Merge branch 'production' into unreserved_permission

# Conflicts:
#	indoteknik_api/controllers/api_v1/cart.py
#	indoteknik_custom/models/sale_order.py

1 files changed, 16 insertions, 13 deletions

diff --git a/indoteknik_api/controllers/api_v1/cart.py b/indoteknik_api/controllers/api_v1/cart.py
index a2fd6286..6bbb812c 100644
--- a/indoteknik_api/controllers/api_v1/cart.py
+++ b/indoteknik_api/controllers/api_v1/cart.py
@@ -17,25 +17,28 @@ class Cart(controller.Controller):
         query = [('user_id', '=', user_id)]
         carts = user_cart.search(query, limit=limit, offset=offset, order='create_date desc')
         carts.write({'source': 'add_to_cart'})
-        data = []
+        products = []
+        products_inactive = []
         for cart in carts:
             if cart.product_id:
                 price = cart.product_id._v2_get_website_price_include_tax()
                 if cart.product_id.active and price > 0:
-                    data.append({
-                        'products': cart.with_context(price_for="web").get_products()
-                    })
+                    product =  cart.with_context(price_for="web").get_products()
+                    for product_active in product:
+                        products.append(product_active)
                 else:
-                    data.append({
-                        'product_inactive': cart.with_context(price_for="web").get_products()
-                    })
+                    product_inactives = cart.with_context(price_for="web").get_products()
+                    for inactives in product_inactives:
+                        products_inactive.append(inactives)
             else:
-                data.append({
-                    'products': cart.with_context(price_for="web").get_products()
-                })
-        data.append({
-            'product_total': user_cart.search_count(query)
-        })
+                program =  cart.with_context(price_for="web").get_products()
+                for programs in program:
+                    products.append(programs)
+        data = {
+            'product_total': user_cart.search_count(query),
+            'products': products,
+            'products_inactive': products_inactive
+        }
         return self.response(data)
     
     @http.route(PREFIX_USER + 'cart/count', auth='public', methods=['GET', 'OPTIONS'])