Merge remote-tracking branch 'origin/release/6.5.1' into trunk

cesarcosta99 · cesarcosta99 · commit 4ec295658a27 · 2022-08-01T20:01:28.000-03:00
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -0,0 +1,23 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+RED="\033[1;31m"
+NO_COLOR="\033[0m"
+
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+PROTECTED_BRANCHES="^(trunk|develop|release/*)"
+
+# Only show warning for 'develop', 'trunk' and 'release/...' branches.
+if ! [[ "$BRANCH" =~ $PROTECTED_BRANCHES ]]; then
+	exit 0
+fi
+
+# Ask for confirmation, anything other than 'y' or 'Y' is considered as a NO.
+echo "\nYou're about to push to ${RED}${BRANCH}${NO_COLOR} 😱, is that what you intended? [y|n] \c"
+read -n 1 -r < /dev/tty
+echo "\n"
+if echo $REPLY | grep -E '^[Yy]$' > /dev/null; then
+	exit 0
+fi
+
+exit 1
diff --git a/assets/css/stripe-link.css b/assets/css/stripe-link.css
diff --git a/assets/css/stripe-link.scss b/assets/css/stripe-link.scss
@@ -0,0 +1,16 @@
+.stripe-gateway-checkout-email-field {
+	position: relative;
+}
+
+.stripe-gateway-checkout-email-field button.stripe-gateway-stripelink-modal-trigger {
+	display: none;
+	position: absolute;
+	right: 5px;
+	width: 64px;
+	height: 40px;
+	background: no-repeat
+		url( '../images/link.svg' );
+	background-color: transparent;
+	cursor: pointer;
+	border: none;
+}
diff --git a/assets/images/link.svg b/assets/images/link.svg
@@ -0,0 +1 @@
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="64" height="40" viewBox="0 0 600 227"><path d="M167.76 39.2c-10.88 3.44-14.8 17.52-7.28 26.24 7.36 8.64 21.04 7.12 26.64-2.96 5.6-10.08-1.52-23.12-12.88-23.76-2.32-.16-5.28.08-6.48.48zM100 128.8v88.8l14.64-.16 14.56-.24.24-88.64.16-88.56H100v88.8zM381.6 114v74.08l-2.96 1.36c-1.84.8-5.28 1.28-8.64 1.36-4.56 0-6.08-.32-8.16-1.84-4.56-3.2-4.88-5.68-5.36-34.96-.4-28.8-1.36-36.32-5.6-45.6-6.4-14-22.96-21.92-39.44-18.64-22.08 4.32-37.6 17.92-59.04 51.92l-7.2 11.36-.24-30.88-.16-30.96H216v126.4h27.04l2.96-6.96c8.88-20.64 23.76-47.12 35.04-62.24 18.88-25.36 36.32-34.56 42.4-22.4 2.48 5.04 3.12 11.6 3.76 36.4.48 20.4.88 26 2 29.6 6.32 20.24 23.36 30.32 46 27.36 19.12-2.56 35.04-11.52 55.04-30.96 6.16-6 10.88-10 11.2-9.52.32.48 5.92 9.36 12.4 19.76l11.84 18.96H482c10.08 0 16.48-.32 16.8-.8.24-.48-8.32-14.96-19.12-32.24L460 153.12l6.4-9.68c7.92-12.16 16.96-27.76 23.6-41.12 2.88-5.68 5.2-10.48 5.2-10.72 0-.24-7.28-.4-16.16-.4l-16.24.08-5.92 10.96c-11.12 20.72-25.04 41.12-38.88 57.04l-6.4 7.28-.4-63.04-.4-63.12-14.56-.24L381.6 40v74zM158.4 154.4v63.2h28.8V91.2h-28.8v63.2z"/></svg>
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,12 @@
 *** Changelog ***
 
+= 6.5.1 - 2022-08-01 =
+
+= 6.5.1 - 2022-xx-xx =
+* Fix - Stripe Link missing styles and logo for email trigger button.
+* Fix - Stripe Link fatal error on `get_upe_enabled_payment_method_ids` method.
+* Fix - Remove Link beta headers on checkout.
+
 = 6.5.0 - 2022-07-28 =
 * Add - Stripe Link: Add beta headers for Stripe server requests
 * Add - Stripe Link payment method option in admin
diff --git a/client/api/index.js b/client/api/index.js
@@ -88,9 +88,6 @@ export default class WCStripeAPI {
 			options.betas = betas;
 		}
 
-		if ( betas.includes( 'link_autofill_modal_beta_1' ) ) {
-			options.apiVersion = '2020-08-27;link_beta=v1';
-		}
 		return new Stripe( key, options );
 	}
 
diff --git a/includes/payment-methods/class-wc-stripe-upe-payment-method-link.php b/includes/payment-methods/class-wc-stripe-upe-payment-method-link.php
@@ -26,4 +26,22 @@ public function __construct() {
 			'woocommerce-gateway-stripe'
 		);
 	}
+
+	/**
+	 * Return if Stripe Link is enabled
+	 *
+	 * @return bool
+	 */
+	public static function is_link_enabled() {
+		// Assume Link is disabled if UPE is disabled.
+		if ( ! WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
+			return false;
+		}
+
+		return in_array(
+			self::STRIPE_ID,
+			woocommerce_gateway_stripe()->get_main_stripe_gateway()->get_upe_enabled_payment_method_ids(),
+			true
+		);
+	}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, sofort,
 Requires at least: 5.7
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 6.5.0
+Stable tag: 6.5.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -128,10 +128,8 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 6.5.0 - 2022-07-28 =
-* Add - Stripe Link payment method option in admin
-* Add - Stripe Link: Add beta headers for Stripe server requests
-* Add - Stripe Link payment method on checkout form
-* Add - Stripe Link payment method on blocks checkout form
+= 6.5.1 - 2022-08-01 =
+* Fix - Stripe Link fatal error on `get_upe_enabled_payment_method_ids` method.
+* Fix - Remove Link beta headers on checkout.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).
diff --git a/woocommerce-gateway-stripe.php b/woocommerce-gateway-stripe.php
@@ -5,7 +5,7 @@
  * Description: Take credit card payments on your store using Stripe.
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 6.5.0
+ * Version: 6.5.1
  * Requires at least: 5.7
  * Tested up to: 6.0
  * WC requires at least: 6.2
@@ -21,7 +21,7 @@
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '6.5.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '6.5.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_STRIPE_MIN_PHP_VER', '7.0.0' );
 define( 'WC_STRIPE_MIN_WC_VER', '6.2' );
 define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '6.3' );
@@ -243,7 +243,9 @@ public function init() {
 				add_filter( 'plugin_row_meta', [ $this, 'plugin_row_meta' ], 10, 2 );
 
 				// Update the email field position.
-				add_filter( 'woocommerce_billing_fields', [ $this, 'checkout_update_email_field_priority' ], 50 );
+				if ( ! is_admin() ) {
+					add_filter( 'woocommerce_billing_fields', [ $this, 'checkout_update_email_field_priority' ], 50 );
+				}
 
 				// Modify emails emails.
 				add_filter( 'woocommerce_email_classes', [ $this, 'add_emails' ], 20 );
@@ -659,13 +661,7 @@ public function get_main_stripe_gateway() {
 			 * @return array WooCommerce checkout fields.
 			 */
 			public function checkout_update_email_field_priority( $fields ) {
-				$is_link_enabled = in_array(
-					WC_Stripe_UPE_Payment_Method_Link::STRIPE_ID,
-					$this->stripe_gateway->get_upe_enabled_payment_method_ids(),
-					true
-				);
-
-				if ( $is_link_enabled ) {
+				if ( isset( $fields['billing_email'] ) && WC_Stripe_UPE_Payment_Method_Link::is_link_enabled() ) {
 					// Update the field priority.
 					$fields['billing_email']['priority'] = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,6 @@ export default class WCStripeAPI {`
`88`	`88`	`options.betas = betas;`
`89`	`89`	`}`
`90`	`90`
`91`		`- if ( betas.includes( 'link_autofill_modal_beta_1' ) ) {`
`92`		`- options.apiVersion = '2020-08-27;link_beta=v1';`
`93`		`- }`
`94`	`91`	`return new Stripe( key, options );`
`95`	`92`	`}`
`96`	`93`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "woocommerce-gateway-stripe",`
`3`	`3`	`"title": "WooCommerce Gateway Stripe",`
`4`		`- "version": "6.5.0",`
	`4`	`+ "version": "6.5.1",`
`5`	`5`	`"license": "GPL-3.0",`
`6`	`6`	`"homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",`
`7`	`7`	`"repository": {`