Skip to content

Commit 9fa2de4

Browse files
Merge branch 'develop' into add/10382-adds-store-id-to-tracker-request-body
2 parents 5f7087d + 570cc98 commit 9fa2de4

File tree

70 files changed

+916
-576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+916
-576
lines changed

assets/css/admin.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@
143143
background-image: url( '../images/payment-methods/grabpay.svg' );
144144
}
145145

146+
.payment-method__brand--wechat_pay {
147+
background-image: url( '../images/payment-methods/wechat-pay.svg' );
148+
}
149+
146150
.wc_gateways tr[data-gateway_id='woocommerce_payments'] .payment-method__icon {
147151
border: 1px solid #ddd;
148152
border-radius: 2px;
File renamed without changes.
File renamed without changes.

assets/images/payment-methods/woopay.svg

Lines changed: 0 additions & 7 deletions
This file was deleted.

bin/wcpay-live-branches/wcpay-live-branches.user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
*/
389389
function appendHtml( el, contents ) {
390390
const $el = $( el );
391-
const wooColor = '#7F54B3'; // https://woocommerce.com/brand-and-logo-guidelines/
391+
const wooColor = '#873eff'; // https://woocommerce.com/brand-and-logo-guidelines/
392392
const styles = $( '<style>' ).text( `
393393
#wcpay-live-branches {
394394
border: 3px dotted ${ wooColor };
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: add
3+
4+
Add loader indication for Stripe notifications banner component

changelog/add-9129-account-management-component

Lines changed: 0 additions & 4 deletions
This file was deleted.

changelog/add-grabpay-pm-details

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: add
3+
4+
Add GrabPay payment method details to the View Transaction page.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: add
3+
4+
Add WeChat Pay support to checkout.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: dev
3+
4+
Add new E2E tests to make sure a non-admin user, such as an editor, can access the wp-admin without errors.

0 commit comments

Comments
 (0)