Skip to content

Commit

Permalink
Merge pull request #2 from devevolutap/use_taxvat
Browse files Browse the repository at this point in the history 
Removido campo custom CPF, substituido pelo TAX_VAT do Magento
  • Loading branch information
@azpay-dev
azpay-dev authored Mar 3, 2021
2 parents 1a5c0c2 + 72aaf5f commit ec5647f
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 75 deletions.
12 changes: 7 additions & 5 deletions Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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);
}

Expand All @@ -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){
Expand Down
8 changes: 4 additions & 4 deletions Plugin/Checkout/Model/LayoutProcessor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand All @@ -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'] = [
Expand All @@ -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' => [
Expand All @@ -106,7 +106,7 @@ public function afterProcess(
'validation' => [],
'sortOrder' => 53,
'id' => 'buyer_cpf'
];
];*/

return $jsLayout;
}
Expand Down
92 changes: 26 additions & 66 deletions view/frontend/templates/prepareGateway.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
?>
<input id="store_url" value="<?php echo $storeUrl ?>"/>
Expand All @@ -30,30 +29,21 @@ $ccPlaceholderImage = $this->getViewFileUrl('Azpay_Gateway::images/cc-placeholde
RMGatewayObj.getGrandTotal();
RMGatewayObj.setCardPlaceHolderImage("<?php echo $ccPlaceholderImage ?>");
RMGatewayObj.getInstallments("<?php echo $grandTotal ?>", 0);
}
window.visibleCpf = <?php echo $visibleCpf ?>;
}

window.addEventListener('load', function() {
validateRg = "<?php echo $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('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite um cpf válido</span></div>');
}
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('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite o RG</span></div>');
Expand All @@ -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('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite um cnpj válido</span></div>');
}
if (company.val().length > 0){
let valid = 0;
if (company.val()?.length > 0){
valid++;
}else{
dvCompany.append('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite o nome da empresa</span></div>');
}

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);
Expand All @@ -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('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite um cpf válido</span></div>');
}
if (validateRg === "1"){
if (rg.val().length > 0){
if (rg.val()?.length > 0){
valid++;
}else{
dvRg.append('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite o RG</span></div>');
Expand All @@ -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('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite um cnpj válido</span></div>');
}
if (company.val().length > 0){
valid++;
}else{
dvCompany.append('<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true" id="error-GOF1VM2"><span data-bind="text: element.error">Digite o nome da empresa</span></div>');
}

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);
Expand Down

0 comments on commit ec5647f

Please sign in to comment.