fix: add possiblity to unset billing address

This commit is contained in:
Sebastian Rindom
2021-10-15 19:24:44 +02:00
parent 9c72acda40
commit dc7ecc959a
3 changed files with 50 additions and 3 deletions
@@ -221,5 +221,47 @@ describe("/store/customers", () => {
}) })
) )
}) })
it("unsets customer billing address", async () => {
const api = useApi()
const authResponse = await api.post("/store/auth", {
email: "john@deere.com",
password: "test",
})
const customerId = authResponse.data.customer.id
const [authCookie] = authResponse.headers["set-cookie"][0].split(";")
const check = await api.post(
`/store/customers/me`,
{
billing_address: "addr_test",
},
{
headers: {
Cookie: authCookie,
},
}
)
expect(check.status).toEqual(200)
expect(check.data.customer.billing_address_id).toEqual("addr_test")
const response = await api.post(
`/store/customers/me`,
{
billing_address: null,
},
{
headers: {
Cookie: authCookie,
},
}
)
expect(response.status).toEqual(200)
expect(response.data.customer.billing_address_id).toEqual(null)
})
}) })
}) })
@@ -50,7 +50,7 @@ export default async (req, res) => {
const id = req.user.customer_id const id = req.user.customer_id
const schema = Validator.object().keys({ const schema = Validator.object().keys({
billing_address: Validator.address().optional(), billing_address: Validator.address().optional().allow(null),
first_name: Validator.string().optional(), first_name: Validator.string().optional(),
last_name: Validator.string().optional(), last_name: Validator.string().optional(),
password: Validator.string().optional(), password: Validator.string().optional(),
+7 -2
View File
@@ -387,8 +387,8 @@ class CustomerService extends BaseService {
customer.email = this.validateEmail_(email) customer.email = this.validateEmail_(email)
} }
if (billing_address_id || billing_address) { if ("billing_address_id" in update || "billing_address" in update) {
const address = update.billing_address_id || update.billing_address const address = billing_address_id || billing_address
await this.updateBillingAddress_(customer, address, addrRepo) await this.updateBillingAddress_(customer, address, addrRepo)
} }
@@ -417,6 +417,11 @@ class CustomerService extends BaseService {
* @return {Promise} the result of the update operation * @return {Promise} the result of the update operation
*/ */
async updateBillingAddress_(customer, addressOrId, addrRepo) { async updateBillingAddress_(customer, addressOrId, addrRepo) {
if (addressOrId === null) {
customer.billing_address_id = null
return
}
if (typeof addressOrId === `string`) { if (typeof addressOrId === `string`) {
addressOrId = await addrRepo.findOne({ addressOrId = await addrRepo.findOne({
where: { id: addressOrId }, where: { id: addressOrId },