@things-factory/operato-wms 7.0.1-alpha.24 → 7.0.1-alpha.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/client/pages/components/partner-selector.js +7 -14
  2. package/client/pages/inbound/carton-label-popup.js +7 -12
  3. package/client/pages/inbound/pallet-label-popup.js +7 -14
  4. package/client/pages/order/reverse-kitting-order/reverse-kitting-pallet-label-popup.js +5 -7
  5. package/client/themes/app-theme.css +12 -2
  6. package/package.json +39 -39
package/client/pages/components/partner-selector.js CHANGED
@@ -1,4 +1,5 @@
1
- import '@material/mwc-button'
1
+ import '@material/web/icon/icon.js'
2
+
2
3
  import '@things-factory/form-ui'
3
4
  import '@operato/data-grist'
4
5
 
@@ -8,10 +9,12 @@ import { css, html, LitElement } from 'lit'
8
9
  import { i18next } from '@things-factory/i18n-base'
9
10
  import { client } from '@things-factory/shell'
10
11
  import { isMobileDevice } from '@things-factory/utils'
12
+ import { ButtonContainerStyles } from '@operato/styles'
11
13
 
12
14
  class PartnerSelector extends LitElement {
13
15
  static get styles() {
14
16
  return [
17
+ ButtonContainerStyles,
15
18
  css`
16
19
  :host {
17
20
  display: flex;
@@ -19,16 +22,10 @@ class PartnerSelector extends LitElement {
19
22
  overflow: hidden;
20
23
  background-color: white;
21
24
  }
25
+
22
26
  ox-grist {
23
27
  flex: 1;
24
28
  }
25
- .button-container {
26
- padding: var(--button-container-padding);
27
- margin: var(--button-container-margin);
28
- text-align: var(--button-container-align);
29
- background-color: var(--button-container-background);
30
- height: var(--button-container-height);
31
- }
32
29
  `
33
30
  ]
34
31
  }
@@ -45,14 +42,10 @@ class PartnerSelector extends LitElement {
45
42
  return html`
46
43
  <search-form id="search-form" .fields=${this.searchFields} @submit=${() => this.dataGrist.fetch()}></search-form>
47
44
 
48
- <ox-grist
49
- .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
50
- .config=${this.config}
51
- .fetchHandler="${this.fetchHandler.bind(this)}"
52
- ></ox-grist>
45
+ <ox-grist .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.config} .fetchHandler="${this.fetchHandler.bind(this)}"></ox-grist>
53
46
 
54
47
  <div class="button-container">
55
- <mwc-button raised @click="${this.select.bind(this)}">${i18next.t('button.select')}</mwc-button>
48
+ <button @click="${this.select.bind(this)}"><md-icon>select_check_box</md-icon>${i18next.t('button.select')}</button>
56
49
  </div>
57
50
  `
58
51
  }
package/client/pages/inbound/carton-label-popup.js CHANGED
@@ -1,3 +1,5 @@
1
+ import '@material/web/icon/icon.js'
2
+
1
3
  import { DirectPrinter } from '@things-factory/barcode-base'
2
4
  import { SingleColumnFormStyles } from '@things-factory/form-ui'
3
5
  import '@operato/data-grist'
@@ -6,6 +8,8 @@ import { client, store } from '@things-factory/shell'
6
8
  import gql from 'graphql-tag'
7
9
  import { css, html, LitElement } from 'lit'
8
10
  import { connect } from 'pwa-helpers/connect-mixin'
11
+ import { ButtonContainerStyles } from '@operato/styles'
12
+
9
13
  import { CARTON_LABEL_SETTING_KEY } from '../constants'
10
14
 
11
15
  class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
@@ -18,6 +22,7 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
18
22
 
19
23
  static get styles() {
20
24
  return [
25
+ ButtonContainerStyles,
21
26
  SingleColumnFormStyles,
22
27
  css`
23
28
  :host {
@@ -27,17 +32,6 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
27
32
  overflow-x: overlay;
28
33
  background-color: var(--main-section-background-color);
29
34
  }
30
- .button-container {
31
- display: flex;
32
- flex-direction: column;
33
- height: 100vh;
34
- height: 100dvh;
35
- justify-content: space-evenly;
36
- padding: 0 20px;
37
- margin: var(--button-container-margin);
38
- text-align: var(--button-container-align);
39
- background-color: var(--button-container-background);
40
- }
41
35
  `
42
36
  ]
43
37
  }
@@ -50,8 +44,9 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
50
44
  <input name="printQty" type="number" min="1" />
51
45
  </fieldset>
52
46
  </form>
47
+
53
48
  <div class="button-container">
54
- <mwc-button raised @click="${this._printLabel.bind(this)}" label="${i18next.t('button.print')}"></mwc-button>
49
+ <button @click=${this._printLabel.bind(this)}><md-icon>print</md-icon>${i18next.t('button.print')}</button>
55
50
  </div>
56
51
  `
57
52
  }
package/client/pages/inbound/pallet-label-popup.js CHANGED
@@ -1,3 +1,4 @@
1
+ import '@material/web/icon/icon.js'
1
2
  import '@operato/data-grist'
2
3
 
3
4
  import gql from 'graphql-tag'
@@ -8,6 +9,7 @@ import { DirectPrinter } from '@things-factory/barcode-base'
8
9
  import { i18next, localize } from '@things-factory/i18n-base'
9
10
  import { client, store } from '@things-factory/shell'
10
11
  import { isMobileDevice } from '@things-factory/utils'
12
+ import { ButtonContainerStyles } from '@operato/styles'
11
13
 
12
14
  import { PALLET_LABEL_SETTING_KEY } from '../constants'
13
15
 
@@ -23,6 +25,7 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
23
25
 
24
26
  static get styles() {
25
27
  return [
28
+ ButtonContainerStyles,
26
29
  css`
27
30
  :host {
28
31
  padding: 10px;
@@ -31,6 +34,7 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
31
34
  overflow-x: overlay;
32
35
  background-color: var(--main-section-background-color);
33
36
  }
37
+
34
38
  .grist {
35
39
  background-color: var(--main-section-background-color);
36
40
  display: flex;
@@ -38,17 +42,11 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
38
42
  flex: 1;
39
43
  overflow-y: auto;
40
44
  }
45
+
41
46
  ox-grist {
42
47
  overflow-y: hidden;
43
48
  flex: 1;
44
49
  }
45
- .button-container {
46
- padding: var(--button-container-padding);
47
- margin: var(--button-container-margin);
48
- text-align: var(--button-container-align);
49
- background-color: var(--button-container-background);
50
- height: var(--button-container-height);
51
- }
52
50
  `
53
51
  ]
54
52
  }
@@ -97,16 +95,11 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
97
95
  render() {
98
96
  return html`
99
97
  <div class="grist">
100
- <ox-grist
101
- id="grist"
102
- .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
103
- .config=${this.config}
104
- .data="${this.data}"
105
- ></ox-grist>
98
+ <ox-grist id="grist" .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.config} .data="${this.data}"></ox-grist>
106
99
  </div>
107
100
 
108
101
  <div class="button-container">
109
- <mwc-button raised @click="${this._printLabel.bind(this)}" label="${i18next.t('button.print')}"></mwc-button>
102
+ <button @click=${this._printLabel.bind(this)}><md-icon>print</md-icon>${i18next.t('button.print')}</button>
110
103
  </div>
111
104
  `
112
105
  }
package/client/pages/order/reverse-kitting-order/reverse-kitting-pallet-label-popup.js CHANGED
@@ -1,3 +1,4 @@
1
+ import '@material/web/icon/icon.js'
1
2
  import '@operato/data-grist'
2
3
 
3
4
  import gql from 'graphql-tag'
@@ -8,6 +9,7 @@ import { DirectPrinter } from '@things-factory/barcode-base'
8
9
  import { i18next, localize } from '@things-factory/i18n-base'
9
10
  import { client, store } from '@things-factory/shell'
10
11
  import { isMobileDevice } from '@things-factory/utils'
12
+ import { ButtonContainerStyles } from '@operato/styles'
11
13
 
12
14
  import { PALLET_LABEL_SETTING_KEY } from '../../constants'
13
15
 
@@ -23,6 +25,7 @@ class ReverseKittingPalletLabelPopup extends connect(store)(localize(i18next)(Li
23
25
 
24
26
  static get styles() {
25
27
  return [
28
+ ButtonContainerStyles,
26
29
  css`
27
30
  :host {
28
31
  padding: 10px;
@@ -97,16 +100,11 @@ class ReverseKittingPalletLabelPopup extends connect(store)(localize(i18next)(Li
97
100
  render() {
98
101
  return html`
99
102
  <div class="grist">
100
- <ox-grist
101
- id="grist"
102
- .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
103
- .config=${this.config}
104
- .data="${this.data}"
105
- ></ox-grist>
103
+ <ox-grist id="grist" .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.config} .data="${this.data}"></ox-grist>
106
104
  </div>
107
105
 
108
106
  <div class="button-container">
109
- <mwc-button raised @click="${this._printLabel.bind(this)}" label="${i18next.t('button.print')}"></mwc-button>
107
+ <button @click=${this._printLabel.bind(this)}><md-icon>print</md-icon>${i18next.t('button.print')}</button>
110
108
  </div>
111
109
  `
112
110
  }
package/client/themes/app-theme.css CHANGED
@@ -88,15 +88,25 @@ body {
88
88
  --md-fab-icon-color: var(--focus-color);
89
89
  --mdc-text-field-fill-color: transparent
90
90
 
91
+ --md-theme-on-primary: var(--theme-white-color);
92
+ --md-theme-primary: var(--secondary-text-color);
93
+ --md-theme-on-secondary: var(--theme-white-color);
94
+ --md-theme-secondary: var(--primary-color);
95
+ --md-button-outline-color: var(--primary-color);
96
+ --md-danger-button-primary-color: var(--status-danger-color);
97
+ --md-danger-button-outline-color: var(--status-danger-color);
98
+ --md-button-outline-width: 1px;
99
+ --md-button-horizontal-padding: 16px;
100
+
91
101
  /* button style */
92
102
  --button-background-color: #fafbfc;
93
103
  --button-background-focus-color: var(--primary-color);
94
104
  --button-border: var(--border-dark-color);
95
105
  --button-border-radius: var(--border-radius);
96
106
  --button-margin: var(--margin-default) var(--margin-default) var(--margin-default) 0;
97
- --button-padding: var(--padding-default);
107
+ --button-padding: calc(var(--padding-narrow)*1.5) var(--padding-wide);
98
108
  --button-color: var(--secondary-color);
99
- --button-font: normal 15px var(--theme-font);
109
+ --button-font: 600 var(--fontsize-default) var(--theme-font);
100
110
  --button-text-transform: capitalize;
101
111
 
102
112
  --button-active-background-color: var(--status-success-color);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "7.0.1-alpha.24",
3
+ "version": "7.0.1-alpha.29",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -73,49 +73,49 @@
73
73
  "@operato/scene-table": "^2.0.0-alpha.0",
74
74
  "@operato/scene-visualizer": "^2.0.0-alpha.0",
75
75
  "@operato/scene-wheel-sorter": "^2.0.0-alpha.0",
76
- "@things-factory/apptool-ui": "^7.0.1-alpha.24",
77
- "@things-factory/auth-ui": "^7.0.1-alpha.24",
78
- "@things-factory/barcode-ui": "^7.0.1-alpha.24",
79
- "@things-factory/biz-ui": "^7.0.1-alpha.24",
80
- "@things-factory/board-service": "^7.0.1-alpha.24",
81
- "@things-factory/board-ui": "^7.0.1-alpha.24",
82
- "@things-factory/code-ui": "^7.0.1-alpha.24",
83
- "@things-factory/context-ui": "^7.0.1-alpha.24",
84
- "@things-factory/env": "^7.0.1-alpha.15",
85
- "@things-factory/export-ui": "^7.0.1-alpha.24",
86
- "@things-factory/export-ui-csv": "^7.0.1-alpha.24",
87
- "@things-factory/export-ui-excel": "^7.0.1-alpha.24",
88
- "@things-factory/fav-base": "^7.0.1-alpha.24",
89
- "@things-factory/form-ui": "^7.0.1-alpha.15",
90
- "@things-factory/geography": "^7.0.1-alpha.24",
91
- "@things-factory/help": "^7.0.1-alpha.24",
92
- "@things-factory/i18n-base": "^7.0.1-alpha.24",
93
- "@things-factory/id-rule-base": "^7.0.1-alpha.24",
94
- "@things-factory/import-ui": "^7.0.1-alpha.24",
95
- "@things-factory/import-ui-excel": "^7.0.1-alpha.24",
96
- "@things-factory/more-ui": "^7.0.1-alpha.24",
97
- "@things-factory/notification": "^7.0.1-alpha.24",
98
- "@things-factory/operato-tools": "^7.0.1-alpha.24",
99
- "@things-factory/pdf": "^7.0.1-alpha.15",
100
- "@things-factory/print-proxy-service": "^7.0.1-alpha.24",
101
- "@things-factory/print-service": "^7.0.1-alpha.24",
102
- "@things-factory/print-ui": "^7.0.1-alpha.24",
103
- "@things-factory/product-base": "^7.0.1-alpha.24",
104
- "@things-factory/resource-ui": "^7.0.1-alpha.24",
105
- "@things-factory/sales-ui": "^7.0.1-alpha.24",
106
- "@things-factory/setting-ui": "^7.0.1-alpha.24",
107
- "@things-factory/system": "^7.0.1-alpha.24",
108
- "@things-factory/transport-base": "^7.0.1-alpha.24",
109
- "@things-factory/tutorial-ui": "^7.0.1-alpha.24",
110
- "@things-factory/warehouse-base": "^7.0.1-alpha.24",
111
- "@things-factory/worksheet-base": "^7.0.1-alpha.24"
76
+ "@things-factory/apptool-ui": "^7.0.1-alpha.29",
77
+ "@things-factory/auth-ui": "^7.0.1-alpha.29",
78
+ "@things-factory/barcode-ui": "^7.0.1-alpha.29",
79
+ "@things-factory/biz-ui": "^7.0.1-alpha.29",
80
+ "@things-factory/board-service": "^7.0.1-alpha.29",
81
+ "@things-factory/board-ui": "^7.0.1-alpha.29",
82
+ "@things-factory/code-ui": "^7.0.1-alpha.29",
83
+ "@things-factory/context-ui": "^7.0.1-alpha.29",
84
+ "@things-factory/env": "^7.0.1-alpha.29",
85
+ "@things-factory/export-ui": "^7.0.1-alpha.29",
86
+ "@things-factory/export-ui-csv": "^7.0.1-alpha.29",
87
+ "@things-factory/export-ui-excel": "^7.0.1-alpha.29",
88
+ "@things-factory/fav-base": "^7.0.1-alpha.29",
89
+ "@things-factory/form-ui": "^7.0.1-alpha.29",
90
+ "@things-factory/geography": "^7.0.1-alpha.29",
91
+ "@things-factory/help": "^7.0.1-alpha.29",
92
+ "@things-factory/i18n-base": "^7.0.1-alpha.29",
93
+ "@things-factory/id-rule-base": "^7.0.1-alpha.29",
94
+ "@things-factory/import-ui": "^7.0.1-alpha.29",
95
+ "@things-factory/import-ui-excel": "^7.0.1-alpha.29",
96
+ "@things-factory/more-ui": "^7.0.1-alpha.29",
97
+ "@things-factory/notification": "^7.0.1-alpha.29",
98
+ "@things-factory/operato-tools": "^7.0.1-alpha.29",
99
+ "@things-factory/pdf": "^7.0.1-alpha.29",
100
+ "@things-factory/print-proxy-service": "^7.0.1-alpha.29",
101
+ "@things-factory/print-service": "^7.0.1-alpha.29",
102
+ "@things-factory/print-ui": "^7.0.1-alpha.29",
103
+ "@things-factory/product-base": "^7.0.1-alpha.29",
104
+ "@things-factory/resource-ui": "^7.0.1-alpha.29",
105
+ "@things-factory/sales-ui": "^7.0.1-alpha.29",
106
+ "@things-factory/setting-ui": "^7.0.1-alpha.29",
107
+ "@things-factory/system": "^7.0.1-alpha.29",
108
+ "@things-factory/transport-base": "^7.0.1-alpha.29",
109
+ "@things-factory/tutorial-ui": "^7.0.1-alpha.29",
110
+ "@things-factory/warehouse-base": "^7.0.1-alpha.29",
111
+ "@things-factory/worksheet-base": "^7.0.1-alpha.29"
112
112
  },
113
113
  "devDependencies": {
114
- "@things-factory/builder": "^7.0.1-alpha.23",
114
+ "@things-factory/builder": "^7.0.1-alpha.29",
115
115
  "cypress": "^9.4.1",
116
116
  "cypress-file-upload": "^5.0.8",
117
117
  "cypress-localstorage-commands": "^1.6.1",
118
118
  "eslint-plugin-cypress": "^2.12.1"
119
119
  },
120
- "gitHead": "996311a63a69b7042fd8c3328c16077f14ccbc98"
120
+ "gitHead": "c6f1ac90f6de7a6ecf02a7c3e4615e116400fecc"
121
121
  }