Merge branch 'staging' into release

1 files changed, 27 insertions, 2 deletions

diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index c3f3dccb..ca6baff0 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -24,9 +24,19 @@ class SaleOrder(models.Model):
                 data['status'] = 'waiting'
         if sale_order.state == 'sale': 
             data['status'] = 'sale'
+            picking_count = {
+                'assigned': 0,
+                'done': 0,
+            }
             for picking in sale_order.picking_ids:
-                if picking.state == 'assigned':
-                    data['status'] = 'shipping'
+                if picking.state in ['confirmed', 'assigned']:
+                    picking_count['assigned'] += 1
+                if picking.state == 'done':
+                    picking_count['done'] += 1
+            if picking_count['done'] > 0:
+                data['status'] = 'shipping'
+                if picking_count['assigned'] > 0:
+                    data['status'] = 'partial_shipping'
         if sale_order.state == 'done': 
             data['status'] = 'done'
         
@@ -53,3 +63,18 @@ class SaleOrder(models.Model):
                         data_with_detail['invoices'].append(self.env['account.move'].api_v1_single_response(invoice))
                 data.update(data_with_detail)
         return data
+
+
+class SaleOrderLine(models.Model):
+    _inherit = 'sale.order.line'
+
+    def api_single_response(self, sale_order_line, context=False):
+        data = {
+            'image': self.env['ir.attachment'].api_image('product.template', 'image_128', sale_order_line.product_id.product_tmpl_id.id),
+            'item_code': sale_order_line.product_id.default_code,
+            'product_name': sale_order_line.product_id.name,
+            'price_before_discount': sale_order_line.price_unit * sale_order_line.product_uom_qty,
+            'price_after_discount': sale_order_line.price_total,
+            'tax': sale_order_line.price_tax
+        }
+        return data