updated total amount after deduction

JU-High-Fives · Feb 26, 2024 · ba31305 · ba31305
1 parent af8b326
commit ba31305
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 185 deletions.
diff --git a/BharaHobe/db.sqlite3 b/BharaHobe/db.sqlite3
diff --git a/BharaHobe/payment/__pycache__/models.cpython-312.pyc b/BharaHobe/payment/__pycache__/models.cpython-312.pyc
diff --git a/BharaHobe/payment/__pycache__/test_monthly_payment.cpython-312.pyc b/BharaHobe/payment/__pycache__/test_monthly_payment.cpython-312.pyc
diff --git a/BharaHobe/payment/__pycache__/views.cpython-312.pyc b/BharaHobe/payment/__pycache__/views.cpython-312.pyc
diff --git a/BharaHobe/payment/migrations/0001_initial.py b/BharaHobe/payment/migrations/0001_initial.py
diff --git a/BharaHobe/payment/migrations/0002_payment_order_id.py b/BharaHobe/payment/migrations/0002_payment_order_id.py
diff --git a/BharaHobe/payment/migrations/0003_paymentmodel_delete_payment.py b/BharaHobe/payment/migrations/0003_paymentmodel_delete_payment.py
diff --git a/.../payment/migrations/0004_remove_paymentmodel_m_timestamp_paymentmodel_m_notes_and_more.py b/.../payment/migrations/0004_remove_paymentmodel_m_timestamp_paymentmodel_m_notes_and_more.py
diff --git a/BharaHobe/payment/migrations/0005_order.py b/BharaHobe/payment/migrations/0005_order.py
diff --git a/BharaHobe/payment/migrations/0006_rename_order_ordermodel_and_more.py b/BharaHobe/payment/migrations/0006_rename_order_ordermodel_and_more.py
diff --git a/BharaHobe/payment/migrations/0007_paymentmodel_m_card_token.py b/BharaHobe/payment/migrations/0007_paymentmodel_m_card_token.py
diff --git a/BharaHobe/payment/migrations/__init__.py b/BharaHobe/payment/migrations/__init__.py
diff --git a/BharaHobe/payment/migrations/__pycache__/0001_initial.cpython-312.pyc b/BharaHobe/payment/migrations/__pycache__/0001_initial.cpython-312.pyc
diff --git a/BharaHobe/payment/migrations/__pycache__/0002_payment_order_id.cpython-312.pyc b/BharaHobe/payment/migrations/__pycache__/0002_payment_order_id.cpython-312.pyc
diff --git a/BharaHobe/payment/migrations/__pycache__/0003_paymentmodel_delete_payment.cpython-312.pyc b/BharaHobe/payment/migrations/__pycache__/0003_paymentmodel_delete_payment.cpython-312.pyc
diff --git a/...ache__/0004_remove_paymentmodel_m_timestamp_paymentmodel_m_notes_and_more.cpython-312.pyc b/...ache__/0004_remove_paymentmodel_m_timestamp_paymentmodel_m_notes_and_more.cpython-312.pyc
diff --git a/BharaHobe/payment/migrations/__pycache__/0005_order.cpython-312.pyc b/BharaHobe/payment/migrations/__pycache__/0005_order.cpython-312.pyc
diff --git a/...Hobe/payment/migrations/__pycache__/0006_rename_order_ordermodel_and_more.cpython-312.pyc b/...Hobe/payment/migrations/__pycache__/0006_rename_order_ordermodel_and_more.cpython-312.pyc
diff --git a/BharaHobe/payment/migrations/__pycache__/0007_paymentmodel_m_card_token.cpython-312.pyc b/BharaHobe/payment/migrations/__pycache__/0007_paymentmodel_m_card_token.cpython-312.pyc
diff --git a/BharaHobe/payment/migrations/__pycache__/__init__.cpython-312.pyc b/BharaHobe/payment/migrations/__pycache__/__init__.cpython-312.pyc
diff --git a/BharaHobe/payment/models.py b/BharaHobe/payment/models.py
@@ -1,19 +1,18 @@
 from django.db import models
 
-from django.db import models
-
 class OrderModel(models.Model):
-    m_order_id = models.CharField(max_length=50, unique=True)
+    m_order_id = models.AutoField(primary_key=True)
     m_items = models.TextField()
     m_total_amount = models.DecimalField(max_digits=10, decimal_places=2)
     m_notes = models.TextField(blank=True, null=True)
 
     def __init__(self, *args, **kwargs):
         super(OrderModel, self).__init__(*args, **kwargs)
-        if self.m_total_amount:
-            self.m_monthly_pay = self.m_total_amount // 6
-        else:
-            self.m_monthly_pay = None
+        if not self.m_monthly_pay:
+            if self.m_total_amount:
+                self.m_monthly_pay = self.m_total_amount // 6
+            else:
+                self.m_monthly_pay = 0
 
     def __str__(self):
         return f"Order #{self.m_order_id}"
@@ -28,4 +27,4 @@ class PaymentModel(models.Model):
 
 
     def __str__(self):
-        return f"Payment #{self.id}"
+        return f"Payment #{self.id}"
diff --git a/BharaHobe/payment/views.py b/BharaHobe/payment/views.py
@@ -123,6 +123,7 @@ def monthly_payment_view(request, order_id):
                         m_card_token=card_token
                     )
                     order.m_total_amount -= amount_to_pay
+                    order.save()
                     return render(request, 'payment_success.html', {'payment': payment})
                 else:
                     return HttpResponseBadRequest("Please pay the exact amount.")