@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/graphql/pages/global/bodyParser[buildQuery].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any, next: any): void;
+declare const _default: (request: any, response: any, next: any) => void;
 export default _default;

package/dist/modules/graphql/pages/global/bodyParser[buildQuery].js.map

@@ -1 +1 @@
-{"version":3,"file":"bodyParser[buildQuery].js","sourceRoot":"","sources":["../../../../../src/modules/graphql/pages/global/bodyParser[buildQuery].js"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE;QAC1D,UAAU,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"bodyParser[buildQuery].js","sourceRoot":"","sources":["../../../../../src/modules/graphql/pages/global/bodyParser[buildQuery].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE;QAC1D,UAAU,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/modules/oms/api/createShipment/[context]borderParser[auth].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any, next: any): void;
+declare const _default: (request: any, response: any, next: any) => void;
 export default _default;

package/dist/modules/oms/api/createShipment/[context]borderParser[auth].js.map

@@ -1 +1 @@
-{"version":3,"file":"[context]borderParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/createShipment/[context]borderParser[auth].js"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}
+{"version":3,"file":"[context]borderParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/createShipment/[context]borderParser[auth].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}

package/dist/modules/oms/api/createShipment/createShipment.d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/oms/api/createShipment/createShipment.js

@@ -1,70 +1,25 @@
-import { commit, insert, rollback, select, startTransaction } from '@evershop/postgres-query-builder';
-import { getConnection, pool } from '../../../../lib/postgres/connection.js';
-import { INTERNAL_SERVER_ERROR, INVALID_PAYLOAD, OK } from '../../../../lib/util/httpStatus.js';
-import { updateShipmentStatus } from '../../services/updateShipmentStatus.js';
+import { rollback, startTransaction } from '@evershop/postgres-query-builder';
+import { debug } from '../../../../lib/log/logger.js';
+import { getConnection } from '../../../../lib/postgres/connection.js';
+import { INTERNAL_SERVER_ERROR, OK } from '../../../../lib/util/httpStatus.js';
+import createShipment from '../../services/createShipment.js';
 export default async (request, response, next) => {
     const connection = await getConnection();
     await startTransaction(connection);
-    const { id } = request.params;
+    const { id } = Array.isArray(request.params.id)
+        ? { id: request.params.id[0] }
+        : { id: request.params.id };
     const { carrier, tracking_number } = request.body;
     try {
-        const order = await select()
-            .from('order')
-            .where('uuid', '=', id)
-            .load(connection);
-        if (!order) {
-            response.status(INVALID_PAYLOAD);
-            response.json({
-                error: {
-                    status: INVALID_PAYLOAD,
-                    message: 'Invalid order id'
-                }
-            });
-            return;
-        }
-        const shipment = await select()
-            .from('shipment')
-            .where('shipment_order_id', '=', order.order_id)
-            .load(connection);
-        if (shipment) {
-            response.status(INVALID_PAYLOAD);
-            response.json({
-                error: {
-                    status: INVALID_PAYLOAD,
-                    message: 'Shipment was created'
-                }
-            });
-            return;
-        }
-        const result = await insert('shipment')
-            .given({
-            shipment_order_id: order.order_id,
-            carrier,
-            tracking_number
-        })
-            .execute(connection);
-        /* Update Shipment status to shipped */
-        await updateShipmentStatus(order.order_id, 'shipped', connection);
-        /* Add an activity log message */
-        await insert('order_activity')
-            .given({
-            order_activity_order_id: order.order_id,
-            comment: 'Order was shipped',
-            customer_notified: 0 // TODO: Send email to customer for shipment
-        })
-            .execute(connection);
-        await commit(connection);
-        const shipmentData = await select()
-            .from('shipment')
-            .where('shipment_id', '=', result.insertId)
-            .load(pool);
+        const shipment = await createShipment(id, carrier, tracking_number);
         response.status(OK);
         response.$body = {
-            data: shipmentData
+            data: shipment
         };
         next();
     }
     catch (e) {
+        debug(e);
         await rollback(connection);
         response.status(INTERNAL_SERVER_ERROR);
         response.json({

package/dist/modules/oms/api/createShipment/createShipment.js.map

@@ -1 +1 @@
-{"version":3,"file":"createShipment.js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/createShipment/createShipment.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"createShipment.js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/createShipment/createShipment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,MAAM,oCAAoC,CAAC;AAG/E,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAE9D,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IACzC,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7C,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QAC9B,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAClD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QACpE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,QAAQ,CAAC,KAAK,GAAG;YACf,IAAI,EAAE,QAAQ;SACf,CAAC;QACF,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,CAAC,CAAC,CAAC;QACT,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC3B,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM,EAAE,qBAAqB;gBAC7B,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/oms/api/markDelivered/[context]bodyParser[auth].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any, next: any): void;
+declare const _default: (request: any, response: any, next: any) => void;
 export default _default;

package/dist/modules/oms/api/markDelivered/[context]bodyParser[auth].js.map

@@ -1 +1 @@
-{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/markDelivered/[context]bodyParser[auth].js"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}
+{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/markDelivered/[context]bodyParser[auth].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}

package/dist/modules/oms/api/markDelivered/markDelivered.d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/oms/api/markDelivered/markDelivered.js

@@ -1,6 +1,7 @@
-import { commit, insert, rollback, select, startTransaction } from '@evershop/postgres-query-builder';
+import { commit, rollback, select, startTransaction } from '@evershop/postgres-query-builder';
 import { getConnection } from '../../../../lib/postgres/connection.js';
 import { INTERNAL_SERVER_ERROR, INVALID_PAYLOAD, OK } from '../../../../lib/util/httpStatus.js';
+import addOrderActivityLog from '../../services/addOrderActivityLog.js';
 import { updateShipmentStatus } from '../../services/updateShipmentStatus.js';
 export default async (request, response, next) => {
     const connection = await getConnection();
@@ -37,13 +38,7 @@ export default async (request, response, next) => {
         }
         await updateShipmentStatus(order_id, 'delivered', connection);
         /* Add an activity log message */
-        await insert('order_activity')
-            .given({
-            order_activity_order_id: order.order_id,
-            comment: 'Order delivered',
-            customer_notified: 0 // TODO: Add customer notification
-        })
-            .execute(connection);
+        await addOrderActivityLog(order.order_id, 'Order delivered', false, connection);
         await commit(connection);
         response.status(OK);
         response.$body = {

package/dist/modules/oms/api/markDelivered/markDelivered.js.map

@@ -1 +1 @@
-{"version":3,"file":"markDelivered.js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/markDelivered/markDelivered.js"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAE9E,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IACzC,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE;aACzB,IAAI,CAAC,OAAO,CAAC;aACb,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC;aAChC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEpB,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,kBAAkB;iBAC5B;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,MAAM,EAAE;aAC5B,IAAI,CAAC,UAAU,CAAC;aAChB,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,QAAQ,CAAC;aACzC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEpB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,0BAA0B;iBACpC;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;QAC9D,iCAAiC;QACjC,MAAM,MAAM,CAAC,gBAAgB,CAAC;aAC3B,KAAK,CAAC;YACL,uBAAuB,EAAE,KAAK,CAAC,QAAQ;YACvC,OAAO,EAAE,iBAAiB;YAC1B,iBAAiB,EAAE,CAAC,CAAC,kCAAkC;SACxD,CAAC;aACD,OAAO,CAAC,UAAU,CAAC,CAAC;QAEvB,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,QAAQ,CAAC,KAAK,GAAG;YACf,IAAI,EAAE;gBACJ,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,WAAW,EAAE,QAAQ,CAAC,WAAW;aAClC;SACF,CAAC;QACF,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC3B,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM,EAAE,qBAAqB;gBAC7B,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"markDelivered.js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/markDelivered/markDelivered.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,QAAQ,EACR,MAAM,EACN,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAG5C,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAE9E,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IACzC,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE;aACzB,IAAI,CAAC,OAAO,CAAC;aACb,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC;aAChC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEpB,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,kBAAkB;iBAC5B;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,MAAM,EAAE;aAC5B,IAAI,CAAC,UAAU,CAAC;aAChB,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,QAAQ,CAAC;aACzC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEpB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,0BAA0B;iBACpC;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;QAC9D,iCAAiC;QACjC,MAAM,mBAAmB,CACvB,KAAK,CAAC,QAAQ,EACd,iBAAiB,EACjB,KAAK,EACL,UAAU,CACX,CAAC;QACF,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,QAAQ,CAAC,KAAK,GAAG;YACf,IAAI,EAAE;gBACJ,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,WAAW,EAAE,QAAQ,CAAC,WAAW;aAClC;SACF,CAAC;QACF,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC3B,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM,EAAE,qBAAqB;gBAC7B,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/oms/api/updateShipment/[context]bodyParser[auth].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any, next: any): void;
+declare const _default: (request: any, response: any, next: any) => void;
 export default _default;

package/dist/modules/oms/api/updateShipment/[context]bodyParser[auth].js.map

@@ -1 +1 @@
-{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/updateShipment/[context]bodyParser[auth].js"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}
+{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/updateShipment/[context]bodyParser[auth].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}

package/dist/modules/oms/api/updateShipment/updateShipment.d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/oms/api/updateShipment/updateShipment.js

@@ -1,6 +1,7 @@
-import { commit, insert, rollback, select, startTransaction, update } from '@evershop/postgres-query-builder';
+import { commit, rollback, select, startTransaction, update } from '@evershop/postgres-query-builder';
 import { getConnection, pool } from '../../../../lib/postgres/connection.js';
 import { INTERNAL_SERVER_ERROR, INVALID_PAYLOAD, OK } from '../../../../lib/util/httpStatus.js';
+import addOrderActivityLog from '../../services/addOrderActivityLog.js';
 export default async (request, response, next) => {
     const connection = await getConnection();
     await startTransaction(connection);
@@ -43,13 +44,7 @@ export default async (request, response, next) => {
             .where('uuid', '=', shipment_id)
             .execute(connection);
         /* Add an activity log message */
-        await insert('order_activity')
-            .given({
-            order_activity_order_id: order.order_id,
-            comment: 'Shipment information updated',
-            customer_notified: 0
-        })
-            .execute(connection);
+        await addOrderActivityLog(order.order_id, 'Shipment information updated', false, connection);
         await commit(connection);
         // Load updated shipment
         const updatedShipment = await select()

package/dist/modules/oms/api/updateShipment/updateShipment.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateShipment.js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/updateShipment/updateShipment.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"updateShipment.js","sourceRoot":"","sources":["../../../../../src/modules/oms/api/updateShipment/updateShipment.ts"],"names":[],"mappings":"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"}

package/dist/modules/oms/bootstrap.d.ts

@@ -1,2 +1,2 @@
-declare function _default(): void;
+declare const _default: () => void;
 export default _default;

package/dist/modules/oms/bootstrap.js

@@ -3,8 +3,10 @@ import { defaultPaginationFilters } from '../../lib/util/defaultPaginationFilter
 import { hookAfter } from '../../lib/util/hookable.js';
 import { merge } from '../../lib/util/merge.js';
 import { addProcessor } from '../../lib/util/registry.js';
+import createShipment from './services/createShipment.js';
 import registerDefaultOrderCollectionFilters from './services/registerDefaultOrderCollectionFilters.js';
 import { changeOrderStatus, resolveOrderStatus } from './services/updateOrderStatus.js';
+import { updateShipmentStatus } from './services/updateShipmentStatus.js';
 export default () => {
     addProcessor('configurationSchema', (schema) => {
         merge(schema, {
@@ -27,9 +29,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 isDefault: {
                                                     type: 'boolean'
                                                 },
@@ -37,7 +36,7 @@ export default () => {
                                                     type: 'boolean'
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         }
                                     },
                                     additionalProperties: false
@@ -54,9 +53,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 isDefault: {
                                                     type: 'boolean'
                                                 },
@@ -64,7 +60,7 @@ export default () => {
                                                     type: 'boolean'
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         }
                                     },
                                     additionalProperties: false
@@ -81,9 +77,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 isDefault: {
                                                     type: 'boolean'
                                                 },
@@ -94,7 +87,7 @@ export default () => {
                                                     }
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         },
                                         processing: {
                                             type: 'object',
@@ -105,9 +98,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 next: {
                                                     type: 'array',
                                                     items: {
@@ -115,7 +105,7 @@ export default () => {
                                                     }
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         },
                                         completed: {
                                             type: 'object',
@@ -126,9 +116,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 next: {
                                                     type: 'array',
                                                     items: {
@@ -136,7 +123,7 @@ export default () => {
                                                     }
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         },
                                         canceled: {
                                             type: 'object',
@@ -147,9 +134,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 next: {
                                                     type: 'array',
                                                     items: {
@@ -157,7 +141,7 @@ export default () => {
                                                     }
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         },
                                         closed: {
                                             type: 'object',
@@ -168,9 +152,6 @@ export default () => {
                                                 badge: {
                                                     type: 'string'
                                                 },
-                                                progress: {
-                                                    type: 'string'
-                                                },
                                                 next: {
                                                     type: 'array',
                                                     items: {
@@ -178,7 +159,7 @@ export default () => {
                                                     }
                                                 }
                                             },
-                                            required: ['name', 'badge', 'progress']
+                                            required: ['name', 'badge']
                                         }
                                     },
                                     additionalProperties: true
@@ -227,30 +208,25 @@ export default () => {
                 pending: {
                     name: 'Pending',
                     badge: 'default',
-                    progress: 'incomplete',
                     isDefault: true
                 },
                 processing: {
                     name: 'Processing',
                     badge: 'default',
-                    progress: 'incomplete',
                     isDefault: false
                 },
                 shipped: {
                     name: 'Shipped',
-                    badge: 'attention',
-                    progress: 'complete'
+                    badge: 'warning'
                 },
                 delivered: {
                     name: 'Delivered',
                     badge: 'success',
-                    progress: 'complete',
                     isCancelable: false
                 },
                 canceled: {
                     name: 'Canceled',
-                    badge: 'critical',
-                    progress: 'complete',
+                    badge: 'destructive',
                     isCancelable: false
                 }
             },
@@ -258,20 +234,17 @@ export default () => {
                 pending: {
                     name: 'Pending',
                     badge: 'default',
-                    progress: 'incomplete',
                     isDefault: true,
                     isCancelable: true
                 },
                 paid: {
                     name: 'Paid',
                     badge: 'success',
-                    progress: 'complete',
                     isCancelable: false
                 },
                 canceled: {
                     name: 'Canceled',
-                    badge: 'critical',
-                    progress: 'complete',
+                    badge: 'destructive',
                     isCancelable: true
                 }
             },
@@ -279,32 +252,27 @@ export default () => {
                 new: {
                     name: 'New',
                     badge: 'default',
-                    progress: 'incomplete',
                     isDefault: true,
                     next: ['processing', 'canceled']
                 },
                 processing: {
                     name: 'Processing',
                     badge: 'default',
-                    progress: 'incomplete',
                     next: ['completed', 'canceled']
                 },
                 completed: {
                     name: 'Completed',
                     badge: 'success',
-                    progress: 'complete',
                     next: ['closed']
                 },
                 canceled: {
                     name: 'Canceled',
-                    badge: 'critical',
-                    progress: 'complete',
+                    badge: 'destructive',
                     next: []
                 },
                 closed: {
                     name: 'Closed',
-                    badge: 'default',
-                    progress: 'complete',
+                    badge: 'outline',
                     next: []
                 }
             },
@@ -341,24 +309,32 @@ export default () => {
     addProcessor('orderCollectionFilters', registerDefaultOrderCollectionFilters, 1);
     addProcessor('orderCollectionFilters', (filters) => [...filters, ...defaultPaginationFilters], 2);
     hookAfter('changePaymentStatus', async (order, orderId, status, connection) => {
-        if (order.status === 'canceled') {
+        const newOrderStatus = resolveOrderStatus(status, order.shipment_status);
+        if (order.status === 'canceled' && newOrderStatus !== 'canceled') {
             throw new Error('Order is already canceled');
         }
-        if (order.status === 'closed') {
+        if (order.status === 'closed' && newOrderStatus !== 'closed') {
             throw new Error('Order is already closed');
         }
-        const orderStatus = resolveOrderStatus(status, order.shipment_status);
-        await changeOrderStatus(orderId, orderStatus, connection);
+        await changeOrderStatus(orderId, newOrderStatus, connection);
     });
     hookAfter('changeShipmentStatus', async (order, orderId, status, connection) => {
-        if (order.status === 'canceled') {
+        const newOrderStatus = resolveOrderStatus(order.payment_status, status);
+        if (order.status === 'canceled' && newOrderStatus !== 'canceled') {
             throw new Error('Order is already canceled');
         }
-        if (order.status === 'closed') {
+        if (order.status === 'closed' && newOrderStatus !== 'closed') {
             throw new Error('Order is already closed');
         }
-        const orderStatus = resolveOrderStatus(order.payment_status, status);
-        await changeOrderStatus(orderId, orderStatus, connection);
+        await changeOrderStatus(orderId, newOrderStatus, connection);
+    });
+    hookAfter('saveOrder', async function createShipmentForVirtualProductsOrder(order, cart, connection) {
+        if (order.no_shipping_required) {
+            // Create a shipment for this order
+            await createShipment(order.uuid, null, null, connection);
+            // And update shipment status to delivered
+            await updateShipmentStatus(order.order_id, 'delivered', connection);
+        }
     });
 };
 //# sourceMappingURL=bootstrap.js.map

package/dist/modules/oms/bootstrap.js.map

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

package/dist/modules/oms/graphql/types/Carrier/Carrier.admin.resolvers.d.ts

@@ -1,6 +1,10 @@
 declare namespace _default {
     namespace Query {
-        function carriers(): any[];
+        function carriers(): {
+            code: string;
+            name: string;
+            trackingUrl?: string;
+        }[];
     }
 }
 export default _default;

package/dist/modules/oms/graphql/types/Order/Order.graphql

@@ -25,6 +25,7 @@ type OrderItem implements ShoppingCartItem {
   productSku: String!
   productName: String
   thumbnail: String
+  noShippingRequired: Boolean!
   productWeight: Weight!
   productPrice: Price!
   productPriceInclTax: Price!
@@ -56,6 +57,7 @@ type Order implements ShoppingCart {
   orderNumber: String!
   status: Status
   items: [OrderItem]
+  noShippingRequired: Boolean!
   shippingAddress: OrderAddress
   billingAddress: OrderAddress
   currency: String!

package/dist/modules/oms/graphql/types/Order/Order.resolvers.d.ts

@@ -37,13 +37,34 @@ declare namespace _default {
         } | null>;
         function shipmentStatus({ shipmentStatus }: {
             shipmentStatus: any;
-        }): any;
+        }): {
+            code: any;
+            name: string;
+            badge: string;
+            progress?: string;
+            isDefault?: boolean;
+            isCancelable?: boolean;
+        };
         function paymentStatus({ paymentStatus }: {
             paymentStatus: any;
-        }): any;
+        }): {
+            code: any;
+            name: string;
+            badge: string;
+            progress?: string;
+            isDefault?: boolean;
+            isCancelable?: boolean;
+        };
         function status({ status }: {
             status: any;
-        }): any;
+        }): {
+            code: any;
+            name: string;
+            badge: string;
+            progress?: string;
+            isDefault?: boolean;
+            next: string[];
+        };
     }
     namespace Customer {
         function orders({ customerId }: {