Merge branch 'production' into iman/new-register

# Conflicts:
#	indoteknik_custom/models/res_users.py

1 files changed, 20 insertions, 2 deletions

diff --git a/indoteknik_api/controllers/api_v1/cart.py b/indoteknik_api/controllers/api_v1/cart.py
index f472a9b0..2a24b205 100644
--- a/indoteknik_api/controllers/api_v1/cart.py
+++ b/indoteknik_api/controllers/api_v1/cart.py
@@ -16,10 +16,28 @@ class Cart(controller.Controller):
         offset = int(kw.get('offset', 0))
         query = [('user_id', '=', user_id)]
         carts = user_cart.search(query, limit=limit, offset=offset, order='create_date desc')
-        carts.write({'source': 'add_to_cart'})
+        # carts.write({'source': 'add_to_cart'})
+        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:
+                    product =  cart.with_context(price_for="web").get_products()
+                    for product_active in product:
+                        products.append(product_active)
+                else:
+                    product_inactives = cart.with_context(price_for="web").get_products()
+                    for inactives in product_inactives:
+                        products_inactive.append(inactives)
+            else:
+                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': carts.with_context(price_for="web").get_products()
+            'products': products,
+            'products_inactive': products_inactive
         }
         return self.response(data)