From 0cd8fd5b1129a39375a1391287f4cca01e6fa28b Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 19:32:01 +0430 Subject: [PATCH 01/10] Update(sanppfood/urls): include order urls --- snapp_food/urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/snapp_food/urls.py b/snapp_food/urls.py index 0e6e7e0..b36d68f 100644 --- a/snapp_food/urls.py +++ b/snapp_food/urls.py @@ -28,6 +28,7 @@ path('item/', include('item.urls', namespace='item')), path('cart/', include('cart.urls', namespace='cart')), path('payment/', include('payment.urls', namespace='payment')), + path('order/', include('order.urls', namespace='order')), ] From 74c0006ff33a99472f1f9e7cd9ef2231c1806020 Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 19:32:35 +0430 Subject: [PATCH 02/10] Add(order/urls): add urlpatterns to urls.py --- order/urls.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 order/urls.py diff --git a/order/urls.py b/order/urls.py new file mode 100644 index 0000000..388aeb3 --- /dev/null +++ b/order/urls.py @@ -0,0 +1,10 @@ +from django.urls import path + +from order.views import CustomerOrdersListView, CustomerOrderDetailView + +app_name = 'order' + +urlpatterns = [ + path('customer/list/', CustomerOrdersListView.as_view(), name='customer-list'), + path('customer//detail/', CustomerOrderDetailView.as_view(), name='customer-detail'), +] \ No newline at end of file From 99c2c63dba21ebcf2db6df58c313bd87aa723f7a Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 19:33:16 +0430 Subject: [PATCH 03/10] Add(order/views): create CustomerOrderDetailView --- order/views.py | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/order/views.py b/order/views.py index 91ea44a..c55c725 100644 --- a/order/views.py +++ b/order/views.py @@ -1,3 +1,37 @@ -from django.shortcuts import render +from django.contrib.auth.decorators import login_required +from django.urls import reverse_lazy +from django.utils.decorators import method_decorator +from django.views.decorators.http import require_http_methods +from django.views.generic import ListView, DetailView + +from accounts.models import Customer +from accounts.utils import IsCustomer +from library.utils import CustomUserPasses +from order.models import Order + + +@method_decorator(require_http_methods(['GET']), name='dispatch') +@method_decorator(login_required(login_url=reverse_lazy('accounts:customer-login-register')), name='dispatch') +class CustomerOrdersListView(IsCustomer, ListView): + template_name = 'order/customer/order_list.html' + context_object_name = 'orders' + + def get_queryset(self): + return Order.objects.select_related('invoice__cart').filter(customer=self.request.user) + + +@method_decorator(require_http_methods(['GET']), name='dispatch') +@method_decorator(login_required(login_url=reverse_lazy('accounts:customer-login-register')), name='dispatch') +class CustomerOrderDetailView(CustomUserPasses, DetailView): + model = Order + template_name = 'order/customer/order_detail.html' + context_object_name = 'order' + + def test_func(self): + user = self.request.user + if not isinstance(user, Customer): + return False + if self.get_object().customer != self.request.user: + return False + return True -# Create your views here. From b7e503c169c5f2296da6b499f1927264815e7755 Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 19:35:05 +0430 Subject: [PATCH 04/10] add order_list and order_detail for customers --- .../order/customer/order_detail.html | 34 +++++++++++++++++++ .../templates/order/customer/order_list.html | 21 ++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 order/templates/order/customer/order_detail.html create mode 100644 order/templates/order/customer/order_list.html diff --git a/order/templates/order/customer/order_detail.html b/order/templates/order/customer/order_detail.html new file mode 100644 index 0000000..1922b94 --- /dev/null +++ b/order/templates/order/customer/order_detail.html @@ -0,0 +1,34 @@ +{% extends 'base.html' %} +{% block title %} Order Detail {% endblock %} + +{% block content %} +

{{ order.invoice.cart.service }}

+

+

status : {{ order.get_status_display }}

+

order date time : {{ order.created_time }}

+

address : {{ order.invoice.address }}

+

+ + + + + + + + + + + {% for line in order.invoice.cart.lines.all %} + + + + + + {% endfor %} + + +
ItemQuantityPrice
{{ line.item }}{{ line.quantity }}$ {{ line.price }}
+ +
Total price : {{ order.invoice.price }}
+ +{% endblock %} \ No newline at end of file diff --git a/order/templates/order/customer/order_list.html b/order/templates/order/customer/order_list.html new file mode 100644 index 0000000..7aaf000 --- /dev/null +++ b/order/templates/order/customer/order_list.html @@ -0,0 +1,21 @@ +{% extends 'base.html' %} +{% block title %} Orders {% endblock %} + +{% block content %} +

Your orders

+ +{% endblock %} \ No newline at end of file From 882cc167c1619cdd567bff6e73e539540a5ee252 Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 19:35:51 +0430 Subject: [PATCH 05/10] Update(templates/inc): add orders link in navbar --- templates/inc/customer_navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/inc/customer_navbar.html b/templates/inc/customer_navbar.html index 985bc67..62a0bc3 100644 --- a/templates/inc/customer_navbar.html +++ b/templates/inc/customer_navbar.html @@ -12,7 +12,7 @@ Profile
  • - Order + Orders
  • Addresses From 4adb887107b018875f04be0e3d22d03612175ba1 Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 20:11:47 +0430 Subject: [PATCH 06/10] Update(order/): remove is_delivered field and add it to status --- order/admin.py | 7 ++++--- order/models.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/order/admin.py b/order/admin.py index f4555a0..e78a395 100644 --- a/order/admin.py +++ b/order/admin.py @@ -5,6 +5,7 @@ @admin.register(Order) class OrderAdmin(admin.ModelAdmin): - list_display = ('invoice', 'status', 'is_delivered') - list_filter = ('status', 'is_delivered') - search_fields = ('invoice',) + list_display = ('customer', 'status') + list_filter = ('status',) + list_editable = ('status',) + search_fields = ('customer__phone_number',) diff --git a/order/models.py b/order/models.py index 9e4d68c..2079af6 100644 --- a/order/models.py +++ b/order/models.py @@ -10,15 +10,15 @@ class Order(BaseModel): PREPARING_FOOD = 0 SENDING = 1 - + DELIVERED = 2 STATUS = ( (PREPARING_FOOD, _('preparing food')), - (PREPARING_FOOD, _('sending')), + (SENDING, _('sending')), + (DELIVERED, _('delivered')) ) invoice = models.OneToOneField(Invoice, verbose_name=_('invoice'), related_name='order', on_delete=models.PROTECT) customer = models.ForeignKey(Customer, verbose_name=_('customer'), related_name='orders', on_delete=models.PROTECT) status = models.PositiveSmallIntegerField(verbose_name=_('status'), choices=STATUS, default=PREPARING_FOOD) - is_delivered = models.BooleanField(verbose_name=_('is delivered'), default=False) class Meta: verbose_name = _('Order') From 734141afd352916593d1315f7f198e19118cc5ba Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 20:12:33 +0430 Subject: [PATCH 07/10] Update(order/): seprate order list into active and delivered --- order/migrations/0003_auto_20210913_1956.py | 22 ++++++++ order/migrations/0004_alter_order_status.py | 18 ++++++ order/migrations/0005_alter_order_status.py | 18 ++++++ .../order/customer/order_detail.html | 6 +- .../templates/order/customer/order_list.html | 56 +++++++++++++------ order/views.py | 11 +++- 6 files changed, 111 insertions(+), 20 deletions(-) create mode 100644 order/migrations/0003_auto_20210913_1956.py create mode 100644 order/migrations/0004_alter_order_status.py create mode 100644 order/migrations/0005_alter_order_status.py diff --git a/order/migrations/0003_auto_20210913_1956.py b/order/migrations/0003_auto_20210913_1956.py new file mode 100644 index 0000000..40915c8 --- /dev/null +++ b/order/migrations/0003_auto_20210913_1956.py @@ -0,0 +1,22 @@ +# Generated by Django 3.2 on 2021-09-13 15:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0002_auto_20210913_1544'), + ] + + operations = [ + migrations.RemoveField( + model_name='order', + name='is_delivered', + ), + migrations.AlterField( + model_name='order', + name='status', + field=models.PositiveSmallIntegerField(choices=[(0, 'preparing food'), (0, 'sending'), (2, 'delivered')], default=0, verbose_name='status'), + ), + ] diff --git a/order/migrations/0004_alter_order_status.py b/order/migrations/0004_alter_order_status.py new file mode 100644 index 0000000..b345535 --- /dev/null +++ b/order/migrations/0004_alter_order_status.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2 on 2021-09-13 15:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0003_auto_20210913_1956'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='status', + field=models.PositiveSmallIntegerField(choices=[(0, 'preparing food'), (2, 'sending'), (2, 'delivered')], default=0, verbose_name='status'), + ), + ] diff --git a/order/migrations/0005_alter_order_status.py b/order/migrations/0005_alter_order_status.py new file mode 100644 index 0000000..7a4bb6a --- /dev/null +++ b/order/migrations/0005_alter_order_status.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2 on 2021-09-13 15:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0004_alter_order_status'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='status', + field=models.PositiveSmallIntegerField(choices=[(0, 'preparing food'), (1, 'sending'), (2, 'delivered')], default=0, verbose_name='status'), + ), + ] diff --git a/order/templates/order/customer/order_detail.html b/order/templates/order/customer/order_detail.html index 1922b94..d305132 100644 --- a/order/templates/order/customer/order_detail.html +++ b/order/templates/order/customer/order_detail.html @@ -6,7 +6,11 @@

    {{ order.invoice.cart.service }}



    status : {{ order.get_status_display }}

    order date time : {{ order.created_time }}

    -

    address : {{ order.invoice.address }}

    +

    address : {{ order.invoice.address.state.name }} - {{ order.invoice.address.city.name }} + - {{ order.invoice.address.area.name }} - {{ order.invoice.address.street }} + - {{ order.invoice.address.alley }} - {{ order.invoice.address.floor }} + - {{ order.invoice.address.plaque }} +



    diff --git a/order/templates/order/customer/order_list.html b/order/templates/order/customer/order_list.html index 7aaf000..3320957 100644 --- a/order/templates/order/customer/order_list.html +++ b/order/templates/order/customer/order_list.html @@ -2,20 +2,44 @@ {% block title %} Orders {% endblock %} {% block content %} -

    Your orders

    - +

    Active orders

    + {% if active_orders %} + + {% else %} +
    +
    You have no active orders :(
    + {% endif %} +

    Delivered orders

    + {% if delivered_orders %} + + {% else %} +
    +
    You have no delivered orders
    + {% endif %} {% endblock %} \ No newline at end of file diff --git a/order/views.py b/order/views.py index c55c725..ce96eb8 100644 --- a/order/views.py +++ b/order/views.py @@ -14,10 +14,16 @@ @method_decorator(login_required(login_url=reverse_lazy('accounts:customer-login-register')), name='dispatch') class CustomerOrdersListView(IsCustomer, ListView): template_name = 'order/customer/order_list.html' - context_object_name = 'orders' + context_object_name = 'active_orders' def get_queryset(self): - return Order.objects.select_related('invoice__cart').filter(customer=self.request.user) + return Order.objects.select_related('invoice__cart').filter(customer=self.request.user, status__in=(0, 1)) + + def get_context_data(self, *, object_list=None, **kwargs): + context = super().get_context_data(object_list=None, **kwargs) + context['delivered_orders'] = Order.objects.select_related('invoice__cart').filter(customer=self.request.user, + status=2) + return context @method_decorator(require_http_methods(['GET']), name='dispatch') @@ -34,4 +40,3 @@ def test_func(self): if self.get_object().customer != self.request.user: return False return True - From 7d70c95174ff5925c99d3c6d83de8b6bec57281c Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Mon, 13 Sep 2021 20:21:54 +0430 Subject: [PATCH 08/10] Update(templates/accounts/customer): add orders link to profile tempalte --- accounts/templates/accounts/customer/profile.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/accounts/templates/accounts/customer/profile.html b/accounts/templates/accounts/customer/profile.html index ef45936..5570ffd 100644 --- a/accounts/templates/accounts/customer/profile.html +++ b/accounts/templates/accounts/customer/profile.html @@ -6,16 +6,17 @@

    Profile

    First name : {{ request.user.first_name }}

    Last name : {{ request.user.last_name }}


    - Address list

    - Create new address

    + Address list

    + Orders

    + Create new address

    - Update profile

    + Update profile

    {% if not request.user.password %} - Set password + Set password

    {% else %} - Change password + Change password

    {% endif %} From a82208a9adaad3e2b2bd26151f6c1fcdab79b996 Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Thu, 16 Sep 2021 11:51:20 +0430 Subject: [PATCH 09/10] Update(payment/models): fix user_email arg in get_request_handler_data --- payment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payment/models.py b/payment/models.py index a469dab..4c887d1 100644 --- a/payment/models.py +++ b/payment/models.py @@ -62,7 +62,7 @@ def __str__(self): def get_request_handler_data(self): return dict( - amount=self.price, description=self.description, user_email='mohammad@agmil.com', + amount=self.price, description=self.description, user_email=getattr(self.customer, 'email', ''), user_phone_number=self.customer.phone_number, REQUEST_URL=self.gateway.gateway_request_url, MERCHANT_ID=self.gateway.auth_data, CALL_BACK=CALL_BACK, ) From 5e63c0238557b0599cb5810c557cc82024293689 Mon Sep 17 00:00:00 2001 From: AmirHossein Bonakdar Date: Thu, 16 Sep 2021 12:18:13 +0430 Subject: [PATCH 10/10] Update(payment/models): add None for user_email getattr --- payment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payment/models.py b/payment/models.py index 4c887d1..898f77a 100644 --- a/payment/models.py +++ b/payment/models.py @@ -62,7 +62,7 @@ def __str__(self): def get_request_handler_data(self): return dict( - amount=self.price, description=self.description, user_email=getattr(self.customer, 'email', ''), + amount=self.price, description=self.description, user_email=getattr(self.customer, 'email', None), user_phone_number=self.customer.phone_number, REQUEST_URL=self.gateway.gateway_request_url, MERCHANT_ID=self.gateway.auth_data, CALL_BACK=CALL_BACK, )