From 57b12c36df829ab358a68a5356c3549cf9714900 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Thu, 16 Feb 2023 13:49:18 +0700 Subject: add wati notification handle --- indoteknik_api/controllers/api_v1/__init__.py | 1 + indoteknik_api/controllers/api_v1/wati.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 indoteknik_api/controllers/api_v1/wati.py (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/__init__.py b/indoteknik_api/controllers/api_v1/__init__.py index 63540928..df89fcaf 100644 --- a/indoteknik_api/controllers/api_v1/__init__.py +++ b/indoteknik_api/controllers/api_v1/__init__.py @@ -20,3 +20,4 @@ from . import brand_homepage from . import customer from . import content from . import midtrans +from . import wati diff --git a/indoteknik_api/controllers/api_v1/wati.py b/indoteknik_api/controllers/api_v1/wati.py new file mode 100644 index 00000000..009ea244 --- /dev/null +++ b/indoteknik_api/controllers/api_v1/wati.py @@ -0,0 +1,18 @@ +from .. import controller +from odoo import http +from odoo.http import request +import json + + +class Wati(controller.Controller): + prefix = '/api/v1/' + + @http.route(prefix + 'wati/notification', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS']) + def notification(self, **kw): + json_raw = json.loads(request.httprequest.data) + + request.env['wati.notification'].create([{ + 'json_raw': json_raw + }]) + + return -- cgit v1.2.3 From 895a2e9ae261a6e11ae5673f0694165919edc6e7 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Thu, 16 Feb 2023 13:57:28 +0700 Subject: json dump wati --- indoteknik_api/controllers/api_v1/wati.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/wati.py b/indoteknik_api/controllers/api_v1/wati.py index 009ea244..01b32653 100644 --- a/indoteknik_api/controllers/api_v1/wati.py +++ b/indoteknik_api/controllers/api_v1/wati.py @@ -10,9 +10,10 @@ class Wati(controller.Controller): @http.route(prefix + 'wati/notification', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS']) def notification(self, **kw): json_raw = json.loads(request.httprequest.data) + json_dump = json.dumps(json_raw, indent=4, sort_keys=True) request.env['wati.notification'].create([{ - 'json_raw': json_raw + 'json_raw': json_dump }]) return -- cgit v1.2.3 From dc44e019784e18f34bb84a86640793efd3daca17 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Thu, 16 Feb 2023 15:13:53 +0700 Subject: bug fix wati --- indoteknik_api/controllers/api_v1/wati.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/wati.py b/indoteknik_api/controllers/api_v1/wati.py index 01b32653..68ff1640 100644 --- a/indoteknik_api/controllers/api_v1/wati.py +++ b/indoteknik_api/controllers/api_v1/wati.py @@ -13,7 +13,8 @@ class Wati(controller.Controller): json_dump = json.dumps(json_raw, indent=4, sort_keys=True) request.env['wati.notification'].create([{ - 'json_raw': json_dump + 'json_raw': json_dump, + 'is_lead': False }]) return -- cgit v1.2.3 From 4a7d62d40a47ae894e2e22171105332ada9516ee Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 20 Feb 2023 09:52:14 +0700 Subject: add date order in midtrans --- indoteknik_api/controllers/api_v1/sale_order.py | 1 + 1 file changed, 1 insertion(+) (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 1c67d6c5..e140605c 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -37,6 +37,7 @@ class SaleOrder(controller.Controller): 'id': sale.id, 'name': sale.name, 'amount_total': sale.amount_total, + 'date_order': sale.date_order, 'state': sale.state, 'product_name': product_name, 'product_not_in_id': product_not_in_id, -- cgit v1.2.3 From 28a205be163323cfad8596bbbcf0d1f7b3e4b993 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 20 Feb 2023 10:48:33 +0700 Subject: fix error date conversion to str --- indoteknik_api/controllers/api_v1/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 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 84c34a7d..f6c6faa5 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -37,7 +37,7 @@ class SaleOrder(controller.Controller): 'id': sale.id, 'name': sale.name, 'amount_total': sale.amount_total, - 'date_order': sale.date_order, + 'date_order': self.time_to_str(sale.date_order, '%d/%m/%Y %H:%M:%S'), 'state': sale.state, 'product_name': product_name, 'product_not_in_id': product_not_in_id, -- cgit v1.2.3 From b9cf801ad8334fe1b5be7b13b5d0483303c297c7 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 20 Feb 2023 11:29:15 +0700 Subject: add details in sale order api midtrans --- indoteknik_api/controllers/api_v1/sale_order.py | 1 + 1 file changed, 1 insertion(+) (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 f6c6faa5..727d49b7 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -41,6 +41,7 @@ class SaleOrder(controller.Controller): 'state': sale.state, 'product_name': product_name, 'product_not_in_id': product_not_in_id, + 'details': [request.env['sale.order.line'].api_single_response(x, context='with_detail') for x in sale.order_line] }) return self.response(data) -- cgit v1.2.3 From e4cd78fc169df2ad092023ab5ffda3fa639d8704 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 20 Feb 2023 11:32:01 +0700 Subject: add amount --- indoteknik_api/controllers/api_v1/sale_order.py | 3 +++ 1 file changed, 3 insertions(+) (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 727d49b7..4d27312e 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -39,6 +39,9 @@ class SaleOrder(controller.Controller): 'amount_total': sale.amount_total, 'date_order': self.time_to_str(sale.date_order, '%d/%m/%Y %H:%M:%S'), 'state': sale.state, + 'amount_untaxed': sale.amount_untaxed, + 'amount_tax': sale.amount_tax, + 'amount_total': sale.amount_total, 'product_name': product_name, 'product_not_in_id': product_not_in_id, 'details': [request.env['sale.order.line'].api_single_response(x, context='with_detail') for x in sale.order_line] -- cgit v1.2.3 From 30548ae7462eebbf28ffad5398d0510541f462c0 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 20 Feb 2023 11:34:12 +0700 Subject: remove duplicate --- indoteknik_api/controllers/api_v1/sale_order.py | 1 - 1 file changed, 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 4d27312e..15dcf0ba 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -36,7 +36,6 @@ class SaleOrder(controller.Controller): data.append({ 'id': sale.id, 'name': sale.name, - 'amount_total': sale.amount_total, 'date_order': self.time_to_str(sale.date_order, '%d/%m/%Y %H:%M:%S'), 'state': sale.state, 'amount_untaxed': sale.amount_untaxed, -- cgit v1.2.3 From 78e791eb0c0d28a02fd4417d5d0761066c271c86 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Tue, 21 Feb 2023 10:51:53 +0700 Subject: refactor function notification in midtrans, complicated with wati --- indoteknik_api/controllers/api_v1/midtrans.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/midtrans.py b/indoteknik_api/controllers/api_v1/midtrans.py index fdc801d3..2adf3c50 100644 --- a/indoteknik_api/controllers/api_v1/midtrans.py +++ b/indoteknik_api/controllers/api_v1/midtrans.py @@ -8,7 +8,7 @@ class Midtrans(controller.Controller): prefix = '/api/v1/' @http.route(prefix + 'midtrans/notification', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS']) - def notification(self, **kw): + def midtrans_notification(self, **kw): json_raw = json.loads(request.httprequest.data) trx_status = json.loads(request.httprequest.data)['transaction_status'] order_no = json.loads(request.httprequest.data)['order_id'] -- cgit v1.2.3 From 093b0160a1f6146e93cb0294341d65dcee707d9c Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Tue, 21 Feb 2023 10:59:31 +0700 Subject: only save withour parsing data json in midtrans notification --- indoteknik_api/controllers/api_v1/midtrans.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/midtrans.py b/indoteknik_api/controllers/api_v1/midtrans.py index 2adf3c50..d5c91cb4 100644 --- a/indoteknik_api/controllers/api_v1/midtrans.py +++ b/indoteknik_api/controllers/api_v1/midtrans.py @@ -10,17 +10,18 @@ class Midtrans(controller.Controller): @http.route(prefix + 'midtrans/notification', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS']) def midtrans_notification(self, **kw): json_raw = json.loads(request.httprequest.data) - trx_status = json.loads(request.httprequest.data)['transaction_status'] - order_no = json.loads(request.httprequest.data)['order_id'] + json_dump = json.dumps(json_raw, indent=4, sort_keys=True) + # trx_status = json.loads(request.httprequest.data)['transaction_status'] + # order_no = json.loads(request.httprequest.data)['order_id'] - query = [('name', '=', order_no)] - order = request.env['sale.order'].sudo().search(query, limit=1) - order.payment_status = trx_status + # query = [('name', '=', order_no)] + # order = request.env['sale.order'].sudo().search(query, limit=1) + # order.payment_status = trx_status request.env['midtrans.notification'].create([{ - 'sale_order_id': order.id, - 'json_raw': json_raw, - 'payment_status': trx_status, + # 'sale_order_id': order.id, + 'json_raw': json_dump, + # 'payment_status': trx_status, }]) return -- cgit v1.2.3 From b9eddb17ac8eeed2b8af734844bb1149ec4184eb Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Tue, 21 Feb 2023 14:29:50 +0700 Subject: change json raw to json dump in midtrans recurring and payaccount --- indoteknik_api/controllers/api_v1/midtrans.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indoteknik_api/controllers/api_v1') diff --git a/indoteknik_api/controllers/api_v1/midtrans.py b/indoteknik_api/controllers/api_v1/midtrans.py index d5c91cb4..49ebce0f 100644 --- a/indoteknik_api/controllers/api_v1/midtrans.py +++ b/indoteknik_api/controllers/api_v1/midtrans.py @@ -29,15 +29,17 @@ class Midtrans(controller.Controller): @http.route(prefix + 'midtrans/recurring', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS']) def recurring(self, **kw): json_raw = json.loads(request.httprequest.data) + json_dump = json.dumps(json_raw, indent=4, sort_keys=True) request.env['midtrans.recurring'].create([{ - 'json_raw': json_raw, + 'json_raw': json_dump, }]) return @http.route(prefix + 'midtrans/payaccount', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS']) def payaccount(self, **kw): json_raw = json.loads(request.httprequest.data) + json_dump = json.dumps(json_raw, indent=4, sort_keys=True) request.env['midtrans.account'].create([{ - 'json_raw': json_raw, + 'json_raw': json_dump, }]) return \ No newline at end of file -- cgit v1.2.3