From 1f58d7d4973edf04d6a3f3092115492585c1545b Mon Sep 17 00:00:00 2001 From: Miqdad Date: Tue, 30 Sep 2025 08:09:02 +0700 Subject: Need approval logistic when IU from BU/Stock --- indoteknik_api/controllers/api_v1/stock_picking.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index a4a9cf80..7f878ad2 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -136,16 +136,15 @@ class StockPicking(controller.Controller): } dispatch_emails = { 'rahmat.afiudin@gmail.com', - 'it@fixcomart.co.id' + 'indraprtama60@gmail.com' } login = (request.env.user.login or '').lower() is_dispatch_user = login in dispatch_emails is_driver_user = (login in driver_emails) and not is_dispatch_user - # ===== Validasi minimal ===== - if not sj_document or not paket_document: - return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login) + # if not sj_document or not paket_document: + # return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login) # if is_dispatch_user and not dispatch_document and not is_driver_user: # return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login) -- cgit v1.2.3 From eb8a67a33b4b8abd574f737bc5727ffdb5b18b99 Mon Sep 17 00:00:00 2001 From: Miqdad Date: Wed, 1 Oct 2025 17:12:48 +0700 Subject: remove email mapping --- indoteknik_api/controllers/api_v1/stock_picking.py | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index 7f878ad2..deb92a50 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -129,20 +129,6 @@ class StockPicking(controller.Controller): paket_document = kw.get('paket_document', False) dispatch_document = kw.get('dispatch_document', False) - # ===== Role by EMAIL ===== - driver_emails = { - 'driverindoteknik@gmail.com', - 'sulistianaridwan8@gmail.com', - } - dispatch_emails = { - 'rahmat.afiudin@gmail.com', - 'indraprtama60@gmail.com' - } - - login = (request.env.user.login or '').lower() - is_dispatch_user = login in dispatch_emails - is_driver_user = (login in driver_emails) and not is_dispatch_user - # if not sj_document or not paket_document: # return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login) -- cgit v1.2.3 From 50d5643a2c4a7b245b37f8ca0dd4fc5383e61d4e Mon Sep 17 00:00:00 2001 From: Miqdad Date: Thu, 2 Oct 2025 08:22:30 +0700 Subject: vals SP doc --- indoteknik_api/controllers/api_v1/stock_picking.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index deb92a50..2ec1ec2a 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -125,15 +125,9 @@ class StockPicking(controller.Controller): @http.route(prefix + 'stock-picking//documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False) @controller.Controller.must_authorized() def write_partner_stock_picking_documentation(self, scanid, **kw): - sj_document = kw.get('sj_document', False) - paket_document = kw.get('paket_document', False) - dispatch_document = kw.get('dispatch_document', False) - - # if not sj_document or not paket_document: - # return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login) - - # if is_dispatch_user and not dispatch_document and not is_driver_user: - # return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login) + sj_document = kw.get('sj_document') if 'sj_document' in kw else None + paket_document = kw.get('paket_document') if 'paket_document' in kw else None + dispatch_document = kw.get('dispatch_document') if 'dispatch_document' in kw else None # ===== Cari picking by id / picking_code ===== picking_data = False @@ -147,10 +141,12 @@ class StockPicking(controller.Controller): return self.response(code=403, description='picking not found') params = { - 'sj_documentation': sj_document, - 'paket_documentation': paket_document, 'driver_arrival_date': datetime.utcnow(), } + if sj_document: + params['sj_documentation'] = sj_document + if paket_document: + params['paket_documentation'] = paket_document if dispatch_document: params['dispatch_documentation'] = dispatch_document -- cgit v1.2.3 From 35d01765f9b925467b6ac20d2ff83c81f49e4d3e Mon Sep 17 00:00:00 2001 From: Miqdad Date: Thu, 2 Oct 2025 16:03:44 +0700 Subject: fix cannot apply voucher when cart has promotion item --- indoteknik_api/controllers/api_v1/sale_order.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 1a75c830..25268856 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -808,6 +808,14 @@ class SaleOrder(controller.Controller): sale_order.apply_promotion_program() sale_order.add_free_product(promotions) + # Pastikan baris hasil promo/bonus ditandai supaya bisa di-skip voucher + promo_lines = sale_order.order_line.filtered( + lambda l: getattr(l, 'order_promotion_id', False) or (l.price_unit or 0.0) == 0.0 + ) + if promo_lines: + promo_lines.write({'is_has_disc': True}) + _logger.info(f"[PROMO_MARK] Marked {len(promo_lines)} promo/free lines as is_has_disc=True") + voucher_code = params['value']['voucher'] if voucher_code: _logger.info(f"Processing voucher: {voucher_code}") @@ -816,7 +824,7 @@ class SaleOrder(controller.Controller): voucher_shipping = request.env['voucher'].search( [('code', '=', voucher_code), ('apply_type', 'in', ['shipping'])], limit=1) - if voucher and len(promotions) == 0: + if voucher: _logger.info("Applying regular voucher") sale_order.voucher_id = voucher.id sale_order.apply_voucher() -- cgit v1.2.3