@things-factory/sales-ui 4.3.81 → 4.3.82

package/client/pages/purchase-order/purchase-order-approval-detail.js

@@ -839,6 +839,10 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
                 brand
                 description
               }
+              productDetail {
+                id
+                name
+              }
               adjustedBatchId
               remark
               status

package/client/pages/purchase-order/purchase-order-detail.js

@@ -2,6 +2,7 @@ import '@things-factory/grist-ui'
 import '@things-factory/biz-ui'
 import '@things-factory/warehouse-ui'
 import '@things-factory/import-ui/client/components/import-pop-up'
+import '@things-factory/operato-wms/client/pages/components/select-product-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -522,29 +523,13 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         width: 150
       },
       {
-        type: 'object',
-        name: 'product',
+        type: 'string',
+        name: 'productName',
         header: i18next.t('field.product'),
-        record: {
-          editable: this._editable,
-          options: {
-            queryName: 'products',
-            basicArgs: {
-              filters: [{ name: 'bizplace_id', operator: 'eq', value: this._purchaseOrderData?.bizplace?.id }]
-            },
-            nameField: 'name',
-            descriptionField: 'description',
-            select: [
-              { name: 'id', hidden: true },
-              { name: 'sku', header: i18next.t('field.sku') },
-              { name: 'name', header: i18next.t('field.name') },
-              { name: 'brand', header: i18next.t('field.brand') },
-              { name: 'description', header: i18next.t('field.description') },
-              { name: 'packingType', header: i18next.t('field.packing_type') },
-              { name: 'primaryUnit', header: i18next.t('field.uom') },
-              { name: 'primaryValue', header: i18next.t('field.uom_value') }
-            ],
-            list: { fields: ['sku', 'name', 'brand', 'description', 'packingType'] }
+        imex: { header: i18next.t('field.product'), key: 'productName', width: 50, type: 'string' },
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            this._openProductSelection(rowIndex)
           }
         },
         width: 350
@@ -1038,6 +1023,10 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
                 brand
                 description
               }
+              productDetail {
+                id
+                name
+              }
               adjustedBatchId
               remark
               status
@@ -1210,6 +1199,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         id: record.id || null,
         batchId: record.batchId,
         product: { id: record.product.id },
+        productDetail: record.productDetailId ? { id: record.productDetailId } : { id: record.productDetail.id },
         packingType: record.packingType,
         uomValue: record?.uomValue ? record.uomValue : 0,
         uom: record.uom,
@@ -1476,6 +1466,59 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     return productGrist
   }
 
+  _openProductSelection(rowIndex) {
+    if (this._purchaseOrderData?.bizplace?.id) {
+      openPopup(
+        html`
+          <select-product-popup
+            .bizplaceId="${this._purchaseOrderData?.bizplace?.id}"
+            @selected="${e => {
+              // let newRecord = []
+              // newRecord.push(e.detail)
+
+              if (this.productGrist.dirtyData.records.length !== rowIndex) {
+                // update existing product data records
+                this.productGrist.dirtyData.records.splice(rowIndex, 1, {
+                  ...this.productGrist.dirtyData.records[rowIndex],
+                  ...e.detail
+                })
+
+                this.productGrist.dirtyData.records = this.productGrist.dirtyData.records.map(item => {
+                  return {
+                    ...item,
+                    totalUomValue:
+                      item?.packQty > 0
+                        ? item?.totalUomValue
+                          ? item.totalUomValue
+                          : `${parseFloat(item.packQty * e.detail.uomValue).toFixed(2)} ${e.detail.uom}`
+                        : null
+                  }
+                })
+
+                this.productData = {
+                  ...this.productData,
+                  records: [...this.productGrist.dirtyData.records]
+                }
+              } else {
+                this.productData = {
+                  ...this.productData,
+                  records: [...this.productGrist.dirtyData.records, e.detail]
+                }
+              }
+            }}"
+          ></select-product-popup>
+        `,
+        {
+          backdrop: true,
+          size: 'large',
+          title: i18next.t('title.select_item')
+        }
+      )
+    } else {
+      this._showToast({ message: i18next.t('text.company_selection_is_empty') })
+    }
+  }
+
   async _exportableData() {
     try {
       var headerSetting = [
@@ -1526,6 +1569,10 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               primaryUnit
               primaryValue
             }
+            productDetail {
+              id
+              name
+            }
           }
         }
       `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.3.81",
+  "version": "4.3.82",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,15 +24,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/code-base": "^4.3.78",
-    "@things-factory/form-ui": "^4.3.78",
-    "@things-factory/grist-ui": "^4.3.78",
-    "@things-factory/i18n-base": "^4.3.78",
-    "@things-factory/import-ui": "^4.3.78",
-    "@things-factory/sales-base": "^4.3.81",
-    "@things-factory/setting-ui": "^4.3.78",
-    "@things-factory/shell": "^4.3.78",
-    "@things-factory/warehouse-ui": "^4.3.81"
+    "@things-factory/code-base": "^4.3.82",
+    "@things-factory/form-ui": "^4.3.82",
+    "@things-factory/grist-ui": "^4.3.82",
+    "@things-factory/i18n-base": "^4.3.82",
+    "@things-factory/import-ui": "^4.3.82",
+    "@things-factory/sales-base": "^4.3.82",
+    "@things-factory/setting-ui": "^4.3.82",
+    "@things-factory/shell": "^4.3.82",
+    "@things-factory/warehouse-ui": "^4.3.82"
   },
-  "gitHead": "42c857ad7bcd48adb8da6e514c6e30b41040d04f"
+  "gitHead": "fb0cb65bba75de2d2d0784202138d6d79dafa274"
 }