Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into dev/10240-update-n…
Browse files Browse the repository at this point in the history
…pm-scripts
  • Loading branch information
eduardoumpierre committed Feb 7, 2025
2 parents 757d858 + 00f9d2f commit 762acda
Show file tree
Hide file tree
Showing 63 changed files with 572 additions and 799 deletions.
42 changes: 42 additions & 0 deletions assets/images/payment-method-icons/grabpay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions assets/images/payment-methods/grabpay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bin/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if $WATCH_FLAG; then
else
echo "Running the tests..."

docker-compose exec -u www-data wordpress \
docker compose exec -u www-data wordpress \
/var/www/html/wp-content/plugins/woocommerce-payments/vendor/bin/phpunit \
--configuration /var/www/html/wp-content/plugins/woocommerce-payments/phpunit.xml.dist \
$*
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*** WooPayments Changelog ***

= 8.9.1 - 2025-02-07 =
* Fix - Ensures that the tokenised cart for ECE implementation is disabled by default.

= 8.9.0 - 2025-02-04 =
* Add - Add a popover to WooPayments to present all possible payment methods
* Add - Added persistent column visibility preferences for reporting tables, allowing merchants to customize and save their preferred table view layouts across sessions.
Expand Down
4 changes: 4 additions & 0 deletions changelog/add-grabpay-settings
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: add

Add GrabPay to the settings page when eligible.
4 changes: 4 additions & 0 deletions changelog/add-pass-business-name-express-checkout
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: add

Pass the business name to the express checkout handler.
4 changes: 4 additions & 0 deletions changelog/dev-e2e-pw-setup-script-permissions-and-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: dev

Update E2E setup scripts to avoid conflicts with other containers and permissions.
4 changes: 4 additions & 0 deletions changelog/feat-add-order-notes-to-tokenized-ece
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: add

feat: add order notes to tokenized ECE GooglePay/ApplePay on blocks checkout
4 changes: 4 additions & 0 deletions changelog/fix-10220-multi-currency-widget-markup-getter
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Ensure multi-currency widget markup getter don't throw errors.
4 changes: 4 additions & 0 deletions changelog/patch-disable-tokenised-carts-by-default
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Ensures that the tokenised cart for ECE implementation is disabled by default.
4 changes: 4 additions & 0 deletions changelog/update-add-handling-for-low-refund-balance
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: update

Update handling for refund processing in case of insufficient funds.
4 changes: 4 additions & 0 deletions changelog/update-remove-card-reader-receipt-details
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: update

Remove the receipt details tab in the card readers page.
1 change: 1 addition & 0 deletions client/additional-methods-setup/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const upeMethods = [
'afterpay_clearpay',
'jcb',
'klarna',
'grabpay',
];

export const upeCapabilityStatuses = {
Expand Down
14 changes: 1 addition & 13 deletions client/card-readers/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { __ } from '@wordpress/i18n';
*/
import Page from 'components/page';
import ReadersList from './list';
import ReceiptSettings from './settings';
import { TabPanel } from '@wordpress/components';

import './style.scss';
Expand All @@ -31,20 +30,9 @@ export const ConnectedReaders = (): JSX.Element => {
),
className: 'connected-readers-list',
},
{
name: 'receipt-details',
title: __( 'Receipt details', 'woocommerce-payments' ),
className: 'connected-readers-receipt-details',
},
] }
>
{ ( tab ) => {
if ( 'receipt-details' === tab.name ) {
return <ReceiptSettings />;
}

return <ReadersList />;
} }
{ () => <ReadersList /> }
</TabPanel>
</Page>
);
Expand Down
150 changes: 0 additions & 150 deletions client/card-readers/settings/file-upload.tsx

This file was deleted.

63 changes: 0 additions & 63 deletions client/card-readers/settings/index.tsx

This file was deleted.

Loading

0 comments on commit 762acda

Please sign in to comment.