Merge branch 'vendor_approval' into production

# Conflicts:
#	indoteknik_custom/models/sale_order_line.py
#	indoteknik_custom/models/website_user_cart.py

4 files changed, 166 insertions, 22 deletions

diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 3d700ce0..a0064c06 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -128,3 +128,4 @@ from . import sales_order_reject
 from . import approval_date_doc
 from . import account_tax
 from . import approval_unreserve
+from . import vendor_approval
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index f8127d8c..0f22a7d4 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -78,6 +78,7 @@ class SaleOrder(models.Model):
     payment_link_midtrans = fields.Char(string='Payment Link', help='Url payment yg digenerate oleh midtrans, harap diserahkan ke customer agar dapat dilakukan pembayaran secara mandiri')
     payment_qr_code = fields.Binary("Payment QR Code")
     due_id = fields.Many2one('due.extension', string="Due Extension", readonly=True, tracking=True)   
+    vendor_approval_id = fields.Many2one('vendor.approval', string="Vendor Approval", readonly=True, tracking=True)   
     customer_type = fields.Selection([
         ('pkp', 'PKP'),
         ('nonpkp', 'Non PKP')
@@ -104,6 +105,7 @@ class SaleOrder(models.Model):
         ('cust_procurement', 'Customer Procurement')
     ], string='Web Approval', copy=False)
     compute_fullfillment = fields.Boolean(string='Compute Fullfillment', compute="_compute_fullfillment")
+    vendor_approval = fields.Boolean(string='Vendor Approval')
     note_ekspedisi = fields.Char(string="Note Ekspedisi")
     date_kirim_ril = fields.Datetime(string='Tanggal Kirim SJ', compute='_compute_date_kirim', copy=False)
     date_status_done = fields.Datetime(string='Date Done DO', compute='_compute_date_kirim', copy=False)
@@ -133,6 +135,12 @@ class SaleOrder(models.Model):
         'account.payment.term', string='Payment Terms', check_company=True,  # Unrequired company
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
     
+    total_weight = fields.Float(string='Total Weight', compute='_compute_total_weight')
+
+    def _compute_total_weight(self):
+        for order in self:
+            order.total_weight = sum(line.weight for line in order.order_line)
+    
     def action_estimate_shipping(self):
         total_weight = 0
         missing_weight_products = []
@@ -145,47 +153,53 @@ class SaleOrder(models.Model):
                 missing_weight_products.append(line.product_id.name)
 
         if missing_weight_products:
-            product_names = '\n'.join(missing_weight_products)
-            self.message_post(body=f"Produk berikut tidak memiliki berat: \n{product_names}")
-
+            product_names = '<br/>'.join(missing_weight_products)
+            self.message_post(body=f"Produk berikut tidak memiliki berat:<br/>{product_names}")
 
         if total_weight == 0:
             raise UserError("Tidak dapat mengestimasi ongkir tanpa berat yang valid.")
 
         # Mendapatkan city_id berdasarkan nama kota
         origin_city_name = self.warehouse_id.partner_id.kota_id.name
-        destination_city_name = self.real_shipping_id.kota_id.name
-        origin_subdistrict_name = self.warehouse_id.partner_id.kecamatan_id.name
-        destination_subdistrict_name = self.real_shipping_id.kecamatan_id.name
-
-        origin_id_city = self._get_city_id_by_name(origin_city_name)
-        destination_id_city = self._get_city_id_by_name(destination_city_name)
-        origin_city_id = self._get_subdistrict_id_by_name(origin_id_city, origin_subdistrict_name)
-        destination_city_id = self._get_subdistrict_id_by_name(destination_id_city, destination_subdistrict_name)
+        destination_subsdistrict_id = self.real_shipping_id.kecamatan_id.rajaongkir_id
 
-        if not origin_city_id or not destination_city_id:
+        if not destination_subsdistrict_id:
             raise UserError("Gagal mendapatkan ID kota asal atau tujuan.")
 
-        result = self._call_rajaongkir_api(total_weight, origin_city_id, destination_city_id)
+        result = self._call_rajaongkir_api(total_weight, destination_subsdistrict_id)
         if result:
             estimated_cost = result['rajaongkir']['results'][0]['costs'][0]['cost'][0]['value']
             self.delivery_amt = estimated_cost
-            self.message_post(body=f"Estimasi Ongkos Kirim: {self.delivery_amt}")
 
+            shipping_info = []
+            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_info.append(f"Service: {service}, Description: {description}, ETD: {etd} hari, Cost: Rp {value}")
+            
+            log_message = "<br/>".join(shipping_info)
+
+            description_ongkir = result['rajaongkir']['results'][0]['costs'][0]['description']
+            etd_ongkir = result['rajaongkir']['results'][0]['costs'][0]['cost'][0]['etd']
+            service_ongkir = result['rajaongkir']['results'][0]['costs'][0]['service']
+            self.message_post(body=f"Estimasi Ongkos Kirim: Rp{self.delivery_amt}<br/>Service: {service_ongkir}<br/>Description: {description_ongkir}<br/>ETD: {etd_ongkir}<br/>Detail Lain:<br/>{log_message}")
         else:
             raise UserError("Gagal mendapatkan estimasi ongkir.")
 
-    def _call_rajaongkir_api(self, total_weight, origin_city_id, destination_city_id):
+    def _call_rajaongkir_api(self, total_weight, destination_subsdistrict_id):
         url = 'https://pro.rajaongkir.com/api/cost'
         headers = {
-            'key': '7ac9883688da043b50cc32f0e3070bb6',
+            'key': '9b1310f644056d84d60b0af6bb21611a',
         }
         courier = self.carrier_id.name.lower()
 
         data = {
-            'origin': int(origin_city_id),
+            'origin': 2127,
             'originType': 'subdistrict',
-            'destination': int(destination_city_id),
+            'destination': int(destination_subsdistrict_id),
             'destinationType': 'subdistrict',
             'weight': int(total_weight * 1000),
             'courier': courier,
@@ -211,7 +225,7 @@ class SaleOrder(models.Model):
     def _get_city_id_by_name(self, city_name):
         url = 'https://pro.rajaongkir.com/api/city'
         headers = {
-            'key': '7ac9883688da043b50cc32f0e3070bb6',
+            'key': '9b1310f644056d84d60b0af6bb21611a',
         }
 
         normalized_city_name = self._normalize_city_name(city_name)
@@ -227,14 +241,17 @@ class SaleOrder(models.Model):
     def _get_subdistrict_id_by_name(self, city_id, subdistrict_name):
         url = f'https://pro.rajaongkir.com/api/subdistrict?city={city_id}'
         headers = {
-            'key': '7ac9883688da043b50cc32f0e3070bb6',
+            'key': '9b1310f644056d84d60b0af6bb21611a',
         }
         
         response = requests.get(url, headers=headers)
         if response.status_code == 200:
             subdistrict_data = response.json()
             for subdistrict in subdistrict_data['rajaongkir']['results']:
-                if subdistrict['subdistrict_name'].lower() == subdistrict_name.lower():
+                subsdistrict_1 = subdistrict['subdistrict_name'].lower()
+                subsdistrict_2 = subdistrict_name.lower()
+
+                if subsdistrict_1 == subsdistrict_2:
                     return subdistrict['subdistrict_id']
         return None
 
@@ -704,6 +721,8 @@ class SaleOrder(models.Model):
         self._validate_order()
         for order in self:
             order.order_line.validate_line()
+            if order.validate_different_vendor() and not self.vendor_approval:
+                return self._create_notification_action('Notification', 'Terdapat Vendor yang berbeda dengan MD Vendor')
 
             partner = order.partner_id.parent_id or order.partner_id
             if not partner.property_payment_term_id:
@@ -802,9 +821,53 @@ class SaleOrder(models.Model):
                     'body_html': email_body,
                     'email_to': salesperson_email,
                 }).send()
+
+    def validate_different_vendor(self):
+        different_vendor = self.order_line.filtered(lambda l: l.vendor_id and l.vendor_md_id and l.vendor_id.id != l.vendor_md_id.id)
+
+        if self.vendor_approval_id and self.vendor_approval_id.state == 'draft':
+            raise UserError('SO ini sedang dalam review Vendor Approval')
+        
+        if self.vendor_approval_id and self.vendor_approval_id.state == 'cancel':
+            raise UserError('Vendor Approval SO ini Di Reject')
+        
+        if different_vendor:
+            vendor_approval = self.env['vendor.approval'].create({
+                'order_id': self.id,
+                'create_date_so': self.create_date,
+                'partner_id': self.partner_id.id,
+                'state': 'draft',
+            })
+
+            self.vendor_approval_id = vendor_approval.id
+            
+            for line in different_vendor:
+                self.env['vendor.approval.line'].create({
+                    'vendor_approval_id': vendor_approval.id,
+                    'product_id': line.product_id.id,
+                    'product_uom_qty': line.product_uom_qty,
+                    'vendor_id': line.vendor_id.id,
+                    'vendor_md_id': line.vendor_md_id.id,
+                    'purchase_price': line.purchase_price,
+                    'purchase_price_md': line.purchase_price_md,
+                    'sales_price': line.price_unit,
+                    'margin_before': line.margin_md,
+                    'margin_after': line.item_percent_margin,
+                    'purchase_tax_id': line.purchase_tax_id.id,
+                    'sales_tax_id': line.tax_id[0].id if line.tax_id else False,
+                    'percent_margin_difference': (line.price_unit - line.purchase_price_md) / line.purchase_price_md if line.purchase_price_md else False,
+                })
+
+            return True
+        else:
+            return False
+
         
     def action_confirm(self):
         for order in self:
+            if order.validate_different_vendor() and not self.vendor_approval:
+                return self._create_notification_action('Notification', 'Terdapat Vendor yang berbeda dengan MD Vendor')
+            
             order.check_data_real_delivery_address()
             order.sale_order_check_approve()
             order._validate_order()
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 14bb8c99..6aaa4d53 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -14,7 +14,9 @@ class SaleOrderLine(models.Model):
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]"
     )   
+    vendor_md_id = fields.Many2one('res.partner', string='MD Vendor')   
     purchase_price = fields.Float('Purchase', required=True, digits='Product Price', default=0.0)
+    purchase_price_md = fields.Float('MD Purchase')
     purchase_tax_id = fields.Many2one('account.tax', string='Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
     delivery_amt_line = fields.Float('DeliveryAmtLine', compute='compute_delivery_amt_line')
     fee_third_party_line = fields.Float('FeeThirdPartyLine', compute='compute_fee_third_party_line', default=0)
@@ -33,6 +35,7 @@ class SaleOrderLine(models.Model):
     item_percent_margin_without_deduction = fields.Float('%Margin', compute='_compute_item_margin_without_deduction')
     weight = fields.Float(string='Weight')
     md_vendor_id = fields.Many2one('res.partner', string='MD Vendor', readonly=True)
+    margin_md = fields.Float(string='Margin MD')
 
     @api.constrains('note_procurement')
     def note_procurement_to_apo(self):
@@ -126,6 +129,9 @@ class SaleOrderLine(models.Model):
             else:
                 line.item_percent_margin = 0
 
+            if not line.margin_md:
+                line.margin_md = line.item_percent_margin 
+
     @api.onchange('vendor_id')
     def onchange_vendor_id(self):
         # TODO : need to change this logic @stephan
@@ -247,9 +253,10 @@ class SaleOrderLine(models.Model):
                 price, taxes, vendor_id = self._get_purchase_price(line.product_id)
                 line.vendor_id = vendor_id
                 line.md_vendor_id = vendor_id
+                line.margin_md = line.item_percent_margin
                 line.tax_id = line.order_id.sales_tax_id
                 # price, taxes = line._get_valid_purchase_price(purchase_price)
-                line.purchase_price = price
+                line.purchase_price_md = price
                 line.purchase_tax_id = taxes
 
             attribute_values = line.product_id.product_template_attribute_value_ids.mapped('name')
diff --git a/indoteknik_custom/models/vendor_approval.py b/indoteknik_custom/models/vendor_approval.py
new file mode 100644
index 00000000..e540b8fc
--- /dev/null
+++ b/indoteknik_custom/models/vendor_approval.py
@@ -0,0 +1,73 @@
+from odoo import models, api, fields
+from odoo.exceptions import AccessError, UserError, ValidationError
+from datetime import timedelta, date
+import logging
+
+_logger = logging.getLogger(__name__)
+
+class VendorApproval(models.Model):
+    _name = "vendor.approval"
+    _description = "Vendor Approval"
+    _inherit = ['mail.thread']
+    _rec_name = 'number'
+
+    number = fields.Char(string='Document No', index=True, copy=False, readonly=True, tracking=True)
+    partner_id = fields.Many2one('res.partner', string="Customer", readonly=True)
+    order_id = fields.Many2one('sale.order', string="SO", readonly=True)
+    vendor_approval_line = fields.One2many('vendor.approval.line', 'vendor_approval_id', string='Vendor Approval Lines', auto_join=True)
+    state = fields.Selection([('draft', 'Draft'), ('done', 'Done'), ('cancel', 'Reject')], string='State', tracking=True)
+    create_date_so = fields.Datetime(string='Create Date SO', readonly=True)
+
+    @api.model
+    def create(self, vals):
+        vals['number'] = self.env['ir.sequence'].next_by_code('vendor.approval') or '0'
+        result = super(VendorApproval, self).create(vals)
+        return result
+
+    def action_approve(self):
+        if not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
+            raise UserError('Hanya Merchandiser yang bisa approve')
+        
+        self.state = 'done'
+        self.order_id.update({'vendor_approval': True})
+        self.order_id.action_confirm()
+        message = "Vendor Approval approved by %s" % (self.env.user.name)
+        self.order_id.message_post(body=message)
+
+
+    def action_reject(self):
+        if not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
+            raise UserError('Hanya Merchandiser yang bisa cancel')
+        
+        self.state = 'cancel'
+
+        message = "Vendor Approval rejected by %s" % (self.env.user.name)
+        self.order_id.message_post(body=message)
+
+    def unlink(self):
+        res = super(VendorApproval, self).unlink()
+        if not self._name == 'vendor.approval':
+            raise UserError('Vendor Approval tidak bisa didelete')
+        return res
+                
+    
+class VendorApprovalLine(models.Model):
+    _name = 'vendor.approval.line'
+    _description = 'Vendor Approval Line'
+    _order = 'vendor_approval_id, id'
+
+    vendor_approval_id = fields.Many2one('vendor.approval', string='Vendor Approval Ref', required=True, ondelete='cascade', index=True, copy=False)
+    product_id = fields.Many2one('product.product', string='Product')
+    product_uom_qty = fields.Float(string='Quantity')
+    vendor_id = fields.Many2one('res.partner', string='Vendor')
+    vendor_md_id = fields.Many2one('res.partner', string='Vendor MD')
+    sales_price = fields.Float(string='Sales Price')
+    margin_before = fields.Float(string='Margin Before')
+    margin_after = fields.Float(string='Margin After')
+    purchase_price = fields.Float(string='Purchase Price')
+    purchase_price_md= fields.Float(string='Purchase Price MD')
+    purchase_tax_id = fields.Many2one('account.tax', string='Purchase Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
+    sales_tax_id = fields.Many2one('account.tax', string='Sales Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
+    percent_margin_difference = fields.Float(string='Percent Margin Difference')
+    
+