Skip to content

Commit b99e5a3

Browse files
hsingyuchsingyuc
committed
Merge release/5.5.0 into trunk
2 parents d59d58c + 4dbad36 commit b99e5a3

File tree

180 files changed

+9020
-1709
lines changed

Some content is hidden

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

180 files changed

+9020
-1709
lines changed

‎.github/workflows/e2e-pull-request.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
test_groups: [ 'wcpay', 'subscriptions' ] # [TODO] Unskip blocks tests after investigating constant failures.
33+
test_groups: [ 'wcpay', 'subscriptions', 'upe', 'upeSplit' ] # [TODO] Unskip blocks tests after investigating constant failures.
3434
test_branches: [ 'merchant', 'shopper' ]
35+
exclude:
36+
- test_groups: 'upe'
37+
test_branches: 'merchant'
38+
- test_groups: 'upeSplit'
39+
test_branches: 'merchant'
3540

3641
name: WC - latest | ${{ matrix.test_groups }} - ${{ matrix.test_branches }}
3742

‎.github/workflows/post-release-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
9898
trigger-translations:
9999
name: "Trigger translations update for the release"
100-
needs: get-last-released-version
100+
needs: [get-last-released-version, create-gh-release]
101101
runs-on: ubuntu-20.04
102102
steps:
103103
- name: "Checkout repository (trunk)"

‎assets/images/payment-methods/cc.svg

Lines changed: 40 additions & 0 deletions
Loading

‎changelog.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
*** WooCommerce Payments Changelog ***
22

3+
= 5.5.0 - 2023-02-22 =
4+
* Add - Added learn more link to deposits page
5+
* Add - Added tracking for the split UPE feature flag.
6+
* Add - Declare WooCommerce Payments compatible with High-Performance Order Storage.
7+
* Add - New support phone and email fields the general settings page.
8+
* Add - Pass settings fields of the plugins that use newsletter block to woopay.
9+
* Add - Pass the namespaces from the Store API checkout schema data to WooPay
10+
* Add - Pass the store's test mode value to WooPay requests to the OTP endpoint.
11+
* Add - The UPE is now the default checkout experience for newly onboarded merchants. It can sbe disabled with these instructions: https://woocommerce.com/?p=3337362#disabling
12+
* Fix - Add wp-i18n as split UPE script dependency to load split UPE elements.
13+
* Fix - Disable WooPay for unavailable countries
14+
* Fix - Display an error when the request for initiating the platform checkout fails.
15+
* Fix - External link accessibilty text style
16+
* Fix - Fixes Stripe Link compatibility with split UPE payment gateway
17+
* Fix - For stores using HPOS, ensure the originating subscription's currency is used when initiating a subscription switch.
18+
* Fix - Make sure available payment methods are provided for the automatic subscription renewals.
19+
* Fix - Point the "Learn more" link to a more appropriate document in the Apple Pay domain registration failure notification.
20+
* Fix - Re-enabled email triggered WooPay flow with Express Checkout flow. WooPay Express Checkout is currently behind a feature flag.
21+
* Fix - Remove unnecessary style dependency from WooPay checkbox.
22+
* Fix - Track user viewport and url when using WooPay
23+
* Update - Removed saved methods listing in My Account Add Payment Method page
24+
* Update - Updated express payment method UI in settings page
25+
* Update - Updated the Express checkout settings page
26+
* Update - WooPay CTA text in shortcode checkout
27+
* Dev - Adding a feature flag to allow further development of onboarding UX - currently this will have no effect on live stores.
28+
* Dev - Merge progressive onboarding prototype under a feature flag
29+
330
= 5.4.0 - 2023-02-01 =
431
* Add - Add logging and order notes when WCPay Subscriptions are suspended or put on-hold.
532
* Add - Highlight subscriptions with overdue payment in list view with red icon & tooltip.

‎changelog/.gitkeep

Whitespace-only changes.

‎client/additional-methods-setup/index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@ import WcPayUpeContextProvider from '../settings/wcpay-upe-toggle/provider';
1313
import WCPaySettingsContext from '../settings/wcpay-settings-context';
1414

1515
const AdditionalMethodsPage = () => {
16-
const { isUpeEnabled } = window.wcpaySettings.additionalMethodsSetup;
16+
const {
17+
isUpeEnabled,
18+
upeType,
19+
} = window.wcpaySettings.additionalMethodsSetup;
1720

1821
return (
1922
<Page>
2023
<WCPaySettingsContext.Provider value={ window.wcpaySettings }>
21-
<WcPayUpeContextProvider defaultIsUpeEnabled={ isUpeEnabled }>
24+
<WcPayUpeContextProvider
25+
defaultIsUpeEnabled={ isUpeEnabled }
26+
defaultUpeType={ upeType }
27+
>
2228
<UpePreviewMethodSelector />
2329
</WcPayUpeContextProvider>
2430
</WCPaySettingsContext.Provider>

‎client/additional-methods-setup/upe-preview-methods-selector/enable-upe-preview-task.js

Lines changed: 60 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Pill from '../../components/pill';
1818
import './enable-upe-preview-task.scss';
1919

2020
const EnableUpePreviewTask = () => {
21-
const { setIsUpeEnabled, status } = useContext( WcPayUpeContext );
21+
const { setIsUpeEnabled, status, upeType } = useContext( WcPayUpeContext );
2222

2323
const { setCompleted } = useContext( WizardTaskContext );
2424

@@ -30,39 +30,69 @@ const EnableUpePreviewTask = () => {
3030

3131
return (
3232
<WizardTaskItem
33-
title={ interpolateComponents( {
34-
mixedString: __(
35-
'{{wrapper}}Enable the new WooCommerce Payments checkout experience{{/wrapper}} ' +
36-
'{{earlyAccessWrapper}}Early access{{/earlyAccessWrapper}}',
37-
'woocommerce-payments'
38-
),
39-
components: {
40-
wrapper: <span />,
41-
earlyAccessWrapper: <Pill />,
42-
},
43-
} ) }
33+
title={
34+
'split' === upeType
35+
? interpolateComponents( {
36+
mixedString: __(
37+
'{{wrapper}}Enable the improved WooCommerce Payments checkout experience{{/wrapper}}',
38+
'woocommerce-payments'
39+
),
40+
components: {
41+
wrapper: <span />,
42+
},
43+
} )
44+
: interpolateComponents( {
45+
mixedString: __(
46+
'{{wrapper}}Enable the new WooCommerce Payments checkout experience{{/wrapper}} ' +
47+
'{{earlyAccessWrapper}}Early access{{/earlyAccessWrapper}}',
48+
'woocommerce-payments'
49+
),
50+
components: {
51+
wrapper: <span />,
52+
earlyAccessWrapper: <Pill />,
53+
},
54+
} )
55+
}
4456
index={ 1 }
4557
>
4658
<CollapsibleBody className="enable-upe-preview__body">
4759
<p className="wcpay-wizard-task__description-element is-muted-color">
48-
{ interpolateComponents( {
49-
mixedString: __(
50-
'Get early access to additional payment methods and an improved checkout experience, ' +
51-
'coming soon to WooCommerce payments. {{learnMoreLink /}}',
52-
'woocommerce-payments'
53-
),
54-
components: {
55-
learnMoreLink: (
56-
// eslint-disable-next-line max-len
57-
<ExternalLink href="https://woocommerce.com/document/payments/additional-payment-methods/#introduction">
58-
{ __(
59-
'Learn more',
60-
'woocommerce-payments'
61-
) }
62-
</ExternalLink>
63-
),
64-
},
65-
} ) }
60+
{ 'split' === upeType
61+
? interpolateComponents( {
62+
mixedString: __(
63+
'Get access to additional payment methods and an improved checkout experience. {{learnMoreLink /}}',
64+
'woocommerce-payments'
65+
),
66+
components: {
67+
learnMoreLink: (
68+
// eslint-disable-next-line max-len
69+
<ExternalLink href="https://woocommerce.com/document/payments/additional-payment-methods/#introduction">
70+
{ __(
71+
'Learn more',
72+
'woocommerce-payments'
73+
) }
74+
</ExternalLink>
75+
),
76+
},
77+
} )
78+
: interpolateComponents( {
79+
mixedString: __(
80+
'Get early access to additional payment methods and an improved checkout experience, ' +
81+
'coming soon to WooCommerce payments. {{learnMoreLink /}}',
82+
'woocommerce-payments'
83+
),
84+
components: {
85+
learnMoreLink: (
86+
// eslint-disable-next-line max-len
87+
<ExternalLink href="https://woocommerce.com/document/payments/additional-payment-methods/#introduction">
88+
{ __(
89+
'Learn more',
90+
'woocommerce-payments'
91+
) }
92+
</ExternalLink>
93+
),
94+
},
95+
} ) }
6696
</p>
6797
<div className="enable-upe-preview__advantages-wrapper">
6898
<Card className="enable-upe-preview__advantage">

‎client/card-readers/settings/index.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ const ReadersSettingsDescription = (): JSX.Element => (
4343
);
4444

4545
const ReceiptSettings = (): JSX.Element => {
46-
const [ isSaveDisabled, setSaveDisabled ] = useState( false );
46+
const [ isBusinessInputsValid, setBusinessInputsValid ] = useState( true );
47+
const [ isContactsInputsValid, setContactsInputsValid ] = useState( true );
48+
const areInputsValid = isBusinessInputsValid && isContactsInputsValid;
4749

4850
return (
4951
<SettingsLayout displayBanner={ false }>
@@ -52,18 +54,18 @@ const ReceiptSettings = (): JSX.Element => {
5254
<Card className="card-readers-settings__wrapper">
5355
<CardBody>
5456
<BusinessDetailsSection
55-
setSaveDisabled={ setSaveDisabled }
57+
setInputsValid={ setBusinessInputsValid }
5658
/>
5759
<ContactsDetailsSection
58-
setSaveDisabled={ setSaveDisabled }
60+
setInputsValid={ setContactsInputsValid }
5961
/>
6062
<AddressDetailsSection />
6163
<BrandingDetailsSection />
6264
</CardBody>
6365
</Card>
6466
</LoadableSettingsSection>
6567
</SettingsSection>
66-
<SaveSettingsSection disabled={ isSaveDisabled } />
68+
<SaveSettingsSection disabled={ ! areInputsValid } />
6769
</SettingsLayout>
6870
);
6971
};

0 commit comments

Comments
 (0)