@things-factory/operato-mms 4.0.11 → 4.0.12

package/client/menu.js

@@ -1,8 +1,9 @@
 import '@material/mwc-icon'
-import { store } from '@things-factory/shell'
+
 import { updateMenuTemplate } from '@things-factory/lite-menu'
+import { store } from '@things-factory/shell'
 
-var stores
+var stores, platforms
 
 store.subscribe(() => {
   var state = store.getState()
@@ -13,6 +14,14 @@ store.subscribe(() => {
 
   stores = state.mms.stores
 
+  // At the moment, only Sales by Platform will use this variable
+  // and currently only support for lazada and shopee
+  platforms = stores
+    .map(store => store.platform)
+    .filter((v, i, a) => a.indexOf(v) === i)
+    .filter(v => ['lazada', 'shopee'].indexOf(v) !== -1)
+    .sort()
+
   updateMenuTemplate(
     getMenuTemplate({
       stores: stores || []
@@ -103,6 +112,35 @@ function getMenuTemplate({ stores }) {
       path: 'mms-inventory-product',
       icon: 'storage'
     },
+    {
+      name: 'report',
+      type: 'group'
+    },
+    {
+      name: 'sales by platform',
+      path: 'mms-report-sales-by-platform-home',
+      icon: 'assessment',
+      menus: [
+        ...platforms.map(platform => {
+          return {
+            name: platform,
+            path: `${platform}-sales-report`,
+            icon: 'store'
+          }
+        })
+        // to be removed. it was here for testing purpose
+        /* {
+          name: 'lazada',
+          path: 'lazada-sales-report',
+          icon: 'store'
+        },
+        {
+          name: 'shopee',
+          path: 'shopee-sales-report',
+          icon: 'store'
+        } */
+      ]
+    },
     {
       name: 'store integration',
       type: 'group'

package/client/pages/catalogue-variation/product-variations.js

@@ -270,7 +270,7 @@ class ProductVariations extends localize(i18next)(PageView) {
   }
 
   async _fetchProducts({ page, limit, sorters = [{ name: 'status' }] }) {
-    let filters = []
+    let filters = [{ name: 'status', operator: 'noteq', value: 'INACTIVE' }]
     if (this.store) {
       filters.push({
         name: 'marketplaceStoreId',

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 },
@@ -527,7 +526,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/home.js

@@ -0,0 +1,144 @@
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin.js'
+
+import { PageView, store } from '@things-factory/shell'
+
+class SalesByPlatformHome extends connect(store)(PageView) {
+  static get styles() {
+    return [
+      css`
+        :host {
+          display: block;
+          background-color: var(--main-section-background-color);
+          padding: var(--padding-wide);
+          overflow: auto;
+          --bizplace-cards-size: 150px;
+        }
+        h2 {
+          margin: var(--title-margin);
+          font: var(--title-font);
+          color: var(--title-text-color);
+        }
+        input {
+          display: block;
+        }
+        [page-description] {
+          margin: var(--page-description-margin);
+          font: var(--page-description-font);
+          color: var(--page-description-color);
+        }
+        [button-primary] {
+          background-color: var(--button-primary-background-color);
+          border: var(--button-border);
+          border-radius: var(--button-border-radius);
+          padding: var(--button-padding);
+          color: var(--button-primary-color);
+          font: var(--button-primary-font);
+          text-transform: var(--button-text-transform);
+          text-decoration: none;
+        }
+        [button-primary]:hover {
+          background-color: var(--button-primary-active-background-color);
+          box-shadow: var(--button-active-box-shadow);
+        }
+        img {
+          max-width: 45%;
+          float: right;
+        }
+        ul {
+          margin: 0 0 var(--margin-wide) 0;
+          padding: 0;
+          overflow: hidden;
+          list-style: none;
+        }
+        li {
+          display: block;
+          float: left;
+          background-color: var(--theme-white-color);
+          border-radius: var(--border-radius);
+          border: 1px solid var(--theme-white-color);
+          box-shadow: var(--box-shadow);
+          margin: var(--margin-narrow) var(--margin-default) var(--margin-default) 0;
+          padding: var(--padding-default) var(--padding-default) var(--padding-narrow) var(--padding-default);
+          text-align: center;
+        }
+        li:hover {
+          border: 1px solid var(--primary-color);
+        }
+        * {
+          display: block;
+        }
+        a {
+          width: var(--bizplace-cards-size);
+          cursor: pointer;
+          text-decoration: none;
+          font-size: var(--fontsize-small);
+          color: var(--secondary-color);
+        }
+        mwc-icon {
+          color: var(--primary-color);
+        }
+        strong {
+          max-width: 100%;
+
+          font-size: 1.2em;
+          color: var(--secondary-text-color);
+        }
+        a,
+        strong @media screen and (max-width: 600px) {
+          [field] {
+            grid-column: span 2;
+          }
+          img {
+            display: none;
+          }
+        }
+      `
+    ]
+  }
+
+  static get properties() {
+    return {
+      _platforms: Array
+    }
+  }
+
+  get context() {
+    return {
+      title: `ecommerce products`
+    }
+  }
+
+  render() {
+    const platforms = this._platforms || []
+
+    return html`
+      <h2>Sales Report</h2>
+      <p page-description>View your day to day sales report.</p>
+
+      <img src="/assets/images/image-products.png" alt="products home graphic image" />
+
+      <ul marketplaceStore>
+        ${platforms.map(
+          platform => html`
+            <li>
+              <a href="${platform}-sales-report">
+                <mwc-icon>${'widgets'}</mwc-icon>
+                <strong>${platform}</strong>
+              </a>
+            </li>
+          `
+        )}
+      </ul>
+    `
+  }
+
+  stateChanged(state) {
+    this._platforms = state.mms?.stores
+      .map(store => store.platform)
+      .filter((v, i, a) => a.indexOf(v) === i)
+      .filter(v => ['lazada', 'shopee'].indexOf(v) !== -1)
+  }
+}
+
+window.customElements.define('mms-report-sales-by-platform-home', SalesByPlatformHome)

package/client/pages/reports/sales-by-platform/index.js

@@ -0,0 +1,3 @@
+export * from './home'
+export * from './lazada-sales-report'
+export * from './shopee-sales-report'