Merged in webhook_v1 (pull request #348)

Webhook v1

1 files changed, 38 insertions, 12 deletions

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 1b247c8a..0525adc3 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -1,6 +1,6 @@
 from .. import controller
 from odoo import http
-from odoo.http import request
+from odoo.http import request, Response
 from pytz import timezone
 from datetime import datetime
 import json
@@ -8,6 +8,7 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
+_logger = logging.getLogger(__name__)
 
 class StockPicking(controller.Controller):
     prefix = '/api/v1/'
@@ -181,21 +182,46 @@ class StockPicking(controller.Controller):
             return {'status': 'error', 'message': str(e)}
 
     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()})
+        picking = request.env['stock.picking'].sudo().search([
+            ('biteship_id', '=', data.get('order_id'))
+        ], limit=1)
+
+        if not picking:
+            _logger.warning(f"[Webhook] Tidak ditemukan picking untuk order_id {data.get('order_id')}")
+            return
+
+        status = data.get('status')
+        timestamp = data.get('updated_at') or datetime.utcnow().isoformat()
+
+        description = picking._get_biteship_status_description(status, {
+            "courier": {"company": data.get("courier_company", "")},
+            "destination": {"contact_name": picking.partner_id.name or ""}
+        })
+
+        # Tambahkan extra data dari webhook
+        extra_data = {
+            "courier_driver_name": data.get("courier_driver_name"),
+            "courier_driver_phone": data.get("courier_driver_phone"),
+            "courier_driver_plate_number": data.get("courier_driver_plate_number"),
+            "courier_link": data.get("courier_link"),
+            "order_price": data.get("order_price"),
+            "status": data.get("status"),
+        }
+
+        picking.log_biteship_event_from_webhook(status, timestamp, description, extra_data=extra_data)
+
+
 
     def process_order_price(self, data):
         picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))],
                                                                    limit=1)
-        order = request.env['sale.order'].sudo().search([('name', '=', picking_model.sale_id.name)], limit=1)
-        if order:
-            order.write({
-                'delivery_amt': data.get('price')
-            })
+        if not picking_model:
+            _logger.warning(f"Tidak ditemukan picking untuk order_id {data.get('order_id')}")
+            return
+
+        picking_model.write({
+            'biteship_shipping_price': data.get('price')
+        })
 
     def process_order_waybill(self, data):
         picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))],