npm - @things-factory/integration-sellercraft - Versions diffs - 4.1.40 → 4.2.2 - Mend

@things-factory/integration-sellercraft 4.1.40 → 4.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist-server/service/marketplace-channel/marketplace-channel-product-mutation.js CHANGED Viewed

@@ -43,17 +43,27 @@ let MarketplaceChannelProductMutation = class MarketplaceChannelProductMutation
                     accessKey: shops[j].credential.consumer_key,
                     accessSecret: shops[j].credential.consumer_secret,
                     storeURL: shops[j].credential.store_url,
-                    platform: channels[i].name
+                    platform: channels[i].name,
+                    accessToken: shops[j].credential.access_token // Magento+
                 };
                 let countryCode = shops[j].country_code;
                 let channelCode = shops[j].org_prefix;
                 let organisationId = shops[j].account_id;
                 let channelShopId = shops[j].channel_shop_id;
                 var sellercraftStore = Object.assign(Object.assign({}, store), { platform: 'sellercraftChannelIntegration' });
-                const productResult = await integration_marketplace_1.StoreAPI.getStoreProducts(store, {});
+                const productResult = [];
+                let totalPages = 1;
+                var limit = 50;
+                for (let page = 0; page < totalPages; page++) {
+                    const { results, total } = await integration_marketplace_1.StoreAPI.getStoreProducts(store, {
+                        pagination: { page, limit }
+                    });
+                    totalPages = Math.ceil(total / limit);
+                    productResult.push(...results);
+                }
                 const categoryResult = await integration_marketplace_1.StoreAPI.getStoreProductCategories(store, {});
-                let mappedProducts = productResult.results.map(item => {
-                    let { categoryId, itemId: productId, name, brand, isVerified, images, attributes, variations } = item;
+                let mappedProducts = productResult.map(item => {
+                    let { categoryId, itemId: productId, parentId, name, brand, isVerified, images, attributes, variations } = item;
                     variations = variations.map(variation => {
                         let { variationSku, variationId, name, isEnabled: isEnabled, isEnabled: isSellable, attributes, stockLocked, qty: stockReported, costPrice: fullPrice, sellPrice: priceDiscounted, length, width, height, weight } = variation;
                         return {
@@ -86,7 +96,7 @@ let MarketplaceChannelProductMutation = class MarketplaceChannelProductMutation
                             ]
                         };
                     });
-                    images = images.map(image => {
+                    images = images === null || images === void 0 ? void 0 : images.map(image => {
                         return {
                             url: image
                         };
@@ -97,7 +107,7 @@ let MarketplaceChannelProductMutation = class MarketplaceChannelProductMutation
                         channelCode: channels[i].channelCode,
                         channelCountry: shops[j].country_code,
                         categoryId,
-                        productId,
+                        productId: parentId || productId,
                         name,
                         brand,
                         isVerified,
@@ -115,11 +125,15 @@ let MarketplaceChannelProductMutation = class MarketplaceChannelProductMutation
                         isLeaf: parent == 0 ? false : true,
                         isActive: isActive || true,
                         channelCode,
-                        countryCode
+                        countryCode,
+                        childrenCategories: []
                     };
                 });
-                mappedCategories.map(category => {
-                    category.childrenCategories = mappedCategories.filter(e => e.parent == category.categoryId);
+                mappedCategories = mappedCategories.map(category => {
+                    if (mappedCategories.filter(e => e.parent == category.categoryId).length > 0) {
+                        category.childrenCategories = mappedCategories.filter(e => e.parent == category.categoryId);
+                    }
+                    return category;
                 });
                 await sellercraft_channel_integration_api_1.SellercraftChannelIntegrationAPI.ingestChannelCategories(sellercraftStore, {
                     categories: mappedCategories

package/dist-server/service/marketplace-channel/marketplace-channel-product-mutation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-channel-product-mutation.js","sourceRoot":"","sources":["../../../server/service/marketplace-channel/marketplace-channel-product-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsD;AACtD,qCAAuC;AAEvC,+DAA0D;AAE1D,6CAA4C;AAC5C,qFAAkE;AAClE,+GAAwG;AAGxG,IAAa,iCAAiC,GAA9C,MAAa,iCAAiC;IAE5C,KAAK,CAAC,iCAAiC,CAAQ,OAAY;QACzD,MAAM,mCAAmC,GAAG,YAAM,CAAC,GAAG,CAAC,qCAAqC,EAAE,EAAE,CAAC,CAAA;QACjG,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAAG,mCAAmC,CAAA;QAE/F,MAAM,QAAQ,GAAyB,MAAM,IAAA,uBAAa,EAAC,wCAAkB,CAAC,CAAC,IAAI,EAAE,CAAA;QAErF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,IAAI,gBAAgB,GAAG,qBAAqB,GAAG,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACrF,MAAM,eAAe,GAAQ,MAAM,KAAK,CAAC,gBAAgB,EAAE;gBACzD,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,WAAW,EAAE,MAAM;iBACpB;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;aACjC;YACD,IAAI,aAAa,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,CAAA;YAChD,IAAI,KAAK,GAAG,aAAa,CAAC,KAAK,CAAA;YAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,IAAI,KAAK,GAAG;oBACV,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY;oBAC3C,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe;oBACjD,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS;oBACvC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;~~iBAC3B~~,CAAA;gBAED,IAAI,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;gBACvC,IAAI,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;gBACrC,IAAI,cAAc,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;gBACxC,IAAI,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAA;gBAE5C,IAAI,gBAAgB,mCAAQ,KAAK,KAAE,QAAQ,EAAE,+BAA+B,GAAE,CAAA;gBAE9E,MAAM,aAAa,GAAG,MAAM,kCAAQ,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;~~gBAEhE~~,MAAM,cAAc,GAAG,MAAM,kCAAQ,CAAC,yBAAyB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;gBAE1E,IAAI,cAAc,GAAG,aAAa,CAAC,~~OAAO,CAAC,~~GAAG,CAAC,IAAI,CAAC,EAAE;~~oBACpD~~,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;~~oBAErG~~,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBACtC,IAAI,EACF,YAAY,EACZ,WAAW,EACX,IAAI,EACJ,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,EACrB,UAAU,EACV,WAAW,EACX,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACP,GAAG,SAAS,CAAA;wBAEb,OAAO;4BACL,YAAY;4BACZ,WAAW;4BACX,IAAI;4BACJ,SAAS;4BACT,UAAU;4BACV,UAAU;4BACV,WAAW;4BACX,aAAa;4BACb,SAAS;4BACT,eAAe;4BACf,iBAAiB,EAAE;gCACjB;oCACE,GAAG,EAAE,aAAa;oCAClB,IAAI,EAAE,GAAG,IAAI,MAAM,YAAY,EAAE;oCACjC,GAAG,EAAE,YAAY;oCACjB,eAAe,EAAE;wCACf;4CACE,KAAK,EAAE,SAAS;4CAChB,eAAe,EAAE,MAAM;4CACvB,cAAc,EAAE,KAAK;4CACrB,eAAe,EAAE,MAAM;4CACvB,iBAAiB,EAAE,MAAM;4CACzB,GAAG,EAAE,CAAC;yCACP;qCACF;iCACF;6BACF;yBACF,CAAA;oBACH,CAAC,CAAC,CAAA;oBAEF,MAAM,GAAG,MAAM,~~CAAC~~,GAAG,CAAC,KAAK,CAAC,EAAE;~~wBAC1B~~,OAAO;4BACL,GAAG,EAAE,KAAK;yBACX,CAAA;oBACH,CAAC,CAAC,CAAA;oBAEF,OAAO;wBACL,cAAc;wBACd,aAAa,EAAE,aAAa;wBAC5B,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW;wBACpC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY;wBACrC,UAAU;wBACV,SAAS;~~wBACT~~,IAAI;wBACJ,KAAK;wBACL,UAAU;wBACV,MAAM;wBACN,UAAU;wBACV,UAAU;qBACX,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,IAAI,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;oBAC3D,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;oBAEvE,OAAO;wBACL,UAAU;wBACV,YAAY;wBACZ,MAAM;wBACN,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;wBAClC,QAAQ,EAAE,QAAQ,IAAI,IAAI;wBAC1B,WAAW;wBACX,WAAW;~~qBACZ~~,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;~~oBAC9B~~,QAAQ,CAAC,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAA;~~gBAC7F~~,CAAC,CAAC,CAAA;gBAEF,MAAM,sEAAgC,CAAC,uBAAuB,CAAC,gBAAgB,EAAE;oBAC/E,UAAU,EAAE,gBAAgB;iBAC7B,CAAC,CAAA;gBAEF,MAAM,sEAAgC,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAA;aAC5G;YAED,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;CACF,CAAA;~~AA/IC~~;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IACY,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;~~0FA8I7C~~;~~AAhJU~~,iCAAiC;IAD7C,IAAA,uBAAQ,GAAE;GACE,iCAAiC,~~CAiJ7C~~;~~AAjJY~~,8EAAiC"}
1	+ {"version":3,"file":"marketplace-channel-product-mutation.js","sourceRoot":"","sources":["../../../server/service/marketplace-channel/marketplace-channel-product-mutation.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-sellercraft",
-  "version": "4.1.40",
+  "version": "4.2.2",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -31,7 +31,7 @@
     "@things-factory/context-ui": "^4.1.40",
     "@things-factory/grist-ui": "^4.1.40",
     "@things-factory/i18n-base": "^4.1.40",
-    "@things-factory/integration-marketplace": "^4.1.40",
+    "@things-factory/integration-marketplace": "^4.2.2",
     "@things-factory/integration-ui": "^4.1.40",
     "@things-factory/more-ui": "^4.1.40",
     "@things-factory/resource-ui": "^4.1.40",
@@ -51,5 +51,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "060b5c664e80a6fcba09598f2c7ceffe067e02bf"
+  "gitHead": "29a63a11161cd2b9692f9e9aafbf4d34b17a6a7b"
 }

package/server/constants/order-status-mapping.ts CHANGED Viewed

@@ -1,6 +1,10 @@
 export const ORDER_STATUS = {
-  pending: 'PENDING_PAYMENT',
-  processing: 'CONFIRMED',
+  pending: 'PAYMENT_PENDING',
+  processing: 'PROCESSING',
   completed: 'DELIVERED',
-  cancelled: 'CANCELLED'
+  cancelled: 'CANCELLED',
+  canceled: 'CANCELLED',
+  refunded: 'REFUND_COMPLETE',
+  failed: 'SHIPMENT_LOST_OR_DAMAGED',
+  refund: 'REFUND_COMPLETE'
 }

package/server/constants/platform.ts CHANGED Viewed

@@ -1,3 +1,4 @@
 export const PLATFORM = {
-  WCM: 'woocommerce'
+  WCM: 'woocommerce',
+  MGT: 'magento'
 }

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-categories.ts CHANGED Viewed

@@ -7,27 +7,7 @@ export function ingestChannelCategories() {
     denormalize(req) {
       const { categories } = req
-      let newCategories = categories.map(category => {
-        return {
-          native_category_id: category.categoryId.toString(),
-          channel_code: category.channelCode,
-          channel_country: category.countryCode,
-          category_name: category.categoryName,
-          is_leaf: category.isLeaf,
-          is_active: category.isActive,
-          children_categories: category.childrenCategories.map(childrenCategory => {
-            return {
-              native_category_id: category.categoryId.toString(),
-              channel_code: category.channelCode,
-              channel_country: category.countryCode,
-              category_name: childrenCategory.categoryName,
-              is_leaf: childrenCategory.isLeaf,
-              is_active: childrenCategory.isActive,
-              children_categories: []
-            }
-          })
-        }
-      })
+      let newCategories = mapCategories(categories)
       return {
         payload: [...newCategories]
@@ -38,3 +18,19 @@ export function ingestChannelCategories() {
     }
   }
 }
+function mapCategories(categories) {
+  if (!categories) return null
+  categories = categories.map(category => {
+    return {
+      native_category_id: category.categoryId.toString(),
+      channel_code: category.channelCode,
+      channel_country: category.countryCode,
+      category_name: category.categoryName,
+      is_leaf: category.isLeaf,
+      is_active: category.isActive,
+      children_categories: mapCategories(category.childrenCategories)
+    }
+  })
+  return categories
+}

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-order.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-/* https://docs.sellercraft.co/docs/api-integrations/b3A6MTY4NjQxODU-initiate-order-shipment */
+/* https://docs.sellercraft.co/docs/api-integrations/b3A6MjQzODQ4OTg-ingest-channel-order */
 import { ORDER_STATUS } from '../../../constants'
@@ -49,7 +49,7 @@ export function ingestChannelOrder() {
             phone_1: order.billPhone1,
             phone_2: order.billPhone2
           },
-          order_items: order.orderItems.map(orderItem => {
+          order_items: order.mappedOrderItems.map(orderItem => {
             return {
               native_item_id: orderItem.id.toString(),
               native_variant_id: orderItem.variationId.toString(),
@@ -73,7 +73,7 @@ export function ingestChannelOrder() {
       })
       return {
-        payload: [ ...newOrders ]
+        payload: [...newOrders]
       }
     },
     normalize(res) {

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-product.ts CHANGED Viewed

@@ -13,9 +13,17 @@ export function ingestChannelProduct() {
             seller_sku: variant.variationSku,
             native_variant_id: variant.variationId.toString(),
             label: variant.name,
-            is_enabled: variant.isEnabled,
-            is_sellable: variant.isSellable,
+            is_enabled: variant.isEnabled || true,
+            is_sellable: variant.isSellable || true,
             is_deleted: false, // default
+            variant_attributes: variant?.attributes
+              ? variant?.attributes.map(attribute => {
+                  return {
+                    ...attribute,
+                    native_attribute_id: attribute.native_attribute_id.toString()
+                  }
+                })
+              : [],
             stock_locked: variant?.stockLocked ? variant.stockLocked : 0,
             native_stock_reported: variant?.stockReported ? variant.stockReported : 0,
             price_full: variant.fullPrice || 0,
@@ -23,7 +31,7 @@ export function ingestChannelProduct() {
             inventory_products: variant?.inventoryProducts
               ? variant.inventoryProducts.map(inventoryProduct => {
                   return {
-                    quantity: inventoryProduct.qty || 0,
+                    quantity: inventoryProduct.qty || 1,
                     name: inventoryProduct.name,
                     inventory_sku: inventoryProduct.sku,
                     product_versions: inventoryProduct?.productVersions
@@ -56,13 +64,19 @@ export function ingestChannelProduct() {
           native_product_id: product.productId.toString(),
           label: product.name,
           brand: product.brand || '',
-          is_verified: product.isVerified,
+          is_verified: product.isVerified || true,
           flexible_attributes: product.channelCode == 'WCM' ? true : false, // add channels that do not support category_attributes ingestion
-          images: product.images.map(image => {
+          images: product?.images.map(image => {
             return {
               file_url: image.url
             }
           }),
+          product_attributes: product?.attributes.map(attribute => {
+            return {
+              ...attribute,
+              native_attribute_id: attribute.native_attribute_id.toString()
+            }
+          }),
           variants: productVariations
         }
       })

package/server/routers/sellercraft-router.ts CHANGED Viewed

@@ -39,22 +39,25 @@ sellercraftRouter.post('/sellercraft/store/update-product-price', async (context
       accessKey: store.shop.credential.consumer_key,
       accessSecret: store.shop.credential.consumer_secret,
       storeURL: store.shop.credential.store_url,
-      platform: PLATFORM[`${store.shop.org_prefix}`]
+      platform: PLATFORM[`${store.shop.org_prefix}`],
+      accessToken: store.shop.credential.access_token
     }
-    if (requestBody[i].native_variant_id) {
+    if (requestBody[i].native_variant_id != requestBody[i].native_product_id) {
       const req = {
         costPrice: requestBody[i].full_price,
         sellPrice: requestBody[i].sale_price,
         productId: requestBody[i].native_product_id,
-        variationId: requestBody[i].native_variant_id
+        variationId: requestBody[i].native_variant_id,
+        variationSku: requestBody[i].sku
       }
       result = await StoreAPI.updateStoreProductVariationPrice(mappedStore, req)
     } else {
       const req = {
         costPrice: requestBody[i].full_price,
         sellPrice: requestBody[i].sale_price,
-        productId: requestBody[i].native_product_id
+        productId: requestBody[i].native_product_id,
+        variationSku: requestBody[i].sku
       }
       result = await StoreAPI.updateStoreProductPrice(mappedStore, req)
     }
@@ -95,20 +98,25 @@ sellercraftRouter.post('/sellercraft/store/update-product-stock', async (context
       accessKey: store.shop.credential.consumer_key,
       accessSecret: store.shop.credential.consumer_secret,
       storeURL: store.shop.credential.store_url,
-      platform: PLATFORM[`${store.shop.org_prefix}`]
+      platform: PLATFORM[`${store.shop.org_prefix}`],
+      accessToken: store.shop.credential.access_token
     }
-    if (requestBody[i].native_variant_id) {
+    if (requestBody[i].native_variant_id != requestBody[i].native_product_id) {
       const req = {
         qty: requestBody[i].stock,
         itemId: requestBody[i].native_product_id,
-        variationId: requestBody[i].native_variant_id
+        variationId: requestBody[i].native_variant_id,
+        distributors: requestBody[i].distributors || [], // for Magento
+        variationSku: requestBody[i].sku
       }
       result = await StoreAPI.updateStoreProductVariationStock(mappedStore, req)
     } else {
       const req = {
         qty: requestBody[i].stock,
-        itemId: requestBody[i].native_product_id
+        itemId: requestBody[i].native_product_id,
+        distributors: requestBody[i].distributors || [], // for Magento
+        variationSku: requestBody[i].sku
       }
       result = await StoreAPI.updateStoreProductStock(mappedStore, req)
     }
@@ -147,10 +155,16 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
     accessKey: store.shop.credential.consumer_key,
     accessSecret: store.shop.credential.consumer_secret,
     storeURL: store.shop.credential.store_url,
-    platform: PLATFORM[`${store.shop.org_prefix}`]
+    platform: PLATFORM[`${store.shop.org_prefix}`],
+    accessToken: store.shop.credential.access_token
   }
-  const reqBody = { orderId: requestBody.native_order_id, status: requestBody.order_status }
+  const reqBody = {
+    orderId: requestBody.native_order_id,
+    status: requestBody.order_status,
+    carrier: requestBody?.shipper_last_mile,
+    trackingNo: requestBody?.tracking_number
+  }
   result = await StoreAPI.updateOrderStatus(mappedStore, reqBody)
   debug(result)
@@ -186,9 +200,10 @@ sellercraftRouter.post('/sellercraft/store/update-product-attribute', async (con
     accessKey: store.shop.credential.consumer_key,
     accessSecret: store.shop.credential.consumer_secret,
     storeURL: store.shop.credential.store_url,
-    platform: PLATFORM[`${store.shop.org_prefix}`]
+    platform: PLATFORM[`${store.shop.org_prefix}`],
+    accessToken: store.shop.credential.access_token
   }
   let { product_sku: productSku, native_product_id: itemId, variants } = requestBody
   variants.map(variant => {

package/server/service/marketplace-channel/marketplace-channel-order-mutation.ts CHANGED Viewed

@@ -41,13 +41,14 @@ export class MarketplaceChannelOrderMutation {
           accessKey: shops[j].credential.consumer_key,
           accessSecret: shops[j].credential.consumer_secret,
           storeURL: shops[j].credential.store_url,
-          platform: channels[i].name
+          platform: channels[i].name,
+          accessToken: shops[j].credential.access_token // Magento+
         }
         // let countryCode = shops[j].country_code
         // let channelCode = shops[j].org_prefix
-        let organisationId = shops[j].credential.account_id
-        let channelShopId = shops[j].credential.channel_shop_id
+        let organisationId = shops[j].account_id
+        let channelShopId = shops[j].channel_shop_id
         const orderReq = {
           fromDate: fromDate,
@@ -80,7 +81,7 @@ export class MarketplaceChannelOrderMutation {
             country: billCountry,
             phone: billPhone1,
             phone_2: billPhone2
-          } = order.billing
+          } = order?.billing
           let {
             first_name: shipFirstName,
@@ -98,7 +99,7 @@ export class MarketplaceChannelOrderMutation {
           } = order.shipping
           let orderItems = order.orderItems.map(item => {
-            let { name: id, variationId: variationId, slaExpiresAt, total, totalTax, subtotal, subtotalTax } = item
+            let { name: id, variationId: variationId, slaExpiresAt, total, totalTax, subtotal, subtotalTax, qty } = item
             return {
               id,
@@ -107,18 +108,159 @@ export class MarketplaceChannelOrderMutation {
               createdAt: order.orderCreatedAt,
               updatedAt: order.orderUpdatedAt,
               charges: [
+                {
+                  name: 'CHARGES_MARKETING',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'CLAIMS_DAMAGE',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'CLAIMS_LOST',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'COMMISSION_PLATFORM',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'DEPOSIT_PRESALE',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'FEE_MISCELLANEOUS',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'FEE_TRANSACTION',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
                 {
                   name: 'PRICE_NORMAL_SELLING',
                   grossAmount: total,
                   nettAmount: subtotal
                 },
+                {
+                  name: 'PRICE_RECOMMENDED_RETAIL',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'PROMOTIONS_CUSTOMER_RECEIVED',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'PROMOTIONS_REBATE_PLATFORM',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'PROMOTIONS_REBATE_SELLER',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_CHARGES_MARKETING',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_COMMISSION',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_FEE_MISCELLANEOUS',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_PROMOTIONS_CUSTOMER_RECEIVED',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_SELLER_RETURN_REFUND_AMOUNT',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_SHIPPING_CUSTOMER_PAID',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_SHIPPING_REBATE_PLATFORM',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'REVERSAL_SHIPPING_SELLER_PAID',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'SHIPPING_COST_TOTAL',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'SHIPPING_CUSTOMER_PAID',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'SHIPPING_REBATE_PLATFORM',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'SHIPPING_SELLER_PAID',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
                 {
                   name: 'TAXES',
                   grossAmount: totalTax,
                   nettAmount: subtotalTax
+                },
+                {
+                  name: 'VOUCHERS_CUSTOMER_RECEIVED',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'VOUCHERS_REBATE_PLATFORM',
+                  grossAmount: 0,
+                  nettAmount: 0
+                },
+                {
+                  name: 'VOUCHERS_REBATE_SELLER',
+                  grossAmount: 0,
+                  nettAmount: 0
                 }
               ],
-              slaExpiresAt
+              slaExpiresAt,
+              qty
+            }
+          })
+          let mappedOrderItems = []
+          orderItems.map(oi => {
+            for (let i = 0; i < oi.qty; i++) {
+              mappedOrderItems.push({
+                ...oi,
+                id: `${oi.id}-${i + 1}`
+              })
             }
           })
@@ -130,19 +272,19 @@ export class MarketplaceChannelOrderMutation {
             id,
             billFirstName,
             billLastName,
-            billAddress1,
-            billAddress2,
-            billAddress3,
-            billAddress4,
-            billAddress5,
-            billCity,
-            billPostalCode,
-            billCountry,
-            billPhone1,
-            billPhone2,
+            billAddress1: billAddress1.toString() || shipAddress1.toString(),
+            billAddress2: billAddress2 || shipAddress2,
+            billAddress3: billAddress3 || shipAddress3,
+            billAddress4: billAddress4 || shipAddress4,
+            billAddress5: billAddress5 || shipAddress5,
+            billCity: billCity || shipCity,
+            billPostalCode: billPostalCode || shipPostalCode,
+            billCountry: billCountry || shipCountry,
+            billPhone1: billPhone1 || shipPhone1,
+            billPhone2: billPhone2 || shipPhone2,
             shipFirstName,
             shipLastName,
-            shipAddress1,
+            shipAddress1: shipAddress1.toString(),
             shipAddress2,
             shipAddress3,
             shipAddress4,
@@ -152,10 +294,11 @@ export class MarketplaceChannelOrderMutation {
             shipCountry,
             shipPhone1,
             shipPhone2,
-            orderItems,
+            mappedOrderItems,
             channelShopId,
             organisationId,
-            status
+            status,
+            charges: getOrderCharges(mappedOrderItems)
           }
         })
@@ -168,3 +311,27 @@ export class MarketplaceChannelOrderMutation {
     }
   }
 }
+function getOrderCharges(mappedOrderItems) {
+  let chargesList = []
+  for (let i = 0; i < mappedOrderItems.length; i++) {
+    for (let j = 0; j < mappedOrderItems[i].charges.length; j++) {
+      let charge = mappedOrderItems[i].charges[j]
+      let foundCharge = chargesList.find(cl => cl.name == charge.name)
+      if (foundCharge) {
+        foundCharge.grossAmount = foundCharge.grossAmount + charge.grossAmount
+        foundCharge.nettAmount = foundCharge.nettAmount + charge.nettAmount
+        chargesList = chargesList.filter(cl => cl.name != charge.name)
+      } else {
+        foundCharge = {
+          name: charge.name,
+          grossAmount: charge.grossAmount,
+          nettAmount: charge.nettAmount
+        }
+      }
+      chargesList.push(foundCharge)
+    }
+  }
+  return chargesList
+}