Merge branch 'production' into iman/pengajuan-tempo

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

4 files changed, 38 insertions, 4 deletions

diff --git a/indoteknik_api/controllers/api_v1/cart.py b/indoteknik_api/controllers/api_v1/cart.py
index 2a24b205..7a40b1e2 100644
--- a/indoteknik_api/controllers/api_v1/cart.py
+++ b/indoteknik_api/controllers/api_v1/cart.py
@@ -46,8 +46,25 @@ class Cart(controller.Controller):
     def get_cart_count_by_user_id(self, user_id, **kw):
         user_id = int(user_id)
         query = [('user_id', '=', user_id)]
-        carts = request.env['website.user.cart'].search_count(query)
-        return self.response(carts)
+        carts = request.env['website.user.cart'].search(query)
+        products_active = []
+        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_active.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_active.append(programs)
+        return self.response(len(products_active))
     
     @http.route(PREFIX_USER + 'cart/create-or-update', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized(private=True, private_key='user_id')
diff --git a/indoteknik_api/controllers/api_v1/product.py b/indoteknik_api/controllers/api_v1/product.py
index 9673b3ef..b68eb0f9 100644
--- a/indoteknik_api/controllers/api_v1/product.py
+++ b/indoteknik_api/controllers/api_v1/product.py
@@ -96,6 +96,21 @@ class Product(controller.Controller):
 
         return self.response(data, headers=[('Cache-Control', 'max-age=600, private')])
 
+    @http.route(prefix + 'product_variant/<id>/qty_available', auth='public', methods=['GET', 'OPTIONS'])
+    @controller.Controller.must_authorized()
+    def get_product_variant_stock_available_by_id(self, **kw):
+        id = int(kw.get('id'))
+        product = request.env['product.product'].search(
+            [('id', '=', id)], limit=1)
+
+        qty_available = product.free_qty
+
+        data = {
+            'qty': qty_available,
+        }
+
+        return self.response(data, headers=[('Cache-Control', 'max-age=600, private')])
+
     @http.route(prefix + 'product/template/price/<id>', auth='public', methods=['GET', 'OPTIONS'])
     def get_product_template_price_by_id(self, **kw):
         if not self.authenticate():
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index e7664c79..3e182a2e 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -446,7 +446,8 @@ class SaleOrder(controller.Controller):
                     'company_id': 1,
                     'order_id': sale_order.id,
                     'product_id': cart['id'],
-                    'product_uom_qty': cart['quantity']
+                    'product_uom_qty': cart['quantity'],
+                    'product_available_quantity': cart['available_quantity']
                 })
                 order_line.product_id_change()
                 order_line.onchange_vendor_id()
@@ -463,6 +464,7 @@ class SaleOrder(controller.Controller):
         
         if len(promotions) > 0:
             sale_order.apply_promotion_program()
+            sale_order.add_free_product(promotions)
 
         voucher_code = params['value']['voucher']
         voucher = request.env['voucher'].search([('code', '=', voucher_code),('apply_type', 'in', ['all', 'brand'])], limit=1)
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index f0c7456d..ea8c6400 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -123,7 +123,7 @@ class StockPicking(controller.Controller):
 
         params = {'sj_documentation': sj_document,
                   'paket_documentation': paket_document,
-                  'driver_arrival_date': self.time_to_str(datetime.utcnow(), '%Y-%m-%d %H:%M:%S'),
+                  'driver_arrival_date': datetime.utcnow(),
                   }
 
         picking_data = request.env['stock.picking'].search([('picking_code', '=', picking_code)], limit=1)