Skip to content

Commit

Permalink
Merge pull request #336 from PluginAndPartners/release/5.5.0
Browse files Browse the repository at this point in the history
Nova versão do plugin de WooCommerce 5.5.0
  • Loading branch information
lira authored Oct 19, 2021
2 parents 15f8274 + 365fd43 commit e75ca09
Show file tree
Hide file tree
Showing 41 changed files with 14,732 additions and 9,363 deletions.
27 changes: 19 additions & 8 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

clear && npm run php:lint && clear && echo "Verificando sintaxe do PHP 🔍" && sleep 1 && echo "Verificando sintaxe do PHP ✅"
npm run lint && clear && echo "Verificando sintaxe do JS 🔍" && sleep 1 && echo "Verificando sintaxe do JS ✅"
npm run build:js && clear && echo "Minificando JS 🔍" && sleep 1 && echo "Minificando JS ✅"
npm run build:css && clear && echo "Minificando CSS 🔍" && sleep 1 && echo "Minificando CSS ✅"
npm run pot && clear && echo "Atualizando arquivo .pot 🔍" && sleep 1 && echo "Atualizando arquivo .pot ✅"
git add *.min.js
git add *.min.css
git add *.pot
command_to_get_staged_files="git diff --name-only --staged | tee"
staged_files=$(eval "$command_to_get_staged_files")

if [[ $staged_files == *".php"* ]]; then
clear && npm run php:lint && clear && echo "Verificando sintaxe do PHP 🔍" && sleep 1 && echo "Verificando sintaxe do PHP ✅"
fi

if [[ $staged_files == *".js"* ]]; then
npm run lint && clear && echo "Verificando sintaxe do JS 🔍" && sleep 1 && echo "Verificando sintaxe do JS ✅"
npm run build:js && clear && echo "Minificando JS 🔍" && sleep 1 && echo "Minificando JS (Se houver) ✅"
fi

if [[ $staged_files == *".css"* ]]; then
npm run build:css && clear && echo "Minificando CSS 🔍" && sleep 1 && echo "Minificando CSS ✅"
fi

if [[ $staged_files == *".po"* ]]; then
npm run pot && clear && echo "Atualizando arquivo .pot 🔍" && sleep 1 && echo "Atualizando arquivo .pot ✅"
fi
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.5.0] - 2021-10-19

### Added
- Render pix image from backend for e-mails
- Added link to terms and conditions of Mercado Pago on checkout screen

### Changed
- Fixed retry payment

## [5.4.1] - 2021-09-22
### Changed
- On the order page, the payment was fetched with the wrong token
Expand Down
46 changes: 29 additions & 17 deletions assets/css/basic_checkout_mercadopago.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
}

.mp-pointer {
cursor: pointer!important;
cursor: pointer !important;
}

.mp-text-center {
Expand Down Expand Up @@ -154,7 +154,6 @@
padding: 0 0 0 32px;
}


.mp-img-fluid {
max-width: 100%;
height: auto;
Expand All @@ -168,7 +167,7 @@
.mp-title-checkout {
padding: 15px 0 0px;
font-family: sans-serif;
font-size: 1.20rem !important;
font-size: 1.2rem !important;
font-weight: 600 !important;
font-style: normal;
font-stretch: normal;
Expand Down Expand Up @@ -231,7 +230,7 @@

.mp-img-redirect {
padding: 8px !important;
max-height: 6.250em !important;
max-height: 6.25em !important;
width: auto !important;
/* adaptation for all themes */
float: none !important;
Expand Down Expand Up @@ -278,6 +277,20 @@
color: #333333 !important;
}

.mp-terms-and-conditions {
height: 18px;
padding: 16px;
font-family: sans-serif;
font-size: 12px;
line-height: 18px;
text-align: center;
color: rgba(0, 0, 0, 0.9);
}

.mp-terms-and-conditions a {
color: #009ee3;
}

/* ----- Custom Checkout ----- */

.mp-panel-custom-checkout {
Expand Down Expand Up @@ -490,7 +503,8 @@

/* ----- Ticket ----- */

.mp-erro_febraban, .mp_error_docnumber {
.mp-erro_febraban,
.mp_error_docnumber {
font-family: sans-serif !important;
font-size: 12px !important;
font-weight: normal !important;
Expand Down Expand Up @@ -580,7 +594,7 @@
.mp-discount {
border-style: solid;
border-width: thin;
border-color: #009EE3;
border-color: #009ee3;
padding: 8px 8px 8px 8px;
margin-top: 20px;
text-transform: uppercase;
Expand Down Expand Up @@ -633,7 +647,7 @@
text-align: center;
color: #3483fa;
border-radius: 16px;
text-transform: uppercase
text-transform: uppercase;
}

.mp-row-checkout-pix {
Expand Down Expand Up @@ -666,15 +680,15 @@
.mp-details-pix {
width: 100%;
height: auto;
display: inline-block;
display: inline-block;
border-radius: 6px;
box-shadow: 0 6px 16px 0 rgba(0, 0, 0, 0.1);
background-color: #ffffff;
margin-bottom: 30px;
}

.mp-details-pix-title {
width:100%;
width: 100%;
opacity: 0.8;
font-family: sans-serif;
font-size: 18px;
Expand Down Expand Up @@ -744,7 +758,6 @@
}
.mp-details-pix-qr-value {
font-weight: bold;

}

.mp-details-pix-qr-title {
Expand Down Expand Up @@ -832,17 +845,16 @@
}
.mp-details-pix-amount {
margin: 32px auto 0;
text-align: center;
width: 100%;
text-align: center;
width: 100%;
color: rgba(0, 0, 0, 0.8);
font-size: 18px;
font-family: sans-serif;

}

.mp-wallet-button {
background: #FFFFFF;
border: 1px solid #DCDCDC;
background: #ffffff;
border: 1px solid #dcdcdc;
box-sizing: border-box;
box-shadow: 0px 7px 12px rgba(0, 0, 0, 0.110659);
border-radius: 10px;
Expand Down Expand Up @@ -881,7 +893,7 @@
}

.mp-wallet-button-info {
width: 65%
width: 65%;
}

.mp-wallet-button-info-header {
Expand All @@ -899,7 +911,7 @@

.mp-wallet-button-pay button {
padding: 0.5em 0.7em;
background-color: #009EE3;
background-color: #009ee3;
border-radius: 5px;
color: #fff;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/basic_checkout_mercadopago.min.css

Large diffs are not rendered by default.

Binary file added assets/images/pix_has_expired.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified i18n/languages/woocommerce-mercadopago-es_AR.mo
Binary file not shown.
Loading

0 comments on commit e75ca09

Please sign in to comment.