Merge pull request #29 from jamedadi/feature_order_service_provider

merge feature order service provider

order/filters.py

@@ -0,0 +1,17 @@
+from django import forms
+
+import django_filters
+
+from order.models import Order
+
+
+class OrderFilter(django_filters.FilterSet):
+ created_time = django_filters.DateFilter(
+ widget=forms.DateInput(attrs={'class': 'form-control', 'type': 'date', 'data-date-format': 'YYYY-MMMM-DD '}),
+ lookup_expr='contains'
+ )
+
+ status = django_filters.ChoiceFilter(
+ choices=Order.STATUS,
+ widget=forms.Select(attrs={'class': 'form-control'})
+ )

order/migrations/0003_alter_order_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2021-09-15 09:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0002_auto_20210913_1544'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='order',
+ name='status',
+ field=models.PositiveSmallIntegerField(choices=[(0, 'preparing food'), (1, 'sending')], default=0, verbose_name='status'),
+ ),
+ ]

order/templates/order/service/order_detail.html

@@ -0,0 +1,55 @@
+{% extends 'base.html' %}
+{% block title %}Order Detail{% endblock %}
+{% block content %}
+
+ <div style="width: 100%; padding: 40px; background-color: white">
+ <div style="margin-bottom: 30px">
+ <div style="padding: 20px">
+ <div style="font-size: 22px">
+ <p><b>id : {{ order.id }}</b></p>
+ <p><b>status : {{ order.get_status_display }}</b></p>
+ <p><b>date time : {{ order.created_time }}</b></p>
+ <p><b>total price : {{ order.invoice.price }}$</b></p>
+ </div>
+ </div>
+
+ </div>
+ <h4>Lines:</h4>
+ <div style="border: 1px solid #ebebeb">
+ <div style="padding: 20px; text-align: center; margin-bottom: 20px">
+ <div style="float: left">
+ <p style="font-size: 20px"><b>
+ Item
+ </b></p>
+ </div>
+ <div style="float: right">
+ <p style="font-size: 20px"><b>
+ Quantity
+ </b></p>
+ </div>
+ </div>
+ {% for cartline in order.invoice.cart.lines.all %}
+ <div style="height: 70px">
+ <div style="padding: 20px; text-align: center">
+ <div style="float: left">
+ <p style="font-size: 18px">
+ {{ cartline.item }}
+ </p>
+ </div>
+ <div style="float: right; margin-right: 30px">
+ <p style="font-size: 18px">
+ {{ cartline.quantity }}
+ </p>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ <div style="margin-top: 40px">
+ <a href="{% url 'order:service-order-update' order.pk %}" style="background-color: deeppink; color: white"
+ class="btn">Change
+ Status</a>
+ </form>
+ </div>
+ </div>
+{% endblock %}

order/templates/order/service/order_filter_list.html

@@ -0,0 +1,34 @@
+{% extends 'base.html' %}
+{% block title %}Payment Verification{% endblock %}
+{% block content %}
+
+ <div style="width: 100%; padding: 40px; background-color: white">
+ <div style="margin-bottom: 30px">
+ <form method="get">
+ {{ filter.form.as_p }}
+ <button type="submit" class="btn btn-warning">Filter</button>
+ </form>
+ </div>
+ <div>
+ {% for order in orders %}
+ <div style="height: 200px;border: 1px solid #e2e2e2">
+ <div style="padding: 20px;">
+ <div style="float: left">
+ <div style="font-size: 18px">
+ <p>id : {{ order.id }}</p>
+ <p>status : {{ order.get_status_display }}</p>
+ <p>date time : {{ order.created_time }}</p>
+ <p> total price : {{ order.invoice.price }}$</p>
+ </div>
+ </div>
+ <div align="right" style="float: right; margin-top: 60px">
+ <a href="{% url 'order:service-order-detail' order.pk %}"
+ class="btn" style="background-color: deeppink; color: white">Show Factor</a>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ </div>
+
+{% endblock %}

order/templates/order/service/order_list.html

@@ -0,0 +1,26 @@
+{% extends 'base.html' %}
+{% block title %}Payment Verification{% endblock %}
+{% block content %}
+ <h6>Today: {% now "Y-m-d" %}</h6>
+ <div style="width: 100%; padding: 40px; background-color: white">
+ {% for order in orders %}
+ <div style="height: 200px;border: 1px solid #e2e2e2">
+ <div style="padding: 20px;">
+ <div style="float: left">
+ <div style="font-size: 18px">
+ <p>id : {{ order.id }}</p>
+ <p>status : {{ order.get_status_display }}</p>
+ <p>date time : {{ order.created_time }}</p>
+ <p> total price : {{ order.invoice.price }}$</p>
+ </div>
+ </div>
+ <div align="right" style="float: right; margin-top: 60px">
+ <a href="{% url 'order:service-order-detail' order.pk %}"
+ class="btn" style="background-color: deeppink; color: white">Show Factor</a>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+
+{% endblock %}

order/templates/order/service/order_update.html

@@ -0,0 +1,9 @@
+{% extends 'base.html' %}
+{% block content %}
+ <form method="POST">
+ {% csrf_token %}
+ {{ form.as_p }}
+ <button type="submit" value="submit" class="btn btn-primary">Update</button>
+ </form>
+ <a href="{% url 'order:service-order-detail' object.pk %}" class="btn btn-warning" style="margin-top: 20px">cancel</a>
+{% endblock %}

order/urls.py

@@ -1,10 +1,16 @@
 from django.urls import path
 
+from order.views import OrderServiceListView, OrderServiceDetailView, OrderServiceUpdateView, OrderServiceListFilterView
 from order.views import CustomerOrdersListView, CustomerOrderDetailView
 
 app_name = 'order'
 
 urlpatterns = [
+ path('service/list/<int:service_pk>/', OrderServiceListFilterView.as_view(), name='service-order-list'),
+ path('service/today/<int:service_pk>/', OrderServiceListView.as_view(), name='service-order-today'),
+ path('service/detail/<int:pk>/', OrderServiceDetailView.as_view(), name='service-order-detail'),
+ path('service/update/<int:pk>/', OrderServiceUpdateView.as_view(), name='service-order-update'),
+
  path('customer/list/', CustomerOrdersListView.as_view(), name='customer-list'),
  path('customer/<int:pk>/detail/', CustomerOrderDetailView.as_view(), name='customer-detail'),
 ]

order/views.py

@@ -1,13 +1,102 @@
+from abc import ABC
+
 from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseForbidden
+from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.http import require_http_methods
-from django.views.generic import ListView, DetailView
+from django.views.generic import ListView, DetailView, UpdateView
+
+from django_filters.views import FilterView
+
+from order.filters import OrderFilter
+from order.models import Order
+from service.models import Service
+
+from library.utils import CustomUserPasses
 
 from accounts.models import Customer
 from accounts.utils import IsCustomer
-from library.utils import CustomUserPasses
-from order.models import Order
+
+
+
+class BaseOrderServiceList(CustomUserPasses):
+ model = Order
+
+ def test_func(self):
+ if self.service.service_provider != self.request.user:
+ return False
+ return True
+
+
+class BaseOrderDetailUpdate(CustomUserPasses):
+ model = Order
+
+ def test_func(self):
+ order = self.get_object()
+ if order.invoice.cart.service.service_provider != self.request.user:
+ return False
+ return True
+
+
+@method_decorator(require_http_methods(['GET']), name='dispatch')
+@method_decorator(login_required(login_url=reverse_lazy('accounts:service-provider-login')), name='dispatch')
+class OrderServiceListFilterView(FilterView):
+ context_object_name = 'orders'
+ filterset_class = OrderFilter
+ template_name = 'order/service/order_filter_list.html'
+
+ def dispatch(self, request, *args, **kwargs):
+ self.service = get_object_or_404(Service, pk=self.kwargs.get('service_pk', None))
+ if self.service.service_provider != self.request.user:
+ return HttpResponseForbidden()
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_queryset(self):
+ return Order.objects.filter(invoice__cart__service=self.service)
+
+
+@method_decorator(require_http_methods(['GET']), name='dispatch')
+@method_decorator(login_required(login_url=reverse_lazy('accounts:service-provider-login')), name='dispatch')
+class OrderServiceListView(BaseOrderServiceList, ListView):
+ context_object_name = 'orders'
+ template_name = 'order/service/order_list.html'
+
+ def dispatch(self, request, *args, **kwargs):
+ self.service = get_object_or_404(Service, pk=self.kwargs.get('service_pk', None))
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_queryset(self):
+ today = timezone.now()
+ time_filter = dict(
+ created_time__day=today.strftime('%d'),
+ created_time__month=today.strftime('%m'),
+ created_time__year=today.strftime('%Y')
+ )
+ return Order.objects.exclude(is_delivered=True).filter(invoice__cart__service=self.service, **time_filter)
+
+
+@method_decorator(require_http_methods(['GET']), name='dispatch')
+@method_decorator(login_required(login_url=reverse_lazy('accounts:service-provider-login')), name='dispatch')
+class OrderServiceDetailView(BaseOrderDetailUpdate, DetailView):
+ context_object_name = 'order'
+ template_name = 'order/service/order_detail.html'
+
+
+@method_decorator(require_http_methods(['GET', 'POST']), name='dispatch')
+@method_decorator(login_required(login_url=reverse_lazy('accounts:service-provider-login')), name='dispatch')
+class OrderServiceUpdateView(BaseOrderDetailUpdate, UpdateView):
+ fields = ('status',)
+ context_object_name = 'order'
+ template_name = 'order/service/order_update.html'
+
+ def get_success_url(self):
+ order = self.get_object()
+ return reverse_lazy('order:service-order-list', kwargs={'service_pk': order.invoice.cart.service.id})
+
+
 
 
 @method_decorator(require_http_methods(['GET']), name='dispatch')

service/templates/service/service_provider/list.html

@@ -5,15 +5,19 @@
  <ul class="list-group">
  {% for service in services %}
  <li class="list-group-item">
- {{ service.name }}
- <div align="right">
- <a href="{% url 'service:service-provider-service-update' service.pk %}"
- class="btn btn-warning" style="margin-right: 10px">Update</a>
- <a href="{% url 'service:service-provider-service-detail' service.pk %}"
- class="btn btn-primary" style="margin-right: 10px">Detail</a>
- <a href="{% url 'service:service-provider-service-delete' service.pk %}"
- class="btn btn-danger">Delete</a>
- </div>
+ <div style="float: left">{{ service.name }}</div>
+ <div align="right" style="float: right">
+ <a href="{% url 'service:service-provider-service-update' service.pk %}"
+ class="btn btn-warning" style="margin-right: 10px">Update</a>
+ <a href="{% url 'service:service-provider-service-detail' service.pk %}"
+ class="btn btn-primary" style="margin-right: 10px">Detail</a>
+ <a href="{% url 'service:service-provider-service-delete' service.pk %}"
+ class="btn btn-danger" style="margin-right: 10px">Delete</a>
+ <a href="{% url 'order:service-order-today' service.pk %}"
+ class="btn" style="color: white; background-color: #ff92ec; margin-right: 10px">Today Orders</a>
+ <a href="{% url 'order:service-order-list' service.pk %}"
+ class="btn" style="color: white; background-color: deeppink">All Orders</a>
+ </div>
  </li>
  {% endfor %}
  </ul>