Skip to content

Commit 4de025f

Browse files
rvishwanathbhatrvishwanathbhat
committed
W-21241548: resolve conflicts
1 parent afab363 commit 4de025f

File tree

11 files changed

+45
-79
lines changed

11 files changed

+45
-79
lines changed

‎packages/commerce-sdk-react/src/constant.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ export const CLIENT_KEYS = {
5858
SHOPPER_PROMOTIONS: 'shopperPromotions',
5959
SHOPPER_SEARCH: 'shopperSearch',
6060
SHOPPER_SEO: 'shopperSeo',
61-
SHOPPER_STORES: 'shopperStores',
62-
SHOPPER_CONFIGURATIONS: 'shopperConfigurations'
61+
SHOPPER_STORES: 'shopperStores'
6362
} as const

‎packages/commerce-sdk-react/src/hooks/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export * from './ShopperStores'
1919
export * from './ShopperSEO'
2020
export * from './ShopperConfigurations'
2121
export * from './useAuthHelper'
22-
export * from './ShopperConfigurations'
2322
export {default as useAccessToken} from './useAccessToken'
2423
export {default as useCommerceApi} from './useCommerceApi'
2524
export {default as useEncUserId} from './useEncUserId'

‎packages/commerce-sdk-react/src/hooks/types.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import {
2020
ShopperPromotions,
2121
ShopperSearch,
2222
ShopperSEO,
23-
ShopperStores,
24-
ShopperConfigurations
23+
ShopperStores
2524
} from 'commerce-sdk-isomorphic'
2625
import {helpers} from 'commerce-sdk-isomorphic'
2726
import {CommerceApiProviderProps} from '../provider'

‎packages/commerce-sdk-react/src/provider.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
ShopperSearch,
2525
ShopperSEO,
2626
ShopperStores,
27-
ShopperConfigurations,
2827
FetchOptions
2928
} from 'commerce-sdk-isomorphic'
3029
import {transformSDKClient} from './utils'
@@ -274,8 +273,7 @@ const CommerceApiProvider = (props: CommerceApiProviderProps): ReactElement => {
274273
shopperPromotions: new ShopperPromotions(config),
275274
shopperSearch: new ShopperSearch(config),
276275
shopperSeo: new ShopperSEO(config),
277-
shopperStores: new ShopperStores(config),
278-
shopperConfigurations: new ShopperConfigurations(config)
276+
shopperStores: new ShopperStores(config)
279277
}
280278
}, [
281279
clientId,

‎packages/template-retail-react-app/app/components/sf-payments-express-buttons/index.jsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,16 @@ const SFPaymentsExpressButtons = ({
270270
// Find SF Payments payment instrument in created order
271271
const orderPaymentInstrument = getSFPaymentsInstrument(order)
272272

273-
// Build the return URL (needed for updatePaymentInstrumentForOrder )
273+
// Build the return URL (needed for updatePaymentInstrumentForOrder )
274274
const baseReturnUrl = `${window.location.protocol}//${window.location.host}/checkout/payment-processing`
275-
paymentData.returnUrl = baseReturnUrl +
276-
'?orderNo=' + encodeURIComponent(createdOrderNo) +
277-
'&zoneId=' + encodeURIComponent(zoneId) +
278-
'&type=' + encodeURIComponent(paymentType)
275+
paymentData.returnUrl =
276+
baseReturnUrl +
277+
'?orderNo=' +
278+
encodeURIComponent(createdOrderNo) +
279+
'&zoneId=' +
280+
encodeURIComponent(zoneId) +
281+
'&type=' +
282+
encodeURIComponent(paymentType)
279283

280284
try {
281285
const paymentInstrumentBody = createPaymentInstrumentBody({

‎packages/template-retail-react-app/app/pages/checkout/partials/sf-payments-sheet.jsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,7 @@ const SFPaymentsSheet = forwardRef((props, ref) => {
538538
if (!containerElementRef.current) return // Skip if Payment container ref not attached to DOM yet
539539
if (!paymentConfig) return // Skip if Payment config not loaded yet
540540

541-
542-
const paymentMethodSetAccounts = (paymentConfig.paymentMethodSetAccounts || []).map(
541+
const paymentMethodSetAccounts = (paymentConfig.paymentMethodSetAccounts || []).map(
543542
(account) => ({
544543
...account,
545544
gatewayId: account.accountId

‎packages/template-retail-react-app/app/static/translations/compiled/en-GB.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -977,12 +977,6 @@
977977
"value": "Place Order"
978978
}
979979
],
980-
"checkout.heading.express_checkout": [
981-
{
982-
"type": 0,
983-
"value": "Express Checkout"
984-
}
985-
],
986980
"checkout.error.billing_address_required": [
987981
{
988982
"type": 0,
@@ -995,6 +989,12 @@
995989
"value": "Could not save shipping address."
996990
}
997991
],
992+
"checkout.heading.express_checkout": [
993+
{
994+
"type": 0,
995+
"value": "Express Checkout"
996+
}
997+
],
998998
"checkout.label.user_registration": [
999999
{
10001000
"type": 0,
@@ -4189,12 +4189,6 @@
41894189
"value": "Visa"
41904190
}
41914191
],
4192-
"sfp_payments_express.error.default": [
4193-
{
4194-
"type": 0,
4195-
"value": "Your attempted payment was unsuccessful. You have not been charged and your order has not been placed. Please select a different payment method and submit payment again to complete your checkout and place your order."
4196-
}
4197-
],
41984192
"shipping_address.action.ship_to_multiple_addresses": [
41994193
{
42004194
"type": 0,

‎packages/template-retail-react-app/app/static/translations/compiled/en-US.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -977,12 +977,6 @@
977977
"value": "Place Order"
978978
}
979979
],
980-
"checkout.heading.express_checkout": [
981-
{
982-
"type": 0,
983-
"value": "Express Checkout"
984-
}
985-
],
986980
"checkout.error.billing_address_required": [
987981
{
988982
"type": 0,
@@ -995,6 +989,12 @@
995989
"value": "Could not save shipping address."
996990
}
997991
],
992+
"checkout.heading.express_checkout": [
993+
{
994+
"type": 0,
995+
"value": "Express Checkout"
996+
}
997+
],
998998
"checkout.label.user_registration": [
999999
{
10001000
"type": 0,
@@ -4189,12 +4189,6 @@
41894189
"value": "Visa"
41904190
}
41914191
],
4192-
"sfp_payments_express.error.default": [
4193-
{
4194-
"type": 0,
4195-
"value": "Your attempted payment was unsuccessful. You have not been charged and your order has not been placed. Please select a different payment method and submit payment again to complete your checkout and place your order."
4196-
}
4197-
],
41984192
"shipping_address.action.ship_to_multiple_addresses": [
41994193
{
42004194
"type": 0,

‎packages/template-retail-react-app/app/static/translations/compiled/en-XA.json‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,42 +1913,42 @@
19131913
"value": "]"
19141914
}
19151915
],
1916-
"checkout.heading.express_checkout": [
1916+
"checkout.error.billing_address_required": [
19171917
{
19181918
"type": 0,
19191919
"value": "["
19201920
},
19211921
{
19221922
"type": 0,
1923-
"value": "Ḗẋƥřḗḗşş Ƈħḗḗƈķǿǿŭŭŧ"
1923+
"value": "Ƥŀḗḗȧȧşḗḗ ḗḗƞŧḗḗř ȧȧ ƀīŀŀīƞɠ ȧȧḓḓřḗḗşş."
19241924
},
19251925
{
19261926
"type": 0,
19271927
"value": "]"
19281928
}
19291929
],
1930-
"checkout.error.billing_address_required": [
1930+
"checkout.error.cannot_save_address": [
19311931
{
19321932
"type": 0,
19331933
"value": "["
19341934
},
19351935
{
19361936
"type": 0,
1937-
"value": "Ƥŀḗḗȧȧşḗḗ ḗḗƞŧḗḗř ȧȧ ƀīŀŀīƞɠ ȧȧḓḓřḗḗşş."
1937+
"value": "Ƈǿǿŭŭŀḓ ƞǿǿŧ şȧȧṽḗḗ şħīƥƥīƞɠ ȧȧḓḓřḗḗşş."
19381938
},
19391939
{
19401940
"type": 0,
19411941
"value": "]"
19421942
}
19431943
],
1944-
"checkout.error.cannot_save_address": [
1944+
"checkout.heading.express_checkout": [
19451945
{
19461946
"type": 0,
19471947
"value": "["
19481948
},
19491949
{
19501950
"type": 0,
1951-
"value": "Ƈǿǿŭŭŀḓ ƞǿǿŧ şȧȧṽḗḗ şħīƥƥīƞɠ ȧȧḓḓřḗḗşş."
1951+
"value": "Ḗẋƥřḗḗşş Ƈħḗḗƈķǿǿŭŭŧ"
19521952
},
19531953
{
19541954
"type": 0,
@@ -1997,56 +1997,56 @@
19971997
"value": "]"
19981998
}
19991999
],
2000-
"checkout.message.user_registration": [
2000+
"checkout.message.payment_confirm_failure": [
20012001
{
20022002
"type": 0,
20032003
"value": "["
20042004
},
20052005
{
20062006
"type": 0,
2007-
"value": "Ẏǿǿŭŭř ƥȧȧẏḿḗḗƞŧ, ȧȧḓḓřḗḗşş, ȧȧƞḓ ƈǿǿƞŧȧȧƈŧ īƞƒǿǿřḿȧȧŧīǿǿƞ ẇīŀŀ ƀḗḗ şȧȧṽḗḗḓ īƞ ȧȧ ƞḗḗẇ ȧȧƈƈǿǿŭŭƞŧ. Ŭşḗḗ ŧħḗḗ ḗḗḿȧȧīŀḗḗḓ ǿǿƞḗḗ-ŧīḿḗḗ ƥȧȧşşẇǿǿřḓ (ǾŦƤ) ŧǿǿ ƈřḗḗȧȧŧḗḗ ẏǿǿŭŭř ȧȧƈƈǿǿŭŭƞŧ. Ȧƒŧḗḗř ƈřḗḗȧȧŧīƞɠ ẏǿǿŭŭř ȧȧƈƈǿǿŭŭƞŧ, ŭŭşḗḗ ŧħḗḗ Ƒǿǿřɠǿǿŧ Ƥȧȧşşẇǿǿřḓ ƒŭŭƞƈŧīǿǿƞ ŧǿǿ şḗḗŧ ȧȧ ƞḗḗẇ ƥȧȧşşẇǿǿřḓ."
2007+
"value": "Ƥȧȧẏḿḗḗƞŧ ƈǿǿƞƒīřḿȧȧŧīǿǿƞ ƒȧȧīŀḗḗḓ. Ẏǿǿŭŭř ǿǿřḓḗḗř ħȧȧş ƀḗḗḗḗƞ ƈȧȧƞƈḗḗŀŀḗḗḓ ȧȧƞḓ ẏǿǿŭŭř ƀȧȧşķḗḗŧ ħȧȧş ƀḗḗḗḗƞ řḗḗşŧǿǿřḗḗḓ. Ƥŀḗḗȧȧşḗḗ ŧřẏ ȧȧɠȧȧīƞ ǿǿř şḗḗŀḗḗƈŧ ȧȧ ḓīƒƒḗḗřḗḗƞŧ ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ."
20082008
},
20092009
{
20102010
"type": 0,
20112011
"value": "]"
20122012
}
20132013
],
2014-
"checkout.message.payment_confirm_failure": [
2014+
"checkout.message.payment_processing_failed": [
20152015
{
20162016
"type": 0,
20172017
"value": "["
20182018
},
20192019
{
20202020
"type": 0,
2021-
"value": "Ƥȧȧẏḿḗḗƞŧ ƈǿǿƞƒīřḿȧȧŧīǿǿƞ ƒȧȧīŀḗḗḓ. Ẏǿǿŭŭř ǿǿřḓḗḗř ħȧȧş ƀḗḗḗḗƞ ƈȧȧƞƈḗḗŀŀḗḗḓ ȧȧƞḓ ẏǿǿŭŭř ƀȧȧşķḗḗŧ ħȧȧş ƀḗḗḗḗƞ řḗḗşŧǿǿřḗḗḓ. Ƥŀḗḗȧȧşḗḗ ŧřẏ ȧȧɠȧȧīƞ ǿǿř şḗḗŀḗḗƈŧ ȧȧ ḓīƒƒḗḗřḗḗƞŧ ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ."
2021+
"value": "Ƥȧȧẏḿḗḗƞŧ ƥřǿǿƈḗḗşşīƞɠ ƒȧȧīŀḗḗḓ. Ẏǿǿŭŭř ǿǿřḓḗḗř ħȧȧş ƀḗḗḗḗƞ ƈȧȧƞƈḗḗŀŀḗḗḓ ȧȧƞḓ ẏǿǿŭŭř ƀȧȧşķḗḗŧ ħȧȧş ƀḗḗḗḗƞ řḗḗşŧǿǿřḗḗḓ. Ƥŀḗḗȧȧşḗḗ ŧřẏ ȧȧɠȧȧīƞ ǿǿř şḗḗŀḗḗƈŧ ȧȧ ḓīƒƒḗḗřḗḗƞŧ ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ."
20222022
},
20232023
{
20242024
"type": 0,
20252025
"value": "]"
20262026
}
20272027
],
2028-
"checkout.payment.save_payment_method": [
2028+
"checkout.message.user_registration": [
20292029
{
20302030
"type": 0,
20312031
"value": "["
20322032
},
20332033
{
20342034
"type": 0,
2035-
"value": "Şȧȧṽḗḗ ŧħīş ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ ƒǿǿř ƒŭŭŧŭŭřḗḗ ŭŭşḗḗ"
2035+
"value": "Ẏǿǿŭŭř ƥȧȧẏḿḗḗƞŧ, ȧȧḓḓřḗḗşş, ȧȧƞḓ ƈǿǿƞŧȧȧƈŧ īƞƒǿǿřḿȧȧŧīǿǿƞ ẇīŀŀ ƀḗḗ şȧȧṽḗḗḓ īƞ ȧȧ ƞḗḗẇ ȧȧƈƈǿǿŭŭƞŧ. Ŭşḗḗ ŧħḗḗ ḗḗḿȧȧīŀḗḗḓ ǿǿƞḗḗ-ŧīḿḗḗ ƥȧȧşşẇǿǿřḓ (ǾŦƤ) ŧǿǿ ƈřḗḗȧȧŧḗḗ ẏǿǿŭŭř ȧȧƈƈǿǿŭŭƞŧ. Ȧƒŧḗḗř ƈřḗḗȧȧŧīƞɠ ẏǿǿŭŭř ȧȧƈƈǿǿŭŭƞŧ, ŭŭşḗḗ ŧħḗḗ Ƒǿǿřɠǿǿŧ Ƥȧȧşşẇǿǿřḓ ƒŭŭƞƈŧīǿǿƞ ŧǿǿ şḗḗŧ ȧȧ ƞḗḗẇ ƥȧȧşşẇǿǿřḓ."
20362036
},
20372037
{
20382038
"type": 0,
20392039
"value": "]"
20402040
}
20412041
],
2042-
"checkout.message.payment_processing_failed": [
2042+
"checkout.payment.save_payment_method": [
20432043
{
20442044
"type": 0,
20452045
"value": "["
20462046
},
20472047
{
20482048
"type": 0,
2049-
"value": "Ƥȧȧẏḿḗḗƞŧ ƥřǿǿƈḗḗşşīƞɠ ƒȧȧīŀḗḗḓ. Ẏǿǿŭŭř ǿǿřḓḗḗř ħȧȧş ƀḗḗḗḗƞ ƈȧȧƞƈḗḗŀŀḗḗḓ ȧȧƞḓ ẏǿǿŭŭř ƀȧȧşķḗḗŧ ħȧȧş ƀḗḗḗḗƞ řḗḗşŧǿǿřḗḗḓ. Ƥŀḗḗȧȧşḗḗ ŧřẏ ȧȧɠȧȧīƞ ǿǿř şḗḗŀḗḗƈŧ ȧȧ ḓīƒƒḗḗřḗḗƞŧ ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ."
2049+
"value": "Şȧȧṽḗḗ ŧħīş ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ ƒǿǿř ƒŭŭŧŭŭřḗḗ ŭŭşḗḗ"
20502050
},
20512051
{
20522052
"type": 0,
@@ -8877,20 +8877,6 @@
88778877
"value": "]"
88788878
}
88798879
],
8880-
"sfp_payments_express.error.default": [
8881-
{
8882-
"type": 0,
8883-
"value": "["
8884-
},
8885-
{
8886-
"type": 0,
8887-
"value": "Ẏǿǿŭŭř ȧȧŧŧḗḗḿƥŧḗḗḓ ƥȧȧẏḿḗḗƞŧ ẇȧȧş ŭŭƞşŭŭƈƈḗḗşşƒŭŭŀ. Ẏǿǿŭŭ ħȧȧṽḗḗ ƞǿǿŧ ƀḗḗḗḗƞ ƈħȧȧřɠḗḗḓ ȧȧƞḓ ẏǿǿŭŭř ǿǿřḓḗḗř ħȧȧş ƞǿǿŧ ƀḗḗḗḗƞ ƥŀȧȧƈḗḗḓ. Ƥŀḗḗȧȧşḗḗ şḗḗŀḗḗƈŧ ȧȧ ḓīƒƒḗḗřḗḗƞŧ ƥȧȧẏḿḗḗƞŧ ḿḗḗŧħǿǿḓ ȧȧƞḓ şŭŭƀḿīŧ ƥȧȧẏḿḗḗƞŧ ȧȧɠȧȧīƞ ŧǿǿ ƈǿǿḿƥŀḗḗŧḗḗ ẏǿǿŭŭř ƈħḗḗƈķǿǿŭŭŧ ȧȧƞḓ ƥŀȧȧƈḗḗ ẏǿǿŭŭř ǿǿřḓḗḗř."
8888-
},
8889-
{
8890-
"type": 0,
8891-
"value": "]"
8892-
}
8893-
],
88948880
"shipping_address.action.ship_to_multiple_addresses": [
88958881
{
88968882
"type": 0,

‎packages/template-retail-react-app/translations/en-GB.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,15 +351,15 @@
351351
"checkout.button.place_order": {
352352
"defaultMessage": "Place Order"
353353
},
354-
"checkout.heading.express_checkout": {
355-
"defaultMessage": "Express Checkout"
356-
},
357354
"checkout.error.billing_address_required": {
358355
"defaultMessage": "Please enter a billing address."
359356
},
360357
"checkout.error.cannot_save_address": {
361358
"defaultMessage": "Could not save shipping address."
362359
},
360+
"checkout.heading.express_checkout": {
361+
"defaultMessage": "Express Checkout"
362+
},
363363
"checkout.label.user_registration": {
364364
"defaultMessage": "Create an account to check out faster"
365365
},
@@ -1772,9 +1772,6 @@
17721772
"sf_payments_order_summary.label.brand.visa": {
17731773
"defaultMessage": "Visa"
17741774
},
1775-
"sfp_payments_express.error.default": {
1776-
"defaultMessage": "Your attempted payment was unsuccessful. You have not been charged and your order has not been placed. Please select a different payment method and submit payment again to complete your checkout and place your order."
1777-
},
17781775
"shipping_address.action.ship_to_multiple_addresses": {
17791776
"defaultMessage": "Ship to multiple addresses"
17801777
},

0 commit comments

Comments
 (0)