<iman> update merchant contact

4 files changed, 123 insertions, 21 deletions

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 8a420048..7852682f 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -182,20 +182,52 @@ class ResPartner(models.Model):
         ('4', 'Importer (Pengimpor Barang)'),
         ('5', 'Wholesaler (Pedagang Besar)'),
     ])
-
+    # Informasi Vendor
     harga_tayang = fields.Char(string='Harga Tayang (HET)')
-    file_dokumenKtpDirut = fields.Binary(string="KTP Dirut/Direktur", tracking=True, track_visibility="onchange")
-    file_kartuNama = fields.Binary(string="Kartu Nama", tracking=True, track_visibility="onchange")
-    file_npwp = fields.Binary(string="NPWP", tracking=True, track_visibility="onchange")
-    file_sppkp = fields.Binary(string="SPPKP", tracking=True, track_visibility="onchange")
-    file_suratPernyataan = fields.Binary(string="Surat Pernyataan Nomor Rekening", tracking=True,
-                                         track_visibility="onchange")
-    file_fotoKantor = fields.Binary(string="Foto Gudang / Kantor Bagian Depan", tracking=True,
-                                    track_visibility="onchange")
-    file_dataProduk = fields.Binary(string="Data Produk (Item Name, Gambar, Deskripsi)", tracking=True,
-                                    track_visibility="onchange")
-    file_pricelist = fields.Binary(string="Pricelist", tracking=True, track_visibility="onchange")
-    description = fields.Text(string='Deskripsi')
+    category_produk_ids_merchant = fields.Many2many(
+        'product.public.category',
+        string='Kategori Produk Merchant',
+        domain=lambda self: self._get_default_category_domain(),
+        relation='res_partner_category_produk_ids_merchant_rel'  # Nama tabel relasi berbeda
+    )
+
+    @api.model
+    def _get_default_category_domain(self):
+        return [('parent_id', '=', False)]
+
+    merk_dagang = fields.Char(string='Merk Dagang')
+    is_pengajuan_tempo = fields.Boolean(string='Apakah anda memiliki Form Pengajuan Tempo?')
+    tempo_duration_merchant = fields.Many2one('account.payment.term', string='Durasi Tempo')
+    kredit_limit = fields.Char(string='Kredit Limit')
+    waktu_pengiriman = fields.Char(string='Waktu Pengiriman')
+    terhitung_sejak = fields.Selection([
+        ('1', 'Terima PO'),
+        ('2', 'Barang Dikirimkan'),
+        ('3', 'Tukar Faktur'),
+    ])
+
+    # syarat dagang
+    is_kembali_barang = fields.Char(string='Syarat Pengembalian Barang')
+    tenggat_waktu = fields.Char(string='Tenggat Waktu Perubahan Harga')
+    sertifikat_produk = fields.Char(string='Dokumen/Sertifikat yang Dimiliki Oleh Brand')
+    custom_sertifikat_produk = fields.Char(string='Dokumen/Sertifikat Lainnya')
+    tempo_garansi = fields.Selection([
+        ('1', '6 Bulan Garansi'),
+        ('2', '1 Tahun Garansi'),
+        ('3', '2 Tahun Garansi'),
+    ])
+    explain_garansi = fields.Char(string='Garansi Yang Dimaksudkan')
+    is_order_quantity = fields.Char(string='Apakah Memiliki Minimum Order Quantity (MOQ)')
+
+    # dokumen
+    file_npwp = fields.Many2one('ir.attachment', string="NPWP Perusahaan", tracking=3)
+    file_sppkp = fields.Many2one('ir.attachment', string="SPPKP Perusahaan", tracking=3)
+    file_dokumenKtpDirut = fields.Many2one('ir.attachment', string="KTP Dirut/Direktur", tracking=3)
+    file_kartuNama = fields.Many2one('ir.attachment', string="Kartu Nama", tracking=3)
+    file_suratPernyataan = fields.Many2one('ir.attachment', string="Surat Pernyataan Nomor Rekening", tracking=3)
+    file_fotoKantor = fields.Many2one('ir.attachment', string="Foto Gudang / Kantor Bagian Depan", tracking=3)
+    file_dataProduk = fields.Many2one('ir.attachment', string="Data Produk (Item Name, Gambar, Deskripsi)", tracking=3)
+    file_pricelist = fields.Many2one('ir.attachment', string="Pricelist", tracking=3)
 
     @api.model
     def _default_payment_term(self):
@@ -323,9 +355,12 @@ class ResPartner(models.Model):
             vals['dokumen_foto_kantor'] = vals.get('dokumen_foto_kantor', self.dokumen_foto_kantor)
             vals['dokumen_tempat_bekerja'] = vals.get('dokumen_tempat_bekerja', self.dokumen_tempat_bekerja)
 
-            # Merchant
+            # MERCHANT
+            # Informasi Perusahaan
             vals['name_merchant'] = vals.get('name_merchant', self.name_merchant)
+            vals['pejabat_name'] = vals.get('pejabat_name', self.pejabat_name)
             vals['pic_merchant'] = vals.get('pic_merchant', self.pic_merchant)
+            vals['pic_position'] = vals.get('pic_position', self.pic_position)
             vals['address_merchant'] = vals.get('address_merchant', self.address_merchant)
             vals['state_merchant'] = vals.get('state_merchant', self.state_merchant)
             vals['city_merchant'] = vals.get('city_merchant', self.city_merchant)
@@ -340,7 +375,30 @@ class ResPartner(models.Model):
             vals['email_finance_merchant'] = vals.get('email_finance_merchant', self.email_finance_merchant)
             vals['phone_merchant'] = vals.get('phone_merchant', self.phone_merchant)
             vals['mobile_merchant'] = vals.get('mobile_merchant', self.mobile_merchant)
+            vals['bisnis_type'] = vals.get('bisnis_type', self.bisnis_type)
+            vals['website_merchant'] = vals.get('website_merchant', self.website_merchant)
+            vals['category_perusahaan'] = vals.get('category_perusahaan', self.category_perusahaan)
+
+            #  Informasi Vendor
             vals['harga_tayang'] = vals.get('harga_tayang', self.harga_tayang)
+            vals['category_produk_ids_merchant'] = vals.get('category_produk_ids_merchant', self.category_produk_ids_merchant)
+            vals['merk_dagang'] = vals.get('merk_dagang', self.merk_dagang)
+            vals['is_pengajuan_tempo'] = vals.get('is_pengajuan_tempo', self.is_pengajuan_tempo)
+            vals['tempo_duration_merchant'] = vals.get('tempo_duration_merchant', self.tempo_duration_merchant)
+            vals['kredit_limit'] = vals.get('kredit_limit', self.kredit_limit)
+            vals['waktu_pengiriman'] = vals.get('waktu_pengiriman', self.waktu_pengiriman)
+            vals['terhitung_sejak'] = vals.get('terhitung_sejak', self.terhitung_sejak)
+
+            #  Syarat Dagang
+            vals['is_kembali_barang'] = vals.get('is_kembali_barang', self.is_kembali_barang)
+            vals['tenggat_waktu'] = vals.get('tenggat_waktu', self.tenggat_waktu)
+            vals['sertifikat_produk'] = vals.get('sertifikat_produk', self.sertifikat_produk)
+            vals['custom_sertifikat_produk'] = vals.get('custom_sertifikat_produk', self.custom_sertifikat_produk)
+            vals['tempo_garansi'] = vals.get('tempo_garansi', self.tempo_garansi)
+            vals['explain_garansi'] = vals.get('explain_garansi', self.explain_garansi)
+            vals['is_order_quantity'] = vals.get('is_order_quantity', self.is_order_quantity)
+
+            # Dokumen
             vals['file_dokumenKtpDirut'] = vals.get('file_dokumenKtpDirut', self.file_dokumenKtpDirut)
             vals['file_kartuNama'] = vals.get('file_kartuNama', self.file_kartuNama)
             vals['file_npwp'] = vals.get('file_npwp', self.file_npwp)
@@ -423,6 +481,9 @@ class ResPartner(models.Model):
 
                 # Merchant
                 'name_merchant': vals.get('name_merchant'),
+                'pejabat_name': vals.get('pejabat_name'),
+                'pic_merchant': vals.get('pic_merchant'),
+                'pic_position': vals.get('pic_position'),
                 'address_merchant': vals.get('address_merchant'),
                 'state_merchant': vals.get('state_merchant'),
                 'city_merchant': vals.get('city_merchant'),
@@ -437,12 +498,33 @@ class ResPartner(models.Model):
                 'email_finance_merchant': vals.get('email_finance_merchant'),
                 'phone_merchant': vals.get('phone_merchant'),
                 'mobile_merchant': vals.get('mobile_merchant'),
+                'bisnis_type': vals.get('bisnis_type'),
+                'website_merchant': vals.get('website_merchant'),
+                'category_perusahaan': vals.get('category_perusahaan'),
+                'harga_tayang': vals.get('harga_tayang'),
+                'category_produk_ids_merchant': vals.get('category_produk_ids_merchant'),
+                'merk_dagang': vals.get('merk_dagang'),
+                'is_pengajuan_tempo': vals.get('is_pengajuan_tempo'),
+                'tempo_duration_merchant': vals.get('tempo_duration_merchant'),
+                'kredit_limit': vals.get('kredit_limit'),
+                'waktu_pengiriman': vals.get('waktu_pengiriman'),
+                'terhitung_sejak': vals.get('terhitung_sejak'),
+                'is_kembali_barang': vals.get('is_kembali_barang'),
+                'tenggat_waktu': vals.get('tenggat_waktu'),
+                'sertifikat_produk': vals.get('sertifikat_produk'),
+                'custom_sertifikat_produk': vals.get('custom_sertifikat_produk'),
+                'tempo_garansi': vals.get('tempo_garansi'),
+                'explain_garansi': vals.get('explain_garansi'),
+                'is_order_quantity': vals.get('is_order_quantity'),
+
                 'file_dokumenKtpDirut': vals.get('file_dokumenKtpDirut'),
                 'file_kartuNama': vals.get('file_kartuNama'),
                 'file_npwp': vals.get('file_npwp'),
                 'file_sppkp': vals.get('file_sppkp'),
                 'file_suratPernyataan': vals.get('file_suratPernyataan'),
                 'file_fotoKantor': vals.get('file_fotoKantor'),
+                'file_dataProduk': vals.get('file_dataProduk'),
+                'file_pricelist': vals.get('file_pricelist'),
                 'description': vals.get('description'),
             }
 
diff --git a/indoteknik_custom/models/user_form_merchant.py b/indoteknik_custom/models/user_form_merchant.py
index 6d881621..a804e93f 100644
--- a/indoteknik_custom/models/user_form_merchant.py
+++ b/indoteknik_custom/models/user_form_merchant.py
@@ -52,7 +52,6 @@ class UserFormMerchant(models.Model):
     def _get_default_category_domain(self):
         return [('parent_id', '=', False)]
 
-
     merk_dagang = fields.Char(string='Merk Dagang')
     is_pengajuan_tempo = fields.Boolean(string='Apakah anda memiliki Form Pengajuan Tempo?')
     tempo_duration = fields.Many2one('account.payment.term', string='Durasi Tempo')
@@ -64,8 +63,6 @@ class UserFormMerchant(models.Model):
         ('3', 'Tukar Faktur'),
     ])
 
-
-
     # syarat dagang
     is_kembali_barang = fields.Char(string='Syarat Pengembalian Barang')
     tenggat_waktu = fields.Char(string='Tenggat Waktu Perubahan Harga')
@@ -79,7 +76,6 @@ class UserFormMerchant(models.Model):
     explain_garansi = fields.Char(string='Garansi Yang Dimaksudkan')
     is_order_quantity = fields.Char(string='Apakah Memiliki Minimum Order Quantity (MOQ)')
 
-
     # dokumen
     file_npwp = fields.Many2one('ir.attachment', string="NPWP Perusahaan", tracking=3)
     file_sppkp = fields.Many2one('ir.attachment', string="SPPKP Perusahaan", tracking=3)
diff --git a/indoteknik_custom/models/user_merchant_request.py b/indoteknik_custom/models/user_merchant_request.py
index a373a771..dd571cdc 100644
--- a/indoteknik_custom/models/user_merchant_request.py
+++ b/indoteknik_custom/models/user_merchant_request.py
@@ -72,7 +72,9 @@ class UserMerchantRequest(models.Model):
         if is_approve:
             # Informasi Perusahaan
             self.user_company_id.name_merchant = self.merchant_id.name_merchant
+            self.user_company_id.pejabat_name = self.merchant_id.pejabat_name
             self.user_company_id.pic_merchant = self.merchant_id.pic_merchant
+            self.user_company_id.pic_position = self.merchant_id.pic_position
             self.user_company_id.address_merchant = self.merchant_id.address
             self.user_company_id.state_merchant = self.merchant_id.state
             self.user_company_id.city_merchant = self.merchant_id.city
@@ -87,11 +89,33 @@ class UserMerchantRequest(models.Model):
             self.user_company_id.email_finance_merchant = self.merchant_id.email_finance
             self.user_company_id.phone_merchant = self.merchant_id.phone
             self.user_company_id.mobile_merchant = self.merchant_id.mobile
+            self.user_company_id.bisnis_type = self.merchant_id.bisnis_type
+            self.user_company_id.website_merchant = self.merchant_id.website
+            self.user_company_id.category_perusahaan = self.merchant_id.category_perusahaan
+
+            # Informasi Vendor
             self.user_company_id.harga_tayang = self.merchant_id.harga_tayang
-            self.user_company_id.file_dokumenKtpDirut = self.merchant_id.file_dokumenKtpDirut
-            self.user_company_id.file_kartuNama = self.merchant_id.file_kartuNama
+            self.user_company_id.category_produk_ids_merchant = self.merchant_id.category_produk_ids
+            self.user_company_id.merk_dagang = self.merchant_id.merk_dagang
+            self.user_company_id.is_pengajuan_tempo = self.merchant_id.is_pengajuan_tempo
+            self.user_company_id.tempo_duration_merchant = self.merchant_id.tempo_duration
+            self.user_company_id.kredit_limit = self.merchant_id.kredit_limit
+            self.user_company_id.waktu_pengiriman = self.merchant_id.waktu_pengiriman
+            self.user_company_id.terhitung_sejak = self.merchant_id.terhitung_sejak
+
+            # Syarat Perdagangan
+            self.user_company_id.is_kembali_barang = self.merchant_id.is_kembali_barang
+            self.user_company_id.tenggat_waktu = self.merchant_id.tenggat_waktu
+            self.user_company_id.sertifikat_produk = self.merchant_id.sertifikat_produk
+            self.user_company_id.tempo_garansi = self.merchant_id.tempo_garansi
+            self.user_company_id.explain_garansi = self.merchant_id.explain_garansi
+            self.user_company_id.is_order_quantity = self.merchant_id.is_order_quantity
+
+            # Dokumen
             self.user_company_id.file_npwp = self.merchant_id.file_npwp
             self.user_company_id.file_sppkp = self.merchant_id.file_sppkp
+            self.user_company_id.file_dokumenKtpDirut = self.merchant_id.file_dokumenKtpDirut
+            self.user_company_id.file_kartuNama = self.merchant_id.file_kartuNama
             self.user_company_id.file_suratPernyataan = self.merchant_id.file_suratPernyataan
             self.user_company_id.file_fotoKantor = self.merchant_id.file_fotoKantor
             self.user_company_id.file_dataProduk = self.merchant_id.file_dataProduk
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 863b8514..1f497f7a 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -224,7 +224,7 @@
                                 <field name="harga_tayang" />
                             </group>
                             <group>
-                                <field name="description" />
+<!--                                <field name="description" />-->
                             </group>
                         </group>
                     </page>