new

osinaweb/customercore/payment/views.py

@@ -199,6 +199,7 @@ def check_order_status(request, merchant_id, order_id):
     api_password = '549c33e1bc4aea6fcf96f9943e6c0256'
     url = f"https://creditlibanais-netcommerce.gateway.mastercard.com/api/rest/version/78/merchant/{merchant_id}/order/{order_id}"
     order = Order.objects.get(order_id=order_id)
+    payment = get_object_or_404(PaymentType, name='Online Payment')
 
     headers = {
         'Content-Type': 'application/json',
@@ -216,6 +217,12 @@ def check_order_status(request, merchant_id, order_id):
                     status = 'Completed',
                     date = datetime.now()
                 )
+                OrderPayment.objects.create(
+                    order = order,
+                    amount = order.get_cart_total,
+                    date_paid =  datetime.now(),
+                    type = payment,
+                )
                 order_items = OrderItem.objects.filter(order=order)
                 for order_item in order_items:
                     order_item.purchased_at = datetime.now()

osinaweb/customercore/templates/details_templates/inner-customer-order.html

@@ -26,10 +26,11 @@
             <p class="text-secondosiblue font-poppinsBold">Remaining Balance: $<span>{{order.remaining_balance}}</span></p>
         </div>
 
+        {% if order.invoice %}
         <div
             class="w-full bg-gray-50 px-3 py-3 border border-gray-100 shadow-md rounded-md flex flex-col md:flex-row justify-end items-center gap-2 mt-3">
             {% if order.invoice %}
-            <a class="w-full md:w-fit">
+            <a href="{% url 'addinvoice' order.id %}" class="w-full md:w-fit">
                 <button
                     class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">
                     Download Invoice
@@ -37,13 +38,16 @@
             </a>
             {% endif %}
 
-            <a class="w-full md:w-fit">
+            {% if order.invoice %}
+            <a href="{% url 'addpayment' order.id %}" class="w-full md:w-fit">
                 <button 
                     class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">
                     Download Statement
                 </button>
             </a>
+            {% endif %}
         </div>
+        {% endif %}
 
 
         {% if order_items %}
@@ -69,6 +73,8 @@
         {% endif %}
 
 
+
+        {% if payments %}
             <div class="overflow-x-auto border border-gray-300 rounded-t-md mt-10 tableContainer">
                 <table class="min-w-full divide-y">
                     <!-- TABLE HEADER -->
@@ -145,6 +151,7 @@
                     </tbody>
                 </table>
             </div>
+        {% endif %}
     </div>
 </div>
 

osinaweb/customercore/templates/payment_pages/buy-now.html

@@ -55,10 +55,6 @@
                             {% endfor %}
                         </select>
 
-                        {% if item.item_type.name == 'cPanel' %}
-                        <input type="text" class="w-full bg-white border border-gray-200 rounded-md px-3 py-3 outline-none"
-                            placeholder="Enter your IP">
-                        {% endif %}
                     </div>
                 </div>