@things-factory/sales-ui 4.3.239 → 4.3.241

package/client/constants/index.js

@@ -1 +1,2 @@
 export * from './order'
+export * from './vas'

package/client/constants/vas.js

@@ -0,0 +1,4 @@
+export const VAS_TYPES = {
+  MATERIALS: 'MATERIALS',
+  SERVICE: 'SERVICE'
+}

package/client/pages/vas-list.js

@@ -8,6 +8,7 @@ import { isMobileDevice } from '@things-factory/utils'
 import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
+import { VAS_TYPES } from '../constants'
 
 class VasList extends localize(i18next)(PageView) {
   static get properties() {
@@ -93,8 +94,7 @@ class VasList extends localize(i18next)(PageView) {
   }
 
   async pageInitialized() {
-    this._currencyTypes = await getCodeByName('CURRENCY')
-    this._vasTypes = await getCodeByName('VAS_TYPES')
+    this._vasTypes = VAS_TYPES
 
     this._searchFields = [
       {
@@ -136,94 +136,32 @@ class VasList extends localize(i18next)(PageView) {
           width: 200
         },
         {
-          type: 'code',
+          type: 'select',
           name: 'type',
           header: i18next.t('field.type'),
           record: {
             editable: true,
-            align: 'center',
-            codeName: 'VAS_TYPES'
+            options: [
+              '',
+              ...Object.values(this._vasTypes)
+                .map(type => type)
+                .sort()
+            ]
           },
           imex: {
             header: i18next.t('field.type'),
             key: 'type',
-            width: 70,
-            type: 'array',
-            arrData: this._vasTypes.map(_vasTypes => {
-              return {
-                name: _vasTypes.name,
-                id: _vasTypes.name
-              }
-            })
-          },
-          sortable: true,
-          width: 100
-        },
-        {
-          type: 'string',
-          name: 'operationGuideType',
-          header: i18next.t('field.operation_guide_type'),
-          record: { editable: true, align: 'center' },
-          imex: {
-            header: i18next.t('field.operation_guide_type'),
-            key: 'operationGuideType',
-            width: 50,
-            type: 'string'
-          },
-          sortable: true,
-          width: 160
-        },
-        {
-          type: 'string',
-          name: 'operationGuide',
-          header: i18next.t('field.operation_guide'),
-          record: { editable: true, align: 'center' },
-          imex: { header: i18next.t('field.operation_guide'), key: 'operationGuide', width: 50, type: 'string' },
-          sortable: true,
-          width: 160
-        },
-        {
-          type: 'string',
-          name: 'uom',
-          header: i18next.t('field.uom'),
-          record: { editable: true, align: 'left' },
-          imex: { header: i18next.t('field.uom'), key: 'uom', width: 50, type: 'string' },
-          sortable: true,
-          width: 160
-        },
-        {
-          type: 'code',
-          name: 'currency',
-          header: i18next.t('field.currency'),
-          record: {
-            editable: true,
-            align: 'center',
-            codeName: 'CURRENCY'
-          },
-          imex: {
-            header: i18next.t('field.currency'),
-            key: 'currency',
             width: 50,
             type: 'array',
-            arrData: this._currencyTypes.map(_currencyType => {
+            arrData: Object.values(this._vasTypes).map(type => {
               return {
-                name: _currencyType.name,
-                id: _currencyType.name
+                name: type
               }
             })
           },
           sortable: true,
           width: 100
         },
-        {
-          type: 'float',
-          name: 'defaultPrice',
-          header: i18next.t('field.default_price'),
-          record: { editable: true, align: 'center' },
-          imex: { header: i18next.t('field.default_price'), key: 'defaultPrice', width: 50, type: 'float' },
-          sortable: true,
-          width: 60
-        },
         {
           type: 'datetime',
           name: 'updatedAt',
@@ -239,6 +177,14 @@ class VasList extends localize(i18next)(PageView) {
           record: { editable: false, align: 'center' },
           sortable: true,
           width: 150
+        },
+        {
+          type: 'object',
+          name: 'creator',
+          header: i18next.t('field.creator'),
+          record: { editable: false, align: 'center' },
+          sortable: true,
+          width: 150
         }
       ]
     }
@@ -259,17 +205,16 @@ class VasList extends localize(i18next)(PageView) {
               id
               name
               description
-              defaultPrice
-              currency
-              uom
               type
-              operationGuideType
-              operationGuide
               updatedAt
               updater {
                 name
                 description
               }
+              creator {
+                name
+                description
+              }
             }
             total
           }
@@ -289,39 +234,54 @@ class VasList extends localize(i18next)(PageView) {
   }
 
   async _saveVas(patches) {
-    if (patches && patches.length) {
-      patches.map(vas => {
-        if (vas.defaultPrice) {
-          vas.defaultPrice = parseFloat(vas.defaultPrice)
-          return vas
-        }
-      })
+    try {
+      if (patches && patches.length) {
+        this.validateVas(patches)
 
-      const response = await client.mutate({
-        mutation: gql`
-          mutation updateMultipleVas($patches: [VasPatch!]!) {
-            updateMultipleVas(patches: $patches) {
-              name
+        const response = await client.mutate({
+          mutation: gql`
+            mutation updateMultipleVas($patches: [VasPatch!]!) {
+              updateMultipleVas(patches: $patches) {
+                name
+              }
             }
+          `,
+          variables: {
+            patches
           }
-        `,
-        variables: {
-          patches
-        }
-      })
+        })
 
-      if (!response.errors) {
-        this.dataGrist.fetch()
-        this.showToast(i18next.t('text.data_updated_successfully'))
+        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')
+        })
       }
-    } else {
-      CustomAlert({
-        title: i18next.t('text.nothing_changed'),
-        text: i18next.t('text.there_is_nothing_to_save')
-      })
+    } catch (error) {
+      this.showToast(error)
     }
   }
 
+  validateVas(patches) {
+    const test = patches
+    test
+    patches.map(patch => {
+      if (patch.name == ''|| patch.name === null || (patch.cuFlag == '+' && !patch.name)) {
+        throw new Error(i18next.t('text.empty_field_field', { field: 'name' }))
+      }
+      if (patch.type == '' || patch.type === null || (patch.cuFlag == '+' && !patch.type)) {
+        throw new Error(i18next.t('text.empty_field_field', { field: 'type' }))
+      }
+      if (patch.type && patch.type != this._vasTypes.MATERIALS && patch.type != this._vasTypes.SERVICE) {
+        throw new Error(i18next.t('text.invalid_input_in_field', { field: 'type' }))
+      }
+    })
+  }
+
   async _deleteVas() {
     const ids = this.dataGrist.selected.map(record => record.id)
     if (ids && ids.length) {
@@ -337,7 +297,7 @@ class VasList extends localize(i18next)(PageView) {
 
       const response = await client.mutate({
         mutation: gql`
-          mutation deleteVass($ids: [String!]) {
+          mutation deleteVass($ids: [String!]!) {
             deleteVass(ids: $ids)
           }
         `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.3.239",
+  "version": "4.3.241",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,10 +28,10 @@
     "@things-factory/grist-ui": "^4.3.237",
     "@things-factory/i18n-base": "^4.3.237",
     "@things-factory/import-ui": "^4.3.237",
-    "@things-factory/sales-base": "^4.3.239",
+    "@things-factory/sales-base": "^4.3.241",
     "@things-factory/setting-ui": "^4.3.237",
     "@things-factory/shell": "^4.3.237",
-    "@things-factory/warehouse-ui": "^4.3.239"
+    "@things-factory/warehouse-ui": "^4.3.241"
   },
-  "gitHead": "ed967aa995647ed1ebd4dd08d162d3a7ffddee51"
+  "gitHead": "507fce6438f95509d660bc61cd1ddc615c868ee3"
 }

package/translations/en.json

@@ -26,12 +26,18 @@
   "label.total_disc_amt": "total disc amt",
   "label.unit_price": "unit price",
   "text.draft_order_saved": "draft order saved",
+  "text.empty_field_field": "empty field ({field})",
   "text.generate_release_order(s)": "generate release order(s)",
+  "text.invalid_input_in_field": "invalid input ({field})",
+  "text.invalid_input_in_unit_price": "invalid input in unit price",
+  "text.negative_value_field": "negative value ({field})",
   "text.please_select_a_valid_draft_order_to_generate_release_order": "please select a valid draft order to generate release order",
   "text.purchase_order_form_invalid": "purchase order form invalid",
   "text.purchase_order_saved": "purchase order saved",
   "text.purchase_order_updated": "purchase order updated",
+  "text.qty_vas_exceed_release_qty_sku": "qty exceed release qty for vas ({sku})",
   "text.release_order(s)_has_been_generated": "release order(s) has been generated",
+  "text.there_is_duplicated_products_with_same_batch_no": "there is duplicated products with same batch no",
   "text.total_price_exceed_x_y": "total price exceed {x}{y}",
   "text.update_draft_release_order": "update draft release order",
   "text.update_purchase_order": "update purchase order",
@@ -44,7 +50,5 @@
   "title.purchase_order": "purchase order",
   "title.purchase_orders_approval": "purchase orders approval",
   "title.purchase_orders": "purchase orders",
-  "text.there_is_duplicated_products_with_same_batch_no": "there is duplicated products with same batch no",
-  "text.invalid_input_in_unit_price": "invalid input in unit price",
   "title.tolerance_limit": "tolerance limit"
 }

package/translations/ko.json

@@ -46,5 +46,9 @@
   "label.tax_rate": "[ko] tax rate",
   "text.purchase_order_updated": "[ko] purchase order updated",
   "text.there_is_duplicated_products_with_same_batch_no": "[ko] there is duplicated products with same batch no",
-  "text.invalid_input_in_unit_price": "[ko] invalid input in unit price"
+  "text.invalid_input_in_unit_price": "[ko] invalid input in unit price",
+  "text.empty_field_field": "[ko] empty field ({field})",
+  "text.invalid_input_in_field": "[ko] invalid input ({field})",
+  "text.negative_value_field": "[ko] negative value ({field})",
+  "text.qty_vas_exceed_release_qty_sku": "[ko] qty exceed release qty for vas ({sku})"
 }

package/translations/ms.json

@@ -46,5 +46,9 @@
   "label.tax_rate": "[ms] tax rate",
   "text.purchase_order_updated": "[ms] purchase order updated",
   "text.there_is_duplicated_products_with_same_batch_no": "[ms] there is duplicated products with same batch no",
-  "text.invalid_input_in_unit_price": "[ms] invalid input in unit price"
+  "text.invalid_input_in_unit_price": "[ms] invalid input in unit price",
+  "text.empty_field_field": "[ms] empty field ({field})",
+  "text.invalid_input_in_field": "[ms] invalid input ({field})",
+  "text.negative_value_field": "[ms] negative value ({field})",
+  "text.qty_vas_exceed_release_qty_sku": "[ms] qty exceed release qty for vas ({sku})"
 }

package/translations/zh.json

@@ -46,5 +46,9 @@
   "label.tax_rate": "[zh] tax rate",
   "text.purchase_order_updated": "[zh] purchase order updated",
   "text.there_is_duplicated_products_with_same_batch_no": "[zh] there is duplicated products with same batch no",
-  "text.invalid_input_in_unit_price": "[zh] invalid input in unit price"
+  "text.invalid_input_in_unit_price": "[zh] invalid input in unit price",
+  "text.empty_field_field": "[zh] empty field ({field})",
+  "text.invalid_input_in_field": "[zh] invalid input ({field})",
+  "text.negative_value_field": "[zh] negative value ({field})",
+  "text.qty_vas_exceed_release_qty_sku": "[zh] qty exceed release qty for vas ({sku})"
 }