(andri) resolved conflict

1 files changed, 96 insertions, 8 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index ce1399fe..0fcb7ca1 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -87,7 +87,7 @@ class StockPicking(models.Model):
     )
     sj_documentation = fields.Binary(string="Dokumentasi Surat Jalan", )
     paket_documentation = fields.Binary(string="Dokumentasi Paket", )
-    sj_return_date = fields.Datetime(string="SJ Return Date", )
+    sj_return_date = fields.Datetime(string="SJ Return Date", copy=False)
     responsible = fields.Many2one('res.users', string='Responsible', tracking=True)
 
     approval_status = fields.Selection([
@@ -255,6 +255,13 @@ class StockPicking(models.Model):
     lalamove_image_url = fields.Char(string="Lalamove Image URL")
     lalamove_image_html = fields.Html(string="Lalamove Image", compute="_compute_lalamove_image_html")
 
+    # KGX Section
+    kgx_pod_photo_url = fields.Char('KGX Photo URL')
+    kgx_pod_photo = fields.Html('KGX Photo', compute='_compute_kgx_image_html')
+    kgx_pod_signature = fields.Char('KGX Signature URL')
+    kgx_pod_receive_time = fields.Datetime('KGX Ata Date')
+    kgx_pod_receiver = fields.Char('KGX Receiver')
+
     total_koli = fields.Integer(compute='_compute_total_koli', string="Total Koli")
     total_koli_display = fields.Char(compute='_compute_total_koli_display', string="Total Koli Display")
     linked_out_picking_id = fields.Many2one('stock.picking', string="Linked BU/OUT", copy=False)
@@ -273,9 +280,78 @@ class StockPicking(models.Model):
     state_packing = fields.Selection([('not_packing', 'Belum Packing'), ('packing_done', 'Sudah Packing')],
                                      string='Packing Status')
     approval_invoice_date_id = fields.Many2one('approval.invoice.date', string='Approval Invoice Date')
-    last_update_date_doc_kirim = fields.Datetime(string='Last Update Tanggal Kirim')
+    last_update_date_doc_kirim = fields.Datetime(string='Last Update Tanggal Kirim', copy=False)
     update_date_doc_kirim_add = fields.Boolean(string='Update Tanggal Kirim Lewat ADD')
 
+    def _get_kgx_awb_number(self):
+        """Menggabungkan name dan origin untuk membuat AWB Number"""
+        self.ensure_one()
+        if not self.name or not self.origin:
+            return False
+        return f"{self.name} {self.origin}"
+    
+    def _download_pod_photo(self, url):
+        """Mengunduh foto POD dari URL"""
+        try:
+            response = requests.get(url, timeout=10)
+            response.raise_for_status()
+            return base64.b64encode(response.content)
+        except Exception as e:
+            raise UserError(f"Gagal mengunduh foto POD: {str(e)}")
+    
+    def _parse_datetime(self, dt_str):
+        """Parse datetime string dari format KGX"""
+        try:
+            from datetime import datetime
+            # Hilangkan timezone jika ada masalah parsing
+            if '+' in dt_str:
+                dt_str = dt_str.split('+')[0]
+            return datetime.strptime(dt_str, '%Y-%m-%dT%H:%M:%S')
+        except ValueError:
+            return False
+    
+    def action_get_kgx_pod(self):
+        self.ensure_one()
+        
+        awb_number = self._get_kgx_awb_number()
+        if not awb_number:
+            raise UserError("Nomor AWB tidak dapat dibuat, pastikan picking memiliki name dan origin")
+            
+        url = "https://kgx.co.id/get_detail_awb"
+        headers = {'Content-Type': 'application/json'}
+        payload = {"params" : {'awb_number': awb_number}}
+        
+        try:
+            response = requests.post(url, headers=headers, data=json.dumps(payload))
+            response.raise_for_status()
+            data = response.json()
+            
+            if data.get('result', {}).get('data', []):
+                pod_data = data['result']['data'][0].get('connote_pod', {})
+                photo_url = pod_data.get('photo')
+                
+                self.kgx_pod_photo_url = photo_url
+                self.kgx_pod_signature = pod_data.get('signature')
+                self.kgx_pod_receiver = pod_data.get('receiver')
+                self.kgx_pod_receive_time = self._parse_datetime(pod_data.get('timeReceive'))
+                self.driver_arrival_date = self._parse_datetime(pod_data.get('timeReceive'))
+                
+                return data
+            else:
+                raise UserError(f"Tidak ditemukan data untuk AWB: {awb_number}")
+                
+        except requests.exceptions.RequestException as e:
+            raise UserError(f"Gagal mengambil data POD: {str(e)}")
+
+    @api.constrains('sj_return_date')
+    def _check_sj_return_date(self):
+        for record in self:
+            if not record.driver_arrival_date:
+                if record.sj_return_date:
+                    raise ValidationError(
+                        _("Anda tidak dapat mengubah Tanggal Pengembalian setelah Tanggal Pengiriman!")
+                    )
+
     def _check_date_doc_kirim_modification(self):
         for record in self:
             if record.last_update_date_doc_kirim and not self.env.context.get('from_button_approve'):
@@ -445,6 +521,13 @@ class StockPicking(models.Model):
             else:
                 record.lalamove_image_html = "No image available."
 
+    def _compute_kgx_image_html(self):
+        for record in self:
+            if record.kgx_pod_photo_url:
+                record.kgx_pod_photo = f'<img src="{record.kgx_pod_photo_url}" width="300" height="300"/>'
+            else:
+                record.kgx_pod_photo = "No image available."
+
     def action_fetch_lalamove_order(self):
         pickings = self.env['stock.picking'].search([
             ('picking_type_code', '=', 'outgoing'),
@@ -930,9 +1013,12 @@ class StockPicking(models.Model):
 
     def action_assign(self):
         res = super(StockPicking, self).action_assign()
-        current_time = datetime.datetime.utcnow()
-        self.real_shipping_id = self.sale_id.real_shipping_id
-        self.date_availability = current_time
+        for move in self:
+            # if not move.sale_id.hold_outgoing and move.location_id.id != 57 and move.location_dest_id.id != 60:
+            # TODO cant skip hold outgoing cause of not singleton method
+            current_time = datetime.datetime.utcnow()
+            move.real_shipping_id = move.sale_id.real_shipping_id
+            move.date_availability = current_time
         # self.check_state_reserve()
         return res
 
@@ -973,6 +1059,8 @@ class StockPicking(models.Model):
             if self.env.user.is_accounting:
                 pick.approval_return_status = 'approved'
                 continue
+            else:
+                pick.approval_return_status = 'pengajuan1'
 
             action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_stock_return_note_wizard')
 
@@ -1237,12 +1325,12 @@ class StockPicking(models.Model):
                 continue
 
             invoice = self.env['account.move'].search(
-                [('sale_id', '=', picking.sale_id.id), ('state', 'not in', ['draft', 'cancel'])], limit=1)
+                [('sale_id', '=', picking.sale_id.id), ('state', 'not in', ['draft', 'cancel']), ('move_type', '=', 'out_invoice')], limit=1)
 
             if not invoice:
                 continue
-
-            if not picking.so_lama and (not picking.date_doc_kirim or not invoice.invoice_date):
+                
+            if not picking.so_lama and invoice and (not picking.date_doc_kirim or not invoice.invoice_date):
                 raise UserError("Tanggal Kirim atau Tanggal Invoice belum diisi!")
 
             picking_date = fields.Date.to_date(picking.date_doc_kirim)