Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit WooPay theme-ing availability to shortcode entrypoint #9867

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Limit WooPay theme-ing availability to shortcode entrypoint #9867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b6893c
Limit WooPay theme-ing availability to shortcode entrypoint
malithsen Dec 2, 2024
b0f5857
Add changelog entry
malithsen Dec 2, 2024
789c8c3
Update tests
malithsen Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/add-limit-woopay-themeing-to-shortcode-checkout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: add
Comment: Updates the availability criteria of WooPay Global theme-ing feature. This feature is unreleased and behind a feature flag.


10 changes: 7 additions & 3 deletions client/checkout/woopay/email-input-iframe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
appendRedirectionParams,
shouldSkipWooPay,
deleteSkipWooPayCookie,
isSupportedThemeEntrypoint,
} from './utils';
import { getAppearanceType } from '../utils';

Expand Down Expand Up @@ -180,6 +181,11 @@ export const handleWooPayEmailInput = async (
// Set the initial value.
iframeHeaderValue = true;
const appearanceType = getAppearanceType();
const appearance =
isSupportedThemeEntrypoint( appearanceType ) &&
getConfig( 'isWooPayGlobalThemeSupportEnabled' )
? getAppearance( appearanceType, true )
: null;

if ( getConfig( 'isWoopayFirstPartyAuthEnabled' ) ) {
request(
Expand All @@ -189,9 +195,7 @@ export const handleWooPayEmailInput = async (
order_id: getConfig( 'order_id' ),
key: getConfig( 'key' ),
billing_email: getConfig( 'billing_email' ),
appearance: getConfig( 'isWooPayGlobalThemeSupportEnabled' )
? getAppearance( appearanceType, true )
: null,
appearance: appearance,
}
).then( ( response ) => {
if ( response?.data?.session ) {
Expand Down
10 changes: 7 additions & 3 deletions client/checkout/woopay/express-button/express-checkout-iframe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
getTargetElement,
validateEmail,
appendRedirectionParams,
isSupportedThemeEntrypoint,
} from '../utils';
import { getTracksIdentity } from 'tracks';
import { getAppearance } from 'wcpay/checkout/upe-styles';
Expand Down Expand Up @@ -100,6 +101,11 @@ export const expressCheckoutIframe = async ( api, context, emailSelector ) => {
// Set the initial value.
iframeHeaderValue = true;
const appearanceType = getAppearanceType();
const appearance =
isSupportedThemeEntrypoint( appearanceType ) &&
getConfig( 'isWooPayGlobalThemeSupportEnabled' )
? getAppearance( appearanceType, true )
: null;

if ( getConfig( 'isWoopayFirstPartyAuthEnabled' ) ) {
request(
Expand All @@ -109,9 +115,7 @@ export const expressCheckoutIframe = async ( api, context, emailSelector ) => {
order_id: getConfig( 'order_id' ),
key: getConfig( 'key' ),
billing_email: getConfig( 'billing_email' ),
appearance: getConfig( 'isWooPayGlobalThemeSupportEnabled' )
? getAppearance( appearanceType, true )
: null,
appearance: appearance,
}
).then( ( response ) => {
if ( response?.data?.session ) {
Expand Down
35 changes: 2 additions & 33 deletions client/checkout/woopay/express-button/test/woopay-express-checkout-button.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,37 +70,6 @@ describe( 'WoopayExpressCheckoutButton', () => {
const mockRequest = jest.fn().mockResolvedValue( true );
const mockAddToCart = jest.fn().mockResolvedValue( true );
const api = new WCPayAPI( {}, mockRequest );
const mockAppearance = {
rules: {
'.Block': {},
'.Input': {},
'.Input--invalid': {},
'.Label': {},
'.Tab': {},
'.Tab--selected': {},
'.Tab:hover': {},
'.TabIcon--selected': {
color: undefined,
},
'.TabIcon:hover': {
color: undefined,
},
'.Text': {},
'.Text--redirect': {},
'.Heading': {},
'.Button': {},
'.Container': {},
'.Link': {},
},
theme: 'stripe',
variables: {
colorBackground: '#ffffff',
colorText: undefined,
fontFamily: undefined,
fontSizeBase: undefined,
},
labels: 'above',
};

beforeEach( () => {
expressCheckoutIframe.mockImplementation( () => jest.fn() );
Expand Down Expand Up @@ -198,7 +167,7 @@ describe( 'WoopayExpressCheckoutButton', () => {
case 'order_id':
return 1;
case 'appearance':
return mockAppearance;
return null;
default:
return 'foo';
}
Expand All @@ -224,7 +193,7 @@ describe( 'WoopayExpressCheckoutButton', () => {
order_id: 1,
key: 'testkey',
billing_email: 'test@test.com',
appearance: mockAppearance,
appearance: null,
} );
expect( expressCheckoutIframe ).not.toHaveBeenCalled();
} );
Expand Down
16 changes: 8 additions & 8 deletions client/checkout/woopay/express-button/woopay-express-checkout-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import interpolateComponents from '@automattic/interpolate-components';
import {
appendRedirectionParams,
deleteSkipWooPayCookie,
isSupportedThemeEntrypoint,
} from 'wcpay/checkout/woopay/utils';
import WooPayFirstPartyAuth from 'wcpay/checkout/woopay/express-button/woopay-first-party-auth';
import { getAppearance } from 'wcpay/checkout/upe-styles';
Expand Down Expand Up @@ -221,6 +222,11 @@ export const WoopayExpressCheckoutButton = ( {
setIsLoading( true );

const appearanceType = getAppearanceType();
const appearance =
isSupportedThemeEntrypoint( appearanceType ) &&
getConfig( 'isWooPayGlobalThemeSupportEnabled' )
? getAppearance( appearanceType, true )
: null;

if ( isProductPage ) {
const productData = getProductDataRef.current();
Expand All @@ -242,11 +248,7 @@ export const WoopayExpressCheckoutButton = ( {
}
WooPayFirstPartyAuth.getWooPaySessionFromMerchant( {
_ajax_nonce: getConfig( 'woopaySessionNonce' ),
appearance: getConfig(
'isWooPayGlobalThemeSupportEnabled'
)
? getAppearance( appearanceType, true )
: null,
appearance: appearance,
} )
.then( async ( response ) => {
if (
Expand Down Expand Up @@ -290,9 +292,7 @@ export const WoopayExpressCheckoutButton = ( {
order_id: getConfig( 'order_id' ),
key: getConfig( 'key' ),
billing_email: getConfig( 'billing_email' ),
appearance: getConfig( 'isWooPayGlobalThemeSupportEnabled' )
? getAppearance( appearanceType, true )
: null,
appearance: appearance,
} )
.then( async ( response ) => {
if ( response?.blog_id && response?.data?.session ) {
Expand Down
10 changes: 10 additions & 0 deletions client/checkout/woopay/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,13 @@ export const deleteSkipWooPayCookie = () => {
document.cookie =
'skip_woopay=; path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC;';
};

/**
* Determine Global theming availability for the entrypoint based on the appearanceType.
*
* @param {string} appearanceType entrypoint identifier.
* @return {boolean} True if Global theming should be enabled for the entrypoint.
*/
export const isSupportedThemeEntrypoint = ( appearanceType ) => {
return appearanceType === 'woopay_shortcode_checkout';
};
Loading