@things-factory/integration-sellercraft 4.1.35 → 4.2.1

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

@@ -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,15 +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,
@@ -115,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}`
+              })
             }
           })
 
@@ -138,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,
@@ -160,19 +294,16 @@ export class MarketplaceChannelOrderMutation {
             shipCountry,
             shipPhone1,
             shipPhone2,
-            orderItems,
+            mappedOrderItems,
             channelShopId,
             organisationId,
-            status
+            status,
+            charges: getOrderCharges(mappedOrderItems)
           }
-
         })
 
         if (mappedOrderResult.length > 0) {
-          const ingestOrder = await SellercraftChannelIntegrationAPI.ingestChannelOrder(
-            sellercraftStore,
-            { orders: mappedOrderResult }
-          )
+          await SellercraftChannelIntegrationAPI.ingestChannelOrder(sellercraftStore, { orders: mappedOrderResult })
         }
       }
 
@@ -180,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
+}

package/server/service/marketplace-channel/marketplace-channel-product-mutation.ts

@@ -10,9 +10,7 @@ import { SellercraftChannelIntegrationAPI } from '../../controllers/sellercraft-
 @Resolver()
 export class MarketplaceChannelProductMutation {
   @Mutation(returns => Boolean)
-  async syncAllMarketplaceChannelProducts(
-    @Ctx() context: any
-  ): Promise<boolean> {
+  async syncAllMarketplaceChannelProducts(@Ctx() context: any): Promise<boolean> {
     const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
     const { tokenCraftApiKey: apiKey, getShopsTokenCraftUrl } = sellercraftChannelIntegrationConfig
 
@@ -39,31 +37,33 @@ export 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].credential.account_id
-        let channelShopId = shops[j].credential.channel_shop_id 
+        let organisationId = shops[j].account_id
+        let channelShopId = shops[j].channel_shop_id
 
         var sellercraftStore = { ...store, platform: 'sellercraftChannelIntegration' }
 
-        const productResult = await StoreAPI.getStoreProducts(store, {})
+        const productResult = []
+        let totalPages: number = 1
+        var limit: number = 50
+  
+        for (let page = 0; page < totalPages; page++) {
+          const { results, total } = await StoreAPI.getStoreProducts(store, {
+            pagination: { page, limit }
+          })
+          totalPages = Math.ceil(total / limit)
+          productResult.push(...results)
+        }
 
         const categoryResult = await 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, name, brand, isVerified, images, attributes, variations } = item
 
           variations = variations.map(variation => {
             let {
@@ -94,23 +94,27 @@ export class MarketplaceChannelProductMutation {
               stockReported,
               fullPrice,
               priceDiscounted,
-              inventoryProducts: [{
-                qty: stockReported,
-                name: `${name} - ${variationSku}`,
-                sku: variationSku,
-                productVersions: [{
-                  label: 'Default',
-                  packageLengthMM: length,
-                  packageWidthMM: width,
-                  packageHeightMM: height,
-                  packageWeightGram: weight,
-                  qty: 1
-                }]
-              }]
+              inventoryProducts: [
+                {
+                  qty: stockReported,
+                  name: `${name} - ${variationSku}`,
+                  sku: variationSku,
+                  productVersions: [
+                    {
+                      label: 'Default',
+                      packageLengthMM: length,
+                      packageWidthMM: width,
+                      packageHeightMM: height,
+                      packageWeightGram: weight,
+                      qty: 1
+                    }
+                  ]
+                }
+              ]
             }
           })
 
-          images = images.map(image => {
+          images = images?.map(image => {
             return {
               url: image
             }
@@ -132,13 +136,8 @@ export class MarketplaceChannelProductMutation {
           }
         })
 
-        let mappedCategories = categoryResult.results.map((category) => {
-          let {
-            id: categoryId,
-            name: categoryName,
-            parent,
-            isActive
-          } = category
+        let mappedCategories = categoryResult.results.map(category => {
+          let { id: categoryId, name: categoryName, parent, isActive } = category
 
           return {
             categoryId,
@@ -147,18 +146,23 @@ export class MarketplaceChannelProductMutation {
             isLeaf: parent == 0 ? false : true,
             isActive: isActive || true,
             channelCode,
-            countryCode
+            countryCode,
+            childrenCategories: []
+          }
+        })
+
+        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
         })
 
-        mappedCategories.map((category) => {
-          category.childrenCategories = mappedCategories.filter(e => e.parent == category.categoryId )
+        await SellercraftChannelIntegrationAPI.ingestChannelCategories(sellercraftStore, {
+          categories: mappedCategories
         })
 
-        const ingestCategory = await SellercraftChannelIntegrationAPI.ingestChannelCategories(sellercraftStore, { categories: mappedCategories})
-        
-        const ingestProduct = await SellercraftChannelIntegrationAPI.ingestChannelProduct(sellercraftStore, { products: mappedProducts })
-        
+        await SellercraftChannelIntegrationAPI.ingestChannelProduct(sellercraftStore, { products: mappedProducts })
       }
 
       return true