From 49846bc78d282516092c6c63db63d4ea01d42949 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 13 Nov 2023 15:31:43 +0700 Subject: remove divide tax while flashsale --- indoteknik_api/models/product_product.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indoteknik_api') diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py index aa9e0ad7..1db58d8e 100644 --- a/indoteknik_api/models/product_product.py +++ b/indoteknik_api/models/product_product.py @@ -273,7 +273,8 @@ class ProductProduct(models.Model): base_price = 0 if base_pricelist: - base_price = base_pricelist.computed_price / 1.11 + base_price = base_pricelist.computed_price + # base_price = base_pricelist.computed_price / 1.11 discount = 0 price_flashsale = 0 -- cgit v1.2.3 From 132d4b80f3d5dad792468bd14961f6a9540122e2 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 15 Nov 2023 10:32:25 +0700 Subject: add new role for wms and fix bug delete reconcile --- indoteknik_api/controllers/api_v1/user.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indoteknik_api') diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py index 7a522d0c..2b297e5d 100644 --- a/indoteknik_api/controllers/api_v1/user.py +++ b/indoteknik_api/controllers/api_v1/user.py @@ -42,9 +42,17 @@ class User(controller.Controller): uid = request.session.authenticate( config.get('db_name'), email, password) user = request.env['res.users'].browse(uid) + role = [] + if user.is_inbound and user.is_outbound: + role.append('admin') + elif user.is_outbound: + role.append('outbound') + elif user.is_inbound: + role.append('inbound') data = { 'is_auth': True, - 'user': self.response_with_token(user) + 'role': role, + 'user': self.response_with_token(user), } return self.response(data) except: -- cgit v1.2.3