Merge branch 'develop' into fix/improve-woopay-test-coverage

Automattic · Nov 13, 2024 · 14bf32c · 14bf32c
2 parents 9e8355e + 733734b
commit 14bf32c
Show file tree

Hide file tree

Showing 306 changed files with 2,373 additions and 987 deletions.
diff --git a/assets/css/success.css b/assets/css/success.css
@@ -3,13 +3,13 @@
 	align-items: center;
 	flex-wrap: wrap;
 	line-height: 1;
+	padding-top: 4px;
 }
 
 .wc-payment-gateway-method-logo-wrapper img {
 	margin-right: 0.5rem;
-	padding-top: 4px;
 }
 
-.wc-payment-gateway-method-logo-wrapper.wc-payment-bnpl-logo img {
-	max-height: 30px;
+.wc-payment-gateway-method-logo-wrapper.wc-payment-lpm-logo img {
+	max-height: 26px;
 }
diff --git a/assets/css/success.rtl.css b/assets/css/success.rtl.css
@@ -3,13 +3,13 @@
 	align-items: center;
 	flex-wrap: wrap;
 	line-height: 1;
+	padding-top: 4px;
 }
 
 .wc-payment-gateway-method-logo-wrapper img {
 	margin-left: 0.5rem;
-	padding-top: 4px;
 }
 
-.wc-payment-gateway-method-logo-wrapper.wc-payment-bnpl-logo img {
-	max-height: 30px;
+.wc-payment-gateway-method-logo-wrapper.wc-payment-lpm-logo img {
+	max-height: 26px;
 }
diff --git a/changelog/add-9673-payouts-rename-notice b/changelog/add-9673-payouts-rename-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Added notice to indicate the rename of Deposits to Payouts. User facing changelog will be added as part of feature branch
+
+
diff --git a/changelog/add-country-specific-test-cards b/changelog/add-country-specific-test-cards
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add country-specific test card numbers for credit card testing
diff --git a/changelog/add-ipp-missing-failure-webhooks b/changelog/add-ipp-missing-failure-webhooks
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Resolved issue with terminal payments in the payment intent failed webhook processing.
diff --git a/changelog/dev-1-9601-rename-deposit-dev-docs b/changelog/dev-1-9601-rename-deposit-dev-docs
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Rename 'deposit' to 'payout' within the developer doc description texts. The change is a part of a larger renaming project.
+
+
diff --git a/changelog/dev-update-pw-screenshots b/changelog/dev-update-pw-screenshots
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Update snapshots for E2E Playwright screenshots
diff --git a/changelog/feature-deposits-payouts-rename b/changelog/feature-deposits-payouts-rename
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Rename 'deposit' to 'payout' across various places in the WooPayments admin UI, docs and doc URLs.
diff --git a/changelog/fix-7802-deposit-withdrawal-text-changes b/changelog/fix-7802-deposit-withdrawal-text-changes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Use 'Withdrawal' and 'Deducted' labels when referring to withdrawal deposits, to more accurately communicate the type of transaction that has occurred
diff --git a/changelog/fix-8254-bnpl-pay-for-order b/changelog/fix-8254-bnpl-pay-for-order
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+BNPL methods now work properly in Pay for Order when they are available. Default values are also provided when available.
diff --git a/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments b/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Include missing scripts that handle refunds for non credit card payments in the order details page.
diff --git a/changelog/fix-9525-menu-url-payouts-rename b/changelog/fix-9525-menu-url-payouts-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Part of feature Renaming deposits to payouts
+
+
diff --git a/changelog/fix-9527-payouts-rename-settings b/changelog/fix-9527-payouts-rename-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Payouts rename: Settings page, part of a larger change
+
+
diff --git a/changelog/fix-9542-rename-payouts-instant-depost-modal-flow b/changelog/fix-9542-rename-payouts-instant-depost-modal-flow
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Part of a larger change - renaming deposit to payout; this PR fixes instant payout modal + button
+
+
diff --git a/changelog/fix-9573-rename-payout-tos-modal b/changelog/fix-9573-rename-payout-tos-modal
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Rename Deposit to Payout in TOS modal. Changelog to be included in featture branch
+
+
diff --git a/changelog/fix-9585-rename-instant-payouts b/changelog/fix-9585-rename-instant-payouts
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Renamed instant deposit to instant payout. Main changelog will be part of feature branch
+
+
diff --git a/changelog/fix-9588-rename-payouts-error-messages b/changelog/fix-9588-rename-payouts-error-messages
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Updated the payouts component error notices. User facing changelog will be on the feature branch.
+
+
diff --git a/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect b/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+
+When tracking is enabled, send a tracks event when the merchant is redirected to a Stripe Capital offer.
+
diff --git a/changelog/fix-9676-multi-currency-autoload b/changelog/fix-9676-multi-currency-autoload
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Keep multi-currency module in the same path to avoid autoload errors.
+
+
diff --git a/changelog/fix-9700-payout-spotlight-illustration b/changelog/fix-9700-payout-spotlight-illustration
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Update the spotlight notice illustration for 'deposit' to 'payout' rename announcement.
+
+
diff --git a/changelog/fix-deprecated-message-on-empty-pmme b/changelog/fix-deprecated-message-on-empty-pmme
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+fix: E_DEPRECATED on BNPL empty PMME
diff --git a/changelog/fix-dev-constructor-descriptions b/changelog/fix-dev-constructor-descriptions
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: chore: updated BNPL constructor descriptions.
+
+
diff --git a/changelog/fix-e2e-test-8.5.0-release b/changelog/fix-e2e-test-8.5.0-release
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Update string in E2E test - `Deposit` to `Payout`
+
+
diff --git a/changelog/fix-payout-rename-account-errors b/changelog/fix-payout-rename-account-errors
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Renamed deposit to Payout in account error messages. Main changelog will be added on feature branch.
+
+
diff --git a/changelog/fix-saving-duplicate-3ds-cards b/changelog/fix-saving-duplicate-3ds-cards
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix duplicate saving of 3DS card entry after checkout
diff --git a/changelog/fix-stripe-connect-breaks-underscore b/changelog/fix-stripe-connect-breaks-underscore
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Change the way we load an external lib to avoid issues with underscore.
+
+
diff --git a/changelog/update-9524-deposit-payout-deposits-list b/changelog/update-9524-deposit-payout-deposits-list
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Change deposit to payout in deposits list page.
+
+
diff --git a/changelog/update-9543-transactions-list-deposit-to-payout-rename b/changelog/update-9543-transactions-list-deposit-to-payout-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Update 'deposit' to 'payout' in UI labels of the transaction list. This PR is a part of a project doing this rename across all parts of the UI.
+
+
diff --git a/changelog/update-9564-transaction-timeline-deposit-to-payout-rename b/changelog/update-9564-transaction-timeline-deposit-to-payout-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Part of a larger change to change 'deposit' to 'payout'. This PR specificially changes it for the transaction details timeline.
+
+
diff --git a/changelog/update-9578-79-rename-deposit-overview-modal b/changelog/update-9578-79-rename-deposit-overview-modal
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Rename 'deposit' to 'payout' in modals within 'Overview' section. PR is a part of a larger renaming project.
+
+
diff --git a/changelog/update-9581-rename-deposit-onboarding-tasklist b/changelog/update-9581-rename-deposit-onboarding-tasklist
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Rename 'deposit' to 'payout' within the onboarding tasklist section. The change is a part of a larger project of doing this rename across the codebase.
+
+
diff --git a/changelog/update-9587-doc-url-payout-rename b/changelog/update-9587-doc-url-payout-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Update 'deposit' to 'payout' in URLs of WooPayments docs occuring across the codebase. Part of a larger renaming project.
+
+
diff --git a/changelog/update-9600-readme b/changelog/update-9600-readme
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: No need changelog entry for this change as there has been one that encapsulate all the payout rename changes.
+
+
diff --git a/changelog/update-order-success-lpm-icon b/changelog/update-order-success-lpm-icon
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+update: show LPM payment method icon on order success page
diff --git a/changelog/update-payment-method-test-mode-label b/changelog/update-payment-method-test-mode-label
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+update: payment method "test mode" label at checkout to be displayed only when payment method is selected
diff --git a/client/checkout/api/index.js b/client/checkout/api/index.js
@@ -125,10 +125,10 @@ export default class WCPayAPI {
 	 * and displays the intent confirmation modal (if needed).
 	 *
 	 * @param {string} redirectUrl The redirect URL, returned from the server.
-	 * @param {string} paymentMethodToSave The ID of a Payment Method if it should be saved (optional).
+	 * @param {boolean} shouldSavePaymentMethod Whether the payment method should be saved.
 	 * @return {Promise<string>|boolean} A redirect URL on success, or `true` if no confirmation is needed.
 	 */
-	confirmIntent( redirectUrl, paymentMethodToSave ) {
+	confirmIntent( redirectUrl, shouldSavePaymentMethod = false ) {
 		const partials = redirectUrl.match(
 			/#wcpay-confirm-(pi|si):(.+):(.+):(.+)$/
 		);
@@ -219,7 +219,9 @@ export default class WCPayAPI {
 						// order status call works when a guest user creates an account during checkout.
 						_ajax_nonce: nonce,
 						intent_id: intentId,
-						payment_method_id: paymentMethodToSave || null,
+						should_save_payment_method: shouldSavePaymentMethod
+							? 'true'
+							: 'false',
 					} );
 
 					return [ ajaxCall, result.error ];

diff --git a/client/checkout/blocks/confirm-card-payment.js b/client/checkout/blocks/confirm-card-payment.js
@@ -13,12 +13,12 @@ export default async function confirmCardPayment(
 	emitResponse,
 	shouldSavePayment
 ) {
-	const { redirect, payment_method: paymentMethod } = paymentDetails;
+	const { redirect } = paymentDetails;
 
 	try {
 		const confirmationRequest = api.confirmIntent(
 			redirect,
-			shouldSavePayment ? paymentMethod : null
+			shouldSavePayment
 		);
 
 		// `true` means there is no intent to confirm.

diff --git a/client/checkout/blocks/index.js b/client/checkout/blocks/index.js
@@ -110,7 +110,10 @@ Object.entries( enabledPaymentMethodsConfig )
 			label: (
 				<PaymentMethodLabel
 					api={ api }
-					upeConfig={ upeConfig }
+					title={ upeConfig.title }
+					countries={ upeConfig.countries }
+					iconLight={ upeConfig.icon }
+					iconDark={ upeConfig.darkIcon }
 					upeName={ upeName }
 					upeAppearanceTheme={ upeAppearanceTheme }
 				/>