Merge branch 'production' of https://bitbucket.org/altafixco/indoteknik-addons into production

1 files changed, 14 insertions, 7 deletions

diff --git a/indoteknik_api/controllers/api_v1/product.py b/indoteknik_api/controllers/api_v1/product.py
index 7ec6459b..e08ec97b 100644
--- a/indoteknik_api/controllers/api_v1/product.py
+++ b/indoteknik_api/controllers/api_v1/product.py
@@ -29,6 +29,12 @@ class Product(controller.Controller):
         qty = 0
         sla_date = '-'
 
+        # Qty Stock Vendor
+        qty_vendor = stock_vendor.quantity
+        qty_vendor -= int(qty_vendor * 0.1)
+        qty_vendor = math.ceil(float(qty_vendor))
+        total_excell = qty_vendor
+
         is_altama_product = product.x_manufacture.id in [10,122,89]
         if is_altama_product:
             try:
@@ -37,11 +43,7 @@ class Product(controller.Controller):
                 qty_altama -= int(qty_altama * 0.1)
                 qty_altama = math.ceil(float(qty_altama))
                 total_adem = qty_altama 
-                # Qty Stock Vendor
-                qty_vendor = stock_vendor.quantity
-                qty_vendor -= int(qty_vendor * 0.1)
-                qty_vendor = math.ceil(float(qty_vendor))
-                total_excell = qty_vendor
+                
                 if qty_available > 0:
                     qty = qty_available + total_adem + total_excell
                     sla_date = '1 Hari'
@@ -53,8 +55,13 @@ class Product(controller.Controller):
             except:
                 print('error')
         else:
-            qty = qty_available
-            sla_date = product_sla.sla or '-'
+            if qty_available > 0:
+                qty = qty_available
+                sla_date = product_sla.sla or '-'
+            elif qty_vendor > 0:    
+                qty = total_excell
+                sla_date = '2-4 Hari'
+                
 
         data = {
             'qty': qty,