@things-factory/operato-mms 4.1.3 → 4.1.10

package/client/pages/order/logistics/batch-init-popup.js

@@ -62,7 +62,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
   }
 
   render() {
-    const shippingProviders = [{ name: 'SeeBuu Logistics' }, { name: 'GDex' }]
+    const shippingProviders = [{ name: 'SeeBuu Logistics' }, { name: 'GDex' }, { name: 'Others' }]
 
     return html`
       <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.dataGrist.fetch()}></search-form>
@@ -223,6 +223,15 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
           sortable: false,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'trackingUrl',
+          header: i18next.t('field.tracking_url'),
+          record: { editable: true },
+          label: true,
+          sortable: false,
+          width: 130
+        },
         {
           type: 'string',
           name: 'shippingProvider',
@@ -360,6 +369,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
               weightUnit
               totalVolume
               volumeUnit
+              trackingUrl
               marketplaceStore {
                 id
                 name
@@ -406,7 +416,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
             return {
               ...itm,
               status: itm.marketplaceOrder.status,
-              idSplitted: itm.marketplaceOrder.isSplitted,
+              isSplitted: itm.marketplaceOrder.isSplitted,
               shippingProvider: itm.transporter,
               ownShippingProvider: itm.ownTransporter,
               orderCreatedAt: itm.marketplaceOrder.orderCreatedAt,
@@ -504,7 +514,9 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
           id: patch.id,
           orderNo: patch.marketplaceOrder.orderNo,
           trackingNo: patch?.trackingNo,
-          shippingProvider: patch?.shippingProvider
+          shippingProvider: patch?.shippingProvider,
+          ownTrackingNo: patch?.ownTrackingNo,
+          trackingUrl: patch?.trackingUrl
         }
       })
 

package/client/pages/order/logistics/lazada-order-init-batch-popup.js

@@ -314,29 +314,31 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
                 description
               }
               marketplaceOrderItems {
-                marketplaceOrderShipping {
-                  id
-                  name
-                  address1
-                  address2
-                  address3
-                  address4
-                  address5
-                  city
-                  postCode
-                  country
-                  state
-                  phone1
-                  phone2
-                  attentionTo
-                  trackingNo
-                  ownTrackingNo
-                  transporter
-                  ownTransporter
-                  totalWeight
-                  weightUnit
-                  totalVolume
-                  volumeUnit
+                marketplaceOrderShippingItems {
+                  marketplaceOrderShipping {
+                    id
+                    name
+                    address1
+                    address2
+                    address3
+                    address4
+                    address5
+                    city
+                    postCode
+                    country
+                    state
+                    phone1
+                    phone2
+                    attentionTo
+                    trackingNo
+                    ownTrackingNo
+                    transporter
+                    ownTransporter
+                    totalWeight
+                    weightUnit
+                    totalVolume
+                    volumeUnit
+                  }
                 }
                 marketplaceProductVariation {
                   name
@@ -423,11 +425,14 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
+      const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(itm => {
+        const marketplaceOrderShipping = itm.marketplaceOrderShipping
 
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
+        if (marketplaceOrderShipping) {
+          marketplaceOrderShippings.push(marketplaceOrderShipping)
+        }
+      })
     })
 
     const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {

package/client/pages/order/logistics/order-init-popup.js

@@ -1,13 +1,13 @@
 import '@things-factory/component-ui'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
-import { isMobileDevice } from '@things-factory/utils'
-import { css, html, LitElement } from 'lit-element'
-import { PLATFORM } from '../../constants'
-
 import './order-items'
 import './order-shipping'
+
+import { css, html, LitElement } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { i18next, localize } from '@things-factory/i18n-base'
+
 class OrderInitPopup extends localize(i18next)(LitElement) {
   static get properties() {
     return {
@@ -88,11 +88,14 @@ class OrderInitPopup extends localize(i18next)(LitElement) {
     const marketplaceOrderItems = this.orderInformation.marketplaceOrderItems
 
     marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
+      const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(itm => {
+        const marketplaceOrderShipping = itm.marketplaceOrderShipping
 
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
+        if (marketplaceOrderShipping) {
+          marketplaceOrderShippings.push(marketplaceOrderShipping)
+        }
+      })
     })
 
     return Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {

package/client/pages/order/logistics/order-shipping-items.js

@@ -240,18 +240,6 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
           header: i18next.t('field.product_name'),
           width: 400
         },
-        {
-          type: 'string',
-          name: 'variationSku',
-          header: i18next.t('field.variation_sku'),
-          width: 200
-        },
-        {
-          type: 'string',
-          name: 'sku',
-          header: i18next.t('field.variation_name'),
-          width: 200
-        },
         {
           type: 'float',
           name: 'qty',
@@ -279,17 +267,23 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
             ownTrackingNo
             transporter
             ownTransporter
-            marketplaceOrderItems {
-              marketplaceProductVariation {
-                marketplaceProduct {
-                  isku
-                  name
-                }
+            marketplaceOrderShippingItems {
+              product {
+                sku
                 name
-                variationSku
               }
               qty
-              paidPrice
+              marketplaceOrderItem {
+                marketplaceProductVariation {
+                  marketplaceProduct {
+                    isku
+                    name
+                  }
+                  name
+                  variationSku
+                }
+                paidPrice
+              }
             }
           }
         }
@@ -300,15 +294,18 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
     if (!response.errors) {
       this.fillUpForm(this.shippingForm, this.massageOrderShippingInformation())
 
+      const marketplaceOrderShippingItems = response.data.marketplaceOrderShipping.marketplaceOrderShippingItems
       return {
         records:
-          response.data.marketplaceOrderShipping.marketplaceOrderItems.map(item => {
+          marketplaceOrderShippingItems.map(mosi => {
+            const product = mosi.product
+            const marketplaceOrderItem = mosi.marketplaceOrderItem
             return {
-              ...item,
-              ...item.marketplaceProductVariation,
-              sku: item.marketplaceProductVariation.name,
-              productSku: item.marketplaceProductVariation.marketplaceProduct.isku,
-              productName: item.marketplaceProductVariation.marketplaceProduct.name
+              ...marketplaceOrderItem,
+              ...marketplaceOrderItem.marketplaceProductVariation,
+              qty: mosi.qty,
+              productSku: product.sku,
+              productName: product.name
             }
           }) || []
       }

package/client/pages/order/logistics/request-ro-popup.js

@@ -381,22 +381,24 @@ class RequestROPopup extends LitElement {
                 description
               }
               marketplaceOrderItems {
-                marketplaceOrderShipping {
-                  id
-                  name
-                  address1
-                  address2
-                  address3
-                  address4
-                  address5
-                  city
-                  postCode
-                  country
-                  state
-                  phone1
-                  phone2
-                  attentionTo
-                  trackingNo
+                marketplaceOrderShippingItems {
+                  marketplaceOrderShipping {
+                    id
+                    name
+                    address1
+                    address2
+                    address3
+                    address4
+                    address5
+                    city
+                    postCode
+                    country
+                    state
+                    phone1
+                    phone2
+                    attentionTo
+                    trackingNo
+                  }
                 }
                 marketplaceProductVariation {
                   marketplaceProduct {

package/client/pages/order/logistics/shopee-order-init-batch-popup.js

@@ -378,29 +378,31 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
                   description
                 }
                 marketplaceOrderItems {
-                  marketplaceOrderShipping {
-                    id
-                    name
-                    address1
-                    address2
-                    address3
-                    address4
-                    address5
-                    city
-                    postCode
-                    country
-                    state
-                    phone1
-                    phone2
-                    attentionTo
-                    trackingNo
-                    ownTrackingNo
-                    transporter
-                    ownTransporter
-                    totalWeight
-                    weightUnit
-                    totalVolume
-                    volumeUnit
+                  marketplaceOrderShippingItems {
+                    marketplaceOrderShipping {
+                      id
+                      name
+                      address1
+                      address2
+                      address3
+                      address4
+                      address5
+                      city
+                      postCode
+                      country
+                      state
+                      phone1
+                      phone2
+                      attentionTo
+                      trackingNo
+                      ownTrackingNo
+                      transporter
+                      ownTransporter
+                      totalWeight
+                      weightUnit
+                      totalVolume
+                      volumeUnit
+                    }
                   }
                   marketplaceProductVariation {
                     name
@@ -573,11 +575,14 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
+      const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(itm => {
+        const marketplaceOrderShipping = itm.marketplaceOrderShipping
 
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
+        if (marketplaceOrderShipping) {
+          marketplaceOrderShippings.push(marketplaceOrderShipping)
+        }
+      })
     })
 
     const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {

package/client/pages/order/order-by-store.js

@@ -441,31 +441,33 @@ class OrderByStore extends localize(i18next)(PageView) {
                 description
               }
               marketplaceOrderItems {
-                marketplaceOrderShipping {
-                  id
-                  name
-                  address1
-                  address2
-                  address3
-                  address4
-                  address5
-                  city
-                  postCode
-                  country
-                  state
-                  phone1
-                  phone2
-                  attentionTo
-                  trackingNo
-                  ownTrackingNo
-                  totalWeight
-                  weightUnit
-                  totalVolume
-                  volumeUnit
-                  transporter
-                  ownTransporter
-                  orderNoRef
-                  subOrderNoRef
+                marketplaceOrderShippingItems {
+                  marketplaceOrderShipping {
+                    id
+                    name
+                    address1
+                    address2
+                    address3
+                    address4
+                    address5
+                    city
+                    postCode
+                    country
+                    state
+                    phone1
+                    phone2
+                    attentionTo
+                    trackingNo
+                    ownTrackingNo
+                    totalWeight
+                    weightUnit
+                    totalVolume
+                    volumeUnit
+                    transporter
+                    ownTransporter
+                    orderNoRef
+                    subOrderNoRef
+                  }
                 }
                 marketplaceProductVariation {
                   marketplaceProduct {
@@ -523,11 +525,14 @@ class OrderByStore extends localize(i18next)(PageView) {
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
+      const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(itm => {
+        const marketplaceOrderShipping = itm.marketplaceOrderShipping
 
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
+        if (marketplaceOrderShipping) {
+          marketplaceOrderShippings.push(marketplaceOrderShipping)
+        }
+      })
     })
 
     const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {

package/client/pages/order/select-datetime-popup.js

@@ -72,8 +72,8 @@ export class SelectDateTimePopup extends localize(i18next)(LitElement) {
           `,
           variables: {
             storeId: this.storeId,
-            fromDate: this._getInputByName('fromDate').value,
-            toDate: this._getInputByName('toDate').value
+            fromDate: new Date(this._getInputByName('fromDate').value).toISOString(),
+            toDate: new Date(this._getInputByName('toDate').value).toISOString()
           }
         })
 

package/config.development.js

@@ -0,0 +1,160 @@
+module.exports = {
+    domainType: 'company',
+    domainExtType: 'company',
+    subdomainOffset: 2,
+    ormconfig: {
+      name: 'default',
+      type: 'postgres',
+      database: 'postgres',
+      username: 'postgres',
+      password: 'hatio',
+      host: 'localhost',
+      port: 15432,
+      synchronize: true,
+      logging: true
+    },
+    // ormconfig: {
+    //   name: 'default',
+    //   type: 'postgres',
+    //   database: 'postgres3',
+    //   username: 'postgres',
+    //   password: 'mysecretpassword',
+    //   host: 'samhouse.asuscomm.com',
+    //   port: 15432,
+    //   synchronize: true,
+    //   logging: true
+    // },
+    inspect: '9280',
+    password: {
+      lowerCase: true,
+      upperCase: false,
+      digit: false,
+      specialCharacter: false,
+      allowRepeat: true,
+      useTightPattern: false,
+      useLoosePattern: true,
+      tightCharacterLength: 4,
+      looseCharacterLength: 4,
+      history: 2
+    },
+    oauth2: {
+      platforms: [
+        {
+          name: 'Operato Hub',
+          apiURL: 'http://operato-s.com:3000/api'
+        }
+      ]
+    },
+    useVirtualHostBasedDomain: false,
+    port: 5000,
+    uploads: 'uploads',
+    attachmentsPath: 'attachments',
+    SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
+    logger: {
+      file: {
+        filename: 'logs/application-%DATE%.log',
+        datePattern: 'YYYY-MM-DD-HH',
+        zippedArchive: true,
+        maxSize: '200m',
+        maxFiles: '1m',
+        level: 'info'
+      }
+    },
+    email: {
+      host: 'smtp.office365.com',
+      port: 587,
+      secure: false, // true for 465, false for other ports
+      auth: {
+        user: 'no-reply@hatiolab.com', // generated ethereal user
+        pass: 'h@ti0LAB1008' // generated ethereal password
+      },
+      secureConnection: false,
+      tls: {
+        ciphers: 'SSLv3'
+      }
+    },
+    sender: 'no-reply@hatiolab.com',
+    notification: {
+      fcm: {
+        serviceAccount: {
+          project_id: 'operato',
+          private_key:
+            '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
+          client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
+        },
+        appConfig: {
+          apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
+          projectId: 'operato',
+          messagingSenderId: 79537064975,
+          appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
+        },
+        serverKey:
+          'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
+      },
+      vapidKey: {
+        subject: 'mailto:heartyoh@hatiolab.com',
+        publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
+        privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
+      }
+    },
+    marketplaceIntegrationShopee: {
+      platform: 'shopee',
+      isUAT: false,
+      application: 'Operato MMS',
+      partnerId: 846025,
+      partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
+    },
+    // marketplaceIntegrationShopee: {
+    //   platform: 'shopee',
+    //   isUAT: true,
+    //   application: 'Staging MMS',
+    //   partnerId: 845525,
+    //   partnerKey: '4a3f4214fd0f0bda970b342a99b6f8705fc7bacad2743cffa7ed67b79840665e'
+    // },
+    marketplaceIntegrationLazada: {
+      platform: 'lazada',
+      application: 'operato-mms',
+      appKey: '120961',
+      appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
+      callback: 'https://maybank.operato-m.com/lazada-callback'
+    },
+    fulfillmentIntegrationOperato: {
+      host: 'operato-s.com:3000',
+      protocol: 'http',
+      platform: 'operato',
+      application: 'Operato MMS',
+      appKey: 'a9bf751e622bf146662b240d58971051',
+      appSecret: '1c385935dc131c4b902b9bbf6a4798af',
+      callback: 'http://operato-s.com:5000/callback-operato'
+    },
+    marketplaceIntegrationShopify: {
+      platform: 'shopify',
+      application: 'Operato',
+      apiKey: '37da47200ab87c8aaf0634869c80bd5f',
+      apiSecret: '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'
+    },
+    marketplaceIntegrationShopifyPrivate: {
+      platform: 'shopify',
+      application: 'Beacon Chicken 1',
+      apiKey: '37da47200ab87c8aaf0634869c80bd5f',
+      apiSecret: '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'
+    },
+    marketplaceIntegrationWoocommerce: {
+      key_id: '',
+      user_id: '',
+      consumer_key: '',
+      consumer_secret: '',
+      key_permission: 'read' | 'write' | 'read_write'
+    },
+    marketplaceIntegrationMagento: {
+      oauth_signature_method: 'HMAC-SHA1',
+      oauth_verifier: '',
+      oauth_consumer_key: '',
+      oauth_consumer_secret: ''
+    },
+    sellercraftChannelIntegrationConfig: {
+      apiKey: 'eqDVmIp0kxakM4sNnzqTkySBM73UGMS1nOPDN5Z1',
+      tokenCraftUrl: 'https://staging-tokencraft.sellercraft.co/v1/get-shop',
+      getShopsTokenCraftUrl: 'https://staging-tokencraft.sellercraft.co/v1/get-shops'
+    }
+  }