@things-factory/sales-ui 4.0.37 → 4.0.41

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

@@ -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,36 +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.mutate({
         mutation: gql`
-          mutation upsertPurchaseOrder($purchaseOrder: PurchaseOrderPatch!, $attachments: [Upload!]) {
-            upsertPurchaseOrder(purchaseOrder: $purchaseOrder, file: $attachments) {
+          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) {
@@ -1081,9 +1070,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           }
         }
       `,
-      variables: {
-        name: this._poNo
-      }
+      variables: { name: this._poNo }
     })
 
     if (!response.errors) {
@@ -1283,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 gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-// import { ORDER_STATUS } from '../../constants'
 
 class PurchaseOrderList extends localize(i18next)(PageView) {
   static get styles() {
@@ -318,7 +319,7 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
   async _fetchContactPoints() {
     const response = await client.query({
       query: gql`
-        query contactPoints($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+        query contactPoints($filters: [Filter!]!, $pagination: Pagination, $sortings: [Sorting!]!) {
           contactPoints(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.0.37",
+  "version": "4.0.41",
   "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.0.37",
-    "@things-factory/form-ui": "^4.0.37",
-    "@things-factory/grist-ui": "^4.0.37",
-    "@things-factory/i18n-base": "^4.0.37",
-    "@things-factory/import-ui": "^4.0.37",
-    "@things-factory/sales-base": "^4.0.37",
-    "@things-factory/setting-ui": "^4.0.37",
-    "@things-factory/shell": "^4.0.37",
-    "@things-factory/warehouse-ui": "^4.0.37"
+    "@things-factory/code-base": "^4.0.41",
+    "@things-factory/form-ui": "^4.0.41",
+    "@things-factory/grist-ui": "^4.0.41",
+    "@things-factory/i18n-base": "^4.0.41",
+    "@things-factory/import-ui": "^4.0.41",
+    "@things-factory/sales-base": "^4.0.41",
+    "@things-factory/setting-ui": "^4.0.41",
+    "@things-factory/shell": "^4.0.41",
+    "@things-factory/warehouse-ui": "^4.0.41"
   },
-  "gitHead": "7abd5ee06f7329c7fbb0c305f7b075a990bc2c18"
+  "gitHead": "1dd445b5b5e5b9e37291dc274886131199d7bf6a"
 }