From f17975540af7fab21d701cbb7b610dd5f6716c57 Mon Sep 17 00:00:00 2001
From: Marwan Alwali <f95166@gmail.com>
Date: Sun, 16 Mar 2025 21:44:36 +0300
Subject: [PATCH 1/3] update

---
 templates/sales/estimates/estimate_detail.html  | 12 ++++++------
 templates/sales/estimates/estimate_preview.html |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html
index cccc682c..b6b53fa5 100644
--- a/templates/sales/estimates/estimate_detail.html
+++ b/templates/sales/estimates/estimate_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n custom_filters%}
 
 {% block title %}{{ _("View Quotation") }}{% endblock title %}
 
@@ -210,29 +210,29 @@
                             </tr>
                       {% endfor %}
                       <tr class="bg-body-secondary total-sum">
-                        <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Vat" %} ({{data.vat}}%)</td>                                                                                                
+                        <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Vat" %} ({{data.vat|percentage}})</td>
                         <td class="align-middle text-start fw-semibold">                            
-                        <span id="grand-total">+ {{data.total_vat_amount}}</span>                            
+                        <span id="grand-total">+ {{data.total_vat_amount|floatformat}}</span>
                         </td>                        
                       </tr>                                                                  
                       <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Discount Amount" %}</td>                                                                                                
                         <td class="align-middle text-start text-danger fw-semibold ">                            
-                        <span id="grand-total">- {{data.total_discount}}</span>
+                        <span id="grand-total">- {{data.total_discount|floatformat}}</span>
                         </td>                        
                       </tr>                                                                  
                       <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Additional Services" %}</td>
                         <td class="align-middle text-start fw-semibold">
                           {% for service in data.additionals %}
-                            <small><span class="fw-semibold">+ {{service.name}} - {{service.price_}}</span></small><br>
+                            <small><span class="fw-semibold">+ {{service.name}} - {{service.price_|floatformat}}</span></small><br>
                           {% endfor %}
                         </td>
                       </tr>                                                                  
                       <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-bolder text-body-highlight" colspan="7">{% trans "Grand Total" %}</td>                                                                                                
                         <td class="align-middle text-start fw-bolder">
-                        <span id="grand-total">{{data.grand_total}}</span>
+                        <span id="grand-total">{{data.grand_total|floatformat}}</span>
                         </td>                        
                       </tr>                                                                  
                     </tbody>
diff --git a/templates/sales/estimates/estimate_preview.html b/templates/sales/estimates/estimate_preview.html
index eb6f77e9..ee292e97 100644
--- a/templates/sales/estimates/estimate_preview.html
+++ b/templates/sales/estimates/estimate_preview.html
@@ -216,8 +216,8 @@
                     {% for item in data.additionals %}
                     <tr>
                         <td class="ps-1 text-start fs-10 align-content-center">{{ item.name }}</td>
-                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price|floatformat:2 }}</td>
-                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price_|floatformat:2 }}</td>
+                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price|floatformat }}</td>
+                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price_|floatformat }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>
@@ -229,12 +229,12 @@
             <table class="table table-sm table-responsive">
                 <tr>
                     <td class="text-start ps-1"><strong class="fs-9">VAT</strong></td>
-                    <td class="text-center"><span class="fs-9">{{ data.total_vat_amount|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></span></td>
+                    <td class="text-center"><span class="fs-9">{{ data.total_vat_amount|floatformat }} <span class="currency">{{ CURRENCY }}</span></span></td>
                     <td class="text-end"><strong class="fs-9">ضريبة&nbsp;القيمة&nbsp;المضافة</strong></td>
                 </tr>
                 <tr>
                     <td class="text-start ps-1"><strong class="fs-9">Total</strong></td>
-                    <td class="text-center"><span class="fs-9">{{ data.grand_total|floatformat:2 }}&nbsp;<span class="currency">{{ CURRENCY }}</span></span></td>
+                    <td class="text-center"><span class="fs-9">{{ data.grand_total|floatformat }}&nbsp;<span class="currency">{{ CURRENCY }}</span></span></td>
                     <td class="text-end"><strong class="fs-9">الإجمالي</strong></td>
                 </tr>
                 <tr>

From 32cf1a63f8c44e8d718d6132b043ae745cae5318 Mon Sep 17 00:00:00 2001
From: Marwan Alwali <f95166@gmail.com>
Date: Sun, 16 Mar 2025 23:58:01 +0300
Subject: [PATCH 2/3] update

---
 inventory/forms.py                            |   2 +-
 .../__pycache__/__init__.cpython-311.pyc      | Bin 146 -> 191 bytes
 .../0002_alter_saleorder_payment_method.py    |  18 ++++++++++++++++++
 inventory/models.py                           |  12 ++++++++++--
 inventory/views.py                            |  18 ++++++++++++++++++
 5 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 inventory/migrations/0002_alter_saleorder_payment_method.py

diff --git a/inventory/forms.py b/inventory/forms.py
index 6cd912b5..d795922a 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -288,7 +288,7 @@ class CarFinanceForm(forms.ModelForm):
 class CarLocationForm(forms.ModelForm):
     class Meta:
         model = CarLocation
-        fields = ["showroom", "description"]
+        fields = ["car", "showroom", "description"]
         widgets = {
             "description": forms.Textarea(attrs={"rows": 2, "class": "form-control"}),
         }
diff --git a/inventory/management/__pycache__/__init__.cpython-311.pyc b/inventory/management/__pycache__/__init__.cpython-311.pyc
index f8712ed747ceb1755750244b22db7a76fe86bc0c..98179969c42524f34b586086c9ef1dd43e2aa573 100644
GIT binary patch
delta 74
zcmbQlxSx?{IWI340}!NU&QF`jV`3DfA6lGRRIHzySX7>vmzYzYn3Jg=P??;OSd<%3
cl%JKFTvDu`oLCf}nOByYSCU^;InmV@0B2Jf<p2Nx

delta 29
jcmdnbIEj&GIWI340}#Y?gr-mAF=18JPb?^ySmX-;W%LJz

diff --git a/inventory/migrations/0002_alter_saleorder_payment_method.py b/inventory/migrations/0002_alter_saleorder_payment_method.py
new file mode 100644
index 00000000..dc6c31ca
--- /dev/null
+++ b/inventory/migrations/0002_alter_saleorder_payment_method.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-16 19:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='saleorder',
+            name='payment_method',
+            field=models.CharField(choices=[('cash', 'Cash'), ('finance', 'Finance'), ('lease', 'Lease'), ('credit_card', 'Credit Card'), ('bank_transfer', 'Bank Transfer'), ('SADAD', 'SADAD')], max_length=20),
+        ),
+    ]
diff --git a/inventory/models.py b/inventory/models.py
index 7610ac98..55d06bb1 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -53,8 +53,16 @@ class DealerUserManager(UserManager):
         return user
 
 
-# class DealerMakes(models.Model):
-#     car_make = models.ManyToManyField(CarMake, verbose_name=_("Car Make"), related_name="dealers")
+class DealersMake(models.Model):
+    dealer = models.ForeignKey("Dealer", on_delete=models.CASCADE, related_name="dealer_makes")
+    car_make = models.ForeignKey("CarMake", on_delete=models.CASCADE, related_name="car_dealers")
+    added_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        unique_together = ("dealer", "car_make")  # Prevents duplicate entries
+
+    def __str__(self):
+        return f"{self.dealer.name} - {self.car_make.name}"
 
 
 class StaffUserManager(UserManager):
diff --git a/inventory/views.py b/inventory/views.py
index 4f02f134..17ea8896 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -1029,6 +1029,24 @@ class CarLocationUpdateView(LoginRequiredMixin,UpdateView):
     form_class = forms.CarLocationForm
     template_name = "inventory/car_location_form.html"
 
+    def get_form(self, form_class=None):
+        form = super().get_form(form_class)
+        form.fields["showroom"].queryset = models.Dealer.objects.all()
+        form.fields["car"].queryset = models.Car.objects.filter(pk=self.kwargs["car_pk"])
+        return form
+
+    def get_initial(self):
+        initial = super().get_initial()
+        initial["car"] = get_object_or_404(models.Car, pk=self.kwargs["car_pk"])
+        initial["showroom"] = get_object_or_404(models.CarLocation, pk=self.kwargs["pk"])
+        return initial
+
+    def form_valid(self, form):
+        form.instance.from_dealer = get_user_type(self.request)
+        form.instance.car.status = "transfer"
+        form.instance.car.save()
+        return super().form_valid(form)
+
     def get_success_url(self):
         return reverse_lazy("car_detail", kwargs={"pk": self.object.car.pk})
 

From 294ccd58a919b86889c0e2ca9c11d5f836b1407c Mon Sep 17 00:00:00 2001
From: Marwan Alwali <f95166@gmail.com>
Date: Tue, 18 Mar 2025 00:24:14 +0300
Subject: [PATCH 3/3] update

---
 inventory/urls.py                       | 4 ++--
 templates/dealers/assign_car_makes.html | 2 +-
 templates/dealers/dealer_detail.html    | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/inventory/urls.py b/inventory/urls.py
index 21765357..cc5e3ca6 100644
--- a/inventory/urls.py
+++ b/inventory/urls.py
@@ -45,8 +45,8 @@ urlpatterns = [
     # ),
     # Dashboards
     # path("user/<int:pk>/settings/", views.UserSettingsView.as_view(), name="user_settings"),
-    path("dealer/<int:pk>/settings/", views.DealerSettingsView, name="dealer_settings"),
-    path("dealer/assign-car-makes/", views.assign_car_makes, name="assign_car_makes"),
+    path("dealers/<int:pk>/settings/", views.DealerSettingsView, name="dealer_settings"),
+    path("dealers/assign-car-makes/", views.assign_car_makes, name="assign_car_makes"),
     path("dashboards/manager/", views.ManagerDashboard.as_view(), name="manager_dashboard"),
     path("dashboards/sales/", views.SalesDashboard.as_view(), name="sales_dashboard"),
     path("test/", views.TestView.as_view(), name="test"),
diff --git a/templates/dealers/assign_car_makes.html b/templates/dealers/assign_car_makes.html
index 6810bcc5..6730d525 100644
--- a/templates/dealers/assign_car_makes.html
+++ b/templates/dealers/assign_car_makes.html
@@ -5,7 +5,7 @@
     <style>
     .car-makes-grid {
       display: grid;
-      grid-template-columns: repeat(5, 1fr);
+      grid-template-columns: repeat(7, 1fr);
       gap: 16px;
     }
     .car-makes-grid label {
diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html
index 7c6dd5f6..d62b1aba 100644
--- a/templates/dealers/dealer_detail.html
+++ b/templates/dealers/dealer_detail.html
@@ -142,6 +142,7 @@
                 <h4 class="mb-3">{{ _("Makes you are selling") }}</h4>
                     <div class="d-flex justify-content-center ">
                         <div class="text-center me-3">
+
                         <div class="row">
                             {% for make in car_makes %}
                             <div class="col my-1">
@@ -152,6 +153,9 @@
                             </div>
                             {% endfor %}
                         </div>
+                        <div class="row">
+                            <a class="btn btn-sm btn-phoenix-warning" href="{% url 'assign_car_makes' %}">{{ _("Select Makes")}}</a>
+                        </div>
                         </div>
 
                     </div>