From 3cb22a5059bfddc5f1d234e8c34e726debe9643d Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 13 Jun 2025 17:05:11 +0700
Subject: (andri) perapihan log note estimate shipping

---
 indoteknik_custom/models/sale_order.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index e54053ff..b9ca4a09 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -890,7 +890,7 @@ class SaleOrder(models.Model):
         total_weight = self._validate_for_shipping_estimate()
     
         weight_gram = int(total_weight * 1000)
-        if weight_gram < 100:
+        if weight_gram <b 100:
             weight_gram = 100
 
         value = int(self.amount_untaxed or sum(line.price_subtotal for line in self.order_line))
@@ -1064,15 +1064,7 @@ class SaleOrder(models.Model):
             self.shipping_option_id = selected_option.id
             self.delivery_amt = selected_option.price
             self.delivery_service_type = selected_option.courier_service_code
-
-        if use_coordinate:
-            origin_info = f"Koordinat ({origin_data.get('origin_latitude')}, {origin_data.get('origin_longitude')})"
-            destination_info = f"Koordinat ({destination_data.get('destination_latitude')}, {destination_data.get('destination_longitude')})"
-        else:
-            origin_info = f"Kode Pos {origin_data.get('origin_postal_code')}"
-            destination_info = f"Kode Pos {destination_data.get('destination_postal_code')}"
-
-        message_lines = [f"<b>Estimasi Ongkos Kirim Biteship ({origin_info} → {destination_info}):</b><br/>"]
+        message_lines = [f"<b>Estimasi Ongkos Kirim Biteship:</b><br/>"]
 
         for courier, options in courier_options.items():
             message_lines.append(f"<b>{courier}:</b><br/>")
@@ -1081,6 +1073,19 @@ class SaleOrder(models.Model):
             if courier != list(courier_options.keys())[-1]:
                 message_lines.append("<br/>")
 
+        origin_address = "Jl. Bandengan Utara Komp A & BRT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET) KOTA JAKARTA UTARA PENJARINGAN"
+        destination_address = shipping_address.alamat_lengkap_text or shipping_address.street or shipping_address.name or ''
+        if use_coordinate:
+            origin_suffix = f"(Koordinat: {origin_data.get('origin_latitude')}, {origin_data.get('origin_longitude')})"
+            destination_suffix = f"(Koordinat: {destination_data.get('destination_latitude')}, {destination_data.get('destination_longitude')})"
+        else:
+            origin_suffix = f"(Kode Pos: {origin_data.get('origin_postal_code')})"
+            destination_suffix = f"(Kode Pos: {destination_data.get('destination_postal_code')})"
+
+        message_lines.append("<br/><br/><br><b>Info Lokasi:</b><br/>")
+        message_lines.append(f"<b>Asal</b>: {origin_address} {origin_suffix}<br/>")
+        message_lines.append(f"<b>Tujuan</b>: {destination_address} {destination_suffix}<br/>")
+
         message_body = "".join(message_lines)
 
         self.message_post(
-- 
cgit v1.2.3