@things-factory/sales-ui 3.8.25 → 3.8.29

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

@@ -13,7 +13,7 @@ import { openPopup } from '@things-factory/layout-base'
 import { fetchSettingRule } from '@things-factory/setting-ui'
 import { client, CustomAlert, navigate, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 import { PURCHASE_ORDER_STATUS } from '../../constants'
 
@@ -912,7 +912,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       purchaseOrder.orderProducts = this._getOrderProducts()
       purchaseOrder.otherCharges = this._getPoOtherCharges()
 
-      const attachments = this._document?.files ? this._document.files : undefined
+      const fileUploader = this._document?.files ? this._document.files : undefined
 
       const objectNames = [
         'bizplace|name',
@@ -931,30 +931,25 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         delete purchaseOrder[objectName]
       })
 
-      const args = {
-        purchaseOrder: {
-          ...purchaseOrder,
-          status,
-          ownTransport: this._purchaseOrderData?.importCargo ? true : this._purchaseOrderData?.ownTransport,
-          supplier: { id: purchaseOrder?.supplier?.id }
-        }
-      }
-
-      const response = await client.query({
-        query: gql`
-            mutation ($attachments: Upload) {
-              upsertPurchaseOrder(${gqlBuilder.buildArgs(args)}, file:$attachments) {
-                id
-                name
-              }
+      const response = await client.mutate({
+        mutation: gql`
+          mutation upsertPurchaseOrder($purchaseOrder: PurchaseOrderPatch!, $files: [Upload!]) {
+            upsertPurchaseOrder(purchaseOrder: $purchaseOrder, files: $files) {
+              id
+              name
             }
-          `,
+          }
+        `,
         variables: {
-          attachments
+          purchaseOrder: {
+            ...purchaseOrder,
+            status,
+            ownTransport: this._purchaseOrderData?.importCargo ? true : this._purchaseOrderData?.ownTransport,
+            supplier: { id: purchaseOrder?.supplier?.id }
+          },
+          files: fileUploader
         },
-        context: {
-          hasUpload: true
-        }
+        context: { hasUpload: true }
       })
 
       if (!response.errors) {
@@ -984,10 +979,8 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     this._status = ''
     const response = await client.query({
       query: gql`
-        query {
-          purchaseOrder(${gqlBuilder.buildArgs({
-            name: this._poNo
-          })}) {
+        query purchaseOrder($name: String!) {
+          purchaseOrder(name: $name) {
             id
             name
             remark
@@ -1051,13 +1044,13 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               name
               description
             }
-            supplier{
+            supplier {
               id
               name
               companyName
               description
             }
-            bufferLocation{
+            bufferLocation {
               id
               name
               description
@@ -1076,7 +1069,8 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             }
           }
         }
-      `
+      `,
+      variables: { name: this._poNo }
     })
 
     if (!response.errors) {
@@ -1276,7 +1270,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         html`
           <contact-points-popup
             type="SUPPLIER"
-            partnerBizplaceId=${this.partnerBizplaceId}
+            partnerBizplaceId=${this.partnerBizplaceId ? this.partnerBizplaceId : this._purchaseOrderData.bizplace?.id}
             @selected="${e => {
               this._purchaseOrderData = {
                 ...this._purchaseOrderData,

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

@@ -1,13 +1,14 @@
-import { getCodeByName } from '@things-factory/code-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
-import { client, navigate, PageView } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
-// import { ORDER_STATUS } from '../../constants'
+
+import { getCodeByName } from '@things-factory/code-base'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, navigate, PageView } from '@things-factory/shell'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { isMobileDevice } from '@things-factory/utils'
 
 class PurchaseOrderList extends localize(i18next)(PageView) {
   static get styles() {
@@ -242,12 +243,8 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
   async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
     const response = await client.query({
       query: gql`
-        query {
-          purchaseOrders(${gqlBuilder.buildArgs({
-            filters: this.searchForm.queryFilters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query purchaseOrders($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          purchaseOrders(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -263,8 +260,8 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
               container
               ownTransport
               importCargo
-              currency              
-              arrivalNotice{
+              currency
+              arrivalNotice {
                 id
                 name
                 description
@@ -274,7 +271,7 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
                 name
                 description
               }
-              supplier{
+              supplier {
                 id
                 name
                 description
@@ -295,7 +292,12 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: this.searchForm.queryFilters,
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     if (!response.errors) {
@@ -317,12 +319,8 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
   async _fetchContactPoints() {
     const response = await client.query({
       query: gql`
-        query {
-          contactPoints(${gqlBuilder.buildArgs({
-            filters: [{ name: 'type', operator: 'eq', value: 'SUPPLIER' }],
-            pagination: { page: 0, limit: 999999 },
-            sortings: [{ name: 'name' }]
-          })}) {
+        query contactPoints($filters: [Filter!]!, $pagination: Pagination, $sortings: [Sorting!]!) {
+          contactPoints(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -330,7 +328,12 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
             }
           }
         }
-      `
+      `,
+      variables: {
+        filters: [{ name: 'type', operator: 'eq', value: 'SUPPLIER' }],
+        pagination: { page: 0, limit: 999999 },
+        sortings: [{ name: 'name' }]
+      }
     })
 
     return response.data.contactPoints.items || []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "3.8.25",
+  "version": "3.8.29",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,10 +29,10 @@
     "@things-factory/grist-ui": "^3.7.5",
     "@things-factory/i18n-base": "^3.8.0",
     "@things-factory/import-ui": "^3.8.0",
-    "@things-factory/sales-base": "^3.8.25",
+    "@things-factory/sales-base": "^3.8.29",
     "@things-factory/setting-ui": "^3.8.19",
     "@things-factory/shell": "^3.8.0",
-    "@things-factory/warehouse-ui": "^3.8.25"
+    "@things-factory/warehouse-ui": "^3.8.29"
   },
-  "gitHead": "65fc6a560f15143d908bb290e70f4f87f6575c7f"
+  "gitHead": "aab48875c1a169b2d75f9fe8aa6af029c3d5b3dd"
 }