Fix square location ID issues

classes/helpers/FrmAppHelper.php

@@ -10,7 +10,7 @@ class FrmAppHelper {
 	 *
 	 * @var int
 	 */
-	public static $db_version = 103;
+	public static $db_version = 104;
 
 	/**
 	 * Used by the API add-on.

classes/models/FrmMigrate.php

@@ -325,7 +325,7 @@ private function migrate_data( $old_db_version ) {
 			return;
 		}
 
-		$migrations = array( 16, 11, 16, 17, 23, 25, 86, 90, 97, 98, 101 );
+		$migrations = array( 16, 11, 16, 17, 23, 25, 86, 90, 97, 98, 101, 104 );
 		foreach ( $migrations as $migration ) {
 			if ( FrmAppHelper::$db_version >= $migration && $old_db_version < $migration ) {
 				$function_name = 'migrate_to_' . $migration;
@@ -395,6 +395,24 @@ public function uninstall() {
 		return true;
 	}
 
+	/**
+	 * In older versions of Lite, it's possible we've saved the wrong location ID.
+	 * So force it to get valid values again.
+	 *
+	 * @since x.x
+	 *
+	 * @return void
+	 */
+	private function migrate_to_104() {
+		if ( FrmSquareLiteConnectHelper::get_merchant_id( 'test' ) ) {
+			FrmSquareLiteConnectHelper::get_location_id( true, 'test' );
+		}
+
+		if ( FrmSquareLiteConnectHelper::get_merchant_id( 'live' ) ) {
+			FrmSquareLiteConnectHelper::get_location_id( true, 'live' );
+		}
+	}
+
 	/**
 	 * Disables summary email for multisite (not the main site) if recipient setting isn't changed.
 	 *

square/helpers/FrmSquareLiteConnectHelper.php

@@ -350,7 +350,7 @@ private static function get_mode_value() {
 	}
 
 	/**
-	 * @param string $mode
+	 * @param string $mode either 'auto', 'live', or 'test'.
 	 * @return bool|string
 	 */
 	public static function get_merchant_id( $mode = 'auto' ) {
@@ -376,6 +376,7 @@ private static function get_location_id_option_name( $mode = 'auto' ) {
 	}
 
 	/**
+	 * @param string $mode either 'auto', 'live', or 'test'.
 	 * @return string
 	 */
 	private static function get_merchant_currency_option_name( $mode = 'auto' ) {
@@ -450,8 +451,8 @@ private static function check_server_for_oauth_merchant_id() {
 		if ( is_object( $data ) && ! empty( $data->merchant_id ) ) {
 			update_option( self::get_merchant_id_option_name( $mode ), $data->merchant_id, 'no' );
 
-			$currency    = self::get_merchant_currency( true );
-			$location_id = self::get_location_id( true );
+			$currency    = self::get_merchant_currency( true, $mode );
+			$location_id = self::get_location_id( true, $mode );
 
 			if ( $currency ) {
 				update_option( self::get_merchant_currency_option_name( $mode ), $currency, 'no' );
@@ -547,17 +548,23 @@ public static function create_subscription( $info ) {
 	 * @param bool $force
 	 * @return false|string
 	 */
-	public static function get_location_id( $force = false ) {
+	public static function get_location_id( $force = false, $mode = 'auto' ) {
 		if ( ! $force ) {
-			$location_id = get_option( self::get_location_id_option_name() );
+			$location_id = get_option( self::get_location_id_option_name( $mode ) );
 			if ( $location_id ) {
 				return $location_id;
 			}
 		}
 
-		$response = self::post_with_authenticated_body( 'get_location_id' );
+		$request_body = array();
+		if ( 'auto' !== $mode ) {
+			$_POST['testMode']                   = 'test' === $mode ? 1 : 0;
+			$request_body['frm_square_api_mode'] = $mode;
+		}
+
+		$response = self::post_with_authenticated_body( 'get_location_id', $request_body );
 		if ( is_object( $response ) ) {
-			update_option( self::get_location_id_option_name(), $response->id, 'no' );
+			update_option( self::get_location_id_option_name( $mode ), $response->id, 'no' );
 			return $response->id;
 		}
 
@@ -650,20 +657,27 @@ public static function reset_square_api_integration() {
 	}
 
 	/**
-	 * @param bool $force
+	 * @param bool   $force
+	 * @param string $mode
 	 * @return false|string
 	 */
-	public static function get_merchant_currency( $force = false ) {
+	public static function get_merchant_currency( $force = false, $mode = 'auto' ) {
 		if ( ! $force ) {
-			$currency = get_option( self::get_merchant_currency_option_name() );
+			$currency = get_option( self::get_merchant_currency_option_name( $mode ) );
 			if ( $currency ) {
 				return $currency;
 			}
 		}
 
-		$response = self::post_with_authenticated_body( 'get_merchant_currency' );
+		$request_body = array();
+		if ( 'auto' !== $mode ) {
+			$_POST['testMode']                   = 'test' === $mode ? 1 : 0;
+			$request_body['frm_square_api_mode'] = $mode;
+		}
+
+		$response = self::post_with_authenticated_body( 'get_merchant_currency', $request_body );
 		if ( is_object( $response ) && ! empty( $response->currency ) ) {
-			update_option( self::get_merchant_currency_option_name(), $response->currency, 'no' );
+			update_option( self::get_merchant_currency_option_name( $mode ), $response->currency, 'no' );
 			return $response->currency;
 		}
 

tests/cypress/e2e/Forms/formPageDataValidation.cy.js

@@ -18,7 +18,7 @@ describe( 'Forms page', () => {
 				const text = $el.text().trim();
 				const href = $el.attr( 'href' );
 
-				if ( href && ( text.includes( 'upgrading to PRO' ) || text.includes( 'Get 60% Off Pro!' ) || text.includes( 'Get the Deal' ) || text.match( /GET \d+% OFF|SAVE \d+%/ ) ) ) {
+				if ( href && ( text.includes( 'upgrading to PRO' ) || text.includes( 'Get 60% Off Pro!' ) || text.includes( 'Get the Deal' ) || text.match( /GET \d+% OFF|SAVE \d+%/ ) || text.includes( 'upgrading for 60% off during our No Brainer Sale!' ) ) ) {
 					cy.origin( 'https://formidableforms.com', { args: { href } }, ( { href } ) => {
 						cy.visit( href );
 						cy.get( 'h1' ).should( $h1 => {