Merge branch 'master' into develop

This commit is contained in:
olivermrbl
2021-11-22 13:40:55 +01:00
80 changed files with 4031 additions and 498 deletions
@@ -169,12 +169,7 @@ export default async (req, res) => {
const order = await orderService
.withTransaction(manager)
.retrieve(id, {
relations: [
"items",
"cart",
"cart.discounts",
"cart.discounts.rule",
],
relations: ["items", "discounts", "discounts.rule"],
})
await claimService.withTransaction(manager).create({