@things-factory/operato-mms 3.7.15 → 3.8.3

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

@@ -253,6 +253,20 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
           label: true,
           sortable: true,
           width: 120
+        },
+        {
+          type: 'datetime',
+          name: 'orderCreatedAt',
+          header: i18next.t('field.created_at'),
+          sortable: true,
+          width: 180
+        },
+        {
+          type: 'datetime',
+          name: 'orderUpdatedAt',
+          header: i18next.t('field.updated_at'),
+          sortable: true,
+          width: 180
         }
       ]
     }
@@ -385,7 +399,9 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
               ...itm,
               status: itm.marketplaceOrder.status,
               shippingProvider: itm.transporter,
-              ownShippingProvider: itm.ownTransporter
+              ownShippingProvider: itm.ownTransporter,
+              orderCreatedAt: itm.marketplaceOrder.orderCreatedAt,
+              orderUpdatedAt: itm.marketplaceOrder.orderUpdatedAt
             }
           }) || []
       }

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

@@ -147,7 +147,6 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
           return { emphasized }
         }
       },
-      pagination: { infinite: true },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
@@ -405,7 +404,7 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
         return itm
       })
       return {
-        total: records.length || 0,
+        total: response.data.marketplaceOrdersForBatchInit.total || 0,
         records
       }
     }

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

@@ -60,7 +60,9 @@ class RequestROPopup extends LitElement {
       warehouseId: String,
       store: Object,
       marketplaceOrders: Object,
-      config: Object
+      config: Object,
+      _searchFields: Array,
+      _shippingProviders: Array
     }
   }
 
@@ -73,6 +75,10 @@ class RequestROPopup extends LitElement {
     return this.shadowRoot.querySelector('data-grist')
   }
 
+  get searchForm() {
+    return this.shadowRoot.querySelector('search-form')
+  }
+
   render() {
     return html`
       <div class="container">
@@ -88,7 +94,9 @@ class RequestROPopup extends LitElement {
             )}
           </select>
         </form>
-        
+
+        <search-form id="search-form" .fields=${this._searchFields} @submit=${e =>
+      this.dataGrist.fetch()}></search-form>
 
         <div class="grist">
             <data-grist
@@ -110,8 +118,44 @@ class RequestROPopup extends LitElement {
   async firstUpdated() {
     this.warehouses = await this.fetchWarehouses()
     this.warehouseId = this.warehouses[0]?.id || null
+    this._shippingProviders = await this._fetchShippingProviders()
     this.requestUpdate()
 
+    this._searchFields = [
+      {
+        label: i18next.t('field.shipping_provider'),
+        name: 'shippingProvider',
+        type: 'select',
+        props: {
+          searchOper: 'eq'
+        },
+        options: [
+          { value: '' },
+          ...this._shippingProviders.map(item => {
+            return {
+              name: item.shippingProvider,
+              value: item.shippingProvider
+            }
+          })
+        ]
+      },
+      {
+        label: i18next.t('field.item_count'),
+        name: 'itemCount',
+        type: 'select',
+        props: {
+          searchOper: 'gte'
+        },
+        options: [{ value: '' }, { name: 'Single Item', value: 1 }, { name: 'Multiple Item', value: 2 }]
+      },
+      {
+        label: i18next.t('field.sku'),
+        name: 'sku',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      }
+    ]
+
     this.config = {
       list: {
         fields: [
@@ -237,6 +281,27 @@ class RequestROPopup extends LitElement {
     }
   }
 
+  async _fetchShippingProviders() {
+    let statuses = this.getROCreatableStatus()
+
+    const response = await client.query({
+      query: gql`
+        query shippingProviders($storeId: String!, $statuses: [String]) {
+          shippingProviders(storeId: $storeId, statuses: $statuses) {
+            items {
+              shippingProvider
+            }
+          }
+        }
+      `,
+      variables: { storeId: this.store.id, statuses }
+    })
+
+    if (!response.errors) {
+      return response.data.shippingProviders.items
+    }
+  }
+
   async addReleaseOrder() {
     try {
       if (!this.warehouseId) {
@@ -282,7 +347,7 @@ class RequestROPopup extends LitElement {
   }
 
   async fetchHandler({ page, limit, sorters = [{ name: 'orderUpdatedAt', desc: true }] }) {
-    let filters = []
+    let filters = [...this.searchForm.queryFilters]
 
     if (this.store) {
       filters.push(
@@ -443,7 +508,7 @@ class RequestROPopup extends LitElement {
         break
 
       case PLATFORM.WOOCOMMERCE.value:
-        roCreatableStatus = ['pending', 'processing']
+        roCreatableStatus = ['processing']
         break
 
       case PLATFORM.MAGENTO.value:

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

@@ -198,7 +198,6 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
           return { emphasized }
         }
       },
-      pagination: { infinite: true },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
@@ -269,6 +268,20 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.status'),
           sortable: true,
           width: 120
+        },
+        {
+          type: 'datetime',
+          name: 'orderCreatedAt',
+          header: i18next.t('field.created_at'),
+          sortable: true,
+          width: 180
+        },
+        {
+          type: 'datetime',
+          name: 'orderUpdatedAt',
+          header: i18next.t('field.updated_at'),
+          sortable: true,
+          width: 180
         }
       ]
     }
@@ -527,7 +540,7 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
         }
 
         return {
-          total: records.length || 0,
+          total: response.data.marketplaceOrdersForBatchInit.total || 0,
           records
         }
       }

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

@@ -28,7 +28,8 @@ class OrderByStore extends localize(i18next)(PageView) {
       config: Object,
       excelConfig: Object,
       data: Object,
-      enableRO: Boolean
+      enableRO: Boolean,
+      _shippingProviders: Array
     }
   }
 
@@ -145,6 +146,7 @@ class OrderByStore extends localize(i18next)(PageView) {
 
   async pageInitialized() {
     const _orderStatus = await getCodeByName('ORDER_STATUS')
+    this._shippingProviders = await this._fetchShippingProviders()
 
     await this.fetchFulfillmentCenters()
 
@@ -169,6 +171,38 @@ class OrderByStore extends localize(i18next)(PageView) {
           })
         ],
         props: { searchOper: 'eq' }
+      },
+      {
+        label: i18next.t('field.shipping_provider'),
+        name: 'shippingProvider',
+        type: 'select',
+        props: {
+          searchOper: 'eq'
+        },
+        options: [
+          { value: '' },
+          ...this._shippingProviders.map(item => {
+            return {
+              name: item.shippingProvider,
+              value: item.shippingProvider
+            }
+          })
+        ]
+      },
+      {
+        label: i18next.t('field.item_count'),
+        name: 'itemCount',
+        type: 'select',
+        props: {
+          searchOper: 'gte'
+        },
+        options: [{ value: '' }, { name: 'Single Item', value: 1 }, { name: 'Multiple Item', value: 2 }]
+      },
+      {
+        label: i18next.t('field.sku'),
+        name: 'sku',
+        type: 'text',
+        props: { searchOper: 'i_like' }
       }
     ]
 
@@ -308,6 +342,21 @@ class OrderByStore extends localize(i18next)(PageView) {
       if ('resourceId' in changes) {
         if (lifecycle.resourceId) {
           this.store = await this.fetchStore(lifecycle.resourceId)
+          this._shippingProviders = await this._fetchShippingProviders()
+
+          this._searchFields = this._searchFields.map(searchField => {
+            if (searchField.name === 'shippingProvider')
+              searchField.options = [
+                { value: '' },
+                ...this._shippingProviders.map(item => {
+                  return {
+                    name: item.shippingProvider,
+                    value: item.shippingProvider
+                  }
+                })
+              ]
+            return searchField
+          })
         } else {
           this.store = null
         }
@@ -486,9 +535,9 @@ class OrderByStore extends localize(i18next)(PageView) {
               if (marketplaceOrderShipping?.trackingNo) {
                 const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
                 newTrackingNo = trackingNos.map(item => item.tracking_code)
+                let uniqueTrackingNos = [...new Set(newTrackingNo)]
+                item = uniqueTrackingNos.join(', ')
               }
-              let uniqueTrackingNos = [...new Set(newTrackingNo)]
-              item = uniqueTrackingNos.join(', ')
             } else {
               item = marketplaceOrderShipping.trackingNo
             }
@@ -845,6 +894,25 @@ class OrderByStore extends localize(i18next)(PageView) {
     }
   }
 
+  async _fetchShippingProviders() {
+    const response = await client.query({
+      query: gql`
+        query shippingProviders($storeId: String!) {
+          shippingProviders(storeId: $storeId) {
+            items {
+              shippingProvider
+            }
+          }
+        }
+      `,
+      variables: { storeId: this.lifecycle.resourceId }
+    })
+
+    if (!response.errors) {
+      return response.data.shippingProviders.items
+    }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/client/pages/reports/sales-by-platform/lazada-sales-report.js

@@ -135,6 +135,46 @@ class LazadaSalesReport extends connect(store)(PageView) {
           imex: { header: i18next.t('field.order_no'), key: 'orderNo', width: 50, type: 'string' },
           width: 200
         },
+        {
+          type: 'datetime',
+          name: 'orderCreatedAt',
+          header: i18next.t('field.order_created_date'),
+          sortable: false,
+          imex: { header: i18next.t('field.order_created_date'), key: 'orderCreatedAt', width: 30, type: 'string' },
+          width: 200
+        },,
+        {
+          type: 'string',
+          name: 'fulfillmentCenter',
+          header: i18next.t('field.fulfillment_partner'),
+          sortable: false,
+          imex: { header: i18next.t('field.fulfillment_partner'), key: 'fulfillmentCenter', width: 50, type: 'string' },
+          width: 200
+        },
+        {
+          type: 'string',
+          name: 'status',
+          header: i18next.t('field.status'),
+          sortable: false,
+          imex: { header: i18next.t('field.status'), key: 'status', width: 50, type: 'string' },
+          width: 200
+        },
+        {
+          type: 'string',
+          name: 'sku',
+          header: i18next.t('field.warehouse_sku'),
+          sortable: false,
+          imex: { header: i18next.t('field.warehouse_sku'), key: 'sku', width: 50, type: 'string' },
+          width: 200
+        },
+        {
+          type: 'string',
+          name: 'variationId',
+          header: i18next.t('field.variation_id'),
+          sortable: false,
+          imex: { header: i18next.t('field.variation_id'), key: 'variationId', width: 50, type: 'string' },
+          width: 200
+        },
         {
           type: 'string',
           name: 'marketplaceOrderItem',
@@ -144,45 +184,35 @@ class LazadaSalesReport extends connect(store)(PageView) {
           width: 400
         },
         {
-          type: 'datetime',
-          name: 'orderCreatedAt',
-          header: i18next.t('field.order_created_date'),
+          type: 'integer',
+          name: 'qty',
+          header: i18next.t('field.qty'),
           sortable: false,
-          imex: { header: i18next.t('field.order_created_date'), key: 'orderCreatedAt', width: 30, type: 'string' },
-          width: 200
+          imex: { header: i18next.t('field.qty'), key: 'qty', width: 20, type: 'integer' },
+          width: 150
         },
         {
           type: 'float',
-          name: 'originalPrice',
-          header: i18next.t('field.original_price'),
+          name: 'itemCommissionFee',
+          header: i18next.t('field.commission_fee'),
           sortable: false,
-          imex: {
-            header: i18next.t('field.original_price'),
-            key: 'originalPrice',
-            width: 30,
-            type: 'float'
-          },
+          imex: { header: i18next.t('field.commission_fee'), key: 'itemCommissionFee', width: 30, type: 'float' },
           width: 200
         },
         {
           type: 'float',
-          name: 'shippingFee',
-          header: i18next.t('field.shipping_fee'),
+          name: 'marketplaceBonusSeller',
+          header: i18next.t('field.lazada_bonus'),
           sortable: false,
-          imex: { header: i18next.t('field.shipping_fee'), key: 'shippingFee', width: 30, type: 'float' },
+          imex: { header: i18next.t('field.lazada_bonus'), key: 'marketplaceBonusSeller', width: 30, type: 'float' },
           width: 200
         },
         {
           type: 'float',
-          name: 'actualShippingFee',
-          header: i18next.t('field.actual_shipping_fee'),
+          name: 'marketplaceBonus',
+          header: i18next.t('field.lazada_bonus_lzd_cofund'),
           sortable: false,
-          imex: {
-            header: i18next.t('field.actual_shipping_fee'),
-            key: 'actualShippingFee',
-            width: 30,
-            type: 'float'
-          },
+          imex: { header: i18next.t('field.lazada_bonus_lzd_cofund'), key: 'marketplaceBonus', width: 30, type: 'float' },
           width: 200
         },
         {
@@ -195,44 +225,114 @@ class LazadaSalesReport extends connect(store)(PageView) {
         },
         {
           type: 'float',
-          name: 'marketplaceShippingFeeVoucher',
-          header: i18next.t('field.shipping_fee_voucher'),
+          name: 'ordersMarketplaceFeesTotal',
+          header: i18next.t('field.orders_lazada_fees_total'),
+          sortable: false,
+          imex: { header: i18next.t('field.orders_lazada_fees_total'), key: 'ordersMarketplaceFeesTotal', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'originalShippingFee',
+          header: i18next.t('field.shipping_fee'),
+          sortable: false,
+          imex: { header: i18next.t('field.shipping_fee'), key: 'originalShippingFee', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'shippingFeePaidByCustomer',
+          header: i18next.t('field.shipping_fee_paid_by_customer'),
+          sortable: false,
+          imex: { header: i18next.t('field.shipping_fee_paid_by_customer'), key: 'shippingFeePaidByCustomer', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'shippingFeeDiscountMarketplace',
+          header: i18next.t('field.shipping_fee_voucher_by_lazada'),
+          sortable: false,
+          imex: { header: i18next.t('field.shipping_fee_voucher_by_lazada'), key: 'shippingFeeDiscountMarketplace', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'shippingFeeDiscountSeller',
+          header: i18next.t('field.shipping_fee_voucher_by_seller'),
+          sortable: false,
+          imex: { header: i18next.t('field.shipping_fee_voucher_by_seller'), key: 'shippingFeeDiscountSeller', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'autoShippingSubsidyMarketplace',
+          header: i18next.t('field.auto_shipping_fee_subsidy_by_lazada'),
+          sortable: false,
+          imex: { header: i18next.t('field.auto_shipping_fee_subsidy_by_lazada'), key: 'autoShippingSubsidyMarketplace', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'ordersLogisticsTotal',
+          header: i18next.t('field.orders_logistics_total'),
+          sortable: false,
+          imex: { header: i18next.t('field.orders_logistics_total'), key: 'ordersLogisticsTotal', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'promotionalChargesFlexiCombo',
+          header: i18next.t('field.promotional_charges_flexi_combo'),
+          sortable: false,
+          imex: { header: i18next.t('field.promotional_charges_flexi_combo'), key: 'promotionalChargesFlexiCombo', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'promotionalCharges',
+          header: i18next.t('field.promotional_charges_vouchers'),
+          sortable: false,
+          imex: { header: i18next.t('field.promotional_charges_vouchers'), key: 'promotionalCharges', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'ordersMarketingFeesTotal',
+          header: i18next.t('field.orders_marketing_fees_total'),
+          sortable: false,
+          imex: { header: i18next.t('field.orders_marketing_fees_total'), key: 'ordersMarketingFeesTotal', width: 30, type: 'float' },
+          width: 200
+        },
+        {
+          type: 'float',
+          name: 'itemPriceCredit',
+          header: i18next.t('field.item_price_credit'),
           sortable: false,
-          imex: {
-            header: i18next.t('field.shipping_fee_voucher'),
-            key: 'marketplaceShippingFeeVoucher',
-            width: 30,
-            type: 'float'
-          },
+          imex: { header: i18next.t('field.item_price_credit'), key: 'itemPriceCredit', width: 30, type: 'float' },
           width: 200
         },
         {
           type: 'float',
-          name: 'sellerShippingFeeVoucher',
-          header: i18next.t('field.seller_shipping_fee_voucher'),
+          name: 'ordersSalesTotal',
+          header: i18next.t('field.orders_sales_total'),
           sortable: false,
-          imex: {
-            header: i18next.t('field.seller_shipping_fee_voucher'),
-            key: 'sellerShippingFeeVoucher',
-            width: 30,
-            type: 'float'
-          },
+          imex: { header: i18next.t('field.orders_sales_total'), key: 'ordersSalesTotal', width: 30, type: 'float' },
           width: 200
         },
         {
           type: 'float',
-          name: 'paidPrice',
-          header: i18next.t('field.paid_price'),
+          name: 'taxAmount',
+          header: i18next.t('field.tax_amount'),
           sortable: false,
-          imex: { header: i18next.t('field.paid_price'), key: 'paidPrice', width: 30, type: 'float' },
+          imex: { header: i18next.t('field.tax_amount'), key: 'taxAmount', width: 30, type: 'float' },
           width: 200
         },
         {
           type: 'float',
-          name: 'totalAmount',
-          header: i18next.t('field.total_amount'),
+          name: 'grandTotal',
+          header: i18next.t('field.grand_total'),
           sortable: false,
-          imex: { header: i18next.t('field.total_amount'), key: 'totalAmount', width: 30, type: 'float' },
+          imex: { header: i18next.t('field.grand_total'), key: 'grandTotal', width: 30, type: 'float' },
           width: 200
         }
       ]
@@ -254,24 +354,39 @@ class LazadaSalesReport extends connect(store)(PageView) {
               orderCreatedAt
               buyerUsername
               payTime
-              totalAmount
               refundAmount
               shippingProvider
               storeName
               storeDescription
               promotionId
-              originalPrice
-              paidPrice
               sku
               variationSku
               productName
               productSku
               productDiscount
               paymentFee
-              shippingFee
-              actualShippingFee
-              marketplaceShippingFeeVoucher
-              sellerShippingFeeVoucher
+              itemCommissionFee
+              shippingFeePaidByCustomer
+              promotionalCharges
+              ordersMarketplaceFeesTotal
+              ordersMarketingFeesTotal
+              ordersSalesTotal
+              ordersLogisticsTotal
+              itemPriceCredit
+              marketplaceBonus
+              marketplaceBonusSeller
+              shippingFeeDiscountMarketplace
+              shippingFeeDiscountSeller
+              promotionalChargesFlexiCombo
+              autoShippingSubsidyMarketplace
+              grandTotal
+              originalShippingFee
+              taxAmount
+              status
+              qty
+              fulfillmentCenter
+              variationId
+              variationName
             }
             total
           }
@@ -286,16 +401,26 @@ class LazadaSalesReport extends connect(store)(PageView) {
         records: response.data.marketplaceSalesReports.items.map(item => {
           return {
             ...item,
-            marketplaceOrderItem: `${item.variationSku} ${item.sku ? `(${item.sku})` : ''}`,
+            marketplaceOrderItem: `${item.variationSku} ${item.variationName ? `(${item.variationName})` : ''}`,
             marketplaceStore: `${item.storeName} ${item.storeDescription ? `(${item.storeDescription})` : ''}`,
-            originalPrice: this._getRoundedValue(item.originalPrice),
-            shippingFee: this._getRoundedValue(item.shippingFee),
-            actualShippingFee: this._getRoundedValue(item.actualShippingFee),
             paymentFee: this._getRoundedValue(item.paymentFee),
-            marketplaceShippingFeeVoucher: this._getRoundedValue(item.marketplaceShippingFeeVoucher),
-            sellerShippingFeeVoucher: this._getRoundedValue(item.sellerShippingFeeVoucher),
-            paidPrice: this._getRoundedValue(item.paidPrice),
-            totalAmount: this._getRoundedValue(item.totalAmount)
+            itemCommissionFee: this._getRoundedValue(item.itemCommissionFee),
+            shippingFeePaidByCustomer: this._getRoundedValue(item.shippingFeePaidByCustomer),
+            promotionalCharges: this._getRoundedValue(item.promotionalCharges),
+            ordersMarketplaceFeesTotal: this._getRoundedValue(item.ordersMarketplaceFeesTotal),
+            ordersMarketingFeesTotal: this._getRoundedValue(item.ordersMarketingFeesTotal),
+            ordersSalesTotal: this._getRoundedValue(item.ordersSalesTotal),
+            ordersLogisticsTotal: this._getRoundedValue(item.ordersLogisticsTotal),
+            itemPriceCredit: this._getRoundedValue(item.itemPriceCredit),
+            marketplaceBonus: this._getRoundedValue(item.marketplaceBonus),
+            marketplaceBonusSeller: this._getRoundedValue(item.marketplaceBonusSeller),
+            shippingFeeDiscountMarketplace: this._getRoundedValue(item.shippingFeeDiscountMarketplace),
+            shippingFeeDiscountSeller: this._getRoundedValue(item.shippingFeeDiscountSeller),
+            promotionalChargesFlexiCombo: this._getRoundedValue(item.promotionalChargesFlexiCombo),
+            autoShippingSubsidyMarketplace: this._getRoundedValue(item.autoShippingSubsidyMarketplace),
+            grandTotal: this._getRoundedValue(item.grandTotal),
+            originalShippingFee: this._getRoundedValue(item.originalShippingFee),
+            taxAmount: this._getRoundedValue(item.taxAmount)
           }
         })
       }

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

@@ -1,11 +1,13 @@
-import { css, html } from 'lit-element'
-import { i18next } from '@things-factory/i18n-base'
-import { connect } from 'pwa-helpers/connect-mixin.js'
-import { client, store, PageView } from '@things-factory/shell'
-import gql from 'graphql-tag'
 import '../../components/stock-allocation-ratio'
 import '../../components/marketplace-order-max-weight'
 
+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'
+
 class MarketplaceSetting extends connect(store)(PageView) {
   static get styles() {
     return [
@@ -149,6 +151,7 @@ class MarketplaceSetting extends connect(store)(PageView) {
                 storeName
                 platform
                 description
+                status
               }
               category
               value
@@ -161,7 +164,7 @@ class MarketplaceSetting extends connect(store)(PageView) {
       variables: { filters, sortings }
     })
 
-    return response.data.marketplaceSettings.items || []
+    return response.data.marketplaceSettings.items.filter(item => item.marketplaceStore.status == 'ACTIVE') || []
   }
 
   showToast(message) {