Merge branch 'odoo-backup' into CR/renca-banner

1 files changed, 19 insertions, 10 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 41f2e138..6c6cbaa1 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -13,11 +13,11 @@ import requests
 import time
 import logging
 import re
-from deep_translator import GoogleTranslator
 _logger = logging.getLogger(__name__)
 
 _biteship_url = "https://api.biteship.com/v1"
-_biteship_api_key = "biteship_live.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiaW5kb3Rla25payIsInVzZXJJZCI6IjY3MTViYTJkYzVkMjdkMDAxMjRjODk2MiIsImlhdCI6MTc0MTE1NTU4M30.pbFCai9QJv8iWhgdosf8ScVmEeP3e5blrn33CHe7Hgo"
+_biteship_api_key = "biteship_test.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiSW5kb3Rla25payIsInVzZXJJZCI6IjY3MTViYTJkYzVkMjdkMDAxMjRjODk2MiIsImlhdCI6MTcyOTQ5ODAwMX0.L6C73couP4-cgVEfhKI2g7eMCMo3YOFSRZhS-KSuHNA"
+# _biteship_api_key = "biteship_live.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiaW5kb3Rla25payIsInVzZXJJZCI6IjY3MTViYTJkYzVkMjdkMDAxMjRjODk2MiIsImlhdCI6MTc0MTE1NTU4M30.pbFCai9QJv8iWhgdosf8ScVmEeP3e5blrn33CHe7Hgo"
         
        
 
@@ -136,11 +136,11 @@ class StockPicking(models.Model):
         ('pending', 'Pending (perlu koordinasi dengan MD)'),
         ('done', 'Approve by MD'),
     ], string='Approval MD Gudang Selisih', tracking=True, copy=False, help="The current state of the MD Approval transfer barang from gudang selisih.")
-    show_state_approve_md = fields.Boolean(compute="_compute_show_state_approve_md")
+    # show_state_approve_md = fields.Boolean(compute="_compute_show_state_approve_md")
 
-    def _compute_show_state_approve_md(self):
-        for record in self:
-            record.show_state_approve_md = record.location_id.id == 47 or record.location_id.complete_name == "Virtual Locations/Gudang Selisih"
+    # def _compute_show_state_approve_md(self):
+    #     for record in self:
+    #         record.show_state_approve_md = record.location_id.id == 47 or record.location_id.complete_name == "Virtual Locations/Gudang Selisih"
 
     @api.model
     def _compute_dokumen_tanda_terima(self):
@@ -502,8 +502,18 @@ class StockPicking(models.Model):
             self.biteship_tracking_id = data.get("courier", {}).get("tracking_id", "")
             self.biteship_waybill_id = data.get("courier", {}).get("waybill_id", "")
             self.delivery_tracking_no = data.get("courier", {}).get("waybill_id", "")
+            
+            waybill_id = data.get("courier", {}).get("waybill_id", "")
 
-            return data
+            message = f"✅ Berhasil Order ke Biteship! Resi: {waybill_id}" if waybill_id else "⚠️ Order berhasil, tetapi tidak ada nomor resi."
+
+            return {
+                'effect': {
+                    'fadeout': 'slow',  # Efek menghilang perlahan
+                    'message': message,  # Pesan sukses
+                    'type': 'rainbow_man',  # Efek animasi lucu Odoo
+                }
+            }
         else:
             error_data = response.json()
             error_message = error_data.get("error", "Unknown error")
@@ -1046,11 +1056,11 @@ class StockPicking(models.Model):
         return True
 
     def action_cancel(self):
-        if not self.env.user.is_logistic_approver:
+        if not self.env.user.is_logistic_approver and (self.env.context.get('active_model') == 'stock.picking' or self.env.context.get('active_model') == 'stock.picking.type'):
             if self.origin and 'Return of' in self.origin:
                 raise UserError("Button ini hanya untuk Logistik")
             
-            if not self.env.user.has_group('indoteknik_custom.group_role_it') and not self.env.user.has_group('indoteknik_custom.group_role_logistic'):
+            if not self.env.user.has_group('indoteknik_custom.group_role_it') and not self.env.user.has_group('indoteknik_custom.group_role_logistic') and self.picking_type_code == 'outgoing':
                 raise UserError("Button ini hanya untuk Logistik")
 
         res = super(StockPicking, self).action_cancel()
@@ -1244,7 +1254,6 @@ class StockPicking(models.Model):
                     manifests.append({
                         "status": re.sub(r'[^a-zA-Z0-9\s]', ' ', entry["status"]).lower().capitalize(),
                         "datetime": self._convert_to_local_time(entry["updated_at"]),
-                        # "description":  GoogleTranslator(source='auto', target='id').translate(entry["note"]),
                         "description":  description[entry["status"]],
                     })