push

1 files changed, 52 insertions, 19 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index a6ea6c81..0f22a7d4 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -135,6 +135,12 @@ class SaleOrder(models.Model):
         'account.payment.term', string='Payment Terms', check_company=True,  # Unrequired company
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
     
+    total_weight = fields.Float(string='Total Weight', compute='_compute_total_weight')
+
+    def _compute_total_weight(self):
+        for order in self:
+            order.total_weight = sum(line.weight for line in order.order_line)
+    
     def action_estimate_shipping(self):
         total_weight = 0
         missing_weight_products = []
@@ -155,38 +161,45 @@ class SaleOrder(models.Model):
 
         # Mendapatkan city_id berdasarkan nama kota
         origin_city_name = self.warehouse_id.partner_id.kota_id.name
-        destination_city_name = self.real_shipping_id.kota_id.name
-        origin_subdistrict_name = self.warehouse_id.partner_id.kecamatan_id.name
-        destination_subdistrict_name = self.real_shipping_id.kecamatan_id.name
+        destination_subsdistrict_id = self.real_shipping_id.kecamatan_id.rajaongkir_id
 
-        origin_id_city = self._get_city_id_by_name(origin_city_name)
-        destination_id_city = self._get_city_id_by_name(destination_city_name)
-        origin_city_id = self._get_subdistrict_id_by_name(origin_id_city, origin_subdistrict_name)
-        destination_city_id = self._get_subdistrict_id_by_name(destination_id_city, destination_subdistrict_name)
-
-        if not origin_city_id or not destination_city_id:
+        if not destination_subsdistrict_id:
             raise UserError("Gagal mendapatkan ID kota asal atau tujuan.")
 
-        result = self._call_rajaongkir_api(total_weight, origin_city_id, destination_city_id)
+        result = self._call_rajaongkir_api(total_weight, destination_subsdistrict_id)
         if result:
             estimated_cost = result['rajaongkir']['results'][0]['costs'][0]['cost'][0]['value']
             self.delivery_amt = estimated_cost
-            self.message_post(body=f"Estimasi Ongkos Kirim: {self.delivery_amt}")
 
+            shipping_info = []
+            for courier in result['rajaongkir']['results']:
+                for cost_detail in courier['costs']:
+                    service = cost_detail['service']
+                    description = cost_detail['description']
+                    etd = cost_detail['cost'][0]['etd']
+                    value = cost_detail['cost'][0]['value']
+                    shipping_info.append(f"Service: {service}, Description: {description}, ETD: {etd} hari, Cost: Rp {value}")
+            
+            log_message = "<br/>".join(shipping_info)
+
+            description_ongkir = result['rajaongkir']['results'][0]['costs'][0]['description']
+            etd_ongkir = result['rajaongkir']['results'][0]['costs'][0]['cost'][0]['etd']
+            service_ongkir = result['rajaongkir']['results'][0]['costs'][0]['service']
+            self.message_post(body=f"Estimasi Ongkos Kirim: Rp{self.delivery_amt}<br/>Service: {service_ongkir}<br/>Description: {description_ongkir}<br/>ETD: {etd_ongkir}<br/>Detail Lain:<br/>{log_message}")
         else:
             raise UserError("Gagal mendapatkan estimasi ongkir.")
 
-    def _call_rajaongkir_api(self, total_weight, origin_city_id, destination_city_id):
+    def _call_rajaongkir_api(self, total_weight, destination_subsdistrict_id):
         url = 'https://pro.rajaongkir.com/api/cost'
         headers = {
-            'key': '7ac9883688da043b50cc32f0e3070bb6',
+            'key': '9b1310f644056d84d60b0af6bb21611a',
         }
         courier = self.carrier_id.name.lower()
 
         data = {
-            'origin': int(origin_city_id),
+            'origin': 2127,
             'originType': 'subdistrict',
-            'destination': int(destination_city_id),
+            'destination': int(destination_subsdistrict_id),
             'destinationType': 'subdistrict',
             'weight': int(total_weight * 1000),
             'courier': courier,
@@ -212,7 +225,7 @@ class SaleOrder(models.Model):
     def _get_city_id_by_name(self, city_name):
         url = 'https://pro.rajaongkir.com/api/city'
         headers = {
-            'key': '7ac9883688da043b50cc32f0e3070bb6',
+            'key': '9b1310f644056d84d60b0af6bb21611a',
         }
 
         normalized_city_name = self._normalize_city_name(city_name)
@@ -228,14 +241,17 @@ class SaleOrder(models.Model):
     def _get_subdistrict_id_by_name(self, city_id, subdistrict_name):
         url = f'https://pro.rajaongkir.com/api/subdistrict?city={city_id}'
         headers = {
-            'key': '7ac9883688da043b50cc32f0e3070bb6',
+            'key': '9b1310f644056d84d60b0af6bb21611a',
         }
         
         response = requests.get(url, headers=headers)
         if response.status_code == 200:
             subdistrict_data = response.json()
             for subdistrict in subdistrict_data['rajaongkir']['results']:
-                if subdistrict['subdistrict_name'].lower() == subdistrict_name.lower():
+                subsdistrict_1 = subdistrict['subdistrict_name'].lower()
+                subsdistrict_2 = subdistrict_name.lower()
+
+                if subsdistrict_1 == subsdistrict_2:
                     return subdistrict['subdistrict_id']
         return None
 
@@ -808,14 +824,24 @@ class SaleOrder(models.Model):
 
     def validate_different_vendor(self):
         different_vendor = self.order_line.filtered(lambda l: l.vendor_id and l.vendor_md_id and l.vendor_id.id != l.vendor_md_id.id)
+
+        if self.vendor_approval_id and self.vendor_approval_id.state == 'draft':
+            raise UserError('SO ini sedang dalam review Vendor Approval')
+        
+        if self.vendor_approval_id and self.vendor_approval_id.state == 'cancel':
+            raise UserError('Vendor Approval SO ini Di Reject')
+        
         if different_vendor:
             vendor_approval = self.env['vendor.approval'].create({
                 'order_id': self.id,
+                'create_date_so': self.create_date,
+                'partner_id': self.partner_id.id,
                 'state': 'draft',
             })
 
             self.vendor_approval_id = vendor_approval.id
-            for line in self.line:
+            
+            for line in different_vendor:
                 self.env['vendor.approval.line'].create({
                     'vendor_approval_id': vendor_approval.id,
                     'product_id': line.product_id.id,
@@ -824,11 +850,18 @@ class SaleOrder(models.Model):
                     'vendor_md_id': line.vendor_md_id.id,
                     'purchase_price': line.purchase_price,
                     'purchase_price_md': line.purchase_price_md,
+                    'sales_price': line.price_unit,
+                    'margin_before': line.margin_md,
+                    'margin_after': line.item_percent_margin,
+                    'purchase_tax_id': line.purchase_tax_id.id,
+                    'sales_tax_id': line.tax_id[0].id if line.tax_id else False,
+                    'percent_margin_difference': (line.price_unit - line.purchase_price_md) / line.purchase_price_md if line.purchase_price_md else False,
                 })
 
             return True
         else:
             return False
+
         
     def action_confirm(self):
         for order in self: