@things-factory/operato-mms 4.3.203 → 4.3.204

package/client/pages/setting/global-marketplace-settings.js

@@ -0,0 +1,111 @@
+import '../../components/stock-allocation-ratio'
+import '../../components/marketplace-order-max-weight'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client } from '@things-factory/shell'
+
+class GlobalMarketplaceSettings extends localize(i18next)(LitElement) {
+  static get styles() {
+    return [
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+          background-color: var(--main-section-background-color);
+          padding: var(--padding-wide);
+          overflow: auto;
+        }
+        h2 {
+          margin: var(--title-margin);
+          font: var(--title-font);
+          color: var(--title-text-color);
+        }
+        [subtitle] {
+          padding: var(--subtitle-padding);
+          font: var(--subtitle-font);
+          color: var(--subtitle-text-color);
+        }
+        input {
+          display: block;
+        }
+      `
+    ]
+  }
+
+  static get properties() {
+    return {
+      ratioSettings: Array
+    }
+  }
+
+  render() {
+    const ratioSettings = this.ratioSettings || []
+
+    return html`
+      <div subtitle>${i18next.t('text.update_stock_allocation_ratio')}</div>
+
+      <stock-allocation-ratio
+        .ratioSettings=${ratioSettings.filter(setting => setting.category === 'stock_allocation')}
+        .category=${'stock_allocation'}
+        @fetch-settings=${async () => {
+          this.ratioSettings = await this.fetchMarketplaceSettings()
+        }}
+      ></stock-allocation-ratio>
+
+      <div subtitle>${i18next.t('text.update_marketplace_order_max_weight')}</div>
+
+      <marketplace-order-max-weight
+        .maxWeightSettings=${ratioSettings.filter(setting => setting.category === 'marketplace_order_max_weight')}
+        @fetch-settings=${async () => {
+          this.ratioSettings = await this.fetchMarketplaceSettings()
+        }}
+      ></marketplace-order-max-weight>
+    `
+  }
+
+  async firstUpdated() {
+    this.ratioSettings = await this.fetchMarketplaceSettings()
+  }
+
+  async fetchMarketplaceSettings() {
+    const filters = []
+    const sortings = []
+
+    const response = await client.query({
+      query: gql`
+        query marketplaceSettings($filters: [Filter], $sortings: [Sorting]) {
+          marketplaceSettings(filters: $filters, sortings: $sortings) {
+            items {
+              id
+              name
+              marketplaceStore {
+                id
+                name
+                storeName
+                platform
+                description
+                status
+              }
+              category
+              value
+              updatedAt
+            }
+            total
+          }
+        }
+      `,
+      variables: { filters, sortings }
+    })
+
+    return response.data.marketplaceSettings.items.filter(item => item.marketplaceStore.status == 'ACTIVE') || []
+  }
+
+  showToast(message) {
+    document.dispatchEvent(new CustomEvent('notify', { detail: { message, option: { timer: 1000 } } }))
+  }
+}
+
+customElements.define('global-marketplace-settings', GlobalMarketplaceSettings)

package/client/pages/setting/marketplace-setting.js

@@ -1,14 +1,13 @@
-import '../../components/stock-allocation-ratio'
-import '../../components/marketplace-order-max-weight'
+import '@things-factory/component-ui'
+import './global-marketplace-settings'
+import './transaction-rates'
 
-import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin.js'
 
-import { i18next } from '@things-factory/i18n-base'
-import { client, PageView, store } from '@things-factory/shell'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { PageView } from '@things-factory/shell'
 
-class MarketplaceSetting extends connect(store)(PageView) {
+class MarketplaceSetting extends localize(i18next)(PageView) {
   static get styles() {
     return [
       css`
@@ -38,7 +37,7 @@ class MarketplaceSetting extends connect(store)(PageView) {
 
   static get properties() {
     return {
-      ratioSettings: Array
+      currentTab: String
     }
   }
 
@@ -50,28 +49,32 @@ class MarketplaceSetting extends connect(store)(PageView) {
   }
 
   render() {
-    const ratioSettings = this.ratioSettings || []
-
-    return html`
-      <h2>${i18next.t('title.global_marketplace_settings')}</h2>
-      <div subtitle>${i18next.t('text.update_stock_allocation_ratio')}</div>
+    const SETTING_TABS = {
+      GLOBAL_SETTINGS: i18next.t('label.global_marketplace_settings'),
+      TRANSACTION_RATES: i18next.t('label.transaction_rates')
+    }
 
-      <stock-allocation-ratio
-        .ratioSettings=${ratioSettings.filter(setting => setting.category === 'stock_allocation')}
-        .category=${'stock_allocation'}
-        @fetch-settings=${async () => {
-          this.ratioSettings = await this.fetchMarketplaceSettings()
-        }}
-      ></stock-allocation-ratio>
+    const settingTemplate = [
+      { name: i18next.t('label.global_marketplace_settings'), template: 'global-marketplace-settings' },
+      { name: i18next.t('label.transaction_rates'), template: 'transaction-rates' }
+    ]
 
-      <div subtitle>${i18next.t('text.update_marketplace_order_max_weight')}</div>
+    const settingSet = {
+      [SETTING_TABS.GLOBAL_SETTINGS]: [],
+      [SETTING_TABS.TRANSACTION_RATES]: []
+    }
 
-      <marketplace-order-max-weight
-        .maxWeightSettings=${ratioSettings.filter(setting => setting.category === 'marketplace_order_max_weight')}
-        @fetch-settings=${async () => {
-          this.ratioSettings = await this.fetchMarketplaceSettings()
-        }}
-      ></marketplace-order-max-weight>
+    return html`
+      <quick-find-content
+        id="setting-list"
+        .data="${settingSet}"
+        @tabChanged="${e => (this.currentTab = e.detail.currentTabKey)}"
+        .contentRenderer="${(item, currentKeyTab) => {
+          const matchTab = settingTemplate.find(ot => ot.name === currentKeyTab)
+          let template = document.createElement(matchTab.template)
+          return template
+        }}"
+      ></quick-find-content>
     `
   }
 
@@ -116,11 +119,7 @@ class MarketplaceSetting extends connect(store)(PageView) {
      */
   }
 
-  async pageUpdated(changes, lifecycle, before) {
-    if (this.active) {
-      this.ratioSettings = await this.fetchMarketplaceSettings()
-    }
-  }
+  async pageUpdated(changes, lifecycle, before) {}
 
   pageDisposed(lifecycle) {
     /*
@@ -134,39 +133,6 @@ class MarketplaceSetting extends connect(store)(PageView) {
      */
   }
 
-  async fetchMarketplaceSettings() {
-    const filters = []
-    const sortings = []
-
-    const response = await client.query({
-      query: gql`
-        query marketplaceSettings($filters: [Filter], $sortings: [Sorting]) {
-          marketplaceSettings(filters: $filters, sortings: $sortings) {
-            items {
-              id
-              name
-              marketplaceStore {
-                id
-                name
-                storeName
-                platform
-                description
-                status
-              }
-              category
-              value
-              updatedAt
-            }
-            total
-          }
-        }
-      `,
-      variables: { filters, sortings }
-    })
-
-    return response.data.marketplaceSettings.items.filter(item => item.marketplaceStore.status == 'ACTIVE') || []
-  }
-
   showToast(message) {
     document.dispatchEvent(new CustomEvent('notify', { detail: { message, option: { timer: 1000 } } }))
   }

package/client/pages/setting/transaction-rates.js

@@ -0,0 +1,454 @@
+import '@things-factory/form-ui'
+import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { i18next } from '@things-factory/i18n-base'
+import { client, CustomAlert } from '@things-factory/shell'
+import { ScrollbarStyles } from '@things-factory/styles'
+import { isMobileDevice } from '@things-factory/utils'
+
+class TransactionRates extends LitElement {
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+        }
+        search-form {
+          overflow: visible;
+        }
+        data-grist {
+          overflow-y: auto;
+          flex: 1;
+        }
+        .button-container {
+          padding: var(--button-container-padding);
+          margin: var(--button-container-margin);
+          text-align: var(--button-container-align);
+          background-color: var(--button-container-background);
+          height: var(--button-container-height);
+        }
+        .button-container button {
+          background-color: var(--button-container-button-background-color);
+          border-radius: var(--button-container-button-border-radius);
+          height: var(--button-container-button-height);
+          border: var(--button-container-button-border);
+          margin: var(--button-container-button-margin);
+
+          padding: var(--button-padding);
+          color: var(--theme-white-color);
+          font: var(--button-font);
+          text-transform: var(--button-text-transform);
+        }
+        .button-container button:hover,
+        .button-container button:active {
+          background-color: var(--button-background-focus-color);
+        }
+      `
+    ]
+  }
+
+  static get properties() {
+    return {
+      _searchFields: Array,
+      config: Object,
+      _selectedRecords: Array,
+      _marketplaceStore: Array,
+      _brands: Array,
+      _rateTypes: Array
+    }
+  }
+
+  render() {
+    return html`
+      <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.dataGrist.fetch()}></search-form>
+
+      <data-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.config}
+        .fetchHandler="${this.fetchHandler.bind(this)}"
+        @select-record-change=${e => (this._selectedRecords = e.detail.selectedRecords)}
+      ></data-grist>
+
+      <div class="button-container">
+        <button @click=${this._saveMarketplaceTransactionRate.bind(this)}>${i18next.t('button.save')}</button>
+        <button @click=${this._deleteMarketplaceTransactionRates.bind(this)}>${i18next.t('button.delete')}</button>
+      </div>
+    `
+  }
+
+  get searchForm() {
+    return this.shadowRoot.querySelector('search-form')
+  }
+
+  get dataGrist() {
+    return this.shadowRoot.querySelector('data-grist')
+  }
+
+  updated(_changes, lifecycle) {
+    if (this.active) {
+      this._warehouseId = lifecycle.resourceId
+      this.dataGrist.fetch()
+    }
+  }
+
+  async firstUpdated() {
+    this._marketplaceStore = await this._fetchMarketplaceStore()
+    this._brands = await this._fetchBrand()
+    this._rateTypes = ['PERCENTAGE', 'AMOUNT']
+
+    this._searchFields = [
+      {
+        label: i18next.t('field.brand'),
+        name: 'brand',
+        type: 'select',
+        options: [
+          { value: '' },
+          ...this._brands
+            .map(brand => {
+              return {
+                name: brand,
+                value: brand
+              }
+            })
+            .sort()
+        ],
+        props: { searchOper: 'eq' }
+      },
+      {
+        label: i18next.t('field.payment_method'),
+        name: 'paymentMethod',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      }
+    ]
+
+    this.config = {
+      rows: { selectable: { multiple: true } },
+      list: { fields: ['name', 'type', 'status'] },
+      columns: [
+        { type: 'gutter', gutterName: 'dirty' },
+        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'select',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(this._brands)
+                .map(b => b)
+                .sort()
+            ]
+          },
+          imex: { header: i18next.t('field.brand'), key: 'brand', width: 50, type: 'string' },
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'paymentMethod',
+          header: i18next.t('field.payment_method'),
+          record: { editable: true, align: 'center' },
+          imex: { header: i18next.t('field.payment_method'), key: 'paymentMethod', width: 50, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'select',
+          name: 'rateType',
+          header: i18next.t('field.rate_type'),
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(this._rateTypes)
+                .map(b => b)
+                .sort()
+            ]
+          },
+          imex: { header: i18next.t('field.rate_type'), key: 'rateType', width: 50, type: 'string' },
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'float',
+          name: 'rate',
+          header: i18next.t('field.rate'),
+          record: { editable: true, align: 'center' },
+          imex: { header: i18next.t('field.rate'), key: 'rate', width: 50, type: 'string' },
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'select',
+          name: 'marketplaceStore',
+          header: i18next.t('field.marketplace_store'),
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(this._marketplaceStore.records)
+                .map(ms => ms.storeName)
+                .sort()
+            ]
+          },
+          imex: { header: i18next.t('field.marketplace_store'), key: 'marketplaceStore', width: 50, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'datetime',
+          name: 'createdAt',
+          header: i18next.t('field.created_at'),
+          record: { editable: false, align: 'center' },
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'datetime',
+          name: 'updatedAt',
+          header: i18next.t('field.updated_at'),
+          record: { editable: false, align: 'center' },
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'object',
+          name: 'updater',
+          header: i18next.t('field.updater'),
+          record: { editable: false, align: 'center' },
+          sortable: true,
+          width: 80
+        }
+      ]
+    }
+  }
+
+  async fetchHandler({ page, limit, sorters = [] }) {
+    let filters = []
+
+    const response = await client.query({
+      query: gql`
+        query marketplaceTransactionRates($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          marketplaceTransactionRates(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              brand
+              paymentMethod
+              rateType
+              rate
+              marketplaceStore {
+                id
+                platform
+                name
+                storeName
+              }
+              createdAt
+              updatedAt
+              updater {
+                id
+                name
+              }
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters: [...filters, ...this.searchForm.queryFilters],
+        pagination: { page, limit },
+        sortings: sorters
+      }
+    })
+
+    return {
+      total: response.data.marketplaceTransactionRates.total || 0,
+      records:
+        response.data.marketplaceTransactionRates.items.map(data => {
+          return {
+            ...data,
+            marketplaceStore: data.marketplaceStore.storeName
+          }
+        }) || []
+    }
+  }
+
+  async _saveMarketplaceTransactionRate(patches) {
+    try {
+      patches = this.dataGrist.exportPatchList({ flagName: 'cuFlag' })
+      this.validateData(patches)
+      patches = patches.map(patch => {
+        if (patch.marketplaceStore) {
+          let ms = this._marketplaceStore.records.find(ms => ms.storeName === patch.marketplaceStore)
+          return {
+            ...patch,
+            marketplaceStore: {
+              id: ms.id,
+              name: ms.name,
+              description: ms.description
+            }
+          }
+        } else {
+          return { ...patch }
+        }
+      })
+      if (patches && patches.length) {
+        const response = await client.mutate({
+          mutation: gql`
+            mutation updateMultipleMarketplaceTransactionRate($patches: [MarketplaceTransactionRatePatch!]!) {
+              updateMultipleMarketplaceTransactionRate(patches: $patches) {
+                id
+              }
+            }
+          `,
+          variables: { patches: patches }
+        })
+
+        if (!response.errors) {
+          this.dataGrist.fetch()
+          this.showToast(i18next.t('text.data_updated_successfully'))
+        }
+      } else {
+        CustomAlert({
+          title: i18next.t('text.nothing_changed'),
+          text: i18next.t('text.there_is_nothing_to_save')
+        })
+      }
+    } catch (error) {
+      this.showToast(error)
+    }
+  }
+
+  async _deleteMarketplaceTransactionRates() {
+    const ids = this.dataGrist.selected.map(record => record.id)
+    if (ids && ids.length) {
+      const anwer = await CustomAlert({
+        type: 'warning',
+        title: i18next.t('button.delete'),
+        text: i18next.t('text.are_you_sure'),
+        confirmButton: { text: i18next.t('button.delete') },
+        cancelButton: { text: i18next.t('button.cancel') }
+      })
+
+      if (!anwer.value) return
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation deleteMarketplaceTransactionRates($ids: [String!]!) {
+            deleteMarketplaceTransactionRates(ids: $ids)
+          }
+        `,
+        variables: { ids }
+      })
+
+      if (!response.errors) {
+        this.dataGrist.fetch()
+        this.showToast(i18next.t('text.data_deleted_successfully'))
+      }
+    } else {
+      CustomAlert({
+        title: i18next.t('text.nothing_selected'),
+        text: i18next.t('text.there_is_nothing_to_delete')
+      })
+    }
+  }
+
+  async _fetchMarketplaceStore() {
+    const filters = []
+    const pagination = {}
+    const sortings = []
+    const response = await client.query({
+      query: gql`
+        query marketplaceStores($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          marketplaceStores(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              platform
+              name
+              storeName
+              description
+            }
+            total
+          }
+        }
+      `,
+      variables: { filters: filters, pagination: pagination, sortings: sortings }
+    })
+
+    if (!response.errors) {
+      return {
+        total: response.data.marketplaceStores.total || 0,
+        records: response.data.marketplaceStores.items || []
+      }
+    }
+  }
+
+  async _fetchBrand() {
+    const filters = []
+    const response = await client.query({
+      query: gql`
+        query productBrands($filters: [Filter!]) {
+          productBrands(filters: $filters) {
+            items {
+              brand
+            }
+          }
+        }
+      `,
+      variables: { filters: filters }
+    })
+
+    if (!response.errors) {
+      return response.data.productBrands.items.map(item => {
+        return item.brand
+      })
+    }
+  }
+
+  validateData(patches) {
+    patches.find(patch => {
+      if (patch.cuFlag === '+') {
+        if (!patch.brand || !patch.paymentMethod || !patch.rateType || !patch.rate || !patch.marketplaceStore) {
+          throw new Error(i18next.t('text.empty_fields'))
+        }
+      } else {
+        if (
+          patch.brand === '' ||
+          patch.paymentMethod === '' ||
+          patch.rateType === '' ||
+          patch.rate === '' ||
+          patch.marketplaceStore === ''
+        ) {
+          throw new Error(i18next.t('text.empty_fields'))
+        }
+      }
+      if (patch.rate) {
+        if (isNaN(parseFloat(patch.rate)) === true) {
+          throw new Error(i18next.t('text.invalid_rate'))
+        }
+      }
+    })
+  }
+
+  onlyNumbers(str) {
+    const specialCharacter = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/
+    const alphabet = /[a-zA-Z]/g
+
+    const value = specialCharacter.test(str) ? false : alphabet.test(str) ? false : true
+    return value
+  }
+
+  showToast(message) {
+    document.dispatchEvent(new CustomEvent('notify', { detail: { message } }))
+  }
+}
+
+window.customElements.define('transaction-rates', TransactionRates)

package/client/route.js

@@ -106,5 +106,9 @@ export default function route(page) {
     case 'shopee-sales-report':
       import('./pages/reports/sales-by-platform/shopee-sales-report')
       return page
+
+    case 'mms-transaction-rates':
+      import('./pages/setting/transaction-rates')
+      return page
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-mms",
-  "version": "4.3.203",
+  "version": "4.3.204",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -80,12 +80,12 @@
     "@things-factory/integration-fulfillment": "^4.3.190",
     "@things-factory/integration-lmd": "^4.3.197",
     "@things-factory/lite-menu": "^4.3.186",
-    "@things-factory/marketplace-base": "^4.3.203",
+    "@things-factory/marketplace-base": "^4.3.204",
     "@things-factory/more-ui": "^4.3.179",
     "@things-factory/notification": "^4.3.186",
     "@things-factory/oauth2-client": "^4.3.179",
     "@things-factory/pdf": "^4.3.159",
-    "@things-factory/product-base": "^4.3.186",
+    "@things-factory/product-base": "^4.3.204",
     "@things-factory/resource-ui": "^4.3.179",
     "@things-factory/scene-data-transform": "^4.3.159",
     "@things-factory/scene-excel": "^4.3.159",
@@ -100,11 +100,11 @@
     "@things-factory/scene-visualizer": "^4.3.159",
     "@things-factory/setting-ui": "^4.3.186",
     "@things-factory/system-ui": "^4.3.179",
-    "@things-factory/warehouse-base": "^4.3.203"
+    "@things-factory/warehouse-base": "^4.3.204"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.179",
     "@types/node-fetch": "^2.5.7"
   },
-  "gitHead": "b52c1edcf8ce5a968ccbf008a6a5f364f7de6f08"
+  "gitHead": "d7400c05d76662c2df54c0278078ade54e57f271"
 }

package/things-factory.config.js

@@ -107,6 +107,10 @@ export default {
     {
       tagname: 'shopee-sales-report',
       page: 'shopee-sales-report'
+    },
+    {
+      tagname: 'mms-transaction-rates',
+      page: 'mms-transaction-rates'
     }
   ],
   bootstrap

package/translations/en.json

@@ -1,14 +1,4 @@
 {
-  "field.variation_id": "variation ID",
-  "field.voucher_amt": "voucher amount",
-  "field.shipping_rebate": "shipping rebate",
-  "field.shipping_mode": "shipping mode",
-  "field.service_fee": "service fee",
-  "field.transaction_fee": "transaction fee",
-  "field.total_released_amt": "total release amount",
-  "field.voucher_code": "voucher code",
-  "field.comission_fee": "comission fee",
-  "field.fulfilment_center": "fulfilment center",
   "button.add_product": "add product",
   "button.add": "add",
   "button.airway_bill": "airway bill",
@@ -54,6 +44,7 @@
   "field.buyer_username": "buyer username",
   "field.channel_sku": "channel sku",
   "field.city": "city",
+  "field.comission_fee": "comission fee",
   "field.commission_fee": "commission fee",
   "field.country": "country",
   "field.criteria": "criteria",
@@ -64,18 +55,20 @@
   "field.eta_date": "eta date",
   "field.from_date": "from date",
   "field.fulfillment_partner": "fulfilment partner",
+  "field.fulfilment_center": "fulfilment center",
   "field.grand_total": "grand total",
   "field.import_cargo": "import cargo",
-  "field.isku": "ISKU",
   "field.is_splitted": "splitted",
+  "field.isku": "ISKU",
   "field.item_count": "item count",
   "field.item_price_credit": "item price credit",
   "field.item": "item",
   "field.last_updated": "last updated",
-  "field.lazada_bonus": "lazada bonus",
   "field.lazada_bonus_lzd_cofund": "lazada bonus - LZD co-fund",
+  "field.lazada_bonus": "lazada bonus",
   "field.marketplace_product_name": "marketplace product name",
   "field.marketplace_product_sku": "marketplace product sku",
+  "field.marketplace_store": "marketplace store",
   "field.name": "name",
   "field.not_assigned": "not assigned",
   "field.on_hold": "on hold",
@@ -93,8 +86,9 @@
   "field.packing_type": "packing type",
   "field.paid_price": "paid price",
   "field.pallet_qty": "pallet qty",
-  "field.payout_date": "payout date",
   "field.payment_fee": "payment fee",
+  "field.payment_method": "payment method",
+  "field.payout_date": "payout date",
   "field.pickup_date": "pickup date",
   "field.pickup_time_id": "pickup time id",
   "field.post_code": "post code",
@@ -109,6 +103,8 @@
   "field.promotional_charges_flexi_combo": "promotional charges flexi-combo",
   "field.promotional_charges_vouchers": "promotional charges vouchers",
   "field.qty": "qty",
+  "field.rate_type": "rate type",
+  "field.rate": "rate",
   "field.ref_no": "ref no.",
   "field.refund_amount": "refund amount",
   "field.remark": "remark",
@@ -121,13 +117,16 @@
   "field.save": "save",
   "field.seller_shipping_fee_voucher": "seller shipping fee voucher",
   "field.sender": "sender",
+  "field.service_fee": "service fee",
   "field.shipping_carrier": "shipping carrier",
-  "field.shipping_fee_voucher": "shipping fee voucher",
   "field.shipping_fee_paid_by_customer": "shipping fee (paid by customer)",
   "field.shipping_fee_voucher_by_lazada": "shipping fee voucher (by lazada)",
   "field.shipping_fee_voucher_by_seller": "shipping fee voucher (by seller)",
+  "field.shipping_fee_voucher": "shipping fee voucher",
   "field.shipping_fee": "shipping fee",
+  "field.shipping_mode": "shipping mode",
   "field.shipping_provider": "shipping provider",
+  "field.shipping_rebate": "shipping rebate",
   "field.sku_name": "sku name",
   "field.sku": "SKU",
   "field.sold_stock": "sold stock",
@@ -141,12 +140,14 @@
   "field.tax_amount": "tax amount",
   "field.to_date": "to date",
   "field.total_amount": "total amount",
+  "field.total_released_amt": "total release amount",
   "field.total_uom_value": "total UOM value",
   "field.total_volume": "total volume",
   "field.total_weight": "total weight",
   "field.town": "town",
   "field.tracking_no": "tracking no",
   "field.tracking_url": "tracking URL",
+  "field.transaction_fee": "transaction fee",
   "field.transporter": "transporter",
   "field.type": "type",
   "field.unit": "unit",
@@ -154,6 +155,7 @@
   "field.uom": "UOM",
   "field.variation_cost_price": "variation cost price",
   "field.variation_description": "variation description",
+  "field.variation_id": "variation ID",
   "field.variation_marketplace_status": "variation marketplace status",
   "field.variation_name": "variation name",
   "field.variation_qty": "variation qty",
@@ -161,6 +163,8 @@
   "field.variation_selling_price": "variation selling price",
   "field.variation_sku": "variation sku",
   "field.variation_uom_value": "variation uom value",
+  "field.voucher_amt": "voucher amount",
+  "field.voucher_code": "voucher code",
   "field.warehouse_sku": "warehouse SKU",
   "field.zipcode": "zipcode",
   "label.address_id": "address id",
@@ -189,6 +193,7 @@
   "label.do_no": "D/O no.",
   "label.eta_date": "eta date",
   "label.from_date": "from date",
+  "label.global_marketplace_settings": "global marketplace settings",
   "label.group_product": "group product",
   "label.height": "height",
   "label.images": "images",
@@ -268,6 +273,7 @@
   "label.to_confirm_receive": "to confirm receive",
   "label.to_date": "to date",
   "label.tracking_no": "tracking no",
+  "label.transaction_rates": "transaction rates",
   "label.truck_no": "truck no.",
   "label.unpaid": "unpaid",
   "label.upload_documents": "upload documents",
@@ -291,8 +297,10 @@
   "text.do_you_want_to_update_x": "do you want to update {x}",
   "text.document_has_been_generated": "document has been generated",
   "text.draft_product_has_been_updated_successfully": "draft product has been updated successfully",
+  "text.empty_fields": "empty field(s)",
   "text.form_is_incomplete": "form is incomplete",
   "text.initialise_logistics": "initialise logistics",
+  "text.invalid_rate": "invalid input (rate)",
   "text.isku_is_empty": "isku is empty",
   "text.kindly_select_a_shipping_provider": "kindly select a shipping provider",
   "text.kindly_select_at_least_one_of_the_option_for_configuration": "kindly select at least one of the option for configuration",
@@ -360,6 +368,7 @@
   "title.lazada_sales_report": "lazada sales report",
   "title.link_product_configuration": "link product configuration",
   "title.marketplace_setting": "marketplace setting",
+  "title.marketplace_transaction_rate": "marketplace transaction rate",
   "title.onhand_inventory": "onhand inventory",
   "title.order_by_store": "order by store",
   "title.order_items_information": "order items information",

package/translations/ko.json

@@ -186,6 +186,7 @@
   "label.do_no": "[ko] D/O no.",
   "label.eta_date": "[ko] eta date",
   "label.from_date": "[ko] from date",
+  "label.global_marketplace_settings": "[ko] global marketplace settings",
   "label.group_product": "[ko] group product",
   "label.height": "[ko] height",
   "label.images": "[ko] images",
@@ -261,6 +262,7 @@
   "label.to_confirm_receive": "[ko] to confirm receive",
   "label.to_date": "[ko] to date",
   "label.tracking_no": "[ko] tracking no",
+  "label.transaction_rates": "[ko] transaction rates",
   "label.truck_no": "[ko] truck no.",
   "label.unpaid": "[ko] unpaid",
   "label.upload_documents": "[ko] upload documents",
@@ -364,5 +366,12 @@
   "title.uploaded_images": "[ko] uploaded images",
   "title.vas": "[ko] vas",
   "title.warehouse_products": "[ko] warehouse products",
-  "button.ok": "[ko] ok"
+  "button.ok": "[ko] ok",
+  "field.payment_method": "[ko] payment method",
+  "field.rate_type": "[ko] rate type",
+  "field.rate": "[ko] rate",
+  "field.marketplace_store": "[ko] marketplace store",
+  "title.marketplace_transaction_rate": "[ko] marketplace transaction rate",
+  "text.empty_fields": "[ko] empty field(s)",
+  "text.invalid_rate": "[ko] invalid input (rate)"
 }

package/translations/ms.json

@@ -186,6 +186,7 @@
   "label.do_no": "[ms] D/O no.",
   "label.eta_date": "[ms] eta date",
   "label.from_date": "[ms] from date",
+  "label.global_marketplace_settings": "[ms]global marketplace settings",
   "label.group_product": "[ms] group product",
   "label.height": "[ms] height",
   "label.images": "[ms] images",
@@ -261,6 +262,7 @@
   "label.to_confirm_receive": "[ms] to confirm receive",
   "label.to_date": "[ms] to date",
   "label.tracking_no": "[ms] tracking no",
+  "label.transaction_rates": "[ms] transaction rates",
   "label.truck_no": "[ms] truck no.",
   "label.unpaid": "[ms] unpaid",
   "label.upload_documents": "[ms] upload documents",
@@ -364,5 +366,12 @@
   "title.uploaded_images": "[ms] uploaded images",
   "title.vas": "[ms] vas",
   "title.warehouse_products": "[ms] warehouse products",
-  "button.ok": "[ms] ok"
+  "button.ok": "[ms] ok",
+  "field.payment_method": "[ms] payment method",
+  "field.rate_type": "[ms] rate type",
+  "field.rate": "[ms] rate",
+  "field.marketplace_store": "[ms] marketplace store",
+  "title.marketplace_transaction_rate": "[ms] marketplace transaction rate",
+  "text.empty_fields": "[ms] empty field(s)",
+  "text.invalid_rate": "[ms] invalid input (rate)"
 }

package/translations/zh.json

@@ -186,6 +186,7 @@
   "label.do_no": "[zh] D/O no.",
   "label.eta_date": "[zh] eta date",
   "label.from_date": "[zh] from date",
+  "label.global_marketplace_settings": "[zh]global marketplace settings",
   "label.group_product": "[zh] group product",
   "label.height": "[zh] height",
   "label.images": "[zh] images",
@@ -261,6 +262,7 @@
   "label.to_confirm_receive": "[zh] to confirm receive",
   "label.to_date": "[zh] to date",
   "label.tracking_no": "[zh] tracking no",
+  "label.transaction_rates": "[zh] transaction rates",
   "label.truck_no": "[zh] truck no.",
   "label.unpaid": "[zh] unpaid",
   "label.upload_documents": "[zh] upload documents",
@@ -364,5 +366,12 @@
   "title.uploaded_images": "[zh] uploaded images",
   "title.vas": "[zh] vas",
   "title.warehouse_products": "[zh] warehouse products",
-  "button.ok": "[zh] ok"
+  "button.ok": "[zh] ok",
+  "field.payment_method": "[zh] payment method",
+  "field.rate_type": "[zh] rate_ ype",
+  "field.rate": "[zh] rate",
+  "field.marketplace_store": "[zh] marketplace store",
+  "title.marketplace_transaction_rate": "[zh] marketplace transaction rate",
+  "text.empty_fields": "[zh] empty field(s)",
+  "text.invalid_rate": "[zh] invalid input (rate)"
 }