diff --git a/assets/js/scripts-boleto.js b/assets/js/scripts-boleto.js
old mode 100755
new mode 100644
index 0dca931..3e6b0f5
--- a/assets/js/scripts-boleto.js
+++ b/assets/js/scripts-boleto.js
@@ -1,164 +1,166 @@
-	jQuery(document).ready(
-		function ($) {
-
-			if(!document.getElementById('swalCss')){
-				let swalCss = $( "<style id='swalCss'></style>" ).html( ".colored-toast .swal2-title {color: white;}.colored-toast .swal2-close {color: white;}.colored-toast .swal2-html-container {color: white;}.colored-toast.swal2-icon-error {background-color: #f27474 !important;}" )
-				$( "#payment" ).after( swalCss );
-			}
-
-			if (document.getElementById("gn_boleto_cpf_cnpj")) {
-				$('#gn_boleto_cpf_cnpj').keyup(
-					function () {
-						$('#gn_boleto_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_boleto_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_boleto_cpf_cnpj")).maskPattern("999.999.999-99");
-					}
-				)
-				$('#gn_boleto_cpf_cnpj').blur(
-					function () {
-						var cpf_cnpj = $('#gn_boleto_cpf_cnpj').val();
-
-						if (!validate_cpf_cnpj(cpf_cnpj)) {
-							$('#gn_boleto_cpf_cnpj').css('border', '1px solid red');
-							customError("CPF/CNPJ Inválido");
-						} else {
-							$('#gn_boleto_cpf_cnpj').css('border', '1px solid green');
-						}
-					}
-				)
-			}
-
-			// Esconder campos caso haja o brazillian market
-
-			if (typeof $('#billing_cpf').val() !== 'undefined') {
-
-				// cpf_cnpj boleto
-				if (typeof $('#gn_boleto_cpf_cnpj').val() !== 'undefined') {
-					$('#gn_boleto_cpf_cnpj').val($('#billing_cpf').val())
-					$('#gn_field_boleto').hide();
-				}
-
-				$('#billing_cpf').keyup(function () {
-
-					if (typeof $('#gn_boleto_cpf_cnpj').val() !== 'undefined') {
-						// cpf_cnpj boleto
-						$('#gn_boleto_cpf_cnpj').val($('#billing_cpf').val())
-						$('#gn_field_boleto').hide();
-					}
-				}
-				)
-			}
-
-			if (typeof $('#billing_cnpj').val() !== 'undefined') {
-				$('#billing_cnpj').keyup(
-					function () {
-						// cpf_cnpj boleto
-						$('#gn_boleto_cpf_cnpj').val($('#billing_cnpj').val())
-						$('#gn_field_boleto').hide();
-					}
-				)
-			}
-
-			// Bairro obrigatório
-			if (typeof $('#billing_neighborhood_field > label > span').html() !== 'undefined') {
-				$('#billing_neighborhood_field > label > span').html($('#billing_neighborhood_field > label > span').html().replace('opcional', 'obrigatório'))
-			}
-
-		}
-	);
-
-	function validate_cpf_cnpj(cpf_cnpj) {
-
-		cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
-
-		if (cpf_cnpj < 11) {
-			return false;
-		}
-
-		if (cpf_cnpj.length == 11) {
-			var remnant, sum = 0;
-
-			for (i = 1; i <= 9; i++) {
-				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
-			}
-			remnant = (sum * 10) % 11;
-
-			if ((remnant == 10) || (remnant == 11)) {
-				remnant = 0;
-			}
-			if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
-				return false;
-			}
-
-			sum = 0;
-
-			for (i = 1; i <= 10; i++) {
-				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
-			}
-			remnant = (sum * 10) % 11;
-
-			if ((remnant == 10) || (remnant == 11)) {
-				remnant = 0;
-			}
-			if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
-				return false;
-			}
-			return true;
-
-		} else if (cpf_cnpj.length == 14) {
-			var tam = cpf_cnpj.length - 2
-			var numbers = cpf_cnpj.substring(0, tam);
-			var digits = cpf_cnpj.substring(tam);
-			var sum = 0;
-			var pos = tam - 7;
-
-			for (i = tam; i >= 1; i--) {
-				sum += numbers.charAt(tam - i) * pos--;
-				if (pos < 2) {
-					pos = 9;
-				}
-			}
-
-			var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-			if (result != digits.charAt(0)) {
-				return false;
-			}
-
-			tam = tam + 1;
-			numbers = cpf_cnpj.substring(0, tam);
-			sum = 0;
-			pos = tam - 7;
-
-			for (i = tam; i >= 1; i--) {
-				sum += numbers.charAt(tam - i) * pos--;
-				if (pos < 2) {
-					pos = 9;
-				}
-			}
-
-			result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-			if (result != digits.charAt(1)) {
-				return false;
-			}
-
-			return true;
-		}
-
-	}
-
-	function customError(msg) {
-		Swal.mixin(
-			{
-				toast: true,
-				position: 'top-right',
-				iconColor: 'white',
-				customClass: {
-					popup: 'colored-toast'
-				},
-				showConfirmButton: false,
-				timer: 5000,
-				timerProgressBar: true
-			}
-		).fire({ icon: 'error', title: msg })
-	}
-
+	jQuery(document).ready(
+		function ($) {
+
+			if(!document.getElementById('swalCss')){
+				let swalCss = $( "<style id='swalCss'></style>" ).html( ".colored-toast .swal2-title {color: white;}.colored-toast .swal2-close {color: white;}.colored-toast .swal2-html-container {color: white;}.colored-toast.swal2-icon-error {background-color: #f27474 !important;}" )
+				$( "#payment" ).after( swalCss );
+			}
+
+			if (document.getElementById("gn_boleto_cpf_cnpj")) {
+				$('#gn_boleto_cpf_cnpj').keyup(
+					function () {
+						$('#gn_boleto_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_boleto_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_boleto_cpf_cnpj")).maskPattern("999.999.999-99");
+					}
+				)
+				$('#gn_boleto_cpf_cnpj').blur(
+					function () {
+						var cpf_cnpj = $('#gn_boleto_cpf_cnpj').val();
+						
+						if(cpf_cnpj != "") {
+    						if (!validate_cpf_cnpj(cpf_cnpj)) {
+    							$('#gn_boleto_cpf_cnpj').css('border', '1px solid red');
+    							customError("CPF/CNPJ Inv谩lido");
+    						} else {
+    							$('#gn_boleto_cpf_cnpj').css('border', '1px solid green');
+    						}
+						}
+					}
+				)
+			}
+
+			// Esconder campos caso haja o brazillian market
+
+			if (typeof $('#billing_cpf').val() !== 'undefined') {
+
+				// cpf_cnpj boleto
+				if (typeof $('#gn_boleto_cpf_cnpj').val() !== 'undefined') {
+					$('#gn_boleto_cpf_cnpj').val($('#billing_cpf').val())
+					$('#gn_field_boleto').hide();
+				}
+
+				$('#billing_cpf').keyup(function () {
+
+					if (typeof $('#gn_boleto_cpf_cnpj').val() !== 'undefined') {
+						// cpf_cnpj boleto
+						$('#gn_boleto_cpf_cnpj').val($('#billing_cpf').val())
+						$('#gn_field_boleto').hide();
+					}
+				}
+				)
+			}
+
+			if (typeof $('#billing_cnpj').val() !== 'undefined') {
+				$('#billing_cnpj').keyup(
+					function () {
+						// cpf_cnpj boleto
+						$('#gn_boleto_cpf_cnpj').val($('#billing_cnpj').val())
+						$('#gn_field_boleto').hide();
+					}
+				)
+			}
+
+			// Bairro obrigat贸rio
+			if (typeof $('#billing_neighborhood_field > label > span').html() !== 'undefined') {
+				$('#billing_neighborhood_field > label > span').html($('#billing_neighborhood_field > label > span').html().replace('opcional', 'obrigat贸rio'))
+			}
+
+		}
+	);
+
+	function validate_cpf_cnpj(cpf_cnpj) {
+
+		cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
+
+		if (cpf_cnpj < 11) {
+			return false;
+		}
+
+		if (cpf_cnpj.length == 11) {
+			var remnant, sum = 0;
+
+			for (i = 1; i <= 9; i++) {
+				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
+			}
+			remnant = (sum * 10) % 11;
+
+			if ((remnant == 10) || (remnant == 11)) {
+				remnant = 0;
+			}
+			if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
+				return false;
+			}
+
+			sum = 0;
+
+			for (i = 1; i <= 10; i++) {
+				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
+			}
+			remnant = (sum * 10) % 11;
+
+			if ((remnant == 10) || (remnant == 11)) {
+				remnant = 0;
+			}
+			if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
+				return false;
+			}
+			return true;
+
+		} else if (cpf_cnpj.length == 14) {
+			var tam = cpf_cnpj.length - 2
+			var numbers = cpf_cnpj.substring(0, tam);
+			var digits = cpf_cnpj.substring(tam);
+			var sum = 0;
+			var pos = tam - 7;
+
+			for (i = tam; i >= 1; i--) {
+				sum += numbers.charAt(tam - i) * pos--;
+				if (pos < 2) {
+					pos = 9;
+				}
+			}
+
+			var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+			if (result != digits.charAt(0)) {
+				return false;
+			}
+
+			tam = tam + 1;
+			numbers = cpf_cnpj.substring(0, tam);
+			sum = 0;
+			pos = tam - 7;
+
+			for (i = tam; i >= 1; i--) {
+				sum += numbers.charAt(tam - i) * pos--;
+				if (pos < 2) {
+					pos = 9;
+				}
+			}
+
+			result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+			if (result != digits.charAt(1)) {
+				return false;
+			}
+
+			return true;
+		}
+
+	}
+
+	function customError(msg) {
+		Swal.mixin(
+			{
+				toast: true,
+				position: 'top-right',
+				iconColor: 'white',
+				customClass: {
+					popup: 'colored-toast'
+				},
+				showConfirmButton: false,
+				timer: 5000,
+				timerProgressBar: true
+			}
+		).fire({ icon: 'error', title: msg })
+	}
+
diff --git a/assets/js/scripts-cartao.js b/assets/js/scripts-cartao.js
old mode 100755
new mode 100644
index c5bdb37..b9b7aee
--- a/assets/js/scripts-cartao.js
+++ b/assets/js/scripts-cartao.js
@@ -1,348 +1,353 @@
-jQuery(document).ready(function ($) {
-
-    if (!document.getElementById('swalCss')) {
-        let swalCss = $("<style id='swalCss'></style>").html(".colored-toast .swal2-title {color: white;}.colored-toast .swal2-close {color: white;}.colored-toast .swal2-html-container {color: white;}.colored-toast.swal2-icon-error {background-color: #f27474 !important;}")
-        $("#payment").after(swalCss);
-    }
-
-
-
-    // Gerar Payment Token
-    jQuery("#gn_cartao_expiration").on('keyup', function () {
-        let cardExpiration = jQuery("#gn_cartao_expiration").val().split("/");
-
-        if (jQuery("#gn_cartao_expiration").val().length >= 7) {
-
-            Swal.fire({
-                title: 'Por favor, aguarde...',
-                text: '',
-                showConfirmButton: false,
-            })
-
-            EfiJs.CreditCard
-                // .debugger(true)
-                .setCardNumber(jQuery("#gn_cartao_number").val())
-                .verifyCardBrand()
-                .then(brand => {
-                    if (brand !== 'undefined') {
-                        EfiJs.CreditCard
-                            //.debugger(true)
-                            .setAccount(options.payeeCode)
-                            .setEnvironment(options.enviroment) // 'production' or 'homologation'
-                            .setCreditCardData({
-                                brand: brand,
-                                number: jQuery("#gn_cartao_number").val(),
-                                cvv: jQuery("#gn_cartao_cvv").val(),
-                                expirationMonth: cardExpiration[0],
-                                expirationYear: cardExpiration[1]
-                            })
-                            .getPaymentToken()
-                            .then(data => {
-                                // Trata a resposta
-                                jQuery('#gn_payment_token').val(data.payment_token);
-                                swal.close()
-                            }).catch(err => {
-                                swalError(err);
-                                throw new Error(`Something went wrong in getPaymentToken(.\n ${err}`);
-                            });
-                    }
-                }).catch(err => {
-                    swalError(err);
-                    throw new Error(`Something went wrong in verifyCardBrand(.\n ${err}`);
-                });
-        }
-
-    });
-
-
-    // Buscar Parcelas
-    jQuery("#gn_cartao_number").on('keyup mouseout', function () {
-
-        let total = document.querySelector("#gn_payment_total").value;
-        total = parseInt(total.replace('.', ''));
-        console.log(total);
-
-        if (jQuery("#gn_cartao_number").val().length >= 15) {
-
-            EfiJs.CreditCard
-                // .debugger(true)
-                .setCardNumber(jQuery("#gn_cartao_number").val())
-                .verifyCardBrand()
-                .then(brand => {
-                    if (brand !== 'undefined') {
-                        EfiJs.CreditCard
-                            //.debugger(true)
-                            .setAccount(options.payeeCode)
-                            .setEnvironment(options.enviroment) // 'production' or 'homologation'
-                            .setBrand(brand)
-                            .setTotal(total)
-                            .getInstallments()
-                            .then(response => {
-                                jQuery('#gn_cartao_no_installments').hide();
-                                jQuery('#gn_cartao_installments')
-                                    .find('option')
-                                    .remove()
-
-                                response.installments.forEach(element => {
-                                    jQuery('#gn_cartao_installments').append(jQuery('<option>', {
-                                        value: element.installment,
-                                        text: element.installment + 'x de R$' + element.currency
-                                    }));
-                                });
-
-                                jQuery('#gn_cartao_installments').show();
-                            }).catch(err => {
-                                swalError(err);
-                                throw new Error(`Something went wrong in getInstallments().\n ${err}`);
-                            });
-                    }
-                }).catch(err => {
-                    swalError(err);
-                    throw new Error(`Something went wrong in verifyCardBrand(.\n ${err}`);
-                });
-
-
-        }
-    })
-
-    
-    if (document.getElementById('gn_cartao_cpf_cnpj')) {
-        jQuery('#gn_cartao_cpf_cnpj').keyup(
-            function () {
-                jQuery('#gn_cartao_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_cartao_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_cartao_cpf_cnpj")).maskPattern("999.999.999-99");
-            }
-        )
-        jQuery('#gn_cartao_cpf_cnpj').blur(
-            function () {
-                var cpf_cnpj = jQuery('#gn_cartao_cpf_cnpj').val();
-
-                if (!validate_cpf_cnpj(cpf_cnpj)) {
-                    jQuery('#gn_cartao_cpf_cnpj').css('border', '1px solid red');
-                    toastError("CPF/CNPJ Inválido");
-                } else {
-                    jQuery('#gn_cartao_cpf_cnpj').css('border', '1px solid green');
-                }
-            }
-        )
-    }
-
-    if (document.getElementById('gn_cartao_birth')) {
-        VMasker(document.querySelector("#gn_cartao_birth")).maskPattern("99/99/9999");
-        jQuery('#gn_cartao_birth').blur(
-            function () {
-                var date = jQuery('#gn_cartao_birth').val();
-
-                if (!verify_date(date)) {
-                    jQuery('#gn_cartao_birth').css('border', '1px solid red');
-                    toastError('Data de nascimento inválida!');
-                } else {
-                    jQuery('#gn_cartao_birth').css('border', '1px solid green');
-                }
-            }
-        )
-    }
-
-    if (document.getElementById('gn_cartao_expiration')) {
-        VMasker(document.querySelector("#gn_cartao_expiration")).maskPattern("99/9999");
-        jQuery('#gn_cartao_expiration').blur(
-            function () {
-                var exp = jQuery('#gn_cartao_expiration').val();
-
-                if (!validate_cartao_expiration(exp)) {
-                    jQuery('#gn_cartao_expiration').css('border', '1px solid red');
-                    toastError('Validade do cartão inválida!');
-                } else {
-                    jQuery('#gn_cartao_expiration').css('border', '1px solid green');
-                }
-            }
-        )
-    }
-
-    if (document.getElementById('gn_cartao_number')) {
-        VMasker(document.querySelector("#gn_cartao_number")).maskPattern("9999 9999 9999 9999");
-    }
-
-    if (typeof jQuery('#billing_cpf').val() !== 'undefined') {
-
-        // cpf_cnpj cartão
-        jQuery('#gn_cartao_cpf_cnpj').val(jQuery('#billing_cpf').val())
-        jQuery('#gn_field_cpf_cnpj').hide();
-        jQuery("#gn_field_birth").removeClass("form-row-last").addClass("form-row-wide");
-
-        jQuery('#billing_cpf').keyup(function () {
-            // cpf_cnpj cartão
-            jQuery('#gn_cartao_cpf_cnpj').val(jQuery('#billing_cpf').val())
-            jQuery('#gn_field_cpf_cnpj').hide();
-            jQuery("#gn_field_birth").removeClass("form-row-last").addClass("form-row-wide");
-        }
-        )
-    }
-
-    if (typeof jQuery('#billing_cnpj').val() !== 'undefined') {
-        jQuery('#billing_cnpj').keyup(
-            function () {
-                // cpf_cnpj cartão
-                jQuery('#gn_cartao_cpf_cnpj').val(jQuery('#billing_cnpj').val())
-                jQuery('#gn_field_cpf_cnpj').hide();
-                jQuery("#gn_field_birth").removeClass("form-row-last").addClass("form-row-wide");
-            }
-        )
-    }
-
-    if (typeof jQuery('#billing_birthdate').val() !== 'undefined') {
-
-        jQuery('#gn_cartao_birth').val(jQuery('#billing_birthdate').val())
-        jQuery('#gn_field_birth').hide();
-
-        jQuery('#billing_birthdate').keyup(
-            function () {
-                jQuery('#gn_cartao_birth').val(jQuery('#billing_birthdate').val())
-                jQuery('#gn_field_birth').hide();
-            }
-        )
-    }
-
-    // Bairro obrigatório
-    if (typeof jQuery('#billing_neighborhood_field > label > span').html() !== 'undefined') {
-        jQuery('#billing_neighborhood_field > label > span').html(jQuery('#billing_neighborhood_field > label > span').html().replace('opcional', 'obrigatório'))
-    }
-
-
-    function validate_cpf_cnpj(cpf_cnpj) {
-
-        cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
-
-        if (cpf_cnpj < 11) {
-            return false;
-        }
-
-        if (cpf_cnpj.length == 11) {
-            var remnant, sum = 0;
-
-            for (i = 1; i <= 9; i++) {
-                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
-            }
-            remnant = (sum * 10) % 11;
-
-            if ((remnant == 10) || (remnant == 11)) {
-                remnant = 0;
-            }
-            if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
-                return false;
-            }
-
-            sum = 0;
-
-            for (i = 1; i <= 10; i++) {
-                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
-            }
-            remnant = (sum * 10) % 11;
-
-            if ((remnant == 10) || (remnant == 11)) {
-                remnant = 0;
-            }
-            if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
-                return false;
-            }
-            return true;
-
-        } else if (cpf_cnpj.length == 14) {
-            var tam = cpf_cnpj.length - 2
-            var numbers = cpf_cnpj.substring(0, tam);
-            var digits = cpf_cnpj.substring(tam);
-            var sum = 0;
-            var pos = tam - 7;
-
-            for (i = tam; i >= 1; i--) {
-                sum += numbers.charAt(tam - i) * pos--;
-                if (pos < 2) {
-                    pos = 9;
-                }
-            }
-
-            var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-            if (result != digits.charAt(0)) {
-                return false;
-            }
-
-            tam = tam + 1;
-            numbers = cpf_cnpj.substring(0, tam);
-            sum = 0;
-            pos = tam - 7;
-
-            for (i = tam; i >= 1; i--) {
-                sum += numbers.charAt(tam - i) * pos--;
-                if (pos < 2) {
-                    pos = 9;
-                }
-            }
-
-            result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-            if (result != digits.charAt(1)) {
-                return false;
-            }
-
-            return true;
-        }
-
-    }
-
-    function verify_date(date) {
-        var patternValidateDate = /^(((0[1-9]|[12][0-9]|3[01])([-.\/])(0[13578]|10|12)([-.\/])(\d{4}))|(([0][1-9]|[12][0-9]|30)([-.\/])(0[469]|11)([-.\/])(\d{4}))|((0[1-9]|1[0-9]|2[0-8])([-.\/])(02)([-.\/])(\d{4}))|((29)(\.|-|\/)(02)([-.\/])([02468][048]00))|((29)([-.\/])(02)([-.\/])([13579][26]00))|((29)([-.\/])(02)([-.\/])([0-9][0-9][0][48]))|((29)([-.\/])(02)([-.\/])([0-9][0-9][2468][048]))|((29)([-.\/])(02)([-.\/])([0-9][0-9][13579][26])))$/;
-        return patternValidateDate.test(date);
-    }
-
-    function validate_cartao_expiration(exp) {
-        if (exp == "" || exp.length < 6)
-            return false;
-        exp = exp.split('/');
-        const newDate = new Date();
-        const year = newDate.getFullYear();
-
-        if ((parseInt(exp[0]) > 12 || (parseInt(exp[0] < 0)) || (parseInt(exp[1]) < parseInt(year)))) {
-            return false;
-        }
-        return true;
-
-    }
-
-    function swalError(msg) {
-        if (msg == 'Error: Escolha uma bandeira entre "visa", "mastercard", "amex", "elo", "hipercard"')
-            msg = 'As bandeiras aceitas são: VISA, MASTERCARD, AMERICAN EXPRESS, ELO E HIPERCARD.'
-
-        if (msg == 'Error: O total fornecido é superior ao limite máximo por transação.')
-            msg = 'O valor total da compra é superior ao limite para emissão.'
-
-        if (msg.toString().includes('Identificador de conta'))
-            msg = 'Identificador de Conta inválido. Entre em contato com o administrador da loja.'
-
-        if (msg != null && msg != '') {
-            console.log(msg);
-            Swal.fire({
-                icon: 'error',
-                title: 'Houve um Erro!',
-                text: msg.toString().replace('Error:', ''),
-            })
-        }
-
-
-    }
-
-    function toastError(msg) {
-        Swal.mixin(
-            {
-                toast: true,
-                position: 'top-right',
-                iconColor: 'white',
-                customClass: {
-                    popup: 'colored-toast'
-                },
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true
-            }
-        ).fire({ icon: 'error', title: msg })
-    }
+jQuery(document).ready(function ($) {
+
+    if (!document.getElementById('swalCss')) {
+        let swalCss = $("<style id='swalCss'></style>").html(".colored-toast .swal2-title {color: white;}.colored-toast .swal2-close {color: white;}.colored-toast .swal2-html-container {color: white;}.colored-toast.swal2-icon-error {background-color: #f27474 !important;}")
+        $("#payment").after(swalCss);
+    }
+
+
+
+    // Gerar Payment Token
+    jQuery("#gn_cartao_expiration").on('keyup', function () {
+        let cardExpiration = jQuery("#gn_cartao_expiration").val().split("/");
+
+        if (jQuery("#gn_cartao_expiration").val().length >= 7) {
+
+            Swal.fire({
+                title: 'Por favor, aguarde...',
+                text: '',
+                showConfirmButton: false,
+            })
+
+            EfiJs.CreditCard
+                // .debugger(true)
+                .setCardNumber(jQuery("#gn_cartao_number").val())
+                .verifyCardBrand()
+                .then(brand => {
+                    if (brand !== 'undefined') {
+                        EfiJs.CreditCard
+                            //.debugger(true)
+                            .setAccount(options.payeeCode)
+                            .setEnvironment(options.enviroment) // 'production' or 'homologation'
+                            .setCreditCardData({
+                                brand: brand,
+                                number: jQuery("#gn_cartao_number").val(),
+                                cvv: jQuery("#gn_cartao_cvv").val(),
+                                expirationMonth: cardExpiration[0],
+                                expirationYear: cardExpiration[1]
+                            })
+                            .getPaymentToken()
+                            .then(data => {
+                                // Trata a resposta
+                                jQuery('#gn_payment_token').val(data.payment_token);
+                                swal.close()
+                            }).catch(err => {
+                                swalError(err);
+                                throw new Error(`Something went wrong in getPaymentToken(.\n ${err}`);
+                            });
+                    }
+                }).catch(err => {
+                    swalError(err);
+                    throw new Error(`Something went wrong in verifyCardBrand(.\n ${err}`);
+                });
+        }
+
+    });
+
+
+    // Buscar Parcelas
+    jQuery("#gn_cartao_number").on('keyup mouseout', function () {
+
+        let total = document.querySelector("#gn_payment_total").value;
+        total = parseInt(total.replace('.', ''));
+        console.log(total);
+
+        if (jQuery("#gn_cartao_number").val().length >= 15) {
+
+            EfiJs.CreditCard
+                // .debugger(true)
+                .setCardNumber(jQuery("#gn_cartao_number").val())
+                .verifyCardBrand()
+                .then(brand => {
+                    if (brand !== 'undefined') {
+                        EfiJs.CreditCard
+                            //.debugger(true)
+                            .setAccount(options.payeeCode)
+                            .setEnvironment(options.enviroment) // 'production' or 'homologation'
+                            .setBrand(brand)
+                            .setTotal(total)
+                            .getInstallments()
+                            .then(response => {
+                                jQuery('#gn_cartao_no_installments').hide();
+                                jQuery('#gn_cartao_installments')
+                                    .find('option')
+                                    .remove()
+
+                                response.installments.forEach(element => {
+                                    jQuery('#gn_cartao_installments').append(jQuery('<option>', {
+                                        value: element.installment,
+                                        text: element.installment + 'x de R$' + element.currency
+                                    }));
+                                });
+
+                                jQuery('#gn_cartao_installments').show();
+                            }).catch(err => {
+                                swalError(err);
+                                throw new Error(`Something went wrong in getInstallments().\n ${err}`);
+                            });
+                    }
+                }).catch(err => {
+                    swalError(err);
+                    throw new Error(`Something went wrong in verifyCardBrand(.\n ${err}`);
+                });
+
+
+        }
+    })
+
+    
+    if (document.getElementById('gn_cartao_cpf_cnpj')) {
+        jQuery('#gn_cartao_cpf_cnpj').keyup(
+            function () {
+                jQuery('#gn_cartao_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_cartao_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_cartao_cpf_cnpj")).maskPattern("999.999.999-99");
+            }
+        )
+        jQuery('#gn_cartao_cpf_cnpj').blur(
+            function () {
+                var cpf_cnpj = jQuery('#gn_cartao_cpf_cnpj').val();
+                
+                if(cpf_cnpj != "") {
+                    if (!validate_cpf_cnpj(cpf_cnpj)) {
+                        jQuery('#gn_cartao_cpf_cnpj').css('border', '1px solid red');
+                        toastError("CPF/CNPJ Inválido");
+                    } else {
+                        jQuery('#gn_cartao_cpf_cnpj').css('border', '1px solid green');
+                    }
+                }
+            }
+        )
+    }
+
+    if (document.getElementById('gn_cartao_birth')) {
+        VMasker(document.querySelector("#gn_cartao_birth")).maskPattern("99/99/9999");
+        jQuery('#gn_cartao_birth').blur(
+            function () {
+                var date = jQuery('#gn_cartao_birth').val();
+                
+                if(date != "") {
+                    if (!verify_date(date)) {
+                        jQuery('#gn_cartao_birth').css('border', '1px solid red');
+                        toastError('Data de nascimento inválida!');
+                    } else {
+                        jQuery('#gn_cartao_birth').css('border', '1px solid green');
+                    }
+                }
+            }
+        )
+    }
+
+    if (document.getElementById('gn_cartao_expiration')) {
+        VMasker(document.querySelector("#gn_cartao_expiration")).maskPattern("99/9999");
+        jQuery('#gn_cartao_expiration').blur(
+            function () {
+                var exp = jQuery('#gn_cartao_expiration').val();
+                if(exp != "") {
+                    if (!validate_cartao_expiration(exp)) {
+                        jQuery('#gn_cartao_expiration').css('border', '1px solid red');
+                        toastError('Validade do cartão inválida!');
+                    } else {
+                        jQuery('#gn_cartao_expiration').css('border', '1px solid green');
+                    }
+                }
+            }
+        )
+    }
+
+    if (document.getElementById('gn_cartao_number')) {
+        VMasker(document.querySelector("#gn_cartao_number")).maskPattern("9999 9999 9999 9999");
+    }
+
+    if (typeof jQuery('#billing_cpf').val() !== 'undefined') {
+
+        // cpf_cnpj cartão
+        jQuery('#gn_cartao_cpf_cnpj').val(jQuery('#billing_cpf').val())
+        jQuery('#gn_field_cpf_cnpj').hide();
+        jQuery("#gn_field_birth").removeClass("form-row-last").addClass("form-row-wide");
+
+        jQuery('#billing_cpf').keyup(function () {
+            // cpf_cnpj cartão
+            jQuery('#gn_cartao_cpf_cnpj').val(jQuery('#billing_cpf').val())
+            jQuery('#gn_field_cpf_cnpj').hide();
+            jQuery("#gn_field_birth").removeClass("form-row-last").addClass("form-row-wide");
+        }
+        )
+    }
+
+    if (typeof jQuery('#billing_cnpj').val() !== 'undefined') {
+        jQuery('#billing_cnpj').keyup(
+            function () {
+                // cpf_cnpj cartão
+                jQuery('#gn_cartao_cpf_cnpj').val(jQuery('#billing_cnpj').val())
+                jQuery('#gn_field_cpf_cnpj').hide();
+                jQuery("#gn_field_birth").removeClass("form-row-last").addClass("form-row-wide");
+            }
+        )
+    }
+
+    if (typeof jQuery('#billing_birthdate').val() !== 'undefined') {
+
+        jQuery('#gn_cartao_birth').val(jQuery('#billing_birthdate').val())
+        jQuery('#gn_field_birth').hide();
+
+        jQuery('#billing_birthdate').keyup(
+            function () {
+                jQuery('#gn_cartao_birth').val(jQuery('#billing_birthdate').val())
+                jQuery('#gn_field_birth').hide();
+            }
+        )
+    }
+
+    // Bairro obrigatório
+    if (typeof jQuery('#billing_neighborhood_field > label > span').html() !== 'undefined') {
+        jQuery('#billing_neighborhood_field > label > span').html(jQuery('#billing_neighborhood_field > label > span').html().replace('opcional', 'obrigatório'))
+    }
+
+
+    function validate_cpf_cnpj(cpf_cnpj) {
+
+        cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
+
+        if (cpf_cnpj < 11) {
+            return false;
+        }
+
+        if (cpf_cnpj.length == 11) {
+            var remnant, sum = 0;
+
+            for (i = 1; i <= 9; i++) {
+                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
+            }
+            remnant = (sum * 10) % 11;
+
+            if ((remnant == 10) || (remnant == 11)) {
+                remnant = 0;
+            }
+            if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
+                return false;
+            }
+
+            sum = 0;
+
+            for (i = 1; i <= 10; i++) {
+                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
+            }
+            remnant = (sum * 10) % 11;
+
+            if ((remnant == 10) || (remnant == 11)) {
+                remnant = 0;
+            }
+            if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
+                return false;
+            }
+            return true;
+
+        } else if (cpf_cnpj.length == 14) {
+            var tam = cpf_cnpj.length - 2
+            var numbers = cpf_cnpj.substring(0, tam);
+            var digits = cpf_cnpj.substring(tam);
+            var sum = 0;
+            var pos = tam - 7;
+
+            for (i = tam; i >= 1; i--) {
+                sum += numbers.charAt(tam - i) * pos--;
+                if (pos < 2) {
+                    pos = 9;
+                }
+            }
+
+            var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+            if (result != digits.charAt(0)) {
+                return false;
+            }
+
+            tam = tam + 1;
+            numbers = cpf_cnpj.substring(0, tam);
+            sum = 0;
+            pos = tam - 7;
+
+            for (i = tam; i >= 1; i--) {
+                sum += numbers.charAt(tam - i) * pos--;
+                if (pos < 2) {
+                    pos = 9;
+                }
+            }
+
+            result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+            if (result != digits.charAt(1)) {
+                return false;
+            }
+
+            return true;
+        }
+
+    }
+
+    function verify_date(date) {
+        var patternValidateDate = /^(((0[1-9]|[12][0-9]|3[01])([-.\/])(0[13578]|10|12)([-.\/])(\d{4}))|(([0][1-9]|[12][0-9]|30)([-.\/])(0[469]|11)([-.\/])(\d{4}))|((0[1-9]|1[0-9]|2[0-8])([-.\/])(02)([-.\/])(\d{4}))|((29)(\.|-|\/)(02)([-.\/])([02468][048]00))|((29)([-.\/])(02)([-.\/])([13579][26]00))|((29)([-.\/])(02)([-.\/])([0-9][0-9][0][48]))|((29)([-.\/])(02)([-.\/])([0-9][0-9][2468][048]))|((29)([-.\/])(02)([-.\/])([0-9][0-9][13579][26])))$/;
+        return patternValidateDate.test(date);
+    }
+
+    function validate_cartao_expiration(exp) {
+        if (exp == "" || exp.length < 6)
+            return false;
+        exp = exp.split('/');
+        const newDate = new Date();
+        const year = newDate.getFullYear();
+
+        if ((parseInt(exp[0]) > 12 || (parseInt(exp[0] < 0)) || (parseInt(exp[1]) < parseInt(year)))) {
+            return false;
+        }
+        return true;
+
+    }
+
+    function swalError(msg) {
+        if (msg == 'Error: Escolha uma bandeira entre "visa", "mastercard", "amex", "elo", "hipercard"')
+            msg = 'As bandeiras aceitas são: VISA, MASTERCARD, AMERICAN EXPRESS, ELO E HIPERCARD.'
+
+        if (msg == 'Error: O total fornecido é superior ao limite máximo por transação.')
+            msg = 'O valor total da compra é superior ao limite para emissão.'
+
+        if (msg.toString().includes('Identificador de conta'))
+            msg = 'Identificador de Conta inválido. Entre em contato com o administrador da loja.'
+
+        if (msg != null && msg != '') {
+            console.log(msg);
+            Swal.fire({
+                icon: 'error',
+                title: 'Houve um Erro!',
+                text: msg.toString().replace('Error:', ''),
+            })
+        }
+
+
+    }
+
+    function toastError(msg) {
+        Swal.mixin(
+            {
+                toast: true,
+                position: 'top-right',
+                iconColor: 'white',
+                customClass: {
+                    popup: 'colored-toast'
+                },
+                showConfirmButton: false,
+                timer: 5000,
+                timerProgressBar: true
+            }
+        ).fire({ icon: 'error', title: msg })
+    }
 })
\ No newline at end of file
diff --git a/assets/js/scripts-open-finance.js b/assets/js/scripts-open-finance.js
old mode 100755
new mode 100644
index a3c544a..0f393ea
--- a/assets/js/scripts-open-finance.js
+++ b/assets/js/scripts-open-finance.js
@@ -1,258 +1,261 @@
-if ('undefined' == typeof participantsVector) {
-    let participantsVector
-}
-
-
-function showParticipants(apiData) {
-    participantsVector = apiData
-
-    jQuery('#gn-default-logo').show()
-    jQuery('#gn-participant-logo').hide()
-    jQuery('#gn-default-name').text('Escolha sua instituição')
-
-    let finalReturn = jQuery('<div></div>')
-
-    let searchInput = jQuery('<input type="text" placeholder="Digite o nome da sua Instituição.." id="gn-of-search" class="gn-of-search" onkeyup="filterParticipants()">')
-
-    finalReturn.append(searchInput)
-
-    let participantsList = jQuery("<div id='gn-participants-list' class='gn-participants-list'></div>")
-
-    apiData.forEach((participant, index) => {
-        let outerDiv = jQuery('<div class="gn-participant" onclick="selectParticipant(' + index + ')"></div>')
-        let participantItem = jQuery("<div class='gn-participant-item' ></div>")
-        let participantLogo = jQuery("<img class='gn-participant-logo' src='" + participant.logo + "' />")
-        let participantName = jQuery("<label class='gn-participant-name'>" + participant.nome + "</label>")
-
-        participantItem.append(participantLogo)
-        participantItem.append(participantName)
-        outerDiv.append(participantItem)
-        outerDiv.append('<hr class="gn-hr">')
-        participantsList.append(outerDiv)
-
-    });
-
-    finalReturn.append(participantsList)
-
-    Swal.fire({
-        title: 'Escolha sua Instituição',
-        html: finalReturn,
-        showCancelButton: false,
-        showConfirmButton: false
-    })
-
-
-}
-
-
-function filterParticipants() {
-    var input, filter, ul, li, a, i;
-    input = document.getElementById("gn-of-search");
-    filter = input.value.toUpperCase();
-    div = document.getElementById("gn-participants-list");
-    elements = div.getElementsByTagName("div");
-
-    for (i = 0; i < elements.length; i++) {
-        txtValue = elements[i].textContent || elements[i].innerText;
-        if (txtValue.toUpperCase().indexOf(filter) > -1) {
-            elements[i].style.display = "";
-        } else {
-            elements[i].style.display = "none";
-        }
-    }
-}
-
-function selectParticipant(participantIndex) {
-    jQuery('#gn-default-logo').hide()
-    jQuery('#gn_of_participant').val(participantsVector[participantIndex].identificador)
-    jQuery('#gn-participant-logo').attr('src', participantsVector[participantIndex].logo)
-    jQuery('#gn-participant-logo').show()
-    jQuery('#gn-default-name').text(participantsVector[participantIndex].nome)
-
-    Swal.close()
-    jQuery("#place_order").prop("disabled", false)
-}
-
-if (document.getElementById('gn_open_finance_cpf_cnpj')) {
-    jQuery('#gn_open_finance_cpf_cnpj').keyup(
-        function () {
-            jQuery('#gn_open_finance_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_open_finance_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_open_finance_cpf_cnpj")).maskPattern("999.999.999-99");
-        }
-    )
-    jQuery('#gn_open_finance_cpf_cnpj').blur(
-        function () {
-            var cpf_cnpj = jQuery('#gn_open_finance_cpf_cnpj').val();
-
-            if (!validate_cpf_cnpj(cpf_cnpj)) {
-                jQuery('#gn_open_finance_cpf_cnpj').css('border', '1px solid red');
-                toastError("CPF/CNPJ Inválido");
-            } else {
-                jQuery('#gn_open_finance_cpf_cnpj').css('border', '1px solid green');
-            }
-        }
-    )
-
-    if (typeof jQuery('#billing_cpf').val() !== 'undefined') {
-
-
-        // cpf_cnpj Open Finance
-        if (typeof jQuery('#gn_open_finance_cpf_cnpj').val() !== 'undefined') {
-            jQuery('#gn_open_finance_cpf_cnpj').val(jQuery('#billing_cpf').val())
-            jQuery('#gn_field_open_finance_cpfcnpj').hide();
-        }
-
-        jQuery('#billing_cpf').keyup(function () {
-
-            if (typeof jQuery('#gn_open_finance_cpf_cnpj').val() !== 'undefined') {
-                // cpf_cnpj Open Finance
-                jQuery('#gn_open_finance_cpf_cnpj').val(jQuery('#billing_cpf').val())
-                jQuery('#gn_field_open_finance_cpfcnpj').hide();
-            }
-        }
-        )
-    }
-
-    if (typeof jQuery('#billing_cnpj').val() !== 'undefined') {
-        jQuery('#billing_cnpj').keyup(
-            function () {
-                // cpf_cnpj Open Finance
-                jQuery('#gn_open_finance_cpf_cnpj').val($('#billing_cnpj').val())
-                jQuery('#gn_field_open_finance_cpfcnpj').hide();
-            }
-        )
-    }
-
-    function toastError(msg) {
-        Swal.mixin(
-            {
-                toast: true,
-                position: 'top-right',
-                iconColor: 'white',
-                customClass: {
-                    popup: 'colored-toast'
-                },
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true
-            }
-        ).fire({ icon: 'error', title: msg })
-    }
-
-    function validate_cpf_cnpj(cpf_cnpj) {
-
-        cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
-
-        if (cpf_cnpj < 11) {
-            return false;
-        }
-
-        if (cpf_cnpj.length == 11) {
-            var remnant, sum = 0;
-
-            for (i = 1; i <= 9; i++) {
-                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
-            }
-            remnant = (sum * 10) % 11;
-
-            if ((remnant == 10) || (remnant == 11)) {
-                remnant = 0;
-            }
-            if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
-                return false;
-            }
-
-            sum = 0;
-
-            for (i = 1; i <= 10; i++) {
-                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
-            }
-            remnant = (sum * 10) % 11;
-
-            if ((remnant == 10) || (remnant == 11)) {
-                remnant = 0;
-            }
-            if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
-                return false;
-            }
-            return true;
-
-        } else if (cpf_cnpj.length == 14) {
-            var tam = cpf_cnpj.length - 2
-            var numbers = cpf_cnpj.substring(0, tam);
-            var digits = cpf_cnpj.substring(tam);
-            var sum = 0;
-            var pos = tam - 7;
-
-            for (i = tam; i >= 1; i--) {
-                sum += numbers.charAt(tam - i) * pos--;
-                if (pos < 2) {
-                    pos = 9;
-                }
-            }
-
-            var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-            if (result != digits.charAt(0)) {
-                return false;
-            }
-
-            tam = tam + 1;
-            numbers = cpf_cnpj.substring(0, tam);
-            sum = 0;
-            pos = tam - 7;
-
-            for (i = tam; i >= 1; i--) {
-                sum += numbers.charAt(tam - i) * pos--;
-                if (pos < 2) {
-                    pos = 9;
-                }
-            }
-
-            result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-            if (result != digits.charAt(1)) {
-                return false;
-            }
-
-            return true;
-        }
-
-    }
-
-}
-
-
-
-jQuery('form[name="checkout"]').submit(function () {
-    if (jQuery('#payment_method_WC_Gerencianet_Open_Finance').is(':checked')) {
-        let participant = jQuery('<div id="conteudo" class="gn-default-participant"></div>')
-        let participantLogo = jQuery("<img class='gn-participant-logo' src='" + jQuery("#gn-participant-logo").attr('src') + "' />")
-        let participantName = jQuery("<label class='gn-participant-name'>" + jQuery("#gn-default-name").html() + "</label>")
-
-        participant.append(participantLogo)
-        participant.append(participantName)
-
-        Swal.fire({
-            title: 'Você está sendo redirecionado para',
-            html: participant,
-            timer: 500000,
-            didOpen: () => {
-                Swal.showLoading()
-            },
-            willClose: () => {
-                return true
-            }
-        })
-        setTimeout(500000)
-    }
-
-});
-
-jQuery('input[name="payment_method"]').click(function () {
-    if (jQuery('#payment_method_WC_Gerencianet_Open_Finance').is(':checked') && jQuery("#gn_of_participant").val() == '') {
-        jQuery("#place_order").prop("disabled", true)
-
-    } else {
-        jQuery("#place_order").prop("disabled", false)
-    }
-})
+if ('undefined' == typeof participantsVector) {
+    let participantsVector
+}
+
+
+function showParticipants(apiData) {
+    participantsVector = apiData
+
+    jQuery('#gn-default-logo').show()
+    jQuery('#gn-participant-logo').hide()
+    jQuery('#gn-default-name').text('Escolha sua instituição')
+
+    let finalReturn = jQuery('<div></div>')
+
+    let searchInput = jQuery('<input type="text" placeholder="Digite o nome da sua Instituição.." id="gn-of-search" class="gn-of-search" onkeyup="filterParticipants()">')
+
+    finalReturn.append(searchInput)
+
+    let participantsList = jQuery("<div id='gn-participants-list' class='gn-participants-list'></div>")
+
+    apiData.forEach((participant, index) => {
+        let outerDiv = jQuery('<div class="gn-participant" onclick="selectParticipant(' + index + ')"></div>')
+        let participantItem = jQuery("<div class='gn-participant-item' ></div>")
+        let participantLogo = jQuery("<img class='gn-participant-logo' src='" + participant.logo + "' />")
+        let participantName = jQuery("<label class='gn-participant-name'>" + participant.nome + "</label>")
+
+        participantItem.append(participantLogo)
+        participantItem.append(participantName)
+        outerDiv.append(participantItem)
+        outerDiv.append('<hr class="gn-hr">')
+        participantsList.append(outerDiv)
+
+    });
+
+    finalReturn.append(participantsList)
+
+    Swal.fire({
+        title: 'Escolha sua Instituição',
+        html: finalReturn,
+        showCancelButton: false,
+        showConfirmButton: false
+    })
+
+
+}
+
+
+function filterParticipants() {
+    var input, filter, ul, li, a, i;
+    input = document.getElementById("gn-of-search");
+    filter = input.value.toUpperCase();
+    div = document.getElementById("gn-participants-list");
+    elements = div.getElementsByTagName("div");
+
+    for (i = 0; i < elements.length; i++) {
+        txtValue = elements[i].textContent || elements[i].innerText;
+        if (txtValue.toUpperCase().indexOf(filter) > -1) {
+            elements[i].style.display = "";
+        } else {
+            elements[i].style.display = "none";
+        }
+    }
+}
+
+function selectParticipant(participantIndex) {
+    jQuery('#gn-default-logo').hide()
+    jQuery('#gn_of_participant').val(participantsVector[participantIndex].identificador)
+    jQuery('#gn-participant-logo').attr('src', participantsVector[participantIndex].logo)
+    jQuery('#gn-participant-logo').show()
+    jQuery('#gn-default-name').text(participantsVector[participantIndex].nome)
+
+    Swal.close()
+    jQuery("#place_order").prop("disabled", false)
+}
+
+if (document.getElementById('gn_open_finance_cpf_cnpj')) {
+    jQuery('#gn_open_finance_cpf_cnpj').keyup(
+        function () {
+            jQuery('#gn_open_finance_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_open_finance_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_open_finance_cpf_cnpj")).maskPattern("999.999.999-99");
+        }
+    )
+    jQuery('#gn_open_finance_cpf_cnpj').blur(
+        function () {
+            var cpf_cnpj = jQuery('#gn_open_finance_cpf_cnpj').val();
+            
+            if(cpf_cnpj != "") {
+    
+                if (!validate_cpf_cnpj(cpf_cnpj)) {
+                    jQuery('#gn_open_finance_cpf_cnpj').css('border', '1px solid red');
+                    toastError("CPF/CNPJ Inválido");
+                } else {
+                    jQuery('#gn_open_finance_cpf_cnpj').css('border', '1px solid green');
+                }
+            }
+        }
+    )
+
+    if (typeof jQuery('#billing_cpf').val() !== 'undefined') {
+
+
+        // cpf_cnpj Open Finance
+        if (typeof jQuery('#gn_open_finance_cpf_cnpj').val() !== 'undefined') {
+            jQuery('#gn_open_finance_cpf_cnpj').val(jQuery('#billing_cpf').val())
+            jQuery('#gn_field_open_finance_cpfcnpj').hide();
+        }
+
+        jQuery('#billing_cpf').keyup(function () {
+
+            if (typeof jQuery('#gn_open_finance_cpf_cnpj').val() !== 'undefined') {
+                // cpf_cnpj Open Finance
+                jQuery('#gn_open_finance_cpf_cnpj').val(jQuery('#billing_cpf').val())
+                jQuery('#gn_field_open_finance_cpfcnpj').hide();
+            }
+        }
+        )
+    }
+
+    if (typeof jQuery('#billing_cnpj').val() !== 'undefined') {
+        jQuery('#billing_cnpj').keyup(
+            function () {
+                // cpf_cnpj Open Finance
+                jQuery('#gn_open_finance_cpf_cnpj').val($('#billing_cnpj').val())
+                jQuery('#gn_field_open_finance_cpfcnpj').hide();
+            }
+        )
+    }
+
+    function toastError(msg) {
+        Swal.mixin(
+            {
+                toast: true,
+                position: 'top-right',
+                iconColor: 'white',
+                customClass: {
+                    popup: 'colored-toast'
+                },
+                showConfirmButton: false,
+                timer: 5000,
+                timerProgressBar: true
+            }
+        ).fire({ icon: 'error', title: msg })
+    }
+
+    function validate_cpf_cnpj(cpf_cnpj) {
+
+        cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
+
+        if (cpf_cnpj < 11) {
+            return false;
+        }
+
+        if (cpf_cnpj.length == 11) {
+            var remnant, sum = 0;
+
+            for (i = 1; i <= 9; i++) {
+                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
+            }
+            remnant = (sum * 10) % 11;
+
+            if ((remnant == 10) || (remnant == 11)) {
+                remnant = 0;
+            }
+            if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
+                return false;
+            }
+
+            sum = 0;
+
+            for (i = 1; i <= 10; i++) {
+                sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
+            }
+            remnant = (sum * 10) % 11;
+
+            if ((remnant == 10) || (remnant == 11)) {
+                remnant = 0;
+            }
+            if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
+                return false;
+            }
+            return true;
+
+        } else if (cpf_cnpj.length == 14) {
+            var tam = cpf_cnpj.length - 2
+            var numbers = cpf_cnpj.substring(0, tam);
+            var digits = cpf_cnpj.substring(tam);
+            var sum = 0;
+            var pos = tam - 7;
+
+            for (i = tam; i >= 1; i--) {
+                sum += numbers.charAt(tam - i) * pos--;
+                if (pos < 2) {
+                    pos = 9;
+                }
+            }
+
+            var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+            if (result != digits.charAt(0)) {
+                return false;
+            }
+
+            tam = tam + 1;
+            numbers = cpf_cnpj.substring(0, tam);
+            sum = 0;
+            pos = tam - 7;
+
+            for (i = tam; i >= 1; i--) {
+                sum += numbers.charAt(tam - i) * pos--;
+                if (pos < 2) {
+                    pos = 9;
+                }
+            }
+
+            result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+            if (result != digits.charAt(1)) {
+                return false;
+            }
+
+            return true;
+        }
+
+    }
+
+}
+
+
+
+jQuery('form[name="checkout"]').submit(function () {
+    if (jQuery('#payment_method_WC_Gerencianet_Open_Finance').is(':checked')) {
+        let participant = jQuery('<div id="conteudo" class="gn-default-participant"></div>')
+        let participantLogo = jQuery("<img class='gn-participant-logo' src='" + jQuery("#gn-participant-logo").attr('src') + "' />")
+        let participantName = jQuery("<label class='gn-participant-name'>" + jQuery("#gn-default-name").html() + "</label>")
+
+        participant.append(participantLogo)
+        participant.append(participantName)
+
+        Swal.fire({
+            title: 'Você está sendo redirecionado para',
+            html: participant,
+            timer: 500000,
+            didOpen: () => {
+                Swal.showLoading()
+            },
+            willClose: () => {
+                return true
+            }
+        })
+        setTimeout(500000)
+    }
+
+});
+
+jQuery('input[name="payment_method"]').click(function () {
+    if (jQuery('#payment_method_WC_Gerencianet_Open_Finance').is(':checked') && jQuery("#gn_of_participant").val() == '') {
+        jQuery("#place_order").prop("disabled", true)
+
+    } else {
+        jQuery("#place_order").prop("disabled", false)
+    }
+})
diff --git a/assets/js/scripts-pix.js b/assets/js/scripts-pix.js
old mode 100755
new mode 100644
index 5308adb..d5879b6
--- a/assets/js/scripts-pix.js
+++ b/assets/js/scripts-pix.js
@@ -1,158 +1,160 @@
-	jQuery(document).ready(
-		function ($) {
-
-			if(!document.getElementById('swalCss')){
-				let swalCss = $( "<style id='swalCss'></style>" ).html( ".colored-toast .swal2-title {color: white;}.colored-toast .swal2-close {color: white;}.colored-toast .swal2-html-container {color: white;}.colored-toast.swal2-icon-error {background-color: #f27474 !important;}" )
-				$( "#payment" ).after( swalCss );
-			}
-
-			if (document.getElementById('gn_pix_cpf_cnpj')) {
-				$('#gn_pix_cpf_cnpj').keyup(
-					function () {
-						$('#gn_pix_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_pix_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_pix_cpf_cnpj")).maskPattern("999.999.999-99");
-					}
-				)
-				$('#gn_pix_cpf_cnpj').blur(
-					function () {
-						var cpf_cnpj = $('#gn_pix_cpf_cnpj').val();
-
-						if (!validate_cpf_cnpj(cpf_cnpj)) {
-							$('#gn_pix_cpf_cnpj').css('border', '1px solid red');
-							customError("CPF/CNPJ Inválido");
-						} else {
-							$('#gn_pix_cpf_cnpj').css('border', '1px solid green');
-						}
-					}
-				)
-			}
-
-			// Esconder campos caso haja o brazillian market
-
-			if (typeof $('#billing_cpf').val() !== 'undefined') {
-
-				// cpf_cnpj Pix
-				if (typeof $('#gn_pix_cpf_cnpj').val() !== 'undefined') {
-					$('#gn_pix_cpf_cnpj').val($('#billing_cpf').val())
-					$('#gn_field_pix').hide();
-				}
-
-				$('#billing_cpf').keyup(function () {
-
-					if (typeof $('#gn_pix_cpf_cnpj').val() !== 'undefined') {
-						// cpf_cnpj Pix
-						$('#gn_pix_cpf_cnpj').val($('#billing_cpf').val())
-						$('#gn_field_pix').hide();
-					}
-				}
-				)
-			}
-
-			if (typeof $('#billing_cnpj').val() !== 'undefined') {
-				$('#billing_cnpj').keyup(
-					function () {
-						// cpf_cnpj Pix
-						$('#gn_pix_cpf_cnpj').val($('#billing_cnpj').val())
-						$('#gn_field_pix').hide();
-					}
-				)
-			}
-		}
-	);
-
-	function validate_cpf_cnpj(cpf_cnpj) {
-
-		cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
-
-		if (cpf_cnpj < 11) {
-			return false;
-		}
-
-		if (cpf_cnpj.length == 11) {
-			var remnant, sum = 0;
-
-			for (i = 1; i <= 9; i++) {
-				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
-			}
-			remnant = (sum * 10) % 11;
-
-			if ((remnant == 10) || (remnant == 11)) {
-				remnant = 0;
-			}
-			if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
-				return false;
-			}
-
-			sum = 0;
-
-			for (i = 1; i <= 10; i++) {
-				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
-			}
-			remnant = (sum * 10) % 11;
-
-			if ((remnant == 10) || (remnant == 11)) {
-				remnant = 0;
-			}
-			if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
-				return false;
-			}
-			return true;
-
-		} else if (cpf_cnpj.length == 14) {
-			var tam = cpf_cnpj.length - 2
-			var numbers = cpf_cnpj.substring(0, tam);
-			var digits = cpf_cnpj.substring(tam);
-			var sum = 0;
-			var pos = tam - 7;
-
-			for (i = tam; i >= 1; i--) {
-				sum += numbers.charAt(tam - i) * pos--;
-				if (pos < 2) {
-					pos = 9;
-				}
-			}
-
-			var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-			if (result != digits.charAt(0)) {
-				return false;
-			}
-
-			tam = tam + 1;
-			numbers = cpf_cnpj.substring(0, tam);
-			sum = 0;
-			pos = tam - 7;
-
-			for (i = tam; i >= 1; i--) {
-				sum += numbers.charAt(tam - i) * pos--;
-				if (pos < 2) {
-					pos = 9;
-				}
-			}
-
-			result = sum % 11 < 2 ? 0 : 11 - sum % 11;
-
-			if (result != digits.charAt(1)) {
-				return false;
-			}
-
-			return true;
-		}
-
-	}
-
-	function customError(msg) {
-		Swal.mixin(
-			{
-				toast: true,
-				position: 'top-right',
-				iconColor: 'white',
-				customClass: {
-					popup: 'colored-toast'
-				},
-				showConfirmButton: false,
-				timer: 5000,
-				timerProgressBar: true
-			}
-		).fire({ icon: 'error', title: msg })
-	}
-
+	jQuery(document).ready(
+		function ($) {
+
+			if(!document.getElementById('swalCss')){
+				let swalCss = $( "<style id='swalCss'></style>" ).html( ".colored-toast .swal2-title {color: white;}.colored-toast .swal2-close {color: white;}.colored-toast .swal2-html-container {color: white;}.colored-toast.swal2-icon-error {background-color: #f27474 !important;}" )
+				$( "#payment" ).after( swalCss );
+			}
+
+			if (document.getElementById('gn_pix_cpf_cnpj')) {
+				$('#gn_pix_cpf_cnpj').keyup(
+					function () {
+						$('#gn_pix_cpf_cnpj').val().length > 14 ? VMasker(document.querySelector("#gn_pix_cpf_cnpj")).maskPattern("99.999.999/9999-99") : VMasker(document.querySelector("#gn_pix_cpf_cnpj")).maskPattern("999.999.999-99");
+					}
+				)
+				$('#gn_pix_cpf_cnpj').blur(
+					function () {
+						var cpf_cnpj = $('#gn_pix_cpf_cnpj').val();
+						
+						if(cpf_cnpj != "") {
+    						if (!validate_cpf_cnpj(cpf_cnpj)) {
+    							$('#gn_pix_cpf_cnpj').css('border', '1px solid red');
+    							customError("CPF/CNPJ Inválido");
+    						} else {
+    							$('#gn_pix_cpf_cnpj').css('border', '1px solid green');
+    						}
+						}
+					}
+				)
+			}
+
+			// Esconder campos caso haja o brazillian market
+
+			if (typeof $('#billing_cpf').val() !== 'undefined') {
+
+				// cpf_cnpj Pix
+				if (typeof $('#gn_pix_cpf_cnpj').val() !== 'undefined') {
+					$('#gn_pix_cpf_cnpj').val($('#billing_cpf').val())
+					$('#gn_field_pix').hide();
+				}
+
+				$('#billing_cpf').keyup(function () {
+
+					if (typeof $('#gn_pix_cpf_cnpj').val() !== 'undefined') {
+						// cpf_cnpj Pix
+						$('#gn_pix_cpf_cnpj').val($('#billing_cpf').val())
+						$('#gn_field_pix').hide();
+					}
+				}
+				)
+			}
+
+			if (typeof $('#billing_cnpj').val() !== 'undefined') {
+				$('#billing_cnpj').keyup(
+					function () {
+						// cpf_cnpj Pix
+						$('#gn_pix_cpf_cnpj').val($('#billing_cnpj').val())
+						$('#gn_field_pix').hide();
+					}
+				)
+			}
+		}
+	);
+
+	function validate_cpf_cnpj(cpf_cnpj) {
+
+		cpf_cnpj = cpf_cnpj.trim().replace(/\./g, '').replace('-', '').replace('/', '');
+
+		if (cpf_cnpj < 11) {
+			return false;
+		}
+
+		if (cpf_cnpj.length == 11) {
+			var remnant, sum = 0;
+
+			for (i = 1; i <= 9; i++) {
+				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (11 - i);
+			}
+			remnant = (sum * 10) % 11;
+
+			if ((remnant == 10) || (remnant == 11)) {
+				remnant = 0;
+			}
+			if (remnant != parseInt(cpf_cnpj.substring(9, 10))) {
+				return false;
+			}
+
+			sum = 0;
+
+			for (i = 1; i <= 10; i++) {
+				sum = sum + parseInt(cpf_cnpj.substring(i - 1, i)) * (12 - i);
+			}
+			remnant = (sum * 10) % 11;
+
+			if ((remnant == 10) || (remnant == 11)) {
+				remnant = 0;
+			}
+			if (remnant != parseInt(cpf_cnpj.substring(10, 11))) {
+				return false;
+			}
+			return true;
+
+		} else if (cpf_cnpj.length == 14) {
+			var tam = cpf_cnpj.length - 2
+			var numbers = cpf_cnpj.substring(0, tam);
+			var digits = cpf_cnpj.substring(tam);
+			var sum = 0;
+			var pos = tam - 7;
+
+			for (i = tam; i >= 1; i--) {
+				sum += numbers.charAt(tam - i) * pos--;
+				if (pos < 2) {
+					pos = 9;
+				}
+			}
+
+			var result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+			if (result != digits.charAt(0)) {
+				return false;
+			}
+
+			tam = tam + 1;
+			numbers = cpf_cnpj.substring(0, tam);
+			sum = 0;
+			pos = tam - 7;
+
+			for (i = tam; i >= 1; i--) {
+				sum += numbers.charAt(tam - i) * pos--;
+				if (pos < 2) {
+					pos = 9;
+				}
+			}
+
+			result = sum % 11 < 2 ? 0 : 11 - sum % 11;
+
+			if (result != digits.charAt(1)) {
+				return false;
+			}
+
+			return true;
+		}
+
+	}
+
+	function customError(msg) {
+		Swal.mixin(
+			{
+				toast: true,
+				position: 'top-right',
+				iconColor: 'white',
+				customClass: {
+					popup: 'colored-toast'
+				},
+				showConfirmButton: false,
+				timer: 5000,
+				timerProgressBar: true
+			}
+		).fire({ icon: 'error', title: msg })
+	}
+
diff --git a/gerencianet-oficial.php b/gerencianet-oficial.php
index a59c9d7..5742002 100644
--- a/gerencianet-oficial.php
+++ b/gerencianet-oficial.php
@@ -9,7 +9,7 @@
  * Plugin Name:       Efí by Gerencianet Oficial
  * Plugin URI:        https://wordpress.org/plugins/woo-gerencianet-official/
  * Description:       Gateway de pagamento Efi by Gerencianet para WooCommerce
- * Version:           2.2.1
+ * Version:           2.2.2
  * Author:            Efi by Gerencianet
  * Author URI:        https://www.sejaefi.com.br
  * License:           GPL-2.0+
@@ -25,7 +25,7 @@
 	die;
 }
 
-define( 'GERENCIANET_OFICIAL_VERSION', '2.2.1' );
+define( 'GERENCIANET_OFICIAL_VERSION', '2.2.2' );
 define( 'GERENCIANET_BOLETO_ID', 'WC_Gerencianet_Boleto' );
 define( 'GERENCIANET_CARTAO_ID', 'WC_Gerencianet_Cartao' );
 define( 'GERENCIANET_PIX_ID', 'WC_Gerencianet_Pix' );
diff --git a/readme.txt b/readme.txt
index fd18123..546fca6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Efí Bank
 Tags: woocommerce, gerencianet, payment, transparent checkout, pix, Boleto, card, brazil, payments brazil, cartão de crédito, efí, efi, efipay, efi bank, efi pay, efípay, efí bank, efí pay
 Requires at least: 5.x
 Tested up to: 6.4
-Stable tag: 2.2.1
+Stable tag: 2.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html