Added file upload handling within range products

oscar/apps/dashboard/ranges/forms.py

@@ -4,19 +4,38 @@ from django import forms
 from django.db.models import get_model
 
 Product = get_model('catalogue', 'Product')
+Range = get_model('offer', 'Range')
+
+
+class RangeForm(forms.ModelForm):
+
+    class Meta:
+        model = Range
+        exclude = ('included_products', 'excluded_products', 'classes')
 
 
 class RangeProductForm(forms.Form):
     query = forms.CharField(max_length=1024,
+                            label="Product SKUs",
                             widget=forms.Textarea,
+                            required=False,
                             help_text="""You can paste in a selection of SKUs""")
+    file_upload = forms.FileField(label="File of SKUs", required=False)
 
     def __init__(self, range, *args, **kwargs):
         self.range = range
         super(RangeProductForm, self).__init__(*args, **kwargs)
 
+    def clean(self):
+        clean_data = super(RangeProductForm, self).clean()
+        if not clean_data.get('query') and not clean_data.get('file_upload'):
+            raise forms.ValidationError("You must submit either a list of SKUs or a file")
+        return clean_data
+
     def clean_query(self):
         raw = self.cleaned_data['query']
+        if not raw:
+            return raw
 
         # Check that the search matches some products
         skus = re.compile(r'[\w-]+').findall(raw)
@@ -40,7 +59,7 @@ class RangeProductForm(forms.Form):
         return raw
 
     def get_products(self):
-        return self.products
+        return self.products if hasattr(self, 'products') else []
 
     def get_missing_skus(self):
         return self.missing_skus

oscar/apps/dashboard/ranges/migrations/0001_initial.py

@@ -0,0 +1,208 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'RangeProductFileUpload'
+        db.create_table('ranges_rangeproductfileupload', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('range', self.gf('django.db.models.fields.related.ForeignKey')(related_name='file_uploads', to=orm['offer.Range'])),
+            ('filepath', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('size', self.gf('django.db.models.fields.PositiveIntegerField')()),
+            ('uploaded_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('date_uploaded', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('status', self.gf('django.db.models.fields.CharField')(default='Pending', max_length=32)),
+            ('error_message', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
+            ('date_processed', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('num_new_skus', self.gf('django.db.models.fields.PositiveIntegerField')(null=True)),
+            ('num_unknown_skus', self.gf('django.db.models.fields.PositiveIntegerField')(null=True)),
+            ('num_duplicate_skus', self.gf('django.db.models.fields.PositiveIntegerField')(null=True)),
+        ))
+        db.send_create_signal('ranges', ['RangeProductFileUpload'])
+
+
+    def backwards(self, orm):
+
+        # Deleting model 'RangeProductFileUpload'
+        db.delete_table('ranges_rangeproductfileupload')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'catalogue.attributeentity': {
+            'Meta': {'object_name': 'AttributeEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
+        },
+        'catalogue.attributeentitytype': {
+            'Meta': {'object_name': 'AttributeEntityType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
+        },
+        'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'catalogue.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '1024', 'db_index': 'True'})
+        },
+        'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'upc': ('django.db.models.fields.CharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        'catalogue.productattributevalue': {
+            'Meta': {'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_values'", 'to': "orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productcategory': {
+            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
+        },
+        'catalogue.productrecommendation': {
+            'Meta': {'object_name': 'ProductRecommendation'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'offer.range': {
+            'Meta': {'object_name': 'Range'},
+            'classes': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'classes'", 'blank': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'excluded_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'excludes'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'included_categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'includes'", 'blank': 'True', 'to': "orm['catalogue.Category']"}),
+            'included_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'includes'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'includes_all_products': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+        },
+        'ranges.rangeproductfileupload': {
+            'Meta': {'ordering': "('-date_uploaded',)", 'object_name': 'RangeProductFileUpload'},
+            'date_processed': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'date_uploaded': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'error_message': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'filepath': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'num_duplicate_skus': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            'num_new_skus': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            'num_unknown_skus': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            'range': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'file_uploads'", 'to': "orm['offer.Range']"}),
+            'size': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '32'}),
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['ranges']

oscar/apps/dashboard/ranges/models.py

@@ -0,0 +1,85 @@
+import datetime
+import os
+import csv
+
+from django.db import models
+Product = models.get_model('catalogue', 'Product')
+
+
+class RangeProductFileUpload(models.Model):
+    range = models.ForeignKey('offer.Range', related_name='file_uploads')
+    filepath = models.CharField(max_length=255)
+    size = models.PositiveIntegerField()
+    uploaded_by = models.ForeignKey('auth.User')
+    date_uploaded = models.DateTimeField(auto_now_add=True)
+
+    PENDING, FAILED, PROCESSED = 'Pending', 'Failed', 'Processed'
+    choices = (
+        (PENDING, PENDING),
+        (FAILED, FAILED),
+        (PROCESSED, PROCESSED),
+    )
+    status = models.CharField(max_length=32, choices=choices, default=PENDING)
+    error_message = models.CharField(max_length=255, null=True)
+
+    # Post-processing audit fields
+    date_processed = models.DateTimeField(null=True)
+    num_new_skus = models.PositiveIntegerField(null=True)
+    num_unknown_skus = models.PositiveIntegerField(null=True)
+    num_duplicate_skus = models.PositiveIntegerField(null=True)
+
+    class Meta:
+        ordering = ('-date_uploaded',)
+
+    @property
+    def filename(self):
+        return os.path.basename(self.filepath)
+
+    def mark_as_failed(self, message=None):
+        self.date_processed = datetime.datetime.now()
+        self.error_message = message
+        self.status = self.FAILED
+        self.save()
+
+    def mark_as_processed(self, num_new, num_unknown, num_duplicate):
+        self.status = self.PROCESSED
+        self.date_processed = datetime.datetime.now()
+        self.num_new_skus = num_new
+        self.num_unknown_skus = num_unknown
+        self.num_duplicate_skus = num_duplicate
+        self.save()
+
+    def was_processing_successful(self):
+        return self.status == self.PROCESSED
+
+    def process(self):
+        """
+        Process the file upload and add products to the range
+        """
+        all_skus = list(self.extract_skus())
+        existing_skus = self.range.included_products.all().values_list(
+            'stockrecord__partner_sku', flat=True)
+        new_skus = list(set(all_skus) - set(existing_skus))
+
+        products = Product._default_manager.filter(stockrecord__partner_sku__in=new_skus)
+        for product in products:
+            self.range.included_products.add(product)
+
+        # Processing stats
+        found_skus = products.values_list('stockrecord__partner_sku', flat=True)
+        missing_skus = set(new_skus) - set(found_skus)
+        dupes = set(all_skus).intersection(set(existing_skus))
+
+        self.mark_as_processed(len(found_skus), len(missing_skus), len(dupes))
+
+    def extract_skus(self):
+        """
+        Extract all SKU-like strings from the file
+        """
+        reader = csv.reader(open(self.filepath, 'r'))
+        for row in reader:
+            for field in row:
+                yield field
+
+    def delete_file(self):
+        os.unlink(self.filepath)

oscar/apps/dashboard/ranges/tests.py

@@ -16,7 +16,7 @@ class RangeProductFormTests(TestCase):
     def submit_form(self, data):
         return forms.RangeProductForm(self.range, data)
 
-    def test_validation_of_query(self):
+    def test_either_query_or_file_must_be_submitted(self):
         form = self.submit_form({'query': ''})
         self.assertFalse(form.is_valid())
 

oscar/apps/dashboard/ranges/views.py

@@ -1,3 +1,5 @@
+import os
+
 from django.views.generic import (ListView, DeleteView, CreateView, UpdateView)
 from django.db.models.loading import get_model
 from django.core.urlresolvers import reverse
@@ -5,13 +7,17 @@ from django.contrib import messages
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect
 from django.template.defaultfilters import pluralize
+from django.conf import settings
 
 from oscar.views.generic import BulkEditMixin
-from oscar.core.loading import get_class
+from oscar.core.loading import get_classes
 
 Range = get_model('offer', 'Range')
 Product = get_model('catalogue', 'Product')
-RangeProductForm = get_class('dashboard.ranges.forms', 'RangeProductForm')
+RangeForm, RangeProductForm = get_classes('dashboard.ranges.forms',
+                                          ['RangeForm', 'RangeProductForm'])
+
+RangeProductFileUpload = get_model('ranges', 'RangeProductFileUpload')
 
 
 class RangeListView(ListView):
@@ -23,6 +29,7 @@ class RangeListView(ListView):
 class RangeCreateView(CreateView):
     model = Range
     template_name = 'dashboard/ranges/range_form.html'
+    form_class = RangeForm
 
     def get_success_url(self):
         messages.success(self.request, "Range created")
@@ -32,6 +39,7 @@ class RangeCreateView(CreateView):
 class RangeUpdateView(UpdateView):
     model = Range
     template_name = 'dashboard/ranges/range_form.html'
+    form_class = RangeForm
 
     def get_success_url(self):
         messages.success(self.request, "Range updated")
@@ -87,12 +95,20 @@ class RangeProductListView(ListView, BulkEditMixin):
 
     def add_products(self, request):
         range = self.get_range()
-        form = self.form_class(range, request.POST)
+        form = self.form_class(range, request.POST, request.FILES)
         if not form.is_valid():
             ctx = self.get_context_data(form=form, object_list=self.object_list)
             return self.render_to_response(ctx)
 
+        self.handle_query_products(request, form)
+        self.handle_file_products(request, range, form)
+        return HttpResponseRedirect(self.get_success_url(request))
+
+    def handle_query_products(self, request, form):
         products = form.get_products()
+        if not products:
+            return
+
         for product in products:
             range.included_products.add(product)
 
@@ -111,4 +127,32 @@ class RangeProductListView(ListView, BulkEditMixin):
             messages.warning(request,
                              "No product was found with SKU matching %s" % ', '.join(missing_skus))
 
-        return HttpResponseRedirect(self.get_success_url(request))
+    def handle_file_products(self, request, range, form):
+        upload = self.create_upload_object(request, range)
+        upload.process()
+        if not upload.was_processing_successful():
+            messages.error(request, upload.error_message)
+        else:
+            msg = "File processed: %d products added, %d duplicate SKUs, %d " \
+                  "SKUS were not found"
+            msg = msg % (upload.num_new_skus, upload.num_duplicate_skus,
+                         upload.num_unknown_skus)
+            if upload.num_new_skus:
+                messages.success(request, msg)
+            else:
+                messages.warning(request, msg)
+        upload.delete_file()
+
+    def create_upload_object(self, request, range):
+        f = request.FILES['file_upload']
+        destination_path = os.path.join(settings.OSCAR_UPLOAD_ROOT, f.name)
+        with open(destination_path, 'wb+') as dest:
+            for chunk in f.chunks():
+                dest.write(chunk)
+        upload = RangeProductFileUpload.objects.create(
+            range=range,
+            uploaded_by=request.user,
+            filepath=destination_path,
+            size=f.size
+        )
+        return upload

oscar/defaults.py

@@ -12,10 +12,11 @@ OSCAR_DEFAULT_CURRENCY = 'GBP'
 # Max number of products to keep on the user's history
 OSCAR_RECENTLY_VIEWED_PRODUCTS = 4
 
-# Image paths
+# Paths
 OSCAR_IMAGE_FOLDER = 'images/products/%Y/%m/'
 OSCAR_PROMOTION_FOLDER = 'images/promotions/'
 OSCAR_MISSING_IMAGE_URL = '/static/oscar/img/image_not_found.jpg'
+OSCAR_UPLOAD_ROOT = '/tmp'
 
 # Search settings
 OSCAR_SEARCH_SUGGEST_LIMIT = 10

oscar/templates/dashboard/ranges/range_list.html

@@ -43,7 +43,9 @@ Range management | {{ block.super }}
 				<td>{{ range.date_created }}</td>
 				<td>
 					<a class="btn btn-primary" href="{% url dashboard:range-update range.id %}">Edit</a>
-					<a class="btn btn-primary" href="{% url dashboard:range-products range.id %}">Edit products</a>
+					{% if not range.includes_all_products %}
+					<a class="btn btn-info" href="{% url dashboard:range-products range.id %}">Edit products</a>
+					{% endif %}
 					<a class="btn btn-danger" href="{% url dashboard:range-delete range.id %}">Delete</a>
 				</td>
 			</tr>

oscar/templates/dashboard/ranges/range_product_list.html

@@ -12,7 +12,11 @@ Products in range '{{ range.name }}' | {{ block.super }}
         <span class="divider">/</span>
     </li>
     <li>
-	<a href="{% url dashboard:range-update range.id %}">Range '{{ range.name }}'</a>
+	<a href="{% url dashboard:range-list %}">Ranges</a>
+        <span class="divider">/</span>
+    </li>
+    <li>
+	<a href="{% url dashboard:range-update range.id %}">'{{ range.name }}'</a>
         <span class="divider">/</span>
     </li>
 	<li class="active"><a href=".">Products</a></li>
@@ -31,12 +35,41 @@ Products in range '{{ range.name }}' | {{ block.super }}
 		<div class="sub-header">
 			<h3>Add products</h3>
 		</div>
-		<form action="." method="post" class="">
+		<form action="." method="post" class="" enctype="multipart/form-data">
 			{% csrf_token %}
 			<input type="hidden" name="action" value="add_products"/>
 			{% include 'partials/form_fields.html' with form=form %}
 			<button type="submit" class="btn btn-primary">Go!</button>
 		</form>
+		{% with uploads=range.file_uploads.all %}
+			{% if uploads %}
+			<div class="sub-header">
+				<h3>Upload history</h3>
+			</div>
+			<table class="table">
+				<thead>
+				<tr>
+					<th>Filename</th>
+					<th>New SKUs</th>
+					<th>Dupliate SKUs</th>
+					<th>Unknown SKUs</th>
+					<th>Date uploaded</th>
+				</tr>
+				</thead>
+				<tbody>
+				{% for upload in uploads %}
+				<tr>
+					<td>{{ upload.filename }}</td>
+					<td>{{ upload.num_new_skus }}</td>
+					<td>{{ upload.num_unknown_skus }}</td>
+					<td>{{ upload.num_duplicate_skus }}</td>
+					<td>{{ upload.date_uploaded }}</td>
+				</tr>
+				{% endfor %}
+				</tbody>
+			</table>
+			{% endif %}
+		{% endwith %}
 	</div>
 
 	{% if products.count %}
@@ -45,7 +78,7 @@ Products in range '{{ range.name }}' | {{ block.super }}
 			<table class="table table-striped table-bordered">
 				<tr>
 					<th></th>
-					<th>SKU<th>
+					<th>SKU</th>
 					<th>Title</th>
 					<th>Price</th>
 					<th></th>