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

allow country code on set region

Browse Source
This commit is contained in:
Sebastian Rindom
2020-10-20 14:34:49 +02:00
parent 917767073a
commit 30e64dda71
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/medusa/src/api/routes/store/carts/update-cart.js
View File

@@ -6,6 +6,7 @@ export default async (req, res) => {
const schema = Validator.object().keys({
region_id: Validator.string(),
country_code: Validator.string().optional(),
email: Validator.string().email(),
billing_address: Validator.address(),
shipping_address: Validator.address(),
@@ -28,7 +29,7 @@ export default async (req, res) => {
try {
if (value.region_id) {
await cartService.setRegion(id, value.region_id)
await cartService.setRegion(id, value.region_id, value.country_code)
}
if (value.email) {

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

@@ -1108,7 +1108,7 @@ class CartService extends BaseService {
* @param {string} regionId - the id of the region to set the cart to
* @return {Promise} the result of the update operation
*/
async setRegion(cartId, regionId) {
async setRegion(cartId, regionId, countryCode) {
const cart = await this.retrieve(cartId)
const region = await this.regionService_.retrieve(regionId)
@@ -1137,17 +1137,27 @@ class CartService extends BaseService {
update.items = newItems.filter(i => !!i)
}
// If the country code of a shipping address is set we need to clear it
let shippingAddress = cart.shipping_address || {}
if (!_.isEmpty(shippingAddress) && shippingAddress.country_code) {
shippingAddress.country_code = ""
update.shipping_address = shippingAddress
}
if (countryCode !== undefined) {
if (!region.countries.includes(countryCode)) {
throw new MedusaError(
MedusaError.Types.NOT_ALLOWED,
`Country not available in region`
)
}
shippingAddress.country_code = countryCode
} else {
// If the country code of a shipping address is set we need to clear it
if (!_.isEmpty(shippingAddress) && shippingAddress.country_code) {
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
// 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
}
}
// Shipping methods are determined by region so the user needs to find a