@colijnit/transaction 12.1.140 → 12.1.142

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 (121) hide show
  1. package/bundles/colijnit-transaction.umd.js +1169 -266
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +14 -0
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +15 -1
  6. package/esm2015/lib/component/checkout/checkout.module.js +2 -2
  7. package/esm2015/lib/component/deposit-payment/deposit-payment.component.js +3 -2
  8. package/esm2015/lib/component/payment/payment.component.js +15 -133
  9. package/esm2015/lib/component/payment-tile/payment-tile.component.js +4 -2
  10. package/esm2015/lib/component/tile/tile.component.js +4 -2
  11. package/esm2015/lib/component/tile/tile.module.js +4 -2
  12. package/esm2015/lib/component/transaction/transaction.component.js +15 -6
  13. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/transaction-cash-register-dialog.component.js +56 -20
  14. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/transaction-cash-register-link-relation.component.js +97 -0
  15. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/transaction-cash-register-link-relation.module.js +24 -0
  16. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.js +63 -41
  17. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order.module.js +6 -2
  18. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.component.js +24 -0
  19. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.module.js +21 -0
  20. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-cash.component.js +82 -0
  21. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-cash.module.js +29 -0
  22. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-done.component.js +98 -0
  23. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-done.module.js +23 -0
  24. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-method.component.js +56 -0
  25. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-method.module.js +23 -0
  26. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-pin.component.js +33 -0
  27. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-pin.module.js +23 -0
  28. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.component.js +142 -0
  29. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.module.js +37 -0
  30. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-state.enum.js +9 -0
  31. package/esm2015/lib/component/transaction-copy-order/transaction-copy-order.component.js +5 -4
  32. package/esm2015/lib/component/transaction-header/transaction-header-order/transaction-header-order.component.js +2 -1
  33. package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +3 -2
  34. package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-payment.component.js +9 -4
  35. package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup.component.js +4 -1
  36. package/esm2015/lib/component/transaction-line/transaction-purchase-order-line/transaction-purchase-order-line.component.js +3 -5
  37. package/esm2015/lib/component/transaction-line-action-buttons/transaction-line-action-buttons-popup.component.js +12 -1
  38. package/esm2015/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.js +9 -6
  39. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-date-button.component.js +89 -12
  40. package/esm2015/lib/component/transaction-line-fields/transaction-purchase-portal-line-confirmed-price.component.js +2 -1
  41. package/esm2015/lib/component/transaction-line-image-and-description/transaction-line-image-and-description.component.js +25 -3
  42. package/esm2015/lib/component/transaction-line-purchase-confirmation/transaction-line-purchase-confirmation.component.js +2 -7
  43. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-order-confirmation/transaction-quick-access-order-confirmation.component.js +9 -9
  44. package/esm2015/lib/component/transaction-tags/transaction-tags.component.js +3 -3
  45. package/esm2015/lib/enum/icon.enum.js +4 -1
  46. package/esm2015/lib/model/icon-svg.js +4 -1
  47. package/esm2015/lib/res/dictionary/dictionaries.js +2 -2
  48. package/esm2015/lib/service/payment.service.js +172 -4
  49. package/esm2015/lib/service/pending-reason.service.js +4 -2
  50. package/esm2015/lib/service/transaction-connector-adapter.service.js +6 -2
  51. package/esm2015/lib/service/transaction-connector.service.js +6 -1
  52. package/esm2015/lib/service/transaction-event.service.js +2 -1
  53. package/esm2015/lib/service/transaction.service.js +8 -2
  54. package/esm2015/lib/transaction-version.js +3 -3
  55. package/fesm2015/colijnit-transaction.js +1168 -260
  56. package/fesm2015/colijnit-transaction.js.map +1 -1
  57. package/lib/component/core/base/components/transaction-header-block/style/_material-definition.scss +1 -1
  58. package/lib/component/deposit-payment/deposit-payment.component.d.ts +1 -0
  59. package/lib/component/payment/payment.component.d.ts +3 -20
  60. package/lib/component/payment/style/_layout.scss +0 -5
  61. package/lib/component/payment-tile/payment-tile.component.d.ts +1 -0
  62. package/lib/component/tile/style/_layout.scss +1 -1
  63. package/lib/component/tile/tile.component.d.ts +1 -0
  64. package/lib/component/transaction/transaction.component.d.ts +3 -0
  65. package/lib/component/transaction-button/style/_layout.scss +1 -0
  66. package/lib/component/transaction-button/style/_material-definition.scss +1 -1
  67. package/lib/component/transaction-cash-register-order/style/_layout.scss +18 -3
  68. package/lib/component/transaction-cash-register-order/style/material.scss +2 -0
  69. package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/transaction-cash-register-dialog.component.d.ts +3 -0
  70. package/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/style/_layout.scss +8 -0
  71. package/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/style/_material-definition.scss +0 -0
  72. package/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/style/_theme.scss +4 -0
  73. package/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/style/material.scss +5 -0
  74. package/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/transaction-cash-register-link-relation.component.d.ts +18 -0
  75. package/lib/component/transaction-cash-register-order/transaction-cash-register-link-relation/transaction-cash-register-link-relation.module.d.ts +2 -0
  76. package/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.d.ts +6 -5
  77. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.component.d.ts +5 -0
  78. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.module.d.ts +2 -0
  79. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-cash.component.d.ts +20 -0
  80. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-cash.module.d.ts +2 -0
  81. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-done.component.d.ts +20 -0
  82. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-done.module.d.ts +2 -0
  83. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-method.component.d.ts +16 -0
  84. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-method.module.d.ts +2 -0
  85. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-pin.component.d.ts +6 -0
  86. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-pin.module.d.ts +2 -0
  87. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_layout.scss +177 -0
  88. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_material-definition.scss +0 -0
  89. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_theme.scss +4 -0
  90. package/lib/component/{transaction-document-button → transaction-cash-register-order/transaction-cash-register-payment-dialog}/style/material.scss +1 -1
  91. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.component.d.ts +28 -0
  92. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.module.d.ts +2 -0
  93. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-state.enum.d.ts +7 -0
  94. package/lib/component/transaction-copy-order/transaction-copy-order.component.d.ts +2 -2
  95. package/lib/component/transaction-header/transaction-header-order/style/_layout.scss +6 -1
  96. package/lib/component/transaction-header/transaction-header-order/style/_material-definition.scss +2 -1
  97. package/lib/component/transaction-header/transaction-header-payment/style/_layout.scss +7 -1
  98. package/lib/component/transaction-header/transaction-header-payment/style/_material-definition.scss +6 -6
  99. package/lib/component/transaction-header/transaction-header-popup/style/_layout.scss +1 -1
  100. package/lib/component/transaction-line/transaction-line/style/_layout.scss +15 -1
  101. package/lib/component/transaction-line/transaction-overview-line/style/_layout.scss +2 -1
  102. package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons-popup.component.d.ts +2 -0
  103. package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.d.ts +3 -3
  104. package/lib/component/transaction-line-fields/transaction-line-delivery-date-button.component.d.ts +25 -1
  105. package/lib/component/transaction-line-image-and-description/style/_layout.scss +16 -1
  106. package/lib/component/transaction-line-image-and-description/transaction-line-image-and-description.component.d.ts +4 -0
  107. package/lib/component/transaction-tags/style/_layout.scss +13 -0
  108. package/lib/component/transaction-tags/style/_material-definition.scss +7 -4
  109. package/lib/enum/icon.enum.d.ts +3 -0
  110. package/lib/res/dictionary/dictionaries.d.ts +3 -0
  111. package/lib/service/payment.service.d.ts +30 -1
  112. package/lib/service/transaction-connector-adapter.service.d.ts +1 -1
  113. package/lib/service/transaction-connector.service.d.ts +1 -0
  114. package/lib/service/transaction-event.service.d.ts +1 -0
  115. package/lib/service/transaction.service.d.ts +1 -0
  116. package/lib/style/_variables.scss +6 -3
  117. package/lib/style/transaction-globals.scss +1 -0
  118. package/package.json +7 -7
  119. package/lib/component/transaction-document-button/style/_layout.scss +0 -59
  120. package/lib/component/transaction-document-button/style/_material-definition.scss +0 -9
  121. package/lib/component/transaction-document-button/style/_theme.scss +0 -5
@@ -10,8 +10,8 @@ import { DictionaryService } from "../../service/dictionary.service";
10
10
  import { TransactionImageService } from "../../service/transaction-image.service";
11
11
  import { RelationService } from "../../service/relation.service";
12
12
  import { CopyTransactionRequest } from "@colijnit/transactionapi/build/model/copy-transaction-request";
13
- import { CustomerFullObject } from "@colijnit/relationapi/build/model/customer-full-object.bo";
14
13
  import { TransactionCreationService } from "../../service/transaction-creation.service";
14
+ import { RelationSmallObject } from "@colijnit/relationapi/build/model/relation-small-object.bo";
15
15
  export declare class TransactionCopyOrderComponent extends TransactionBaseComponent {
16
16
  transactionEventService: TransactionEventService;
17
17
  service: TransactionService;
@@ -27,7 +27,7 @@ export declare class TransactionCopyOrderComponent extends TransactionBaseCompon
27
27
  customers: any[];
28
28
  selectedSalesPerson: SalesPerson;
29
29
  selectedBranch: BranchLov;
30
- selectedCustomer: CustomerFullObject;
30
+ selectedCustomer: RelationSmallObject;
31
31
  copyTransactionRequest: CopyTransactionRequest;
32
32
  closeDialog: EventEmitter<void>;
33
33
  showClass(): boolean;
@@ -32,7 +32,7 @@
32
32
  height: $tp-transaction-header-order-discount-height;
33
33
  .header-discount {
34
34
  display: flex;
35
- column-gap: 10px;
35
+ column-gap: $tp-transaction-header-order-discount-column-gap;
36
36
  align-items: center;
37
37
  justify-content: space-between;
38
38
  font-size: $tp-transaction-header-order-discount-font-size;
@@ -46,6 +46,11 @@
46
46
  height: $tp-transaction-header-order-discount-icon-size;
47
47
  }
48
48
  }
49
+ .spacer {
50
+ width: 1px;
51
+ height: 100%;
52
+ background: $tp-transaction-header-order-discount-border-color;
53
+ }
49
54
  }
50
55
  .transaction-header-block-content-third {
51
56
  display: flex;
@@ -11,9 +11,10 @@ $tp-transaction-header-order-discount-border-style: solid !default;
11
11
  $tp-transaction-header-order-discount-border-width: 1px !default;
12
12
  $tp-transaction-header-order-discount-border-color: $tp-color-border !default;
13
13
  $tp-transaction-header-order-discount-border-radius: $tp-default-border-radius !default;
14
- $tp-transaction-header-order-discount-padding: 5px 10px !default;
14
+ $tp-transaction-header-order-discount-padding: 0px 10px !default;
15
15
  $tp-transaction-header-order-discount-icon-color: $tp-color-font !default;
16
16
  $tp-transaction-header-order-discount-icon-size: 16px !default;
17
+ $tp-transaction-header-order-discount-column-gap: 8px !default;
17
18
  $tp-transaction-header-order-default-row-gap: $tp-default-row-gap !default;
18
19
  $tp-transaction-header-order-default-column-gap: $tp-default-column-gap !default;
19
20
  $tp-transaction-header-order-section-label-font-family: $tp-font-family !default;
@@ -39,7 +39,7 @@
39
39
  height: 100%;
40
40
  background-color: $tp-co-transaction-header-downpayment-percentage-wrapper-background;
41
41
  border-color: $tp-co-transaction-header-downpayment-border-color;
42
- min-width: $tp-co-transaction-header-downpayment-percentage-wrapper-width;
42
+ pointer-events: none;
43
43
  .transaction-header-deposit {
44
44
  span {
45
45
  font-weight: $tp-co-transaction-header-downpayment-amount-weight;
@@ -47,6 +47,7 @@
47
47
  }
48
48
  }
49
49
  .header-downpayment-amount-wrapper {
50
+ pointer-events: none;
50
51
  .transaction-header-deposit {
51
52
  span {
52
53
  font-weight: $tp-co-transaction-header-downpayment-amount-weight;
@@ -76,6 +77,11 @@
76
77
  font-weight: 600;
77
78
  }
78
79
  }
80
+ .spacer {
81
+ width: 1px;
82
+ height: 100%;
83
+ background: $tp-co-transaction-header-payment-button-wrapper-border-color;
84
+ }
79
85
  }
80
86
  }
81
87
  }
@@ -1,13 +1,13 @@
1
- $tp-co-transaction-header-downpayment-border-width: 1px !default;
1
+ $tp-co-transaction-header-downpayment-border-width: 0px !default;
2
2
  $tp-co-transaction-header-downpayment-border-radius: 5px !default;
3
3
  $tp-co-transaction-header-downpayment-border-color: $tp-color-light-accent !default;
4
- $tp-co-transaction-header-downpayment-percentage-padding: 2px 10px !default;
5
- $tp-co-transaction-header-downpayment-percentage-wrapper-background: $tp-color-light !default;
6
- $tp-co-transaction-header-downpayment-percentage-wrapper-width: 100px !default;
4
+ $tp-co-transaction-header-downpayment-percentage-padding: 0 0 0 5px !default;
5
+ $tp-co-transaction-header-downpayment-percentage-wrapper-background: transparent !default;
6
+ $tp-co-transaction-header-downpayment-percentage-wrapper-width: 40px !default;
7
7
  $tp-co-transaction-header-downpayment-amount-weight: bold !default;
8
8
 
9
- $tp-co-transaction-header-payment-button-wrapper-gap: 10px !default;
10
- $tp-co-transaction-header-payment-button-wrapper-padding: 5px 10px !default;
9
+ $tp-co-transaction-header-payment-button-wrapper-gap: 8px !default;
10
+ $tp-co-transaction-header-payment-button-wrapper-padding: 0px 10px !default;
11
11
  $tp-co-transaction-header-payment-button-wrapper-height: 30px !default;
12
12
  $tp-co-transaction-header-payment-button-wrapper-border-width: 1px !default;
13
13
  $tp-co-transaction-header-payment-button-wrapper-border-color: $tp-color-light-accent !default;
@@ -128,7 +128,7 @@
128
128
  .co-dialog:not(.is-mobile) .co-dialog-wrapper {
129
129
  max-height: 90vh;
130
130
  }
131
- .save-button {
131
+ .save-button, .close-button {
132
132
  height: $tp-transaction-header-popup-save-button-size;
133
133
  .co-icon {
134
134
  height: $tp-transaction-header-popup-save-button-icon-size;
@@ -3,6 +3,7 @@
3
3
  font-family: $tp-transaction-line-font-family;
4
4
  font-size: $tp-transaction-line-font-size;
5
5
  width: 100%;
6
+ min-width: 100%;
6
7
  display: flex;
7
8
  flex-direction: column;
8
9
  border: $tp-transaction-line-border;
@@ -19,6 +20,7 @@
19
20
  .line-end {
20
21
  max-width: 66%;
21
22
  width: max-content;
23
+ padding-top: 5px;
22
24
  }
23
25
  .preview-margin {
24
26
  margin-left: $tp-transaction-line-column-gap;
@@ -39,7 +41,6 @@
39
41
  }
40
42
  .transaction-line-extended-wrapper {
41
43
  display: flex;
42
- flex-wrap: wrap;
43
44
  align-content: flex-start;
44
45
  row-gap: $tp-transaction-line-row-gap;
45
46
  .column1 {
@@ -198,6 +199,19 @@
198
199
  grid-row: 1 / 1;
199
200
  }
200
201
  }
202
+ @media(max-width:1440px) {
203
+ .transaction-line-totals {
204
+ grid-template-columns: 100px 100px;
205
+ .transaction-line-totals-total {
206
+ grid-column: 2 / 2;
207
+ grid-row: 2 / 2;
208
+ }
209
+ .co-transaction-line-discount-button {
210
+ grid-column: 1 / 1;
211
+ grid-row: 2 / 2;
212
+ }
213
+ }
214
+ }
201
215
  //.transaction-line-totals-price-discount {
202
216
  // display: flex;
203
217
  // flex-direction: column;
@@ -5,7 +5,8 @@
5
5
 
6
6
  .transaction-line-section {
7
7
  display: flex;
8
-
8
+ gap: 10px;
9
+ margin-right: 15px;
9
10
  .vat-button {
10
11
  margin-right: 15px;
11
12
  }
@@ -5,11 +5,13 @@ export declare class TransactionLineActionButtonsPopupComponent {
5
5
  iconCacheService: IconCacheService;
6
6
  readonly icons: typeof Icon;
7
7
  parentForOverlay: ElementRef;
8
+ addDocumentButtonClick: EventEmitter<void>;
8
9
  articleTextButtonClick: EventEmitter<void>;
9
10
  transactionTextButtonClick: EventEmitter<void>;
10
11
  sidePanelButtonClick: EventEmitter<void>;
11
12
  showClass: boolean;
12
13
  constructor(iconCacheService: IconCacheService);
14
+ handleAddDocumentButtonClick(event: MouseEvent): void;
13
15
  handleArticleTextButtonClick(event: MouseEvent): void;
14
16
  handleTransactionTextButtonClick(event: MouseEvent): void;
15
17
  handleSidePanelButtonClick(event: MouseEvent): void;
@@ -3,7 +3,6 @@ import { TransactionEventService } from '../../service/transaction-event.service
3
3
  import { TransactionService } from '../../service/transaction.service';
4
4
  import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
5
5
  import { Icon } from '../../enum/icon.enum';
6
- import { DictionaryService } from '../../service/dictionary.service';
7
6
  import { IconCacheService } from '../../service/icon-cache.service';
8
7
  import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
9
8
  import { OverlayService } from '@colijnit/corecomponents_v12';
@@ -11,9 +10,9 @@ export declare class TransactionLineActionButtonsComponent implements OnInit {
11
10
  elementRef: ElementRef;
12
11
  iconCacheService: IconCacheService;
13
12
  private _transactionService;
14
- private _dictionaryService;
15
13
  private _transactionEventService;
16
14
  private _overlayService;
15
+ private _eventService;
17
16
  readonly icons: typeof Icon;
18
17
  set transactionLine(value: TransactionLineInfo);
19
18
  get transactionLine(): TransactionLineInfo;
@@ -28,9 +27,10 @@ export declare class TransactionLineActionButtonsComponent implements OnInit {
28
27
  showActionButtons: boolean;
29
28
  private _transactionLine;
30
29
  private _actionButtonsPopupComponentRef;
31
- constructor(elementRef: ElementRef, iconCacheService: IconCacheService, _transactionService: TransactionService, _dictionaryService: DictionaryService, _transactionEventService: TransactionEventService, _overlayService: OverlayService);
30
+ constructor(elementRef: ElementRef, iconCacheService: IconCacheService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _overlayService: OverlayService, _eventService: TransactionEventService);
32
31
  ngOnInit(): void;
33
32
  handleShowHideClick(): void;
33
+ handleAddDocumentButtonClick(): void;
34
34
  handleTransactionText(): void;
35
35
  handleArticleText(): void;
36
36
  handleShowSidePanel(): void;
@@ -1,8 +1,32 @@
1
+ import { ChangeDetectorRef, ElementRef } from '@angular/core';
1
2
  import { Icon } from '../../enum/icon.enum';
2
3
  import { TransactionBaseComponent } from '../core/base/transaction-base.component';
4
+ import { OverlayService } from '@colijnit/corecomponents_v12';
5
+ import { TransactionEventService } from "../../service/transaction-event.service";
6
+ import { TransactionService } from "../../service/transaction.service";
7
+ import { IconCacheService } from "../../service/icon-cache.service";
8
+ import { TransactionScreenConfigurationService } from "../../service/transaction-screen-configuration.service";
9
+ import { DictionaryService } from "../../service/dictionary.service";
10
+ import { TransactionImageService } from "../../service/transaction-image.service";
3
11
  export declare class TransactionLineDeliveryDateButtonComponent extends TransactionBaseComponent {
12
+ transactionEventService: TransactionEventService;
13
+ service: TransactionService;
14
+ iconCacheService: IconCacheService;
15
+ transactionScreenConfigurationService: TransactionScreenConfigurationService;
16
+ protected dictionaryService: DictionaryService;
17
+ protected imageService: TransactionImageService;
18
+ protected changeDetector: ChangeDetectorRef;
19
+ private _overlayService;
4
20
  readonly icons: typeof Icon;
21
+ commitWhenDateSelected: boolean;
22
+ showCalender: boolean;
23
+ parentComponent: ElementRef;
5
24
  showClass(): boolean;
25
+ constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _overlayService: OverlayService);
6
26
  private _calendarPopupComponentRef;
7
- handleShowDialog(event: MouseEvent): void;
27
+ handleShowHideClick(): void;
28
+ private _showPopup;
29
+ private _handleDateChanged;
30
+ private _hidePopup;
31
+ protected commit(date: Date): Promise<boolean>;
8
32
  }
@@ -25,7 +25,6 @@
25
25
  padding: $tp-transaction-line-image-and-description-description-inner-padding;
26
26
  overflow: hidden;
27
27
  height: 100%;
28
- justify-content: center;
29
28
  .description-wrapper {
30
29
  display: flex;
31
30
  flex-direction: row;
@@ -64,6 +63,22 @@
64
63
  display: flex;
65
64
  column-gap: 15px;
66
65
  }
66
+ .article-text-expand {
67
+ &.large-article {
68
+ max-height: 90px;
69
+ overflow: hidden;
70
+ }
71
+ }
72
+ .expand-wrapper {
73
+ display: flex;
74
+ align-items: center;
75
+ padding-top: 5px;
76
+ .co-icon {
77
+ width: 20px;
78
+ height: 20px;
79
+ margin-right: 10px;
80
+ }
81
+ }
67
82
 
68
83
  }
69
84
  }
@@ -6,10 +6,14 @@ export declare class TransactionLineImageAndDescriptionComponent extends Transac
6
6
  preview: boolean;
7
7
  openArticleTextClicked: EventEmitter<string>;
8
8
  handleDeleteLine: EventEmitter<MouseEvent>;
9
+ expanded: boolean;
10
+ expandClicked(): void;
9
11
  image: string;
10
12
  handleOpenArticleText(text: string): void;
11
13
  deleteTransactionLineClick(event: MouseEvent): Promise<void>;
12
14
  protected transactionLineSet(): void;
13
15
  protected visibilitySet(visible: boolean): void;
14
16
  private _loadLineImage;
17
+ calculateTotalCharacterCount(): number;
18
+ handleReadMoreClick(): void;
15
19
  }
@@ -5,12 +5,15 @@
5
5
  .transaction-tags-wrapper {
6
6
  display: flex;
7
7
  column-gap: $tp-co-transaction-tags-column-gap;
8
+ align-items: center;
8
9
  .edit-tags-wrapper {
9
10
  display: flex;
10
11
  column-gap: $tp-co-transaction-tags-column-gap;
12
+ cursor: pointer;
11
13
  .co-button {
12
14
  color: $tp-co-transaction-tags-edit-button-color;
13
15
  background: $tp-co-transaction-tags-edit-button-background-color;
16
+ height: 28px;
14
17
  .co-icon {
15
18
  width: $tp-co-transaction-tags-edit-button-icon-size;
16
19
  height: $tp-co-transaction-tags-edit-button-icon-size;
@@ -21,6 +24,15 @@
21
24
  fill: $tp-co-transaction-tags-edit-button-icon-color;
22
25
  }
23
26
  }
27
+ &:hover {
28
+ filter: brightness(100%);
29
+ background: $tp-co-transaction-tags-edit-button-hover-color;
30
+ .co-icon {
31
+ svg {
32
+ fill: $tp-co-transaction-tags-edit-button-hover-icon-color;
33
+ }
34
+ }
35
+ }
24
36
  }
25
37
  }
26
38
  }
@@ -28,6 +40,7 @@
28
40
  user-select: none;
29
41
  display: flex;
30
42
  align-items: center;
43
+ max-height: $tp-co-transaction-tags-height;
31
44
  padding: $tp-co-transaction-tags-padding;
32
45
  border-style: $tp-co-transaction-tags-border-style;
33
46
  border-width: $tp-co-transaction-tags-border-width;
@@ -1,6 +1,6 @@
1
1
  $tp-co-transaction-tags-font-family: $tp-font-family !default;
2
- $tp-co-transaction-tags-font-size: $tp-font-size !default;
3
- $tp-co-transaction-tags-color: $tp-color-font !default;
2
+ $tp-co-transaction-tags-font-size: $tp-font-size-small !default;
3
+ $tp-co-transaction-tags-color: $tp-color-light !default;
4
4
  $tp-co-transaction-tags-default-background-color: $tp-color-label !default;
5
5
  $tp-co-transaction-tags-border-style: solid !default;
6
6
  $tp-co-transaction-tags-border-width: 1px !default;
@@ -9,7 +9,10 @@ $tp-co-transaction-tags-column-gap: 5px !default;
9
9
  $tp-co-transaction-tags-align-items: flex-start !default;
10
10
  $tp-co-transaction-tags-border-radius: 10px !default;
11
11
  $tp-co-transaction-tags-padding: 5px 10px !default;
12
+ $tp-co-transaction-tags-height: 24px !default;
12
13
  $tp-co-transaction-tags-edit-button-icon-size: 20px !default;
13
- $tp-co-transaction-tags-edit-button-icon-color: $tp-color-action !default;
14
+ $tp-co-transaction-tags-edit-button-icon-color: $tp-color-font !default;
15
+ $tp-co-transaction-tags-edit-button-hover-icon-color: $tp-color-light !default;
14
16
  $tp-co-transaction-tags-edit-button-color: $tp-color-action !default;
15
- $tp-co-transaction-tags-edit-button-background-color: $tp-default-background-accent !default;
17
+ $tp-co-transaction-tags-edit-button-hover-color: $tp-color-action !default;
18
+ $tp-co-transaction-tags-edit-button-background-color: $tp-default-background !default;
@@ -6,6 +6,7 @@ export declare enum Icon {
6
6
  ArrowPointRight = "arrow_point_right",
7
7
  ArrowRightRegular = "arrow_right_regular",
8
8
  Article = "article",
9
+ Attachments = "attachments",
9
10
  AtSolid = "at_solid",
10
11
  BarcodeRegular = "barcode_regular",
11
12
  BarcodeSolid = "barcode_solid",
@@ -96,6 +97,8 @@ export declare enum Icon {
96
97
  SquareFullSolid = "square_full_solid",
97
98
  SyncAlt = "sync_alt",
98
99
  Tag = "tag",
100
+ TagLight = "tag_light",
101
+ TagLines = "tag_lines",
99
102
  TextSizeSolid = "text_size_solid",
100
103
  TextSolid = "text_solid",
101
104
  ThickLines = "thick_lines",
@@ -14918,6 +14918,8 @@ export declare class Dictionaries {
14918
14918
  PROGNOSIS: string;
14919
14919
  PROGRESS: string;
14920
14920
  PROGRESSIVE: string;
14921
+ PROJECT_CODE: string;
14922
+ PROJECT_CODES: string;
14921
14923
  PROJECTNR: string;
14922
14924
  PROMOTIONS: string;
14923
14925
  PROMOTION_RULES: string;
@@ -15925,6 +15927,7 @@ export declare class Dictionaries {
15925
15927
  SHOW_ALL_CONTACTS: string;
15926
15928
  SHOW_ALL_FILTERS: string;
15927
15929
  SHOW_ALL_LINES: string;
15930
+ SHOW_ALL_PRESETS: string;
15928
15931
  SHOW_ALL_WAREHOUSES_FOR_BRANCH: string;
15929
15932
  SHOW_ANONYMISED_RELATIONS: string;
15930
15933
  SHOW_ART_OPTIONS: string;
@@ -14,15 +14,34 @@ import { DoPaymentRequest } from "@colijnit/transactionapi/build/model/do-paymen
14
14
  import { AmountToPay } from "@colijnit/transactionapi/build/model/amount-to-pay";
15
15
  import { CalculateAmountToPayRequest } from "@colijnit/transactionapi/build/model/calculate-amount-to-pay-request";
16
16
  import { CreateCashRegisterOrderRequest } from "@colijnit/transactionapi/build/model/create-cash-register-order-request";
17
+ import { DepositPaymentViewModel } from "../model/deposit-payment-view-model";
18
+ import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
19
+ import { TransactionEventService } from "./transaction-event.service";
17
20
  export declare class PaymentService {
18
21
  private _adapterService;
19
22
  private _selectMultipleCacheService;
20
23
  private _selectMultipleParameterizedCacheService;
21
24
  private _transactionService;
22
25
  private _sharedService;
26
+ private _transactionEventService;
23
27
  readonly transKind: typeof TransactionKind;
24
28
  currentCashRegisterOrderRequest: CreateCashRegisterOrderRequest;
25
- constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _transactionService: TransactionService, _sharedService: SharedService);
29
+ selectedCashRegister: CashRegister;
30
+ paymentMethods: PaymentViewmodel[];
31
+ depositPayments: DepositPaymentViewModel[];
32
+ showKeyPad: boolean;
33
+ showPspQrCode: boolean;
34
+ qrCodeImage: string;
35
+ showLoader: boolean;
36
+ amountToPay: number;
37
+ statusMessage: string;
38
+ private _paymentStatusInterval;
39
+ private _paymentStatusPollIntervalMs;
40
+ private _paymentStatusMaxPollInterval;
41
+ private _paymentStatusPollIntervalCount;
42
+ private _paymentResult;
43
+ private _paymentMethod;
44
+ constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _transactionService: TransactionService, _sharedService: SharedService, _transactionEventService: TransactionEventService);
26
45
  registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<boolean>;
27
46
  createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
28
47
  doPinPayment(transId: number, paymentMethodCode: string, cashRegisterNr: number, cashRegisterGroupId: number, amount: number): Promise<string>;
@@ -35,4 +54,14 @@ export declare class PaymentService {
35
54
  getPaymentMethodsForCashRegister(branchNr: string): Promise<PaymentMethod[]>;
36
55
  processPosTransactionByUuid(uuid: string): Promise<boolean>;
37
56
  getPaymentMethodsViewModels(branchNr: string, transactionKind: TransactionKind): Promise<PaymentViewmodel[]>;
57
+ handlePayment(paymentMethod: PaymentMethod, cashRegister?: CashRegister, amountToPay?: number): void;
58
+ private _handlePayment;
59
+ private _doPayment;
60
+ private _getDepositPaymentInfo;
61
+ private _calculateAmountToPay;
62
+ private _dataUriToBase64;
63
+ private _waitForPaymentStatus;
64
+ private _waitForPinPaymentStatus;
65
+ private _clearInterval;
66
+ private _getToPayDetails;
38
67
  }
@@ -132,9 +132,9 @@ export declare class TransactionConnectorAdapterService {
132
132
  mainConnector: MainApi;
133
133
  controllerInitialized: BehaviorSubject<boolean>;
134
134
  private _boFactory;
135
- private _internalParameterCache;
136
135
  constructor(_optionsService: OptionsService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _errorService: ErrorService);
137
136
  connect(): Promise<void>;
137
+ logOut(): Promise<void>;
138
138
  getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
139
139
  getGoodIdFromArticleNr(articleNr: string): Promise<number>;
140
140
  getSingleImage(nodeId: number | string, publication: number, includeMimetype: boolean, thumb: boolean): Promise<string>;
@@ -120,6 +120,7 @@ export declare class TransactionConnectorService {
120
120
  private _selectSinlgeParameterizedCacheService;
121
121
  constructor(_adapterService: TransactionConnectorAdapterService, _selectSingleCacheService: SelectSingleCacheService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _selectSinlgeParameterizedCacheService: SelectSingleParameterizedCacheService);
122
122
  connect(): Promise<void>;
123
+ logOut(): Promise<void>;
123
124
  getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
124
125
  getGoodIdFromArticleNr(articleNr: string): Promise<number>;
125
126
  getSingleImage(nodeId: number | string, publication: number, includeMimetype: boolean, thumb: boolean): Promise<string>;
@@ -115,5 +115,6 @@ export declare class TransactionEventService {
115
115
  readonly headerPopupSaveButtonClick: Subject<void>;
116
116
  readonly headerPopupWantsToClose: Subject<void>;
117
117
  readonly headerPopupClose: Subject<boolean>;
118
+ readonly addDocumentToLineClicked: Subject<TransactionLineInfo>;
118
119
  constructor();
119
120
  }
@@ -108,6 +108,7 @@ export declare class TransactionService extends PendingReasonService {
108
108
  internalParameterAllowsDropShipment: boolean;
109
109
  internalParameterPartialInvoice: boolean;
110
110
  internalParameterReceiveGoodsWithDataTerminal: boolean;
111
+ logOut(): Promise<void>;
111
112
  prepareDropShipmentInternalParam(): void;
112
113
  preparePartialInvoiceInternalParam(): void;
113
114
  prepareReceiveGoodsWithDataTerminalInternalParam(): void;
@@ -82,7 +82,7 @@ $tp-md-width: 1280px !default;
82
82
  $tp-lg-width: 1920px !default;
83
83
 
84
84
  // transaction buttons
85
- $tp-transaction-default-button-width: 78px !default;
85
+ $tp-transaction-default-button-width: 100px !default;
86
86
  $tp-transaction-default-button-width-big: 175px !default;
87
87
  $tp-transaction-default-button-height: 26px !default;
88
88
  $tp-transaction-line-input-number-picker-width: 110px !default;
@@ -96,9 +96,12 @@ $tp-transaction-quick-access-column-gap: 10px;
96
96
 
97
97
  // payment num pad globals
98
98
  $tp-payment-amount-color: rgba(0, 0, 0, 0.5) !default;
99
- $tp-payment-amount-background-color: #dedede5c !default;
99
+ $tp-payment-amount-background-color: white !default;
100
100
  $tp-payment-amount-border-color: $tp-color-border !default;
101
-
101
+ $sc-key-pad-background-color: white;
102
+ $sc-key-pad-button-gap: 2px;
103
+ $sc-key-pad-button-border-radius: 0;
104
+ $sc-key-pad-button-background-color: #131840;
102
105
 
103
106
  /* core components override */
104
107
  $cc-color-action: $tp-color-font !default;
@@ -82,6 +82,7 @@
82
82
  .key-pad-button {
83
83
  background-color: $tp-payment-amount-background-color;
84
84
  color: $tp-payment-amount-color;
85
+ box-shadow: none;
85
86
  font-weight: bold;
86
87
  .co-icon {
87
88
  svg { // for fontawesome icons
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@colijnit/transaction",
3
- "version": "12.1.140",
3
+ "version": "12.1.142",
4
4
  "description": "Colijn IT transaction module for Angular 12",
5
5
  "repository": "npm/npm",
6
6
  "author": "Colijn IT",
@@ -9,16 +9,16 @@
9
9
  "peerDependencies": {
10
10
  "@angular/common": ">=12.2.0",
11
11
  "@angular/core": ">=12.2.0",
12
- "@colijnit/articleapi": ">=1.0.26",
13
- "@colijnit/catalog": ">=12.1.41",
12
+ "@colijnit/articleapi": ">=1.0.27",
13
+ "@colijnit/catalog": ">=12.1.42",
14
14
  "@colijnit/corecomponents": ">=1.12.0",
15
15
  "@colijnit/corecomponents_v12": ">=12.1.8",
16
- "@colijnit/ioneconnector": ">=3.1.4",
17
- "@colijnit/mainapi": ">=1.0.21",
18
- "@colijnit/relationapi": ">=1.0.7",
16
+ "@colijnit/ioneconnector": ">=3.1.6",
17
+ "@colijnit/mainapi": ">=1.0.23",
18
+ "@colijnit/relationapi": ">=1.0.8",
19
19
  "@colijnit/sharedapi": ">=1.0.16",
20
20
  "@colijnit/sharedcomponents": ">=1.0.46",
21
- "@colijnit/transactionapi": ">=1.1.97",
21
+ "@colijnit/transactionapi": ">=1.1.100",
22
22
  "@types/three": ">=0.125.0",
23
23
  "@tweenjs/tween.js": ">=17.2.0",
24
24
  "three": ">=0.125.0"
@@ -1,59 +0,0 @@
1
- @include export-module('co-transaction-document-button-bar-layout') {
2
- .co-transaction-document-button-bar {
3
- font-family: $tp-co-transaction-document-button-bar-font-family;
4
- font-size: $tp-co-transaction-document-button-bar-font-size;
5
- .button-bar-wrapper {
6
- display: flex;
7
- flex-direction: row;
8
- justify-content: center;
9
- }
10
-
11
- .co-transaction-document-button {
12
- .co-transaction-document-button-icon {
13
- height: $tp-co-transaction-button-bar-icon-size;
14
- width: $tp-co-transaction-button-bar-icon-size;
15
- margin: $tp-co-transaction-button-bar-icon-margin;
16
- svg {
17
- height: 100%;
18
- width: 100%;
19
- }
20
- }
21
- }
22
- .button-wrapper {
23
- //height: $tp-co-transaction-button-bar-button-size;
24
- //min-width: $tp-co-transaction-button-bar-button-size;
25
- background: $tp-co-transaction-document-button-background-color;
26
- border-radius: $tp-co-transaction-document-button-border-radius;
27
- padding: $tp-co-transaction-document-button-padding;
28
- display: flex;
29
- flex-direction: column;
30
- align-items: center;
31
- justify-content: center;
32
- cursor: pointer;
33
- .button-title {
34
- font-size: $tp-co-transaction-document-button-label-font-size;
35
- //padding: 0 7px 4px 7px;
36
- }
37
- .co-transaction-document-button-icon {
38
- height: $tp-co-transaction-document-button-icon-size;
39
- width: $tp-co-transaction-document-button-icon-size;
40
- margin: $tp-co-transaction-document-button-icon-margin;
41
- svg {
42
- height: 100%;
43
- width: 100%;
44
- }
45
- }
46
- }
47
- /*.co-transaction-sales-purchase-button-bar-button,
48
- .co-transaction-purchase-receive-goods-button-bar-button,
49
- .co-transaction-sales-allocation-button-bar-button,
50
- .co-transaction-purchase-confirmation-button-bar-button,
51
- .co-transaction-purchase-invoice-button-bar-button,
52
- .co-transaction-sales-invoice-button-bar-button,
53
- .co-transaction-sales-delivery-button-bar-button {
54
- display: flex;
55
- flex-direction: column;
56
- align-items: center;
57
- }*/
58
- }
59
- }
@@ -1,9 +0,0 @@
1
- $tp-co-transaction-document-button-bar-font-family: $tp-font-family !default;
2
- $tp-co-transaction-document-button-bar-font-size: $tp-font-size !default;
3
- //$tp-co-transaction-button-bar-button-size: 65px !default;
4
- $tp-co-transaction-document-button-background-color: white !default;
5
- $tp-co-transaction-document-button-border-radius: $tp-default-border-radius !default;
6
- $tp-co-transaction-document-button-padding: 5px !default;
7
- $tp-co-transaction-document-button-icon-size: 60px !default;
8
- $tp-co-transaction-document-button-icon-margin: 0 0 5px 0 !default;
9
- $tp-co-transaction-document-button-label-font-size: $tp-font-size-small !default;
@@ -1,5 +0,0 @@
1
- @include export-module('co-transaction-document-button-bar-theme') {
2
- .co-transaction-document-button-bar {
3
-
4
- }
5
- }