inventory/views.py

@@ -9368,7 +9368,6 @@ def payment_callback(request, dealer_slug):
     history = models.PaymentHistory.objects.filter(transaction_id=payment_id).first()
     payment_status = request.GET.get("status")
     order = Order.objects.filter(user=dealer.user, status=1).first()  # Status 1 = NEW
-    print(order)
     if payment_status == "paid":
         billing_info, created = BillingInfo.objects.get_or_create(
             user=dealer.user,
@@ -9381,27 +9380,19 @@ def payment_callback(request, dealer_slug):
                 'country': dealer.entity.country or " ",
             }
         )
-        if not hasattr(order.user, 'userplan'):
-            UserPlan.objects.create(
-                user=order.user,
-                plan=order.plan,
-                expire=datetime.now().date() + timedelta(days=order.get_plan_pricing().pricing.period)
-            )
 
         try:
-
-            # if order.user.userplan:
-            #     user = order.user
-            #     pricing = order.get_plan_pricing().pricing
-
-            #     logger.info(f"Processing order completion for {user} - upgrading to {order.plan}")
-            #     user.userplan.plan = order.plan
-            #     user.userplan.expire = datetime.now() + timedelta(days=pricing.period)
-            #     user.userplan.save()
-            #     user.save()
-            #     logger.info(f"User {user} upgraded to {order.plan} plan successfully")
-
             order.complete_order()
+            user = order.user
+            pricing = order.get_plan_pricing().pricing
+
+            logger.info(f"Processing order completion for {user} - upgrading to {order.plan}")
+            user.userplan.plan = order.plan
+            user.userplan.expire = datetime.now() + timedelta(days=pricing.period)
+            user.userplan.save()
+            user.save()
+            logger.info(f"User {user} upgraded to {order.plan} plan successfully")
+
             history.status = "paid"
             history.save()
 

templates/sales/estimates/estimate_list.html

@@ -79,7 +79,7 @@
 
     {% else %}
        {% url "estimate_create" request.dealer.slug as create_estimate_url %}
-      {% include "empty-illustration-page.html" with value="estimate" url=create_estimate_url  %}  
+      {% include "empty-illustration-page.html" with value="estimate" url=create_estimate_url image='images/no_content/no_estimate.jpg' %}  
 
     {% endif %}
 {% endblock %}

templates/users/user_list.html

@@ -83,8 +83,8 @@
 
     {% else %} 
                 {% if request.user.userplan %}
-                    {% url "user_create" request.dealer.slug as create_staff_url  %}    
+                    {% url "user_create" request.dealer.slug as create_staff_url image="images/no_content/no_user.png" %}    
-                    {% include "empty-illustration-page.html" with value="staff" url=create_staff_url image="images/no_content/no_user.png"%}
+                    {% include "empty-illustration-page.html" with value="staff" url=create_staff_url %}
 
                 {% else %}
                             {% url "pricing_page" request.dealer.slug as pricing_page_url %}