(andri) fix conflict

1 files changed, 2 insertions, 13 deletions

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index da18e16a..0525adc3 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -8,6 +8,8 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
+_logger = logging.getLogger(__name__)
+
 class StockPicking(controller.Controller):
     prefix = '/api/v1/'
     PREFIX_PARTNER = prefix + 'partner/<partner_id>/'
@@ -145,7 +147,6 @@ class StockPicking(controller.Controller):
             'name': picking_data.name
         })
 
-
     @http.route(prefix + 'webhook/biteship', type='json', auth='public', methods=['POST'], csrf=False)
     def update_status_from_biteship(self, **kw):
         _logger.info("Biteship Webhook: Request received at controller start (type='json').")
@@ -180,18 +181,6 @@ class StockPicking(controller.Controller):
             # Untuk error, kembalikan dictionary error juga, Odoo akan mengonversinya ke JSON
             return {'status': 'error', 'message': str(e)}
 
-    # @http.route(prefix + 'webhook/biteship', auth='public', methods=['POST'], csrf=False)
-    # def udpate_status_from_bitehsip(self, **kw):
-    #     return "ok"
-
-    # def process_order_status(self, data):
-    #     picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))],
-    #                                                                limit=1)
-    #     if data.get('status') == 'picked':
-    #         picking_model.write({'driver_departure_date': datetime.utcnow()})
-    #     elif data.get('status') == 'delivered':
-    #         picking_model.write({'driver_arrival_date': datetime.utcnow()})
-
     def process_order_status(self, data):
         picking = request.env['stock.picking'].sudo().search([
             ('biteship_id', '=', data.get('order_id'))