asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: auto pick country in 1 country regions

Browse Source
This commit is contained in:
Sebastian Rindom
2020-08-31 11:19:04 +02:00
parent ec2728bbd5
commit d11eb8fa65
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/medusa-payment-klarna/src/services/klarna-provider.js
View File

@@ -135,9 +135,11 @@ class KlarnaProviderService extends PaymentService {
}
// TODO: Check if country matches ISO
if (!_.isEmpty(cart.billing_address) && cart.billing_address.country) {
order.purchase_country =
cart.shipping_address.country_code || cart.billing_address.country_code
if (
!_.isEmpty(cart.shipping_address) &&
cart.shipping_address.country_code
) {
order.purchase_country = cart.shipping_address.country_code
} else {
// Defaults to Sweden
order.purchase_country = "SE"

11
packages/medusa/src/services/cart.js
View File

@@ -1135,10 +1135,15 @@ class CartService extends BaseService {
}
// If the country code of a shipping address is set we need to clear it
let shippingAddress = cart.shipping_address
let shippingAddress = cart.shipping_address || {}
if (!_.isEmpty(shippingAddress) && shippingAddress.country_code) {
shippingAddress.country_code =
region.countries.length === 1 ? region.countries[0] : ""
shippingAddress.country_code = ""
update.shipping_address = shippingAddress
}
// If there is only one country in the region preset it
if (region.countries.length === 1) {
shippingAddress.country_code = region.countries[0]
update.shipping_address = shippingAddress
}