Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

1 files changed, 11 insertions, 6 deletions

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 85b0fbba..762e17c5 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -125,28 +125,33 @@ 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, **kw):
-        scanid = int(kw.get('scanid', 0))
+        scanid = kw.get('scanid', '').strip()
         sj_document = kw.get('sj_document', False)
         paket_document = kw.get('paket_document', False)
 
-        params = {'sj_documentation': sj_document,
-                  'paket_documentation': paket_document,
-                  'driver_arrival_date': datetime.utcnow(),
-                  }
+        params = {
+            'sj_documentation': sj_document,
+            'paket_documentation': paket_document,
+            'driver_arrival_date': datetime.utcnow(),
+        }
 
-        picking_data = request.env['stock.picking'].search([('id', '=', scanid)], limit=1)
+        picking_data = False
+        if scanid.isdigit() and int(scanid) < 2147483647:
+            picking_data = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=1)
 
         if not picking_data:
             picking_data = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=1)
 
         if not picking_data:
             return self.response(code=404, description='picking not found')
+
         picking_data.write(params)
 
         return self.response({
             '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').")