new

osinaweb/billing/migrations/0045_orderpayment_date_due_alter_orderpayment_date_paid.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.5 on 2024-04-30 08:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('billing', '0044_alter_orderitem_active'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderpayment',
+            name='date_due',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='orderpayment',
+            name='date_paid',
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

osinaweb/billing/models.py

@@ -25,7 +25,10 @@ class RecurringCycle(models.Model):
     months = models.IntegerField()
     cycle_price = models.FloatField(null=True)
     def __str__(self):
-        return f"{self.months} months"
+        if self.months > 1:
+            return f"{self.months} months - {self.item}"
+        else:
+            return f"{self.months} month - {self.item}"
 
 
 class Order(models.Model):
@@ -108,7 +111,8 @@ class PaymentType(models.Model):
 class OrderPayment(models.Model):
     order = models.ManyToManyField(Order, null=True)
     amount = models.DecimalField(decimal_places=3,  max_digits = 5)
-    date_paid = models.DateField()
+    date_paid = models.DateField(null=True,blank=True)
+    date_due = models.DateField(null=True, blank=True)
     type = models.ForeignKey(PaymentType, null=True, on_delete=models.SET_NULL)
     comment = models.TextField(null=True, blank=True)
     def __str__(self):

osinaweb/customercore/templates/products/osimenu-plans.html

@@ -17,8 +17,7 @@
                 <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Basic</p>
 
                 <div class="w-full flex flex-col justify-center items-center">
-                    <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$0</p>
-                    <p class="text-gray-500">monthly/restaurant</p>
+                    <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$0/month</p>
                 </div>
 
 
@@ -38,37 +37,50 @@
                     <h1 class="text-gray-500 text-[17px] font-light">Features:</h1>
 
                     <div class="w-full flex flex-col">
+                                                
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-semibold text-secondosiblue">Online Ordering (75 Orders)</p>
+                            <p class="font-semibold text-secondosiblue">1 Restaurant</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Restaurant Website</p>
+                            <p class="font-light text-secondosiblue">1 Branch</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Branded Mobile App</p>
+                            <p class="font-light text-secondosiblue">Unlimed Categories</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">QR Code Menu</p>
+                            <p class="font-light text-secondosiblue">Unlimed Items per Category</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Loyalty Program</p>
+                            <p class="font-light text-secondosiblue">1 Personalized Digital Menu</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">50+ Free Website Templates</p>
+                            <p class="font-light text-secondosiblue">1 Digital Menu Template</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Multi Location</p>
+                            <p class="font-light text-secondosiblue">1 PDF Menu</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Online Payments</p>
+                            <p class="font-light text-secondosiblue">Menu QR Code</p>
+                        </div>
+                        <div class="flex justify-start items-center gap-2 py-1">
+                            <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                            <p class="font-light text-secondosiblue">Unlimited QR Code Scans</p>
+                        </div>
+                        <div class="flex justify-start items-center gap-2 py-1">
+                            <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                            <p class="font-light text-secondosiblue">Unlimited Menu Editing</p>
+                        </div>
+                        <div class="flex justify-start items-center gap-2 py-1">
+                            <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                            <p class="font-light text-secondosiblue">No Ads</p>
                         </div>
                     </div>
                 </div>
@@ -84,8 +96,7 @@
                     <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Standard</p>
 
                     <div class="w-full flex flex-col justify-center items-center">
-                        <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$89</p>
-                        <p class="text-gray-500">monthly/restaurant</p>
+                        <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$7/month</p>
                     </div>
 
                     {% if not active_order_item_standard %}
@@ -106,36 +117,49 @@
                         <div class="w-full flex flex-col">
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-semibold text-secondosiblue">Online Ordering (75 Orders)</p>
+                                <p class="font-semibold text-secondosiblue">1 Restaurant</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Tableside Ordering</p>
+                                <p class="font-light text-secondosiblue">Unlimited Branches</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Table Reservations</p>
+                                <p class="font-light text-secondosiblue">Unlimed Items per Category</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Premium Website Templates</p>
+                                <p class="font-light text-secondosiblue">Unlimited Personalized Digital Menus</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Email & SMS marketing</p>
+                                <p class="font-light text-secondosiblue">Unlimited Digital Menu Templates</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Coupons & Promo Codes</p>
+                                <p class="font-light text-secondosiblue">Unlimited PDF Menus</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Integrations</p>
+                                <p class="font-light text-secondosiblue">Menu QR Code</p>
                             </div>
                             <div class="flex justify-start items-center gap-2 py-1">
                                 <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                                <p class="font-light text-secondosiblue">Ordering for the future</p>
+                                <p class="font-light text-secondosiblue">Unlimited QR Code Scans</p>
                             </div>
+                            <div class="flex justify-start items-center gap-2 py-1">
+                                <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                                <p class="font-light text-secondosiblue">Unlimited Menu Editing</p>
+                            </div>
+                            <div class="flex justify-start items-center gap-2 py-1">
+                                <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                                <p class="font-light text-secondosiblue">No Ads</p>
+                            </div>
+                            <div class="flex justify-start items-center gap-2 py-1">
+                                <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                                <p class="font-light text-secondosiblue">Remove ‘Powered by Ositcom'</p>
+                            </div>
+                            
                         </div>
                     </div>
                 </div>
@@ -146,8 +170,7 @@
                 <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Premium</p>
 
                 <div class="w-full flex flex-col justify-center items-center">
-                    <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$169</p>
-                    <p class="text-gray-500">monthly/restaurant</p>
+                    <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$24/month</p>
                 </div>
 
                 {% if not active_order_item_premium %}
@@ -168,35 +191,47 @@
                     <div class="w-full flex flex-col">
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-semibold text-secondosiblue">Online Ordering (Unlimited)</p>
+                            <p class="font-semibold text-secondosiblue">5 Restaurants</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Marketing Automation</p>
+                            <p class="font-light text-secondosiblue">Unlimited Branches</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Gift Cards</p>
+                            <p class="font-light text-secondosiblue">Unlimed Items per Category</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Inventory</p>
+                            <p class="font-light text-secondosiblue">Unlimited Personalized Digital Menus</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Item Recommendations</p>
+                            <p class="font-light text-secondosiblue">Unlimited Digital Menu Templates</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Multiple Menus</p>
+                            <p class="font-light text-secondosiblue">Unlimited PDF Menus</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">Remove ‘Powered by UpMenu’</p>
+                            <p class="font-light text-secondosiblue">Menu QR Code</p>
                         </div>
                         <div class="flex justify-start items-center gap-2 py-1">
                             <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
-                            <p class="font-light text-secondosiblue">API</p>
+                            <p class="font-light text-secondosiblue">Unlimited QR Code Scans</p>
+                        </div>
+                        <div class="flex justify-start items-center gap-2 py-1">
+                            <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                            <p class="font-light text-secondosiblue">Unlimited Menu Editing</p>
+                        </div>
+                        <div class="flex justify-start items-center gap-2 py-1">
+                            <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                            <p class="font-light text-secondosiblue">No Ads</p>
+                        </div>
+                        <div class="flex justify-start items-center gap-2 py-1">
+                            <img src="{% static 'images/icons/greencheckmark.png' %}" class="w-[20px]">
+                            <p class="font-light text-secondosiblue">Remove ‘Powered by Ositcom'</p>
                         </div>
                     </div>
                 </div>