Merged in CR/form-merchant (pull request #310)odoo-production

odoo quotation view & merchant view

8 files changed, 726 insertions, 303 deletions

diff --git a/indoteknik_api/controllers/api_v1/banner.py b/indoteknik_api/controllers/api_v1/banner.py
index 308d2765..64a6167b 100644
--- a/indoteknik_api/controllers/api_v1/banner.py
+++ b/indoteknik_api/controllers/api_v1/banner.py
@@ -15,7 +15,8 @@ class Banner(controller.Controller):
         limit = int(kw.get('limit', 0))
         offset = int(kw.get('offset', 0))
         order = kw.get('order', 'write_date DESC')
-        
+        keyword = kw.get('keyword')
+
         query = [('x_status_banner', '=', 'tayang')]
         if type:
             query += [('x_banner_category.x_studio_field_KKVl4', '=', type)]
@@ -25,9 +26,27 @@ class Banner(controller.Controller):
         
         if manufacture_id:
             query += [('x_relasi_manufacture', '=', int(manufacture_id))]
-        
-        banners = request.env['x_banner.banner'].search(query, limit=limit, offset=offset, order=order)
-        
+
+        banner_kumpulan = []
+        banner_ids = set()  # Set untuk menyimpan ID banner agar tidak duplikat
+
+        if keyword:
+            keyword_list = [word.strip() for word in keyword.split() if word.strip()]  # Pisahkan berdasarkan spasi
+
+            for word in keyword_list:
+                keyword_query = query + [('x_keyword_banner', 'ilike', word)]  # Buat query baru dengan keyword
+                banners = request.env['x_banner.banner'].search(keyword_query, limit=limit, offset=offset, order=order)
+
+                for banner in banners:
+                    if banner.id not in banner_ids:  # Pastikan tidak ada duplikasi
+                        banner_kumpulan.append(banner)
+                        banner_ids.add(banner.id)
+
+        if not keyword:
+            banners = request.env['x_banner.banner'].search(query, limit=limit, offset=offset, order=order)
+        else:
+            banners = banner_kumpulan if len(banner_kumpulan) > 0 else request.env['x_banner.banner'].search(query, limit=limit, offset=offset, order=order)
+
         week_number = self.get_week_number_of_current_month()
         
         end_datas = []
@@ -41,7 +60,8 @@ class Banner(controller.Controller):
                 'group_by_week': banner.group_by_week,
                 'image': request.env['ir.attachment'].api_image('x_banner.banner', 'x_banner_image', banner.id),
                 'headline_banner': banner.x_headline_banner,
-                'description_banner': banner.x_description_banner
+                'description_banner': banner.x_description_banner,
+                'keyword_banner': banner.x_keyword_banner
             }
             
             if banner.group_by_week and int(banner.group_by_week) < week_number and type == 'index-a-1':
diff --git a/indoteknik_api/controllers/api_v1/flash_sale.py b/indoteknik_api/controllers/api_v1/flash_sale.py
index 6c4ad8c0..1038500c 100644
--- a/indoteknik_api/controllers/api_v1/flash_sale.py
+++ b/indoteknik_api/controllers/api_v1/flash_sale.py
@@ -14,7 +14,7 @@ class FlashSale(controller.Controller):
     def _get_flash_sale_header(self, **kw):
         try:
             # base_url = request.env['ir.config_parameter'].get_param('web.base.url')
-            active_flash_sale = request.env['product.pricelist'].get_is_show_program_flash_sale()
+            active_flash_sale = request.env['product.pricelist'].get_is_show_program_flash_sale(is_show_program=kw.get('is_show_program'))
             data = []
             for pricelist in active_flash_sale:
                 query = [
diff --git a/indoteknik_api/controllers/api_v1/lead.py b/indoteknik_api/controllers/api_v1/lead.py
index d5cc7c5c..389f36b8 100644
--- a/indoteknik_api/controllers/api_v1/lead.py
+++ b/indoteknik_api/controllers/api_v1/lead.py
@@ -1,6 +1,9 @@
 from .. import controller
 from odoo import http
 from odoo.http import request
+import base64
+import mimetypes
+import json
 
 class Lead(controller.Controller):
     @http.route('/api/v1/lead', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
@@ -26,4 +29,206 @@ class Lead(controller.Controller):
 
         lead = request.env['crm.lead'].create(params['value'])
 
-        return self.response(True)
\ No newline at end of file
+        return self.response(True)
+
+    @http.route('/api/v1/merchant/<id>', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
+    @controller.Controller.must_authorized()
+    def create_merchant(self, **kw):
+        merchant_request = True if kw.get('merchant_request') == 'true' else False
+        params = self.get_request_params(kw, {
+            # informasi perusahaan
+            "name_merchant": [],
+            "pejabat_name": [],
+            "pic_merchant": [],
+            "pic_position": [],
+            "address": [],
+            "state": ['number'],
+            "city": ['number'],
+            "district": ['number'],
+            "subDistrict": ['number'],
+            "zip": [],
+            "bank_name": [],
+            "rekening_name": [],
+            "account_number": [],
+            "email_company": [],
+            "email_sales": [],
+            "email_finance": [],
+            "phone": [],
+            "mobile": [],
+            "bisnis_type": [],
+            "category_perusahaan": [],
+            "website": [],
+            "description": [],
+
+            # informasi vendor
+            "harga_tayang": [],
+            "merk_dagang": [],
+            "tempo_duration": [],
+            "kredit_limit": [],
+            "is_pengajuan_tempo": [],
+            "waktu_pengiriman": [],
+            "terhitung_sejak": [],
+
+            # Syarat Perdagangan
+            "is_kembali_barang": [],
+            "tempo_garansi": [],
+            "is_order_quantity": [],
+            "explain_garansi": [],
+            "custom_sertifikat_produk": [],
+
+            # # dokumen
+            
+            "file_npwp": [],
+            "file_sppkp": [],
+            "file_dokumenKtpDirut ": [],
+            "file_kartuNama": [],
+            "file_suratPernyataan": [],
+            "file_fotoKantor": [],
+            # "file_dataProduk": [],
+            # "file_pricelist": [],
+        })
+        partner_id = int(kw.get('id'))
+        partner = request.env['res.partner'].search([('id', '=', partner_id)], limit=1)
+        main_partner = partner.get_main_parent()
+
+        if params['value']['is_pengajuan_tempo']:
+            if params['value']['is_pengajuan_tempo'] == 'ada':
+                params['value']['is_pengajuan_tempo'] = True
+            else:
+                params['value']['is_pengajuan_tempo'] = False
+
+        if params['value']['is_kembali_barang']:
+            if params['value']['is_kembali_barang'] == 'ya':
+                params['value']['is_kembali_barang'] = kw.get('textReturn')
+            else:
+                params['value']['is_kembali_barang'] = 'Tidak dapat direturn'
+
+        if kw.get('tenggat_waktu'):
+            if kw.get('tenggat_waktu') != 'custom':
+                params['value']['tenggat_waktu'] = kw.get('tenggat_waktu') + ' hari sejak data dikirimkan'
+            else:
+                params['value']['tenggat_waktu'] = kw.get('custom_tenggat_waktu')
+
+        if params['value']['is_order_quantity']:
+            if params['value']['is_order_quantity'] == 'ya':
+                params['value']['is_order_quantity'] = kw.get('minimum_pembelian')
+            else:
+                params['value']['is_order_quantity'] = 'Tidak ada minimum order quantity'
+
+        filtered_params = {key: value for key, value in params['value'].items() if kw.get(key) is not None}
+        form_merchant = request.env['user.form.merchant'].search([('partner_id', '=', main_partner.id)], limit=1)
+        lead = []
+        if form_merchant:
+            form_merchant.write(filtered_params)
+        else:
+            lead = request.env['user.form.merchant'].create(filtered_params)
+            lead.partner_id = main_partner.id
+
+        sertifikat = [
+            'TKDN',
+            'SNI',
+            'K3L',
+        ]
+        sertifikat_ids = kw.get('sertifikat_produk')
+        sertifikat_input = kw.get('custom_sertifikat_produk')
+        dokumen_sertifikat = []
+
+        if sertifikat_ids:
+            dokumen_kirim_ids = list(map(int, sertifikat_ids.split(',')))
+            dokumen_sertifikat = [sertifikat[i] for i in dokumen_kirim_ids if 0 <= i < len(sertifikat)]
+        if sertifikat_input != 'false' and sertifikat_input:
+            input_items = [item.strip() for item in sertifikat_input.split(',')]
+            dokumen_sertifikat.extend(item for item in input_items if item and item not in dokumen_sertifikat)
+            form_merchant.sertifikat_produk = sertifikat_input
+        else:
+            # Jika sertifikat_input kosong, hapus elemen custom (yang tidak ada di daftar `sertifikat`)
+            dokumen_sertifikat = [item for item in dokumen_sertifikat if item in sertifikat]
+        if dokumen_sertifikat:
+            form_merchant.sertifikat_produk = ', '.join(dokumen_sertifikat)
+
+        category_ids = ''
+        category_produk_ids = kw.get('categoryProduk', False)
+        if category_produk_ids:
+            category_ids = list(map(int, category_produk_ids.split(',')))
+            valid_category_ids = request.env['product.public.category'].search([('id', 'in', category_ids)]).ids
+            form_merchant.category_produk_ids = [(6, 0, valid_category_ids)]
+
+        file_dokumen = kw.get('file_dokumen', False)
+        if file_dokumen:
+            form_dokumen = json.loads(file_dokumen)
+
+            for dokumen in form_dokumen:
+                if form_dokumen[dokumen]['details']:
+                    mimetype, _ = mimetypes.guess_type(form_dokumen[dokumen]['details']['name'])
+                    mimetype = mimetype or 'application/octet-stream'
+                    data = base64.b64decode(form_dokumen[dokumen]['details']['format'])
+                    sppkp_attachment = request.env['ir.attachment'].create({
+                        'name': form_dokumen[dokumen]['details']['name'],
+                        'type': 'binary',
+                        'datas': base64.b64encode(data),
+                        'res_model': 'user.form.merchant',
+                        'res_id': form_merchant.id,
+                        'mimetype': mimetype
+                    })
+
+                    if dokumen == 'file_npwp':
+                        form_merchant.file_npwp = sppkp_attachment.id
+
+                    elif dokumen == 'file_sppkp':
+                        form_merchant.file_sppkp = sppkp_attachment.id
+
+                    elif dokumen == 'file_dokumenKtpDirut':
+                        form_merchant.file_dokumenKtpDirut = sppkp_attachment.id
+
+                    elif dokumen == 'file_kartuNama':
+                        form_merchant.file_kartuNama = sppkp_attachment.id
+
+                    elif dokumen == 'file_suratPernyataan':
+                        form_merchant.file_suratPernyataan = sppkp_attachment.id
+
+                    elif dokumen == 'file_fotoKantor':
+                        form_merchant.file_fotoKantor = sppkp_attachment.id
+
+                    elif dokumen == 'file_dataProduk':
+                        form_merchant.file_dataProduk = sppkp_attachment.id
+
+                    elif dokumen == 'file_pricelist':
+                        form_merchant.file_pricelist = sppkp_attachment.id
+        if not params['valid']:
+            return self.response(code=400, description=params)
+        if merchant_request:
+            user_merchant_request = request.env['user.merchant.request'].create({
+                'user_id': partner.id,
+                'merchant_id': form_merchant.id,
+                'user_company_id': main_partner.id
+            })
+
+        return self.response(True)
+
+    @http.route('/api/v1/detail-merchant/<id>', auth='public', methods=['GET', 'OPTIONS'])
+    @controller.Controller.must_authorized()
+    def get_partner_detail_merchant(self, **kw):
+        params = self.get_request_params(kw, {
+            'id': ['required', 'number']
+        })
+        partner = request.env['res.partner'].search([('id', '=', params['value']['id'])], limit=1)
+        main_partner = partner.get_main_parent()
+        form_merchant = request.env['user.form.merchant'].search([('partner_id', '=', main_partner.id)],limit=1)
+        if not form_merchant:
+            return self.response(code=404, description='form merchant not found')
+        form_merchant = request.env['res.partner'].api_single_response_merchant(form_merchant)
+        return self.response(form_merchant)
+
+    @http.route('/api/v1/check-merchant/<id>', auth='public', methods=['GET', 'OPTIONS'])
+    @controller.Controller.must_authorized()
+    def get_partner_form_merchant(self, **kw):
+        params = self.get_request_params(kw, {
+            'id': ['required', 'number']
+        })
+        partner = request.env['res.partner'].search([('id', '=', params['value']['id'])], limit=1)
+        main_partner = partner.get_main_parent()
+        form_merchant = request.env['user.merchant.request'].search([('user_company_id', '=', main_partner.id)], limit=1)
+        if form_merchant:
+            return self.response(form_merchant.state_merchant)
+        else:
+            return self.response(code=404, description='form merchant not found')
\ No newline at end of file
diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index 307165b3..126fded4 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -64,37 +64,43 @@ class Partner(controller.Controller):
     @http.route(prefix + 'partner/<id>/address', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def write_partner_address_by_id(self, **kw):
-        params = self.get_request_params(kw, {
-            'id': ['required', 'number'],
-            'type': ['default:other'],
-            'name': ['required'],
-            'email': ['required'],
-            'mobile': ['required'],
-            'phone': [''],
-            'street': ['required'],
-            'state_id': ['required', 'number', 'alias:state_id'],
-            'city_id': ['required', 'number', 'alias:kota_id'],
-            'district_id': ['number', 'alias:kecamatan_id'],
-            'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
-            'zip': ['required'],
-            'longtitude': [],
-            'latitude': [],
-            'address_map': [],
-            'alamat_lengkap_text': []
-        })
+        try:
+            params = self.get_request_params(kw, {
+                'id': ['required', 'number'],
+                'type': ['default:other'],
+                'name': ['required'],
+                'email': ['required'],
+                'mobile': ['required'],
+                'phone': [''],
+                'street': ['required'],
+                'state_id': ['required', 'number', 'alias:state_id'],
+                'city_id': ['required', 'number', 'alias:kota_id'],
+                'district_id': ['number', 'alias:kecamatan_id'],
+                'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
+                'zip': ['required'],
+                'longtitude': '',
+                'latitude': '',
+                'address_map': [],
+                'alamat_lengkap_text': []
+            })
 
-        if not params['valid']:
-            return self.response(code=400, description=params)
-        
-        partner = request.env[self._name].search([('id', '=', params['value']['id'])], limit=1)
-        if not partner:
-            return self.response(code=404, description='User not found')
-            
-        partner.write(params['value'])
+            if not params['valid']:
+                return self.response(code=400, description=params)
 
-        return self.response({
-            'id': partner.id
-        })
+            partner = request.env[self._name].sudo().search([('id', '=', params['value']['id'])], limit=1)
+
+            if not partner:
+                return self.response(code=404, description='User not found')
+
+            try:
+                partner.write(params['value'])
+            except Exception as e:
+                return self.response(code=500, description=f'Error writing partner data: {str(e)}')
+
+            return self.response({'id': partner.id})
+
+        except Exception as e:
+            return self.response(code=500, description=f'Unexpected error: {str(e)}')
 
     @http.route(prefix + 'partner/address', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
@@ -111,8 +117,8 @@ class Partner(controller.Controller):
             'city_id': ['required', 'number', 'alias:kota_id'],
             'district_id': ['number', 'alias:kecamatan_id'],
             'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
-            'longtitude': [],
-            'latitude': [],
+            'longtitude': '',
+            'latitude': '',
             'address_map': [],
             'zip': ['required']
         })
@@ -303,270 +309,310 @@ class Partner(controller.Controller):
     @http.route(prefix + 'partner/pengajuan_tempo', auth='public', methods=['POST'], csrf=False)
     @controller.Controller.must_authorized()
     def write_pengajuan_tempo(self, **kw):
-        id = int(kw.get('partner_id'))
-        user_id = int(kw.get('user_id'))
-        tempo_request = True if kw.get('tempo_request') == 'true' else False
-        pengajuan_tempo = request.env['user.pengajuan.tempo'].search([('name_tempo', '=', user_id)], limit=1)
-        user = request.env['res.partner'].search([('id', '=', user_id)], limit=1)
-        company_name = kw.get('name', pengajuan_tempo.name_tempo.name)
-        partner_id = request.env['res.partner'].search([('name', 'like', company_name)], limit=1)
-        user_account = self.get_user_by_email(user.email)
-
-        params = self.get_request_params(kw, {
-
-            # informasi perusahaan
-            # 'name': ['required', 'alias:name_tempo'],
-            'industryId': ['alias:industry_id_tempo'],
-            'street': ['alias:street_tempo'],
-            'state': ['alias:state_id_tempo'],
-            'city': ['alias:city_id_tempo'],
-            'district': ['alias:district_id_tempo'],
-            'subDistrict': ['alias:subDistrict_id_tempo'],
-            'zip': ['alias:zip_tempo'],
-            'mobile': ['alias:mobile_tempo'],
-            'bankName': ['alias:bank_name_tempo'],
-            'accountName': ['alias:account_name_tempo'],
-            'accountNumber': ['alias:account_number_tempo'],
-            'website': ['alias:website_tempo'],
-            'estimasi': ['alias:estimasi_tempo'],
-            'portal': ['alias:portal'],
-            'bersedia': ['alias:bersedia'],
-            'tempoDuration': ['alias:tempo_duration'],
-            'tempoLimit': ['alias:tempo_limit'],
-
-            # informasi perusahaan
-            'direkturTittle': ['alias:direktur_tittle'],
-            'direkturName': ['alias:direktur_name'],
-            'direkturMobile': ['alias:direktur_mobile'],
-            'direkturEmail': ['alias:direktur_email'],
-            'purchasingTittle': ['alias:purchasing_tittle'],
-            'purchasingName': ['alias:purchasing_name'],
-            'purchasingMobile': ['alias:purchasing_mobile'],
-            'purchasingEmail': ['alias:purchasing_email'],
-            'financeTittle': ['alias:finance_tittle'],
-            'financeName': ['alias:finance_name'],
-            'financeMobile': ['alias:finance_mobile'],
-            'financeEmail': ['alias:finance_email'],
-
-            # Pengiriman
-            'PICTittle': ['alias:pic_tittle'],
-            'PICName': ['alias:pic_name'],
-            'streetPengiriman': ['alias:street_pengiriman'],
-            'statePengiriman': ['alias:state_id_pengiriman'],
-            'cityPengiriman': ['alias:city_id_pengiriman'],
-            'districtPengiriman': ['alias:district_id_pengiriman'],
-            'subDistrictPengiriman': ['alias:subDistrict_id_pengiriman'],
-            'zipPengiriman': ['alias:zip_pengiriman'],
-            'invoicePicTittle': ['alias:invoice_pic_tittle'],
-            'invoicePic': ['alias:invoice_pic'],
-            'streetInvoice': ['alias:street_invoice'],
-            'stateInvoice': ['alias:state_id_invoice'],
-            'cityInvoice': ['alias:city_id_invoice'],
-            'districtInvoice': ['alias:district_id_invoice'],
-            'subDistrictInvoice': ['alias:subDistrict_id_invoice'],
-            'zipInvoice': ['alias:zip_invoice'],
-            'isSameAddrees':['alias:is_same_address'],
-            'isSameAddreesStreet':['alias:is_same_address_street'],
-        })
-
-        # # Konversi nilai 'true' ke boolean True
-        # is_same_address = kw.get('isSameAddrees', 'false').lower() == 'true'
-        # is_same_address_street = kw.get('isSameAddreesStreet', 'false').lower() == 'true'
-        #
-        # # Tambahkan nilai yang dikonversi ke params
-        # if 'isSameAddress' in kw:
-        #     params['value']['is_same_address'] = is_same_address
-        # if 'is_same_address_street' in kw:
-        #     params['value']['is_same_address_street'] = is_same_address_street
+        try:
+            id = int(kw.get('partner_id'))
+            user_id = int(kw.get('user_id'))
+            tempo_request = True if kw.get('tempo_request') == 'true' else False
+            pengajuan_tempo = request.env['user.pengajuan.tempo'].search([('name_tempo', '=', user_id)], limit=1)
+            user = request.env['res.partner'].search([('id', '=', user_id)], limit=1)
+            company_name = kw.get('name', pengajuan_tempo.name_tempo.name)
+            partner_id = request.env['res.partner'].search([('name', 'like', company_name)], limit=1)
+            user_account = self.get_user_by_email(user.email)
+            dokumen_prosedur = False
+            if kw.get('formDokumenProsedur') and kw.get('formDokumenProsedur') != 'false':
+                dokumen_prosedur = kw.get('formDokumenProsedur')
+            params = self.get_request_params(kw, {
+
+                # informasi perusahaan
+                # 'name': ['required', 'alias:name_tempo'],
+                'industryId': ['alias:industry_id_tempo'],
+                'street': ['alias:street_tempo'],
+                'state': ['alias:state_id_tempo'],
+                'city': ['alias:city_id_tempo'],
+                'district': ['alias:district_id_tempo'],
+                'subDistrict': ['alias:subDistrict_id_tempo'],
+                'zip': ['alias:zip_tempo'],
+                'mobile': ['alias:mobile_tempo'],
+                'bankName': ['alias:bank_name_tempo'],
+                'accountName': ['alias:account_name_tempo'],
+                'accountNumber': ['alias:account_number_tempo'],
+                'website': ['alias:website_tempo'],
+                'estimasi': ['alias:estimasi_tempo'],
+                'portal': ['alias:portal'],
+                'bersedia': ['alias:bersedia'],
+                'tempoDuration': ['alias:tempo_duration'],
+                'tempoLimit': ['alias:tempo_limit'],
+
+                # informasi perusahaan
+                'direkturTittle': ['alias:direktur_tittle'],
+                'direkturName': ['alias:direktur_name'],
+                'direkturMobile': ['alias:direktur_mobile'],
+                'direkturEmail': ['alias:direktur_email'],
+                'purchasingTittle': ['alias:purchasing_tittle'],
+                'purchasingName': ['alias:purchasing_name'],
+                'purchasingMobile': ['alias:purchasing_mobile'],
+                'purchasingEmail': ['alias:purchasing_email'],
+                'financeTittle': ['alias:finance_tittle'],
+                'financeName': ['alias:finance_name'],
+                'financeMobile': ['alias:finance_mobile'],
+                'financeEmail': ['alias:finance_email'],
+
+                # Pengiriman
+                'PICTittle': ['alias:pic_tittle'],
+                'PICBarangMobile': ['alias:pic_mobile'],
+                'PICName': ['alias:pic_name'],
+                'streetPengiriman': ['alias:street_pengiriman'],
+                'statePengiriman': ['alias:state_id_pengiriman'],
+                'cityPengiriman': ['alias:city_id_pengiriman'],
+                'districtPengiriman': ['alias:district_id_pengiriman'],
+                'subDistrictPengiriman': ['alias:subDistrict_id_pengiriman'],
+                'zipPengiriman': ['alias:zip_pengiriman'],
+                'invoicePicTittle': ['alias:invoice_pic_tittle'],
+                'invoicePicMobile': ['alias:invoice_pic_mobile'],
+                'invoicePic': ['alias:invoice_pic'],
+                'streetInvoice': ['alias:street_invoice'],
+                'stateInvoice': ['alias:state_id_invoice'],
+                'cityInvoice': ['alias:city_id_invoice'],
+                'districtInvoice': ['alias:district_id_invoice'],
+                'subDistrictInvoice': ['alias:subDistrict_id_invoice'],
+                'zipInvoice': ['alias:zip_invoice'],
+                'isSameAddrees':['alias:is_same_address'],
+                'isSameAddreesStreet':['alias:is_same_address_street'],
+            })
 
-        if not params['valid']:
-            return self.response(code=400, description=params)
-        if params['value']['portal']:
-            if params['value']['portal'] == 'ada':
-                params['value']['portal'] = True
+            # # Konversi nilai 'true' ke boolean True
+            # is_same_address = kw.get('isSameAddrees', 'false').lower() == 'true'
+            # is_same_address_street = kw.get('isSameAddreesStreet', 'false').lower() == 'true'
+            #
+            # # Tambahkan nilai yang dikonversi ke params
+            # if 'isSameAddress' in kw:
+            #     params['value']['is_same_address'] = is_same_address
+            # if 'is_same_address_street' in kw:
+            #     params['value']['is_same_address_street'] = is_same_address_street
+
+            if not params['valid']:
+                return self.response(code=400, description=params)
+            if params['value']['portal']:
+                if params['value']['portal'] == 'ada':
+                    params['value']['portal'] = True
+                else:
+                    params['value']['portal'] = False
+            # Filter data baru yang dikirim (non-kosong, boolean False tetap masuk)
+            new_data = {key: value for key, value in params['value'].items() if value != ''}
+
+            if pengajuan_tempo:
+                try:
+                    pengajuan_tempo.write(new_data)
+                except Exception as e:
+                    return self.response(code=500, description=f'Error updating partner data: {str(e)}')
             else:
-                params['value']['portal'] = False
-        # Filter data baru yang dikirim (non-kosong, boolean False tetap masuk)
-        new_data = {key: value for key, value in params['value'].items() if value != ''}
+                try:
+                    pengajuan_tempo = request.env['user.pengajuan.tempo'].create(new_data)
+                    pengajuan_tempo.partner_id = user_id
+                except Exception as e:
+                    return self.response(code=500, description=f'Error creating partner data: {str(e)}')
+
+            if partner_id:
+                try:
+                    pengajuan_tempo.name_tempo = partner_id
+                except Exception as e:
+                    return self.response(code=500, description=f'Error updating partner data: {str(e)}')
+
+            # Prosedur Pengiriman
+            if dokumen_prosedur:
+                dokumen_prosedur = json.loads(dokumen_prosedur)
+                mimetype, _ = mimetypes.guess_type(dokumen_prosedur['name'])
+                mimetype = mimetype or 'application/octet-stream'
+                data = base64.b64decode(dokumen_prosedur['base64'])
+                dokumen_prosedur_attachment = request.env['ir.attachment'].create({
+                    'name': dokumen_prosedur['name'],
+                    'type': 'binary',
+                    'datas': base64.b64encode(data),
+                    'res_model': 'user.pengajuan.tempo',
+                    'res_id': pengajuan_tempo.id,
+                    'mimetype': mimetype
+                })
+                pengajuan_tempo.dokumen_prosedur = [(6, 0, [dokumen_prosedur_attachment.id])]
+                pengajuan_tempo.message_post(body="Dokumen Prosedur", attachment_ids=[dokumen_prosedur_attachment.id])
+
+
+            form_supplier_data = kw.get('formSupplier', False)
+
+            if form_supplier_data:
+                try:
+                    form_supplier_data = json.loads(form_supplier_data)
+
+                    supplier_ids_to_add = []
+                    for item in form_supplier_data:
+                        supplier_name = item.get("supplier")
+                        pic_name = item.get("pic")
+                        phone = item.get("telepon")
+                        tempo_duration = item.get("durasiTempo")
+                        credit_limit = item.get("creditLimit")
+
+                        new_data = {
+                            'name_supplier': supplier_name,
+                            'pic_name': pic_name,
+                            'phone': phone,
+                            'tempo_duration': tempo_duration,
+                            'credit_limit': credit_limit,
+                        }
+                        new_supplier_data = request.env['user.pengajuan.tempo.line'].create(new_data)
+
+                        supplier_ids_to_add.append(new_supplier_data.id)
+
+                    pengajuan_tempo.write({'supplier_ids': [(6, 0, supplier_ids_to_add)]})
+
+                except json.JSONDecodeError:
+                    return http.Response(status=400, json_body={'error': 'Invalid JSON format for formSupplier'})
+            category_produk_ids = kw.get('categoryProduk', False)
+            category_ids = ''
+            if category_produk_ids:
+                try:
+                    category_ids = list(map(int, category_produk_ids.split(',')))
+                    pengajuan_tempo.category_produk_ids = [(6, 0, category_ids)]
+                except Exception as e:
+                    return self.response(code=500, description=f'Unexpected error: {str(e)}')
+
+
+            tukar_invoice_input = kw.get('tukarInvoiceInput')
+            if tukar_invoice_input:
+                pengajuan_tempo.tukar_invoice = tukar_invoice_input
+
+            tukar_invoice_input_pembayaran = kw.get('tukarInvoiceInputPembayaran')
+            if tukar_invoice_input_pembayaran:
+                pengajuan_tempo.jadwal_bayar = tukar_invoice_input_pembayaran
+
+            dokumen_kirim = [
+                'Surat Tanda Terima Barang (STTB)',
+                'Good Receipt (GR)',
+                'Surat Terima Barang (STB)',
+                'Lembar Penerimaan Barang (LPB)'
+            ]
+
+            dokumen_kirim_barang_ids = kw.get('dokumenPengiriman')
+            dokumen_kirim_input = kw.get('dokumenKirimInput', '')
+            dokumen_kirim_barang_input = kw.get('dokumenPengirimanInput', '')
+            dokumen_kirim_barang = []
+
+            if dokumen_kirim_barang_ids:
+                dokumen_kirim_ids = list(map(int, dokumen_kirim_barang_ids.split(',')))
+                dokumen_kirim_barang = [dokumen_kirim[i] for i in dokumen_kirim_ids if 0 <= i < len(dokumen_kirim)]
+            if dokumen_kirim_input:
+                input_items = [item.strip() for item in dokumen_kirim_input.split(',')]
+                dokumen_kirim_barang.extend(item for item in input_items if item and item not in dokumen_kirim_barang)
+                pengajuan_tempo.dokumen_kirim_input = dokumen_kirim_input
+            if dokumen_kirim_barang:
+                pengajuan_tempo.dokumen_pengiriman = ', '.join(dokumen_kirim_barang)
+            if dokumen_kirim_barang_input:
+                pengajuan_tempo.dokumen_pengiriman_input = dokumen_kirim_barang_input
+
+            dokumen = [
+                'Invoice Pembelian',
+                'Surat Jalan',
+                'Berita Acara Serah Terima (BAST)',
+                'Faktur Pajak',
+                'Good Receipt (GR)'
+            ]
+
+            dokumen_invoice = kw.get('dokumenPengirimanInvoice', '')
+            if dokumen_invoice:
+                pengajuan_tempo.dokumen_invoice = dokumen_invoice
+            user_tempo_request = []
+            if tempo_request:
+                user_tempo_request = request.env['user.pengajuan.tempo.request'].create({
+                    'user_id': id,
+                    'pengajuan_tempo_id': pengajuan_tempo.id,
+                    'user_company_id': partner_id.id,
+                    'tempo_duration': pengajuan_tempo.tempo_duration.id,
+                    'tempo_limit': pengajuan_tempo.tempo_limit,
+                })
 
-        if pengajuan_tempo:
-            # Jika pengajuan_tempo sudah ada, hanya write data baru yang non-kosong
-            pengajuan_tempo.write(new_data)
-        else:
-            # Jika belum ada, buat record baru
-            pengajuan_tempo = request.env['user.pengajuan.tempo'].create(new_data)
-            pengajuan_tempo.partner_id = user_id
+            form_dokumen_data = kw.get('formDocs', False)
+            if form_dokumen_data:
+                try:
+                    form_dokumen = json.loads(form_dokumen_data)
 
-        if partner_id:
-            pengajuan_tempo.name_tempo = partner_id
+                    for dokumen in form_dokumen:
+                        if dokumen['details']['base64'] != '':
+                            mimetype, _ = mimetypes.guess_type(dokumen['details']['name'])
+                            mimetype = mimetype or 'application/octet-stream'
+                            data = base64.b64decode(dokumen['details']['base64'])
+                            sppkp_attachment = request.env['ir.attachment'].create({
+                                'name': dokumen['details']['name'],
+                                'type': 'binary',
+                                'datas': base64.b64encode(data),
+                                'res_model': 'user.pengajuan.tempo',
+                                'res_id': pengajuan_tempo.id,
+                                'mimetype': mimetype
+                            })
 
-        form_supplier_data = kw.get('formSupplier', False)
+                            if dokumen['documentName'] == 'dokumenNib':
+                                pengajuan_tempo.dokumen_nib = [(6, 0, [sppkp_attachment.id])]
 
-        if form_supplier_data:
-            try:
-                form_supplier_data = json.loads(form_supplier_data)
-
-                supplier_ids_to_add = []
-                for item in form_supplier_data:
-                    supplier_name = item.get("supplier")
-                    pic_name = item.get("pic")
-                    phone = item.get("telepon")
-                    tempo_duration = item.get("durasiTempo")
-                    credit_limit = item.get("creditLimit")
-
-                    new_data = {
-                        'name_supplier': supplier_name,
-                        'pic_name': pic_name,
-                        'phone': phone,
-                        'tempo_duration': tempo_duration,
-                        'credit_limit': credit_limit,
-                    }
-                    new_supplier_data = request.env['user.pengajuan.tempo.line'].create(new_data)
-
-                    supplier_ids_to_add.append(new_supplier_data.id)
-
-                pengajuan_tempo.write({'supplier_ids': [(6, 0, supplier_ids_to_add)]})
-
-            except json.JSONDecodeError:
-                return http.Response(status=400, json_body={'error': 'Invalid JSON format for formSupplier'})
-        category_produk_ids = kw.get('categoryProduk', False)
-        category_ids = ''
-        if category_produk_ids:
-            category_ids = list(map(int, category_produk_ids.split(',')))
-            pengajuan_tempo.category_produk_ids = [(6, 0, category_ids)]
-
-        tukar_invoice_input = kw.get('tukarInvoiceInput')
-        if tukar_invoice_input:
-            pengajuan_tempo.tukar_invoice = tukar_invoice_input
-
-        tukar_invoice_input_pembayaran = kw.get('tukarInvoiceInputPembayaran')
-        if tukar_invoice_input_pembayaran:
-            pengajuan_tempo.jadwal_bayar = tukar_invoice_input_pembayaran
-
-        dokumen_kirim = [
-            'Surat Tanda Terima Barang (STTB)',
-            'Good Receipt (GR)',
-            'Surat Terima Barang (STB)',
-            'Lembar Penerimaan Barang (LPB)'
-        ]
-
-        dokumen_kirim_barang_ids = kw.get('dokumenPengiriman')
-        dokumen_kirim_input = kw.get('dokumenKirimInput', '')
-        dokumen_kirim_barang_input = kw.get('dokumenPengirimanInput', '')
-        dokumen_kirim_barang = []
-
-        if dokumen_kirim_barang_ids:
-            dokumen_kirim_ids = list(map(int, dokumen_kirim_barang_ids.split(',')))
-            dokumen_kirim_barang = [dokumen_kirim[i] for i in dokumen_kirim_ids if 0 <= i < len(dokumen_kirim)]
-        if dokumen_kirim_input:
-            input_items = [item.strip() for item in dokumen_kirim_input.split(',')]
-            dokumen_kirim_barang.extend(item for item in input_items if item and item not in dokumen_kirim_barang)
-            pengajuan_tempo.dokumen_kirim_input = dokumen_kirim_input
-        if dokumen_kirim_barang:
-            pengajuan_tempo.dokumen_pengiriman = ', '.join(dokumen_kirim_barang)
-        if dokumen_kirim_barang_input:
-            pengajuan_tempo.dokumen_pengiriman_input = dokumen_kirim_barang_input
-
-        dokumen = [
-            'Invoice Pembelian',
-            'Surat Jalan',
-            'Berita Acara Serah Terima (BAST)',
-            'Faktur Pajak',
-            'Good Receipt (GR)'
-        ]
-
-        dokumen_invoice = kw.get('dokumenPengirimanInvoice', '')
-        if dokumen_invoice:
-            pengajuan_tempo.dokumen_invoice = dokumen_invoice
-        user_tempo_request = []
-        if tempo_request:
-            user_tempo_request = request.env['user.pengajuan.tempo.request'].create({
-                'user_id': id,
-                'pengajuan_tempo_id': pengajuan_tempo.id,
-                'user_company_id': partner_id.id,
-                'tempo_duration': pengajuan_tempo.tempo_duration.id,
-                'tempo_limit': pengajuan_tempo.tempo_limit,
-            })
+                            elif dokumen['documentName'] == 'dokumenSiup':
+                                pengajuan_tempo.dokumen_siup = [(6, 0, [sppkp_attachment.id])]
 
-        form_dokumen_data = kw.get('formDocs', False)
-        if form_dokumen_data:
-            try:
-                form_dokumen = json.loads(form_dokumen_data)
+                            elif dokumen['documentName'] == 'dokumenTdp':
+                                pengajuan_tempo.dokumen_tdp = [(6, 0, [sppkp_attachment.id])]
 
-                for dokumen in form_dokumen:
-                    if dokumen['details']['base64'] != '':
-                        mimetype, _ = mimetypes.guess_type(dokumen['details']['name'])
-                        mimetype = mimetype or 'application/octet-stream'
-                        data = base64.b64decode(dokumen['details']['base64'])
-                        sppkp_attachment = request.env['ir.attachment'].create({
-                            'name': dokumen['details']['name'],
-                            'type': 'binary',
-                            'datas': base64.b64encode(data),
-                            'res_model': 'user.pengajuan.tempo',
-                            'res_id': pengajuan_tempo.id,
-                            'mimetype': mimetype
-                        })
+                            elif dokumen['documentName'] == 'dokumenSkdp':
+                                pengajuan_tempo.dokumen_skdp = [(6, 0, [sppkp_attachment.id])]
 
-                        if dokumen['documentName'] == 'dokumenNib':
-                            pengajuan_tempo.dokumen_nib = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenSkt':
+                                pengajuan_tempo.dokumen_skt = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenSiup':
-                            pengajuan_tempo.dokumen_siup = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenNpwp':
+                                pengajuan_tempo.dokumen_npwp = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenTdp':
-                            pengajuan_tempo.dokumen_tdp = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenSppkp':
+                                pengajuan_tempo.dokumen_sppkp = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenSkdp':
-                            pengajuan_tempo.dokumen_skdp = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenAktaPerubahan':
+                                pengajuan_tempo.dokumen_akta_perubahan = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenSkt':
-                            pengajuan_tempo.dokumen_skt = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenKtpDirut':
+                                pengajuan_tempo.dokumen_ktp_dirut = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenNpwp':
-                            pengajuan_tempo.dokumen_npwp = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenAktaPendirian':
+                                pengajuan_tempo.dokumen_akta_pendirian = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenSppkp':
-                            pengajuan_tempo.dokumen_sppkp = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenLaporanKeuangan':
+                                pengajuan_tempo.dokumen_laporan_keuangan = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenAktaPerubahan':
-                            pengajuan_tempo.dokumen_akta_perubahan = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenFotoKantor':
+                                pengajuan_tempo.dokumen_foto_kantor = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenKtpDirut':
-                            pengajuan_tempo.dokumen_ktp_dirut = [(6, 0, [sppkp_attachment.id])]
+                            elif dokumen['documentName'] == 'dokumenTempatBekerja':
+                                pengajuan_tempo.dokumen_tempat_bekerja = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenAktaPendirian':
-                            pengajuan_tempo.dokumen_akta_pendirian = [(6, 0, [sppkp_attachment.id])]
+                            formatted_text = ''.join([' ' + char if char.isupper() and i != 0 else char for i, char in
+                                                      enumerate(dokumen['documentName'])])
+                            teks = formatted_text.strip().title()
+                            pengajuan_tempo.message_post(body=teks, attachment_ids=[sppkp_attachment.id])
+                            if tempo_request:
+                                user_tempo_request.message_post(body=teks, attachment_ids=[sppkp_attachment.id])
 
-                        elif dokumen['documentName'] == 'dokumenLaporanKeuangan':
-                            pengajuan_tempo.dokumen_laporan_keuangan = [(6, 0, [sppkp_attachment.id])]
 
-                        elif dokumen['documentName'] == 'dokumenFotoKantor':
-                            pengajuan_tempo.dokumen_foto_kantor = [(6, 0, [sppkp_attachment.id])]
+                except json.JSONDecodeError:
+                    return http.Response(status=400, json_body={'error': 'Invalid JSON format for formDokumen'})
 
-                        elif dokumen['documentName'] == 'dokumenTempatBekerja':
-                            pengajuan_tempo.dokumen_tempat_bekerja = [(6, 0, [sppkp_attachment.id])]
+            if tempo_request:
+                # pengajuan_tempo.user_id = id
+                template = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_request_tempo_review')
+                template.send_mail(pengajuan_tempo.id, force_send=True)
+                template2 = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_new_tempo_to_sales')
+                template2.send_mail(pengajuan_tempo.id, force_send=True)
+            if not pengajuan_tempo:
+                return self.response(code=500, description="Failed to create or update pengajuan_tempo")
 
-                        formatted_text = ''.join([' ' + char if char.isupper() and i != 0 else char for i, char in
-                                                  enumerate(dokumen['documentName'])])
-                        teks = formatted_text.strip().title()
-                        pengajuan_tempo.message_post(body=teks, attachment_ids=[sppkp_attachment.id])
-                        if tempo_request:
-                            user_tempo_request.message_post(body=teks, attachment_ids=[sppkp_attachment.id])
-
-
-            except json.JSONDecodeError:
-                return http.Response(status=400, json_body={'error': 'Invalid JSON format for formDokumen'})
+            return self.response({
+                'id': pengajuan_tempo.id,
+                'user_id': user_id,
+            })
+        except Exception as e:
+            return self.response(code=500, description=f'Unexpected error: {str(e)}')
 
-        if tempo_request:
-            # pengajuan_tempo.user_id = id
-            template = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_request_tempo_review')
-            template.send_mail(pengajuan_tempo.id, force_send=True)
-            template2 = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_new_tempo_to_sales')
-            template2.send_mail(pengajuan_tempo.id, force_send=True)
-        return self.response({
-            'id': pengajuan_tempo.id,
-            'user_id': user_id,
-        })
 
     def get_user_by_email(self, email):
         return request.env['res.users'].search([
diff --git a/indoteknik_api/controllers/api_v1/product.py b/indoteknik_api/controllers/api_v1/product.py
index 32362582..a88c3368 100644
--- a/indoteknik_api/controllers/api_v1/product.py
+++ b/indoteknik_api/controllers/api_v1/product.py
@@ -1,13 +1,13 @@
 from .. import controller
 from odoo import http
-from odoo.http import request
+from odoo.http import request, Response
 from datetime import datetime, timedelta
 import ast
 import logging
 import math
 import json
 
-_logger = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)  
 
 
 class Product(controller.Controller):
@@ -33,9 +33,70 @@ class Product(controller.Controller):
 
         categories.reverse()
         return self.response(categories, headers=[('Cache-Control', 'max-age=3600, public')])
-
-    @http.route(prefix + 'product_variant/<id>/stock', auth='public', methods=['GET', 'OPTIONS'])
+    
+    @http.route(prefix + 'product/variants/sla', auth='public', methods=['POST', 'OPTIONS'] , csrf=False)
     @controller.Controller.must_authorized()
+    def get_product_template_sla_by_id(self, **kwargs):
+        
+        raw_data = kwargs.get('products', '[]')
+        product_data = json.loads(raw_data)
+        
+        product_ids = [int(item["id"]) for item in product_data]
+        products = request.env['purchase.pricelist'].search([
+            ('product_id', 'in', product_ids),
+            ('is_winner', '=', True)
+        ])
+        
+        start_date = datetime.today().date()
+        additional_days = request.env['sale.order'].get_days_until_next_business_day(start_date)
+        include_instant = True
+        
+        if(len(products) != len(product_ids)):  
+            products_data_params = {product["id"] : product for product in product_data }
+            
+            all_fast_products = all(
+                product.product_id.qty_free_bandengan >= products_data_params.get(product.product_id.id, {}).get("quantity", 0)
+                for product in products
+            )
+        
+            if all_fast_products: 
+                return self.response({
+                    'include_instant': include_instant,
+                    'sla_duration': 1,
+                    'sla_additional_days': additional_days,
+                    'sla_total' : int(1) + int(additional_days),
+                    'sla_unit': 'Hari'
+                })
+            
+        max_slatime  = 1
+
+        for vendor in products:
+            vendor_sla = request.env['vendor.sla'].search([('id_vendor', '=', vendor.vendor_id.id)], limit=1)
+            slatime = 15
+            if vendor_sla:
+                if vendor_sla.unit == 'hari':
+                    vendor_duration = vendor_sla.duration * 24 * 60
+                    include_instant = False
+                else : 
+                    vendor_duration = vendor_sla.duration * 60
+                    include_instant = True
+                    
+                estimation_sla = (1 * 24 * 60) + vendor_duration
+                estimation_sla_days = estimation_sla / (24 * 60)
+                slatime = math.ceil(estimation_sla_days)
+            
+            max_slatime = max(max_slatime, slatime)
+            
+        return self.response({
+            'include_instant': include_instant,
+            'sla_duration': max_slatime,
+            'sla_additional_days': additional_days,
+            'sla_total' : int(max_slatime) + int(additional_days),
+            'sla_unit': 'Hari'
+        })
+    
+    @http.route(prefix + 'product_variant/<id>/stock', auth='public', methods=['GET', 'OPTIONS'])
+    @controller.Controller.must_authorized()        
     def get_product_template_stock_by_id(self, **kw):
         id = int(kw.get('id'))
         date_7_days_ago = datetime.now() - timedelta(days=7)
@@ -49,10 +110,11 @@ class Product(controller.Controller):
         ], limit=1)
 
         qty_available = product.qty_free_bandengan
-
-        if qty_available < 0:
-            qty_available = 0
-
+        
+        
+        if qty_available < 1 :
+            qty_available = 0 
+                
         qty = 0
         sla_date = '-'
 
@@ -74,24 +136,25 @@ class Product(controller.Controller):
 
                 if qty_available > 0:
                     qty = qty_available + total_adem + total_excell
+                    sla_date = product_sla.sla or 1
                 elif qty_altama > 0 or qty_vendor > 0:
                     qty = total_adem if qty_altama > 0 else total_excell
-                    sla_date = '2-4 Hari'
+                    sla_date = product_sla.sla  
                 else:
-                    sla_date = '3-7 Hari'
+                    sla_date = product_sla.sla
             except:
                 print('error')
         else:
             if qty_available > 0:
                 qty = qty_available
-                sla_date = product_sla.sla or '-'
+                sla_date = product_sla.sla or 'Indent'
             elif qty_vendor > 0:
                 qty = total_excell
                 sla_date = '2-4 Hari'
 
         data = {
             'qty': qty,
-            'sla_date': sla_date,
+            'sla_date': sla_date
         }
 
         return self.response(data, headers=[('Cache-Control', 'max-age=600, private')])
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index a7e027c8..d5208fb1 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -54,6 +54,20 @@ class SaleOrder(controller.Controller):
             # sales = request.env['sale.order'].search_read([('name', '=', sale_number)], fields=['id', 'name', 'amount_total', 'state'])
             sales = request.env['sale.order'].search(query, limit=1)
         data = []
+        INDONESIAN_MONTHS = {
+            1: 'Januari',
+            2: 'Februari',
+            3: 'Maret',
+            4: 'April',
+            5: 'Mei',
+            6: 'Juni',
+            7: 'Juli',
+            8: 'Agustus',
+            9: 'September',
+            10: 'Oktober',
+            11: 'November',
+            12: 'Desember',
+        }
         for sale in sales:
             product_name = ''
             product_not_in_id = 0
@@ -65,6 +79,7 @@ class SaleOrder(controller.Controller):
                 'id': sale.id,
                 'name': sale.name,
                 'date_order': self.time_to_str(sale.date_order, '%d/%m/%Y %H:%M:%S'),
+                'expected_ready_to_ship': f"{sale.expected_ready_to_ship.day} {INDONESIAN_MONTHS[sale.expected_ready_to_ship.month]} {sale.expected_ready_to_ship.year}",
                 'state': sale.state,
                 'amount_untaxed': sale.amount_untaxed,
                 'amount_tax': sale.amount_tax,
@@ -142,6 +157,15 @@ class SaleOrder(controller.Controller):
         sale_order = request.env['sale.order'].search(domain)
         if sale_order:
             data = request.env['sale.order'].api_v1_single_response(sale_order, context='with_detail')
+            if sale_order.expected_ready_to_ship:
+                bulan_id = [
+                    "Januari", "Februari", "Maret", "April", "Mei", "Juni",
+                    "Juli", "Agustus", "September", "Oktober", "November", "Desember"
+                ]
+                tanggal = sale_order.expected_ready_to_ship.day
+                bulan = bulan_id[sale_order.expected_ready_to_ship.month - 1]
+                tahun = sale_order.expected_ready_to_ship.year
+                data['expected_ready_to_ship'] = f"{tanggal} {bulan} {tahun}"
 
         return self.response(data)
 
@@ -386,7 +410,8 @@ class SaleOrder(controller.Controller):
             'note_website': [],
             'voucher': [],
             'source': [],
-            'estimated_arrival_days': ['number', 'default:0']
+            'estimated_arrival_days': ['number', 'default:0'],
+            'estimated_arrival_days_start': ['number', 'default:0']
         })
         
         if not params['valid']:
@@ -417,6 +442,7 @@ class SaleOrder(controller.Controller):
             'partner_purchase_order_file': params['value']['po_file'],
             'delivery_amt': params['value']['delivery_amount'] * 1.10,
             'estimated_arrival_days': params['value']['estimated_arrival_days'],
+            'estimated_arrival_days_start': params['value']['estimated_arrival_days_start'],
             'shipping_cost_covered': 'customer',
             'shipping_paid_by': 'customer',
             'carrier_id': params['value']['carrier_id'],
@@ -464,6 +490,8 @@ class SaleOrder(controller.Controller):
                     'program_line_id': cart['id'],
                     'quantity': cart['quantity']
                 })
+        
+        sale_order._compute_etrts_date()
 
         request.env['sale.order.promotion'].create(promotions)
         
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 2e0c4ad0..31706b99 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -101,7 +101,7 @@ class StockPicking(controller.Controller):
         picking = picking_model.browse(id)
         if not picking:
             return self.response(None)
-        
+        hostori = picking.get_tracking_detail()
         return self.response(picking.get_tracking_detail())
 
     @http.route(prefix + 'stock-picking/<id>/tracking', auth='public', method=['GET', 'OPTIONS'])
@@ -116,10 +116,10 @@ class StockPicking(controller.Controller):
 
         return self.response(picking.get_tracking_detail())
 
-    @http.route(prefix + 'stock-picking/<picking_code>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
+    @http.route(prefix + 'stock-picking/<scanid>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def write_partner_stock_picking_documentation(self, **kw):
-        picking_code = int(kw.get('picking_code', 0))
+        scanid = int(kw.get('scanid', 0))
         sj_document = kw.get('sj_document', False)
         paket_document = kw.get('paket_document', False)
 
@@ -128,7 +128,10 @@ class StockPicking(controller.Controller):
                   'driver_arrival_date': datetime.utcnow(),
                   }
 
-        picking_data = request.env['stock.picking'].search([('picking_code', '=', picking_code)], limit=1)
+        picking_data = request.env['stock.picking'].search([('id', '=', scanid)], limit=1)
+
+        if not picking_data:
+            picking_data = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=1)
 
         if not picking_data:
             return self.response(code=404, description='picking not found')
@@ -136,4 +139,50 @@ class StockPicking(controller.Controller):
 
         return self.response({
             'name': picking_data.name
-        })
\ No newline at end of file
+        })
+      
+    @http.route(prefix + 'webhook/biteship',  type='json',  auth='public', methods=['POST'], csrf=False)
+    def udpate_status_from_bitehsip(self, **kw):
+        try:
+            if not request.jsonrequest:
+                return "ok"
+            
+            data = request.jsonrequest  # Ambil data JSON dari request
+            event = data.get('event')
+
+            # Handle Event Berdasarkan Jenisnya
+            if event == "order.status":
+                self.process_order_status(data)
+            elif event == "order.price":
+                self.process_order_price(data)
+            elif event == "order.waybill_id":
+                self.process_order_waybill(data)
+
+            return {'success': True, 'message': f'Webhook {event} received'}
+        except Exception as e:
+            return {'success': False, 'message': str(e)}
+
+    def process_order_status(self, data):
+        picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))], limit=1)
+        if data.get('status') == 'picked':
+            picking_model.write({'driver_departure_date': datetime.utcnow()})
+        elif data.get('status') == 'delivered':
+            picking_model.write({'driver_arrival_date': datetime.utcnow()})
+            
+    def process_order_price(self, data):
+        picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))], limit=1)
+        order = request.env['sale.order'].sudo().search([('name', '=', picking_model.sale_id.name)], limit=1)
+        if order:
+            order.write({
+                'delivery_amt': data.get('price')
+            })
+
+    def process_order_waybill(self, data):
+        picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))], limit=1)
+        if picking_model:
+            picking_model.write({
+                'biteship_waybill_id': data.get('courier_waybill_id'), 
+                'delivery_tracking_no': data.get('courier_waybill_id'), 
+                'biteship_tracking_id':data.get('courier_tracking_id')
+                })
+    
\ No newline at end of file
diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index c0974367..967bbcc9 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -60,7 +60,9 @@ class User(controller.Controller):
                 'user': self.response_with_token(user),
             }
             return self.response(data)
-        except:
+        except Exception as e:
+            respon = str(e)
+            print(respon)
             return self.response({
                 'is_auth': False,
                 'reason': 'NOT_FOUND'
@@ -131,6 +133,7 @@ class User(controller.Controller):
         nama_wajib_pajak = kw.get('nama_wajib_pajak', False)
         is_pkp = kw.get('is_pkp')
         is_terdaftar = kw.get('is_terdaftar', False)
+        is_terdaftar = False if is_terdaftar == 'false' else is_terdaftar
         type_acc = kw.get('type_acc', 'individu') or 'individu'
 
         if not name or not email or not password:
@@ -162,9 +165,7 @@ class User(controller.Controller):
             'sel_groups_1_9_10': 9
         }
 
-        user = request.env['res.users'].create(user_data)
-        user.partner_id.email = email
-        user.partner_id.mobile = phone
+
 
         if type_acc == 'business' and business_name:
             # Eksekusi query SQL menggunakan Levenshtein distance
@@ -182,7 +183,9 @@ class User(controller.Controller):
             if result and is_terdaftar:
                 match_company_name = result[2]
                 match_company_id = result[0]
-
+                user = request.env['res.users'].create(user_data)
+                user.partner_id.email = email
+                user.partner_id.mobile = phone
                 # Create a user company request
                 request.env['user.company.request'].create({
                     'user_id': user.partner_id.id,
@@ -190,6 +193,9 @@ class User(controller.Controller):
                     'user_input': business_name
                 })
             else:
+                if not result and is_terdaftar:
+                    response['reason'] = 'BISNIS_NOT_FOUND'
+                    return self.response(response)
                 if not nama_wajib_pajak and is_pkp == 'false':
                     nama_wajib_pajak = business_name
 
@@ -213,6 +219,10 @@ class User(controller.Controller):
                     'property_account_payable_id': 438,
                     'active': False,
                 }
+
+                user = request.env['res.users'].create(user_data)
+                user.partner_id.email = email
+                user.partner_id.mobile = phone
                 new_company = request.env['res.partner'].create(new_company_data)
                 request.env['user.company.request'].create({
                     'user_id': user.partner_id.id,
@@ -247,8 +257,10 @@ class User(controller.Controller):
                         'mimetype': sppkp_mimetype
                     })
                     new_company.message_post(body="SPPKP Uploaded", attachment_ids=[sppkp_attachment.id])
-
         if type_acc == 'individu':
+            user = request.env['res.users'].create(user_data)
+            user.partner_id.email = email
+            user.partner_id.mobile = phone
             user.partner_id.customer_type = 'nonpkp'
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'