@things-factory/operato-mms 4.0.0-alpha.7 → 4.0.0-beta.1

package/Dockerfile

@@ -18,11 +18,12 @@ RUN apt-get install -y --no-install-recommends apt-utils
 RUN apt-get install -y chromium
 RUN apt-get install -y libcups2-dev 
 RUN apt-get install -y libavahi-compat-libdnssd-dev 
-RUN apt-get install -y gconf-service libasound2 libatk1.0-0 libcairo2 libcups2 libfontconfig1 libgdk-pixbuf2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libxss1 fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils libaio1
+RUN apt-get install -y gconf-service libasound2 libatk1.0-0 libcairo2 libcups2 libfontconfig1 libgdk-pixbuf2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libxss1 fonts-liberation libnss3 lsb-release xdg-utils libaio1
 
 RUN apt update
 RUN apt-get install -y ghostscript
 RUN apt-get install -y curl
+RUN apt-get install -y git
 
 # install chrome
 RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb

package/client/bootstrap.js

@@ -1,20 +1,22 @@
+import '@things-factory/auth-ui' /* for domain-switch */
+import '@things-factory/notification'
+import './menu'
+import './viewparts/user-circle'
+
+import { html } from 'lit-element'
+
 import { APPEND_APP_TOOL } from '@things-factory/apptool-base'
+import { auth } from '@things-factory/auth-base'
+import { setAuthManagementMenus } from '@things-factory/auth-ui'
 import { appendViewpart, toggleOverlay, TOOL_POSITION, VIEWPART_POSITION } from '@things-factory/layout-base'
 import { setupMenuPart } from '@things-factory/lite-menu'
 import { ADD_MORENDA } from '@things-factory/more-base'
-import { auth } from '@things-factory/auth-base'
-import '@things-factory/auth-ui' /* for domain-switch */
-import { setAuthManagementMenus } from '@things-factory/auth-ui'
-import '@things-factory/notification'
 import { ADD_SETTING } from '@things-factory/setting-base'
 import { navigate, store } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
-import { html } from 'lit-element'
-import mms from './reducers/mms'
 
-import './menu'
-import './viewparts/user-circle'
 import { fetchMmsStatus } from './actions/mms'
+import mms from './reducers/mms'
 
 console.log(
   `%c
@@ -92,6 +94,28 @@ export default function bootstrap() {
     position: VIEWPART_POSITION.ASIDEBAR
   })
 
+  store.dispatch({
+    type: ADD_MORENDA,
+    morenda: {
+      icon: html` <mwc-icon>device_hub</mwc-icon> `,
+      name: html` <i18n-msg msgid="text.connection"></i18n-msg> `,
+      action: () => {
+        navigate('connection')
+      }
+    }
+  })
+
+  store.dispatch({
+    type: ADD_MORENDA,
+    morenda: {
+      icon: html` <mwc-icon>format_list_numbered</mwc-icon> `,
+      name: html` <i18n-msg msgid="text.scenario"></i18n-msg> `,
+      action: () => {
+        navigate('scenario')
+      }
+    }
+  })
+
   store.dispatch({
     type: ADD_SETTING,
     setting: {
@@ -99,12 +123,4 @@ export default function bootstrap() {
       template: html` <notification-setting-let></notification-setting-let> `
     }
   })
-
-  // store.dispatch({
-  //   type: APPEND_APP_TOOL,
-  //   tool: {
-  //     template: html` <user-circle> </user-circle> `,
-  //     position: TOOL_POSITION.REAR
-  //   }
-  // })
 }

package/client/components/marketplace-order-max-weight.js

@@ -0,0 +1,158 @@
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, CustomAlert } from '@things-factory/shell'
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+class MarketplaceOrderMaxWeight extends localize(i18next)(LitElement) {
+  static get styles() {
+    return css`
+      [field-2column] {
+        background-color: var(--theme-white-color);
+        margin: var(--margin-wide) 0;
+        padding: var(--padding-wide);
+        border-radius: var(--border-radius);
+        box-shadow: var(--box-shadow);
+        max-width: var(--input-container-max-width);
+      }
+      [field-2column] mwc-button {
+        margin: var(--input-margin);
+      }
+      [field] {
+        display: flex;
+        flex-direction: column;
+        padding-bottom: var(--padding-default);
+      }
+      [grid-span] {
+        grid-column: span 2;
+      }
+
+      input {
+        border: var(--border-dark-color);
+        border-radius: var(--border-radius);
+        margin: var(--input-margin);
+        padding: var(--input-padding);
+        min-width: 250px;
+        font: var(--input-font);
+      }
+      label {
+        display: flex;
+        flex-direction: column;
+
+        font: var(--label-font);
+        color: var(--label-color);
+        text-transform: var(--label-text-transform);
+      }
+      mwc-button {
+        margin: var(--input-margin);
+      }
+      @media screen and (max-width: 480px) {
+        div {
+          display: grid;
+        }
+        [field] {
+          grid-column: span 2;
+        }
+      }
+    `
+  }
+
+  static get properties() {
+    return {
+      maxWeightSettings: Array
+    }
+  }
+
+  render() {
+    const maxWeightSettings = this.maxWeightSettings || []
+    return html`
+      <div field-2column>
+        <label>${i18next.t('label.order_max_weight')} </label>
+        <input name="maxWeight" value="" type="number" max="100" required />
+
+        <mwc-button
+          @click=${this.onUpdateMaxWeight.bind(this)}
+          outlined
+          label="${i18next.t('button.update')}"
+        ></mwc-button>
+
+        <div>
+          ${this.maxWeightSettings?.length
+            ? this.maxWeightSettings.map(
+                setting => html` <label>${setting?.marketplaceStore.storeName}: ${setting.value}</label> `
+              )
+            : ''}
+        </div>
+      </div>
+    `
+  }
+
+  get maxWeightInput() {
+    return this.shadowRoot.querySelector('input[name=maxWeight]')
+  }
+
+  async onUpdateMaxWeight() {
+    try {
+      const marketplaceSettingPatch = this.maxWeightSettings.map(item => {
+        return {
+          id: item.id,
+          name: item.name,
+          marketplaceStore: { id: item.marketplaceStore.id },
+          category: item.category,
+          value: this.maxWeightInput.value
+        }
+      })
+
+      const result = await CustomAlert({
+        title: i18next.t('text.are_you_sure'),
+        text: i18next.t('text.do_you_want_to_update_x', { x: i18next.t('label.order_max_weight') }),
+        confirmButton: { text: i18next.t('button.confirm') },
+        cancelButton: { text: i18next.t('button.cancel') }
+      })
+
+      if (!result.value) return
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateMarketplaceSetting($marketplaceSettingPatch: [MarketplaceSettingPatch]!) {
+            updateMarketplaceSetting(marketplaceSettingPatch: $marketplaceSettingPatch)
+          }
+        `,
+        variables: { marketplaceSettingPatch }
+      })
+
+      if (!response.errors) {
+        await this.dispatchEvent(new CustomEvent('fetch-settings'))
+
+        await CustomAlert({
+          type: 'success',
+          title: i18next.t('text.completed'),
+          text: i18next.t('text.data_updated_successfully'),
+          confirmButton: { text: i18next.t('button.confirm') }
+        })
+      }
+    } catch (e) {
+      this.showToast(e)
+    }
+  }
+
+  validateInput(marketplaceSettingPatch) {
+    marketplaceSettingPatch.map(setting => {
+      const percentage = parseInt(setting.value)
+      if (isNaN(percentage) || percentage > 100 || percentage < 1)
+        throw new Error(i18next.t('text.max_weight_should_be_between_1_to_100'))
+    })
+  }
+
+  showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
+  }
+}
+
+window.customElements.define('marketplace-order-max-weight', MarketplaceOrderMaxWeight)

package/client/components/mms-home-cards.js

@@ -99,7 +99,7 @@ class MmsHomeCards extends LitElement {
             <li>
               <a href=${`${mmsUrl}/${marketplaceStore.id}`}>
                 <mwc-icon>${'widgets'}</mwc-icon>
-                <strong>${marketplaceStore.name}</strong>
+                <strong>${marketplaceStore.storeName}</strong>
                 <span>${marketplaceStore.platform}</span>
               </a>
             </li>

package/client/components/stock-allocation-ratio.js

@@ -12,12 +12,11 @@ class StockAllocationRatio extends localize(i18next)(LitElement) {
         padding: var(--padding-wide);
         border-radius: var(--border-radius);
         box-shadow: var(--box-shadow);
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-        gap: 5px 15px;
-        clear: both;
         max-width: var(--input-container-max-width);
       }
+      [field-2column] mwc-button {
+        margin: var(--input-margin);
+      }
       [field] {
         display: flex;
         flex-direction: column;
@@ -71,29 +70,23 @@ class StockAllocationRatio extends localize(i18next)(LitElement) {
           ? ratioSettings.map(
               setting =>
                 html`
-                  <div field>
-                    <label
-                      >${setting?.marketplaceStore.name}
-                      <input
-                        name="${setting?.marketplaceStore.id}"
-                        value="${parseInt(setting.value)}"
-                        type="number"
-                        max="100"
-                        required
-                      />
-                    </label>
-                  </div>
+                  <label>${setting?.marketplaceStore.storeName} </label>
+                  <input
+                    name="${setting?.marketplaceStore.id}"
+                    value="${parseInt(setting.value)}"
+                    type="number"
+                    max="100"
+                    required
+                  />
                 `
             )
           : ''}
 
-        <div>
-          <mwc-button
-            @click=${this.onUpdateAllocationRatio.bind(this)}
-            outlined
-            label="${i18next.t('button.update')}"
-          ></mwc-button>
-        </div>
+        <mwc-button
+          @click=${this.onUpdateAllocationRatio.bind(this)}
+          outlined
+          label="${i18next.t('button.update')}"
+        ></mwc-button>
       </div>
     `
   }
@@ -107,6 +100,7 @@ class StockAllocationRatio extends localize(i18next)(LitElement) {
       const marketplaceSettingPatch = Array.from(this.percentageInput).map(input => {
         return {
           marketplaceStore: { id: input.name },
+          category: this.category,
           value: input.value
         }
       })

package/client/pages/catalogue/products.js

@@ -137,7 +137,7 @@ class Products extends localize(i18next)(PageView) {
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'string',
-          name: 'marketplaceStore|name',
+          name: 'marketplaceStore|storeName',
           header: i18next.t('field.store_name'),
           sortable: true,
           imex: { header: i18next.t('field.store_name'), key: 'name', width: 25, type: 'string' },
@@ -230,6 +230,7 @@ class Products extends localize(i18next)(PageView) {
               status
               marketplaceStore {
                 name
+                storeName
               }
               updatedAt
               createdAt

package/client/pages/catalogue/warehouse-products.js

@@ -253,6 +253,7 @@ class WarehouseProducts extends localize(i18next)(PageView) {
             id
             name
             platform
+            storeName
             storeId
             countryCode
             status
@@ -276,7 +277,7 @@ class WarehouseProducts extends localize(i18next)(PageView) {
           return {
             type: 'string',
             name: store.id.toString(),
-            header: store.name,
+            header: store.storeName ? store.storeName : store.name,
             sortable: false,
             width: 160,
             handlers: {

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

@@ -1,11 +1,13 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, PageView } from '@things-factory/shell'
-import { ScrollbarStyles } from '@things-factory/styles'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
 
 class ProductVariations extends localize(i18next)(PageView) {
   static get styles() {
@@ -42,6 +44,13 @@ class ProductVariations extends localize(i18next)(PageView) {
   get context() {
     return {
       title: i18next.t('title.product_variations'),
+      actions: [
+        {
+          title: i18next.t('button.save'),
+          action: this._saveMarketplaceProductVariations.bind(this),
+          ...CommonButtonStyles.save
+        }
+      ],
       exportable: {
         name: i18next.t('title.product_variations'),
         data: this._exportableData.bind(this)
@@ -100,10 +109,15 @@ class ProductVariations extends localize(i18next)(PageView) {
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'string',
-          name: 'marketplaceProduct|marketplaceStore|name',
+          name: 'marketplaceProduct|marketplaceStore|storeName',
           header: i18next.t('field.store_name'),
           sortable: true,
-          imex: { header: i18next.t('field.store_name'), key: 'name', width: 25, type: 'string' },
+          imex: {
+            header: i18next.t('field.store_name'),
+            key: 'marketplaceProduct|marketplaceStore|storeName',
+            width: 25,
+            type: 'string'
+          },
           width: 160
         },
         {
@@ -111,7 +125,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'marketplaceProduct|isku',
           header: i18next.t('field.product_sku'),
           sortable: true,
-          imex: { header: i18next.t('field.product_sku'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.product_sku'), key: 'marketplaceProduct|isku', width: 25, type: 'string' },
           record: { align: 'left' },
           width: 400
         },
@@ -120,7 +134,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'marketplaceProduct|name',
           header: i18next.t('field.product_name'),
           sortable: true,
-          imex: { header: i18next.t('field.product_name'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.product_name'), key: 'marketplaceProduct|name', width: 25, type: 'string' },
           record: { align: 'left' },
           width: 850
         },
@@ -129,7 +143,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'channelSku',
           header: i18next.t('field.channel_sku'),
           sortable: true,
-          imex: { header: i18next.t('field.channel_sku'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.channel_sku'), key: 'channelSku', width: 25, type: 'string' },
           record: { align: 'left' },
           width: 400
         },
@@ -138,7 +152,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'variationSku',
           header: i18next.t('field.variation_sku'),
           sortable: true,
-          imex: { header: i18next.t('field.variation_sku'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.variation_sku'), key: 'variationSku', width: 25, type: 'string' },
           record: { align: 'left' },
           width: 400
         },
@@ -156,7 +170,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'description',
           header: i18next.t('field.variation_description'),
           sortable: true,
-          imex: { header: i18next.t('field.variation_description'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.variation_description'), key: 'description', width: 25, type: 'string' },
           record: { align: 'left' },
           width: 850
         },
@@ -165,7 +179,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'qty',
           header: i18next.t('field.variation_qty'),
           sortable: true,
-          imex: { header: i18next.t('field.variation_qty'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.variation_qty'), key: 'qty', width: 25, type: 'string' },
           record: { align: 'center' },
           width: 150
         },
@@ -174,7 +188,7 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'costPrice',
           header: i18next.t('field.variation_cost_price'),
           sortable: true,
-          imex: { header: i18next.t('field.variation_cost_price'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.variation_cost_price'), key: 'costPrice', width: 25, type: 'string' },
           record: { align: 'center' },
           width: 150
         },
@@ -183,16 +197,25 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'sellPrice',
           header: i18next.t('field.variation_selling_price'),
           sortable: true,
-          imex: { header: i18next.t('field.variation_selling_price'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.variation_selling_price'), key: 'sellPrice', width: 25, type: 'string' },
           record: { align: 'center' },
           width: 150
         },
+        {
+          type: 'float',
+          name: 'primaryUnitValue',
+          header: i18next.t('field.variation_uom_value'),
+          sortable: true,
+          imex: { header: i18next.t('field.variation_uom_value'), key: 'primaryUnitValue', width: 25, type: 'string' },
+          record: { align: 'center', editable: true },
+          width: 150
+        },
         {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
           sortable: true,
-          imex: { header: i18next.t('field.status'), key: 'name', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.status'), key: 'status', width: 25, type: 'string' },
           width: 180
         },
         {
@@ -200,7 +223,12 @@ class ProductVariations extends localize(i18next)(PageView) {
           name: 'marketplaceStatus',
           header: i18next.t('field.variation_marketplace_status'),
           sortable: true,
-          imex: { header: i18next.t('field.variation_marketplace_status'), key: 'name', width: 25, type: 'string' },
+          imex: {
+            header: i18next.t('field.variation_marketplace_status'),
+            key: 'marketplaceStatus',
+            width: 25,
+            type: 'string'
+          },
           width: 180
         },
         {
@@ -269,6 +297,7 @@ class ProductVariations extends localize(i18next)(PageView) {
               description
               marketplaceStore{
                 name
+                storeName
                 description
               }
             }
@@ -289,6 +318,7 @@ class ProductVariations extends localize(i18next)(PageView) {
             marketplaceStatus
             afterTaxCostPrice
             afterTaxSalesPrice
+            primaryUnitValue
             updatedAt
           }
           total
@@ -307,6 +337,33 @@ class ProductVariations extends localize(i18next)(PageView) {
     }
   }
 
+  async _saveMarketplaceProductVariations() {
+    var patches = this.dataGrist.exportPatchList({ flagName: 'cuFlag' })
+
+    if (patches && patches.length) {
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateMultipleMarketplaceProductVariations($patches: [MarketplaceProductVariationPatch]!) {
+            updateMultipleMarketplaceProductVariations(patches: $patches)
+          }
+        `,
+        variables: {
+          patches
+        }
+      })
+
+      if (!response.errors) {
+        this.dataGrist.fetch()
+        this._showToast({ message: i18next.t('text.data_updated_successfully') })
+      }
+    } else {
+      CustomAlert({
+        title: i18next.t('text.nothing_changed'),
+        text: i18next.t('text.there_is_nothing_to_save')
+      })
+    }
+  }
+
   async fetchStore(id) {
     const response = await client.query({
       query: gql`

package/client/pages/inventory/inventory-by-product.js

@@ -253,6 +253,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
           items {
             id
             name
+            storeName
             platform
             storeId
             countryCode
@@ -310,7 +311,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
     if (patches && patches.length) {
       const response = await client.mutate({
         mutation: gql`
-          mutation($patches: [MarketplaceProductVariationPatch]!) {
+          mutation updateMultipleMarketplaceProductVariationQuantity($patches: [MarketplaceProductVariationPatch]!) {
             updateMultipleMarketplaceProductVariationQuantity(patches: $patches)
           }
         `,
@@ -334,7 +335,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
       stores.push({
         type: 'string',
         name: store.id.toString() + '_store',
-        header: store.name,
+        header: store?.storeName ? store.storeName : store.name,
         sortable: false,
         record: { align: 'left' },
         width: 160