From d416d5b06fbc4cb7b9c5c2ee2bf2b356faad3fe9 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Fri, 28 Feb 2025 15:34:10 +0700 Subject: add status --- indoteknik_api/controllers/api_v1/sale_order.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (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 a7e027c8..b73798b0 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -85,7 +85,8 @@ class SaleOrder(controller.Controller): 'site': [], 'limit': ['default:0', 'number'], 'offset': ['default:0', 'number'], - 'context': [] + 'context': [], + 'status': [] }) limit = params['value']['limit'] offset = params['value']['offset'] @@ -116,7 +117,23 @@ class SaleOrder(controller.Controller): domain += [ ('partner_id.site_id.name', 'ilike', '%' + site + '%') ] - + if params['value']['status']: + if params['value']['status'] == 'quotation': + domain += [('state', '=', 'draft')] + elif params['value']['status'] == 'cancel': + domain += [('state', '=', 'cancel')] + elif params['value']['status'] == 'diterima': + domain += [('state', '=', 'draft')] + domain += [('is_continue_transaction', '=', True)] + domain += [('approval_status', 'in', ['pengajuan1', 'pengajuan2'])] + elif params['value']['status'] == 'diproses': + domain += [('state', '=', 'sale')] + domain += [('picking_ids.state', 'in', ['draft', 'waiting', 'confirmed', 'assigned'])] + elif params['value']['status'] == 'dikirim': + domain += [('state', '=', 'sale')] + domain += [('picking_ids.state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned', 'cancel'])] + elif params['value']['status'] == 'selesai': + domain += [('state', '=', 'done')] sale_orders = request.env['sale.order'].search( domain, offset=offset, limit=limit) data = { -- cgit v1.2.3 From bfb7d3b45bbf780fa77b9abc8a0f1860a50da57c Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 3 Mar 2025 16:38:40 +0700 Subject: update code --- 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 b73798b0..8723c738 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -124,7 +124,7 @@ class SaleOrder(controller.Controller): domain += [('state', '=', 'cancel')] elif params['value']['status'] == 'diterima': domain += [('state', '=', 'draft')] - domain += [('is_continue_transaction', '=', True)] + # domain += [('is_continue_transaction', '=', True)] domain += [('approval_status', 'in', ['pengajuan1', 'pengajuan2'])] elif params['value']['status'] == 'diproses': domain += [('state', '=', 'sale')] -- cgit v1.2.3 From d7285a4c58256bbadcdd72dc5afbba2cc0b2b491 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 10 Mar 2025 11:21:30 +0700 Subject: add sort filter --- indoteknik_api/controllers/api_v1/sale_order.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (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 5914a23c..bf03e04d 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -86,7 +86,8 @@ class SaleOrder(controller.Controller): 'limit': ['default:0', 'number'], 'offset': ['default:0', 'number'], 'context': [], - 'status': [] + 'status': [], + 'sort': [], }) limit = params['value']['limit'] offset = params['value']['offset'] @@ -117,6 +118,7 @@ class SaleOrder(controller.Controller): domain += [ ('partner_id.site_id.name', 'ilike', '%' + site + '%') ] + if params['value']['status']: if params['value']['status'] == 'quotation': domain += [('state', '=', 'draft')] @@ -134,8 +136,18 @@ class SaleOrder(controller.Controller): domain += [('picking_ids.state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned', 'cancel'])] elif params['value']['status'] == 'selesai': domain += [('state', '=', 'done')] + + # Sorting + order = None + if params['value']['sort']: + if params['value']['sort'] == 'asc': + order = 'amount_total asc' + elif params['value']['sort'] == 'desc': + order = 'amount_total desc' + sale_orders = request.env['sale.order'].search( - domain, offset=offset, limit=limit) + domain, offset=offset, limit=limit, order=order) + data = { 'sale_order_total': request.env['sale.order'].search_count(domain), 'sale_orders': [request.env['sale.order'].api_v1_single_response(x) for x in sale_orders] -- cgit v1.2.3 From 61fc24442212691483873fa85dc3eacad8b253be Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 12 Mar 2025 09:38:53 +0700 Subject: fix transaction --- indoteknik_api/controllers/api_v1/sale_order.py | 15 +++++++++++++++ 1 file changed, 15 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 bf03e04d..3219fc07 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -88,6 +88,8 @@ class SaleOrder(controller.Controller): 'context': [], 'status': [], 'sort': [], + 'startDate': [], + 'endDate': [], }) limit = params['value']['limit'] offset = params['value']['offset'] @@ -145,6 +147,19 @@ class SaleOrder(controller.Controller): elif params['value']['sort'] == 'desc': order = 'amount_total desc' + # Filter berdasarkan tanggal order + if params['value']['startDate'] and params['value']['endDate']: + try: + start_date = datetime.strptime(params['value']['startDate'], '%d/%m/%Y').strftime('%Y-%m-%d 00:00:00') + end_date = datetime.strptime(params['value']['endDate'], '%d/%m/%Y').strftime('%Y-%m-%d 23:59:59') + + domain.append(('date_order', '>=', start_date)) + domain.append(('date_order', '<=', end_date)) + except ValueError: + return self.response(code=400, description="Invalid date format. Use 'DD/MM/YYYY'.") + + + sale_orders = request.env['sale.order'].search( domain, offset=offset, limit=limit, order=order) -- cgit v1.2.3 From deba962d7368a5c4e30441b5a640102608e3dde6 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 31 May 2025 08:56:21 +0700 Subject: fix repeat order --- indoteknik_api/controllers/api_v1/sale_order.py | 45 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 15 deletions(-) (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 39fa0e13..e87b357e 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -136,24 +136,39 @@ class SaleOrder(controller.Controller): ('partner_id.site_id.name', 'ilike', '%' + site + '%') ] - if params['value']['status']: - if params['value']['status'] == 'quotation': + status = params['value'].get('status') + if status: + if status == 'quotation': domain += [('state', '=', 'draft')] - elif params['value']['status'] == 'cancel': + domain += [('approval_status', '=', False)] + + elif status == 'cancel': domain += [('state', '=', 'cancel')] - elif params['value']['status'] == 'diterima': - domain += [('state', '=', 'draft')] - # domain += [('is_continue_transaction', '=', True)] - domain += [('approval_status', 'in', ['pengajuan1', 'pengajuan2'])] - elif params['value']['status'] == 'diproses': - domain += [('state', '=', 'sale')] - domain += [('picking_ids.state', 'in', ['draft', 'waiting', 'confirmed', 'assigned'])] - elif params['value']['status'] == 'dikirim': - domain += [('state', '=', 'sale')] - domain += [('picking_ids.state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned', 'cancel'])] - elif params['value']['status'] == 'selesai': + + elif status == 'diterima': + domain += [ + ('state', '=', 'draft'), + ('approval_status', 'in', ['pengajuan1', 'pengajuan2']), + ] + + elif status == 'dikirim': + domain += [ + ('state', '=', 'sale'), + ('picking_ids.state', 'in', ['done']) + ] + + elif status == 'diproses': + domain += [ + ('state', '=', 'sale'), + ('picking_ids.state', 'in', ['draft', 'waiting', 'confirmed', 'assigned']) + ] + + elif status == 'selesai': domain += [('state', '=', 'done')] + elif status == 'all': + domain += [] + # Sorting order = None if params['value']['sort']: @@ -190,7 +205,7 @@ class SaleOrder(controller.Controller): def partner_get_sale_order_detail(self, **kw): params = self.get_request_params(kw, { 'partner_id': ['number'], - 'id': ['number'] + 'id': ['number'], }) if not params['valid']: return self.response(code=400, description=params) -- cgit v1.2.3 From 8d1af98bb7dab812f91d7d275b4004c4e5b0ff75 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 31 Jul 2025 08:33:22 +0700 Subject: repeat order fix --- indoteknik_api/controllers/api_v1/sale_order.py | 52 ++++++++++++++++--------- 1 file changed, 34 insertions(+), 18 deletions(-) (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 3ecaff57..f116f189 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -145,26 +145,14 @@ class SaleOrder(controller.Controller): elif status == 'cancel': domain += [('state', '=', 'cancel')] - elif status == 'diterima': + elif status == 'diproses': domain += [ ('state', '=', 'draft'), ('approval_status', 'in', ['pengajuan1', 'pengajuan2']), ] - elif status == 'dikirim': - domain += [ - ('state', '=', 'sale'), - ('picking_ids.state', 'in', ['done']) - ] - - elif status == 'diproses': - domain += [ - ('state', '=', 'sale'), - ('picking_ids.state', 'in', ['draft', 'waiting', 'confirmed', 'assigned']) - ] - - elif status == 'selesai': - domain += [('state', '=', 'done')] + elif status in ['dikemas', 'dikirim', 'selesai', 'partial']: + domain += [('state', '=', 'sale')] elif status == 'all': domain += [] @@ -191,11 +179,39 @@ class SaleOrder(controller.Controller): sale_orders = request.env['sale.order'].search( - domain, offset=offset, limit=limit, order=order) + domain, order=order) + status = params['value'].get('status') + if status in ['dikemas', 'dikirim', 'selesai', 'partial']: + filtered_orders = [] + for sale_order in sale_orders: + bu_pickings = [ + p for p in sale_order.picking_ids + if p.picking_type_id and p.picking_type_id.id == 29 + ] + total = len(bu_pickings) + done_pickings = [p for p in bu_pickings if p.state == 'done'] + done_with_driver = [p for p in done_pickings if p.driver_arrival_date] + done_without_driver = [p for p in done_pickings if not p.driver_arrival_date] + + if status == 'dikemas' and len(done_pickings) == 0: + filtered_orders.append(sale_order) + elif status == 'dikirim' and len(done_pickings) == total and len(done_pickings) > 0 and len(done_without_driver) == total: + filtered_orders.append(sale_order) + elif status == 'selesai' and len(done_pickings) == total and len(done_pickings) > 0 and len(done_with_driver) == total: + filtered_orders.append(sale_order) + elif status == 'partial' and ( + len(done_pickings) != total or + (done_with_driver and done_without_driver) + ): + filtered_orders.append(sale_order) + else: + filtered_orders = sale_orders + + filtered_orders_paginated = filtered_orders[offset: offset + limit] data = { - 'sale_order_total': request.env['sale.order'].search_count(domain), - 'sale_orders': [request.env['sale.order'].api_v1_single_response(x) for x in sale_orders] + 'sale_order_total': len(filtered_orders), + 'sale_orders': [request.env['sale.order'].api_v1_single_response(x) for x in filtered_orders_paginated] } return self.response(data) -- cgit v1.2.3 From dddfd3846d37e24c5b52cc98bbe889bd4a958775 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 31 Jul 2025 15:51:03 +0700 Subject: repeat order --- indoteknik_api/controllers/api_v1/sale_order.py | 33 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-) (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 0527345e..fd460ea0 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -1,5 +1,5 @@ from .. import controller -from odoo import http +from odoo import http, fields from datetime import datetime, timedelta from odoo.http import request import json @@ -127,10 +127,19 @@ class SaleOrder(controller.Controller): if params['value']['name']: name = params['value']['name'].replace(' ', '%') - domain += [ + order_lines = request.env['sale.order.line'].search([ + ('order_id.partner_id', 'in', partner_child_ids), '|', - ('name', 'ilike', '%' + name + '%'), - ('partner_purchase_order_name', 'ilike', '%' + name + '%') + ('product_id.name', 'ilike', name), + ('product_id.default_code', 'ilike', name), + ]) + + sale_order_ids_from_lines = order_lines.mapped('order_id.id') + + domain += ['|', '|', + ('name', 'ilike', name), + ('partner_purchase_order_name', 'ilike', name), + ('id', 'in', sale_order_ids_from_lines) ] if params['value']['site']: @@ -169,15 +178,19 @@ class SaleOrder(controller.Controller): order = 'amount_total desc' # Filter berdasarkan tanggal order - if params['value']['startDate'] and params['value']['endDate']: - try: + try: + if params['value']['startDate'] and params['value']['endDate']: start_date = datetime.strptime(params['value']['startDate'], '%d/%m/%Y').strftime('%Y-%m-%d 00:00:00') end_date = datetime.strptime(params['value']['endDate'], '%d/%m/%Y').strftime('%Y-%m-%d 23:59:59') + else: + start_date = '2023-01-01 00:00:00' + end_date = fields.Datetime.now().strftime('%Y-%m-%d 23:59:59') + + domain.append(('date_order', '>=', start_date)) + domain.append(('date_order', '<=', end_date)) - domain.append(('date_order', '>=', start_date)) - domain.append(('date_order', '<=', end_date)) - except ValueError: - return self.response(code=400, description="Invalid date format. Use 'DD/MM/YYYY'.") + except ValueError: + return self.response(code=400, description="Invalid date format. Use 'DD/MM/YYYY'.") -- cgit v1.2.3