(andri) fix address pada log note destination estimate shipping biteship

1 files changed, 7 insertions, 1 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 4535ae0d..ee9d6f70 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1071,7 +1071,13 @@ class SaleOrder(models.Model):
                 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.street or shipping_address.name or ''
+        destination_address = ', '.join(filter(None, [
+            shipping_address.street,
+            shipping_address.kelurahan_id.name if shipping_address.kelurahan_id else None,
+            shipping_address.kecamatan_id.name if shipping_address.kecamatan_id else None,
+            shipping_address.kota_id.name if shipping_address.kota_id else None,
+            shipping_address.state_id.name if shipping_address.state_id else None
+        ]))
         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')})"