Merged in master - plus fixes to JS based on jshint

oscar/apps/basket/views.py

@@ -50,7 +50,7 @@ class BasketView(ModelFormSetView):
     def formset_valid(self, formset):
         needs_auth = False
         for form in formset:
-            if form.cleaned_data['save_for_later']:
+            if hasattr(form, 'cleaned_data') and form.cleaned_data['save_for_later']:
                 line = form.instance
                 if self.request.user.is_authenticated():
                     self.move_line_to_saved_basket(line)
@@ -232,4 +232,4 @@ class SavedView(ModelFormSetView):
         return super(SavedView, self).formset_valid(formset)
 
     def formset_invalid(self, formset):
-        return HttpResponseRedirect(self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+        return HttpResponseRedirect(self.request.META.get('HTTP_REFERER', reverse('basket:summary')))

oscar/apps/catalogue/abstract_models.py

@@ -94,7 +94,10 @@ class AbstractProductCategory(models.Model):
     class Meta:
         abstract = True
         ordering = ['-is_canonical']
-        verbose_name_plural = 'Categories'
+        verbose_name_plural = 'Product categories'
+
+    def __unicode__(self):
+        return u"<productcategory for product '%s'>" % self.product
         
 
 class AbstractContributorRole(models.Model):

oscar/apps/catalogue/admin.py

@@ -54,3 +54,4 @@ admin.site.register(product_models.AttributeEntityType)
 admin.site.register(product_models.Option, OptionAdmin)
 admin.site.register(product_models.ProductImage)
 admin.site.register(product_models.Category)
+admin.site.register(product_models.ProductCategory)

oscar/apps/checkout/views.py

@@ -236,6 +236,7 @@ class UserAddressDeleteView(CheckoutSessionMixin, DeleteView):
     """
     Delete an address from a user's addressbook.
     """
+    template_name = 'checkout/user_address_delete.html'
 
     def get_queryset(self):
         return UserAddress._default_manager.filter(user=self.request.user)
@@ -574,7 +575,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
 
     def send_confirmation_message(self, order, **kwargs):
         code = self.communication_type_code
-        ctx = {'order': order}
+        ctx = {'order': order,
+               'lines': order.lines.all(),}
         try:
             event_type = CommunicationEventType.objects.get(code=code)
         except CommunicationEventType.DoesNotExist:

oscar/apps/dashboard/catalogue/forms.py

@@ -1,9 +1,11 @@
 from django import forms
+from django.forms.models import inlineformset_factory
 from django.db.models import get_model
 
 Product = get_model('catalogue', 'Product')
 StockRecord = get_model('partner', 'StockRecord')
 ProductAttributeValue = get_model('catalogue', 'ProductAttributeValue')
+ProductCategory = get_model('catalogue', 'ProductCategory')
 
 
 class ProductSearchForm(forms.Form):
@@ -121,3 +123,13 @@ class ProductForm(forms.ModelForm):
 
 class StockAlertSearchForm(forms.Form):
     status = forms.CharField(label='Status')
+
+
+class ProductCategoryForm(forms.ModelForm):
+    class Meta:
+        model = ProductCategory
+        exclude = ('product',)
+
+
+ProductCategoryFormSet = inlineformset_factory(Product, ProductCategory,
+                                               fields=('category',), extra=1)

oscar/apps/dashboard/catalogue/views.py

@@ -6,10 +6,12 @@ from django.core.urlresolvers import reverse
 
 from oscar.apps.dashboard.catalogue import forms
 from oscar.core.loading import get_classes
-ProductForm, StockRecordForm, StockAlertSearchForm = get_classes(
+ProductForm, StockRecordForm, StockAlertSearchForm, ProductCategoryFormSet = get_classes(
     'dashboard.catalogue.forms', ('ProductForm', 'StockRecordForm',
-                                  'StockAlertSearchForm'))
+                                  'StockAlertSearchForm',
+                                  'ProductCategoryFormSet'))
 Product = get_model('catalogue', 'Product')
+ProductCategory = get_model('catalogue', 'ProductCategory')
 ProductClass = get_model('catalogue', 'ProductClass')
 StockRecord = get_model('partner', 'StockRecord')
 StockAlert = get_model('partner', 'StockAlert')
@@ -53,6 +55,7 @@ class ProductListView(generic.ListView):
 
         return queryset
 
+
 class ProductCreateRedirectView(generic.RedirectView):
 
     def get_redirect_url(self, **kwargs):
@@ -76,6 +79,7 @@ class ProductCreateView(generic.CreateView):
     def get_context_data(self, **kwargs):
         ctx = super(ProductCreateView, self).get_context_data(**kwargs)
         ctx['stockrecord_form'] = StockRecordForm()
+        ctx['category_formset'] = ProductCategoryFormSet()
         ctx['title'] = 'Create new product'
         return ctx
 
@@ -88,16 +92,20 @@ class ProductCreateView(generic.CreateView):
         return kwargs
 
     def form_valid(self, form):
+        product = form.save(commit=False)
+        product.product_class = self.get_product_class()
         stockrecord_form = StockRecordForm(self.request.POST)
-        if stockrecord_form.is_valid():
+        category_formset = ProductCategoryFormSet(self.request.POST,
+                                                  instance=product)
+        if stockrecord_form.is_valid() and category_formset.is_valid():
             # Save product
-            product = form.save()
-            product.product_class = self.get_product_class()
             product.save()
             # Save stock record
             stockrecord = stockrecord_form.save(commit=False)
             stockrecord.product = product
             stockrecord.save()
+            # Save categories
+            category_formset.save()
             return HttpResponseRedirect(self.get_success_url(product))
 
         ctx = self.get_context_data()
@@ -119,6 +127,7 @@ class ProductUpdateView(generic.UpdateView):
     def get_context_data(self, **kwargs):
         ctx = super(ProductUpdateView, self).get_context_data(**kwargs)
         ctx['stockrecord_form'] = StockRecordForm(instance=self.object.stockrecord)
+        ctx['category_formset'] = ProductCategoryFormSet(instance=self.object)
         ctx['title'] = 'Update product'
         return ctx
 
@@ -130,14 +139,18 @@ class ProductUpdateView(generic.UpdateView):
     def form_valid(self, form):
         stockrecord_form = StockRecordForm(self.request.POST,
                                            instance=self.object.stockrecord)
-        if stockrecord_form.is_valid():
-            form.save()
+        category_formset = ProductCategoryFormSet(self.request.POST,
+                                                  instance=self.object)
+        if stockrecord_form.is_valid() and category_formset.is_valid():
+            product = form.save()
             stockrecord_form.save()
+            category_formset.save()
             return HttpResponseRedirect(self.get_success_url())
 
         ctx = self.get_context_data()
         ctx['form'] = form
         ctx['stockrecord_form'] = stockrecord_form
+        ctx['category_formset'] = category_form
         return self.render_to_response(ctx)
 
     def get_success_url(self):

oscar/apps/dashboard/promotions/views.py

@@ -6,16 +6,18 @@ from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.db.models import Count
+from django.shortcuts import HttpResponse
 
 from oscar.core.loading import get_classes, get_class
 from oscar.apps.promotions.layout import split_by_position
 from oscar.apps.promotions.conf import PROMOTION_CLASSES, PROMOTION_POSITIONS
+from oscar.views.generic import PostActionMixin
 
 SingleProduct, RawHTML, Image, MultiImage, \
     AutomaticProductList, PagePromotion, HandPickedProductList = get_classes('promotions.models',
     ['SingleProduct', 'RawHTML', 'Image', 'MultiImage', 'AutomaticProductList',
      'PagePromotion', 'HandPickedProductList'])
-SelectForm, RawHTMLForm, PagePromotionForm = get_classes('dashboard.promotions.forms', 
+SelectForm, RawHTMLForm, PagePromotionForm = get_classes('dashboard.promotions.forms',
     ['PromotionTypeSelectForm', 'RawHTMLForm', 'PagePromotionForm'])
 
 
@@ -28,7 +30,7 @@ class ListView(generic.TemplateView):
         data = []
         for klass in PROMOTION_CLASSES:
             data.append(klass.objects.all())
-        promotions = itertools.chain(*data)                                    
+        promotions = itertools.chain(*data)
         ctx = {
             'promotions': promotions,
             'select_form': SelectForm(),
@@ -43,7 +45,7 @@ class CreateRedirectView(generic.RedirectView):
         code = self.request.GET.get('promotion_type', None)
         urls = {}
         for klass in PROMOTION_CLASSES:
-            urls[klass.classname()] = reverse('dashboard:promotion-create-%s' % 
+            urls[klass.classname()] = reverse('dashboard:promotion-create-%s' %
                                               klass.classname())
         return urls.get(code, None)
 
@@ -80,6 +82,26 @@ class PageDetailView(generic.TemplateView):
             })
         return ctx
 
+    def post(self, request, **kwargs):
+        """
+        When called with a post request, try and get 'promo[]' from
+        the post data and use it to reorder the page content blocks.
+        """
+        data = dict(request.POST).get('promo[]')
+        self._save_page_order(data)
+        return HttpResponse(status=200)
+
+    def _save_page_order(self, data):
+        """ 
+        Save the order of the pages. This gets used when an ajax request
+        posts backa new order for promotions within page regions.
+        """
+        for index, item in enumerate(data):
+            page = PagePromotion.objects.get(pk=item)
+            if page.display_order != index:
+                page.display_order = index
+                page.save()
+
 
 class PromotionMixin(object):
 
@@ -94,7 +116,7 @@ class DeletePagePromotionView(generic.DeleteView):
 
     def get_success_url(self):
         messages.info(self.request, "Promotion removed successfully")
-        return reverse('dashboard:promotion-list-by-url', 
+        return reverse('dashboard:promotion-list-by-url',
                        kwargs={'path': self.object.page_url})
 
 
@@ -107,7 +129,7 @@ class CreateView(PromotionMixin, generic.CreateView):
 
     def get_success_url(self):
         messages.info(self.request, "Promotion created successfully")
-        return reverse('dashboard:promotion-update', 
+        return reverse('dashboard:promotion-update',
                        kwargs={'ptype': self.model.classname(),
                                'pk': self.object.id})
 
@@ -146,7 +168,7 @@ class CreateHandPickedProductListView(CreateView):
 # ============
 # UPDATE VIEWS
 # ============
-        
+
 
 class UpdateView(PromotionMixin, generic.UpdateView):
     actions = ('add_to_page', 'remove_from_page')
@@ -225,7 +247,7 @@ class UpdateHandPickedProductListView(UpdateView):
 # ============
 # DELETE VIEWS
 # ============
-        
+
 
 class DeleteView(generic.DeleteView):
     template_name = 'dashboard/promotions/delete.html'

oscar/apps/partner/tests/models.py

@@ -62,7 +62,8 @@ class DefaultWrapperTests(unittest.TestCase):
 
     def test_default_wrapper_for_out_of_stock(self):
         product = create_product(price=D('10.00'), partner="Acme", num_in_stock=0)
-        self.assertEquals("Out of stock", product.stockrecord.availability)
+        self.assertEquals(u"Not available",
+                          unicode(product.stockrecord.availability))
         self.assertEqual("outofstock", product.stockrecord.availability_code)
 
     def test_dispatch_date_for_in_stock(self):

oscar/apps/partner/wrappers.py

@@ -31,7 +31,7 @@ class DefaultWrapper(object):
     def availability(self, stockrecord):
         if stockrecord.net_stock_level > 0:
             return _("In stock (%d available)" % stockrecord.net_stock_level)
-        return _("Not available ...")
+        return _("Not available")
     
     def dispatch_date(self, stockrecord):
         if stockrecord.net_stock_level:

oscar/apps/payment/forms.py

@@ -188,7 +188,7 @@ class BankcardForm(forms.ModelForm):
     
     number = BankcardNumberField(max_length=20, widget=forms.TextInput(attrs={'autocomplete':'off'}), label="Card number")
     name = forms.CharField(max_length=128, label="Name on card")
-    ccv_number = forms.RegexField(required=True, label="CCV Number",
+    cvv_number = forms.RegexField(required=True, label="CVV Number",
                                   regex=r'^\d{3,4}$', widget=forms.TextInput(attrs={'size': '5'}))
     start_month = BankcardStartingMonthField(label="Valid from", required=False)
     expiry_month = BankcardExpiryMonthField(required=True, label = "Valid to")
@@ -196,7 +196,7 @@ class BankcardForm(forms.ModelForm):
     class Meta:
         model = payment_models.Bankcard
         exclude = ('user', 'partner_reference')
-        fields = ('number', 'name', 'start_month', 'expiry_month', 'ccv_number')
+        fields = ('number', 'name', 'start_month', 'expiry_month', 'cvv_number')
         
     def get_bankcard_obj(self):
         """
@@ -206,7 +206,7 @@ class BankcardForm(forms.ModelForm):
             'name': self.cleaned_data['name'],
             'card_number': self.cleaned_data['number'],
             'expiry_date': self.cleaned_data['expiry_month'].strftime("%m/%y"),
-            'ccv': self.cleaned_data['ccv_number'],
+            'cvv': self.cleaned_data['cvv_number'],
         }
         if self.cleaned_data['start_month']:
             kwargs['start_date'] = self.cleaned_data['start_month'].strftime("%m/%y")

oscar/apps/payment/utils.py

@@ -1,11 +1,15 @@
-
-
 class Bankcard(object):
     
-    def __init__(self, card_number, expiry_date, name=None, ccv=None, start_date=None, issue_number=None):
+    def __init__(self, card_number, expiry_date, name=None, cvv=None, start_date=None, issue_number=None):
         self.card_number = card_number
         self.card_holder_name = name
         self.expiry_date = expiry_date
         self.start_date = start_date
         self.issue_number = issue_number
-        self.ccv = ccv
+        self.cvv = cvv
+
+    @property
+    def ccv(self):
+        # There are lots of acronyms for this -
+        # see http://en.wikipedia.org/wiki/Card_Code_Verification
+        return self.cvv

oscar/static/js/oscar/dashboard.js

@@ -1,4 +1,14 @@
-var oscar = oscar || {}
+var oscar = oscar || {};
+oscar.get_csrf_token = function() {
+    var cookies = document.cookie.split(';');
+    $.each(cookies, function(index, cookie) {
+        cookie_parts = $.trim(cookie).split('=');
+        if (cookie_parts[0] == 'csrftoken') {
+            return cookie_parts[1];
+        }
+    });
+    return null;
+};
 oscar.dashboard = {
     promotions: {
         init: function() {
@@ -7,14 +17,26 @@ oscar.dashboard = {
                 stop: oscar.dashboard.promotions.save_order});
         },
         save_order: function(event, ui) {
-            // todo - save order of promotions
-            console.log(event, ui);
+            // Get the csrf token, otherwise django will not accept the
+            // POST request.
+            var serial = $(this).sortable("serialize"),
+                csrf = oscar.get_csrf_token();
+            serial = serial + '&csrfmiddlewaretoken=' + csrf;
+            $.ajax({
+                type: 'POST',
+                data: serial,
+                dataType: "json",
+                url: '#',
+                beforeSend: function(xhr, settings) {
+                    xhr.setRequestHeader("X-CSRFToken", csrf);
+                }
+            });
         }
     }
-}
+};
 
-$(document).ready(function() 
-{   
+$(document).ready(function()
+{
     //table font size increase decrease
     $('.fontsize li').click(function()
     {
@@ -23,12 +45,12 @@ $(document).ready(function()
         var num = parseFloat(os, 10);// gets rid of the px
         $('.bordered-table').css('font-size', num / 1.1 + uom);
         if (this.id == 'larger') {
-            $('.bordered-table').css('font-size', num * 1.1 + uom);    
-        }  
+            $('.bordered-table').css('font-size', num * 1.1 + uom);
+        }
     });
 
     //side navigation accordion
-    $('.primary-nav > li > ul, .orders_search').each(function(index) 
+    $('.primary-nav > li > ul, .orders_search').each(function(index)
     {
         $(this).css('height', $(this).height());
     });

oscar/static/js/oscar/ui.js

@@ -1,5 +1,5 @@
 $(document).ready(function()
-{	
+{   
     // Product star rating  -- must improve this in python
     $('.product_pod, .span6, .promotion_single').each(function() 
     {
@@ -11,15 +11,15 @@ $(document).ready(function()
         });
         var ave_rating = sum_rating_count / sum_total_reviews *10;
         if (ave_rating <= 2) {
-            var ave_rating = 'One'
+            ave_rating = 'One';
         } else if (ave_rating <= 4) {
-            var ave_rating = 'Two'
+            ave_rating = 'Two';
         } else if (ave_rating <= 6) {
-            var ave_rating = 'Three'
+            ave_rating = 'Three';
         } else if (ave_rating <= 8) {
-            var ave_rating = 'Four'
+            ave_rating = 'Four';
         } else if (ave_rating <= 10) {
-            var ave_rating = 'Five'
+            ave_rating = 'Five';
         }
         $(this).find('.review_count')
           .after('<p class=\"star ' + ave_rating + '\">' + ave_rating + ' star(s) by user reviews. <a href=\"#reviews\">Add review</a></p>')
@@ -34,32 +34,26 @@ $(document).ready(function()
             user_rating += parseFloat($(this).text());
         });
         if (user_rating == 1) {
-            var user_rating = 'One'
+            user_rating = 'One';
         }
         else if (user_rating == 2) {
-            var user_rating = 'Two'
+            user_rating = 'Two';
         }
         else if (user_rating == 3) {
-            var user_rating = 'Three'
+            user_rating = 'Three';
         }
         else if (user_rating == 4) {
-            var user_rating = 'Four'
+            user_rating = 'Four';
         }
         else if (user_rating == 5) {
-            var user_rating = 'Five'
+            user_rating = 'Five';
         }
-        $(this)
-          .find('h3')
-          .addClass(user_rating)
-          .end()
-          .find('span')
-          .remove();
+        $(this).find('h3').addClass(user_rating).end().find('span').remove();
     });
     
-    
-    var window_width = $(window).width(); // Width of the window
-        $browse_width = $('aside.span3').outerWidth(),// Width of main navigation
-        $browse_height = $('#browse > .dropdown-menu').outerHeight();// Height of main navigation
+    var window_width = $(window).width(), // Width of the window
+        $browse_width = $('aside.span3').outerWidth(), // Width of main navigation
+        $browse_height = $('#browse > .dropdown-menu').outerHeight(); // Height of main navigation
     
     if (window_width > 480) {
       // This activates elastislide
@@ -124,29 +118,29 @@ $(document).ready(function()
     $(".accordion dd").hide();
 
     /* scroll to sections */
-  	$('.top_page a, .product_page a').click(function (e) {
-  		var section = $(this).attr('href');
-  		var sectionPosition = Math.floor($(section).offset().top);
-  		var currentPosition = Math.floor($(document).scrollTop());
-  		// when scrolling downwards
-  		if (sectionPosition > currentPosition) {
-  			$('html, body').animate({
-  				scrollTop: sectionPosition}, 500, function() {
-  				$('html, body').animate({
-  					scrollTop: sectionPosition
-  				});
-  			});
-  		}
-  		// when scrolling upwards
-  		else if (sectionPosition < currentPosition) {
-  			$('html, body').animate({
-  				scrollTop: sectionPosition}, 500, function() {
-  				$('html, body').animate({
-  					scrollTop: sectionPosition
-  				});
-  			});			
-  		}
-  		e.preventDefault();
-  	});
+    $('.top_page a, .product_page a').click(function (e) {
+        var section = $(this).attr('href');
+        var sectionPosition = Math.floor($(section).offset().top);
+        var currentPosition = Math.floor($(document).scrollTop());
+        // when scrolling downwards
+        if (sectionPosition > currentPosition) {
+            $('html, body').animate({
+                scrollTop: sectionPosition}, 500, function() {
+                $('html, body').animate({
+                    scrollTop: sectionPosition
+                });
+            });
+        }
+        // when scrolling upwards
+        else if (sectionPosition < currentPosition) {
+            $('html, body').animate({
+                scrollTop: sectionPosition}, 500, function() {
+                $('html, body').animate({
+                    scrollTop: sectionPosition
+                });
+            });         
+        }
+        e.preventDefault();
+    });
 });
     

oscar/templates/checkout/user_address_delete.html

@@ -0,0 +1,12 @@
+{% extends "checkout/checkout.html" %}
+
+{% block shipping_address %}
+
+<h4>Delete address?</h4>
+<form action="." method="post">
+    {% csrf_token %}
+	{{ object.summary }}
+    <p>Are you sure you want to delete this address? <input type="submit" value="Yes!" /></p>
+</form>
+
+{% endblock shipping_address %}

oscar/templates/dashboard/catalogue/product_update.html

@@ -25,6 +25,11 @@ Update product | {{ block.super }}
 	{% csrf_token %}
 		<legend>Product information</legend>
 		{% include "partials/form_fields.html" with form=form %}
+		<legend>Category information</legend>
+		{{ category_formset.management_form }}
+		{% for category_form in category_formset %}
+			{% include "partials/form_fields.html" with form=category_form %}
+		{% endfor %}
 		<legend>Stock and price information</legend>
 		{% include "partials/form_fields.html" with form=stockrecord_form %}
 		<div class="form-actions">

oscar/templates/dashboard/layout.html

@@ -4,16 +4,14 @@
 {% load category_tags %}
 {% load dashboard_tags %}
 
-
 {% block extrahead %}
     <link rel="stylesheet" href="{{ STATIC_URL }}css/dashboard.css" />
 {%endblock extrahead %}
+
 {% block title %}
 Dashboard | {{ block.super }}
 {% endblock %}
 
-
-
 {% block layout %}
     <div class="navbar accounts">
         <div class="navbar-inner">
@@ -87,4 +85,5 @@ Dashboard | {{ block.super }}
 {% block extrascripts %}
     <!-- dashboard js -->
     <script src="{{ STATIC_URL }}js/oscar/dashboard.js" type="text/javascript" charset="utf-8"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/jquery-ui.min.js"></script>
 {% endblock %}

oscar/templates/dashboard/promotions/page_detail.html

@@ -49,7 +49,7 @@ Content blocks for page {{ page }} | {{ block.super }}
 </table>
 <!-- <ul class="promotion_list">
     {% for promotion in position.promotions %}
-    <li>
+    <li id="promo_{{ promotion.pk }}">
     {{ promotion.content_object.name }} - Type: {{ promotion.content_object.type }}
     <a href="{% url dashboard:promotion-update promotion.content_object.code promotion.content_object.id %}" class="btn btn-success">Edit</a>
     <a href="#" class="btn btn-info btn-handle">Re-order</a>

oscar/templates/partials/form_fields.html

@@ -1,13 +1,17 @@
 {% for field in form %}
 <div class="control-group {% for error in field.errors %}error{% endfor %}">
-    {{ field.label_tag }}
-    <div class="controls">
-        {{ field }}
-        {% for error in field.errors %}
-            <span class="help-block">
-                {{ error|escape }}
-            </span>
-        {% endfor %}
-    </div>
+	{% if field.is_hidden %}
+		{{ field }}
+	{% else %}
+		{{ field.label_tag }}
+		<div class="controls">
+			{{ field }}
+			{% for error in field.errors %}
+				<span class="help-block">
+					{{ error|escape }}
+				</span>
+			{% endfor %}
+		</div>
+	{% endif %}
 </div>
 {% endfor %}

pre-commit.sh

@@ -1,7 +1,18 @@
 #!/usr/bin/env bash
 
+git stash --keep-index -q
+
 source ~/.virtualenvs/oscar/bin/activate
+
 ./run_tests.py
-[ $? -ne 0 ] && echo "Tests failed" && exit 1
+TEST_RESULT=$?
+
+jshint oscar/static/js/oscar
+JS_RESULT=$?
+
+git stash pop -q
+
+[ $TEST_RESULT -ne 0 ] && echo "Tests failed" && exit 1
+[ $JS_RESULT -ne 0 ] && echo "JShint failed" && exit 1
 
 exit 0