Wip design

Author: bruecksen

bakeup/core/views.py

@@ -17,6 +17,8 @@ def dispatch(self, request, *args, **kwargs):
 
 
 class CustomerRequiredMixin(AccessMixin):
+    login_url = 'shop:login'
+    
     def dispatch(self, request, *args, **kwargs):
         if request.user.is_authenticated and hasattr(request.user, 'customer'):
             return super().dispatch(request, *args, **kwargs)

bakeup/shop/models.py

@@ -55,6 +55,13 @@ def get_absolute_url(self):
 
     def has_products_open_for_order(self):
         return self.production_day_products.filter(production_plan__isnull=True).exists()
+    
+    def get_random_product_image(self):
+        product = self.production_day_products.published().exclude(
+            Q(product__image='')|
+            Q(product__image=None)).order_by('?').first()
+        if product:
+            return product.product.image
 
     @property
     def calendar_week(self):
@@ -142,13 +149,20 @@ def get_ingredient_summary_list(self):
         return collections.OrderedDict(sorted(ingredients.items(), key=lambda t: t[0].path))
 
 
+class ProductionDayProductQuerySet(models.QuerySet):
+    def published(self):
+        return self.filter(is_published=True)
+
+
 class ProductionDayProduct(CommonBaseClass):
     production_day = models.ForeignKey('shop.ProductionDay', on_delete=models.CASCADE, related_name='production_day_products')
     product = models.ForeignKey('workshop.Product', on_delete=models.PROTECT, related_name='production_days', limit_choices_to={'is_sellable': True})
     max_quantity = models.PositiveSmallIntegerField(blank=False, null=False)
     production_plan = models.ForeignKey('workshop.ProductionPlan', on_delete=models.SET_NULL, blank=True, null=True)
     is_published = models.BooleanField(default=False, verbose_name="Published?")
 
+    objects = ProductionDayProductQuerySet.as_manager()
+
     class Meta:
         ordering = ('production_day', 'product')
         unique_together = ['production_day', 'product']

bakeup/shop/urls.py

@@ -2,6 +2,7 @@
 
 from bakeup.shop.views import CustomerOrderUpdateView, CustomerOrderAddView, CustomerOrderListView, ProductListView, ShopView, ProductionDayWeeklyView, CustomerOrderPositionDeleteView, CustomerOrderAddBatchView, CustomerOrderPositionUpdateView
 
+from bakeup.users.views import LoginView, TokenLoginView, SignupView
 from bakeup.users.views import (
     shop_user_profile_view,
     shop_user_update_view,
@@ -23,6 +24,8 @@
    path("orders/positions/<int:pk>/update/", view=CustomerOrderPositionUpdateView.as_view(), name="customer-order-position-update"),
    path("orders/", view=CustomerOrderListView.as_view(), name="order-list"),
    path("profile/", view=shop_user_update_view, name="user-profile"),
+    path("login/", view=LoginView.as_view(), name="login"),
+    path("signup/", view=SignupView.as_view(), name="signup"),
 #    path("product/add/", view=ProductAddView.as_view(), name="product-add"),
 #    path("product/<int:pk>/", view=ProductDetailView.as_view(), name="product-detail"),
 #    path("product/", view=ProductListView.as_view(), name="product-list"),

bakeup/shop/views.py

@@ -115,7 +115,7 @@ class CustomerOrderAddBatchView(CustomerRequiredMixin, FormView):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['production_day_products'] = self.production_day.production_day_products.filter(is_published=True).filter(Q(production_plan__isnull=True) | Q(production_plan__state=0))
+        kwargs['production_day_products'] = self.production_day.production_day_products.published().filter(Q(production_plan__isnull=True) | Q(production_plan__state=0))
         kwargs['customer'] = self.request.user.customer
         return kwargs
 
@@ -200,10 +200,10 @@ def get_context_data(self, **kwargs):
         customer = None if self.request.user.is_anonymous else self.request.user.customer
         if production_day_next:
             context['production_day_next'] = production_day_next.production_day
-            context['production_day_products'] = production_day_next.production_day.production_day_products.filter(is_published=True)
+            context['production_day_products'] = production_day_next.production_day.production_day_products.published()
             context['current_customer_order'] = CustomerOrder.objects.filter(customer=customer, production_day=production_day_next.production_day).first()
             production_day_products = []
-            for production_day_product in production_day_next.production_day.production_day_products.filter(is_published=True):
+            for production_day_product in production_day_next.production_day.production_day_products.published():
                 form = production_day_product.get_order_form(customer)
                 production_day_products.append({
                     'production_day_product': production_day_product,
@@ -212,6 +212,7 @@ def get_context_data(self, **kwargs):
             context['production_day_products'] = production_day_products
         context['show_remaining_products'] = self.request.tenant.clientsetting.show_remaining_products
         context['point_of_sales'] = PointOfSale.objects.all()
+        context['production_days'] = ProductionDay.objects.upcoming()
         return context