Merged in cr_delivery_sj (pull request #459)

Cr delivery sj

1 files changed, 65 insertions, 14 deletions

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index fe82e665..c19812f5 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -124,35 +124,86 @@ class StockPicking(controller.Controller):
     @http.route(prefix + 'stock-picking/<scanid>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def write_partner_stock_picking_documentation(self, scanid, **kw):
-        sj_document = kw.get('sj_document') if 'sj_document' in kw else None
         paket_document = kw.get('paket_document') if 'paket_document' in kw else None
         dispatch_document = kw.get('dispatch_document') if 'dispatch_document' in kw else None
-        self_pu= kw.get('self_pu') if 'self_pu' in kw else None
+        self_pu = kw.get('self_pu') if 'self_pu' in kw else None
 
         # ===== Cari picking by id / picking_code =====
-        picking_data = False
+        picking = False
         if scanid.isdigit() and int(scanid) < 2147483646:
-            picking_data = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0)
+            picking = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0)
+        if not picking:
+            picking = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0)
+        if not picking:
+            return self.response(code=403, description='picking not found')
 
-        if not picking_data:
-            picking_data = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0)
+        # ===== Ambil MULTIPLE SJ dari form: sj_documentations=...&sj_documentations=... =====
+        form = request.httprequest.form or {}
+        sj_list = form.getlist('sj_documentations')  # list of base64 strings
 
-        if not picking_data:
-            return self.response(code=403, description='picking not found')
+        # fallback: kalau FE kirim single dengan nama yang sama (bukan list)
+        if not sj_list and 'sj_documentations' in kw and kw.get('sj_documentations'):
+            sj_list = [kw.get('sj_documentations')]
 
         params = {}
-        if sj_document:
-            params['sj_documentation'] = sj_document
-            if self_pu:
-                params['driver_arrival_date'] = datetime.utcnow()
         if paket_document:
             params['paket_documentation'] = paket_document
             params['driver_arrival_date'] = datetime.utcnow()
         if dispatch_document:
             params['dispatch_documentation'] = dispatch_document
+        if sj_list and self_pu:
+            params['driver_arrival_date'] = datetime.utcnow()
 
-        picking_data.write(params)
-        return self.response({'name': picking_data.name})
+        if params:
+            picking.write(params)
+
+        if sj_list:
+            Child = request.env['stock.picking.sj.document'].sudo()
+            seq = (picking.sj_documentations[:1].sequence or 10) if picking.sj_documentations else 10
+            for b64 in sj_list:
+                if not b64:
+                    continue
+                Child.create({
+                    'picking_id': picking.id,
+                    'sequence': seq,
+                    'image': b64,
+                })
+                seq += 10
+
+        return self.response({'name': picking.name})
+
+    # @http.route(prefix + 'stock-picking/<scanid>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
+    # @controller.Controller.must_authorized()
+    # def write_partner_stock_picking_documentation(self, scanid, **kw):
+    #     sj_document = kw.get('sj_document') if 'sj_document' in kw else None
+    #     paket_document = kw.get('paket_document') if 'paket_document' in kw else None
+    #     dispatch_document = kw.get('dispatch_document') if 'dispatch_document' in kw else None
+    #     self_pu= kw.get('self_pu') if 'self_pu' in kw else None
+    #
+    #     # ===== Cari picking by id / picking_code =====
+    #     picking_data = False
+    #     if scanid.isdigit() and int(scanid) < 2147483646:
+    #         picking_data = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0)
+    #
+    #     if not picking_data:
+    #         picking_data = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0)
+    #
+    #     if not picking_data:
+    #         return self.response(code=403, description='picking not found')
+    #
+    #     params = {}
+    #     if sj_document:
+    #         params['sj_documentation'] = sj_document
+    #         if self_pu:
+    #             params['driver_arrival_date'] = datetime.utcnow()
+    #     if paket_document:
+    #         params['paket_documentation'] = paket_document
+    #         params['driver_arrival_date'] = datetime.utcnow()
+    #     if dispatch_document:
+    #         params['dispatch_documentation'] = dispatch_document
+    #
+    #     picking_data.write(params)
+    #     return self.response({'name': picking_data.name})
 
 
     @http.route(prefix + 'webhook/biteship', type='json', auth='public', methods=['POST'], csrf=False)