Intermediate commit

Yosef-AlSabbah · Yosef-AlSabbah · commit 3e13383715eb · 2025-03-16T14:56:03.000+02:00
diff --git a/cart/cart.py b/cart/cart.py
@@ -2,6 +2,7 @@
 
 from django.conf import settings
 
+from coupons.models import Coupon
 from shop.models import Product
 
 
@@ -17,6 +18,9 @@ def __init__(self, request):
             cart = self.session[settings.CART_SESSION_ID] = {}
         self.cart = cart
 
+        # store current applied coupon
+        self.coupon_id = self.session.get('coupon_id')
+
     def __iter__(self):
         """
         Iterate over the items in the cart and get the products
@@ -82,3 +86,22 @@ def remove(self, product):
     def save(self):
         # mark the session as "modified" to make sure it gets saved
         self.session.modified = True
+
+    @property
+    def coupon(self):
+        if self.coupon_id:
+            try:
+                return Coupon.objects.get(id=self.coupon_id)
+            except Coupon.DoesNotExist:
+                pass
+            return None
+
+    def get_discount(self):
+        if self.coupon:
+            return (
+                    self.coupon.discount / Decimal('100')
+            ) * self.get_total_price()
+        return Decimal(0)
+
+    def get_total_price_after_discount(self):
+        return self.get_total_price() - self.get_discount()
diff --git a/cart/templates/cart/detail.html b/cart/templates/cart/detail.html
@@ -26,6 +26,8 @@ <h1>Your shopping cart</h1>
 
 
 
+
+
                                     {% if product.image %}{{ product.image.url }}{% else %}{% static "img/no_image.png" %}{% endif %}">
                         </a>
                     </td>
@@ -50,13 +52,40 @@ <h1>Your shopping cart</h1>
                 </tr>
             {% endwith %}
         {% endfor %}
+        <tr class="total">
+            {% if cart.coupon %}
+                <tr class="subtotal">
+                    <td>Subtotal</td>
+                    <td colspan="4"></td>
+                    <td class="num">${{ cart.get_total_price|floatformat:2 }}</td>
+                </tr>
+                <tr>
+                    <td>
+                        "{{ cart.coupon.code }}" coupon
+                        ({{ cart.coupon.discount }}% off)
+                    </td>
+                    <td colspan="4"></td>
+                    <td class="num neg">
+                        - ${{ cart.get_discount|floatformat:2 }}
+                    </td>
+                </tr>
+            {% endif %}
         <tr class="total">
             <td>Total</td>
             <td colspan="4"></td>
-            <td class="num">${{ cart.get_total_price }}</td>
+            <td class="num">
+                ${{ cart.get_total_price_after_discount|floatformat:2 }}
+            </td>
         </tr>
+
         </tbody>
     </table>
+    <p>Apply a coupon:</p>
+    <form action="{% url "coupons:apply" %}" method="post">
+        {{ coupon_apply_form }}
+        <input type="submit" value="Apply">
+        {% csrf_token %}
+    </form>
     <p class="text-right">
         <a href="{% url "shop:product_list" %}" class="button
 light">Continue shopping</a>
diff --git a/cart/views.py b/cart/views.py
@@ -1,6 +1,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 from django.views.decorators.http import require_POST
 
+from coupons.froms import CouponApplyForm
 from shop.models import Product
 from .cart import Cart
 from .forms import CartAddProductForm
@@ -35,10 +36,12 @@ def cart_detail(request):
                 'override': True,
             }
         )
+    coupon_apply_form = CouponApplyForm()
     return render(
         request,
         'cart/detail.html',
         context={
             'cart': cart,
+            'coupon_apply_form': coupon_apply_form
         }
     )
diff --git a/coupons/froms.py b/coupons/froms.py
@@ -0,0 +1,5 @@
+from django import forms
+
+
+class CouponApplyForm(forms.Form):
+    code = forms.CharField(max_length=50)
diff --git a/coupons/urls.py b/coupons/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+
+from . import views
+
+app_name = 'coupons'
+
+urlpatterns = [
+    path('apply/', views.coupon_apply, name='apply'),
+]
diff --git a/myshop/settings/local.py b/myshop/settings/local.py
@@ -41,6 +41,7 @@
     'shop.apps.ShopConfig',
     'orders.apps.OrdersConfig',
     'payment.apps.PaymentConfig',
+    'coupons.apps.CouponsConfig',
 ]
 
 MIDDLEWARE = [
@@ -148,3 +149,9 @@
 EMAIL_USE_TLS = True
 
 STRIPE_WEBHOOK_SECRET = config('STRIPE_WEBHOOK_SECRET')
+
+
+# Redis settings
+REDIS_HOST = 'localhost'
+REDIS_PORT = 6379
+REDIS_DB = 1
diff --git a/myshop/settings/production.py b/myshop/settings/production.py
@@ -42,6 +42,7 @@
     'shop.apps.ShopConfig',
     'orders.apps.OrdersConfig',
     'payment.apps.PaymentConfig',
+    'coupons.apps.CouponsConfig',
 ]
 
 MIDDLEWARE = [
@@ -141,3 +142,8 @@
 STRIPE_API_VERSION = '2025-02-24.acacia'
 
 STRIPE_WEBHOOK_SECRET = config('STRIPE_WEBHOOK_SECRET')
+
+# Redis settings
+REDIS_HOST = 'localhost'
+REDIS_PORT = 6379
+REDIS_DB = 1
diff --git a/myshop/urls.py b/myshop/urls.py
@@ -24,6 +24,7 @@
     path('cart/', include('cart.urls', namespace='cart')),
     path('orders/', include('orders.urls', namespace='orders')),
     path('payment/', include('payment.urls', namespace='payment')),
+    path('coupons/', include('coupons.urls', namespace='coupons')),
     path('', include('shop.url', namespace='shop')),
 ]
 
diff --git a/orders/models.py b/orders/models.py
@@ -1,6 +1,11 @@
+from decimal import Decimal
+
 from django.conf import settings
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
+from coupons.models import Coupon
+
 
 class Order(models.Model):
     first_name = models.CharField(max_length=50)
@@ -15,6 +20,21 @@ class Order(models.Model):
 
     stripe_id = models.CharField(max_length=250, blank=True)
 
+    coupon = models.ForeignKey(
+        Coupon,
+        related_name='orders',
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+    )
+    discount = models.SmallIntegerField(
+        default=0,
+        validators=[
+            MinValueValidator(0),
+            MaxValueValidator(100)
+        ]
+    )
+
     class Meta:
         ordering = ['-created']
         indexes = [
@@ -26,9 +46,19 @@ class Meta:
     def __str__(self):
         return f'Order {self.id}'
 
-    def total_cost(self):
+    def get_total_cost_before_discount(self):
         return sum(item.get_cost() for item in self.items.all())
 
+    def get_discount(self):
+        total_cost = self.get_total_cost_before_discount()
+        if self.discount:
+            return total_cost * (self.discount / Decimal(100))
+        return Decimal(0)
+
+    def get_total_cost(self):
+        total_cost = self.get_total_cost_before_discount()
+        return total_cost - self.get_discount()
+
     def get_stripe_url(self):
         if not self.stripe_id:
             # no payment associated
diff --git a/orders/templates/admin/orders/order/detail.html b/orders/templates/admin/orders/order/detail.html
@@ -82,6 +82,24 @@ <h2>Items bought</h2>
                     <td class="num">${{ item.get_cost }}</td>
                 </tr>
             {% endfor %}
+
+            {% if order.coupon %}
+                <tr class="subtotal">
+                    <td colspan="3">Subtotal</td>
+                    <td class="num">
+                        ${{ order.get_total_cost_before_discount|floatformat:2 }}
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="3">
+                        "{{ order.coupon.code }}" coupon
+                        ({{ order.discount }}% off)
+                    </td>
+                    <td class="num neg">
+                        - ${{ order.get_discount|floatformat:2 }}
+                    </td>
+                </tr>
+            {% endif %}
             <tr class="total">
                 <td colspan="3">Total</td>
                 <td class="num">${{ order.get_total_cost }}</td>
diff --git a/orders/templates/orders/order/create.html b/orders/templates/orders/order/create.html
@@ -13,8 +13,14 @@ <h3>Your order</h3>
                     <span>${{ item.total_price }}</span>
                 </li>
             {% endfor %}
+            {% if cart.coupon %}
+                <li>
+                    "{{ cart.coupon.code }}" ({{ cart.coupon.discount }}% off)
+                    <span class="neg">- ${{ cart.get_discount|floatformat:2 }}</span>
+                </li>
+            {% endif %}
         </ul>
-        <p>Total: ${{ cart.get_total_price }}</p>
+        <p>Total: ${{ cart.get_total_price_after_discount|floatformat:2 }}</p>
     </div>
     <form method="post" class="order-form">
         {{ form.as_p }}
diff --git a/orders/templates/orders/order/pdf.html b/orders/templates/orders/order/pdf.html
@@ -33,9 +33,26 @@ <h3>Items bought</h3>
             <td class="num">${{ item.get_cost }}</td>
         </tr>
     {% endfor %}
+    {% if order.coupon %}
+        <tr class="subtotal">
+            <td colspan="3">Subtotal</td>
+            <td class="num">
+                ${{ order.get_total_cost_before_discount|floatformat:2 }}
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3">
+                "{{ order.coupon.code }}" coupon
+                ({{ order.discount }}% off)
+            </td>
+            <td class="num neg">
+                - ${{ order.get_discount|floatformat:2 }}
+            </td>
+        </tr>
+    {% endif %}
     <tr class="total">
         <td colspan="3">Total</td>
-        <td class="num">${{ order.get_total_cost }}</td>
+        <td class="num">${{ order.get_total_cost|floatformat:2 }}</td>
     </tr>
     </tbody>
 </table>
diff --git a/orders/views.py b/orders/views.py
@@ -1,10 +1,7 @@
 # import weasyprint
 from django.contrib.admin.views.decorators import staff_member_required
-from django.contrib.staticfiles import finders
-from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render, redirect
-from django.template.loader import render_to_string
 
 from cart.cart import Cart
 from .forms import OrderCreateForm
@@ -41,7 +38,11 @@ def order_create(request):
     if request.method == 'POST':
         form = OrderCreateForm(request.POST)
         if form.is_valid():
-            order = form.save()
+            order = form.save(commit=False)
+            if cart.coupon:
+                order.coupon = cart.coupon
+                order.discount = cart.coupon.discount
+            order.save()
             for item in cart:
                 OrderItem.objects.create(
                     order=order,
diff --git a/payment/templates/payment/process.html b/payment/templates/payment/process.html
@@ -17,17 +17,40 @@ <h1>Order summary</h1>
         {% for item in order.items.all %}
             <tr class="row{% cycle "1" "2" %}">
                 <td>
-                    <img src="{% if item.product.image %}{{ item.product.image.url }}{% else %}{% static "img/no_image.png" %}{% endif %}">
+                    <img src="
+                            {% if item.product.image %}{{ item.product.image.url }}{% else %}{% static "img/no_image.png" %}{% endif %}">
                 </td>
                 <td>{{ item.product.name }}</td>
                 <td class="num">${{ item.price }}</td>
                 <td class="num">{{ item.quantity }}</td>
                 <td class="num">${{ item.get_cost }}</td>
             </tr>
         {% endfor %}
+        {% if order.coupon %}
+            <tr class="subtotal">
+                <td>Subtotal</td>
+                <td colspan="3"></td>
+                <td class="num">
+                    ${{ order.get_total_cost_before_discount|floatformat:2 }}
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    "{{ order.coupon.code }}" coupon
+                    ({{ order.discount }}% off)
+                </td>
+                <td colspan="3"></td>
+                <td class="num neg">
+                    - ${{ order.get_discount|floatformat:2 }}
+                </td>
+            </tr>
+        {% endif %}
         <tr class="total">
-            <td colspan="4">Total</td>
-            <td class="num">${{ order.get_total_cost }}</td>
+            <td>Total</td>
+            <td colspan="3"></td>
+            <td class="num">
+                ${{ order.get_total_cost|floatformat:2 }}
+            </td>
         </tr>
         </tbody>
     </table>
diff --git a/payment/views.py b/payment/views.py
@@ -48,6 +48,14 @@ def payment_process(request):
                 }
             )
 
+        if order.coupon:
+            stripe_coupon = stripe.Coupon.create(
+                name=order.coupon.code,
+                percent_off=order.discount,
+                duration='once',
+            )
+            session_data['discounts'] = [{'coupon': stripe_coupon.id}]
+
         # create Stripe checkout session
         session = stripe.checkout.Session.create(**session_data)
 
diff --git a/requirements.txt b/requirements.txt
diff --git a/shop/recommender.py b/shop/recommender.py

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`from django.shortcuts import get_object_or_404, redirect, render`
`2`	`2`	`from django.views.decorators.http import require_POST`
`3`	`3`
	`4`	`+from coupons.froms import CouponApplyForm`
`4`	`5`	`from shop.models import Product`
`5`	`6`	`from .cart import Cart`
`6`	`7`	`from .forms import CartAddProductForm`
`@@ -35,10 +36,12 @@ def cart_detail(request):`
`35`	`36`	`'override': True,`
`36`	`37`	`}`
`37`	`38`	`)`
	`39`	`+ coupon_apply_form = CouponApplyForm()`
`38`	`40`	`return render(`
`39`	`41`	`request,`
`40`	`42`	`'cart/detail.html',`
`41`	`43`	`context={`
`42`	`44`	`'cart': cart,`
	`45`	`+ 'coupon_apply_form': coupon_apply_form`
`43`	`46`	`}`
`44`	`47`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`path('cart/', include('cart.urls', namespace='cart')),`
`25`	`25`	`path('orders/', include('orders.urls', namespace='orders')),`
`26`	`26`	`path('payment/', include('payment.urls', namespace='payment')),`
	`27`	`+ path('coupons/', include('coupons.urls', namespace='coupons')),`
`27`	`28`	`path('', include('shop.url', namespace='shop')),`
`28`	`29`	`]`
`29`	`30`