Merge release/7.5.0 into trunk

Automattic · Apr 17, 2024 · 1784d15 · 1784d15
2 parents ff2c3cf + 4b1eab2
commit 1784d15
Show file tree

Hide file tree

Showing 364 changed files with 6,191 additions and 1,921 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ We currently support the following variables:
 
 ## Test account setup
 
-For setting up a test account follow [these instructions](https://woo.com/document/woopayments/testing-and-troubleshooting/sandbox-mode/).
+For setting up a test account follow [these instructions](https://woocommerce.com/document/woopayments/testing-and-troubleshooting/sandbox-mode/).
 
 You will need a externally accessible URL to set up the plugin. You can use ngrok for this.
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -8,7 +8,7 @@ Generally, only the latest version of the extension has continued support.  In s
 
 ## Reporting a Vulnerability
 
-[WooPayments](https://woo.com/payments/) is an open-source plugin for WooCommerce. Our HackerOne program covers the plugin software.
+[WooPayments](https://woocommerce.com/payments/) is an open-source plugin for WooCommerce. Our HackerOne program covers the plugin software.
 
 **For responsible disclosure of security issues and to be eligible for our bug bounty program, please submit your report via the [HackerOne](https://hackerone.com/automattic) portal.**
 

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -67,6 +67,10 @@
 	background-image: url( '../images/cards/visa.svg' );
 }
 
+.payment-method__brand--cartes_bancaires {
+	background-image: url( '../images/cards/cartes_bancaires.svg' );
+}
+
 .payment-method__brand--unknown {
 	background-image: url( '../images/cards/unknown.svg' );
 }

diff --git a/assets/css/admin.rtl.css b/assets/css/admin.rtl.css
@@ -67,6 +67,10 @@
 	background-image: url( '../images/cards/visa.svg' );
 }
 
+.payment-method__brand--cartes_bancaires {
+	background-image: url( '../images/cards/cartes_bancaires.svg' );
+}
+
 .payment-method__brand--unknown {
 	background-image: url( '../images/cards/unknown.svg' );
 }

diff --git a/assets/images/bnpl_announcement_afterpay.png b/assets/images/bnpl_announcement_afterpay.png
diff --git a/assets/images/bnpl_announcement_clearpay.png b/assets/images/bnpl_announcement_clearpay.png
diff --git a/assets/images/cards/cartes_bancaires.svg b/assets/images/cards/cartes_bancaires.svg
diff --git a/assets/images/cards/diners.svg b/assets/images/cards/diners.svg
diff --git a/assets/images/cards/discover.svg b/assets/images/cards/discover.svg
diff --git a/assets/images/payment-activity-empty-state.svg b/assets/images/payment-activity-empty-state.svg
diff --git a/assets/images/payment-methods/afterpay-logo.svg b/assets/images/payment-methods/afterpay-logo.svg
diff --git a/assets/images/payment-methods/link.svg b/assets/images/payment-methods/link.svg
diff --git a/bin/wcpay-live-branches/wcpay-live-branches.user.js b/bin/wcpay-live-branches/wcpay-live-branches.user.js
@@ -388,7 +388,7 @@
 		 */
 		function appendHtml( el, contents ) {
 			const $el = $( el );
-			const wooColor = '#7F54B3'; // https://woo.com/brand-and-logo-guidelines/
+			const wooColor = '#7F54B3'; // https://woocommerce.com/brand-and-logo-guidelines/
 			const styles = $( '<style>' ).text( `
 				#wcpay-live-branches {
 					border: 3px dotted ${ wooColor };