@unchainedshop/api 2.9.4 → 2.10.0

package/lib/resolvers/mutations/orders/addCartDiscount.js

@@ -1,9 +1,12 @@
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 export default async function addCartDiscount(root, { orderId, code }, context) {
     const { modules, user, userId } = context;
     log(`mutation addCartDiscount ${code} ${orderId}`, { userId, orderId });
-    const cart = await getOrderCart({ orderId, user }, context);
-    return modules.orders.discounts.createManualOrderDiscount({ order: cart, code }, context);
+    const order = await getOrderCart({ orderId, user }, context);
+    if (!modules.orders.isCart(order))
+        throw new OrderWrongStatusError({ status: order.status });
+    return modules.orders.discounts.createManualOrderDiscount({ order, code }, context);
 }
 //# sourceMappingURL=addCartDiscount.js.map

package/lib/resolvers/mutations/orders/addCartDiscount.js.map

@@ -1 +1 @@
-{"version":3,"file":"addCartDiscount.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartDiscount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAsC,EACrD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,4BAA4B,IAAI,IAAI,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAExE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAE5D,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AAC5F,CAAC"}
+{"version":3,"file":"addCartDiscount.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartDiscount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAsC,EACrD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,4BAA4B,IAAI,IAAI,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAExE,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAE7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AACtF,CAAC"}

package/lib/resolvers/mutations/orders/addCartProduct.js

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { ProductNotFoundError, OrderQuantityTooLowError, InvalidIdError } from '../../../errors.js';
+import { ProductNotFoundError, OrderQuantityTooLowError, InvalidIdError, OrderWrongStatusError, } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 export default async function addCartProduct(root, { orderId, productId, quantity, configuration }, context) {
     const { modules, userId, user } = context;
@@ -12,6 +12,8 @@ export default async function addCartProduct(root, { orderId, productId, quantit
     if (!product)
         throw new ProductNotFoundError({ productId });
     const order = await getOrderCart({ orderId, user }, context);
+    if (!modules.orders.isCart(order))
+        throw new OrderWrongStatusError({ status: order.status });
     const orderPosition = await modules.orders.positions.addProductItem({
         quantity,
         configuration,

package/lib/resolvers/mutations/orders/addCartProduct.js.map

@@ -1 +1 @@
-{"version":3,"file":"addCartProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EAC/C,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CACD,2BAA2B,SAAS,IAAI,QAAQ,IAC9C,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACxD,IAAI,QAAQ,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE5D,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CACjE;QACE,QAAQ;QACR,aAAa;KACd,EACD,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,OAAO,CACR,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"addCartProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EAC/C,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CACD,2BAA2B,SAAS,IAAI,QAAQ,IAC9C,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACxD,IAAI,QAAQ,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE5D,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CACjE;QACE,QAAQ;QACR,aAAa;KACd,EACD,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,OAAO,CACR,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/lib/resolvers/mutations/orders/addCartQuotation.js

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { QuotationStatus } from '@unchainedshop/core-quotations';
-import { QuotationNotFoundError, QuotationWrongStatusError, OrderQuantityTooLowError, InvalidIdError, } from '../../../errors.js';
+import { QuotationNotFoundError, QuotationWrongStatusError, OrderQuantityTooLowError, InvalidIdError, OrderWrongStatusError, } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 export default async function addCartQuotation(root, params, context) {
     const { modules, userId, user } = context;
@@ -17,6 +17,8 @@ export default async function addCartQuotation(root, params, context) {
         throw new QuotationWrongStatusError({ status: quotation.status });
     }
     const order = await getOrderCart({ orderId, user }, context);
+    if (!modules.orders.isCart(order))
+        throw new OrderWrongStatusError({ status: order.status });
     const product = await modules.products.findProduct({
         productId: quotation.productId,
     });

package/lib/resolvers/mutations/orders/addCartQuotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"addCartQuotation.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartQuotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,wBAAwB,EACxB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAEjE,GAAG,CACD,6BAA6B,WAAW,IAAI,QAAQ,IAClD,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5D,IAAI,QAAQ,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1E,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,sBAAsB,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAElE,IAAI,SAAS,CAAC,MAAM,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;QAClD,MAAM,IAAI,yBAAyB,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QACjD,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B,CAAC,CAAC;IAEH,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,0BAA0B,CAChF,SAAS,EACT;QACE,QAAQ;QACR,aAAa;KACd,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAC5C;QACE,QAAQ,EAAE,sBAAsB,CAAC,QAAQ;QACzC,aAAa,EAAE,sBAAsB,CAAC,aAAa;QACnD,WAAW;KACZ,EACD,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,OAAO,CACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"addCartQuotation.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartQuotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAEjE,GAAG,CACD,6BAA6B,WAAW,IAAI,QAAQ,IAClD,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5D,IAAI,QAAQ,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1E,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,sBAAsB,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAElE,IAAI,SAAS,CAAC,MAAM,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;QAClD,MAAM,IAAI,yBAAyB,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QACjD,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B,CAAC,CAAC;IAEH,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,0BAA0B,CAChF,SAAS,EACT;QACE,QAAQ;QACR,aAAa;KACd,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAC5C;QACE,QAAQ,EAAE,sBAAsB,CAAC,QAAQ;QACzC,aAAa,EAAE,sBAAsB,CAAC,aAAa;QACnD,WAAW;KACZ,EACD,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,OAAO,CACR,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/orders/addMultipleCartProducts.js

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { ProductNotFoundError, OrderQuantityTooLowError } from '../../../errors.js';
+import { ProductNotFoundError, OrderQuantityTooLowError, OrderWrongStatusError, } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 export default async function addMultipleCartProducts(root, params, context) {
     const { modules, userId, user } = context;
@@ -19,6 +19,8 @@ export default async function addMultipleCartProducts(root, params, context) {
         };
     }));
     const order = await getOrderCart({ orderId, user }, context);
+    if (!modules.orders.isCart(order))
+        throw new OrderWrongStatusError({ status: order.status });
     // Reduce is used to wait for each product to be added before processing the next (sequential processing)
     return itemsWithProducts.reduce(async (positionsPromise, { product, quantity, configuration }) => {
         const positions = await positionsPromise;

package/lib/resolvers/mutations/orders/addMultipleCartProducts.js.map

@@ -1 +1 @@
-{"version":3,"file":"addMultipleCartProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addMultipleCartProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,IAAU,EACV,MAOC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAElC,GAAG,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE;QAC/D,MAAM;QACN,OAAO;KACR,CAAC,CAAC;IAEH,kCAAkC;IAClC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;QACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAE5D,OAAO;YACL,GAAG,IAAI;YACP,OAAO;SACR,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAE7D,yGAAyG;IACzG,OAAO,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QAC/F,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC;QACzC,IAAI,QAAQ,GAAG,CAAC;YACd,MAAM,IAAI,wBAAwB,CAAC;gBACjC,QAAQ;gBACR,SAAS,EAAE,OAAO,CAAC,GAAG;aACvB,CAAC,CAAC;QAEL,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAC5D;YACE,QAAQ;YACR,aAAa;SACd,EACD,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,OAAO,CACR,CAAC;QAEF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzB,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"addMultipleCartProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addMultipleCartProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,IAAU,EACV,MAOC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAElC,GAAG,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE;QAC/D,MAAM;QACN,OAAO;KACR,CAAC,CAAC;IAEH,kCAAkC;IAClC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;QACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAE5D,OAAO;YACL,GAAG,IAAI;YACP,OAAO;SACR,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,yGAAyG;IACzG,OAAO,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QAC/F,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC;QACzC,IAAI,QAAQ,GAAG,CAAC;YACd,MAAM,IAAI,wBAAwB,CAAC;gBACjC,QAAQ;gBACR,SAAS,EAAE,OAAO,CAAC,GAAG;aACvB,CAAC,CAAC;QAEL,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAC5D;YACE,QAAQ;YACR,aAAa;SACd,EACD,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,OAAO,CACR,CAAC;QAEF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzB,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1B,CAAC"}

package/lib/resolvers/mutations/orders/checkoutCart.d.ts

@@ -1,7 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 export default function checkoutCart(root: Root, params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
 }, context: Context): Promise<import("@unchainedshop/types/orders.js").Order>;

package/lib/resolvers/mutations/orders/checkoutCart.js

@@ -5,16 +5,17 @@ export default async function checkoutCart(root, params, context) {
     const { modules, user, userId } = context;
     const { orderId: forceOrderId, ...transactionContext } = params;
     log('mutation checkoutCart', { orderId: forceOrderId, userId });
-    const orderId = (await getOrderCart({ orderId: forceOrderId, user }, context))._id;
+    // Do not check for order status here! The checkout method will act accordingly
+    let order = await getOrderCart({ orderId: forceOrderId, user }, context);
     try {
-        const order = await modules.orders.checkout(orderId, transactionContext, context);
+        order = await modules.orders.checkout(order._id, transactionContext, context);
         return order;
     }
     catch (error) {
-        log(error.message, { userId, orderId, level: LogLevel.Error });
+        log(error.message, { userId, orderId: order._id, level: LogLevel.Error });
         throw new OrderCheckoutError({
             userId,
-            orderId,
+            orderId: order._id,
             ...transactionContext,
             detailCode: error.name || error.code,
             detailMessage: error.message,

package/lib/resolvers/mutations/orders/checkoutCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkoutCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/checkoutCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEhE,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhE,MAAM,OAAO,GAAG,CAAC,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAEnF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAClF,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,kBAAkB,CAAC;YAC3B,MAAM;YACN,OAAO;YACP,GAAG,kBAAkB;YACrB,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;YACpC,aAAa,EAAE,KAAK,CAAC,OAAO;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"checkoutCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/checkoutCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEhE,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhE,+EAA+E;IAC/E,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEzE,IAAI,CAAC;QACH,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAC9E,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,MAAM,IAAI,kBAAkB,CAAC;YAC3B,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,GAAG;YAClB,GAAG,kBAAkB;YACrB,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;YACpC,aAAa,EAAE,KAAK,CAAC,OAAO;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/orders/confirmOrder.d.ts

@@ -1,7 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 export default function confirmOrder(root: Root, params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
 }, context: Context): Promise<import("@unchainedshop/types/orders.js").Order>;

package/lib/resolvers/mutations/orders/confirmOrder.js

@@ -13,6 +13,6 @@ export default async function confirmOrder(root, params, context) {
     if (order.status !== OrderStatus.PENDING) {
         throw new OrderWrongStatusError({ status: order.status });
     }
-    return modules.orders.confirm(order._id, transactionContext, context);
+    return modules.orders.confirm(order, transactionContext, context);
 }
 //# sourceMappingURL=confirmOrder.js.map

package/lib/resolvers/mutations/orders/confirmOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirmOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/confirmOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"confirmOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/confirmOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC"}

package/lib/resolvers/mutations/orders/createCart.js

@@ -6,6 +6,6 @@ export default async function createCart(root, { orderNumber }, context) {
     const order = await modules.orders.findOrder({ orderNumber });
     if (order)
         throw new OrderNumberAlreadyExistsError({ orderNumber });
-    return services.orders.createUserCart({ user, orderNumber, countryCode: context.countryContext }, context);
+    return services.orders.nextUserCart({ user, orderNumber, countryCode: context.countryContext, forceCartCreation: true }, context);
 }
 //# sourceMappingURL=createCart.js.map

package/lib/resolvers/mutations/orders/createCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/createCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CACtC,IAAU,EACV,EAAE,WAAW,EAA2B,EACxC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACpD,GAAG,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9D,IAAI,KAAK;QAAE,MAAM,IAAI,6BAA6B,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAEpE,OAAO,QAAQ,CAAC,MAAM,CAAC,cAAc,CACnC,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,EAC1D,OAAO,CACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"createCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/createCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CACtC,IAAU,EACV,EAAE,WAAW,EAA2B,EACxC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACpD,GAAG,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9D,IAAI,KAAK;QAAE,MAAM,IAAI,6BAA6B,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAEpE,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CACjC,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,IAAI,EAAE,EACnF,OAAO,CACR,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/orders/emptyCart.js

@@ -1,12 +1,15 @@
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 export default async function emptyCart(root, { orderId }, context) {
     const { modules, userId, user } = context;
     log('mutation emptyCart', { userId, orderId });
-    const cart = await getOrderCart({ orderId, user }, context);
-    if (!cart)
+    const order = await getOrderCart({ orderId, user }, context);
+    if (!modules.orders.isCart(order))
+        throw new OrderWrongStatusError({ status: order.status });
+    if (!order)
         return null;
-    await modules.orders.positions.removePositions({ orderId: cart._id }, context);
-    return modules.orders.findOrder({ orderId: cart._id });
+    await modules.orders.positions.removePositions({ orderId: order._id }, context);
+    return modules.orders.findOrder({ orderId: order._id });
 }
 //# sourceMappingURL=emptyCart.js.map

package/lib/resolvers/mutations/orders/emptyCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"emptyCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,IAAU,EACV,EAAE,OAAO,EAAwB,EACjC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"emptyCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,IAAU,EACV,EAAE,OAAO,EAAwB,EACjC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IAChF,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;AAC1D,CAAC"}

package/lib/resolvers/mutations/orders/rejectOrder.d.ts

@@ -1,7 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 export default function rejectOrder(root: Root, params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
 }, context: Context): Promise<import("@unchainedshop/types/orders.js").Order>;

package/lib/resolvers/mutations/orders/rejectOrder.js

@@ -13,6 +13,6 @@ export default async function rejectOrder(root, params, context) {
     if (order.status !== OrderStatus.PENDING) {
         throw new OrderWrongStatusError({ status: order.status });
     }
-    return modules.orders.reject(order._id, transactionContext, context);
+    return modules.orders.reject(order, transactionContext, context);
 }
 //# sourceMappingURL=rejectOrder.js.map

package/lib/resolvers/mutations/orders/rejectOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"rejectOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/rejectOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,sBAAsB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"rejectOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/rejectOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,sBAAsB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC"}

package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js

@@ -1,8 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { PaymentProviderType } from '@unchainedshop/core-payment';
 import { OrderPaymentStatus } from '@unchainedshop/types/orders.payments.js';
-import { OrderPaymentConfigurationError, OrderPaymentNotFoundError, OrderPaymentTypeError, OrderWrongPaymentStatusError, } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderPaymentConfigurationError, OrderPaymentNotFoundError, OrderPaymentTypeError, OrderWrongPaymentStatusError, UserNoCartError, } from '../../../errors.js';
 export default async function signPaymentProviderForCheckout(root, params, context) {
     const { modules, userId } = context;
     const { orderPaymentId, transactionContext } = params;
@@ -18,7 +17,12 @@ export default async function signPaymentProviderForCheckout(root, params, conte
             throw new OrderPaymentNotFoundError({ orderPaymentId });
     }
     else {
-        const order = await getOrderCart({ user: context.user }, context);
+        const order = await modules.orders.cart({
+            countryContext: context.countryContext || context.user.lastLogin?.countryCode,
+            userId,
+        });
+        if (!order)
+            throw new UserNoCartError({ userId });
         orderPayment = await modules.orders.payments.findOrderPayment({
             orderPaymentId: order.paymentId,
         });

package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js.map

@@ -1 +1 @@
-{"version":3,"file":"signPaymentProviderForCheckout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B,CAC1D,IAAU,EACV,MAA2D,EAC3D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEtD,GAAG,CAAC,2CAA2C,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC;IAEjB,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAClE,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc,EAAE,KAAK,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,4BAA4B,CAAC;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CACtD,QAAQ,CAAC,GAAG,EACZ;YACE,MAAM;YACN,YAAY;YACZ,kBAAkB;SACnB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"signPaymentProviderForCheckout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,EAC5B,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B,CAC1D,IAAU,EACV,MAA2D,EAC3D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEtD,GAAG,CAAC,2CAA2C,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC;IAEjB,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW;YAC7E,MAAM;SACP,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc,EAAE,KAAK,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,4BAA4B,CAAC;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CACtD,QAAQ,CAAC,GAAG,EACZ;YACE,MAAM;YACN,YAAY;YACZ,kBAAkB;SACnB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/orders/updateCart.js

@@ -1,13 +1,15 @@
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 export default async function updateCart(root, params, context) {
     const { orderId, billingAddress, contact, paymentProviderId, deliveryProviderId, meta } = params;
     const { modules, userId, user } = context;
     log('mutation updateCart', { userId });
     let order = await getOrderCart({ orderId, user }, context);
+    if (!modules.orders.isCart(order))
+        throw new OrderWrongStatusError({ status: order.status });
     if (meta) {
-        await modules.orders.updateContext(order._id, meta, context);
-        order = await modules.orders.findOrder({ orderId: order._id });
+        order = await modules.orders.updateContext(order._id, meta, context);
     }
     if (billingAddress) {
         order = await modules.orders.updateBillingAddress(order._id, billingAddress, context);

package/lib/resolvers/mutations/orders/updateCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAWxD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAwB,EAAE,OAAgB;IAC7F,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAE3D,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7D,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IACxF,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACzF,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"updateCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAW3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAwB,EAAE,OAAgB;IAC7F,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IACxF,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACzF,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/resolvers/mutations/orders/updateOrderDeliveryPickUp.js

@@ -24,12 +24,9 @@ export default async function updateOrderDeliveryPickUp(root, params, context) {
             received: deliveryProviderType,
             required: DeliveryProviderType.PICKUP,
         });
-    await modules.orders.deliveries.updateContext(orderDeliveryId, {
+    return modules.orders.deliveries.updateContext(orderDeliveryId, {
         orderPickUpLocationId,
         meta,
     }, context);
-    return modules.orders.deliveries.findDelivery({
-        orderDeliveryId,
-    });
 }
 //# sourceMappingURL=updateOrderDeliveryPickUp.js.map

package/lib/resolvers/mutations/orders/updateOrderDeliveryPickUp.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateOrderDeliveryPickUp.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderDeliveryPickUp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAExG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,MAA6E,EAC7E,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAChE,GAAG,CAAC,sCAAsC,eAAe,kBAAkB,qBAAqB,EAAE,EAAE;QAClG,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QACjE,eAAe;KAChB,CAAC,CAAC;IACH,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,0BAA0B,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACnD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;KACrD,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,QAAQ,EAAE,IAAI,CAAC;IAE5C,IAAI,oBAAoB,KAAK,oBAAoB,CAAC,MAAM;QACtD,MAAM,IAAI,sBAAsB,CAAC;YAC/B,eAAe;YACf,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,oBAAoB,CAAC,MAAM;SACtC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAC3C,eAAe,EACf;QACE,qBAAqB;QACrB,IAAI;KACL,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QAC5C,eAAe;KAChB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"updateOrderDeliveryPickUp.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderDeliveryPickUp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAExG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,MAA6E,EAC7E,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAChE,GAAG,CAAC,sCAAsC,eAAe,kBAAkB,qBAAqB,EAAE,EAAE;QAClG,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QACjE,eAAe;KAChB,CAAC,CAAC;IACH,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,0BAA0B,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACnD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;KACrD,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,QAAQ,EAAE,IAAI,CAAC;IAE5C,IAAI,oBAAoB,KAAK,oBAAoB,CAAC,MAAM;QACtD,MAAM,IAAI,sBAAsB,CAAC;YAC/B,eAAe;YACf,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,oBAAoB,CAAC,MAAM;SACtC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAC5C,eAAe,EACf;QACE,qBAAqB;QACrB,IAAI;KACL,EACD,OAAO,CACR,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/orders/updateOrderDeliveryShipping.js

@@ -22,9 +22,6 @@ export default async function updateOrderDeliveryShipping(root, params, context)
             received: deliveryProviderType,
             required: DeliveryProviderType.SHIPPING,
         });
-    await modules.orders.deliveries.updateContext(orderDeliveryId, { address, meta }, context);
-    return modules.orders.deliveries.findDelivery({
-        orderDeliveryId,
-    });
+    return modules.orders.deliveries.updateContext(orderDeliveryId, { address, meta }, context);
 }
 //# sourceMappingURL=updateOrderDeliveryShipping.js.map

package/lib/resolvers/mutations/orders/updateOrderDeliveryShipping.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateOrderDeliveryShipping.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderDeliveryShipping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAExG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,2BAA2B,CACvD,IAAU,EACV,MAA4D,EAC5D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,wCAAwC,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3E,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QACjE,eAAe;KAChB,CAAC,CAAC;IACH,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,0BAA0B,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACnD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;KACrD,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,QAAQ,EAAE,IAAI,CAAC;IAE5C,IAAI,oBAAoB,KAAK,oBAAoB,CAAC,QAAQ;QACxD,MAAM,IAAI,sBAAsB,CAAC;YAC/B,eAAe;YACf,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,oBAAoB,CAAC,QAAQ;SACxC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAE3F,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QAC5C,eAAe;KAChB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"updateOrderDeliveryShipping.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderDeliveryShipping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAExG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,2BAA2B,CACvD,IAAU,EACV,MAA4D,EAC5D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,wCAAwC,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3E,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QACjE,eAAe;KAChB,CAAC,CAAC;IACH,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,0BAA0B,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACnD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;KACrD,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,QAAQ,EAAE,IAAI,CAAC;IAE5C,IAAI,oBAAoB,KAAK,oBAAoB,CAAC,QAAQ;QACxD,MAAM,IAAI,sBAAsB,CAAC;YAC/B,eAAe;YACf,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,oBAAoB,CAAC,QAAQ;SACxC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AAC9F,CAAC"}

package/lib/resolvers/mutations/orders/updateOrderPaymentCard.js

@@ -21,9 +21,6 @@ export default async function updateOrderPaymentCard(root, { orderPaymentId, met
             received: providerType,
             required: PaymentProviderType.CARD,
         });
-    await modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
-    return modules.orders.payments.findOrderPayment({
-        orderPaymentId,
-    });
+    return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
 }
 //# sourceMappingURL=updateOrderPaymentCard.js.map

package/lib/resolvers/mutations/orders/updateOrderPaymentCard.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateOrderPaymentCard.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderPaymentCard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAClD,IAAU,EACV,EAAE,cAAc,EAAE,IAAI,EAA0C,EAChE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,mCAAmC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,IAAI;QAC3C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,IAAI;SACnC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEjF,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC9C,cAAc;KACf,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"updateOrderPaymentCard.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderPaymentCard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAClD,IAAU,EACV,EAAE,cAAc,EAAE,IAAI,EAA0C,EAChE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,mCAAmC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,IAAI;QAC3C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,IAAI;SACnC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AACpF,CAAC"}

package/lib/resolvers/mutations/orders/updateOrderPaymentGeneric.js

@@ -23,9 +23,6 @@ export default async function updateOrderPaymentGeneric(root, { orderPaymentId,
             received: providerType,
             required: PaymentProviderType.GENERIC,
         });
-    await modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
-    return modules.orders.payments.findOrderPayment({
-        orderPaymentId,
-    });
+    return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
 }
 //# sourceMappingURL=updateOrderPaymentGeneric.js.map

package/lib/resolvers/mutations/orders/updateOrderPaymentGeneric.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateOrderPaymentGeneric.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderPaymentGeneric.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,EAAE,cAAc,EAAE,IAAI,EAA0C,EAChE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,GAAG,CAAC,sCAAsC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE;QAClF,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEjF,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC9C,cAAc;KACf,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"updateOrderPaymentGeneric.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderPaymentGeneric.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,EAAE,cAAc,EAAE,IAAI,EAA0C,EAChE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,GAAG,CAAC,sCAAsC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE;QAClF,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AACpF,CAAC"}

package/lib/resolvers/mutations/orders/updateOrderPaymentInvoice.js

@@ -23,9 +23,6 @@ export default async function updateOrderPaymentInvoice(root, { orderPaymentId,
             received: providerType,
             required: PaymentProviderType.INVOICE,
         });
-    await modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
-    return modules.orders.payments.findOrderPayment({
-        orderPaymentId,
-    });
+    return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
 }
 //# sourceMappingURL=updateOrderPaymentInvoice.js.map

package/lib/resolvers/mutations/orders/updateOrderPaymentInvoice.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateOrderPaymentInvoice.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderPaymentInvoice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,EAAE,cAAc,EAAE,IAAI,EAA0C,EAChE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,GAAG,CAAC,sCAAsC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE;QAClF,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEjF,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC9C,cAAc;KACf,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"updateOrderPaymentInvoice.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateOrderPaymentInvoice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,EAAE,cAAc,EAAE,IAAI,EAA0C,EAChE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,GAAG,CAAC,sCAAsC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE;QAClF,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AACpF,CAAC"}

package/lib/resolvers/mutations/utils/getOrderCart.js

@@ -1,18 +1,13 @@
-import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError } from '../../../errors.js';
 export const getOrderCart = async (params, context) => {
-    const { countryContext, modules, services } = context;
+    const { modules, services } = context;
     const { orderId, user } = params;
     if (orderId) {
         const order = await modules.orders.findOrder({ orderId });
         if (!order)
             throw new OrderNotFoundError({ orderId });
-        if (!modules.orders.isCart(order))
-            throw new OrderWrongStatusError({ status: order.status });
         return order;
     }
-    const cart = await modules.orders.cart({ countryContext }, user);
-    if (cart)
-        return cart;
-    return services.orders.createUserCart({ user, countryCode: context.countryContext }, context);
+    return services.orders.nextUserCart({ user, countryCode: context.countryContext, forceCartCreation: true }, context);
 };
 //# sourceMappingURL=getOrderCart.js.map

package/lib/resolvers/mutations/utils/getOrderCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOrderCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/utils/getOrderCart.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAwC,EAAE,OAAgB,EAAE,EAAE;IAC/F,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7F,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC;IACjE,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAEtB,OAAO,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;AAChG,CAAC,CAAC"}
+{"version":3,"file":"getOrderCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/utils/getOrderCart.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAwC,EAAE,OAAgB,EAAE,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CACjC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,IAAI,EAAE,EACtE,OAAO,CACR,CAAC;AACJ,CAAC,CAAC"}

package/lib/resolvers/type/user-types.js

@@ -58,17 +58,21 @@ export const User = {
     async cart(user, params, context) {
         const { modules, countryContext } = context;
         await checkAction(context, viewUserOrders, [user, params]);
-        return modules.orders.cart({ countryContext, orderNumber: params.orderNumber }, user);
+        return modules.orders.cart({
+            countryContext: countryContext || user.lastLogin?.countryCode,
+            orderNumber: params.orderNumber,
+            userId: user._id,
+        });
     },
     async tokens(user, params, context) {
         await checkAction(context, viewUserPrivateInfos, [user, params]);
         return context.modules.warehousing.findTokensForUser(user);
     },
-    country: async (user, params, context) => {
+    async country(user, params, context) {
         await checkAction(context, viewUserPrivateInfos, [user, params]);
         return context.services.users.getUserCountry(user, context);
     },
-    enrollments: async (user, params, context) => {
+    async enrollments(user, params, context) {
         await checkAction(context, viewUserEnrollments, [user, params]);
         return context.modules.enrollments.findEnrollments({
             ...(params || {}),

package/lib/resolvers/type/user-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAwE/C,MAAM,EACJ,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,GACvB,GAAG,OAAiC,CAAC;AAEtC,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE;IACzC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACxG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAoB;IACnC,GAAG,EAAE,iBAAiB,CAAC,mBAAmB,EAAE,KAAK,CAAC;IAClD,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,MAAM,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,QAAQ,CAAC;IACzD,kBAAkB,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACjF,WAAW,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,aAAa,CAAC;IACnE,SAAS,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,WAAW,CAAC;IAC/D,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,KAAK,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvD,IAAI,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACrD,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,UAAU,CAAC;IAE7D,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACpC,MAAM,WAAW,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAEhE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE;YAAE,OAAO,OAAO,CAAC,WAAW,CAAC;QAE7F,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,YAAY,EAAE,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC;IAC3C,CAAC;IAED,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC5C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACjD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,MAAM,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC;IAC3C,CAAC;IACD,kBAAkB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,MAAM,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QACjF,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACvC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtC,MAAM,WAAW,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAChE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;YAC7B,MAAM,EAAE,IAAI,CAAC,QAAQ;SACtB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACzC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QAC9B,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;QAC5C,MAAM,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QAChC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACvC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3C,MAAM,WAAW,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAChE,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC;YACjD,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACxC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC9C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAEjE,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClE,OAAO,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAsB,CAAC;IACpE,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtC,MAAM,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YACvC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CACtE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EACxC;YACE,IAAI,EAAE;gBACJ,OAAO,EAAE,CAAC,CAAC;aACZ;SACF,CACF,CAAC;IACJ,CAAC;IAED,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACnD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE,CAAC;IACvC,CAAC;IAED,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;IACnC,CAAC;IACD,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC1C,MAAM,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;YAC/C,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IACD,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QAC5C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7F,GAAG,EAAE,IAAI,CAAC,MAAM;YAChB,SAAS;YACT,cAAc;YACd,QAAQ;SACT,CAAC,CAAC,CAAC;IACN,CAAC;IACD,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;YACjF,OAAQ,QAAgB,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAC9C,QAAQ;gBACR,GAAI,YAAoB;aACzB,CAAC,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QACjC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,WAAW,CAAC,OAAO,EAAE,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC;YACjD,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,QAAQ,EAAE,IAAI,CAAC,GAAG;SACnB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QACtC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,WAAW,CAAC,OAAO,EAAE,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YACpC,QAAQ,EAAE,IAAI,CAAC,GAAG;SACnB,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"user-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"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"}

package/lib/schema/mutation.js

@@ -193,7 +193,7 @@ export default [
       Process the checkout (automatically charge & deliver if possible), the cart will get
       transformed to an ordinary order if everything goes well.
       """
-      checkoutCart(orderId: ID, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      checkoutCart(orderId: ID, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Change the quantity or configuration of an item in an open order.align-baselineAll
@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.9.4",
+  "version": "2.10.0",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -48,11 +48,11 @@
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.2",
-    "@unchainedshop/core": "^2.9.4",
-    "@unchainedshop/events": "^2.9.4",
-    "@unchainedshop/logger": "^2.9.4",
-    "@unchainedshop/roles": "^2.9.4",
-    "@unchainedshop/utils": "^2.9.4",
+    "@unchainedshop/core": "^2.10.0",
+    "@unchainedshop/events": "^2.10.0",
+    "@unchainedshop/logger": "^2.10.0",
+    "@unchainedshop/roles": "^2.10.0",
+    "@unchainedshop/utils": "^2.10.0",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
@@ -65,7 +65,7 @@
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
     "@types/node": "^20.12.13",
-    "@unchainedshop/types": "^2.9.4",
+    "@unchainedshop/types": "^2.10.0",
     "express": "^4.19.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.4",

package/src/resolvers/mutations/orders/addCartDiscount.ts

@@ -1,6 +1,7 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function addCartDiscount(
   root: Root,
@@ -11,7 +12,9 @@ export default async function addCartDiscount(
 
   log(`mutation addCartDiscount ${code} ${orderId}`, { userId, orderId });
 
-  const cart = await getOrderCart({ orderId, user }, context);
+  const order = await getOrderCart({ orderId, user }, context);
 
-  return modules.orders.discounts.createManualOrderDiscount({ order: cart, code }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
+  return modules.orders.discounts.createManualOrderDiscount({ order, code }, context);
 }

package/src/resolvers/mutations/orders/addCartProduct.ts

@@ -1,6 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
-import { ProductNotFoundError, OrderQuantityTooLowError, InvalidIdError } from '../../../errors.js';
+import {
+  ProductNotFoundError,
+  OrderQuantityTooLowError,
+  InvalidIdError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addCartProduct(
@@ -24,6 +29,8 @@ export default async function addCartProduct(
   if (!product) throw new ProductNotFoundError({ productId });
 
   const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
   const orderPosition = await modules.orders.positions.addProductItem(
     {
       quantity,

package/src/resolvers/mutations/orders/addCartQuotation.ts

@@ -7,6 +7,7 @@ import {
   QuotationWrongStatusError,
   OrderQuantityTooLowError,
   InvalidIdError,
+  OrderWrongStatusError,
 } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
@@ -42,6 +43,8 @@ export default async function addCartQuotation(
   }
 
   const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
   const product = await modules.products.findProduct({
     productId: quotation.productId,
   });

package/src/resolvers/mutations/orders/addMultipleCartProducts.ts

@@ -1,7 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { Configuration } from '@unchainedshop/types/common.js';
-import { ProductNotFoundError, OrderQuantityTooLowError } from '../../../errors.js';
+import {
+  ProductNotFoundError,
+  OrderQuantityTooLowError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addMultipleCartProducts(
@@ -38,6 +42,7 @@ export default async function addMultipleCartProducts(
   );
 
   const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   // Reduce is used to wait for each product to be added before processing the next (sequential processing)
   return itemsWithProducts.reduce(async (positionsPromise, { product, quantity, configuration }) => {

package/src/resolvers/mutations/orders/checkoutCart.ts

@@ -7,7 +7,6 @@ export default async function checkoutCart(
   root: Root,
   params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
   },
@@ -18,16 +17,17 @@ export default async function checkoutCart(
 
   log('mutation checkoutCart', { orderId: forceOrderId, userId });
 
-  const orderId = (await getOrderCart({ orderId: forceOrderId, user }, context))._id;
+  // Do not check for order status here! The checkout method will act accordingly
+  let order = await getOrderCart({ orderId: forceOrderId, user }, context);
 
   try {
-    const order = await modules.orders.checkout(orderId, transactionContext, context);
+    order = await modules.orders.checkout(order._id, transactionContext, context);
     return order;
   } catch (error) {
-    log(error.message, { userId, orderId, level: LogLevel.Error });
+    log(error.message, { userId, orderId: order._id, level: LogLevel.Error });
     throw new OrderCheckoutError({
       userId,
-      orderId,
+      orderId: order._id,
       ...transactionContext,
       detailCode: error.name || error.code,
       detailMessage: error.message,

package/src/resolvers/mutations/orders/confirmOrder.ts

@@ -7,7 +7,6 @@ export default async function confirmOrder(
   root: Root,
   params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
   },
@@ -27,5 +26,5 @@ export default async function confirmOrder(
     throw new OrderWrongStatusError({ status: order.status });
   }
 
-  return modules.orders.confirm(order._id, transactionContext, context);
+  return modules.orders.confirm(order, transactionContext, context);
 }

package/src/resolvers/mutations/orders/createCart.ts

@@ -13,8 +13,8 @@ export default async function createCart(
   const order = await modules.orders.findOrder({ orderNumber });
   if (order) throw new OrderNumberAlreadyExistsError({ orderNumber });
 
-  return services.orders.createUserCart(
-    { user, orderNumber, countryCode: context.countryContext },
+  return services.orders.nextUserCart(
+    { user, orderNumber, countryCode: context.countryContext, forceCartCreation: true },
     context,
   );
 }

package/src/resolvers/mutations/orders/emptyCart.ts

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function emptyCart(
   root: Root,
@@ -11,9 +12,11 @@ export default async function emptyCart(
 
   log('mutation emptyCart', { userId, orderId });
 
-  const cart = await getOrderCart({ orderId, user }, context);
-  if (!cart) return null;
+  const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
-  await modules.orders.positions.removePositions({ orderId: cart._id }, context);
-  return modules.orders.findOrder({ orderId: cart._id });
+  if (!order) return null;
+
+  await modules.orders.positions.removePositions({ orderId: order._id }, context);
+  return modules.orders.findOrder({ orderId: order._id });
 }

package/src/resolvers/mutations/orders/rejectOrder.ts

@@ -7,7 +7,6 @@ export default async function rejectOrder(
   root: Root,
   params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
   },
@@ -25,5 +24,5 @@ export default async function rejectOrder(
   if (order.status !== OrderStatus.PENDING) {
     throw new OrderWrongStatusError({ status: order.status });
   }
-  return modules.orders.reject(order._id, transactionContext, context);
+  return modules.orders.reject(order, transactionContext, context);
 }

package/src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts

@@ -7,8 +7,8 @@ import {
   OrderPaymentNotFoundError,
   OrderPaymentTypeError,
   OrderWrongPaymentStatusError,
+  UserNoCartError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function signPaymentProviderForCheckout(
   root: Root,
@@ -30,7 +30,11 @@ export default async function signPaymentProviderForCheckout(
     });
     if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
   } else {
-    const order = await getOrderCart({ user: context.user }, context);
+    const order = await modules.orders.cart({
+      countryContext: context.countryContext || context.user.lastLogin?.countryCode,
+      userId,
+    });
+    if (!order) throw new UserNoCartError({ userId });
     orderPayment = await modules.orders.payments.findOrderPayment({
       orderPaymentId: order.paymentId,
     });

package/src/resolvers/mutations/orders/updateCart.ts

@@ -2,6 +2,7 @@ import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { Address, Contact } from '@unchainedshop/types/common.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 
 interface UpdateCartParams {
   orderId?: string;
@@ -20,10 +21,10 @@ export default async function updateCart(root: Root, params: UpdateCartParams, c
   log('mutation updateCart', { userId });
 
   let order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (meta) {
-    await modules.orders.updateContext(order._id, meta, context);
-    order = await modules.orders.findOrder({ orderId: order._id });
+    order = await modules.orders.updateContext(order._id, meta, context);
   }
 
   if (billingAddress) {

package/src/resolvers/mutations/orders/updateOrderDeliveryPickUp.ts

@@ -33,7 +33,7 @@ export default async function updateOrderDeliveryPickUp(
       required: DeliveryProviderType.PICKUP,
     });
 
-  await modules.orders.deliveries.updateContext(
+  return modules.orders.deliveries.updateContext(
     orderDeliveryId,
     {
       orderPickUpLocationId,
@@ -41,8 +41,4 @@ export default async function updateOrderDeliveryPickUp(
     },
     context,
   );
-
-  return modules.orders.deliveries.findDelivery({
-    orderDeliveryId,
-  });
 }

package/src/resolvers/mutations/orders/updateOrderDeliveryShipping.ts

@@ -32,9 +32,5 @@ export default async function updateOrderDeliveryShipping(
       required: DeliveryProviderType.SHIPPING,
     });
 
-  await modules.orders.deliveries.updateContext(orderDeliveryId, { address, meta }, context);
-
-  return modules.orders.deliveries.findDelivery({
-    orderDeliveryId,
-  });
+  return modules.orders.deliveries.updateContext(orderDeliveryId, { address, meta }, context);
 }

package/src/resolvers/mutations/orders/updateOrderPaymentCard.ts

@@ -31,9 +31,5 @@ export default async function updateOrderPaymentCard(
       required: PaymentProviderType.CARD,
     });
 
-  await modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
-
-  return modules.orders.payments.findOrderPayment({
-    orderPaymentId,
-  });
+  return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
 }

package/src/resolvers/mutations/orders/updateOrderPaymentGeneric.ts

@@ -32,9 +32,5 @@ export default async function updateOrderPaymentGeneric(
       required: PaymentProviderType.GENERIC,
     });
 
-  await modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
-
-  return modules.orders.payments.findOrderPayment({
-    orderPaymentId,
-  });
+  return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
 }

package/src/resolvers/mutations/orders/updateOrderPaymentInvoice.ts

@@ -32,9 +32,5 @@ export default async function updateOrderPaymentInvoice(
       required: PaymentProviderType.INVOICE,
     });
 
-  await modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
-
-  return modules.orders.payments.findOrderPayment({
-    orderPaymentId,
-  });
+  return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
 }

package/src/resolvers/mutations/utils/getOrderCart.ts

@@ -1,21 +1,19 @@
 import { Context } from '@unchainedshop/types/api.js';
 import { User } from '@unchainedshop/types/user.js';
-import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError } from '../../../errors.js';
 
 export const getOrderCart = async (params: { orderId?: string; user: User }, context: Context) => {
-  const { countryContext, modules, services } = context;
+  const { modules, services } = context;
   const { orderId, user } = params;
 
   if (orderId) {
     const order = await modules.orders.findOrder({ orderId });
     if (!order) throw new OrderNotFoundError({ orderId });
-
-    if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
     return order;
   }
 
-  const cart = await modules.orders.cart({ countryContext }, user);
-  if (cart) return cart;
-
-  return services.orders.createUserCart({ user, countryCode: context.countryContext }, context);
+  return services.orders.nextUserCart(
+    { user, countryCode: context.countryContext, forceCartCreation: true },
+    context,
+  );
 };

package/src/resolvers/type/user-types.ts

@@ -167,7 +167,11 @@ export const User: UserHelperTypes = {
   async cart(user, params, context) {
     const { modules, countryContext } = context;
     await checkAction(context, viewUserOrders, [user, params]);
-    return modules.orders.cart({ countryContext, orderNumber: params.orderNumber }, user);
+    return modules.orders.cart({
+      countryContext: countryContext || user.lastLogin?.countryCode,
+      orderNumber: params.orderNumber,
+      userId: user._id,
+    });
   },
 
   async tokens(user, params, context) {
@@ -175,12 +179,12 @@ export const User: UserHelperTypes = {
     return context.modules.warehousing.findTokensForUser(user);
   },
 
-  country: async (user, params, context) => {
+  async country(user, params, context) {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
     return context.services.users.getUserCountry(user, context);
   },
 
-  enrollments: async (user, params, context) => {
+  async enrollments(user, params, context) {
     await checkAction(context, viewUserEnrollments, [user, params]);
     return context.modules.enrollments.findEnrollments({
       ...(params || {}),

package/src/schema/mutation.ts

@@ -193,7 +193,7 @@ export default [
       Process the checkout (automatically charge & deliver if possible), the cart will get
       transformed to an ordinary order if everything goes well.
       """
-      checkoutCart(orderId: ID, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      checkoutCart(orderId: ID, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Change the quantity or configuration of an item in an open order.align-baselineAll
@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid