woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-31 06:52:50 +08:00
Code Issues Projects Packages Wiki Activity Actions

Fix block shipping address handlers.

Browse source
This commit is contained in:
Pedro Silva 2024-03-19 14:05:30 +00:00
parent 9f35681131
commit 47c9223d9b
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
2 changed files with 70 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/ppcp-blocks/resources/js/Helper/Helper.js Normal file
View file

@ -0,0 +1,22 @@
/**
* @param str
* @returns {string}
*/
export const toSnakeCase = (str) => {
return str.replace(/[\w]([A-Z])/g, function(m) {
return m[0] + "_" + m[1];
}).toLowerCase();
}
/**
* @param obj
* @returns {{}}
*/
export const convertKeysToSnakeCase = (obj) => {
const newObj = {};
Object.keys(obj).forEach((key) => {
const newKey = toSnakeCase(key);
newObj[newKey] = obj[key];
});
return newObj;
}

95
modules/ppcp-blocks/resources/js/checkout-block.js
View file

@ -6,6 +6,9 @@ import {
paypalOrderToWcAddresses,
paypalSubscriptionToWcAddresses
} from "./Helper/Address";
import {
convertKeysToSnakeCase
} from "./Helper/Helper";
import {
cartHasSubscriptionProducts,
isPayPalSubscription
@ -18,6 +21,7 @@ import {
} from '../../../ppcp-button/resources/js/modules/Helper/Style'
import buttonModuleWatcher from "../../../ppcp-button/resources/js/modules/ButtonModuleWatcher";
import BlockCheckoutMessagesBootstrap from "./Bootstrap/BlockCheckoutMessagesBootstrap";
import {keysToCamelCase} from "../../../ppcp-button/resources/js/modules/Helper/Utils";
const config = wc.wcSettings.getSetting('ppcp-gateway_data');
window.ppcpFundingSource = config.fundingSource;
@ -286,30 +290,18 @@ const PayPalComponent = ({
onClick();
};
let handleShippingChange = null;
let handleShippingOptionsChange = null;
let handleShippingAddressChange = null;
let handleSubscriptionShippingChange = null;
let handleSubscriptionShippingOptionsChange = null;
let handleSubscriptionShippingAddressChange = null;
if (shippingData.needsShipping && !config.finalReviewEnabled) {
handleShippingChange = async (data, actions) => {
handleShippingOptionsChange = async (data, actions) => {
try {
const shippingOptionId = data.selected_shipping_option?.id;
const shippingOptionId = data.selectedShippingOption?.id;
if (shippingOptionId) {
await shippingData.setSelectedRates(shippingOptionId);
}
if (data.shipping_address) {
const address = paypalAddressToWc(data.shipping_address);
await wp.data.dispatch('wc/store/cart').updateCustomerData({
shipping_address: address,
});
await shippingData.setShippingAddress(address);
}
const res = await fetch(config.ajax.update_shipping.endpoint, {
method: 'POST',
credentials: 'same-origin',
@ -331,28 +323,53 @@ const PayPalComponent = ({
}
};
handleShippingOptionsChange = (data, actions) => {
handleShippingChange({
orderID: data.orderID,
selected_shipping_option: data.selectedShippingOption
}, actions);
};
handleShippingAddressChange = (data, actions) => {
handleShippingChange({
orderID: data.orderID,
shipping_address: data.shippingAddress
}, actions);
};
handleSubscriptionShippingChange = async (data, actions) => {
handleShippingAddressChange = async (data, actions) => {
try {
const shippingOptionId = data.selected_shipping_option?.id;
const address = paypalAddressToWc(convertKeysToSnakeCase(data.shippingAddress));
await wp.data.dispatch('wc/store/cart').updateCustomerData({
shipping_address: address,
});
await shippingData.setShippingAddress(address);
const res = await fetch(config.ajax.update_shipping.endpoint, {
method: 'POST',
credentials: 'same-origin',
body: JSON.stringify({
nonce: config.ajax.update_shipping.nonce,
order_id: data.orderID,
})
});
const json = await res.json();
if (!json.success) {
throw new Error(json.data.message);
}
} catch (e) {
console.error(e);
actions.reject();
}
};
handleSubscriptionShippingOptionsChange = async (data, actions) => {
try {
const shippingOptionId = data.selectedShippingOption?.id;
if (shippingOptionId) {
await shippingData.setSelectedRates(shippingOptionId);
}
} catch (e) {
console.error(e);
const address = paypalAddressToWc(data.shipping_address);
actions.reject();
}
};
handleSubscriptionShippingAddressChange = async (data, actions) => {
try {
const address = paypalAddressToWc(convertKeysToSnakeCase(data.shippingAddress));
await wp.data.dispatch('wc/store/cart').updateCustomerData({
shipping_address: address,
@ -366,20 +383,6 @@ const PayPalComponent = ({
actions.reject();
}
};
handleSubscriptionShippingOptionsChange = (data, actions) => {
handleSubscriptionShippingChange({
orderID: data.orderID,
selected_shipping_option: data.selectedShippingOption
}, actions);
};
handleSubscriptionShippingAddressChange = (data, actions) => {
handleSubscriptionShippingChange({
orderID: data.orderID,
shipping_address: data.shippingAddress
}, actions);
};
}
useEffect(() => {
@ -476,7 +479,6 @@ const PayPalComponent = ({
onError={onClose}
createSubscription={createSubscription}
onApprove={handleApproveSubscription}
onShippingChange={handleSubscriptionShippingChange}
onShippingOptionsChange={handleSubscriptionShippingOptionsChange}
onShippingAddressChange={handleSubscriptionShippingAddressChange}
/>
@ -492,7 +494,6 @@ const PayPalComponent = ({
onError={onClose}
createOrder={createOrder}
onApprove={handleApprove}
onShippingChange={handleShippingChange}
onShippingOptionsChange={handleShippingOptionsChange}
onShippingAddressChange={handleShippingAddressChange}
/>