@colijnit/transaction 12.1.35 → 12.1.37

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 (84) hide show
  1. package/bundles/colijnit-transaction.umd.js +855 -554
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +267 -261
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +268 -262
  6. package/esm2015/lib/component/checkout/checkout.component.js +3 -1
  7. package/esm2015/lib/component/core/base/dynamic-base-component.js +8 -0
  8. package/esm2015/lib/component/core/base/transaction-filter-popup-base.component.js +34 -14
  9. package/esm2015/lib/component/core/base/transaction-header-base.component.js +1 -1
  10. package/esm2015/lib/component/core/base/transaction-line-base.component.js +1 -1
  11. package/esm2015/lib/component/dialog/transaction-header/dialog-transaction-header-delivery-method/dialog-transaction-header-delivery-method.component.js +3 -1
  12. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/dialog-transaction-line-commission-code.component.js +4 -1
  13. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-delivery-method/dialog-transaction-line-delivery-method.component.js +3 -1
  14. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-price-list/dialog-transaction-line-price-list.component.js +3 -1
  15. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-vat/dialog-transaction-line-vat.component.js +3 -1
  16. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse/dialog-transaction-line-warehouse.component.js +3 -1
  17. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.component.js +37 -0
  18. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.module.js +28 -0
  19. package/esm2015/lib/component/shopping-cart-preview/shopping-cart-preview.component.js +2 -1
  20. package/esm2015/lib/component/transaction/transaction.component.js +13 -23
  21. package/esm2015/lib/component/transaction/transaction.module.js +1 -1
  22. package/esm2015/lib/component/transaction-grid/transaction-base-grid/transaction-base-grid.component.js +2 -2
  23. package/esm2015/lib/component/transaction-grid/transaction-history-grid/transaction-history-grid.component.js +3 -3
  24. package/esm2015/lib/component/transaction-grid/transaction-lines-grid/transaction-lines-grid.component.js +1 -1
  25. package/esm2015/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.js +39 -22
  26. package/esm2015/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.module.js +4 -2
  27. package/esm2015/lib/component/transaction-header/transaction-header-delivery/transaction-header-delivery.component.js +2 -1
  28. package/esm2015/lib/component/transaction-header-fields/transaction-header-delivery-date.component.js +5 -1
  29. package/esm2015/lib/component/transaction-header-fields/transaction-header-preferred-delivery-date.component.js +6 -2
  30. package/esm2015/lib/component/transaction-line/transaction-line.component.js +18 -7
  31. package/esm2015/lib/component/transaction-line/transaction-line.module.js +4 -2
  32. package/esm2015/lib/component/transaction-line-checkbox-list/transaction-line-checkbox-list.component.js +3 -3
  33. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-date.component.js +45 -5
  34. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-method.component.js +1 -1
  35. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.js +45 -0
  36. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location.module.js +23 -0
  37. package/esm2015/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.js +64 -52
  38. package/esm2015/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.js +2 -4
  39. package/esm2015/lib/component/transaction-lines/transaction-lines.component.js +6 -2
  40. package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.js +23 -18
  41. package/esm2015/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.js +4 -10
  42. package/esm2015/lib/service/article-connector.service.js +2 -8
  43. package/esm2015/lib/service/article.service.js +6 -2
  44. package/esm2015/lib/service/dialog.service.js +32 -41
  45. package/esm2015/lib/service/dynamic-component.service.js +68 -0
  46. package/esm2015/lib/service/transaction.service.js +3 -3
  47. package/fesm2015/colijnit-transaction.js +643 -359
  48. package/fesm2015/colijnit-transaction.js.map +1 -1
  49. package/lib/component/core/base/dynamic-base-component.d.ts +3 -0
  50. package/lib/component/core/base/transaction-filter-popup-base.component.d.ts +4 -2
  51. package/lib/component/dialog/dialog-header-search/style/_layout.scss +16 -0
  52. package/lib/component/dialog/dialog-header-search/style/_material-definition.scss +4 -0
  53. package/lib/component/dialog/transaction-header/dialog-transaction-header-delivery-method/style/_material-definition.scss +1 -1
  54. package/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/style/_material-definition.scss +1 -1
  55. package/lib/component/dialog/transaction-line/dialog-transaction-line-delivery-method/style/_material-definition.scss +1 -1
  56. package/lib/component/dialog/transaction-line/dialog-transaction-line-price-list/style/_material-definition.scss +1 -1
  57. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/style/_material-definition.scss +1 -1
  58. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse/style/_material-definition.scss +1 -1
  59. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.component.d.ts +4 -0
  60. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.module.d.ts +2 -0
  61. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/style/_material-definition.scss +1 -1
  62. package/lib/component/transaction/transaction.component.d.ts +3 -3
  63. package/lib/component/transaction-grid/transaction-received-goods-grid/style/_layout.scss +11 -0
  64. package/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.d.ts +7 -2
  65. package/lib/component/transaction-line/style/_layout.scss +6 -0
  66. package/lib/component/transaction-line/style/material.scss +1 -1
  67. package/lib/component/transaction-line/transaction-line.component.d.ts +2 -0
  68. package/lib/component/transaction-line-checkbox-list/style/_layout.scss +13 -0
  69. package/lib/component/transaction-line-fields/transaction-line-delivery-date.component.d.ts +9 -0
  70. package/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.d.ts +13 -0
  71. package/lib/component/transaction-line-fields/transaction-line-warehouse-location.module.d.ts +2 -0
  72. package/lib/component/transaction-line-side-panel/style/_layout.scss +16 -13
  73. package/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.d.ts +4 -2
  74. package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts +1 -1
  75. package/lib/component/transaction-lines/transaction-lines.component.d.ts +2 -0
  76. package/lib/component/transaction-receiving-goods-details/style/_layout.scss +16 -0
  77. package/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.d.ts +4 -1
  78. package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.d.ts +5 -7
  79. package/lib/service/dialog.service.d.ts +10 -3
  80. package/lib/service/dynamic-component.service.d.ts +9 -0
  81. package/lib/service/transaction.service.d.ts +1 -1
  82. package/lib/style/_variables.scss +1 -0
  83. package/lib/style/transaction-globals.scss +6 -2
  84. package/package.json +3 -3
@@ -0,0 +1,3 @@
1
+ export declare abstract class DynamicBaseComponent {
2
+ onClose(): void;
3
+ }
@@ -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;
@@ -0,0 +1,4 @@
1
+ import { DialogTransactionLineBaseComponent } from "../../../core/base/dialog-transaction-line-base.component";
2
+ export declare class DialogTransactionLineWarehouseLocationComponent extends DialogTransactionLineBaseComponent {
3
+ showClass(): boolean;
4
+ }
@@ -0,0 +1,2 @@
1
+ export declare class DialogTransactionLineWarehouseLocationModule {
2
+ }
@@ -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;
@@ -8,9 +8,11 @@ import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/mo
8
8
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
9
9
  import { TransactionBarButton } from "../../model/transaction-bar-button";
10
10
  import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
11
+ import { DynamicComponentService } from "../../service/dynamic-component.service";
11
12
  export declare class TransactionComponent implements OnDestroy {
12
13
  iconCacheService: IconCacheService;
13
14
  private _service;
15
+ private dynamicComponentService;
14
16
  readonly viewModes: typeof ContentViewMode;
15
17
  readonly icons: typeof Icon;
16
18
  set transaction(value: TransactionInfoResponse);
@@ -24,16 +26,14 @@ export declare class TransactionComponent implements OnDestroy {
24
26
  activeViewMode: ContentViewMode;
25
27
  activeCategory: TransactionTypeCategory;
26
28
  showDiscountsSidebar: boolean;
27
- showSidePanel: boolean;
28
29
  sidePanelTransactionLine: TransactionLineInfo;
29
30
  private _subs;
30
31
  private _transaction;
31
32
  private _transactionId;
32
- constructor(iconCacheService: IconCacheService, _service: TransactionService);
33
+ constructor(iconCacheService: IconCacheService, _service: TransactionService, dynamicComponentService: DynamicComponentService);
33
34
  ngOnDestroy(): void;
34
35
  addDiscount(): void;
35
36
  saveTransactionLine(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
36
37
  handleButtonBarButtonClicked(button: TransactionBarButton): void;
37
38
  handleShowSidePanel(line: TransactionLineInfo): void;
38
- handleCloseSidePanel(event: MouseEvent): void;
39
39
  }
@@ -2,5 +2,16 @@
2
2
 
3
3
  @include export-module('cc-transaction-received-goods-grid-layout') {
4
4
  .co-transaction-received-goods-grid {
5
+
6
+ .location-wrapper {
7
+ cursor: pointer;
8
+ display: flex;
9
+ align-items: center;
10
+ justify-content: center;
11
+ border: 1px solid $tp-transaction-line-border-color;
12
+ border-radius: 10px;
13
+ height: 30px;
14
+ background-color: $tp-transaction-line-discount-background-color;
15
+ }
5
16
  }
6
17
  }
@@ -7,20 +7,24 @@ import { TransactionService } from "../../../service/transaction.service";
7
7
  import { ArticleService } from "../../../service/article.service";
8
8
  import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
9
9
  import { TransactionEventService } from "../../../service/transaction-event.service";
10
+ import { DialogService } from "../../../service/dialog.service";
11
+ import { ColumnAlign } from "@colijnit/corecomponents_v12";
10
12
  export declare class TransactionReceivedGoodsGridComponent extends TransactionGridBaseComponent implements OnInit, OnDestroy {
11
13
  private _imageService;
12
14
  private _transactionService;
13
15
  private _transactionEventService;
14
16
  private _articleService;
17
+ private _dialogService;
18
+ readonly columnAlign: typeof ColumnAlign;
15
19
  showClass(): boolean;
16
20
  locations: string[];
17
21
  locationDropdownFields: {};
18
22
  rowViewModels: Map<TransactionLineInfo, ReceiveGoodsViewModel>;
19
23
  private _subscriptions;
20
- constructor(_imageService: TransactionImageService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _articleService: ArticleService);
24
+ constructor(_imageService: TransactionImageService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _articleService: ArticleService, _dialogService: DialogService);
21
25
  ngOnInit(): void;
22
26
  ngOnDestroy(): void;
23
- handleRowVisible(row: any): Promise<void>;
27
+ handleRowVisible(row: TransactionLineInfo): Promise<void>;
24
28
  locationRequired(row: TransactionLineInfo): boolean;
25
29
  handleDropDownSelected(warehouseNr: number): Promise<void>;
26
30
  getRowViewModel(row: TransactionLineInfo): ReceiveGoodsViewModel;
@@ -34,4 +38,5 @@ export declare class TransactionReceivedGoodsGridComponent extends TransactionGr
34
38
  transactionLine: TransactionLineInfo;
35
39
  goodsReceiptStatus: GoodsReceiptStatusWithHistory;
36
40
  }): void;
41
+ openWarehouseLocationDialog(line: TransactionLineInfo): Promise<any>;
37
42
  }
@@ -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;
@@ -1,13 +1,13 @@
1
1
  @import "./material-definition";
2
2
  @import "./layout";
3
3
  @import "./theme";
4
- @import "lib/components/input-number-picker/style/material";
5
4
  @import "../../core/image-display/style/material";
6
5
  @import "../../shared/transaction-article-text/style/material";
7
6
  @import "../../shared/transaction-article-text-overview/style/material";
8
7
  @import "../../transaction-line-side-panel/style/material";
9
8
  @import "../../dialog/transaction-line/dialog-transaction-line-commission-code/style/material";
10
9
  @import "../../dialog/transaction-line/dialog-transaction-line-warehouse/style/material";
10
+ @import "../../dialog/transaction-line/dialog-transaction-line-warehouse-location/style/material";
11
11
  @import "../../dialog/transaction-line/dialog-transaction-line-delivery-method/style/material";
12
12
  @import "../../dialog/transaction-line/dialog-transaction-line-vat/style/material";
13
13
  @import "../../dialog/transaction-line/dialog-transaction-line-discount/style/material";
@@ -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>;
@@ -2,6 +2,15 @@
2
2
  .co-transaction-line-checkbox-list {
3
3
  display: block;
4
4
  height: 100%;
5
+
6
+ .test {
7
+ height: 400px;
8
+ }
9
+
10
+ .test2 {
11
+ height: 50px;
12
+ }
13
+
5
14
  .highlight {
6
15
  font-weight: $tp-transaction-line-checkbox-list-item-hightlight-font-weight;
7
16
  font-style: $tp-transaction-line-checkbox-list-item-hightlight-font-style;
@@ -13,6 +22,10 @@
13
22
  overflow: hidden;
14
23
  tr {
15
24
  height: $tp-transaction-line-checkbox-list-item-height;
25
+ visibility: hidden;
26
+ &.visible {
27
+ visibility: visible;
28
+ }
16
29
  }
17
30
  td {
18
31
  border-width: $tp-transaction-line-checkbox-list-item-border-width;
@@ -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;
@@ -0,0 +1,13 @@
1
+ import { OnInit } from "@angular/core";
2
+ import { TransactionLineBaseComponent } from "../core/base/transaction-line-base.component";
3
+ import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
4
+ import { ArticleService } from "../../service/article.service";
5
+ export declare class TransactionLineWarehouseLocationComponent extends TransactionLineBaseComponent<StockLocation> implements OnInit {
6
+ private _articleService;
7
+ warehouseNr: number;
8
+ protected codeField: string;
9
+ protected propsForLabel: string[];
10
+ constructor(_articleService: ArticleService);
11
+ ngOnInit(): void;
12
+ commit(locationNr: number): Promise<boolean>;
13
+ }
@@ -0,0 +1,2 @@
1
+ export declare class TransactionLineWarehouseLocationModule {
2
+ }
@@ -2,19 +2,22 @@
2
2
 
3
3
  @include export-module('co-transaction-line-side-panel-layout') {
4
4
  .co-transaction-line-side-panel {
5
- display: flex;
6
- flex-direction: column;
7
- font-family: $tp-transaction-line-side-panel-font-family;
8
- font-size: $tp-transaction-line-side-panel-font-size;
9
- position: fixed;
10
- right: 0;
11
- top: $tp-transaction-line-side-panel-top;
12
- width: $tp-transaction-line-side-panel-width;
13
- height: $tp-transaction-line-side-panel-height;
14
- z-index: 10;
15
- box-shadow: $tp-transaction-line-side-panel-box-shadow;
16
- padding: $tp-transaction-line-side-panel-padding;
17
- background: white;
5
+
6
+ .transaction-line-side-panel-wrapper {
7
+ display: flex;
8
+ flex-direction: column;
9
+ font-family: $tp-transaction-line-side-panel-font-family;
10
+ font-size: $tp-transaction-line-side-panel-font-size;
11
+ position: fixed;
12
+ right: 0;
13
+ top: $tp-transaction-line-side-panel-top;
14
+ width: $tp-transaction-line-side-panel-width;
15
+ height: $tp-transaction-line-side-panel-height;
16
+ z-index: 30;
17
+ box-shadow: $tp-transaction-line-side-panel-box-shadow;
18
+ padding: $tp-transaction-line-side-panel-padding;
19
+ background: white;
20
+ }
18
21
 
19
22
  .transaction-line-side-panel-header {
20
23
  display: flex;
@@ -7,7 +7,8 @@ import { TransactionTypeCategory } from "../../enum/transaction-type-category.en
7
7
  import { TransactionService } from "../../service/transaction.service";
8
8
  import { TransactionEventService } from "../../service/transaction-event.service";
9
9
  import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
10
- export declare class TransactionLineSidePanelComponent {
10
+ import { DynamicBaseComponent } from "../core/base/dynamic-base-component";
11
+ export declare class TransactionLineSidePanelComponent extends DynamicBaseComponent {
11
12
  iconService: IconCacheService;
12
13
  private _service;
13
14
  private _transactionEventService;
@@ -19,7 +20,8 @@ export declare class TransactionLineSidePanelComponent {
19
20
  activeCategory: TransactionTypeCategory;
20
21
  cancelClick: EventEmitter<MouseEvent>;
21
22
  showClass(): boolean;
23
+ show: boolean;
22
24
  quantityToReceive: number;
23
25
  constructor(iconService: IconCacheService, _service: TransactionService, _transactionEventService: TransactionEventService);
24
- handleCancelClick(event: MouseEvent): void;
26
+ handleCancelClick(): void;
25
27
  }
@@ -9,9 +9,9 @@ export declare class TransactionLineSidePanelPurchaseComponent implements AfterV
9
9
  private _service;
10
10
  private _transactionEventService;
11
11
  readonly categories: typeof TransactionTypeCategory;
12
+ transactionLine: TransactionLineInfo;
12
13
  set transactionInfo(value: TransactionInfo);
13
14
  get transactionInfo(): TransactionInfo;
14
- transactionLine: TransactionLineInfo;
15
15
  category: TransactionTypeCategory;
16
16
  quantityToReceiveChange: EventEmitter<number>;
17
17
  showClass(): boolean;
@@ -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>;
@@ -34,5 +34,21 @@
34
34
  .details-input {
35
35
  margin: $tp-co-transaction-receiving-goods-details-input-margin;
36
36
  }
37
+
38
+ .location-wrapper {
39
+ cursor: pointer;
40
+ display: flex;
41
+ align-items: center;
42
+ border: 1px solid $tp-transaction-line-border-color;
43
+ border-radius: 10px;
44
+ height: 40px;
45
+ background-color: $tp-transaction-line-discount-background-color;
46
+ padding-left: 6px;
47
+ margin-bottom: 20px;
48
+ }
49
+ }
50
+
51
+ .clickable {
52
+ cursor: pointer;
37
53
  }
38
54
  }
@@ -5,10 +5,12 @@ import { FormMasterService } from "@colijnit/corecomponents_v12";
5
5
  import { ReceiveGoodsForPurchaseOrderRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-request.bo";
6
6
  import { TransactionService } from "../../service/transaction.service";
7
7
  import { ArticleService } from "../../service/article.service";
8
+ import { DialogService } from "../../service/dialog.service";
8
9
  export declare class TransactionReceivingGoodsDetailsComponent {
9
10
  private _formMaster;
10
11
  private _service;
11
12
  private _articleService;
13
+ private _dialogService;
12
14
  set amountLeftToReceive(value: number);
13
15
  transactionId: number;
14
16
  set transactionLine(value: TransactionLineInfo);
@@ -24,10 +26,11 @@ export declare class TransactionReceivingGoodsDetailsComponent {
24
26
  readonly: boolean;
25
27
  private _transactionLine;
26
28
  private _amountLeftToReceive;
27
- constructor(_formMaster: FormMasterService, _service: TransactionService, _articleService: ArticleService);
29
+ constructor(_formMaster: FormMasterService, _service: TransactionService, _articleService: ArticleService, _dialogService: DialogService);
28
30
  submit(): boolean;
29
31
  locationRequired(): boolean;
30
32
  handleSaveDetailsEdit(): Promise<void>;
31
33
  handleCancelDetailsEdit(): void;
32
34
  handleDropDownSelected(warehouseNr: number): Promise<void>;
35
+ openWarehouseLocationDialog(): Promise<any>;
33
36
  }
@@ -1,18 +1,16 @@
1
1
  import { EventEmitter } from "@angular/core";
2
2
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
3
3
  import { TransactionService } from "../../service/transaction.service";
4
- import { GoodsReceiptHistory } from "@colijnit/transactionapi/build/model/goods-receipt-history.bo";
5
- import { DatePipe } from "@angular/common";
4
+ import { LogisticalStateDetail } from "@colijnit/transactionapi/build/model/logistical-state-detail.bo";
6
5
  export declare class TransactionReceivingGoodsHistoryComponent {
7
6
  private _service;
8
- private _datePipe;
9
- set goodsReceiptHistory(value: GoodsReceiptHistory[]);
7
+ set goodsReceiptHistory(value: LogisticalStateDetail[]);
10
8
  transactionLine: TransactionLineInfo;
11
9
  transactionId: number;
12
10
  reloadReceivingGoodsHistory: EventEmitter<void>;
13
- get goodsReceiptHistory(): GoodsReceiptHistory[];
11
+ get goodsReceiptHistory(): LogisticalStateDetail[];
14
12
  private _goodsReceiptHistory;
15
- constructor(_service: TransactionService, _datePipe: DatePipe);
13
+ constructor(_service: TransactionService);
16
14
  showClass(): boolean;
17
- handleDeleteSelectedRow(row: GoodsReceiptHistory): Promise<void>;
15
+ handleDeleteSelectedRow(row: LogisticalStateDetail): Promise<void>;
18
16
  }
@@ -1,16 +1,23 @@
1
- import { ApplicationRef, ComponentFactoryResolver, Injector } from "@angular/core";
1
+ import { ApplicationRef, ComponentFactoryResolver, Injector, Type } from "@angular/core";
2
2
  import { TransactionLineCharacteristicChoice } from "@colijnit/transactionapi/build/model/transactionLineCharacteristicChoice.bo";
3
+ import { DynamicComponentService } from "./dynamic-component.service";
4
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
5
+ import { DialogBaseComponent } from "../component/core/base/dialog-base.component";
6
+ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
3
7
  export declare class DialogService {
4
8
  private _compFactoryResolver;
5
9
  private appRef;
6
10
  private injector;
11
+ private dynamicComponentService;
7
12
  private _componentRefs;
8
- constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector);
13
+ constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector, dynamicComponentService: DynamicComponentService);
9
14
  showYesNo(title: string, text: string): Promise<any>;
10
15
  showError(message: string, details?: string): Promise<any>;
11
16
  showInformation(message: string): Promise<any>;
17
+ showTransactionLineComponent(comp: Type<DialogBaseComponent>, transLine: TransactionLineInfo): Promise<any>;
18
+ showTransactionHeaderComponent(comp: Type<DialogBaseComponent>, transactionInfo: TransactionInfo): Promise<any>;
12
19
  showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<string>;
13
20
  showWarehouse(): Promise<number>;
14
21
  showCommissionCode(): Promise<string>;
15
- private _createComponent;
22
+ showWarehouseLocation(): Promise<string>;
16
23
  }
@@ -0,0 +1,9 @@
1
+ import { ApplicationRef, ComponentFactoryResolver, Injector, StaticProvider } from "@angular/core";
2
+ export declare class DynamicComponentService {
3
+ private _compFactoryResolver;
4
+ private appRef;
5
+ private injector;
6
+ private _componentRefs;
7
+ constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector);
8
+ createComponent(componentClass: any, inputs?: any, outputs?: any, providers?: StaticProvider[]): Promise<any>;
9
+ }
@@ -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.35",
3
+ "version": "12.1.37",
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
- "@colijnit/corecomponents_v12": ">=12.0.61",
10
- "@colijnit/transactionapi": ">=1.1.32",
9
+ "@colijnit/corecomponents_v12": ">=12.0.68",
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",