rerobe-js-orm 4.5.7 → 4.5.8

package/lib/constants/order-constants.d.ts

@@ -10,6 +10,7 @@ export namespace PAYMENT_TYPES {
     let shoppingCredit: string;
     let cash: string;
     let mobilePayment: string;
+    let shopifyPayment: string;
 }
 export namespace ORDER_STATES {
     let draft: string;
@@ -21,6 +22,7 @@ export namespace SALES_CHANNELS {
     let store: string;
     let onlineStore: string;
     let thirdParty: string;
+    let shopify: string;
     let ahlens: string;
     let ribbnMobilePOS: string;
     let ribbnWebPOS: string;
@@ -51,6 +53,7 @@ export const SALES_CHANNEL_TO_RETURN_POLICY_MAPPING: {
     [SALES_CHANNELS.webApp]: string;
     [SALES_CHANNELS.store]: string;
     [SALES_CHANNELS.onlineStore]: string;
+    [SALES_CHANNELS.shopify]: string;
     [SALES_CHANNELS.thirdParty]: string;
     [SALES_CHANNELS.ahlens]: string;
     [SALES_CHANNELS.ribbnMobilePOS]: string;

package/lib/constants/order-constants.js

@@ -13,6 +13,7 @@ exports.PAYMENT_TYPES = {
     shoppingCredit: 'SHOPPING_CREDIT',
     cash: 'CASH',
     mobilePayment: 'MOBILE_PAYMENT',
+    shopifyPayment: 'SHOPIFY_PAYMENT',
 };
 exports.ORDER_STATES = {
     draft: 'DRAFT',
@@ -24,6 +25,7 @@ exports.SALES_CHANNELS = {
     store: 'STORE',
     onlineStore: 'ONLINE_STORE',
     thirdParty: 'THIRD_PARTY',
+    shopify: 'SHOPIFY',
     ahlens: 'AHLENS',
     ribbnMobilePOS: 'RIBBN_MOBILE_POS',
     ribbnWebPOS: 'RIBBN_WEB_POS',
@@ -54,6 +56,7 @@ exports.SALES_CHANNEL_TO_RETURN_POLICY_MAPPING = {
     [exports.SALES_CHANNELS.webApp]: exports.RETURN_POLICY_TYPES.inStore,
     [exports.SALES_CHANNELS.store]: exports.RETURN_POLICY_TYPES.inStore,
     [exports.SALES_CHANNELS.onlineStore]: exports.RETURN_POLICY_TYPES.online,
+    [exports.SALES_CHANNELS.shopify]: exports.RETURN_POLICY_TYPES.online,
     [exports.SALES_CHANNELS.thirdParty]: exports.RETURN_POLICY_TYPES.inStore,
     [exports.SALES_CHANNELS.ahlens]: exports.RETURN_POLICY_TYPES.inStore,
     [exports.SALES_CHANNELS.ribbnMobilePOS]: exports.RETURN_POLICY_TYPES.inStore,

package/lib/factories/Order/OrderFromShopifyWebhook.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
 const OrderHelpers_1 = require("../../helpers/OrderHelpers");
+const order_constants_1 = require("../../constants/order-constants");
 const orderHelpers = new OrderHelpers_1.default();
 const fulfillmentStatusRestMapping = {
     fulfilled: 'FULFILLED',
@@ -274,7 +275,7 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
             fulfillments,
             refunds,
             taxLines,
-            shippingLine, state: Order_1.default.ORDER_STATES.completed, shippingType: orderHelpers.getShippingTypeFromShopifyObj(shipping_lines), paymentType: orderHelpers.getPaymentTypeUsingTags(tags), salesChannel: orderHelpers.getSalesChannelUsingTags(tags), tags: tags ? tags.split(', ') : [] }));
+            shippingLine, state: Order_1.default.ORDER_STATES.completed, shippingType: orderHelpers.getShippingTypeFromShopifyObj(shipping_lines), paymentType: orderHelpers.getPaymentTypeUsingTags(tags), salesChannel: order_constants_1.SALES_CHANNELS.shopify, tags: tags ? tags.split(', ') : [] }));
         return rerobeOrder.toObj();
     }
     // Aligned with Shopify REST order payload that includes current_* fields
@@ -580,7 +581,8 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
         // @ts-ignore
         const fulfillmentStatus = !fulfillment_status ? '' : fulfillmentStatusRestMapping[fulfillment_status];
         const rerobeOrder = new Order_1.default({
-            id: orderHelpers.getOrderIdFromShopifyObj({ id, tags }),
+            id: this.utilities.makeRandId(28),
+            documentId: this.utilities.makeRandId(28),
             shopifyId: `gid://shopify/Order/${id}`,
             shopifyOrderNumber: name ? Number(String(name).replace('#', '')) : order_number || 0,
             name: name || '',
@@ -612,8 +614,8 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
             tags: tags ? String(tags).split(', ').filter(Boolean) : [],
             state: Order_1.default.ORDER_STATES.completed,
             shippingType: orderHelpers.getShippingTypeFromShopifyObj((shipping_lines || [])),
-            paymentType: orderHelpers.getPaymentTypeUsingTags(tags),
-            salesChannel: orderHelpers.getSalesChannelUsingTags(tags),
+            paymentType: order_constants_1.PAYMENT_TYPES.shopifyPayment,
+            salesChannel: order_constants_1.SALES_CHANNELS.shopify,
         });
         return rerobeOrder.toObj();
     }

package/lib/models/Order.d.ts

@@ -12,6 +12,7 @@ export default class Order extends Base {
         shoppingCredit: string;
         cash: string;
         mobilePayment: string;
+        shopifyPayment: string;
     };
     static ORDER_STATES: {
         draft: string;
@@ -23,6 +24,7 @@ export default class Order extends Base {
         store: string;
         onlineStore: string;
         thirdParty: string;
+        shopify: string;
         ahlens: string;
         ribbnMobilePOS: string;
         ribbnWebPOS: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",