Merge branch 'develop' into add/transaction-id-to-refund-endpoint

Automattic · Dec 21, 2023 · b0e9352 · b0e9352
2 parents 88327ca + f62ff7e
commit b0e9352
Show file tree

Hide file tree

Showing 81 changed files with 1,858 additions and 245 deletions.
diff --git a/changelog/add-334-test-mode-notice-order-details b/changelog/add-334-test-mode-notice-order-details
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add test mode notice in page order detail.
diff --git a/changelog/add-7248-refund-transaction-from-details-page b/changelog/add-7248-refund-transaction-from-details-page
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add refund controls to transaction details view
diff --git a/changelog/dev-3468-allow-reset-account-management b/changelog/dev-3468-allow-reset-account-management
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add Account Management tools with reset account functionality for partially onboarded accounts.
diff --git a/changelog/fix-6700-remove-currency-sign-modification-code b/changelog/fix-6700-remove-currency-sign-modification-code
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix currency negative sign position on JS rendered amounts
diff --git a/changelog/revert-file-needed-for-plugin-update b/changelog/revert-file-needed-for-plugin-update
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: This is the file revert to avoid failures on plugin update. This is a temporary solution. Both removal & revert happen on develop meaning there is no change to the outside world.
+
+
diff --git a/changelog/subscriptions-6.6.0-1 b/changelog/subscriptions-6.6.0-1
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Deprecate the WC_Subscriptions_Synchroniser::add_to_recurring_cart_key(). Use WC_Subscriptions_Synchroniser::add_to_recurring_product_grouping_key() instead.
diff --git a/changelog/subscriptions-6.6.0-2 b/changelog/subscriptions-6.6.0-2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Introduce a new wcs_get_subscription_grouping_key() function to generate a unique key for a subscription based on its billing schedule. This function uses the existing recurring cart key concept.
diff --git a/changelog/subscriptions-core-6.6.0 b/changelog/subscriptions-core-6.6.0
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Updated subscriptions-core to version 6.6.0
diff --git a/changelog/subscriptions-core-6.6.0-3 b/changelog/subscriptions-core-6.6.0-3
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Fetch and update the `_cancelled_email_sent` meta in a HPOS compatibile way.
diff --git a/changelog/subscriptions-core-6.6.0-4 b/changelog/subscriptions-core-6.6.0-4
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Ensure proper backfilling of subscription metadata (i.e. dates and cache) to the postmeta table when HPOS is enabled and compatibility mode (data syncing) is turned on.
diff --git a/changelog/subscriptions-core-6.6.0-5 b/changelog/subscriptions-core-6.6.0-5
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Resolved an issue that would cause undefined $current_page, $max_num_pages, and $paginate variable errors when viewing a page with the subscriptions-shortcode.
diff --git a/changelog/subscriptions-core-6.6.0-6 b/changelog/subscriptions-core-6.6.0-6
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+When HPOS is enabled and data compatibility mode is turned on, make sure subscription date changes made to postmeta are synced to orders_meta table.
diff --git a/changelog/subscriptions-core-6.6.0-7 b/changelog/subscriptions-core-6.6.0-7
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Prevents a PHP fatal error that occurs when the cart contains a renewal order item that no longer exists.
diff --git a/changelog/subscriptions-core-6.6.0-8 b/changelog/subscriptions-core-6.6.0-8
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+When using the checkout block to pay for renewal orders, ensure the order's cart hash is updated to make sure the existing order can be used.
diff --git a/client/components/account-status/account-fees/index.js b/client/components/account-status/account-fees/index.js
@@ -16,6 +16,8 @@ import {
 	getCurrentBaseFee,
 	getTransactionsPaymentMethodName,
 } from 'utils/account-fees';
+import { CardDivider } from '@wordpress/components';
+import './styles.scss';
 
 const AccountFee = ( props ) => {
 	const { accountFee, paymentMethod } = props;
@@ -59,7 +61,12 @@ const AccountFees = ( props ) => {
 	return (
 		<>
 			{ haveDiscounts && (
-				<h4>{ __( 'Active discounts', 'woocommerce-payments' ) }</h4>
+				<div className="account-fees">
+					<CardDivider />
+					<h4>
+						{ __( 'Active discounts', 'woocommerce-payments' ) }
+					</h4>
+				</div>
 			) }
 			{ activeDiscounts }
 		</>

diff --git a/client/components/account-status/account-fees/styles.scss b/client/components/account-status/account-fees/styles.scss
@@ -0,0 +1,3 @@
+.account-fees {
+	padding-top: 16px;
+}
diff --git a/client/components/account-status/account-fees/test/__snapshots__/index.js.snap b/client/components/account-status/account-fees/test/__snapshots__/index.js.snap
@@ -2,9 +2,20 @@
 
 exports[`AccountFees renders discounted base fee 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -47,9 +58,20 @@ exports[`AccountFees renders discounted base fee 1`] = `
 
 exports[`AccountFees renders discounted fee with USD volume currency and non-USD base fee 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -92,9 +114,20 @@ exports[`AccountFees renders discounted fee with USD volume currency and non-USD
 
 exports[`AccountFees renders discounted fee with end date 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -115,9 +148,20 @@ exports[`AccountFees renders discounted fee with end date 1`] = `
 
 exports[`AccountFees renders discounted fee with volume limit 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -160,9 +204,20 @@ exports[`AccountFees renders discounted fee with volume limit 1`] = `
 
 exports[`AccountFees renders discounted fee with volume limit and end date 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -205,9 +260,20 @@ exports[`AccountFees renders discounted fee with volume limit and end date 1`] =
 
 exports[`AccountFees renders discounted fee without volume limit 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -223,9 +289,20 @@ exports[`AccountFees renders discounted fee without volume limit 1`] = `
 
 exports[`AccountFees renders discounted non-USD base fee 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -268,9 +345,20 @@ exports[`AccountFees renders discounted non-USD base fee 1`] = `
 
 exports[`AccountFees renders discounts multiple payment methods 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -306,9 +394,20 @@ exports[`AccountFees renders discounts multiple payment methods 1`] = `
 
 exports[`AccountFees renders first discounted fee ignoring the rest 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -324,9 +423,20 @@ exports[`AccountFees renders first discounted fee ignoring the rest 1`] = `
 
 exports[`AccountFees renders non-USD base fee 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :
@@ -342,9 +452,20 @@ exports[`AccountFees renders non-USD base fee 1`] = `
 
 exports[`AccountFees renders normal base fee 1`] = `
 <div>
-  <h4>
-    Active discounts
-  </h4>
+  <div
+    class="account-fees"
+  >
+    <hr
+      aria-orientation="horizontal"
+      class="components-divider components-card__divider components-card-divider css-yo8r29-DividerView-renderBorder-renderSize-renderMargin-Divider-borderColor e19on6iw0"
+      data-wp-c16t="true"
+      data-wp-component="CardDivider"
+      role="separator"
+    />
+    <h4>
+      Active discounts
+    </h4>
+  </div>
   <p>
     Card transactions
     :