@colijnit/transaction 12.1.64 → 12.1.66

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 (158) hide show
  1. package/bundles/colijnit-transaction.umd.js +1556 -645
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +152 -139
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +153 -140
  6. package/esm2015/lib/assets/dictionary/text.properties.js +3 -1
  7. package/esm2015/lib/component/checkout/checkout-overview-payment/checkout-overview-payment.component.js +2 -2
  8. package/esm2015/lib/component/checkout/checkout.component.js +36 -11
  9. package/esm2015/lib/component/core/base/transaction-lines-line-base.component.js +2 -3
  10. package/esm2015/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.js +45 -0
  11. package/esm2015/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.module.js +23 -0
  12. package/esm2015/lib/component/stepper/stepper.component.js +6 -4
  13. package/esm2015/lib/component/transaction/transaction.component.js +4 -3
  14. package/esm2015/lib/component/transaction/transaction.module.js +4 -2
  15. package/esm2015/lib/component/transaction-allocate-goods-history/transaction-allocate-goods-history.component.js +81 -0
  16. package/esm2015/lib/component/transaction-allocate-goods-history/transaction-allocate-goods-history.module.js +25 -0
  17. package/esm2015/lib/component/transaction-grid/transaction-available-stock-grid/transaction-available-stock-grid.component.js +3 -3
  18. package/esm2015/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.js +5 -5
  19. package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +3 -3
  20. package/esm2015/lib/component/transaction-header-fields/transaction-header-downpayment-amount.component.js +2 -2
  21. package/esm2015/lib/component/transaction-line/transaction-base-line/transaction-base-line.component.js +2 -1
  22. package/esm2015/lib/component/transaction-line/transaction-goods-allocation-line/service/transaction-allocate-goods.service.js +63 -0
  23. package/esm2015/lib/component/transaction-line/transaction-goods-allocation-line/transaction-goods-allocation-line.component.js +109 -0
  24. package/esm2015/lib/component/transaction-line/transaction-goods-allocation-line/transaction-goods-allocation-line.module.js +33 -0
  25. package/esm2015/lib/component/transaction-line/transaction-line/transaction-line.component.js +2 -1
  26. package/esm2015/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.js +4 -4
  27. package/esm2015/lib/component/transaction-line/transaction-overview-line/transaction-overview-line.component.js +2 -2
  28. package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line.component.js +2 -2
  29. package/esm2015/lib/component/transaction-line/transaction-receive-goods-line/service/transaction-receive-goods.service.js +4 -12
  30. package/esm2015/lib/component/transaction-line/transaction-receive-goods-line/transaction-receive-goods-line.component.js +10 -5
  31. package/esm2015/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.js +16 -5
  32. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.component.js +1 -1
  33. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.js +1 -1
  34. package/esm2015/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.js +8 -1
  35. package/esm2015/lib/component/transaction-line-side-panel/transaction-line-side-panel.module.js +4 -4
  36. package/esm2015/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.js +12 -10
  37. package/esm2015/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.module.js +4 -4
  38. package/esm2015/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales.component.js +81 -0
  39. package/esm2015/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales.module.js +25 -0
  40. package/esm2015/lib/component/transaction-line-statusbar/transaction-line-statusbar.component.js +36 -4
  41. package/esm2015/lib/component/transaction-lines/transaction-lines.component.js +4 -2
  42. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access/transaction-quick-access.module.js +4 -2
  43. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/transaction-quick-access-goods-allocation.component.js +69 -0
  44. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/transaction-quick-access-goods-allocation.module.js +25 -0
  45. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-overview/transaction-quick-access-overview.component.js +62 -1
  46. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-overview/transaction-quick-access-overview.module.js +6 -2
  47. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.js +1 -2
  48. package/esm2015/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.js +6 -3
  49. package/esm2015/lib/component/transaction-search/transaction-search-header/transaction-search-header.component.js +11 -4
  50. package/esm2015/lib/component/transaction-search/transaction-search-header/transaction-search-header.module.js +4 -3
  51. package/esm2015/lib/component/transaction-search/transaction-search.component.js +13 -3
  52. package/esm2015/lib/component/transaction-side-panel-edit-request-details/components/allocation-request.component.js +144 -0
  53. package/esm2015/lib/component/transaction-side-panel-edit-request-details/components/receive-goods-request.component.js +195 -0
  54. package/esm2015/lib/component/transaction-side-panel-edit-request-details/transaction-side-panel-edit-request-details.component.js +50 -0
  55. package/esm2015/lib/component/transaction-side-panel-edit-request-details/transaction-side-panel-edit-request-details.module.js +30 -0
  56. package/esm2015/lib/component/transaction-tile/transaction-tile.component.js +3 -2
  57. package/esm2015/lib/enum/icon.enum.js +2 -1
  58. package/esm2015/lib/enum/transaction-type-category.enum.js +2 -1
  59. package/esm2015/lib/model/extended-transaction-line-view-model.js +4 -0
  60. package/esm2015/lib/model/icon-svg.js +2 -1
  61. package/esm2015/lib/service/pending-reason.service.js +3 -1
  62. package/esm2015/lib/service/transaction-connector-adapter.service.js +51 -1
  63. package/esm2015/lib/service/transaction-connector.service.js +21 -1
  64. package/esm2015/lib/service/transaction-event.service.js +2 -1
  65. package/esm2015/lib/service/transaction-mapping.service.js +6 -1
  66. package/esm2015/lib/service/transaction.service.js +24 -8
  67. package/fesm2015/colijnit-transaction.js +1500 -566
  68. package/fesm2015/colijnit-transaction.js.map +1 -1
  69. package/lib/component/checkout/checkout.component.d.ts +13 -6
  70. package/lib/component/core/base/transaction-lines-line-base.component.d.ts +3 -1
  71. package/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.d.ts +15 -0
  72. package/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.module.d.ts +2 -0
  73. package/lib/component/dialog/catalog/dialog-catalog/style/_layout.scss +4 -0
  74. package/lib/component/dialog/catalog/dialog-catalog/style/_material-definition.scss +0 -0
  75. package/lib/component/dialog/catalog/dialog-catalog/style/_theme.scss +4 -0
  76. package/lib/component/dialog/catalog/dialog-catalog/style/material.scss +4 -0
  77. package/lib/component/dialog/dialog-header-search/style/_layout.scss +1 -1
  78. package/lib/component/dialog/dialog-header-search/style/_material-definition.scss +1 -1
  79. package/lib/component/stepper/stepper.component.d.ts +2 -1
  80. package/lib/component/transaction/transaction.component.d.ts +1 -1
  81. package/lib/component/transaction-allocate-goods-history/style/_layout.scss +4 -0
  82. package/lib/component/transaction-allocate-goods-history/style/_material-definition.scss +0 -0
  83. package/lib/component/transaction-allocate-goods-history/style/_theme.scss +4 -0
  84. package/lib/component/transaction-allocate-goods-history/style/material.scss +4 -0
  85. package/lib/component/transaction-allocate-goods-history/transaction-allocate-goods-history.component.d.ts +18 -0
  86. package/lib/component/transaction-allocate-goods-history/transaction-allocate-goods-history.module.d.ts +2 -0
  87. package/lib/component/transaction-confirmation-details/style/_layout.scss +1 -1
  88. package/lib/component/transaction-grid/transaction-available-stock-grid/transaction-available-stock-grid.component.d.ts +2 -1
  89. package/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.d.ts +2 -5
  90. package/lib/component/transaction-line/transaction-goods-allocation-line/service/transaction-allocate-goods.service.d.ts +12 -0
  91. package/lib/component/transaction-line/transaction-goods-allocation-line/style/_layout.scss +27 -0
  92. package/lib/component/transaction-line/transaction-goods-allocation-line/style/_material-definition.scss +0 -0
  93. package/lib/component/transaction-line/transaction-goods-allocation-line/style/_theme.scss +4 -0
  94. package/lib/component/transaction-line/transaction-goods-allocation-line/style/material.scss +4 -0
  95. package/lib/component/transaction-line/transaction-goods-allocation-line/transaction-goods-allocation-line.component.d.ts +27 -0
  96. package/lib/component/transaction-line/transaction-goods-allocation-line/transaction-goods-allocation-line.module.d.ts +2 -0
  97. package/lib/component/transaction-line/transaction-line/transaction-line.component.d.ts +2 -2
  98. package/lib/component/transaction-line/transaction-receive-goods-line/service/transaction-receive-goods.service.d.ts +2 -3
  99. package/lib/component/transaction-line/transaction-receive-goods-line/transaction-receive-goods-line.component.d.ts +2 -2
  100. package/lib/component/transaction-line-action-buttons/style/_layout.scss +2 -2
  101. package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.d.ts +3 -1
  102. package/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.component.d.ts +3 -3
  103. package/lib/component/transaction-line-image-and-description/style/_layout.scss +1 -0
  104. package/lib/component/transaction-line-image-and-description/style/_material-definition.scss +1 -0
  105. package/lib/component/transaction-line-side-panel/style/material.scss +1 -1
  106. package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts +2 -3
  107. package/lib/component/transaction-line-side-panel-sales/style/_layout.scss +4 -0
  108. package/lib/component/transaction-line-side-panel-sales/style/_material-definition.scss +0 -0
  109. package/lib/component/transaction-line-side-panel-sales/style/_theme.scss +4 -0
  110. package/lib/component/transaction-line-side-panel-sales/style/material.scss +4 -0
  111. package/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales.component.d.ts +20 -0
  112. package/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales.module.d.ts +2 -0
  113. package/lib/component/transaction-line-statusbar/transaction-line-statusbar.component.d.ts +11 -3
  114. package/lib/component/transaction-lines/style/material.scss +1 -0
  115. package/lib/component/transaction-quick-access/transaction-quick-access/style/material.scss +2 -0
  116. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/style/_layout.scss +27 -0
  117. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/style/_material-definition.scss +0 -0
  118. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/style/_theme.scss +4 -0
  119. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/style/material.scss +4 -0
  120. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/transaction-quick-access-goods-allocation.component.d.ts +20 -0
  121. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/transaction-quick-access-goods-allocation.module.d.ts +2 -0
  122. package/lib/component/transaction-quick-access/transaction-quick-access-overview/style/_layout.scss +3 -0
  123. package/lib/component/transaction-quick-access/transaction-quick-access-overview/transaction-quick-access-overview.component.d.ts +17 -0
  124. package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/style/_layout.scss +1 -6
  125. package/lib/component/transaction-receiving-goods-history/style/_layout.scss +2 -2
  126. package/lib/component/transaction-receiving-goods-history/style/_material-definition.scss +1 -1
  127. package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.d.ts +6 -4
  128. package/lib/component/transaction-search/style/_material-definition.scss +9 -2
  129. package/lib/component/transaction-search/transaction-search-header/style/_layout.scss +12 -0
  130. package/lib/component/transaction-search/transaction-search-header/style/_theme.scss +10 -0
  131. package/lib/component/transaction-search/transaction-search-header/transaction-search-header.component.d.ts +4 -1
  132. package/lib/component/transaction-search/transaction-search.component.d.ts +8 -3
  133. package/lib/component/transaction-side-panel-edit-request-details/components/allocation-request.component.d.ts +35 -0
  134. package/lib/component/{transaction-receiving-goods-details/transaction-receiving-goods-details.component.d.ts → transaction-side-panel-edit-request-details/components/receive-goods-request.component.d.ts} +9 -12
  135. package/lib/component/{transaction-receiving-goods-details → transaction-side-panel-edit-request-details}/style/_layout.scss +16 -19
  136. package/lib/component/transaction-side-panel-edit-request-details/style/_material-definition.scss +3 -0
  137. package/lib/component/transaction-side-panel-edit-request-details/style/_theme.scss +4 -0
  138. package/lib/component/transaction-side-panel-edit-request-details/style/material.scss +4 -0
  139. package/lib/component/transaction-side-panel-edit-request-details/transaction-side-panel-edit-request-details.component.d.ts +15 -0
  140. package/lib/component/transaction-side-panel-edit-request-details/transaction-side-panel-edit-request-details.module.d.ts +2 -0
  141. package/lib/component/transaction-tile/transaction-tile.component.d.ts +2 -0
  142. package/lib/enum/icon.enum.d.ts +1 -0
  143. package/lib/enum/transaction-type-category.enum.d.ts +1 -0
  144. package/lib/model/{receive-good-view-model.d.ts → extended-transaction-line-view-model.d.ts} +3 -1
  145. package/lib/service/pending-reason.service.d.ts +2 -0
  146. package/lib/service/transaction-connector-adapter.service.d.ts +8 -0
  147. package/lib/service/transaction-connector.service.d.ts +8 -0
  148. package/lib/service/transaction-event.service.d.ts +3 -5
  149. package/lib/service/transaction.service.d.ts +9 -1
  150. package/lib/style/_variables.scss +2 -1
  151. package/package.json +8 -6
  152. package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.js +0 -211
  153. package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.module.js +0 -30
  154. package/esm2015/lib/model/receive-good-view-model.js +0 -4
  155. package/lib/component/transaction-receiving-goods-details/style/_material-definition.scss +0 -3
  156. package/lib/component/transaction-receiving-goods-details/style/_theme.scss +0 -7
  157. package/lib/component/transaction-receiving-goods-details/style/material.scss +0 -3
  158. package/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.module.d.ts +0 -2
@@ -0,0 +1,27 @@
1
+ @include export-module('cc-transaction-quick-access-goods-allocation-layout') {
2
+ .co-transaction-quick-access-goods-allocation {
3
+
4
+ .button-wrapper {
5
+ position: relative;
6
+ background: $tp-default-background-accent;
7
+ border-radius: 10px;
8
+ padding: 5px;
9
+ display: flex;
10
+ flex-direction: column;
11
+ align-items: center;
12
+ justify-content: center;
13
+ cursor: pointer;
14
+ width: 65px;
15
+ height: 40px;
16
+
17
+ .button-icon {
18
+ height: 20px;
19
+ width: 20px;
20
+ }
21
+ }
22
+
23
+ .hidden {
24
+ visibility: hidden;
25
+ }
26
+ }
27
+ }
@@ -0,0 +1,4 @@
1
+ @include export-module('cc-transaction-quick-access-goods-allocation-theme') {
2
+ .co-transaction-quick-access-goods-allocation {
3
+ }
4
+ }
@@ -0,0 +1,4 @@
1
+ @import "../../../../style/mixin";
2
+ @import "./_material-definition";
3
+ @import "./_layout";
4
+ @import "./_theme";
@@ -0,0 +1,20 @@
1
+ import { TransactionService } from "../../../service/transaction.service";
2
+ import { TransactionEventService } from "../../../service/transaction-event.service";
3
+ import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
4
+ import { Icon } from "../../../enum/icon.enum";
5
+ import { IconCacheService } from "../../../service/icon-cache.service";
6
+ import { TransactionAllocateGoodsService } from "../../transaction-line/transaction-goods-allocation-line/service/transaction-allocate-goods.service";
7
+ export declare class TransactionQuickAccessGoodsAllocationComponent extends TransactionBaseComponent {
8
+ iconService: IconCacheService;
9
+ private _transactionService;
10
+ private _transactionEventService;
11
+ private _allocateGoodsService;
12
+ readonly icons: typeof Icon;
13
+ showClass(): boolean;
14
+ awaitingResult: boolean;
15
+ resultSuccessful: boolean;
16
+ iconVisible: boolean;
17
+ constructor(iconService: IconCacheService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _allocateGoodsService: TransactionAllocateGoodsService);
18
+ handleSelectAllLines(value: boolean): void;
19
+ handleCommitEvent(): Promise<void>;
20
+ }
@@ -0,0 +1,2 @@
1
+ export declare class TransactionQuickAccessGoodsAllocationModule {
2
+ }
@@ -14,6 +14,9 @@
14
14
  // top: math.div($tp-transaction-quick-access-search-height, 2);
15
15
  //}
16
16
  }
17
+ .co-input-text:not(.no-style).has-left-icon .input-text-left-icon {
18
+ height: 60%;
19
+ }
17
20
  }
18
21
  }
19
22
  }
@@ -1,4 +1,21 @@
1
1
  import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
2
+ import { ArticleExtended } from "@colijnit/articleapi/build/model/article-extended.bo";
3
+ import { Icon } from "../../../enum/icon.enum";
4
+ import { TransactionService } from "../../../service/transaction.service";
5
+ import { IconCacheService } from "../../../service/icon-cache.service";
2
6
  export declare class TransactionQuickAccessOverviewComponent extends TransactionBaseComponent {
7
+ iconService: IconCacheService;
8
+ protected readonly service: TransactionService;
9
+ readonly icons: typeof Icon;
3
10
  showClass(): boolean;
11
+ catalogOptions: any;
12
+ catalogParameters: any;
13
+ showCatalog: boolean;
14
+ searchText: string;
15
+ constructor(iconService: IconCacheService, service: TransactionService);
16
+ handleSearch(text: string): void;
17
+ handleAddArticle(event: MouseEvent): void;
18
+ handleSearchCatalog(event: MouseEvent): void;
19
+ handleCatalogArticleClick(article: ArticleExtended): Promise<void>;
20
+ showCatalogDialog(): void;
4
21
  }
@@ -45,7 +45,7 @@
45
45
  }
46
46
 
47
47
  .button-wrapper {
48
- background: #f5f5fc;
48
+ background: $tp-default-background-accent;
49
49
  border-radius: 10px;
50
50
  padding: 5px;
51
51
  display: flex;
@@ -60,11 +60,6 @@
60
60
  height: 20px;
61
61
  width: 20px;
62
62
  }
63
-
64
- .button-title {
65
- font-size: 10px;
66
- font-family: 'Public sans';
67
- }
68
63
  }
69
64
  }
70
65
  }
@@ -8,12 +8,12 @@
8
8
  flex-direction: column;
9
9
 
10
10
  .row {
11
- color: #8083A3;
11
+ color: $tp-color-label;
12
12
  }
13
13
 
14
14
  .correction {
15
15
  margin-top: 8px;
16
- color: #DB2C2C;
16
+ color: $tp-transaction-receiving-goods-history-correction-color;
17
17
  }
18
18
  }
19
19
  }
@@ -1 +1 @@
1
- $tp-transaction: $tp-font-family !default;
1
+ $tp-transaction-receiving-goods-history-correction-color: #DB2C2C !default;
@@ -1,16 +1,18 @@
1
- import { EventEmitter } from "@angular/core";
1
+ import { AfterViewInit, 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
4
  import { LogisticalStateDetail } from "@colijnit/transactionapi/build/model/logistical-state-detail.bo";
5
- export declare class TransactionReceivingGoodsHistoryComponent {
5
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
6
+ export declare class TransactionReceivingGoodsHistoryComponent implements AfterViewInit {
6
7
  private _service;
7
8
  set goodsReceiptHistory(value: LogisticalStateDetail[]);
9
+ transactionInfo: TransactionInfo;
8
10
  transactionLine: TransactionLineInfo;
9
- transactionId: number;
10
11
  reloadReceivingGoodsHistory: EventEmitter<void>;
11
12
  get goodsReceiptHistory(): LogisticalStateDetail[];
13
+ showClass(): boolean;
12
14
  private _goodsReceiptHistory;
13
15
  constructor(_service: TransactionService);
14
- showClass(): boolean;
16
+ ngAfterViewInit(): void;
15
17
  handleDeleteSelectedRow(row: LogisticalStateDetail): void;
16
18
  }
@@ -64,8 +64,15 @@ $tp-co-transaction-search-result-header-sidebar-close-button-size: 46px !default
64
64
  $tp-co-transaction-search-header-label-color: $tp-color-font !default;
65
65
  $tp-co-transaction-search-header-label-font-size: 18px !default;
66
66
  $tp-co-transaction-search-header-label-font-weight: bold !default;
67
- $tp-co-transaction-search-header-column-gap: 10px !default;
68
- $tp-co-transaction-search-header-button-wrapper-column-gap: 5px !default;
67
+ $tp-co-transaction-search-header-column-gap: 20px !default;
68
+ $tp-co-transaction-search-header-button-wrapper-column-gap: 20px !default;
69
+ $tp-co-transaction-search-header-plus-button-size: 26px !default;
70
+ $tp-co-transaction-search-header-plus-button-color: $tp-color-font !default;
71
+ $tp-co-transaction-search-header-plus-button-border-style: solid !default;
72
+ $tp-co-transaction-search-header-plus-button-border-width: 1px !default;
73
+ $tp-co-transaction-search-header-plus-button-border-color: $tp-color-font !default;
74
+ $tp-co-transaction-search-header-plus-button-border-radius: 10px !default;
75
+ $tp-co-transaction-search-header-plus-button-background-color: $tp-default-background-accent !default;
69
76
 
70
77
  $tp-co-transaction-search-input-text-fullscreen-width: 440px !default;
71
78
  $tp-co-transaction-search-input-text-sidebar-width: 250px !default;
@@ -107,5 +107,17 @@
107
107
  .view-mode-buttons-wrapper {
108
108
  padding: $tp-co-transaction-search-view-modes-wrapper-padding;
109
109
  }
110
+ .transaction-add-button {
111
+ cursor: pointer;
112
+ height: $tp-co-transaction-search-header-plus-button-size;
113
+ width: $tp-co-transaction-search-header-plus-button-size;
114
+ border-style: $tp-co-transaction-search-header-plus-button-border-style;
115
+ border-width: $tp-co-transaction-search-header-plus-button-border-width;
116
+ border-radius: $tp-co-transaction-search-header-plus-button-border-radius;
117
+ svg {
118
+ width: 90%;
119
+ height: 90%;
120
+ }
121
+ }
110
122
  }
111
123
  }
@@ -3,5 +3,15 @@
3
3
  .header-searchbar-title {
4
4
  color: $tp-co-transaction-search-header-label-color;
5
5
  }
6
+ .transaction-add-button {
7
+ border-color: $tp-co-transaction-search-header-plus-button-border-color;
8
+ background-color: $tp-co-transaction-search-header-plus-button-background-color;
9
+ svg { // for fontawesome icons
10
+ fill: $tp-co-transaction-search-header-plus-button-color;
11
+ }
12
+ & [fill] { // for own icons
13
+ fill: $tp-co-transaction-search-header-plus-button-color;
14
+ }
15
+ }
6
16
  }
7
17
  }
@@ -5,10 +5,12 @@ import { SearchViewMode } from "../../../enum/search-view-mode.enum";
5
5
  import { DictionaryService } from "../../../service/dictionary.service";
6
6
  import { IconCacheService } from "../../../service/icon-cache.service";
7
7
  import { TransactionSearchService } from "../service/transaction-search.service";
8
+ import { TransactionEventService } from "../../../service/transaction-event.service";
8
9
  export declare class TransactionSearchHeaderComponent {
9
10
  searchService: TransactionSearchService;
10
11
  iconCacheService: IconCacheService;
11
12
  private _dictionary;
13
+ private _transactionEventService;
12
14
  readonly icon: typeof Icon;
13
15
  readonly contentViewModes: typeof ContentViewMode;
14
16
  readonly searchViewModes: typeof SearchViewMode;
@@ -25,9 +27,10 @@ export declare class TransactionSearchHeaderComponent {
25
27
  showClass(): boolean;
26
28
  label: string;
27
29
  searchPlaceholder: string;
28
- constructor(searchService: TransactionSearchService, iconCacheService: IconCacheService, _dictionary: DictionaryService);
30
+ constructor(searchService: TransactionSearchService, iconCacheService: IconCacheService, _dictionary: DictionaryService, _transactionEventService: TransactionEventService);
29
31
  get fullscreen(): boolean;
30
32
  onResizeClick(): void;
31
33
  onCloseClick(): void;
32
34
  onViewModeChange(viewMode: any): void;
35
+ handleAddTransactionClick(): void;
33
36
  }
@@ -1,11 +1,13 @@
1
- import { EventEmitter } from "@angular/core";
1
+ import { EventEmitter, OnDestroy } from "@angular/core";
2
2
  import { CoDirection, CoOrientation } from "@colijnit/corecomponents_v12";
3
3
  import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
4
4
  import { TransactionSearchView } from "@colijnit/transactionapi/build/model/transaction-search-view.bo";
5
5
  import { SearchViewMode } from "../../enum/search-view-mode.enum";
6
6
  import { TransactionSearchService } from "./service/transaction-search.service";
7
- export declare class TransactionSearchComponent {
7
+ import { TransactionEventService } from "../../service/transaction-event.service";
8
+ export declare class TransactionSearchComponent implements OnDestroy {
8
9
  transactionSearchService: TransactionSearchService;
10
+ private _transactionEventService;
9
11
  readonly searchViewModes: typeof SearchViewMode;
10
12
  readonly orientations: typeof CoOrientation;
11
13
  readonly directionRight: CoDirection;
@@ -14,8 +16,11 @@ export declare class TransactionSearchComponent {
14
16
  get transactionType(): TransactionKind;
15
17
  transactionClick: EventEmitter<TransactionSearchView>;
16
18
  searchViewModeChange: EventEmitter<SearchViewMode>;
19
+ createTransactionClick: EventEmitter<void>;
17
20
  showClass(): boolean;
18
- constructor(transactionSearchService: TransactionSearchService);
21
+ private _subs;
22
+ constructor(transactionSearchService: TransactionSearchService, _transactionEventService: TransactionEventService);
23
+ ngOnDestroy(): void;
19
24
  onTransactionClick(transaction: TransactionSearchView): void;
20
25
  onSearchViewResizeClick(): void;
21
26
  onSideCollapseHandleClick(): void;
@@ -0,0 +1,35 @@
1
+ import { EventEmitter } from "@angular/core";
2
+ import { Icon } from "../../../enum/icon.enum";
3
+ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
4
+ import { AllocateGoodsForSalesOrderRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-request";
5
+ import { SalesOrderLineAllocationDetails } from "@colijnit/transactionapi/build/model/sales-order-line-allocation-details";
6
+ import { IconCacheService } from "../../../service/icon-cache.service";
7
+ import { FormMasterService } from "@colijnit/corecomponents_v12";
8
+ import { TransactionService } from "../../../service/transaction.service";
9
+ import { DialogService } from "../../../service/dialog.service";
10
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
11
+ export declare class AllocationRequestComponent {
12
+ iconCacheService: IconCacheService;
13
+ private _formMaster;
14
+ private _service;
15
+ private _dialogService;
16
+ readonly icons: typeof Icon;
17
+ set amountLeftToAllocate(value: number);
18
+ set transactionLine(value: TransactionLineInfo);
19
+ get amountLeftToAllocate(): number;
20
+ get transactionLine(): TransactionLineInfo;
21
+ transactionInfo: TransactionInfo;
22
+ reloadAllocationGoodsHistory: EventEmitter<void>;
23
+ allocationRequest: AllocateGoodsForSalesOrderRequest;
24
+ allocationDetails: SalesOrderLineAllocationDetails;
25
+ readonly: boolean;
26
+ saveButtonDisabled: boolean;
27
+ private _transactionLine;
28
+ private _amountLeftToAllocate;
29
+ private _subscriptions;
30
+ showClass(): boolean;
31
+ constructor(iconCacheService: IconCacheService, _formMaster: FormMasterService, _service: TransactionService, _dialogService: DialogService);
32
+ submit(): boolean;
33
+ handleSaveDetailsEdit(): void;
34
+ openWarehouseLocationDialog(): void;
35
+ }
@@ -1,15 +1,15 @@
1
- import { EventEmitter, OnDestroy, OnInit } from "@angular/core";
1
+ import { EventEmitter } from "@angular/core";
2
+ import { Icon } from "../../../enum/icon.enum";
2
3
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
3
4
  import { PurchaseOrderLineReceiptDetails } from "@colijnit/transactionapi/build/model/purchase-order-line-receipt-details.bo";
4
- import { FormMasterService } from "@colijnit/corecomponents_v12";
5
5
  import { ReceiveGoodsForPurchaseOrderRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-request.bo";
6
- import { TransactionService } from "../../service/transaction.service";
7
- import { ArticleService } from "../../service/article.service";
8
- import { DialogService } from "../../service/dialog.service";
9
- import { Icon } from "../../enum/icon.enum";
10
- import { IconCacheService } from "../../service/icon-cache.service";
11
- import { TransactionReceiveGoodsService } from "../transaction-line/transaction-receive-goods-line/service/transaction-receive-goods.service";
12
- export declare class TransactionReceivingGoodsDetailsComponent implements OnInit, OnDestroy {
6
+ import { IconCacheService } from "../../../service/icon-cache.service";
7
+ import { FormMasterService } from "@colijnit/corecomponents_v12";
8
+ import { TransactionService } from "../../../service/transaction.service";
9
+ import { ArticleService } from "../../../service/article.service";
10
+ import { DialogService } from "../../../service/dialog.service";
11
+ import { TransactionReceiveGoodsService } from "../../transaction-line/transaction-receive-goods-line/service/transaction-receive-goods.service";
12
+ export declare class ReceiveGoodsRequestComponent {
13
13
  iconCacheService: IconCacheService;
14
14
  private _formMaster;
15
15
  private _service;
@@ -18,7 +18,6 @@ export declare class TransactionReceivingGoodsDetailsComponent implements OnInit
18
18
  private _receiveGoodsService;
19
19
  readonly icons: typeof Icon;
20
20
  set amountLeftToReceive(value: number);
21
- transactionId: number;
22
21
  set transactionLine(value: TransactionLineInfo);
23
22
  reloadReceivingGoodsHistory: EventEmitter<void>;
24
23
  showClass(): boolean;
@@ -40,8 +39,6 @@ export declare class TransactionReceivingGoodsDetailsComponent implements OnInit
40
39
  submit(): boolean;
41
40
  locationRequired(): boolean;
42
41
  handleSaveDetailsEdit(): void;
43
- handleCancelDetailsEdit(): void;
44
- handleDropDownSelected(warehouseNr: number): Promise<void>;
45
42
  openWarehouseLocationDialog(): void;
46
43
  returnStockMode(): boolean;
47
44
  private _handleReturnStock;
@@ -1,17 +1,14 @@
1
- @import "../../../style/mixin";
2
-
3
- @include export-module('co-transaction-receiving-goods-details') {
4
- .co-transaction-receiving-goods-details {
5
- .receipt-details-wrapper {
1
+ @include export-module('cc-transaction-side-panel-edit-request-details-layout') {
2
+ .co-transaction-side-panel-edit-request-details {
3
+ .edit-request-details-wrapper {
6
4
  display: flex;
7
5
  flex-direction: column;
8
6
  }
9
7
 
10
8
  .details-header {
11
- font-size: $tp-co-transaction-receiving-goods-details-title-font-size;
12
- //font-weight: bold;
13
- margin: $tp-co-transaction-receiving-goods-details-title-margin;
14
- color: #8083A3;
9
+ font-size: $tp-co-transaction-request-details-title-font-size;
10
+ margin: $tp-co-transaction-request-details-title-margin;
11
+ color: $tp-color-label;
15
12
  }
16
13
 
17
14
  .columns-wrapper {
@@ -29,20 +26,20 @@
29
26
  visibility: hidden;
30
27
 
31
28
  .divider {
32
- border-left: 1px solid #dce4ea;
33
- margin: $tp-co-transaction-receiving-goods-details-input-margin;
29
+ border-left: 1px solid;
30
+ border-color: $tp-color-border;
31
+ margin: $tp-co-transaction-request-details-input-margin;
34
32
  }
35
33
  }
36
34
 
37
35
  .details-input {
38
- margin: $tp-co-transaction-receiving-goods-details-input-margin;
36
+ margin: $tp-co-transaction-request-details-input-margin;
39
37
  }
40
38
 
41
39
  .location-wrapper {
42
40
  position: relative;
43
41
  display: flex;
44
42
  align-items: center;
45
- //border: 1px solid $tp-transaction-line-border-color;
46
43
  border-radius: 10px;
47
44
  height: 28px;
48
45
  background-color: $tp-transaction-line-discount-background-color;
@@ -57,30 +54,30 @@
57
54
  position: absolute;
58
55
  right: 7px;
59
56
  top: 7px;
60
- color: #c13c3c;
57
+ color: $tp-color-error;
61
58
  }
62
59
  }
63
60
 
64
- .receive-button-wrapper {
61
+ .commit-button-wrapper {
65
62
  width: 100%;
66
63
  display: flex;
67
64
  margin-top: 20px;
68
65
  margin-bottom: 40px;
69
66
  justify-content: center;
70
67
 
71
- .receive-button {
68
+ .commit-button {
72
69
  display: flex;
73
70
  width: 125px;
74
71
  height: 35px;
75
- background: #3E7EFF;
72
+ background: $tp-color-action;
76
73
  align-items: center;
77
74
  justify-content: center;
78
75
  border-radius: 11px;
79
76
 
80
- .receive-text {
77
+ .commit-text {
81
78
  font-size: 12px;
82
79
  font-weight: bold;
83
- color: white;
80
+ color: $tp-color-text-light;
84
81
  }
85
82
  }
86
83
  }
@@ -0,0 +1,3 @@
1
+ $tp-co-transaction-request-details-title-font-size: 15px !default;
2
+ $tp-co-transaction-request-details-title-margin: 10px 0 20px 0 !default;
3
+ $tp-co-transaction-request-details-input-margin: 0 0 18px 0 !default;
@@ -0,0 +1,4 @@
1
+ @include export-module('cc-transaction-side-panel-edit-request-details-theme') {
2
+ .co-transaction-side-panel-edit-request-details {
3
+ }
4
+ }
@@ -0,0 +1,4 @@
1
+ @import "../../../style/mixin";
2
+ @import "./_material-definition";
3
+ @import "./_layout";
4
+ @import "./_theme";
@@ -0,0 +1,15 @@
1
+ import { EventEmitter } from "@angular/core";
2
+ import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
3
+ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
4
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
5
+ export declare class TransactionSidePanelEditRequestDetailsComponent {
6
+ readonly categories: typeof TransactionTypeCategory;
7
+ category: TransactionTypeCategory;
8
+ transactionInfo: TransactionInfo;
9
+ transactionLine: TransactionLineInfo;
10
+ amountLeftToReceive: number;
11
+ amountLeftToAllocate: number;
12
+ reloadReceivingGoodsHistory: EventEmitter<void>;
13
+ reloadAllocationGoodsHistory: EventEmitter<void>;
14
+ showClass(): boolean;
15
+ }
@@ -0,0 +1,2 @@
1
+ export declare class TransactionSidePanelEditRequestDetailsModule {
2
+ }
@@ -4,12 +4,14 @@ import { IconCacheService } from "../../service/icon-cache.service";
4
4
  import { Icon } from "../../enum/icon.enum";
5
5
  import { TransactionImageService } from "../../service/transaction-image.service";
6
6
  import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
7
+ import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
7
8
  export declare class TransactionTileComponent {
8
9
  iconCacheService: IconCacheService;
9
10
  private _imageService;
10
11
  readonly icon: typeof Icon;
11
12
  readonly transactionTypes: typeof TransactionKind;
12
13
  transactionType: TransactionKind;
14
+ activeCategory: TransactionTypeCategory;
13
15
  set transactionLine(value: TransactionLineInfo);
14
16
  get transactionLine(): TransactionLineInfo;
15
17
  showSidePanelClicked: EventEmitter<TransactionLineInfo>;
@@ -41,6 +41,7 @@ export declare enum Icon {
41
41
  PalletBoxesSolid = "pallet_boxes_solid",
42
42
  PercentSolid = "percent_solid",
43
43
  PlusRound = "plus_round",
44
+ PlusSimple = "plus_simple",
44
45
  PrintSolid = "print_solid",
45
46
  Purchase = "purchase",
46
47
  Resize = "resize",
@@ -7,6 +7,7 @@ export declare enum TransactionTypeCategory {
7
7
  PurchaseOrderMenu = "purchaseOrderMenu",
8
8
  SalesOrderOverview = "salesOrderOverview",
9
9
  SalesOrderPurchase = "salesOrderPurchase",
10
+ SalesOrderAllocation = "salesOrderAllocation",
10
11
  SalesOrderLogistics = "salesOrderLogistics",
11
12
  SalesOrderPlanning = "salesOrderPlanning",
12
13
  SalesOrderDeliveryNote = "salesOrderDeliveryNote",
@@ -1,8 +1,10 @@
1
1
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
2
- export declare class ReceiveGoodViewModel extends TransactionLineInfo {
2
+ export declare class ExtendedTransactionLineViewModel extends TransactionLineInfo {
3
3
  locationNr: string;
4
4
  quantityToReceive: number;
5
5
  quantityReceived: number;
6
+ quantityToAllocate: number;
7
+ quantityAllocated: number;
6
8
  lineNr: number;
7
9
  transId: number;
8
10
  }
@@ -13,6 +13,7 @@ import { SharedService } from "@colijnit/sharedcomponents";
13
13
  import { DictionaryService } from "./dictionary.service";
14
14
  import { TransactionEventService } from "./transaction-event.service";
15
15
  import { RelationConnectorService } from "./relation-connector.service";
16
+ import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
16
17
  export declare class PendingReasonService {
17
18
  protected dialogService: DialogService;
18
19
  protected options: OptionsService;
@@ -27,6 +28,7 @@ export declare class PendingReasonService {
27
28
  relationUpdated: BehaviorSubject<RelationAnyType>;
28
29
  applicationUser: boolean;
29
30
  invoiceAddressSameAsDelivery: boolean;
31
+ transactionKind: TransactionKind;
30
32
  currentTransaction: TransactionInfoResponse;
31
33
  set relation(value: RelationAnyType);
32
34
  get relation(): RelationAnyType;
@@ -53,6 +53,10 @@ import { StockStickersPrintLayouts } from "@colijnit/sharedapi/build/model/repor
53
53
  import { Sharedapi } from "@colijnit/sharedapi/build/sharedapi";
54
54
  import { EmailOrderConfirmation } from "@colijnit/transactionapi/build/model/report/email-order-confirmation";
55
55
  import { AvailableStock } from "@colijnit/transactionapi/build/model/available-stock.bo";
56
+ import { AllocateGoodsForSalesOrderRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-request";
57
+ import { AllocateGoodsForSalesOrderCorrectionRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-correction-request";
58
+ import { GoodsAllocationStatus } from "@colijnit/transactionapi/build/model/goods-allocation-status.bo";
59
+ import { GoodsAllocationStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-allocation-status-with-history.bo";
56
60
  export declare class TransactionConnectorAdapterService {
57
61
  private _optionsService;
58
62
  private _selectMultipleCacheService;
@@ -161,5 +165,9 @@ export declare class TransactionConnectorAdapterService {
161
165
  generateCommissionOrders(transId: number, onlyGenerateForDirectSellSuppliers: boolean): Promise<boolean>;
162
166
  getDeliveryOrderStatus(transId: number, lineNr: number): Promise<DeliveryOrderStatus>;
163
167
  getAvailableStockGroupedByWLBSByTransIdLineNr(transId: number, lineNr: number): Promise<AvailableStock[]>;
168
+ allocateGoodsForSalesOrder(request: AllocateGoodsForSalesOrderRequest): Promise<boolean>;
169
+ allocateGoodsForSalesOrderCorrection(request: AllocateGoodsForSalesOrderCorrectionRequest): Promise<boolean>;
170
+ getGoodsAllocationStatus(transId: number, lineNr: number): Promise<GoodsAllocationStatus>;
171
+ getGoodsAllocationStatusWithHistory(transId: number, lineNr: number): Promise<GoodsAllocationStatusWithHistory>;
164
172
  private _handleExceptionFromResponse;
165
173
  }
@@ -50,6 +50,10 @@ import { StockStickersEmailLayouts } from "@colijnit/sharedapi/build/model/repor
50
50
  import { StockStickersPrintLayouts } from "@colijnit/sharedapi/build/model/report/stock-stickers-print-layouts.bo";
51
51
  import { EmailOrderConfirmation } from "@colijnit/transactionapi/build/model/report/email-order-confirmation";
52
52
  import { AvailableStock } from "@colijnit/transactionapi/build/model/available-stock.bo";
53
+ import { AllocateGoodsForSalesOrderRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-request";
54
+ import { AllocateGoodsForSalesOrderCorrectionRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-correction-request";
55
+ import { GoodsAllocationStatus } from "@colijnit/transactionapi/build/model/goods-allocation-status.bo";
56
+ import { GoodsAllocationStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-allocation-status-with-history.bo";
53
57
  export declare class TransactionConnectorService {
54
58
  private _adapterService;
55
59
  private _selectSingleCacheService;
@@ -153,4 +157,8 @@ export declare class TransactionConnectorService {
153
157
  emailOrderConfirmation(emailOrderConfirmation: EmailOrderConfirmation): Promise<boolean>;
154
158
  getStockStickerTemplates(data: StockStickersPrintLayouts): Promise<StockStickersPrintLayouts[]>;
155
159
  getAvailableStockGroupedByWLBSByTransIdLineNr(transId: number, lineNr: number): Promise<AvailableStock[]>;
160
+ allocateGoodsForSalesOrder(request: AllocateGoodsForSalesOrderRequest): Promise<boolean>;
161
+ allocateGoodsForSalesOrderCorrection(request: AllocateGoodsForSalesOrderCorrectionRequest): Promise<boolean>;
162
+ getGoodsAllocationStatus(transId: number, lineNr: number): Promise<GoodsAllocationStatus>;
163
+ getGoodsAllocationStatusWithHistory(transId: number, lineNr: number): Promise<GoodsAllocationStatusWithHistory>;
156
164
  }
@@ -2,8 +2,8 @@ import { BehaviorSubject, Subject } from "rxjs";
2
2
  import { PositionGridRow } from "../enum/position-grid-row.enum";
3
3
  import { Scroll } from "@angular/router";
4
4
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
5
- import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
6
5
  import { BusinessObject } from "@colijnit/ioneconnector/build/model/business-object";
6
+ import { ExtendedTransactionLineViewModel } from "../model/extended-transaction-line-view-model";
7
7
  export declare class TransactionEventService {
8
8
  readonly addToCartBySku: Subject<{
9
9
  sku: string;
@@ -57,13 +57,11 @@ export declare class TransactionEventService {
57
57
  id: string;
58
58
  }>;
59
59
  readonly selectAllLines: Subject<boolean>;
60
- readonly transactionLineChanged: Subject<{
61
- transactionLine: TransactionLineInfo;
62
- goodsReceiptStatus: GoodsReceiptStatusWithHistory;
63
- }>;
60
+ readonly transactionLineChanged: Subject<ExtendedTransactionLineViewModel>;
64
61
  readonly openSidePanel: Subject<TransactionLineInfo>;
65
62
  readonly selectAllSalesOrderLinesForPurchase: Subject<boolean>;
66
63
  readonly generateCommissionOrders: Subject<boolean>;
67
64
  readonly allowPartialDeliveryChanged: Subject<boolean>;
68
65
  readonly connectionInitialized: BehaviorSubject<boolean>;
66
+ readonly createTransaction: Subject<void>;
69
67
  }