Merged in min-deliv-amt-afp (pull request #271)

Min deliv amt afp

3 files changed, 60 insertions, 7 deletions

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index fd3a0514..451577c5 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -200,6 +200,17 @@ class ResPartner(models.Model):
                 if existing_partner:
                     raise ValidationError(f"Nama '{record.name}' sudah digunakan oleh partner lain!")
 
+    @api.constrains('npwp')
+    def _check_npwp(self):
+        for record in self:
+            if record.npwp:
+                if not record.npwp.isdigit():
+                    raise ValidationError("NPWP hanya boleh berisi angka.")
+                if len(record.npwp) < 15:
+                    raise ValidationError("Digit NPWP yang dimasukkan kurang dari batas minimal (15 digit)")
+                if len(record.npwp) > 16:
+                    raise ValidationError("Digit NPWP yang dimasukkan lebih dari batas maksimal (16 digit)")
+
     def write(self, vals):
         # Fungsi rekursif untuk meng-update semua child, termasuk child dari child
         def update_children_recursively(partner, vals_for_child):
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 97e3b5b0..4affb35f 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -315,7 +315,17 @@ 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()
@@ -354,6 +364,8 @@ 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({
@@ -363,12 +375,23 @@ 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
 
-            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])}")
+            _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")
+
         else:
             raise UserError("Gagal mendapatkan estimasi ongkir.")
+    
 
     def _call_rajaongkir_api(self, total_weight, destination_subsdistrict_id):
         url = 'https://pro.rajaongkir.com/api/cost'
@@ -671,12 +694,30 @@ class SaleOrder(models.Model):
         
     # @api.constrains('delivery_amt', 'carrier_id', 'shipping_cost_covered')
     def _validate_delivery_amt(self):
-        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')
+        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.')
                 else:
-                    raise UserError('Untuk Shipping Covered Indoteknik, Estimasi Ongkos Kirim Harus di isi')
+                    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.')
+
         
     def override_allow_create_invoice(self):
         if not self.env.user.is_accounting:
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 2c64181e..f1b72af3 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -94,6 +94,7 @@
                             type="object"
                     />
                     <button string="Estimate Shipping" type="object" name="action_estimate_shipping"/>
+                    
                 </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="real_shipping_id"/>