@things-factory/marketplace-base 4.3.176 → 4.3.177

package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js

@@ -9,6 +9,10 @@ exports.marketplaceOrdersResolver = {
         let postCodeSorter = params.sortings.find(sort => sort.name === 'postCode');
         const noOfItemsFilter = params.filters.find(param => param.name === 'itemCount');
         const skuFilter = params.filters.find(param => param.name === 'sku');
+        const fromDateFilter = params.filters.find(filter => filter.name === 'fromDate');
+        const toDateFilter = params.filters.find(filter => filter.name === 'toDate');
+        params.filters = params.filters.filter(filter => filter.name !== 'fromDate');
+        params.filters = params.filters.filter(filter => filter.name !== 'toDate');
         params.sortings = params.sortings.filter(sort => sort.name !== 'postCode');
         if (noOfItemsFilter && noOfItemsFilter.value == 1) {
             params.filters.find(param => param.name === 'itemCount').operator = 'eq';
@@ -39,6 +43,12 @@ exports.marketplaceOrdersResolver = {
         and lower(mpv.sku) like :sku)
       `, { sku: skuFilter.value.toLowerCase() });
         }
+        if (fromDateFilter && toDateFilter) {
+            qb.andWhere('mo.order_created_at BETWEEN :fromDate AND :toDate', {
+                fromDate: fromDateFilter.value,
+                toDate: toDateFilter.value
+            });
+        }
         let [items, total] = await qb.getManyAndCount();
         return { items, total };
     }

package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;QAChF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE1E,IAAI,eAAe,IAAI,eAAe,CAAC,KAAK,IAAI,CAAC,EAAE;YACjD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;SACzE;QAED,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;SACtE;QAED,IAAI,EAAE,GAAyC,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACvG,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC;aACnD,iBAAiB,CAAC,kCAAkC,EAAE,MAAM,CAAC;aAC7D,iBAAiB,CAAC,gCAAgC,EAAE,KAAK,CAAC;aAC1D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,+BAA+B,EAAE,KAAK,CAAC;aACzD,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAE7C,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACrE;QAED,IAAI,SAAS,EAAE;YACb,EAAE,CAAC,QAAQ,CACT;;;;;;OAMD,EACC,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CACvC,CAAA;SACF;QAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order-shipping/index.js

@@ -8,9 +8,10 @@ const marketplace_order_shipping_1 = require("./marketplace-order-shipping");
 const marketplace_order_shippings_1 = require("./marketplace-order-shippings");
 const marketplace_order_shippings_for_batch_init_1 = require("./marketplace-order-shippings-for-batch-init");
 const update_marketplace_order_shipping_1 = require("./update-marketplace-order-shipping");
+const update_marketplace_order_shipping_by_ref_no_1 = require("./update-marketplace-order-shipping-by-ref-no");
 const update_multiple_marketplace_order_shipping_1 = require("./update-multiple-marketplace-order-shipping");
 exports.MarketplaceOrderShippingResolver = {
     Query: Object.assign(Object.assign(Object.assign({}, marketplace_order_shippings_1.marketplaceOrderShippingsResolver), marketplace_order_shipping_1.marketplaceOrderShippingResolver), marketplace_order_shippings_for_batch_init_1.marketplaceOrderShippingsForBatchInitResolver),
-    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, update_marketplace_order_shipping_1.updateMarketplaceOrderShipping), update_multiple_marketplace_order_shipping_1.updateMultipleMarketplaceOrderShipping), create_marketplace_order_shipping_1.createMarketplaceOrderShipping), delete_marketplace_order_shipping_1.deleteMarketplaceOrderShipping), delete_marketplace_order_shippings_1.deleteMarketplaceOrderShippings)
+    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, update_marketplace_order_shipping_1.updateMarketplaceOrderShipping), update_multiple_marketplace_order_shipping_1.updateMultipleMarketplaceOrderShipping), create_marketplace_order_shipping_1.createMarketplaceOrderShipping), delete_marketplace_order_shipping_1.deleteMarketplaceOrderShipping), delete_marketplace_order_shippings_1.deleteMarketplaceOrderShippings), update_marketplace_order_shipping_by_ref_no_1.updateMarketplaceOrderShippingByRefNo)
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/marketplace-order-shipping/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/index.ts"],"names":[],"mappings":";;;AAAA,2FAAoF;AACpF,2FAAoF;AACpF,6FAAsF;AACtF,6EAA+E;AAC/E,+EAAiF;AACjF,6GAA4G;AAC5G,2FAAoF;AACpF,6GAAqG;AAExF,QAAA,gCAAgC,GAAG;IAC9C,KAAK,gDACA,+DAAiC,GACjC,6DAAgC,GAChC,0FAA6C,CACjD;IACD,QAAQ,4EACH,kEAA8B,GAC9B,mFAAsC,GACtC,kEAA8B,GAC9B,kEAA8B,GAC9B,oEAA+B,CACnC;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/index.ts"],"names":[],"mappings":";;;AAAA,2FAAoF;AACpF,2FAAoF;AACpF,6FAAsF;AACtF,6EAA+E;AAC/E,+EAAiF;AACjF,6GAA4G;AAC5G,2FAAoF;AACpF,+GAAqG;AACrG,6GAAqG;AAExF,QAAA,gCAAgC,GAAG;IAC9C,KAAK,gDACA,+DAAiC,GACjC,6DAAgC,GAChC,0FAA6C,CACjD;IACD,QAAQ,0FACH,kEAA8B,GAC9B,mFAAsC,GACtC,kEAA8B,GAC9B,kEAA8B,GAC9B,oEAA+B,GAC/B,mFAAqC,CACzC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping-by-ref-no.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateMarketplaceOrderShippingByRefNo = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.updateMarketplaceOrderShippingByRefNo = {
+    async updateMarketplaceOrderShippingByRefNo(_, { patches }, context) {
+        await (0, typeorm_1.getConnection)().transaction(async (tx) => {
+            for (let patch of patches) {
+                await tx
+                    .getRepository(entities_1.MarketplaceOrderShipping)
+                    .update({ orderNoRef: patch.orderNoRef }, { trackingNo: patch.ownTrackingNo, ownTrackingNo: patch.ownTrackingNo });
+            }
+        });
+        return true;
+    }
+};
+//# sourceMappingURL=update-marketplace-order-shipping-by-ref-no.js.map

package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping-by-ref-no.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-marketplace-order-shipping-by-ref-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping-by-ref-no.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,gDAA4D;AAE/C,QAAA,qCAAqC,GAAG;IACnD,KAAK,CAAC,qCAAqC,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QAC3E,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE;gBACzB,MAAM,EAAE;qBACL,aAAa,CAAC,mCAAwB,CAAC;qBACvC,MAAM,CACL,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,EAChC,EAAE,UAAU,EAAE,KAAK,CAAC,aAAa,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CACxE,CAAA;aACJ;QACH,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

package/dist-server/graphql/types/marketplace-order-shipping/index.js

@@ -29,6 +29,7 @@ exports.MarketplaceOrderShippingResolver = (0, graphql_tag_1.default) `
     updateMarketplaceOrderShipping(orderNo: String!, patch: MarketplaceOrderShippingPatch!): MarketplaceOrderShipping
       @transaction
     updateMultipleMarketplaceOrderShipping(patches: [MarketplaceOrderShippingPatch]!): [MarketplaceOrderShipping]
+    updateMarketplaceOrderShippingByRefNo(patches: [MarketplaceOrderShippingPatch]!): Boolean
     deleteMarketplaceOrderShipping(name: String!): Boolean
     deleteMarketplaceOrderShippings(names: [String]!): Boolean
   }

package/dist-server/graphql/types/marketplace-order-shipping/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,+DAA4C;AAC5C,oEAAiD;AACjD,qEAAkD;AAClD,mEAAgD;AAEnC,QAAA,gCAAgC,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;CAuBlD,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,+DAA4C;AAC5C,oEAAiD;AACjD,qEAAkD;AAClD,mEAAgD;AAEnC,QAAA,gCAAgC,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwBlD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "4.3.176",
+  "version": "4.3.177",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,5 +28,5 @@
     "@things-factory/product-base": "^4.3.176",
     "@things-factory/shell": "^4.3.176"
   },
-  "gitHead": "03fcdfd5ec9fa6f0f3f6b85004428239359d8efb"
+  "gitHead": "9fe26b4f1912973afbe913715116a27ba6ec0c35"
 }

package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts

@@ -9,6 +9,11 @@ export const marketplaceOrdersResolver = {
     let postCodeSorter = params.sortings.find(sort => sort.name === 'postCode')
     const noOfItemsFilter = params.filters.find(param => param.name === 'itemCount')
     const skuFilter = params.filters.find(param => param.name === 'sku')
+    const fromDateFilter = params.filters.find(filter => filter.name === 'fromDate')
+    const toDateFilter = params.filters.find(filter => filter.name === 'toDate')
+
+    params.filters = params.filters.filter(filter => filter.name !== 'fromDate')
+    params.filters = params.filters.filter(filter => filter.name !== 'toDate')
 
     params.sortings = params.sortings.filter(sort => sort.name !== 'postCode')
 
@@ -49,6 +54,13 @@ export const marketplaceOrdersResolver = {
       )
     }
 
+    if (fromDateFilter && toDateFilter) {
+      qb.andWhere('mo.order_created_at BETWEEN :fromDate AND :toDate', {
+        fromDate: fromDateFilter.value,
+        toDate: toDateFilter.value
+      })
+    }
+
     let [items, total] = await qb.getManyAndCount()
 
     return { items, total }

package/server/graphql/resolvers/marketplace-order-shipping/index.ts

@@ -5,6 +5,7 @@ import { marketplaceOrderShippingResolver } from './marketplace-order-shipping'
 import { marketplaceOrderShippingsResolver } from './marketplace-order-shippings'
 import { marketplaceOrderShippingsForBatchInitResolver } from './marketplace-order-shippings-for-batch-init'
 import { updateMarketplaceOrderShipping } from './update-marketplace-order-shipping'
+import { updateMarketplaceOrderShippingByRefNo } from './update-marketplace-order-shipping-by-ref-no'
 import { updateMultipleMarketplaceOrderShipping } from './update-multiple-marketplace-order-shipping'
 
 export const MarketplaceOrderShippingResolver = {
@@ -18,6 +19,7 @@ export const MarketplaceOrderShippingResolver = {
     ...updateMultipleMarketplaceOrderShipping,
     ...createMarketplaceOrderShipping,
     ...deleteMarketplaceOrderShipping,
-    ...deleteMarketplaceOrderShippings
+    ...deleteMarketplaceOrderShippings,
+    ...updateMarketplaceOrderShippingByRefNo
   }
 }

package/server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping-by-ref-no.ts

@@ -0,0 +1,18 @@
+import { getConnection } from 'typeorm'
+import { MarketplaceOrderShipping } from '../../../entities'
+
+export const updateMarketplaceOrderShippingByRefNo = {
+  async updateMarketplaceOrderShippingByRefNo(_: any, { patches }, context: any) {
+    await getConnection().transaction(async tx => {
+      for (let patch of patches) {
+        await tx
+          .getRepository(MarketplaceOrderShipping)
+          .update(
+            { orderNoRef: patch.orderNoRef },
+            { trackingNo: patch.ownTrackingNo, ownTrackingNo: patch.ownTrackingNo }
+          )
+      }
+    })
+    return true
+  }
+}

package/server/graphql/types/marketplace-order-shipping/index.ts

@@ -11,6 +11,7 @@ export const MarketplaceOrderShippingResolver = gql`
     updateMarketplaceOrderShipping(orderNo: String!, patch: MarketplaceOrderShippingPatch!): MarketplaceOrderShipping
       @transaction
     updateMultipleMarketplaceOrderShipping(patches: [MarketplaceOrderShippingPatch]!): [MarketplaceOrderShipping]
+    updateMarketplaceOrderShippingByRefNo(patches: [MarketplaceOrderShippingPatch]!): Boolean
     deleteMarketplaceOrderShipping(name: String!): Boolean
     deleteMarketplaceOrderShippings(names: [String]!): Boolean
   }