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.

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

v1.7.8 #339

Merged
merged 32 commits into from
Aug 20, 2024
Merged
Changes from 3 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
61f2106
Merge branch 'BWPM-14' into rs-dev
ponddeja Jul 10, 2024
7a2facb
Merge branch 'BWPM-30' into rs-dev
ponddeja Jul 10, 2024
6da54ea
[Fix] Settle function updated to check additional error fields
Jul 11, 2024
22a6f8d
Merge branch 'refs/heads/master' into rs-dev
Jul 18, 2024
8baf2a2
Merge branch 'rs-dev' of https://github.com/reepay/reepay-woocommerce…
ponddeja Jul 18, 2024
5434ccd
Merge branch 'BWSM-29' into rs-dev
ponddeja Jul 23, 2024
96a4608
Merge branch 'BWPM-14' into rs-dev
ponddeja Jul 23, 2024
3fe7712
Fix code standard
ponddeja Jul 23, 2024
6a5b7fb
Update changelog message
ponddeja Jul 23, 2024
13f2272
Merge branch 'BWPM-14' into rs-dev
ponddeja Jul 23, 2024
47df43a
Merge branch 'BWPM-14' into rs-dev
ponddeja Jul 24, 2024
753a324
Disable code change on BWPM-14
ponddeja Jul 24, 2024
e86cc56
Merge branch 'refs/heads/BWPM-40' into rs-dev
Jul 24, 2024
2fab0dc
Fix conflicts merge BWPM-14
ponddeja Jul 24, 2024
15c60f4
Merge remote-tracking branch 'origin/rs-dev' into rs-dev
Jul 24, 2024
7d2a955
Merge remote-tracking branch 'refs/remotes/origin/master' into rs-dev
Aug 2, 2024
696a880
Fix bug calculate amount double from setting skipt order line
ponddeja Aug 14, 2024
b979db8
Fix standard code
ponddeja Aug 14, 2024
0b4c40b
Fix Instant Settle with Setting skip order lines make calculate amoun…
ponddeja Aug 16, 2024
cfbe551
Change patch version 1.7.7.3
ponddeja Aug 16, 2024
46f7431
Update version and changelog message.
ponddeja Aug 19, 2024
f13e72e
Fix change log message
ponddeja Aug 19, 2024
60919a9
Merge branch 'BWSM-32' into rs-dev
ponddeja Aug 19, 2024
cb196fb
Merge branch 'BWSM-32' into rs-dev
ponddeja Aug 19, 2024
2c4782b
Fix code standard and unit test value on function get order items
ponddeja Aug 20, 2024
a6f0680
Fix unit test assertEqualsCanonicalizing get item price
ponddeja Aug 20, 2024
01a91f7
Change version to 1.7.8 and add chengelog message
ponddeja Aug 20, 2024
72e2013
Fix conflicts readme.txt
ponddeja Aug 20, 2024
d1b81a9
Fix code standard
ponddeja Aug 20, 2024
a8c0ba5
Update version 1.7.8 and add change log message
ponddeja Aug 20, 2024
c51d81a
Change version to 1.7.8
ponddeja Aug 20, 2024
ab66db2
Fix change log message
ponddeja Aug 20, 2024
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
22 changes: 22 additions & 0 deletions includes/Gateways/ReepayCheckout.php
Original file line number Diff line number Diff line change
@@ -629,6 +629,8 @@ public function process_admin_options(): bool {
$this->private_key_test = $this->settings['private_key_test'] ?? $this->private_key_test;
$this->test_mode = $this->settings['test_mode'] ?? $this->test_mode;

add_action( 'woocommerce_update_options_checkout', array( $this, 'notice_message_test_mode_enabled' ) );

reepay()->reset_settings();

parent::is_webhook_configured();
@@ -793,4 +795,24 @@ public function notice_message_live_key_changed() {
<?php
}
}

/**
* Message notice enabled or disabled test mode
*/
public function notice_message_test_mode_enabled() {
if ( is_plugin_active( 'reepay-subscriptions-for-woocommerce/reepay-subscriptions-for-woocommerce.php' ) ) {
if ( 'yes' === $this->test_mode ) {
// translators: notice message enabled test mode.
$notice_message = sprintf( __( 'You just enabled test mode, meaning your test API key will now be used. Please note that all subscription products previously linked to plans on your live account are no longer linked. If you try to purchase a subscription product now, an error will occur. Disabling test mode will restore all connections. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
} else {
// translators: notice message disabled test mode.
$notice_message = sprintf( __( 'You just disabled test mode, meaning your live API key will now be used. Please note that all subscription products previously linked to plans on your live account are now restored. If you haven\'t linked your subscription products with your test account, they will remain unlinked. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
}
}
?>
<div class="notice notice-info">
<p><?php echo $notice_message; ?></p>
</div>
<?php
}
}
15 changes: 0 additions & 15 deletions templates/admin/admin-options.php
Original file line number Diff line number Diff line change
@@ -14,21 +14,6 @@
?>

<h2><?php esc_html( $gateway->get_method_title() ); ?></h2>
<?php
if ( is_plugin_active( 'reepay-subscriptions-for-woocommerce/reepay-subscriptions-for-woocommerce.php' ) ) {
if ( 'yes' === reepay()->get_setting( 'test_mode' ) ) {
// translators: notice message enabled test mode.
$notice_message = sprintf( __( 'You just enabled test mode, meaning your test API key will now be used. Please note that all subscription products previously linked to plans on your live account are no longer linked. If you try to purchase a subscription product now, an error will occur. Disabling test mode will restore all connections. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
} else {
// translators: notice message disabled test mode.
$notice_message = sprintf( __( 'You just disabled test mode, meaning your live API key will now be used. Please note that all subscription products previously linked to plans on your live account are now restored. If you haven\'t linked your subscription products with your test account, they will remain unlinked. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
}
}
?>
<div class="notice notice-info">
<p><?php echo $notice_message; ?></p>
</div>

<?php wp_kses_post( wpautop( $gateway->get_method_description() ) ); ?>
<p><?php _e( 'Billwerk+ Pay', 'reepay-checkout-gateway' ); ?></p>
<?php if ( ! $webhook_installed ) : ?>