Resolve merge conflict

This commit is contained in:
Daniel Dudzic 2024-04-20 19:38:41 +02:00
commit 2317c90db4
No known key found for this signature in database
GPG key ID: 31B40D33E3465483
77 changed files with 6249 additions and 123 deletions

View file

@ -121,8 +121,13 @@ const PayPalComponent = ({
};
const createSubscription = async (data, actions) => {
let planId = config.scriptData.subscription_plan_id;
if (config.scriptData.variable_paypal_subscription_variation_from_cart !== '') {
planId = config.scriptData.variable_paypal_subscription_variation_from_cart;
}
return actions.subscription.create({
'plan_id': config.scriptData.subscription_plan_id
'plan_id': planId
});
};