From 72aaf5fa10fab9e7081b7248a95deeaa334d31f6 Mon Sep 17 00:00:00 2001 From: Bruno Botho Date: Wed, 3 Mar 2021 11:56:47 -0300 Subject: [PATCH] Removido campo custom CPF, substituido pelo TAX_VAT do Magento --- Helper/Data.php | 12 +-- Plugin/Checkout/Model/LayoutProcessor.php | 8 +- view/frontend/templates/prepareGateway.phtml | 92 ++++++-------------- 3 files changed, 37 insertions(+), 75 deletions(-) diff --git a/Helper/Data.php b/Helper/Data.php index 7fc1ea5..796c04a 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -722,7 +722,7 @@ public function getItemsParams(\Magento\Sales\Model\Order $order) public function getSenderParams(\Magento\Sales\Model\Order $order, $payment) { $digits = new \Zend\Filter\Digits(); - $cpf = $this->getCustomerCpfValue($order, $payment); + $cpf = $this->getCpf($order, $payment); $phone = $this->extractPhone($order->getBillingAddress()->getTelephone()); @@ -853,9 +853,9 @@ public function getCreditCardInstallmentsParams(\Magento\Sales\Model\Order $orde return $return; } - public function getCpf(\Magento\Sales\Model\Order $order, $payment){ + public function getCpf(\Magento\Sales\Model\Order $order, $payment){ $digits = new \Zend\Filter\Digits(); - $cpf = $this->getCustomerCpfValue($order, $payment); + $cpf = $order->getCustomerTaxvat(); return $digits->filter($cpf); } @@ -867,8 +867,10 @@ public function getRg(\Magento\Sales\Model\Order $order, $payment){ public function getCnpj(\Magento\Sales\Model\Order $order, $payment){ $digits = new \Zend\Filter\Digits(); - $cpf = $this->getCustomerCnpjValue($order, $payment); - return $digits->filter($cpf); + $cnpj = $order->getCustomerTaxvat(); + if (strlen($cnpj) > 11) + return $digits->filter($cnpj); + return ''; } public function getAddress(\Magento\Sales\Model\Order $order, $type){ diff --git a/Plugin/Checkout/Model/LayoutProcessor.php b/Plugin/Checkout/Model/LayoutProcessor.php index 5b9b931..83c8eb5 100644 --- a/Plugin/Checkout/Model/LayoutProcessor.php +++ b/Plugin/Checkout/Model/LayoutProcessor.php @@ -51,7 +51,7 @@ public function afterProcess( ]; - $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children'] + /*$jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children'] ['shippingAddress']['children']['shipping-address-fieldset']['children']['buyer_cpf'] = [ 'component' => 'Magento_Ui/js/form/element/abstract', 'config' => [ @@ -68,7 +68,7 @@ public function afterProcess( 'validation' => [ ], 'sortOrder' => 51, 'id' => 'buyer_cpf' - ]; + ];*/ $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children'] ['shippingAddress']['children']['shipping-address-fieldset']['children']['buyer_rg'] = [ @@ -89,7 +89,7 @@ public function afterProcess( 'id' => 'buyer_rg' ]; - $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children'] + /*$jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children'] ['shippingAddress']['children']['shipping-address-fieldset']['children']['buyer_cnpj'] = [ 'component' => 'Magento_Ui/js/form/element/abstract', 'config' => [ @@ -106,7 +106,7 @@ public function afterProcess( 'validation' => [], 'sortOrder' => 53, 'id' => 'buyer_cpf' - ]; + ];*/ return $jsLayout; } diff --git a/view/frontend/templates/prepareGateway.phtml b/view/frontend/templates/prepareGateway.phtml index 8120dcc..eecbb44 100644 --- a/view/frontend/templates/prepareGateway.phtml +++ b/view/frontend/templates/prepareGateway.phtml @@ -5,7 +5,6 @@ $storeUrl = $helper->getStoreUrl(); $grandTotal = $helper->getGrandTotal(); $installments = $helper->getInstallmentQty(); $validateRg = $helper->getValidateRg(); -$visibleCpf = '1'; $ccPlaceholderImage = $this->getViewFileUrl('Azpay_Gateway::images/cc-placeholder.png'); ?> @@ -30,30 +29,21 @@ $ccPlaceholderImage = $this->getViewFileUrl('Azpay_Gateway::images/cc-placeholde RMGatewayObj.getGrandTotal(); RMGatewayObj.setCardPlaceHolderImage(""); RMGatewayObj.getInstallments("", 0); - } - window.visibleCpf = ; + } window.addEventListener('load', function() { validateRg = ""; jQuery(document).on('change', '.form-shipping-address input', function(){ let ptipo = jQuery('select[name="buyer_ptype"]').val(); - if (ptipo === 'fisica'){ - let dvCpf = jQuery('[name="shippingAddress.buyer_cpf"]') - let dvRg = jQuery('[name="shippingAddress.buyer_rg"]') - let cpf = jQuery('[name="buyer_cpf"]'); - let rg = jQuery('[name="buyer_rg"]'); - dvCpf.children('.field-error').remove(); + if (ptipo === 'fisica'){ + let dvRg = jQuery('[name="shippingAddress.buyer_rg"]') + let rg = jQuery('[name="buyer_rg"]'); dvRg.children('.field-error').remove(); - let valid = 0; - if (validarCpf(cpf.val())){ - valid++; - }else{ - dvCpf.append('
Digite um cpf válido
'); - } + let valid = 0; console.log(validateRg === "1", validateRg === "0"); if (validateRg === "1"){ - if (rg.val().length > 0){ + if (rg.val()?.length > 0){ valid++; }else{ dvRg.append('
Digite o RG
'); @@ -62,34 +52,25 @@ $ccPlaceholderImage = $this->getViewFileUrl('Azpay_Gateway::images/cc-placeholde valid++; } - if (valid == 2){ + if (valid == 1){ jQuery('#co-shipping-method-form button').attr("disabled", false); }else{ jQuery('#co-shipping-method-form button').attr("disabled", true); } - }else if (ptipo === 'juridica'){ - jQuery('[name="shippingAddress.buyer_cnpj"]').show(); - jQuery('[name="shippingAddress.company"]').show(); - let dvCnpj = jQuery('[name="shippingAddress.buyer_cnpj"]') - let dvCompany = jQuery('[name="shippingAddress.company"]') - let cnpj = jQuery('[name="buyer_cnpj"]'); - let company = jQuery('[name="company"]'); - dvCnpj.children('.field-error').remove(); + }else if (ptipo === 'juridica'){ + jQuery('[name="shippingAddress.company"]').show(); + let dvCompany = jQuery('[name="shippingAddress.company"]') + let company = jQuery('[name="company"]'); dvCompany.children('.field-error').remove(); - let valid = 0; - if (validarCnpj(cnpj.val())){ - valid++; - }else{ - dvCnpj.append('
Digite um cnpj válido
'); - } - if (company.val().length > 0){ + let valid = 0; + if (company.val()?.length > 0){ valid++; }else{ dvCompany.append('
Digite o nome da empresa
'); } - if (valid == 2){ + if (valid == 1){ jQuery('#co-shipping-method-form button').attr("disabled", false); }else{ jQuery('#co-shipping-method-form button').attr("disabled", true); @@ -100,26 +81,16 @@ $ccPlaceholderImage = $this->getViewFileUrl('Azpay_Gateway::images/cc-placeholde jQuery(document).on('change', 'select[name="buyer_ptype"]', function(){ console.log("SELECTTT", this.value); jQuery('#co-shipping-method-form button').attr("disabled", true); - if (this.value === 'fisica'){ - jQuery('[name="shippingAddress.buyer_cpf"]').show(); - jQuery('[name="shippingAddress.buyer_rg"]').show(); - jQuery('[name="shippingAddress.buyer_cnpj"]').hide(); - jQuery('[name="shippingAddress.company"]').hide(); - - let dvCpf = jQuery('[name="shippingAddress.buyer_cpf"]') + if (this.value === 'fisica'){ + jQuery('[name="shippingAddress.buyer_rg"]').show(); + jQuery('[name="shippingAddress.company"]').hide(); let dvRg = jQuery('[name="shippingAddress.buyer_rg"]') - let cpf = jQuery('[name="buyer_cpf"]'); let rg = jQuery('[name="buyer_rg"]'); - dvCpf.children('.field-error').remove(); + dvRg.children('.field-error').remove(); let valid = 0; - if (validarCpf(cpf.val())){ - valid++; - }else{ - dvCpf.append('
Digite um cpf válido
'); - } if (validateRg === "1"){ - if (rg.val().length > 0){ + if (rg.val()?.length > 0){ valid++; }else{ dvRg.append('
Digite o RG
'); @@ -128,39 +99,28 @@ $ccPlaceholderImage = $this->getViewFileUrl('Azpay_Gateway::images/cc-placeholde valid++; } - if (valid == 2){ + if (valid == 1){ jQuery('#co-shipping-method-form button').attr("disabled", false); }else{ jQuery('#co-shipping-method-form button').attr("disabled", true); } - }else if (this.value === 'juridica'){ - jQuery('[name="shippingAddress.buyer_cpf"]').hide(); - jQuery('[name="shippingAddress.buyer_rg"]').hide(); - jQuery('[name="shippingAddress.buyer_cnpj"]').show(); + }else if (this.value === 'juridica'){ + jQuery('[name="shippingAddress.buyer_rg"]').hide(); jQuery('[name="shippingAddress.company"]').show(); - - jQuery('[name="shippingAddress.buyer_cnpj"]').show(); + jQuery('[name="shippingAddress.company"]').show(); - let dvCnpj = jQuery('[name="shippingAddress.buyer_cnpj"]') - let dvCompany = jQuery('[name="shippingAddress.company"]') - let cnpj = jQuery('[name="buyer_cnpj"]'); - let company = jQuery('[name="company"]'); - dvCnpj.children('.field-error').remove(); + let dvCompany = jQuery('[name="shippingAddress.company"]') + let company = jQuery('[name="company"]'); dvCompany.children('.field-error').remove(); let valid = 0; - if (validarCnpj(cnpj.val())){ - valid++; - }else{ - dvCnpj.append('
Digite um cnpj válido
'); - } if (company.val().length > 0){ valid++; }else{ dvCompany.append('
Digite o nome da empresa
'); } - if (valid == 2){ + if (valid == 1){ jQuery('#co-shipping-method-form button').attr("disabled", false); }else{ jQuery('#co-shipping-method-form button').attr("disabled", true);