@unchainedshop/api 2.4.3 → 2.5.1

package/lib/resolvers/type/order/order-item-types.d.ts

@@ -22,8 +22,11 @@ export interface OrderItemHelperTypes {
     quotation: HelperType<never, Promise<Quotation>>;
     total: HelperType<{
         category: string;
+        useNetPrice: boolean;
+    }, Promise<OrderPrice>>;
+    unitPrice: HelperType<{
+        useNetPrice: boolean;
     }, Promise<OrderPrice>>;
-    unitPrice: HelperType<never, Promise<OrderPrice>>;
 }
 export declare const OrderItem: OrderItemHelperTypes;
 export {};

package/lib/resolvers/type/order/order-item-types.js

@@ -71,30 +71,24 @@ export const OrderItem = {
             return null;
         return modules.quotations.findQuotation({ quotationId: obj.quotationId });
     },
-    total: async (obj, { category }, context) => {
+    total: async (obj, params, context) => {
         const pricingSheet = await getPricingSheet(obj, context);
         if (pricingSheet.isValid()) {
-            const { amount, currency } = pricingSheet.total({
-                category,
-                useNetPrice: false,
-            });
+            const price = pricingSheet.total(params);
             return {
                 _id: crypto
                     .createHash('sha256')
-                    .update([`${obj._id}-${category}`, amount, currency].join(''))
+                    .update([obj._id, JSON.stringify(params), JSON.stringify(price)].join(''))
                     .digest('hex'),
-                amount,
-                currency,
+                ...price,
             };
         }
         return null;
     },
-    unitPrice: async (obj, _, context) => {
+    unitPrice: async (obj, params, context) => {
         const pricingSheet = await getPricingSheet(obj, context);
         if (pricingSheet.isValid()) {
-            const price = pricingSheet.unitPrice({
-                useNetPrice: false,
-            });
+            const price = pricingSheet.unitPrice(params);
             return {
                 _id: crypto
                     .createHash('sha256')

package/lib/resolvers/type/order/order-item-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-item-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-item-types.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/type/order/order-types.d.ts

@@ -25,6 +25,7 @@ export interface OrderHelperTypes {
     status: HelperType<never, string>;
     total: HelperType<{
         category: string;
+        useNetPrice: boolean;
     }, Promise<OrderPrice>>;
     user: HelperType<never, Promise<User>>;
 }

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

@@ -30,11 +30,11 @@ export const Order = {
     total: async (obj, params, { modules }) => {
         const pricingSheet = modules.orders.pricingSheet(obj);
         if (pricingSheet.isValid()) {
-            const price = pricingSheet.total({ category: params.category, useNetPrice: false });
+            const price = pricingSheet.total(params);
             return {
                 _id: crypto
                     .createHash('sha256')
-                    .update([obj._id, price.amount, price.currency].join(''))
+                    .update([obj._id, JSON.stringify(params), JSON.stringify(price)].join(''))
                     .digest('hex'),
                 ...price,
             };

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

@@ -1 +1 @@
-{"version":3,"file":"order-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"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"}

package/lib/schema/types/order/item.js

@@ -24,8 +24,8 @@ export default [
       quantity: Int!
       originalProduct: Product!
       quotation: Quotation
-      unitPrice: Price
-      total(category: OrderItemPriceCategory): Price
+      unitPrice(useNetPrice: Boolean = false): Price
+      total(category: OrderItemPriceCategory, useNetPrice: Boolean = false): Price
       discounts: [OrderItemDiscount!]
       dispatches: [Dispatch!]
       configuration: [ProductConfigurationParameter!]

package/lib/schema/types/order/order.js

@@ -77,7 +77,7 @@ export default [
       status: OrderStatus
       supportedDeliveryProviders: [DeliveryProvider!]!
       supportedPaymentProviders: [PaymentProvider!]!
-      total(category: OrderPriceCategory): Price
+      total(category: OrderPriceCategory, useNetPrice: Boolean = false): Price
       updated: DateTime
       user: User
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.4.3",
+  "version": "2.5.1",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -48,12 +48,12 @@
     "express": "^4.18.2"
   },
   "dependencies": {
-    "@metamask/eth-sig-util": "^6.0.0",
-    "@unchainedshop/core": "^2.4.3",
-    "@unchainedshop/events": "^2.4.3",
-    "@unchainedshop/logger": "^2.4.3",
-    "@unchainedshop/roles": "^2.4.3",
-    "@unchainedshop/utils": "^2.4.3",
+    "@metamask/eth-sig-util": "^6.0.1",
+    "@unchainedshop/core": "^2.5.1",
+    "@unchainedshop/events": "^2.5.1",
+    "@unchainedshop/logger": "^2.5.1",
+    "@unchainedshop/roles": "^2.5.1",
+    "@unchainedshop/utils": "^2.5.1",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.22.2",
@@ -65,8 +65,8 @@
   "devDependencies": {
     "@types/graphql-upload": "^16.0.1",
     "@types/locale": "^0.1.2",
-    "@types/node": "^18.17.14",
-    "@unchainedshop/types": "^2.4.3",
+    "@types/node": "^18.17.15",
+    "@unchainedshop/types": "^2.5.1",
     "express": "^4.18.2",
     "graphql": "^16.8.0",
     "jest": "^29.6.4",

package/src/resolvers/type/order/order-item-types.ts

@@ -28,8 +28,8 @@ export interface OrderItemHelperTypes {
   originalProduct: HelperType<never, Promise<Product>>;
   product: HelperType<never, Promise<Product>>;
   quotation: HelperType<never, Promise<Quotation>>;
-  total: HelperType<{ category: string }, Promise<OrderPrice>>;
-  unitPrice: HelperType<never, Promise<OrderPrice>>;
+  total: HelperType<{ category: string; useNetPrice: boolean }, Promise<OrderPrice>>;
+  unitPrice: HelperType<{ useNetPrice: boolean }, Promise<OrderPrice>>;
 }
 
 const getPricingSheet = async (orderPosition: OrderPosition, context: Context) => {
@@ -118,33 +118,27 @@ export const OrderItem: OrderItemHelperTypes = {
     return modules.quotations.findQuotation({ quotationId: obj.quotationId });
   },
 
-  total: async (obj, { category }, context) => {
+  total: async (obj, params, context) => {
     const pricingSheet = await getPricingSheet(obj, context);
 
     if (pricingSheet.isValid()) {
-      const { amount, currency } = pricingSheet.total({
-        category,
-        useNetPrice: false,
-      });
+      const price = pricingSheet.total(params);
       return {
         _id: crypto
           .createHash('sha256')
-          .update([`${obj._id}-${category}`, amount, currency].join(''))
+          .update([obj._id, JSON.stringify(params), JSON.stringify(price)].join(''))
           .digest('hex'),
-        amount,
-        currency,
+        ...price,
       };
     }
     return null;
   },
 
-  unitPrice: async (obj, _, context) => {
+  unitPrice: async (obj, params, context) => {
     const pricingSheet = await getPricingSheet(obj, context);
 
     if (pricingSheet.isValid()) {
-      const price = pricingSheet.unitPrice({
-        useNetPrice: false,
-      });
+      const price = pricingSheet.unitPrice(params);
       return {
         _id: crypto
           .createHash('sha256')

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

@@ -26,7 +26,7 @@ export interface OrderHelperTypes {
   payment: HelperType<never, Promise<OrderPayment>>;
   items: HelperType<never, Promise<Array<OrderPosition>>>;
   status: HelperType<never, string>;
-  total: HelperType<{ category: string }, Promise<OrderPrice>>;
+  total: HelperType<{ category: string; useNetPrice: boolean }, Promise<OrderPrice>>;
   user: HelperType<never, Promise<User>>;
 }
 
@@ -80,16 +80,15 @@ export const Order: OrderHelperTypes = {
     return obj.status;
   },
 
-  total: async (obj, params: { category: string }, { modules }) => {
+  total: async (obj, params, { modules }) => {
     const pricingSheet = modules.orders.pricingSheet(obj);
 
     if (pricingSheet.isValid()) {
-      const price = pricingSheet.total({ category: params.category, useNetPrice: false });
-
+      const price = pricingSheet.total(params);
       return {
         _id: crypto
           .createHash('sha256')
-          .update([obj._id, price.amount, price.currency].join(''))
+          .update([obj._id, JSON.stringify(params), JSON.stringify(price)].join(''))
           .digest('hex'),
         ...price,
       };

package/src/schema/types/order/item.ts

@@ -24,8 +24,8 @@ export default [
       quantity: Int!
       originalProduct: Product!
       quotation: Quotation
-      unitPrice: Price
-      total(category: OrderItemPriceCategory): Price
+      unitPrice(useNetPrice: Boolean = false): Price
+      total(category: OrderItemPriceCategory, useNetPrice: Boolean = false): Price
       discounts: [OrderItemDiscount!]
       dispatches: [Dispatch!]
       configuration: [ProductConfigurationParameter!]

package/src/schema/types/order/order.ts

@@ -77,7 +77,7 @@ export default [
       status: OrderStatus
       supportedDeliveryProviders: [DeliveryProvider!]!
       supportedPaymentProviders: [PaymentProvider!]!
-      total(category: OrderPriceCategory): Price
+      total(category: OrderPriceCategory, useNetPrice: Boolean = false): Price
       updated: DateTime
       user: User
     }