Added stock validation to the basket forms

oscar/apps/basket/forms.py

@@ -3,8 +3,8 @@ from django.conf import settings
 from django.db.models import get_model
 from django.utils.translation import gettext_lazy as _
 
-basketline_model = get_model('basket', 'line')
-basket_model = get_model('basket', 'basket')
+Line = get_model('basket', 'line')
+Basket = get_model('basket', 'basket')
 Product = get_model('catalogue', 'product')
 
 
@@ -13,6 +13,11 @@ class BasketLineForm(forms.ModelForm):
 
     def clean_quantity(self):
         qty = self.cleaned_data['quantity']
+        self.check_max_allowed_quantity(qty)
+        self.check_permission(qty)
+        return qty
+
+    def check_max_allowed_quantity(self, qty):
         basket_threshold = settings.OSCAR_MAX_BASKET_QUANTITY_THRESHOLD
         if basket_threshold:
             total_basket_quantity = self.instance.basket.num_items
@@ -25,10 +30,16 @@ class BasketLineForm(forms.ModelForm):
                             'threshold': basket_threshold,
                             'basket': total_basket_quantity,
                     })
-        return qty
+
+    def check_permission(self, qty):
+        product = self.instance.product
+        is_available, reason = product.is_purchase_permitted(user=None,
+                                                             quantity=qty)
+        if not is_available:
+            raise forms.ValidationError(reason)
 
     class Meta:
-        model = basketline_model
+        model = Line
         exclude = ('basket', 'product', 'line_reference', )
 
 
@@ -36,7 +47,7 @@ class SavedLineForm(forms.ModelForm):
     move_to_basket = forms.BooleanField(initial=False, required=False)
 
     class Meta:
-        model = basketline_model
+        model = Line
         exclude = ('basket', 'product', 'line_reference', 'quantity', )
 
 
@@ -63,9 +74,10 @@ class AddToBasketForm(forms.Form):
     product_id = forms.IntegerField(widget=forms.HiddenInput(), min_value=1)
     quantity = forms.IntegerField(initial=1, min_value=1)
 
-    def __init__(self, basket, instance, *args, **kwargs):
+    def __init__(self, basket, user, instance, *args, **kwargs):
         super(AddToBasketForm, self).__init__(*args, **kwargs)
         self.basket = basket
+        self.user = user
         self.instance = instance
         if instance:
             if instance.is_group:
@@ -73,12 +85,22 @@ class AddToBasketForm(forms.Form):
             else:
                 self._create_product_fields(instance)
 
-    def clean_product_id(self):
+    def clean(self):
         id = self.cleaned_data['product_id']
         product = Product.objects.get(id=id)
-        if not product.has_stockrecord or not product.stockrecord.is_available_to_buy:
-            raise forms.ValidationError(_("This product is not available for purchase"))
-        return id
+        qty = self.cleaned_data.get('quantity', 1)
+        try:
+            line = self.basket.lines.get(product=product)
+        except Line.DoesNotExist:
+            desired_qty = qty
+        else:
+            desired_qty = qty + line.quantity
+
+        is_available, reason = product.is_purchase_permitted(user=self.user, 
+                                                             quantity=desired_qty)
+        if not is_available:
+            raise forms.ValidationError(reason)
+        return self.cleaned_data
 
     def clean_quantity(self):
         qty = self.cleaned_data['quantity']

oscar/apps/basket/views.py

@@ -8,11 +8,14 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist
 
 from extra_views import ModelFormSetView
-from oscar.apps.basket.forms import BasketLineForm, AddToBasketForm, \
-    BasketVoucherForm, SavedLineForm, ProductSelectionForm
 from oscar.apps.basket.signals import basket_addition
-from oscar.core.loading import import_module
-import_module('offer.utils', ['Applicator'], locals())
+from oscar.core.loading import get_class, get_classes
+Applicator = get_class('offer.utils', 'Applicator')
+BasketLineForm, AddToBasketForm, BasketVoucherForm, \
+        SavedLineForm, ProductSelectionForm = get_classes(
+            'basket.forms', ('BasketLineForm', 'AddToBasketForm',
+                             'BasketVoucherForm', 'SavedLineForm',
+                             'ProductSelectionForm'))
 
 
 class BasketView(ModelFormSetView):
@@ -56,6 +59,8 @@ class BasketView(ModelFormSetView):
                     needs_auth = True
         if needs_auth:
             messages.error(self.request, "You can't save an item for later if you're not logged in!")
+        else:
+            messages.success(self.request, _("Basket updated"))
         return super(BasketView, self).formset_valid(formset)
 
     def move_line_to_saved_basket(self, line):
@@ -88,6 +93,7 @@ class BasketAddView(FormView):
             kwargs['instance'] = product_select_form.cleaned_data['product_id']
         else:
             raise Http404()
+        kwargs['user'] = self.request.user
         kwargs['basket'] = self.request.basket
         return kwargs
 
@@ -226,19 +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')))
-
-
-
-#    def do_bulk_load(self, basket):
-#        num_additions = 0
-#        num_not_found = 0
-#        for sku in re.findall(r"[\d -]{5,}", self.request.POST['source_text']):
-#            try:
-#                item = Product.objects.get(upc=sku)
-#                basket.add_product(item)
-#                num_additions += 1
-#            except Product.DoesNotExist:
-#                num_not_found += 1
-#        messages.info(self.request, "Added %d items to your basket (%d missing)" % (num_additions, num_not_found))
-#
+        return HttpResponseRedirect(self.request.META.get('HTTP_REFERER', reverse('basket:summary')))

oscar/templatetags/basket_tags.py

@@ -1,8 +1,8 @@
 from django import template
 from django.db.models import get_model
 
-from oscar.core.loading import import_module
-forms = import_module('basket.forms', ['AddToBasketForm'])
+from oscar.core.loading import get_class
+AddToBasketForm = get_class('basket.forms', 'AddToBasketForm')
 Product = get_model('catalogue', 'product')
 
 register = template.Library()
@@ -39,5 +39,5 @@ class BasketFormNode(template.Node):
             initial = {
                 'product_id': product.id,
             }
-            context[self.form_var] = forms.AddToBasketForm(basket, instance=product,initial=initial)
+            context[self.form_var] = AddToBasketForm(basket, user=None, instance=product,initial=initial)
         return ''