Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add environment variable handling to Google Pay #608

Merged
merged 12 commits into from
Aug 23, 2023
Merged

Add environment variable handling to Google Pay #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
96a0ae1
pass gateway env to gpay js handler
nikolas4175-godaddy Jul 21, 2023
6093248
include gateway env in paymentOptions
nikolas4175-godaddy Jul 21, 2023
7c011cd
5.11.7 dev versioning and changelog entry
nikolas4175-godaddy Jul 21, 2023
6eefb22
version 5.11.7
nikolas4175-godaddy Jul 21, 2023
afd8cd4
compile assets
nikolas4175-godaddy Jul 21, 2023
8f22bbd
5.11.7 dev versioning and changelog entry
nikolas4175-godaddy Jul 21, 2023
98e71d5
version 5.11.7
nikolas4175-godaddy Jul 21, 2023
398569a
Enqueue form styles for hosted payment forms (#610)
ragulka Jul 27, 2023
18f3c9c
Fix merge conflict
unfulvio Jul 28, 2023
869b781
Fix merge conflict
unfulvio Jul 28, 2023
ec27dd0
Fix merge conflict
unfulvio Jul 28, 2023
2d23425
Fix merge conflict
unfulvio Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion woocommerce/i18n/languages/woocommerce-plugin-framework-et.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ msgid ""
"processing real payments."
msgstr ""

#: payment-gateway/External_Checkout/Google_Pay/Frontend.php:130
#: payment-gateway/External_Checkout/Google_Pay/Frontend.php:131
#: payment-gateway/External_Checkout/apple-pay/class-sv-wc-payment-gateway-apple-pay-frontend.php:141
#: payment-gateway/api/class-sv-wc-payment-gateway-api-response-message-helper.php:99
msgid "An error occurred, please try again or try an alternate form of payment"
Expand Down
4 changes: 2 additions & 2 deletions woocommerce/i18n/languages/woocommerce-plugin-framework.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce Plugin Framework 5.11.7\n"
"Report-Msgid-Bugs-To: https://support.woocommerce.com/hc/\n"
"POT-Creation-Date: 2023-07-28 09:06:33+00:00\n"
"POT-Creation-Date: 2023-07-28 09:14:36+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -374,7 +374,7 @@ msgid ""
"processing real payments."
msgstr ""

#: payment-gateway/External_Checkout/Google_Pay/Frontend.php:130
#: payment-gateway/External_Checkout/Google_Pay/Frontend.php:131
#: payment-gateway/External_Checkout/apple-pay/class-sv-wc-payment-gateway-apple-pay-frontend.php:141
#: payment-gateway/api/class-sv-wc-payment-gateway-api-response-message-helper.php:99
msgid "An error occurred, please try again or try an alternate form of payment"
Expand Down
1 change: 1 addition & 0 deletions woocommerce/payment-gateway/External_Checkout/Google_Pay/Frontend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ protected function get_js_handler_args() {
'merchant_name' => get_bloginfo( 'name' ),
'gateway_id' => $this->get_gateway()->get_id(),
'gateway_id_dasherized' => $this->get_gateway()->get_id_dasherized(),
'environment' => $this->get_gateway()->get_environment() == 'production' ? 'PRODUCTION' : 'TEST',
'ajax_url' => admin_url( 'admin-ajax.php' ),
'recalculate_totals_nonce' => wp_create_nonce( 'wc_' . $this->get_gateway()->get_id() . '_google_pay_recalculate_totals' ),
'process_nonce' => wp_create_nonce( 'wc_' . $this->get_plugin()->get_gateway()->get_id() . '_google_pay_process_payment' ),
Expand Down
2 changes: 1 addition & 1 deletion woocommerce/payment-gateway/assets/dist/frontend/sv-wc-payment-gateway-google-pay.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion woocommerce/payment-gateway/assets/dist/frontend/sv-wc-payment-gateway-google-pay.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading