(miqdad) add xpdc

1 files changed, 29 insertions, 50 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 92581678..2061c686 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -67,6 +67,17 @@ class ShippingOption(models.Model):
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    ongkir_ke_xpdc = fields.Float(string='Ongkir ke Ekspedisi', help='Biaya ongkir ekspedisi', copy=False, index=True, tracking=3)
+
+    metode_kirim_ke_xpdc = fields.Selection([
+        ('indoteknik_deliv', 'Indoteknik Delivery'),
+        ('lalamove', 'Lalamove'),
+        ('grab', 'Grab'),
+        ('gojek', 'Gojek'),
+        ('deliveree', 'Deliveree'),
+        ('other', 'Other'),
+    ], string='Metode Kirim Ke Ekspedisi', copy=False, index=True, tracking=3)
+
     koli_lines = fields.One2many('sales.order.koli', 'sale_order_id', string='Sales Order Koli', auto_join=True)
     fulfillment_line_v2 = fields.One2many('sales.order.fulfillment.v2', 'sale_order_id', string='Fullfillment2')
     fullfillment_line = fields.One2many('sales.order.fullfillment', 'sales_order_id', string='Fullfillment')
@@ -315,17 +326,7 @@ class SaleOrder(models.Model):
             "sale_order_id": self.id,
         })
         self.shipping_option_id = shipping_option.id
-        self.message_post(
-            body=(
-                f"<b>Estimasi pengiriman Indoteknik berhasil:</b><br/>"
-                f"Layanan: {shipping_option.name}<br/>"
-                f"ETD: {shipping_option.etd}<br/>"
-                f"Biaya: Rp {shipping_option.price:,}<br/>"
-                f"Provider: {shipping_option.provider}"
-            ),
-            message_type="comment",
-        )
-
+    
     def action_estimate_shipping(self):
         if self.carrier_id.id in [1, 151]:
             self.action_indoteknik_estimate_shipping()
@@ -364,8 +365,6 @@ class SaleOrder(models.Model):
                     shipping_options.append((service, description, etd, value, courier['code']))
                     
             self.env["shipping.option"].search([('sale_order_id', '=', self.id)]).unlink()
-
-            _logger.info(f"Shipping options: {shipping_options}")
             
             for service, description, etd, value, provider in shipping_options:
                 self.env["shipping.option"].create({
@@ -375,23 +374,12 @@ class SaleOrder(models.Model):
                     "etd": etd,
                     "sale_order_id": self.id,
                 })
-
             
             self.shipping_option_id = self.env["shipping.option"].search([('sale_order_id', '=', self.id)], limit=1).id
 
-            _logger.info(f"Shipping option SO ID: {self.shipping_option_id}")
-
-            self.message_post(
-                body=f"Estimasi Ongkos Kirim: Rp{self.delivery_amt}<br/>Detail Lain:<br/>"
-                    f"{'<br/>'.join([f'Service: {s[0]}, Description: {s[1]}, ETD: {s[2]} hari, Cost: Rp {s[3]}' for s in shipping_options])}",
-                message_type="comment"
-            )
-  
-            # self.message_post(body=f"Estimasi Ongkos Kirim: Rp{self.delivery_amt}<br/>Detail Lain:<br/>{'<br/>'.join([f'Service: {s[0]}, Description: {s[1]}, ETD: {s[2]} hari, Cost: Rp {s[3]}' for s in shipping_options])}", message_type="comment")
-
+            self.message_post(body=f"Estimasi Ongkos Kirim: Rp{self.delivery_amt}<br/>Detail Lain:<br/>{'<br/>'.join([f'Service: {s[0]}, Description: {s[1]}, ETD: {s[2]} hari, Cost: Rp {s[3]}' for s in shipping_options])}")
         else:
             raise UserError("Gagal mendapatkan estimasi ongkir.")
-    
 
     def _call_rajaongkir_api(self, total_weight, destination_subsdistrict_id):
         url = 'https://pro.rajaongkir.com/api/cost'
@@ -495,7 +483,7 @@ class SaleOrder(models.Model):
 
     def _compute_date_kirim(self):
         for rec in self:
-            picking = self.env['stock.picking'].search([('sale_id', '=', rec.id), ('state', 'not in', ['cancel'])], order='date_doc_kirim desc', limit=1)
+            picking = self.env['stock.picking'].search([('sale_id', '=', rec.id), ('state', 'not in', ['cancel']), ('name', 'not ilike', 'BU/PICK/%')], order='date_doc_kirim desc', limit=1)
             rec.date_kirim_ril = picking.date_doc_kirim
             rec.date_status_done = picking.date_done
             rec.date_driver_arrival = picking.driver_arrival_date
@@ -694,30 +682,12 @@ class SaleOrder(models.Model):
         
     # @api.constrains('delivery_amt', 'carrier_id', 'shipping_cost_covered')
     def _validate_delivery_amt(self):
-        is_indoteknik = self.carrier_id.id == 1 or self.shipping_cost_covered == 'indoteknik'
-        is_active_id = not self.env.context.get('active_id', [])
-
-        if is_indoteknik and is_active_id:
-            if self.delivery_amt == 0:
-                if self.carrier_id.id == 1:
-                    raise UserError('Untuk Kurir Indoteknik Delivery, estimasi ongkos kirim belum diisi.')
-                else:
-                    raise UserError('Untuk Shipping Covered Indoteknik, estimasi ongkos kirim belum diisi.')
-            
-            if self.delivery_amt < 5000:
-                if self.carrier_id.id == 1:
-                    raise UserError('Untuk Kurir Indoteknik Delivery, estimasi ongkos kirim belum memenuhi tarif minimum.')
+        if self.delivery_amt < 1:
+            if(self.carrier_id.id == 1 or self.shipping_cost_covered == 'indoteknik') and not self.env.context.get('active_id', []):
+                if(self.carrier_id.id == 1):
+                    raise UserError('Untuk Kurir Indoteknik Delivery, Estimasi Ongkos Kirim Harus di isi')
                 else:
-                    raise UserError('Untuk Shipping Covered Indoteknik, estimasi ongkos kirim belum memenuhi tarif minimum.')
-
-
-        # if self.delivery_amt < 5000:
-        #     if (self.carrier_id.id == 1 or self.shipping_cost_covered == 'indoteknik') and not self.env.context.get('active_id', []):
-        #         if self.carrier_id.id == 1:
-        #             raise UserError('Untuk Kurir Indoteknik Delivery, estimasi ongkos kirim belum memenuhi jumlah minimum.')
-        #         else:
-        #             raise UserError('Untuk Shipping Covered Indoteknik, estimasi ongkos kirim belum memenuhi jumlah minimum.')
-
+                    raise UserError('Untuk Shipping Covered Indoteknik, Estimasi Ongkos Kirim Harus di isi')
         
     def override_allow_create_invoice(self):
         if not self.env.user.is_accounting:
@@ -1467,12 +1437,21 @@ class SaleOrder(models.Model):
         #     partner.npwp = self.npwp
         #     partner.sppkp = self.sppkp
         #     partner.email = self.email
-    
+
     def _compute_total_margin(self):
         for order in self:
             total_margin = sum(line.item_margin for line in order.order_line if line.product_id)
+            #hitung nek onk 
+            if order.ongkir_ke_xpdc:
+                total_margin -= order.ongkir_ke_xpdc
+
             order.total_margin = total_margin
     
+    # def _compute_total_margin(self):
+    #     for order in self:
+    #         total_margin = sum(line.item_margin for line in order.order_line if line.product_id)
+    #         order.total_margin = total_margin
+    
     def _compute_total_percent_margin(self):
         for order in self:
             if order.amount_untaxed == 0: