" + - wc_mercadopago_ticket_params.discount_info3 + - " " + - currencyIdToCurrency(response.response.currency_id) + - " " + - Math.round(getAmountWithoutDiscount() * 100) / 100 + - "
" + - wc_mercadopago_ticket_params.discount_info4 + - " " + - currencyIdToCurrency(response.response.currency_id) + - " " + - Math.round(getAmount() * 100) / 100 + - "*
" + - "" + - wc_mercadopago_ticket_params.discount_info5 + - "
" + - '' + - wc_mercadopago_ticket_params.discount_info6 + - ""; - document.querySelector("#mpCouponErrorTicket").style.display = - "none"; - document.querySelector("#couponCodeTicket").style.background = null; - document.querySelector("#couponCodeTicket").style.background = - "url(" + - wc_mercadopago_ticket_params.check + - ") 94% 50% no-repeat #fff"; - document.querySelector("#couponCodeTicket").style.border = - "1px solid #cecece"; - document.querySelector("#applyCouponTicket").value = - wc_mercadopago_ticket_params.remove; - document.querySelector("#campaign_idTicket").value = - response.response.id; - document.querySelector("#campaignTicket").value = - response.response.name; - } else { - coupon_of_discounts.status = false; - document.querySelector("#mpCouponApplyedTicket").style.display = - "none"; - document.querySelector("#mpCouponErrorTicket").style.display = - "block"; - document.querySelector("#mpCouponErrorTicket").innerHTML = - response.response.message; - document.querySelector("#couponCodeTicket").style.background = null; - document.querySelector("#couponCodeTicket").style.background = - "url(" + - wc_mercadopago_ticket_params.error + - ") 94% 50% no-repeat #fff"; - document.querySelector("#applyCouponTicket").value = - wc_mercadopago_ticket_params.apply; - document.querySelector("#discountTicket").value = 0; - } - document.querySelector("#applyCouponTicket").disabled = false; - }, - }); - } - - /** - * CurrencyId to Currency - * - * @param {string} currency_id - */ - function currencyIdToCurrency(currency_id) { - if (currency_id === "ARS") { - return "$"; - } else if (currency_id === "BRL") { - return "R$"; - } else if (currency_id === "COP") { - return "$"; - } else if (currency_id === "CLP") { - return "$"; - } else if (currency_id === "MXN") { - return "$"; - } else if (currency_id === "VEF") { - return "Bs"; - } else if (currency_id === "PEN") { - return "S/"; - } else if (currency_id === "UYU") { - return "$U"; - } else { - return "$"; - } - } - - /** - * Get Amount Without Discount - * - * @return {string} - */ - function getAmountWithoutDiscount() { - return document.querySelector("#amountTicket").value; - } - - /** - * Get Amount end calculate discount for hide inputs - */ - function getAmount() { - return ( - document.getElementById("amountTicket").value - - document.getElementById("discountTicket").value - ); - } }); })(jQuery); diff --git a/assets/js/ticket.min.js b/assets/js/ticket.min.js index 10a4b52b3..7b373fa7a 100644 --- a/assets/js/ticket.min.js +++ b/assets/js/ticket.min.js @@ -1 +1 @@ -!function(e){"use strict";e((function(){var o=!1,t=wc_mercadopago_ticket_params.site_id,r={discount_action_url:wc_mercadopago_ticket_params.discount_action_url,payer_email:wc_mercadopago_ticket_params.payer_email,activated:wc_mercadopago_ticket_params.coupon_mode,status:!1};function c(){return!document.getElementById("payment_method_woo-mercado-pago-ticket").checked||("mlb"===t?(function(){for(var e=document.querySelector("#mercadopago-form-ticket"),o=e.querySelectorAll("[data-checkout]"),t=e.querySelectorAll(".mp-erro_febraban"),r=0;r
"+wc_mercadopago_ticket_params.discount_info3+" "+l(e.response.currency_id)+" "+Math.round(100*document.querySelector("#amountTicket").value)/100+"
"+wc_mercadopago_ticket_params.discount_info4+" "+l(e.response.currency_id)+" "+Math.round(100*(document.getElementById("amountTicket").value-document.getElementById("discountTicket").value))/100+"*
"+wc_mercadopago_ticket_params.discount_info5+'
'+wc_mercadopago_ticket_params.discount_info6+"",document.querySelector("#mpCouponErrorTicket").style.display="none",document.querySelector("#couponCodeTicket").style.background=null,document.querySelector("#couponCodeTicket").style.background="url("+wc_mercadopago_ticket_params.check+") 94% 50% no-repeat #fff",document.querySelector("#couponCodeTicket").style.border="1px solid #cecece",document.querySelector("#applyCouponTicket").value=wc_mercadopago_ticket_params.remove,document.querySelector("#campaign_idTicket").value=e.response.id,document.querySelector("#campaignTicket").value=e.response.name):(r.status=!1,document.querySelector("#mpCouponApplyedTicket").style.display="none",document.querySelector("#mpCouponErrorTicket").style.display="block",document.querySelector("#mpCouponErrorTicket").innerHTML=e.response.message,document.querySelector("#couponCodeTicket").style.background=null,document.querySelector("#couponCodeTicket").style.background="url("+wc_mercadopago_ticket_params.error+") 94% 50% no-repeat #fff",document.querySelector("#applyCouponTicket").value=wc_mercadopago_ticket_params.apply,document.querySelector("#discountTicket").value=0),document.querySelector("#applyCouponTicket").disabled=!1}})}())}function l(e){return"ARS"===e?"$":"BRL"===e?"R$":"COP"===e||"CLP"===e||"MXN"===e?"$":"VEF"===e?"Bs":"PEN"===e?"S/":"UYU"===e?"$U":"$"}e("form#order_review").length>0&&"yes"===r.activated&&e("#applyCouponTicket").on("click",a),e("body").on("updated_checkout",(function(){"yes"===r.activated&&e("#applyCouponTicket").on("click",a)})),e("form.checkout").on("checkout_place_order_woo-mercado-pago-ticket",(function(){return c()})),e("form#order_review").submit((function(){return c()}))}))}(jQuery); \ No newline at end of file +!function(e){"use strict";e((function(){var t=!1;function r(){if(!document.getElementById("payment_method_woo-mercado-pago-ticket").checked)return!0;let r=document.querySelector(".mp-checkout-ticket-content"),o=r.querySelectorAll("input-helper");return"mlb"!==wc_mercadopago_params.site_id&&"mlu"!==wc_mercadopago_params.site_id||function(e,t){if(""==e.querySelectorAll(".mp-document")[0].value){document.getElementsByClassName("mp-input")[1].classList.add("mp-error"),t[0].querySelector("div").style.display="flex"}}(r,o),function(){let e=!1;document.querySelectorAll(".mp-input-radio-radio").forEach((t=>{t.checked&&(e=!0)})),0==e&&(CheckoutPage.setDisplayOfError("fcInputTableContainer","add","mp-error"),CheckoutPage.setDisplayOfInputHelper("mp-payment-method","flex"));const t=document.getElementsByClassName("mp-input-table-label");for(var r=0;r
-
";
+ public function get_mp_devsite_link( $country ) {
+ $country_links = [
+ 'mla' => 'https://www.mercadopago.com.ar/developers/es/guides/plugins/woocommerce/testing',
+ 'mlb' => 'https://www.mercadopago.com.br/developers/pt/guides/plugins/woocommerce/testing',
+ 'mlc' => 'https://www.mercadopago.cl/developers/es/guides/plugins/woocommerce/testing',
+ 'mco' => 'https://www.mercadopago.com.co/developers/es/guides/plugins/woocommerce/testing',
+ 'mlm' => 'https://www.mercadopago.com.mx/developers/es/guides/plugins/woocommerce/testing',
+ 'mpe' => 'https://www.mercadopago.com.pe/developers/es/guides/plugins/woocommerce/testing',
+ 'mlu' => 'https://www.mercadopago.com.uy/developers/es/guides/plugins/woocommerce/testing',
+ ];
+ $link = array_key_exists($country, $country_links) ? $country_links[$country] : $country_links['mla'];
+
+ return $link;
}
/**
@@ -1238,4 +1255,76 @@ public function set_order_to_pending_on_retry( $order ) {
$order->save();
}
}
+
+ /**
+ * Get Country Link to Mercado Pago
+ *
+ * @param string $checkout Checkout by country.
+ * @return string
+ */
+ public static function get_country_link_mp_terms() {
+
+ $country_link = [
+ 'mla' => [
+ 'help' => 'ayuda',
+ 'sufix_url' => 'com.ar/',
+ 'translate' => 'es',
+ 'term_conditition' => '/terminos-y-politicas_194', // Argentinian.
+ ],
+ 'mlb' => [
+ 'help' => 'ajuda',
+ 'sufix_url' => 'com.br/',
+ 'translate' => 'pt',
+ 'term_conditition' => '/termos-e-politicas_194', //Brasil
+ ],
+ 'mlc' => [
+ 'help' => 'ayuda',
+ 'sufix_url' => 'cl/',
+ 'translate' => 'es',
+ 'term_conditition' => '/terminos-y-politicas_194', // Chile.
+ ],
+ 'mco' => [
+ 'help' => 'ayuda',
+ 'sufix_url' => 'com.co/',
+ 'translate' => 'es',
+ 'term_conditition' => '/terminos-y-politicas_194', // Colombia.
+ ],
+ 'mlm' => [
+ 'help' => 'ayuda',
+ 'sufix_url' => 'com.mx/',
+ 'translate' => 'es',
+ 'term_conditition' => '/terminos-y-politicas_194', // Mexico.
+ ],
+ 'mpe' => [
+ 'help' => 'ayuda',
+ 'sufix_url' => 'com.pe/',
+ 'translate' => 'es',
+ 'term_conditition' => '/terminos-y-politicas_194', // Peru.
+ ],
+ 'mlu' => [
+ 'help' => 'ayuda',
+ 'sufix_url' => 'com.uy/',
+ 'translate' => 'es',
+ 'term_conditition' => '/terminos-y-politicas_194', // Uruguay.
+ ],
+ ];
+
+ $checkout_country = strtolower(get_option( 'checkout_country', '' ));
+ return $country_link[ $checkout_country ];
+ }
+
+ /**
+ *
+ * Define terms and conditions link
+ *
+ * @return array
+ */
+ public static function mp_define_terms_and_conditions() {
+ $links_mp = self::get_country_link_mp_terms();
+ $link_prefix_mp = 'https://www.mercadopago.';
+
+ return array (
+ 'link_terms_and_conditions' => $link_prefix_mp . $links_mp['sufix_url'] . $links_mp['help'] . $links_mp['term_conditition']
+ );
+ }
}
diff --git a/includes/payments/class-wc-woomercadopago-pix-gateway.php b/includes/payments/class-wc-woomercadopago-pix-gateway.php
index 2271a06c2..2ccf6b941 100755
--- a/includes/payments/class-wc-woomercadopago-pix-gateway.php
+++ b/includes/payments/class-wc-woomercadopago-pix-gateway.php
@@ -45,12 +45,16 @@ public function __construct() {
$this->checkout_type = 'custom';
$this->activated_payment = get_option( '_mp_payment_methods_pix', '' );
$this->field_forms_order = $this->get_fields_sequence();
+
parent::__construct();
+
$this->update_pix_method();
$this->form_fields = $this->get_form_mp_fields();
$this->hook = new WC_WooMercadoPago_Hook_Pix( $this );
$this->notification = new WC_WooMercadoPago_Notification_Webhook( $this );
$this->currency_convertion = true;
+ $this->icon = $this->get_checkout_icon();
+
add_action( 'woocommerce_email_before_order_table', array(__CLASS__,'get_pix_template'), 20, 4 );
add_action( 'woocommerce_order_details_after_order_table', array(__CLASS__,'get_pix_template_order_details') );
}
@@ -362,25 +366,20 @@ public function field_checkout_pix_card_info() {
* Payment fields
*/
public function payment_fields() {
- // add css.
$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+ // add css.
wp_enqueue_style(
- 'woocommerce-mercadopago-basic-checkout-styles',
- plugins_url( '../assets/css/basic_checkout_mercadopago' . $suffix . '.css', plugin_dir_path( __FILE__ ) ),
+ 'woocommerce-mercadopago-narciso-styles',
+ plugins_url( '../assets/css/mp-plugins-components.css', plugin_dir_path( __FILE__ ) ),
array(),
WC_WooMercadoPago_Constants::VERSION
);
- $parameters = array(
- 'checkout_alert_test_mode' => $this->is_production_mode()
- ? ''
- : $this->checkout_alert_test_mode_template(
- 'Pix em Modo Teste',
- 'É possível testar o fluxo até gerar o código, mas não é possível finalizar o pagamento.'
- ),
- 'image_pix' => plugins_url( '../assets/images/pix.png', plugin_dir_path( __FILE__ ) ),
- );
+ $parameters = [
+ 'test_mode' => ! $this->is_production_mode(),
+ 'pix_image' => plugins_url( '../assets/images/pix.png', plugin_dir_path( __FILE__ ) ),
+ ];
$parameters = array_merge($parameters, WC_WooMercadoPago_Helper_Links::mp_define_terms_and_conditions());
wc_get_template( 'checkout/pix-checkout.php', $parameters, 'woo/mercado/pago/module/', WC_WooMercadoPago_Module::get_templates_path() );
@@ -659,4 +658,17 @@ public static function get_pix_template_order_details( $order ) {
}
+ /**
+ * Get Mercado Pago Icon
+ *
+ * @return mixed
+ */
+ public function get_checkout_icon() {
+ /**
+ * Add Mercado Pago icon.
+ *
+ * @since 3.0.1
+ */
+ return apply_filters( 'woocommerce_mercadopago_icon', plugins_url( '../assets/images/icons/pix.png', plugin_dir_path( __FILE__ ) ) );
+ }
}
diff --git a/includes/payments/class-wc-woomercadopago-ticket-gateway.php b/includes/payments/class-wc-woomercadopago-ticket-gateway.php
index e671ec686..860569374 100755
--- a/includes/payments/class-wc-woomercadopago-ticket-gateway.php
+++ b/includes/payments/class-wc-woomercadopago-ticket-gateway.php
@@ -47,11 +47,13 @@ public function __construct() {
$this->checkout_type = 'custom';
$this->activated_payment = $this->get_activated_payment();
$this->field_forms_order = $this->get_fields_sequence();
+
parent::__construct();
$this->form_fields = $this->get_form_mp_fields();
$this->hook = new WC_WooMercadoPago_Hook_Ticket( $this );
$this->notification = new WC_WooMercadoPago_Notification_Webhook( $this );
$this->currency_convertion = true;
+ $this->icon = $this->get_checkout_icon();
}
/**
@@ -144,6 +146,7 @@ public function get_fields_sequence() {
*/
public static function get_activated_payment() {
$activated_payment = array();
+ $treated_payments = array();
$get_payment_methods_ticket = get_option( '_all_payment_methods_ticket', '' );
if ( ! empty( $get_payment_methods_ticket ) ) {
@@ -161,7 +164,29 @@ public static function get_activated_payment() {
}
}
}
- return $activated_payment;
+
+ foreach ( $activated_payment as $payment ) {
+ $treated_payment = [];
+ if ( isset($payment['payment_places']) ) {
+ foreach ( $payment['payment_places'] as $place ) {
+ $payment_place_id = ( new WC_WooMercadoPago_Composite_Id_Helper() )->generateIdFromPlace($payment['id'], $place['payment_option_id']);
+ $treated_payment['id'] = $payment_place_id;
+ $treated_payment['value'] = $payment_place_id;
+ $treated_payment['rowText'] = $place['name'];
+ $treated_payment['img'] = $place['thumbnail'];
+ $treated_payment['alt'] = $place['name'];
+ array_push( $treated_payments, $treated_payment);
+ }
+ } else {
+ $treated_payment['id'] = $payment['id'];
+ $treated_payment['value'] = $payment['id'];
+ $treated_payment['rowText'] = $payment['name'];
+ $treated_payment['img'] = $payment['secure_thumbnail'];
+ $treated_payment['alt'] = $payment['name'];
+ array_push( $treated_payments, $treated_payment);
+ }
+ }
+ return $treated_payments;
}
/**
@@ -299,8 +324,8 @@ public function payment_fields() {
$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
wp_enqueue_style(
- 'woocommerce-mercadopago-basic-checkout-styles',
- plugins_url( '../assets/css/basic_checkout_mercadopago' . $suffix . '.css', plugin_dir_path( __FILE__ ) ),
+ 'woocommerce-mercadopago-narciso-styles',
+ plugins_url( '../assets/css/mp-plugins-components.css', plugin_dir_path( __FILE__ ) ),
array(),
WC_WooMercadoPago_Constants::VERSION
);
@@ -316,6 +341,7 @@ public function payment_fields() {
$address .= ( ! empty( $address_2 ) ? ' - ' . $address_2 : '' );
$country = get_user_meta( wp_get_current_user()->ID, 'billing_country', true );
$address .= ( ! empty( $country ) ? ' - ' . $country : '' );
+ $test_mode_link = $this->get_mp_devsite_link($this->checkout_country);
try {
$currency_ratio = WC_WooMercadoPago_Helpers_CurrencyConverter::get_instance()->ratio( $this );
@@ -324,12 +350,8 @@ public function payment_fields() {
}
$parameters = array(
- 'checkout_alert_test_mode' => $this->is_production_mode()
- ? ''
- : $this->checkout_alert_test_mode_template(
- __( 'Offline Methods in Test Mode', 'woocommerce-mercadopago' ),
- __( 'You can test the flow to generate an invoice, but you cannot finalize the payment.', 'woocommerce-mercadopago' )
- ),
+ 'test_mode' => ! $this->is_production_mode(),
+ 'test_mode_link' => $test_mode_link,
'amount' => $amount,
'payment_methods' => $this->activated_payment,
'site_id' => $this->mp_options->get_site_id(),
@@ -411,14 +433,23 @@ public function process_payment( $order_id ) {
// Check for brazilian FEBRABAN rules.
if ( 'mlb' === $this->mp_options->get_site_id() ) {
- if ( ! isset( $ticket_checkout['docNumber'] ) || empty( $ticket_checkout['docNumber'] ) ||
- ( 14 !== strlen( $ticket_checkout['docNumber'] ) && 18 !== strlen( $ticket_checkout['docNumber'] ) ) ) {
- wc_add_notice(
- '
- ![alert](" . esc_url( plugins_url( )
-
-
-
- $alertTitle
-$alertDescription
-' . - __( 'There was a problem processing your payment. Are you sure you have correctly filled out all the information on the payment form?', 'woocommerce-mercadopago' ) . - '
', - 'error' - ); + if ( ! isset( $ticket_checkout['docNumber'] ) || empty( $ticket_checkout['docNumber'] ) ) { + + if ( isset( $ticket_checkout['docNumberError'] ) || ! empty( $ticket_checkout['docNumberError'] ) ) { + wc_add_notice( + '' . + __( 'Your document data is invalid', 'woocommerce-mercadopago' ) . + '
', + 'error' + ); + } else { + wc_add_notice( + '' . + __( 'There was a problem processing your payment. Are you sure you have correctly filled out all the information on the payment form?', 'woocommerce-mercadopago' ) . + '
', + 'error' + ); + } return array( 'result' => 'fail', 'redirect' => '', @@ -431,12 +462,21 @@ public function process_payment( $order_id ) { ! isset( $ticket_checkout['docNumber'] ) || empty( $ticket_checkout['docNumber'] ) || ! isset( $ticket_checkout['docType'] ) || empty( $ticket_checkout['docType'] ) ) { - wc_add_notice( - '' . - __( 'There was a problem processing your payment. Are you sure you have correctly filled out all the information on the payment form?', 'woocommerce-mercadopago' ) . - '
', - 'error' - ); + if ( isset( $ticket_checkout['docNumberError'] ) || ! empty( $ticket_checkout['docNumberError'] ) ) { + wc_add_notice( + '' . + __( 'Your document data is invalid', 'woocommerce-mercadopago' ) . + '
', + 'error' + ); + } else { + wc_add_notice( + '' . + __( 'There was a problem processing your payment. Are you sure you have correctly filled out all the information on the payment form?', 'woocommerce-mercadopago' ) . + '
', + 'error' + ); + } return array( 'result' => 'fail', 'redirect' => '', @@ -593,4 +633,29 @@ public static function build_paycash_payments_string() { return implode( __(' and ', 'woocommerce-mercadopago') , array( $paycash_payments, $last_element )); } + + /** + * Get Mercado Pago Icon + * + * @return mixed + */ + public function get_checkout_icon() { + $country = $this->get_option_mp( '_site_id_v1' ); + + if ( 'MLB' !== $country ) { + /** + * Add Mercado Pago icon. + * + * @since 3.0.1 + */ + return apply_filters( 'woocommerce_mercadopago_icon', plugins_url( '../assets/images/icons/ticket.png', plugin_dir_path( __FILE__ ) ) ); + } + + /** + * Add Mercado Pago icon. + * + * @since 3.0.1 + */ + return apply_filters( 'woocommerce_mercadopago_icon', plugins_url( '../assets/images/icons/ticket_mlb.png', plugin_dir_path( __FILE__ ) ) ); + } } diff --git a/includes/payments/hooks/class-wc-woomercadopago-hook-abstract.php b/includes/payments/hooks/class-wc-woomercadopago-hook-abstract.php index 36d36a682..cb78c353f 100755 --- a/includes/payments/hooks/class-wc-woomercadopago-hook-abstract.php +++ b/includes/payments/hooks/class-wc-woomercadopago-hook-abstract.php @@ -104,20 +104,17 @@ function() { public function add_discount_abst( $checkout ) { if ( isset( $checkout['discount'] ) - && ! empty( $checkout['discount'] ) - && isset( $checkout['coupon_code'] ) - && ! empty( $checkout['coupon_code'] ) - && $checkout['discount'] > 0 - && WC()->session->chosen_payment_method === $this->payment->id + && ! empty( $checkout['discount'] ) + && isset( $checkout['coupon_code'] ) + && ! empty( $checkout['coupon_code'] ) + && $checkout['discount'] > 0 + && WC()->session->chosen_payment_method === $this->payment->id ) { $this->payment->log->write_log( __FUNCTION__, $this->class . 'trying to apply discount...' ); - $value = ( - 'COP' === $this->payment->site_data['currency'] - || 'CLP' === $this->payment->site_data['currency'] - ) - ? floor( $checkout['discount'] / $checkout['currency_ratio'] ) - : floor( $checkout['discount'] / $checkout['currency_ratio'] * 100 ) / 100; + $value = ( 'COP' === $this->payment->site_data['currency'] || 'CLP' === $this->payment->site_data['currency'] ) + ? floor( $checkout['discount'] / $checkout['currency_ratio'] ) + : floor( $checkout['discount'] / $checkout['currency_ratio'] * 100 ) / 100; global $woocommerce; diff --git a/includes/payments/hooks/class-wc-woomercadopago-hook-basic.php b/includes/payments/hooks/class-wc-woomercadopago-hook-basic.php index fd218ce51..9297e09a6 100755 --- a/includes/payments/hooks/class-wc-woomercadopago-hook-basic.php +++ b/includes/payments/hooks/class-wc-woomercadopago-hook-basic.php @@ -25,6 +25,7 @@ class WC_WooMercadoPago_Hook_Basic extends WC_WooMercadoPago_Hook_Abstract { */ public function load_hooks( $is_instance = false ) { parent::load_hooks(); + if ( ! empty( $this->payment->settings['enabled'] ) && 'yes' === $this->payment->settings['enabled'] ) { add_action( 'wp_enqueue_scripts', array( $this, 'add_checkout_scripts_basic' ) ); add_action( 'woocommerce_after_checkout_form', array( $this, 'add_mp_settings_script_basic' ) ); @@ -104,9 +105,10 @@ public function render_order_form( $order_id ) { public function add_checkout_scripts_basic() { if ( is_checkout() && $this->payment->is_available() && ! get_query_var( 'order-received' ) ) { $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + wp_enqueue_script( - 'woocommerce-mercadopago-basic', - plugins_url( '../../assets/js/basic-cho' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), + 'woocommerce-mercadopago-narciso-scripts', + plugins_url( '../../assets/js/mp-plugins-components.js', plugin_dir_path( __FILE__ ) ), array( 'jquery' ), WC_WooMercadoPago_Constants::VERSION, true diff --git a/includes/payments/hooks/class-wc-woomercadopago-hook-custom.php b/includes/payments/hooks/class-wc-woomercadopago-hook-custom.php index 8c1e39eec..b7b1714cd 100644 --- a/includes/payments/hooks/class-wc-woomercadopago-hook-custom.php +++ b/includes/payments/hooks/class-wc-woomercadopago-hook-custom.php @@ -23,10 +23,12 @@ class WC_WooMercadoPago_Hook_Custom extends WC_WooMercadoPago_Hook_Abstract { */ public function load_hooks() { parent::load_hooks(); + if ( ! empty( $this->payment->settings['enabled'] ) && 'yes' === $this->payment->settings['enabled'] ) { add_action( 'wp_enqueue_scripts', array( $this, 'add_checkout_scripts_custom' ) ); add_action( 'woocommerce_after_checkout_form', array( $this, 'add_mp_settings_script_custom' ) ); add_action( 'woocommerce_thankyou', array( $this, 'update_mp_settings_script_custom' ) ); + add_action( 'woocommerce_review_order_before_payment', array( $this, 'add_init_cardform_checkout')); } add_action( @@ -39,6 +41,20 @@ function ( $order ) { ); } + /** + * Add Init Cardform on Checkout Page + */ + public function add_init_cardform_checkout() { + $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + wp_enqueue_script( + 'woocommerce-mercadopago-checkout-init-cardform', + plugins_url( '../../assets/js/securityFields/checkoutSecurityFields' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), + array(), + WC_WooMercadoPago_Constants::VERSION, + true + ); + } + /** * Add Discount */ @@ -63,10 +79,43 @@ public function add_discount() { public function add_checkout_scripts_custom() { if ( is_checkout() && $this->payment->is_available() && ! get_query_var( 'order-received' ) ) { $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + + wp_enqueue_script( + 'woocommerce-mercadopago-sdk', + 'https://sdk.mercadopago.com/js/v2', + array(), + WC_WooMercadoPago_Constants::VERSION, + true + ); + wp_enqueue_script( 'woocommerce-mercadopago-checkout', - plugins_url( '../../assets/js/credit-card' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), - array( 'jquery' ), + plugins_url( '../../assets/js/securityFields/securityFields' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), + array(), + WC_WooMercadoPago_Constants::VERSION, + true + ); + + wp_enqueue_script( + 'woocommerce-mercadopago-checkout-page', + plugins_url( '../../assets/js/securityFields/pageObjects/checkoutPage' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), + array(), + WC_WooMercadoPago_Constants::VERSION, + true + ); + + wp_enqueue_script( + 'woocommerce-mercadopago-checkout-elements', + plugins_url( '../../assets/js/securityFields/elements/checkoutElements' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), + array(), + WC_WooMercadoPago_Constants::VERSION, + true + ); + + wp_enqueue_script( + 'woocommerce-mercadopago-narciso-scripts', + plugins_url( '../../assets/js/mp-plugins-components.js', plugin_dir_path( __FILE__ ) ), + array(), WC_WooMercadoPago_Constants::VERSION, true ); @@ -75,26 +124,61 @@ public function add_checkout_scripts_custom() { 'woocommerce-mercadopago-checkout', 'wc_mercadopago_params', array( - 'site_id' => strtolower(get_option( '_site_id_v1' )), - 'public_key' => $this->payment->get_public_key(), - 'coupon_mode' => isset( $this->payment->logged_user_email ) ? $this->payment->coupon_mode : 'no', - 'discount_action_url' => $this->payment->discount_action_url, - 'payer_email' => esc_js( $this->payment->logged_user_email ), - 'apply' => __( 'Apply', 'woocommerce-mercadopago' ), - 'remove' => __( 'Remove', 'woocommerce-mercadopago' ), - 'coupon_empty' => __( 'Please, inform your coupon code', 'woocommerce-mercadopago' ), - 'choose' => __( 'To choose', 'woocommerce-mercadopago' ), - 'other_bank' => __( 'Other bank', 'woocommerce-mercadopago' ), - 'discount_info1' => __( 'You will save', 'woocommerce-mercadopago' ), - 'discount_info2' => __( 'with discount of', 'woocommerce-mercadopago' ), - 'discount_info3' => __( 'Total of your purchase:', 'woocommerce-mercadopago' ), - 'discount_info4' => __( 'Total of your purchase with discount:', 'woocommerce-mercadopago' ), - 'discount_info5' => __( '*After payment approval', 'woocommerce-mercadopago' ), - 'discount_info6' => __( 'Terms and conditions of use', 'woocommerce-mercadopago' ), - 'loading' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'loading.gif', - 'check' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'check.png', - 'error' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'error.png', - 'plugin_version' => WC_WooMercadoPago_Constants::VERSION, + 'site_id' => strtolower(get_option( '_site_id_v1' )), + 'public_key' => $this->payment->get_public_key(), + 'coupon_mode' => isset( $this->payment->logged_user_email ) ? $this->payment->coupon_mode : 'no', + 'discount_action_url' => $this->payment->discount_action_url, + 'payer_email' => esc_js( $this->payment->logged_user_email ), + 'apply' => __( 'Apply', 'woocommerce-mercadopago' ), + 'remove' => __( 'Remove', 'woocommerce-mercadopago' ), + 'coupon_empty' => __( 'Please, inform your coupon code', 'woocommerce-mercadopago' ), + 'choose' => __( 'To choose', 'woocommerce-mercadopago' ), + 'other_bank' => __( 'Other bank', 'woocommerce-mercadopago' ), + 'discount_info1' => __( 'You will save', 'woocommerce-mercadopago' ), + 'discount_info2' => __( 'with discount of', 'woocommerce-mercadopago' ), + 'discount_info3' => __( 'Total of your purchase:', 'woocommerce-mercadopago' ), + 'discount_info4' => __( 'Total of your purchase with discount:', 'woocommerce-mercadopago' ), + 'discount_info5' => __( '*After payment approval', 'woocommerce-mercadopago' ), + 'discount_info6' => __( 'Terms and conditions of use', 'woocommerce-mercadopago' ), + 'rate_text' => __( 'No fee', 'woocommerce-mercadopago' ), + 'more_installments_text' => __( 'More options', 'woocommerce-mercadopago' ), + 'loading' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'loading.gif', + 'check' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'check.png', + 'error' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'error.png', + 'plugin_version' => WC_WooMercadoPago_Constants::VERSION, + 'currency' => $this->payment->site_data['currency'], + 'intl' => $this->payment->site_data['intl'], + 'placeholders' => array( + 'cardExpirationDate' => __( 'mm/yy', 'woocommerce-mercadopago' ), + 'issuer' => __( 'Issuer', 'woocommerce-mercadopago' ), + 'installments' => __( 'Installments', 'woocommerce-mercadopago' ), + ), + 'cvvHint' => array( + 'back' => __( 'on the back', 'woocommerce-mercadopago' ), + 'front' => __( 'on the front', 'woocommerce-mercadopago' ), + ), + 'cvvText' => __( 'digits', 'woocommerce-mercadopago' ), + 'installmentObsFee' => __( 'No fee', 'woocommerce-mercadopago' ), + 'installmentButton' => __( 'More options', 'woocommerce-mercadopago' ), + 'input_helper_message' => array( + 'cardNumber' => array( + 'invalid_type' => __( 'Card number is required', 'woocommerce-mercadopago' ), + 'invalid_length' => __( 'Card number invalid', 'woocommerce-mercadopago' ), + ), + 'cardholderName' => array( + '221' => __( 'Holder name is required', 'woocommerce-mercadopago' ), + '316' => __( 'Holder name invalid', 'woocommerce-mercadopago' ), + ), + 'expirationDate' => array( + 'invalid_type' => __( 'Expiration date invalid', 'woocommerce-mercadopago' ), + 'invalid_length' => __( 'Expiration date incomplete', 'woocommerce-mercadopago' ), + 'invalid_value' => __( 'Expiration date invalid', 'woocommerce-mercadopago' ), + ), + 'securityCode' => array( + 'invalid_type' => __( 'Security code is required', 'woocommerce-mercadopago' ), + 'invalid_length' => __( 'Security code incomplete', 'woocommerce-mercadopago' ), + ) + ), ) ); } diff --git a/includes/payments/hooks/class-wc-woomercadopago-hook-pix.php b/includes/payments/hooks/class-wc-woomercadopago-hook-pix.php index 87377818e..7e6a002be 100644 --- a/includes/payments/hooks/class-wc-woomercadopago-hook-pix.php +++ b/includes/payments/hooks/class-wc-woomercadopago-hook-pix.php @@ -17,12 +17,12 @@ * Class WC_WooMercadoPago_Hook_Pix */ class WC_WooMercadoPago_Hook_Pix extends WC_WooMercadoPago_Hook_Abstract { - /** * Load Hooks */ public function load_hooks() { parent::load_hooks(); + if ( ! empty( $this->payment->settings['enabled'] ) && 'yes' === $this->payment->settings['enabled'] ) { add_action( 'wp_enqueue_scripts', array( $this, 'add_checkout_scripts_pix' ) ); add_action( 'woocommerce_after_checkout_form', array( $this, 'add_mp_settings_script_pix' ) ); @@ -39,9 +39,11 @@ public function add_discount() { if ( ! isset( $_POST['mercadopago_pix'] ) ) { return; } + if ( is_admin() && ! defined( 'DOING_AJAX' ) || is_cart() ) { return; } + // @todo need fix Processing form data without nonce verification // @codingStandardsIgnoreLine $pix_checkout = $_POST['mercadopago_pix']; @@ -53,6 +55,15 @@ public function add_discount() { */ public function add_checkout_scripts_pix() { if ( is_checkout() && $this->payment->is_available() && ! get_query_var( 'order-received' ) ) { + $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + + wp_enqueue_script( + 'woocommerce-mercadopago-narciso-scripts', + plugins_url( '../../assets/js/mp-plugins-components.js', plugin_dir_path( __FILE__ ) ), + array( 'jquery' ), + WC_WooMercadoPago_Constants::VERSION, + true + ); wp_localize_script( 'woocommerce-mercadopago-pix-checkout', @@ -75,13 +86,12 @@ public function add_checkout_scripts_pix() { 'loading' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'loading.gif', 'check' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'check.png', 'error' => plugins_url( '../../assets/images/', plugin_dir_path( __FILE__ ) ) . 'error.png', - ) - ); + )); } } /** - * MP Settings Ticket + * MP Settings pix */ public function add_mp_settings_script_pix() { parent::add_mp_settings_script(); @@ -94,15 +104,20 @@ public function add_mp_settings_script_pix() { */ public function update_mp_settings_script_pix( $order_id ) { parent::update_mp_settings_script( $order_id ); + $order = wc_get_order( $order_id ); $qr_base64 = ( method_exists( $order, 'get_meta' ) ) ? $order->get_meta( 'mp_pix_qr_base64' ) : get_post_meta( $order->get_id(), 'mp_pix_qr_base64', true ); $qr_code = ( method_exists( $order, 'get_meta' ) ) ? $order->get_meta( 'mp_pix_qr_code' ) : get_post_meta( $order->get_id(), 'mp_pix_qr_code', true ); $transaction_amount = ( method_exists( $order, 'get_meta' ) ) ? $order->get_meta( 'mp_transaction_amount' ) : get_post_meta( $order->get_id(), 'mp_transaction_amount', true ); + $currency_symbol = WC_WooMercadoPago_Configs::get_country_configs(); + if ( empty( $qr_base64 ) && empty( $qr_code ) ) { return; } $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + + // add js wp_enqueue_script( 'woocommerce-mercadopago-pix-order-recived', plugins_url( '../../assets/js/pix_mercadopago_order_received' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), @@ -111,7 +126,13 @@ public function update_mp_settings_script_pix( $order_id ) { false ); - $currency_symbol = WC_WooMercadoPago_Configs::get_country_configs(); + // add css + wp_enqueue_style( + 'woocommerce-mercadopago-pix-checkout', + plugins_url( '../../assets/css/basic_checkout_mercadopago' . $suffix . '.css', plugin_dir_path( __FILE__ ) ), + array(), + WC_WooMercadoPago_Constants::VERSION + ); $parameters = array( 'img_pix' => plugins_url( '../../assets/images/img-pix.png', plugin_dir_path( __FILE__ ) ), @@ -139,14 +160,5 @@ public function update_mp_settings_script_pix( $order_id ) { 'woo/mercado/pago/module/', WC_WooMercadoPago_Module::get_templates_path() ); - - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; - - wp_enqueue_style( - 'woocommerce-mercadopago-pix-checkout', - plugins_url( '../../assets/css/basic_checkout_mercadopago' . $suffix . '.css', plugin_dir_path( __FILE__ ) ), - array(), - WC_WooMercadoPago_Constants::VERSION - ); } } diff --git a/includes/payments/hooks/class-wc-woomercadopago-hook-ticket.php b/includes/payments/hooks/class-wc-woomercadopago-hook-ticket.php index dc1983fee..13731fcba 100644 --- a/includes/payments/hooks/class-wc-woomercadopago-hook-ticket.php +++ b/includes/payments/hooks/class-wc-woomercadopago-hook-ticket.php @@ -23,6 +23,7 @@ class WC_WooMercadoPago_Hook_Ticket extends WC_WooMercadoPago_Hook_Abstract { */ public function load_hooks() { parent::load_hooks(); + if ( ! empty( $this->payment->settings['enabled'] ) && 'yes' === $this->payment->settings['enabled'] ) { add_action( 'wp_enqueue_scripts', array( $this, 'add_checkout_scripts_ticket' ) ); add_action( 'woocommerce_after_checkout_form', array( $this, 'add_mp_settings_script_ticket' ) ); @@ -54,6 +55,7 @@ public function add_discount() { public function add_checkout_scripts_ticket() { if ( is_checkout() && $this->payment->is_available() && ! get_query_var( 'order-received' ) ) { $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + wp_enqueue_script( 'woocommerce-mercadopago-ticket-checkout', plugins_url( '../../assets/js/ticket' . $suffix . '.js', plugin_dir_path( __FILE__ ) ), @@ -62,6 +64,14 @@ public function add_checkout_scripts_ticket() { true ); + wp_enqueue_script( + 'woocommerce-mercadopago-narciso-scripts', + plugins_url( '../../assets/js/mp-plugins-components.js', plugin_dir_path( __FILE__ ) ), + array( 'jquery' ), + WC_WooMercadoPago_Constants::VERSION, + true + ); + wp_localize_script( 'woocommerce-mercadopago-ticket-checkout', 'wc_mercadopago_ticket_params', diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..9c1da4467 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,566 @@ +{ + "name": "cart-woocommerce", + "version": "6.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "dev": true, + "requires": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, + "clean-css": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz", + "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==", + "dev": true, + "requires": { + "source-map": "~0.6.0" + } + }, + "cli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", + "integrity": "sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==", + "dev": true, + "requires": { + "exit": "0.1.2", + "glob": "^7.1.1" + } + }, + "commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==", + "dev": true, + "requires": { + "date-now": "^0.1.4" + } + }, + "core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true + }, + "css-b64-images": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/css-b64-images/-/css-b64-images-0.2.5.tgz", + "integrity": "sha1-QgBdgyBLK0pdk7axpWRBM7WSegI=", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==", + "dev": true + }, + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "dev": true, + "requires": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + }, + "dependencies": { + "domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dev": true + }, + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true + } + } + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", + "dev": true + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==", + "dev": true, + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==", + "dev": true, + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dev": true, + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==", + "dev": true + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true + }, + "find-up": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.2.0.tgz", + "integrity": "sha512-yWHzMzXCaFoABSnFTCPKNFlYoq4mSga9QLRRKOCLSJ33hSkzROB14ITbAWW0QDQDyuzsPQ33S1DsOWQb/oW1yA==", + "dev": true, + "requires": { + "locate-path": "^7.0.0", + "path-exists": "^5.0.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "dev": true, + "requires": { + "camel-case": "^4.1.2", + "clean-css": "^5.2.2", + "commander": "^8.3.0", + "he": "^1.2.0", + "param-case": "^3.0.4", + "relateurl": "^0.2.7", + "terser": "^5.10.0" + } + }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==", + "dev": true, + "requires": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + } + }, + "husky": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", + "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true + }, + "jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=", + "dev": true + }, + "jshint": { + "version": "2.13.4", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz", + "integrity": "sha512-HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw==", + "dev": true, + "requires": { + "cli": "~1.0.0", + "console-browserify": "1.1.x", + "exit": "0.1.x", + "htmlparser2": "3.8.x", + "lodash": "~4.17.21", + "minimatch": "~3.0.2", + "strip-json-comments": "1.0.x" + } + }, + "locate-path": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.0.0.tgz", + "integrity": "sha512-+cg2yXqDUKfo4hsFxwa3G1cBJeA+gs1vD8FyV9/odWoUlQe/4syxHQ5DPtKjtfm6gnKbZzjCqzX03kXosvZB1w==", + "dev": true, + "requires": { + "p-locate": "^6.0.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dev": true, + "requires": { + "tslib": "^2.0.3" + } + }, + "matched": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/matched/-/matched-5.0.1.tgz", + "integrity": "sha512-E1fhSTPRyhAlNaNvGXAgZQlq1hL0bgYMTk/6bktVlIhzUnX/SZs7296ACdVeNJE8xFNGSuvd9IpI7vSnmcqLvw==", + "dev": true, + "requires": { + "glob": "^7.1.6", + "picomatch": "^2.2.1" + } + }, + "minify": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/minify/-/minify-7.2.2.tgz", + "integrity": "sha512-AcgoqXRQX0o/PRrydK8klB5OD09lFjJ/OYVHGxmWmbg/DQP/ETmmPM4aA10NZBiGdlLeUnC9sCgrgJAt0P14mA==", + "dev": true, + "requires": { + "clean-css": "^5.0.1", + "css-b64-images": "~0.2.5", + "debug": "^4.1.0", + "find-up": "^6.1.0", + "html-minifier-terser": "^6.0.2", + "readjson": "^2.2.2", + "terser": "^5.3.2", + "try-catch": "^3.0.0", + "try-to-catch": "^3.0.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dev": true, + "requires": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "requires": { + "yocto-queue": "^1.0.0" + } + }, + "p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "requires": { + "p-limit": "^4.0.0" + } + }, + "param-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "dev": true, + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dev": true, + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-sort": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/path-sort/-/path-sort-0.1.0.tgz", + "integrity": "sha1-ywF11Oy/paGP5nTMbXIL/hXguAU=", + "dev": true + }, + "php-parser": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.0.3.tgz", + "integrity": "sha512-WjbrtYrwmLY9hpoKoq1+mVqJhT0dEVDZRWSpNIw2MpTw3VM/K4C6e0WR4KlU6G/XROkV7tpH4NesV2dDiPxqaw==", + "dev": true + }, + "picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "readjson": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/readjson/-/readjson-2.2.2.tgz", + "integrity": "sha512-PdeC9tsmLWBiL8vMhJvocq+OezQ3HhsH2HrN7YkhfYcTjQSa/iraB15A7Qvt7Xpr0Yd2rDNt6GbFwVQDg3HcAw==", + "dev": true, + "requires": { + "jju": "^1.4.0", + "try-catch": "^3.0.0" + } + }, + "relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", + "dev": true + }, + "strip-json-comments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", + "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==", + "dev": true + }, + "terser": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", + "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, + "try-catch": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/try-catch/-/try-catch-3.0.0.tgz", + "integrity": "sha512-3uAqUnoemzca1ENvZ72EVimR+E8lqBbzwZ9v4CEbLjkaV3Q+FtdmPUt7jRtoSoTiYjyIMxEkf6YgUpe/voJ1ng==", + "dev": true + }, + "try-to-catch": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/try-to-catch/-/try-to-catch-3.0.0.tgz", + "integrity": "sha512-eIm6ZXwR35jVF8By/HdbbkcaCDTBI5PpCPkejRKrYp0jyf/DbCCcRhHD7/O9jtFI3ewsqo9WctFEiJTS6i+CQA==", + "dev": true + }, + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "wp-pot": { + "version": "1.9.9", + "resolved": "https://registry.npmjs.org/wp-pot/-/wp-pot-1.9.9.tgz", + "integrity": "sha512-cCtSeIyEe1u9DvJdgov4hGakMoabvLIwPZpCMqUKI5FnBoTMu7buQrIJar+JNIeRg/+RRxAKFtq4DsqH5GdJuQ==", + "dev": true, + "requires": { + "matched": "^5.0.0", + "path-sort": "^0.1.0", + "php-parser": "^3.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true + } + } +} diff --git a/package.json b/package.json index 011d4a73f..567ae426e 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,10 @@ "build:js": "node -e 'require(\"./main.js\").minifyFiles(\"js\")'", "build:css": "node -e 'require(\"./main.js\").minifyFiles(\"css\")'", "pot": "node -e 'require(\"./main.js\").generatePotFiles()'", - "lint": "jshint" + "lint": "jshint", + "husky": "husky install && rm -rf .husky/_/.gitignore" }, - "version": "5.8.0", + "version": "6.0.0", "repository": { "type": "git", "url": "https://github.com/mercadopago/cart-woocommerce" @@ -17,7 +18,7 @@ "main": "main.js", "devDependencies": { "husky": "^7.0.0", - "jshint": "^2.11.0", + "jshint": "^2.13.4", "minify": "^7.0.2", "wp-pot": "^1.9.9" } diff --git a/readme.txt b/readme.txt index d8c7d9001..11bdef1a1 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: ecommerce, mercadopago, woocommerce Requires at least: 4.9.10 Tested up to: 5.9 Requires PHP: 5.6 -Stable tag: 5.8.0 +Stable tag: 6.0.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -16,6 +16,8 @@ The official Mercado Pago plugin allows you to process payments for your online To install it, **you don't need to have technical knowledge:** you can follow the [step by step of how to integrate it](https://www.mercadopago.com.ar/developers/es/guides/plugins/woocommerce/introduction/). from our developer website and start selling today. +**Warning about v6.0.0:** when updating, if you have made custom layout changes to your checkout, it is possible that some of those customizations become misconfigured. If you have a separate store environment just for testing, please update there first in order to visualize and test the changes. + ### What to do with the Mercado Pago Plugin? * Activate **Checkout Pro** to offer logged-in payments with money in Mercado Pago account, saved cards and off means. * Offer payments without the need of having a Mercado Pago account, through the **Custom Checkout** for cards and off means, such as cash, bank transfer and PIX (only in Brazil). @@ -133,6 +135,15 @@ Set up both the plugin and the checkouts you want to activate on your payment av Check out our official documentation for more information on the specific fields to configure. == Changelog == + += v6.0.0 (22/06/2022) = +* Features +- Added ideal checkout template +- Added secure inputs for Checkout Custom + +* Changes +- Updated melidata script to load only on plugin pages + = v5.8.0 (07/06/2022) = * Features - Added melidata script to collect metrics from plugin diff --git a/templates/checkout/basic-checkout.php b/templates/checkout/basic-checkout.php index 1eaa1d326..7addd52f6 100644 --- a/templates/checkout/basic-checkout.php +++ b/templates/checkout/basic-checkout.php @@ -1,4 +1,5 @@ -
-
-
-
-
-
-
-
-
-
-
- ; ?>)
-
-
-
- - - - - - - - -
- - - -
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
diff --git a/templates/checkout/custom-checkout.php b/templates/checkout/custom-checkout.php
index 5631ab250..c0401c090 100644
--- a/templates/checkout/custom-checkout.php
+++ b/templates/checkout/custom-checkout.php
@@ -1,4 +1,5 @@
-
-
+ ",
+ "",
+ ""
+ ]'
+ list-style-type-src=""
+ list-style-type-alt=""
+ >
+
-
-
-
-
-
+
-
-
-
+
-
+
- ; ?>)
-
+
+
-
-
+
+
+
+
-
+
+
-
-
-
-
-
-
-
+
-
-
-
-  ) ); ?>)
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- ; ?>)
-
-
-
-
-
-
- ; ?>)
-
-
+
+
-
-
-
+
-
+ )); ?>)
+
-
+
-
-
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
+ )); ?>)
+
-
+ )); ?>)
+
+
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
-
+
-
+
+
-
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
+
-
+
+
+
-
-
-
-
-
+
-
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
- - * -
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
diff --git a/templates/checkout/pix-checkout.php b/templates/checkout/pix-checkout.php
index 7ec556ee2..56d2092c5 100644
--- a/templates/checkout/pix-checkout.php
+++ b/templates/checkout/pix-checkout.php
@@ -10,32 +10,37 @@
* @package MercadoPago
*/
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
-
-
-
-
- ; ?>)
-
-
-
-
-
+
-
-
+
+
diff --git a/templates/checkout/ticket-checkout.php b/templates/checkout/ticket-checkout.php
index 29e4c6ad6..5b153fd05 100644
--- a/templates/checkout/ticket-checkout.php
+++ b/templates/checkout/ticket-checkout.php
@@ -14,184 +14,62 @@
exit;
}
?>
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+ ; ?>)
+
+
+
-
-
+
+
-
-
-
-
-
diff --git a/templates/order-received/show-pix.php b/templates/order-received/show-pix.php
index 709d8c6cc..601499e34 100644
--- a/templates/order-received/show-pix.php
+++ b/templates/order-received/show-pix.php
@@ -66,7 +66,7 @@
-
-
-
- columns=''>
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateIdFromPlace($payment['id'], $place['payment_option_id']);
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
diff --git a/tests/includes/modules/test-class-wc-woomercadopago-configs.php b/tests/includes/modules/test-class-wc-woomercadopago-configs.php index 3b69d11ef..8d60f1ed7 100644 --- a/tests/includes/modules/test-class-wc-woomercadopago-configs.php +++ b/tests/includes/modules/test-class-wc-woomercadopago-configs.php @@ -58,6 +58,7 @@ function test_get_country_configs() { 'currency' => 'COP', 'zip_code' => '110111', 'currency_symbol' => '$', + 'intl' => 'es-CO', ), 'mla' => array( 'site_id' => 'mla', @@ -67,6 +68,7 @@ function test_get_country_configs() { 'currency' => 'ARS', 'zip_code' => '3039', 'currency_symbol' => '$', + 'intl' => 'es-AR', ), 'mlb' => array( 'site_id' => 'mlb', @@ -76,6 +78,7 @@ function test_get_country_configs() { 'currency' => 'BRL', 'zip_code' => '01310924', 'currency_symbol' => 'R$', + 'intl' => 'pt-BR', ), 'mlc' => array( 'site_id' => 'mlc', @@ -85,6 +88,7 @@ function test_get_country_configs() { 'currency' => 'CLP', 'zip_code' => '7591538', 'currency_symbol' => '$', + 'intl' => 'es-CL', ), 'mlm' => array( 'site_id' => 'mlm', @@ -94,6 +98,7 @@ function test_get_country_configs() { 'currency' => 'MXN', 'zip_code' => '11250', 'currency_symbol' => '$', + 'intl' => 'es-MX', ), 'mlu' => array( 'site_id' => 'mlu', @@ -103,6 +108,7 @@ function test_get_country_configs() { 'currency' => 'UYU', 'zip_code' => '11800', 'currency_symbol' => '$', + 'intl' => 'es-UY', ), 'mlv' => array( 'site_id' => 'mlv', @@ -112,6 +118,7 @@ function test_get_country_configs() { 'currency' => 'VEF', 'zip_code' => '1160', 'currency_symbol' => '$', + 'intl' => 'es-VE', ), 'mpe' => array( 'site_id' => 'mpe', @@ -121,6 +128,7 @@ function test_get_country_configs() { 'currency' => 'PEN', 'zip_code' => '15074', 'currency_symbol' => '$', + 'intl' => 'es-PE', ), ); diff --git a/woocommerce-mercadopago.php b/woocommerce-mercadopago.php index 4f9de2371..1ef322199 100644 --- a/woocommerce-mercadopago.php +++ b/woocommerce-mercadopago.php @@ -3,7 +3,7 @@ * Plugin Name: Mercado Pago payments for WooCommerce * Plugin URI: https://github.com/mercadopago/cart-woocommerce * Description: Configure the payment options and accept payments with cards, ticket and money of Mercado Pago account. - * Version: 5.8.0 + * Version: 6.0.0 * Author: Mercado Pago * Author URI: https://developers.mercadopago.com/ * Text Domain: woocommerce-mercadopago