| Image | -Product | -Quantity | -Remove | -Unit Price | -Price | +{% trans 'Image' %} | +{% trans 'Product' %} | +{% trans 'Quantity' %} | +{% trans 'Remove' %} | +{% trans 'Unit Price' %} | +{% trans 'Price' %} | {{item.price}} | {{item.total_price}} | + {% if cart.coupon %} +
|---|---|---|---|---|---|---|---|---|---|---|---|
| {% trans 'Subtotal' %} | ++ | ${{cart.get_total_price|floatformat:2}} | +|||||||||
| + "{{cart.coupon.code}}" coupon + ({{cart.coupon.discount}} off) + | ++ | + - ${{cart.get_discount|floatformat:2}} + | +|||||||||
| Total | +{% trans 'Total' %} | - | ${{cart.get_total_price}} | +${{cart.get_price_after_coupon|floatformat:2}} | |||||||
{% trans 'Apply a Coupon' %}
+ +- Continue Shopping - Checkout + {% trans 'Continue Shopping' %} + {% trans 'Checkout' %}
{% endblock %} \ No newline at end of file diff --git a/cart/views.py b/cart/views.py index 54d5020..0b2f311 100644 --- a/cart/views.py +++ b/cart/views.py @@ -4,6 +4,7 @@ from .cart import Cart from .forms import CartAddProductForm from shop.models import Product +from coupons.forms import CouponApplyForm from common.constants import KEY_QUANTITY @@ -30,8 +31,10 @@ def cart_remove(request, product_id): def cart_details(request): cart = Cart(request) + coupon_apply_form = CouponApplyForm() for item in cart: item['product_update_form'] = CartAddProductForm(initial={ KEY_QUANTITY: item.get(KEY_QUANTITY), 'override': True }) - return render(request, 'cart/cart_details.html', {'cart': cart}) + return render(request, 'cart/cart_details.html', {'cart': cart, + 'coupon_apply_form': coupon_apply_form}) diff --git a/coupons/__init__.py b/coupons/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/coupons/admin.py b/coupons/admin.py new file mode 100644 index 0000000..3717dfb --- /dev/null +++ b/coupons/admin.py @@ -0,0 +1,10 @@ +from django.contrib import admin + +from .models import Coupon + + +@admin.register(Coupon) +class CouponAdmin(admin.ModelAdmin): + list_display = ['code', 'valid_from', 'valid_to', 'discount', 'active', 'total_coupons', 'availed_coupons'] + list_filter = ['active', 'valid_to', 'valid_from'] + search_fields = ['code'] \ No newline at end of file diff --git a/coupons/apps.py b/coupons/apps.py new file mode 100644 index 0000000..1190536 --- /dev/null +++ b/coupons/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CouponsConfig(AppConfig): + name = 'coupons' diff --git a/coupons/forms.py b/coupons/forms.py new file mode 100644 index 0000000..9c4421f --- /dev/null +++ b/coupons/forms.py @@ -0,0 +1,6 @@ +from django import forms +from django.utils.translation import gettext_lazy as _ + + +class CouponApplyForm(forms.Form): + code = forms.CharField(label=_('Code')) diff --git a/coupons/migrations/0001_initial.py b/coupons/migrations/0001_initial.py new file mode 100644 index 0000000..7dd1596 --- /dev/null +++ b/coupons/migrations/0001_initial.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.3 on 2021-12-31 18:47 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Coupon', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(db_index=True, max_length=32, unique=True)), + ('valid_from', models.DateTimeField()), + ('valid_to', models.DateTimeField()), + ('discount', models.IntegerField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])), + ('active', models.BooleanField()), + ('total_coupons', models.PositiveIntegerField(default=3)), + ('availed_coupons', models.PositiveIntegerField(default=0)), + ], + ), + ] diff --git a/coupons/migrations/__init__.py b/coupons/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/coupons/models.py b/coupons/models.py new file mode 100644 index 0000000..be63841 --- /dev/null +++ b/coupons/models.py @@ -0,0 +1,15 @@ +from django.db import models +from django.core.validators import MinValueValidator, MaxValueValidator + + +class Coupon(models.Model): + code = models.CharField(max_length=32, unique=True, db_index=True) + valid_from = models.DateTimeField() + valid_to = models.DateTimeField() + discount = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)]) + active = models.BooleanField() + total_coupons = models.PositiveIntegerField(default=3) + availed_coupons = models.PositiveIntegerField(default=0) + + def __str__(self): + return f"Coupon code:{self.code}" diff --git a/coupons/tests.py b/coupons/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/coupons/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/coupons/urls.py b/coupons/urls.py new file mode 100644 index 0000000..eca8d9b --- /dev/null +++ b/coupons/urls.py @@ -0,0 +1,10 @@ +from django.urls import path + +from .views import coupon_apply + +app_name = 'coupons' + + +urlpatterns = [ + path('apply/', coupon_apply, name='apply') +] diff --git a/coupons/views.py b/coupons/views.py new file mode 100644 index 0000000..de6da20 --- /dev/null +++ b/coupons/views.py @@ -0,0 +1,21 @@ +from django.utils import timezone +from django.shortcuts import render, redirect +from django.views.decorators.http import require_POST + +from .models import Coupon +from .forms import CouponApplyForm + + +@require_POST +def coupon_apply(request): + now = timezone.now() + form = CouponApplyForm(request.POST) + if form.is_valid(): + code = form.cleaned_data['code'] + try: + coupon = Coupon.objects.get(code=code, valid_from__lte=now, valid_to__gte=now, active=True) + request.session['coupon_id'] = coupon.id + except Coupon.DoesNotExist: + request.session['coupon_id'] = None + + return redirect('cart:cart_details') diff --git a/eShop/settings.py b/eShop/settings.py index 197abb6..2f321cf 100644 --- a/eShop/settings.py +++ b/eShop/settings.py @@ -12,6 +12,7 @@ import os import braintree +from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -39,11 +40,13 @@ 'cart.apps.CartConfig', 'orders.apps.OrdersConfig', 'payment.apps.PaymentConfig', + 'coupons.apps.CouponsConfig' ] MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -106,7 +109,12 @@ # Internationalization # https://docs.djangoproject.com/en/2.2/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'en' +LANGUAGES = ( + ('en', _('English')), + ('es', _('Spanish')), + ('ur', _('Urdu')), +) TIME_ZONE = 'UTC' @@ -119,6 +127,9 @@ MEDIA_URL = '/media/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media/') STATIC_ROOT = os.path.join(BASE_DIR, 'static/') +LOCALE_PATHS = ( + os.path.join(BASE_DIR, 'locale/'), +) # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ @@ -133,6 +144,10 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' # EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +REDIS_HOST = 'localhost' +REDIS_PORT = '6379' +REDIS_DB = 1 + try: from .local_settings import * # pylint: disable=all except: # pylint: disable=bare-except diff --git a/eShop/urls.py b/eShop/urls.py index 315030c..42577f9 100644 --- a/eShop/urls.py +++ b/eShop/urls.py @@ -17,13 +17,15 @@ from django.conf import settings from django.urls import path, include from django.conf.urls.static import static +from django.conf.urls.i18n import i18n_patterns -urlpatterns = [ +urlpatterns = i18n_patterns( path('admin/', admin.site.urls), path('payment/', include('payment.urls', namespace='payment')), path('cart/', include('cart.urls', namespace='cart')), path('orders/', include('orders.urls', namespace='orders')), + path('coupons/', include('coupons.urls', namespace='coupons')), path('', include('shop.urls', namespace='shop')), -] +) if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..aca0f3a --- /dev/null +++ b/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,124 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHORTotal: ${{cart.get_total_price}}
+{% trans 'Total' %}: ${{cart.get_price_after_coupon|floatformat:2}}
Your order has been successfully completed. Your order number is {{order.id}}.
+{% trans 'Your order has been successfully completed. Your order number is' %} {{order.id}}.
{% endblock %} \ No newline at end of file diff --git a/orders/views.py b/orders/views.py index aeae4f4..dfc3e41 100644 --- a/orders/views.py +++ b/orders/views.py @@ -19,7 +19,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() log_info("Order saved!!!") for item in cart: OrderItem.objects.create(order=order, product=item['product'], diff --git a/shop/recommender.py b/shop/recommender.py new file mode 100644 index 0000000..7aeddf4 --- /dev/null +++ b/shop/recommender.py @@ -0,0 +1,59 @@ +import redis +from django.conf import settings +from .models import Product + + +# connect to redis +r = redis.Redis(host=settings.REDIS_HOST, + port=settings.REDIS_PORT, + db=settings.REDIS_DB) + + +class Recommender(object): + + def get_product_key(self, id): + return f'product:{id}:purchased_with' + + def products_bought(self, products): + product_ids = [p.id for p in products] + for product_id in product_ids: + for with_id in product_ids: + # get the other products bought with each product + if product_id != with_id: + # increment score for product purchased together + r.zincrby(self.get_product_key(product_id), + 1, + with_id) + + def suggest_products_for(self, products, max_results=6): + product_ids = [p.id for p in products] + if len(products) == 1: + # only 1 product + suggestions = r.zrange( + self.get_product_key(product_ids[0]), + 0, -1, desc=True)[:max_results] + else: + # generate a temporary key + flat_ids = ''.join([str(id) for id in product_ids]) + tmp_key = f'tmp_{flat_ids}' + # multiple products, combine scores of all products + # store the resulting sorted set in a temporary key + keys = [self.get_product_key(id) for id in product_ids] + r.zunionstore(tmp_key, keys) + # remove ids for the products the recommendation is for + r.zrem(tmp_key, *product_ids) + # get the product ids by their score, descendant sort + suggestions = r.zrange(tmp_key, 0, -1, + desc=True)[:max_results] + # remove the temporary key + r.delete(tmp_key) + suggested_products_ids = [int(id) for id in suggestions] + + # get suggested products and sort by order of appearance + suggested_products = list(Product.objects.filter(id__in=suggested_products_ids)) + suggested_products.sort(key=lambda x: suggested_products_ids.index(x.id)) + return suggested_products + + def clear_purchases(self): + for id in Product.objects.values_list('id', flat=True): + r.delete(self.get_product_key(id)) diff --git a/shop/templates/shop/base.html b/shop/templates/shop/base.html index c044e75..18d74d9 100644 --- a/shop/templates/shop/base.html +++ b/shop/templates/shop/base.html @@ -1,26 +1,45 @@ {% load static %} +{% load i18n %} -{% trans "Language" %}:
+