@colijnit/transaction 12.1.36 → 12.1.38

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 (53) hide show
  1. package/bundles/colijnit-transaction.umd.js +279 -189
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +80 -80
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +81 -81
  6. package/esm2015/lib/component/checkout/checkout.component.js +3 -1
  7. package/esm2015/lib/component/core/base/transaction-filter-popup-base.component.js +37 -14
  8. package/esm2015/lib/component/dialog/transaction-header/dialog-transaction-header-delivery-method/dialog-transaction-header-delivery-method.component.js +3 -1
  9. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/dialog-transaction-line-commission-code.component.js +4 -1
  10. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-delivery-method/dialog-transaction-line-delivery-method.component.js +3 -1
  11. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-price-list/dialog-transaction-line-price-list.component.js +3 -1
  12. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-vat/dialog-transaction-line-vat.component.js +3 -1
  13. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse/dialog-transaction-line-warehouse.component.js +3 -1
  14. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.component.js +6 -2
  15. package/esm2015/lib/component/shopping-cart-preview/shopping-cart-preview.component.js +2 -1
  16. package/esm2015/lib/component/transaction/transaction.component.js +2 -1
  17. package/esm2015/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.js +2 -2
  18. package/esm2015/lib/component/transaction-header/transaction-header-delivery/transaction-header-delivery.component.js +2 -1
  19. package/esm2015/lib/component/transaction-header-fields/transaction-header-delivery-date.component.js +5 -1
  20. package/esm2015/lib/component/transaction-header-fields/transaction-header-preferred-delivery-date.component.js +6 -2
  21. package/esm2015/lib/component/transaction-line/transaction-line.component.js +18 -7
  22. package/esm2015/lib/component/transaction-line/transaction-line.module.js +4 -2
  23. package/esm2015/lib/component/transaction-line-checkbox-list/transaction-line-checkbox-list.component.js +21 -16
  24. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-date.component.js +45 -5
  25. package/esm2015/lib/component/transaction-lines/transaction-lines.component.js +6 -2
  26. package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.js +7 -6
  27. package/esm2015/lib/service/article-connector.service.js +2 -2
  28. package/esm2015/lib/service/dialog.service.js +4 -3
  29. package/esm2015/lib/service/transaction.service.js +3 -3
  30. package/fesm2015/colijnit-transaction.js +218 -107
  31. package/fesm2015/colijnit-transaction.js.map +1 -1
  32. package/lib/component/core/base/transaction-filter-popup-base.component.d.ts +4 -2
  33. package/lib/component/dialog/dialog-header-search/style/_layout.scss +16 -0
  34. package/lib/component/dialog/dialog-header-search/style/_material-definition.scss +4 -0
  35. package/lib/component/dialog/transaction-header/dialog-transaction-header-delivery-method/style/_material-definition.scss +1 -1
  36. package/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/style/_material-definition.scss +1 -1
  37. package/lib/component/dialog/transaction-line/dialog-transaction-line-delivery-method/style/_material-definition.scss +1 -1
  38. package/lib/component/dialog/transaction-line/dialog-transaction-line-price-list/style/_material-definition.scss +1 -1
  39. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/style/_material-definition.scss +1 -1
  40. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse/style/_material-definition.scss +1 -1
  41. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.component.d.ts +1 -0
  42. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/style/_material-definition.scss +1 -1
  43. package/lib/component/transaction-line/style/_layout.scss +6 -0
  44. package/lib/component/transaction-line/transaction-line.component.d.ts +2 -0
  45. package/lib/component/transaction-line-checkbox-list/style/_layout.scss +27 -33
  46. package/lib/component/transaction-line-checkbox-list/transaction-line-checkbox-list.component.d.ts +5 -5
  47. package/lib/component/transaction-line-fields/transaction-line-delivery-date.component.d.ts +9 -0
  48. package/lib/component/transaction-lines/transaction-lines.component.d.ts +2 -0
  49. package/lib/service/dialog.service.d.ts +1 -1
  50. package/lib/service/transaction.service.d.ts +1 -1
  51. package/lib/style/_variables.scss +1 -0
  52. package/lib/style/transaction-globals.scss +6 -2
  53. package/package.json +2 -2
@@ -3,10 +3,12 @@ import { BusinessObject } from "@colijnit/transactionapi/build/model/business-ob
3
3
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
4
4
  import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
5
5
  export declare abstract class TransactionFilterPopupBaseComponent<T extends BusinessObject | number | string> {
6
+ autoClose: boolean;
6
7
  useModel: boolean;
7
8
  set searchText(value: string);
8
9
  get searchText(): string;
9
10
  valueChange: EventEmitter<any>;
11
+ closeAfterCommit: EventEmitter<void>;
10
12
  set collection(value: T[]);
11
13
  get collection(): T[];
12
14
  get model(): TransactionLineInfo | TransactionInfo;
@@ -25,12 +27,12 @@ export declare abstract class TransactionFilterPopupBaseComponent<T extends Busi
25
27
  protected propsForLabel: string[];
26
28
  private _collection;
27
29
  private _searchText;
28
- commit(value: any): void;
30
+ commit(value: any): Promise<boolean>;
29
31
  handleChecked(row: {
30
32
  value: number;
31
33
  text: string;
32
34
  checked: boolean;
33
- }): void;
35
+ }): Promise<void>;
34
36
  protected prepareViewModels(): void;
35
37
  private _doSearch;
36
38
  }
@@ -1,7 +1,23 @@
1
+ @use "sass:math";
2
+
1
3
  @include export-module('co-dialog-header-search-layout') {
2
4
  .co-dialog-header-search {
3
5
  .dialog-header-search-title {
6
+ font-family: $tp-dialog-header-search-title-font-family;
7
+ font-size: $tp-dialog-header-search-title-font-size;
8
+ font-weight: $tp-dialog-header-search-title-font-weight;
4
9
  margin: $tp-dialog-header-search-title-margin;
5
10
  }
11
+ .co-input-search {
12
+ .co-input-text:not(.custom-height) {
13
+ height: $tp-dialog-header-search-input-height;
14
+ label {
15
+ top: math.div($tp-dialog-header-search-input-height, 2);
16
+ }
17
+ input {
18
+ margin-top: math.div($tp-dialog-header-search-input-height, 2) - 6;
19
+ }
20
+ }
21
+ }
6
22
  }
7
23
  }
@@ -1 +1,5 @@
1
+ $tp-dialog-header-search-title-font-family: $tp-font-family !default;
2
+ $tp-dialog-header-search-title-font-size: $tp-font-size-big !default;
3
+ $tp-dialog-header-search-title-font-weight: bold !default;
1
4
  $tp-dialog-header-search-title-margin: 0 0 10px 0 !default;
5
+ $tp-dialog-header-search-input-height: 32px !default;
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-header-delivery-method-min-width: 500px !default;
1
+ $tp-dialog-transaction-header-delivery-method-min-width: 410px !default;
2
2
  $tp-dialog-transaction-header-delivery-method-height: 400px !default;
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-line-commission-code-min-width: 500px !default;
1
+ $tp-dialog-transaction-line-commission-code-min-width: 410px !default;
2
2
  $tp-dialog-transaction-line-commission-code-height: 400px !default;
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-line-delivery-method-min-width: 500px !default;
1
+ $tp-dialog-transaction-line-delivery-method-min-width: 410px !default;
2
2
  $tp-dialog-transaction-line-delivery-method-height: 400px !default;
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-line-price-list-min-width: 500px !default;
1
+ $tp-dialog-transaction-line-price-list-min-width: 410px !default;
2
2
  $tp-dialog-transaction-line-price-list-height: 400px !default;
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-line-vat-min-width: 500px !default;
1
+ $tp-dialog-transaction-line-vat-min-width: 410px !default;
2
2
  $tp-dialog-transaction-line-vat-height: 400px !default;
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-line-warehouse-min-width: 500px !default;
1
+ $tp-dialog-transaction-line-warehouse-min-width: 410px !default;
2
2
  $tp-dialog-transaction-line-warehouse-height: 400px !default;
@@ -1,4 +1,5 @@
1
1
  import { DialogTransactionLineBaseComponent } from "../../../core/base/dialog-transaction-line-base.component";
2
2
  export declare class DialogTransactionLineWarehouseLocationComponent extends DialogTransactionLineBaseComponent {
3
+ warehouseNr: number;
3
4
  showClass(): boolean;
4
5
  }
@@ -1,2 +1,2 @@
1
- $tp-dialog-transaction-line-warehouse-location-min-width: 500px !default;
1
+ $tp-dialog-transaction-line-warehouse-location-min-width: 410px !default;
2
2
  $tp-dialog-transaction-line-warehouse-location-height: 400px !default;
@@ -191,6 +191,12 @@
191
191
  .price {
192
192
  font-weight: $tp-transaction-line-price-font-weight;
193
193
  }
194
+ .transaction-line-deliverydate {
195
+ .co-input-date {
196
+ height: auto;
197
+ padding: 0;
198
+ }
199
+ }
194
200
  }
195
201
  .article-text {
196
202
  font-family: $tp-transaction-line-font-family;
@@ -8,6 +8,7 @@ import { IconCacheService } from "../../service/icon-cache.service";
8
8
  import { DialogService } from "../../service/dialog.service";
9
9
  import { TransactionImageService } from "../../service/transaction-image.service";
10
10
  import { TransactionLineActionButtonsComponent } from "../transaction-line-action-buttons/transaction-line-action-buttons.component";
11
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
11
12
  export declare class TransactionLineComponent {
12
13
  service: TransactionService;
13
14
  iconCacheService: IconCacheService;
@@ -16,6 +17,7 @@ export declare class TransactionLineComponent {
16
17
  private _imageService;
17
18
  readonly icons: typeof Icon;
18
19
  preview: boolean;
20
+ transactionInfo: TransactionInfo;
19
21
  set line(value: TransactionLineInfo);
20
22
  get line(): TransactionLineInfo;
21
23
  waitingForUserAction: EventEmitter<boolean>;
@@ -3,46 +3,40 @@
3
3
  display: block;
4
4
  height: 100%;
5
5
 
6
- .test {
7
- height: 400px;
8
- }
9
-
10
- .test2 {
11
- height: 50px;
12
- }
13
-
14
- .highlight {
15
- font-weight: $tp-transaction-line-checkbox-list-item-hightlight-font-weight;
16
- font-style: $tp-transaction-line-checkbox-list-item-hightlight-font-style;
17
- text-decoration: $tp-transaction-line-checkbox-list-item-hightlight-text-decoration;
18
- }
19
- table {
6
+ .virtual-scroll-container {
7
+ max-height: $tp-dialog-transaction-line-warehouse-location-height;
8
+ height: $tp-dialog-transaction-line-warehouse-location-height;
9
+ min-width: $tp-dialog-transaction-line-warehouse-location-min-width;
20
10
  width: 100%;
21
- border-spacing: 0 3px;
22
- overflow: hidden;
23
- tr {
11
+
12
+ .virtual-scroll-item {
24
13
  height: $tp-transaction-line-checkbox-list-item-height;
25
- visibility: hidden;
26
- &.visible {
27
- visibility: visible;
28
- }
29
- }
30
- td {
31
- border-width: $tp-transaction-line-checkbox-list-item-border-width;
32
- border-style: $tp-transaction-line-checkbox-list-item-border-style;
14
+ border-radius: $tp-transaction-line-checkbox-list-item-border-radius;
15
+ display: flex;
16
+ align-items: center;
17
+ background-color: $tp-transaction-line-checkbox-list-item-background-color;
18
+ margin-bottom: 3px;
33
19
  }
34
- td:first-child {
35
- border-left-style: solid;
36
- border-top-left-radius: $tp-transaction-line-checkbox-list-item-border-radius;
37
- border-bottom-left-radius: $tp-transaction-line-checkbox-list-item-border-radius;
20
+
21
+ .checkbox-wrapper {
38
22
  padding-left: 10px;
39
23
  width: 40px;
40
24
  }
41
- td:last-child {
42
- border-right-style: solid;
43
- border-bottom-right-radius: $tp-transaction-line-checkbox-list-item-border-radius;
44
- border-top-right-radius: $tp-transaction-line-checkbox-list-item-border-radius;
25
+
26
+ .label-wrapper {
27
+ display: flex;
28
+ width: 100%;
45
29
  }
30
+
31
+ .label {
32
+ width: 50%;
33
+ }
34
+ }
35
+
36
+ .highlight {
37
+ font-weight: $tp-transaction-line-checkbox-list-item-hightlight-font-weight;
38
+ font-style: $tp-transaction-line-checkbox-list-item-hightlight-font-style;
39
+ text-decoration: $tp-transaction-line-checkbox-list-item-hightlight-text-decoration;
46
40
  }
47
41
  }
48
42
  }
@@ -1,16 +1,16 @@
1
- import { EventEmitter } from "@angular/core";
2
- export declare class TransactionLineCheckboxListComponent {
1
+ import { AfterViewChecked, ElementRef, EventEmitter } from "@angular/core";
2
+ export declare class TransactionLineCheckboxListComponent implements AfterViewChecked {
3
+ scrollingItem: ElementRef;
3
4
  collection: any[];
4
5
  readonly: boolean;
5
6
  checked: EventEmitter<any>;
6
7
  showClass: boolean;
7
8
  smallToolbar: boolean;
8
- private _observer;
9
+ itemHeight: number;
10
+ ngAfterViewChecked(): void;
9
11
  handleChecked(event: MouseEvent, row: {
10
12
  value: string;
11
13
  text: string;
12
14
  checked: boolean;
13
15
  }): void;
14
- private _initObserver;
15
- private _handleVisibility;
16
16
  }
@@ -1,7 +1,16 @@
1
1
  import { TransactionService } from "../../service/transaction.service";
2
2
  import { TransactionLineBaseComponent } from "../core/base/transaction-line-base.component";
3
+ import { InputDatePickerComponent } from "@colijnit/corecomponents_v12";
3
4
  export declare class TransactionLineDeliveryDateComponent extends TransactionLineBaseComponent<number> {
4
5
  private _transactionService;
6
+ set child(content: any);
7
+ showLabel: boolean;
8
+ defaultEditMode: boolean;
9
+ set editMode(value: boolean);
10
+ get editMode(): boolean;
11
+ handleClick(event: MouseEvent): void;
12
+ input: InputDatePickerComponent;
13
+ private _editMode;
5
14
  constructor(_transactionService: TransactionService);
6
15
  commit(date: Date): Promise<boolean>;
7
16
  protected transactionInfoSet(): void;
@@ -6,11 +6,13 @@ import { TransactionArticleTextComponent } from "../shared/transaction-article-t
6
6
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
7
7
  import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
8
8
  import { TransactionService } from "../../service/transaction.service";
9
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
9
10
  export declare class TransactionLinesComponent {
10
11
  iconCacheService: IconCacheService;
11
12
  private service;
12
13
  readonly icons: typeof Icon;
13
14
  transactionArticleText: TransactionArticleTextComponent;
15
+ transactionInfo: TransactionInfo;
14
16
  transactionLines: TransactionLineInfo[];
15
17
  preview: boolean;
16
18
  saveTransactionLine: EventEmitter<TransactionAddTextLineRequest>;
@@ -19,5 +19,5 @@ export declare class DialogService {
19
19
  showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<string>;
20
20
  showWarehouse(): Promise<number>;
21
21
  showCommissionCode(): Promise<string>;
22
- showWarehouseLocation(): Promise<string>;
22
+ showWarehouseLocation(warehouseNr: number): Promise<string>;
23
23
  }
@@ -89,7 +89,7 @@ export declare class TransactionService extends PendingReasonService {
89
89
  getDeliveryMethods(): Promise<DeliveryMethod[]>;
90
90
  getDeliveryOptions(): Promise<DeliveryOption[]>;
91
91
  getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
92
- addArticle(articleNo: string, amount?: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
92
+ addArticle(articleNo: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
93
93
  addTransactionLine(lineType: TransactionLineType, articleNo: string, amount: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
94
94
  addTextLine(showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
95
95
  addTextLineToTransaction(transactionUuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
@@ -94,6 +94,7 @@ $cc-checkbox-border-radius: 7px;
94
94
  $cc-checkbox-check-background-color: white;
95
95
  $cc-checkbox-check-border-color: #5FDCB3;
96
96
  $cc-checkbox-check-color: #5FDCB3;
97
+ $cc-co-dialog-header-text-color: $tp-color-font;
97
98
 
98
99
  $cc-collapsible-content-padding: 10px 0px 0px 0px;
99
100
 
@@ -96,10 +96,8 @@ $stopPoint: 10%;
96
96
 
97
97
  .transaction-line-button {
98
98
  font-size: $tp-font-size;
99
- cursor: pointer;
100
99
  display: flex;
101
100
  align-items: center;
102
- justify-content: center;
103
101
  height: $tp-transaction-line-button-height;
104
102
  column-gap: $tp-transaction-line-button-column-gap;
105
103
  padding: $tp-transaction-line-button-padding;
@@ -109,11 +107,17 @@ $stopPoint: 10%;
109
107
  border-radius: $tp-transaction-line-button-radius;
110
108
  background-color: $tp-transaction-line-button-background-color;
111
109
  }
110
+ &:not(.no-pointer) {
111
+ cursor: pointer;
112
+ }
112
113
  &:not(.custom-width) {
113
114
  width: $tp-transaction-line-button-width;
114
115
  &.big {
115
116
  width: $tp-transaction-line-button-big-width;
116
117
  }
117
118
  }
119
+ &.center-align {
120
+ justify-content: center;
121
+ }
118
122
  }
119
123
 
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@colijnit/transaction",
3
- "version": "12.1.36",
3
+ "version": "12.1.38",
4
4
  "description": "Colijn IT transaction module for Angular 12",
5
5
  "private": false,
6
6
  "peerDependencies": {
7
7
  "@angular/common": "^12.2.0",
8
8
  "@angular/core": "^12.2.0",
9
9
  "@colijnit/corecomponents_v12": ">=12.0.68",
10
- "@colijnit/transactionapi": ">=1.1.37",
10
+ "@colijnit/transactionapi": ">=1.1.38",
11
11
  "@fortawesome/angular-fontawesome": "0.9.0",
12
12
  "@fortawesome/fontawesome-svg-core": "^6.1.1",
13
13
  "@fortawesome/free-solid-svg-icons": "^6.1.1",