(andri) rajaongkir V2

1 files changed, 90 insertions, 48 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 109771e9..bc830e2b 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -845,25 +845,32 @@ class SaleOrder(models.Model):
             if total_weight == 0:
                 raise UserError("Tidak dapat mengestimasi ongkir tanpa berat yang valid.")
 
-            destination_subsdistrict_id = self.real_shipping_id.kecamatan_id.rajaongkir_id
+            kecamatan_name = self.real_shipping_id.kecamatan_id.name
+            kota_name = self.real_shipping_id.kota_id.name
+
+            destination_subsdistrict_id = self._get_subdistrict_id_from_komerce(kecamatan_name, kota_name)
+
+            # destination_subsdistrict_id = self.real_shipping_id.kecamatan_id.rajaongkir_id
             if not destination_subsdistrict_id:
                 raise UserError("Gagal mendapatkan ID kota tujuan.")
 
             result = self._call_rajaongkir_api(total_weight, destination_subsdistrict_id)
             if result:
                 shipping_options = []
-                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_options.append((service, description, etd, value, courier['code']))
-                        
+
+                for cost in result.get('data', []):
+                    service = cost.get('service')
+                    description = cost.get('description')
+                    etd = cost.get('etd', '')
+                    value = cost.get('cost', 0)
+                    provider = cost.get('code')
+
+                    shipping_options.append((service, description, etd, value, provider))
+
                 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({
                         "name": service,
@@ -873,19 +880,15 @@ class SaleOrder(models.Model):
                         "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])}",
+                        f"{'<br/>'.join([f'Service: {s[0]}, Description: {s[1]}, ETD: {s[2]}, 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")
-
             else:
                 raise UserError("Gagal mendapatkan estimasi ongkir.")
 
@@ -1191,25 +1194,30 @@ class SaleOrder(models.Model):
 
 
     def _call_rajaongkir_api(self, total_weight, destination_subsdistrict_id):
-        url = 'https://pro.rajaongkir.com/api/cost'
+        url = 'https://rajaongkir.komerce.id/api/v1/calculate/domestic-cost'
         headers = {
             'key': '9b1310f644056d84d60b0af6bb21611a',
         }
         courier = self.carrier_id.name.lower()
 
         data = {
-            'origin': 2127,
-            'originType': 'subdistrict',
+            'origin': 17656,
+            # 'originType': 'subdistrict',
             'destination': int(destination_subsdistrict_id),
-            'destinationType': 'subdistrict',
+            # 'destinationType': 'subdistrict',
             'weight': int(total_weight * 1000),
             'courier': courier,
         }
 
-        response = requests.post(url, headers=headers, data=data)
-        if response.status_code == 200:
-            return response.json()
-        return None
+        try:
+            _logger.info(f"Calling RajaOngkir API with data: {data}")
+            response = requests.post(url, headers=headers, data=data)
+            _logger.info(f"RajaOngkir response: {response.status_code} - {response.text}")
+
+            if response.status_code == 200:
+                return response.json()
+        except Exception as e:
+            _logger.error(f"Exception while calling RajaOngkir: {str(e)}")
 
     def _normalize_city_name(self, city_name):
         city_name = city_name.lower()
@@ -1223,37 +1231,71 @@ class SaleOrder(models.Model):
 
         return city_name
 
-    def _get_city_id_by_name(self, city_name):
-        url = 'https://pro.rajaongkir.com/api/city'
+    # def _get_city_id_by_name(self, city_name):
+    #     url = 'https://pro.rajaongkir.com/api/city'
+    #     headers = {
+    #         'key': '9b1310f644056d84d60b0af6bb21611a',
+    #     }
+
+    #     normalized_city_name = self._normalize_city_name(city_name)
+
+    #     response = requests.get(url, headers=headers)
+    #     if response.status_code == 200:
+    #         city_data = response.json()
+    #         for city in city_data['rajaongkir']['results']:
+    #             if city['city_name'].lower() == normalized_city_name:
+    #                 return city['city_id']
+    #     return None
+
+    # def _get_subdistrict_id_by_name(self, city_id, subdistrict_name):
+    #     url = f'https://pro.rajaongkir.com/api/subdistrict?city={city_id}'
+    #     headers = {
+    #         'key': '9b1310f644056d84d60b0af6bb21611a',
+    #     }
+
+    #     response = requests.get(url, headers=headers)
+    #     if response.status_code == 200:
+    #         subdistrict_data = response.json()
+    #         for subdistrict in subdistrict_data['rajaongkir']['results']:
+    #             subsdistrict_1 = subdistrict['subdistrict_name'].lower()
+    #             subsdistrict_2 = subdistrict_name.lower()
+
+    #             if subsdistrict_1 == subsdistrict_2:
+    #                 return subdistrict['subdistrict_id']
+    #     return None
+
+    def _get_subdistrict_id_from_komerce(self, kecamatan_name, kota_name):
+        url = 'https://rajaongkir.komerce.id/api/v1/destination/domestic-destination'
         headers = {
             'key': '9b1310f644056d84d60b0af6bb21611a',
         }
-
-        normalized_city_name = self._normalize_city_name(city_name)
-
-        response = requests.get(url, headers=headers)
-        if response.status_code == 200:
-            city_data = response.json()
-            for city in city_data['rajaongkir']['results']:
-                if city['city_name'].lower() == normalized_city_name:
-                    return city['city_id']
-        return None
-
-    def _get_subdistrict_id_by_name(self, city_id, subdistrict_name):
-        url = f'https://pro.rajaongkir.com/api/subdistrict?city={city_id}'
-        headers = {
-            'key': '9b1310f644056d84d60b0af6bb21611a',
+        search = f"{kecamatan_name} {kota_name}"
+        params = {
+            'search': search,
+            'limit': 5
         }
 
-        response = requests.get(url, headers=headers)
-        if response.status_code == 200:
-            subdistrict_data = response.json()
-            for subdistrict in subdistrict_data['rajaongkir']['results']:
-                subsdistrict_1 = subdistrict['subdistrict_name'].lower()
-                subsdistrict_2 = subdistrict_name.lower()
+        try:
+            response = requests.get(url, headers=headers, params=params, timeout=10)
+            if response.status_code == 200:
+                data = response.json().get('data', [])
+                _logger.info(f"[Komerce] Fetched {len(data)} subdistricts for search '{search}'")
+                _logger.info(f"[Komerce] Response: {data}")
+
+                normalized_kota = self._normalize_city_name(kota_name)
+                for item in data:
+                    if (
+                        item.get('subdistrict_name', '').lower() == kecamatan_name.lower() and
+                        item.get('city_name', '').lower() == normalized_kota
+                    ):
+                        return item.get('id')
+
+                _logger.warning(f"[Komerce] No match for '{kecamatan_name}' in city '{kota_name}'")
+            else:
+                _logger.error(f"[Komerce] HTTP Error {response.status_code}: {response.text}")
+        except Exception as e:
+            _logger.error(f"[Komerce] Exception: {e}")
 
-                if subsdistrict_1 == subsdistrict_2:
-                    return subdistrict['subdistrict_id']
         return None
 
     def _compute_type_promotion(self):