@colijnit/transaction 12.1.144 → 12.1.146

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 (104) hide show
  1. package/bundles/colijnit-transaction.umd.js +1091 -459
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +270 -265
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +271 -266
  6. package/esm2015/lib/component/add-product/add-product.component.js +1 -2
  7. package/esm2015/lib/component/add-product/add-product.module.js +11 -9
  8. package/esm2015/lib/component/animated-checkbox/animated-checkbox.component.js +5 -3
  9. package/esm2015/lib/component/checkout/checkout-overview-relation-edit/checkout-overview-relation-edit.component.js +7 -1
  10. package/esm2015/lib/component/checkout/checkout.component.js +10 -2
  11. package/esm2015/lib/component/core/base/transaction-base.component.js +16 -5
  12. package/esm2015/lib/component/core/base/transaction-filter-popup-base.component.js +4 -3
  13. package/esm2015/lib/component/deposit-payment/deposit-payment.component.js +3 -3
  14. package/esm2015/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.js +2 -1
  15. package/esm2015/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.module.js +1 -1
  16. package/esm2015/lib/component/payment/payment.component.js +5 -5
  17. package/esm2015/lib/component/relation/relation-contact-details/relation-contact-details.component.js +1 -2
  18. package/esm2015/lib/component/transaction/transaction.component.js +6 -3
  19. package/esm2015/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-button-bar-button-base.component.js +14 -3
  20. package/esm2015/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-button-bar-button.component.js +6 -5
  21. package/esm2015/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-sales-allocation-button-bar-button.component.js +6 -6
  22. package/esm2015/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-sales-picking-button-bar-button.component.js +30 -14
  23. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.js +16 -13
  24. package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.component.js +9 -7
  25. package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +42 -11
  26. package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.module.js +4 -2
  27. package/esm2015/lib/component/transaction-header-fields/transaction-header-remaining-amount.component.js +50 -0
  28. package/esm2015/lib/component/transaction-header-fields/transaction-header-remaining-amount.module.js +24 -0
  29. package/esm2015/lib/component/transaction-line/transaction-invoice-line/transaction-invoice-line-base.component.js +19 -2
  30. package/esm2015/lib/component/transaction-line/transaction-invoice-line/transaction-invoice-line.component.js +17 -7
  31. package/esm2015/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line-base.component.js +26 -3
  32. package/esm2015/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.js +17 -8
  33. package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line-base.component.js +3 -2
  34. package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line.component.js +2 -1
  35. package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line.module.js +4 -2
  36. package/esm2015/lib/component/transaction-line-fields/transaction-line-confirmed-delivery-date-button.component.js +108 -0
  37. package/esm2015/lib/component/transaction-line-fields/transaction-line-confirmed-delivery-date-button.module.js +21 -0
  38. package/esm2015/lib/component/transaction-line-fields/transaction-line-supplier.component.js +19 -8
  39. package/esm2015/lib/component/transaction-line-statusbar/transaction-line-statusbar.component.js +2 -2
  40. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/transaction-quick-access-goods-allocation.component.js +17 -9
  41. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-invoice/transaction-quick-access-invoice.component.js +28 -17
  42. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/transaction-quick-access-order-delivery.component.js +16 -2
  43. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.js +15 -8
  44. package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-statusbar/transaction-statusbar.component.js +5 -5
  45. package/esm2015/lib/res/dictionary/dictionaries.js +3 -3
  46. package/esm2015/lib/service/line-selection.service.js +70 -0
  47. package/esm2015/lib/service/payment.service.js +18 -13
  48. package/esm2015/lib/service/pending-reason.service.js +5 -3
  49. package/esm2015/lib/service/relation.service.js +18 -10
  50. package/esm2015/lib/service/transaction-base.service.js +37 -31
  51. package/esm2015/lib/service/transaction-connector-adapter.service.js +47 -4
  52. package/esm2015/lib/service/transaction-connector.service.js +11 -1
  53. package/esm2015/lib/service/transaction-event.service.js +12 -2
  54. package/esm2015/lib/service/transaction-screen-configuration.service.js +4 -5
  55. package/esm2015/lib/service/transaction.service.js +52 -23
  56. package/esm2015/lib/transaction-version.js +3 -3
  57. package/fesm2015/colijnit-transaction.js +702 -147
  58. package/fesm2015/colijnit-transaction.js.map +1 -1
  59. package/lib/component/animated-checkbox/animated-checkbox.component.d.ts +1 -0
  60. package/lib/component/animated-checkbox/style/_layout.scss +4 -0
  61. package/lib/component/animated-checkbox/style/_material-definition.scss +1 -0
  62. package/lib/component/checkout/checkout.component.d.ts +6 -3
  63. package/lib/component/core/base/transaction-base.component.d.ts +4 -0
  64. package/lib/component/core/base/transaction-filter-popup-base.component.d.ts +1 -1
  65. package/lib/component/deposit-payment/deposit-payment.component.d.ts +1 -1
  66. package/lib/component/payment/payment.component.d.ts +1 -1
  67. package/lib/component/transaction/transaction.component.d.ts +3 -1
  68. package/lib/component/transaction-button-bar/style/_layout.scss +1 -0
  69. package/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-button-bar-button-base.component.d.ts +9 -5
  70. package/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-button-bar-button.component.d.ts +4 -4
  71. package/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-sales-allocation-button-bar-button.component.d.ts +4 -4
  72. package/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-sales-picking-button-bar-button.component.d.ts +12 -10
  73. package/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.d.ts +17 -15
  74. package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.component.d.ts +8 -6
  75. package/lib/component/transaction-header/transaction-header-payment/style/_layout.scss +12 -1
  76. package/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.d.ts +2 -0
  77. package/lib/component/transaction-header-fields/transaction-header-remaining-amount.component.d.ts +17 -0
  78. package/lib/component/transaction-header-fields/transaction-header-remaining-amount.module.d.ts +2 -0
  79. package/lib/component/transaction-line/transaction-invoice-line/transaction-invoice-line-base.component.d.ts +2 -0
  80. package/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line-base.component.d.ts +3 -0
  81. package/lib/component/transaction-line-fields/transaction-line-confirmed-delivery-date-button.component.d.ts +34 -0
  82. package/lib/component/transaction-line-fields/transaction-line-confirmed-delivery-date-button.module.d.ts +2 -0
  83. package/lib/component/transaction-line-fields/transaction-line-supplier.component.d.ts +4 -1
  84. package/lib/component/transaction-quick-access/transaction-quick-access-goods-allocation/transaction-quick-access-goods-allocation.component.d.ts +8 -5
  85. package/lib/component/transaction-quick-access/transaction-quick-access-invoice/style/_layout.scss +1 -1
  86. package/lib/component/transaction-quick-access/transaction-quick-access-invoice/transaction-quick-access-invoice.component.d.ts +15 -12
  87. package/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/style/_layout.scss +1 -1
  88. package/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/transaction-quick-access-order-delivery.component.d.ts +6 -2
  89. package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts +11 -9
  90. package/lib/component/transaction-search/transaction-search-tile/transaction-statusbar/transaction-statusbar.component.d.ts +5 -5
  91. package/lib/res/dictionary/dictionaries.d.ts +24 -2
  92. package/lib/service/line-selection.service.d.ts +14 -0
  93. package/lib/service/payment.service.d.ts +10 -9
  94. package/lib/service/pending-reason.service.d.ts +1 -1
  95. package/lib/service/relation.service.d.ts +1 -0
  96. package/lib/service/transaction-base.service.d.ts +12 -3
  97. package/lib/service/transaction-connector-adapter.service.d.ts +4 -0
  98. package/lib/service/transaction-connector.service.d.ts +3 -0
  99. package/lib/service/transaction-event.service.d.ts +17 -1
  100. package/lib/service/transaction-screen-configuration.service.d.ts +3 -3
  101. package/lib/service/transaction.service.d.ts +8 -5
  102. package/lib/style/_variables.scss +2 -1
  103. package/lib/style/transaction-globals.scss +4 -0
  104. package/package.json +4 -3
@@ -2152,6 +2152,7 @@ export declare class Dictionaries {
2152
2152
  ALREADY_DELIVERED: string;
2153
2153
  ALREADY_EXISTS: string;
2154
2154
  ALREADY_INVOICED: string;
2155
+ ALREADY_IN_ORDER: string;
2155
2156
  ALREADY_PICKED: string;
2156
2157
  ALREADY_TO_PICK: string;
2157
2158
  ALSO_COPY: string;
@@ -2524,7 +2525,8 @@ export declare class Dictionaries {
2524
2525
  BOOKINGS_UNCAPITALIZED: string;
2525
2526
  BOOKING_LINE: string;
2526
2527
  BOOKING_LINES: string;
2527
- BOOKING_SEARCH_GENERAL_INFO: string;
2528
+ BOOKING_SEARCH_GENERAL_INFO_SUPPLIER: string;
2529
+ BOOKING_SEARCH_GENERAL_INFO_CUSTOMER: string;
2528
2530
  BOOK_DATE: string;
2529
2531
  BOOK_INVOICE: string;
2530
2532
  BOOK_PRICE: string;
@@ -3298,6 +3300,7 @@ export declare class Dictionaries {
3298
3300
  DATE_COLLECTED: string;
3299
3301
  DATE_CONDITION: string;
3300
3302
  DATE_DEFINATE: string;
3303
+ DATE_DELIVERED: string;
3301
3304
  DATE_END_ABSENCE: string;
3302
3305
  DATE_FAMILY_EXPANSION: string;
3303
3306
  DATE_FILTER: string;
@@ -4773,6 +4776,7 @@ export declare class Dictionaries {
4773
4776
  LONG_43_366_DAYS: string;
4774
4777
  LONG_ANSWER: string;
4775
4778
  LOOKAT: string;
4779
+ LOOK_AT: string;
4776
4780
  LYING_COLUMN: string;
4777
4781
  M: string;
4778
4782
  MAILING_ADDRESS: string;
@@ -5405,6 +5409,7 @@ export declare class Dictionaries {
5405
5409
  NOT_AVAILABLE: string;
5406
5410
  NOT_AVAILABLE_ON: string;
5407
5411
  NOT_BEFORE: string;
5412
+ NOT_BLOCKED: string;
5408
5413
  NOT_COMPLETE: string;
5409
5414
  NOT_COMPLETELY_ALLOCATED: string;
5410
5415
  NOT_COMPLETELY_ASSIGNED: string;
@@ -6964,6 +6969,7 @@ export declare class Dictionaries {
6964
6969
  SEARCH_EMPLOYEES: string;
6965
6970
  SEARCH_EMPLOYERS: string;
6966
6971
  SEARCH_EXCEEDENCE_CODE: string;
6972
+ SEARCH_FILTER: string;
6967
6973
  SEARCH_FOR: string;
6968
6974
  SEARCH_FULL_VERB: string;
6969
6975
  SEARCH_IMPERATIVE: string;
@@ -7077,6 +7083,8 @@ export declare class Dictionaries {
7077
7083
  SELECT_COMPANY: string;
7078
7084
  SELECT_CUSTOMER: string;
7079
7085
  SELECT_DATE: string;
7086
+ SELECT_END_DATE: string;
7087
+ SELECT_START_DATE: string;
7080
7088
  SELECT_DATE_RANGE: string;
7081
7089
  SELECT_DESELECT_ALL: string;
7082
7090
  SELECT_EMAIL_ADDRESS: string;
@@ -8171,6 +8179,9 @@ export declare class Dictionaries {
8171
8179
  AMOUNT_IN: string;
8172
8180
  AMOUNT_OUT: string;
8173
8181
  BOOK_AMOUNT: string;
8182
+ ">_30_DAYS": string;
8183
+ "30_60_DAYS": string;
8184
+ ">_60_DAYS": string;
8174
8185
  };
8175
8186
  text_fr: {
8176
8187
  CHARACTERISTIC: string;
@@ -10187,6 +10198,7 @@ export declare class Dictionaries {
10187
10198
  ALREADY_DELIVERED: string;
10188
10199
  ALREADY_EXISTS: string;
10189
10200
  ALREADY_INVOICED: string;
10201
+ ALREADY_IN_ORDER: string;
10190
10202
  ALREADY_PICKED: string;
10191
10203
  ALREADY_SENT: string;
10192
10204
  ALREADY_TO_PICK: string;
@@ -10585,7 +10597,8 @@ export declare class Dictionaries {
10585
10597
  BOOKING_LINES: string;
10586
10598
  BOOKING_LINE_DESCRIPTION: string;
10587
10599
  BOOKING_REPORT: string;
10588
- BOOKING_SEARCH_GENERAL_INFO: string;
10600
+ BOOKING_SEARCH_GENERAL_INFO_SUPPLIER: string;
10601
+ BOOKING_SEARCH_GENERAL_INFO_CUSTOMER: string;
10589
10602
  BOOKING_SELECTION: string;
10590
10603
  BOOK_AMOUNT: string;
10591
10604
  BOOK_DATA: string;
@@ -11507,6 +11520,7 @@ export declare class Dictionaries {
11507
11520
  DATE_COLLECTED: string;
11508
11521
  DATE_CONDITION: string;
11509
11522
  DATE_DEFINATE: string;
11523
+ DATE_DELIVERED: string;
11510
11524
  DATE_END_ABSENCE: string;
11511
11525
  DATE_END_LEAVE: string;
11512
11526
  DATE_FAMILY_EXPANSION: string;
@@ -13184,6 +13198,7 @@ export declare class Dictionaries {
13184
13198
  LONG_43_366_DAYS: string;
13185
13199
  LONG_ANSWER: string;
13186
13200
  LOOKAT: string;
13201
+ LOOK_AT: string;
13187
13202
  LOYALTY: string;
13188
13203
  LYING_COLUMN: string;
13189
13204
  M: string;
@@ -13879,6 +13894,7 @@ export declare class Dictionaries {
13879
13894
  NOT_AVAILABLE: string;
13880
13895
  NOT_AVAILABLE_ON: string;
13881
13896
  NOT_BEFORE: string;
13897
+ NOT_BLOCKED: string;
13882
13898
  NOT_COMPLETE: string;
13883
13899
  NOT_COMPLETELY_ALLOCATED: string;
13884
13900
  NOT_COMPLETE_ORDERS: string;
@@ -15617,6 +15633,7 @@ export declare class Dictionaries {
15617
15633
  SEARCH_BUYORDERS: string;
15618
15634
  SEARCH_BY_ARTICLENUMBER_NAME_OR_DESCRIPTION: string;
15619
15635
  SEARCH_BY_ARTICLENUMBER_OR_DESCRIPTION: string;
15636
+ SEARCH_FILTER: string;
15620
15637
  SEARCH_CATALOGUE: string;
15621
15638
  SEARCH_CODE: string;
15622
15639
  SEARCH_COMMISSION_CODE: string;
@@ -15758,6 +15775,8 @@ export declare class Dictionaries {
15758
15775
  SELECT_COMPANY: string;
15759
15776
  SELECT_CUSTOMER: string;
15760
15777
  SELECT_DATE: string;
15778
+ SELECT_END_DATE: string;
15779
+ SELECT_START_DATE: string;
15761
15780
  SELECT_DATE_RANGE: string;
15762
15781
  SELECT_DESELECT_ALL: string;
15763
15782
  SELECT_DRAWER: string;
@@ -17016,5 +17035,8 @@ export declare class Dictionaries {
17016
17035
  ZERO_VALUES: string;
17017
17036
  ZMF: string;
17018
17037
  ZVP: string;
17038
+ ">_30_DAYS": string;
17039
+ "30_60_DAYS": string;
17040
+ ">_60_DAYS": string;
17019
17041
  };
17020
17042
  }
@@ -0,0 +1,14 @@
1
+ import { OnDestroy } from '@angular/core';
2
+ import { TransactionEventService } from './transaction-event.service';
3
+ import { TransactionService } from './transaction.service';
4
+ export declare class LineSelectionService implements OnDestroy {
5
+ private _transactionEventService;
6
+ private _transactionService;
7
+ private _subs;
8
+ private _selectedLineUuidsForDelivery;
9
+ private _selectedLineUuidsForInvoice;
10
+ constructor(_transactionEventService: TransactionEventService, _transactionService: TransactionService);
11
+ ngOnDestroy(): void;
12
+ private _checkAllLinesSelectedForDelivery;
13
+ private _checkAllLinesSelectedForInvoice;
14
+ }
@@ -9,14 +9,14 @@ import { SharedService } from './shared.service';
9
9
  import { TransactionDepositPaymentInfo } from '@colijnit/transactionapi/build/model/transaction-deposit-payment-info.bo';
10
10
  import { PspTransactionStatus } from '@colijnit/transactionapi/build/model/psp-transaction-status.bo';
11
11
  import { SelectMultipleParameterizedCacheService } from '../cache/service/select-multiple-parameterized-cache.service';
12
- import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
13
- import { DoPaymentRequest } from "@colijnit/transactionapi/build/model/do-payment-request";
14
- import { AmountToPay } from "@colijnit/transactionapi/build/model/amount-to-pay";
15
- import { CalculateAmountToPayRequest } from "@colijnit/transactionapi/build/model/calculate-amount-to-pay-request";
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";
12
+ import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
13
+ import { DoPaymentRequest } from '@colijnit/transactionapi/build/model/do-payment-request';
14
+ import { AmountToPay } from '@colijnit/transactionapi/build/model/amount-to-pay';
15
+ import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
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';
20
20
  export declare class PaymentService {
21
21
  private _adapterService;
22
22
  private _selectMultipleCacheService;
@@ -50,11 +50,12 @@ export declare class PaymentService {
50
50
  getPspTransactionStatus(pspTransactionUuid: string): Promise<PspTransactionStatus>;
51
51
  getDepositPaymentInfo(uuid: string): Promise<TransactionDepositPaymentInfo>;
52
52
  calculateAmountToPay(calculateAmountToPayRequest: CalculateAmountToPayRequest): Promise<AmountToPay>;
53
+ calculateAmountToPayWithLineSelection(calculateAmountToPayRequest: CalculateAmountToPayRequest): Promise<AmountToPay>;
53
54
  getPaymentMethodsForSalesOrder(branchNr: string): Promise<PaymentMethod[]>;
54
55
  getPaymentMethodsForCashRegister(branchNr: string): Promise<PaymentMethod[]>;
55
56
  processPosTransactionByUuid(uuid: string): Promise<boolean>;
56
57
  getPaymentMethodsViewModels(branchNr: string, transactionKind: TransactionKind): Promise<PaymentViewmodel[]>;
57
- handlePayment(paymentMethod: PaymentMethod, cashRegister?: CashRegister, amountToPay?: number): void;
58
+ handlePayment(paymentMethod: PaymentMethod, transId: number, currencyId: number, cashRegister?: CashRegister, amountToPay?: number): void;
58
59
  private _handlePayment;
59
60
  private _doPayment;
60
61
  private _getDepositPaymentInfo;
@@ -9,7 +9,7 @@ import { TransactionBaseService } from './transaction-base.service';
9
9
  export declare class PendingReasonService extends TransactionBaseService {
10
10
  cancelAddTransactionLine(lineUuid: string): Promise<TransactionInfoResponse>;
11
11
  handleHeaderOperationStatuses(response: TransactionInfoResponse, saveTransaction?: boolean, overrideSave?: boolean): Promise<boolean>;
12
- protected handleLineOperationStatuses(response: TransactionInfoResponse, saveTransaction?: boolean): Promise<boolean>;
12
+ protected handleLineOperationStatuses(response: TransactionInfoResponse, saveTransaction?: boolean, rememberTransaction?: boolean): Promise<boolean>;
13
13
  protected _handleLineOperationStatus(transaction: TransactionInfoResponse, operationStatus: LineOperationStatus, transactionLine: TransactionLineInfo): Promise<boolean>;
14
14
  protected _handleHeaderOperationStatus(operationStatus: HeaderOperationStatus, transactionInfo: TransactionInfo): Promise<boolean>;
15
15
  resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<void>;
@@ -21,6 +21,7 @@ export declare class RelationService {
21
21
  private readonly _getMethods;
22
22
  private readonly _updateMethods;
23
23
  private readonly _insertMethods;
24
+ relationLocked: boolean;
24
25
  private _boFactory;
25
26
  constructor(_adapterService: RelationConnectorService, _selectMultipleCacheService: SelectMultipleCacheService, _selectSingleCacheService: SelectSingleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService);
26
27
  getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
@@ -41,7 +41,8 @@ export declare class TransactionBaseService {
41
41
  autoSave: boolean;
42
42
  applicationUser: boolean;
43
43
  invoiceAddressSameAsDelivery: boolean;
44
- activeRubric: TransactionTypeCategory;
44
+ set activeRubric(value: TransactionTypeCategory);
45
+ get activeRubric(): TransactionTypeCategory;
45
46
  getRelationOnRememberCurrentTransaction: boolean;
46
47
  get titleForCheckout(): string;
47
48
  get iconForCheckout(): Icon;
@@ -56,6 +57,8 @@ export declare class TransactionBaseService {
56
57
  get receiveGoodsCompleted(): boolean;
57
58
  set allocateGoodsCompleted(value: boolean);
58
59
  set salesOrderPickingGoodsCompleted(value: boolean);
60
+ set salesOrderPickedCompleted(value: boolean);
61
+ set salesOrderToBePickedCompleted(value: boolean);
59
62
  get allocateGoodsCompleted(): boolean;
60
63
  set purchaseOrderConfirmationCompleted(value: boolean);
61
64
  get purchaseOrderConfirmationCompleted(): boolean;
@@ -69,14 +72,21 @@ export declare class TransactionBaseService {
69
72
  get transactionDirty(): boolean;
70
73
  purchasePortalLine: PurchasePortalLine[];
71
74
  docDeliveryBatch: DocDeliveryBatch;
75
+ internalParameterAllowsDropShipment: boolean;
76
+ internalParameterPartialInvoice: boolean;
77
+ internalParameterReceiveGoodsWithDataTerminal: boolean;
78
+ internalParameterPakBinnen: boolean;
72
79
  articleAmount: number;
73
80
  protected transactionLineAdded: boolean;
81
+ private _activeRubric;
74
82
  private _transactionKind;
75
83
  private _relation;
76
84
  private _purchaseOrdersCompleted;
77
85
  private _receiveGoodsCompleted;
78
86
  private _allocateGoodsCompleted;
79
87
  private _pickingGoodsCompleted;
88
+ private _pickedCompleted;
89
+ private _toBePickedCompleted;
80
90
  private _purchaseOrderConfirmationCompleted;
81
91
  private _deliveryCompleted;
82
92
  private _invoiceCompleted;
@@ -101,8 +111,8 @@ export declare class TransactionBaseService {
101
111
  saveTransactionAndCommit(response?: TransactionInfoResponse): Promise<boolean>;
102
112
  rememberCurrentTransaction(value: TransactionInfoResponse): Promise<void>;
103
113
  protected _checkHeaderStatus(): void;
104
- protected _checkPurchaseOrders(): Promise<void>;
105
114
  checkRefTransaction(): Promise<void>;
115
+ protected _handleBeforeRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
106
116
  protected _handleAfterRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
107
117
  protected initializeTransaction(): void;
108
118
  protected _isValidTransaction(): boolean;
@@ -111,6 +121,5 @@ export declare class TransactionBaseService {
111
121
  private _getRelationClass;
112
122
  private _getRelation;
113
123
  private _setAmount;
114
- private _pickingGoodsCompletedCheck;
115
124
  private _shouldCheckRefTransactions;
116
125
  }
@@ -122,6 +122,7 @@ import { ChangeHeaderRetailStadiumRequest } from '@colijnit/transactionapi/build
122
122
  import { RetailStadium } from '@colijnit/transactionapi/build/model/retail-stadium.bo';
123
123
  import { WorkFlowStatus } from '@colijnit/transactionapi/build/model/workflow-status.bo';
124
124
  import { BehaviorSubject } from 'rxjs';
125
+ import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
125
126
  export declare class TransactionConnectorAdapterService {
126
127
  private _optionsService;
127
128
  private _selectMultipleCacheService;
@@ -176,6 +177,7 @@ export declare class TransactionConnectorAdapterService {
176
177
  getHistoricStateValues(): Promise<CodeDescription[]>;
177
178
  getPaymentMethodsForSalesOrder(branchNr: string): Promise<PaymentMethod[]>;
178
179
  getPaymentMethodsForCashRegister(branchNr: string): Promise<PaymentMethod[]>;
180
+ getMaxConfirmedDeliveryDateForPurchaseOrder(transId: number): Promise<Date>;
179
181
  commit(): Promise<boolean>;
180
182
  rollback(): Promise<boolean>;
181
183
  createTransaction(kind: TransactionKind, branchNr: string): Promise<TransactionInfoResponse>;
@@ -198,6 +200,7 @@ export declare class TransactionConnectorAdapterService {
198
200
  cancelAddTransactionLine(lineUuid: string): Promise<TransactionInfoResponse>;
199
201
  deleteTransactionLine(uuid: string, lineUuid: string): Promise<TransactionInfoResponse>;
200
202
  changeTransactionLineQuantity(uuid: string, lineUuid: string, newQuantity: number): Promise<TransactionInfoResponse>;
203
+ changeTransactionLineQuantitySelected(uuid: string, lines: ChangeLineQuantitySelectedLineRequest[]): Promise<TransactionInfoResponse>;
201
204
  changeTransactionLineCommissionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
202
205
  changeTransactionLineSupplier(uuid: string, lineUuid: string, id: number): Promise<TransactionInfoResponse>;
203
206
  changeTransactionLineWarehouse(uuid: string, lineUuid: string, warehouseNumber: number): Promise<TransactionInfoResponse>;
@@ -248,6 +251,7 @@ export declare class TransactionConnectorAdapterService {
248
251
  getPspTransactionStatus(pspTransactionUuid: string): Promise<PspTransactionStatus>;
249
252
  getDepositPaymentInfo(uuid: string): Promise<TransactionDepositPaymentInfo>;
250
253
  calculateAmountToPay(calculateAmountToPayRequest: CalculateAmountToPayRequest): Promise<AmountToPay>;
254
+ calculateAmountToPayWithLineSelection(calculateAmountToPayRequest: CalculateAmountToPayRequest): Promise<AmountToPay>;
251
255
  getGoodsReceiptHistory(transId: number, lineNr: number): Promise<GoodsReceiptHistory>;
252
256
  receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<TransactionInfoResponse>;
253
257
  receiveGoodsForPurchaseOrderCorrection(request: ReceiveGoodsForPurchaseOrderCorrectionRequest): Promise<TransactionInfoResponse>;
@@ -112,6 +112,7 @@ import { ChangeHeaderExpectedScoringDateRequest } from '@colijnit/transactionapi
112
112
  import { ChangeHeaderRetailStadiumRequest } from '@colijnit/transactionapi/build/model/change-header-retail-stadium-request';
113
113
  import { RetailStadium } from '@colijnit/transactionapi/build/model/retail-stadium.bo';
114
114
  import { WorkFlowStatus } from '@colijnit/transactionapi/build/model/workflow-status.bo';
115
+ import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
115
116
  export declare class TransactionConnectorService {
116
117
  private _adapterService;
117
118
  private _selectSingleCacheService;
@@ -167,6 +168,7 @@ export declare class TransactionConnectorService {
167
168
  cancelAddTransactionLine(lineUuid: string): Promise<TransactionInfoResponse>;
168
169
  deleteTransactionLine(uuid: string, lineUuid: string): Promise<TransactionInfoResponse>;
169
170
  changeTransactionLineQuantity(uuid: string, lineUuid: string, newQuantity: number): Promise<TransactionInfoResponse>;
171
+ changeTransactionLineQuantitySelected(uuid: string, lines: ChangeLineQuantitySelectedLineRequest[]): Promise<TransactionInfoResponse>;
170
172
  resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<TransactionInfoResponse>;
171
173
  resolvePendingHeaderReason(pendingHeaderValues: ResolveHeaderPendingReasonRequest): Promise<TransactionInfoResponse>;
172
174
  getCommissionCodes(languageCode: string): Promise<CoDomainValue[]>;
@@ -183,6 +185,7 @@ export declare class TransactionConnectorService {
183
185
  getWarehouses(branchNr?: string): Promise<Warehouse[]>;
184
186
  getWarehouseStockInfoByGoodAndBranch(goodId: number, branchNr: string): Promise<WarehouseStockInfo[]>;
185
187
  getHistoricStateValues(): Promise<CodeDescription[]>;
188
+ getMaxConfirmedDeliveryDateForPurchaseOrder(transId: number): Promise<Date>;
186
189
  changeTransactionLineCommissionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
187
190
  changeTransactionLineSupplier(uuid: string, lineUuid: string, id: number): Promise<TransactionInfoResponse>;
188
191
  changeTransactionLineWarehouse(uuid: string, lineUuid: string, warehouseNumber: number): Promise<TransactionInfoResponse>;
@@ -4,6 +4,7 @@ import { Scroll } from '@angular/router';
4
4
  import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
5
5
  import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
6
6
  import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
7
+ import { TransactionTypeCategory } from '../enum/transaction-type-category.enum';
7
8
  export declare class TransactionEventService {
8
9
  readonly addToCartBySku: Subject<{
9
10
  sku: string;
@@ -55,6 +56,7 @@ export declare class TransactionEventService {
55
56
  readonly selectAllLines: Subject<boolean>;
56
57
  readonly transactionHeaderDirty: Subject<boolean>;
57
58
  readonly transactionLineChanged: Subject<TransactionLineInfo>;
59
+ readonly transactionLineRefTransactionsChanged: BehaviorSubject<TransactionLineInfo>;
58
60
  readonly transactionLineAdded: BehaviorSubject<number>;
59
61
  readonly openArticleTextOverview: Subject<TransactionLineInfo>;
60
62
  readonly addArticleText: Subject<TransactionLineInfo>;
@@ -83,9 +85,11 @@ export declare class TransactionEventService {
83
85
  readonly connectionInitialized: BehaviorSubject<boolean>;
84
86
  readonly salesOrderGeneratePurchaseOrdersCompletedChanged: BehaviorSubject<boolean>;
85
87
  readonly salesOrderPickingGoodsCompletedChanged: BehaviorSubject<boolean>;
88
+ readonly salesOrderPickedCompletedChanged: BehaviorSubject<boolean>;
89
+ readonly salesOrderToBePickedCompletedChanged: BehaviorSubject<boolean>;
86
90
  readonly salesOrderDeliveryCompletedChanged: BehaviorSubject<boolean>;
87
91
  readonly invoiceCompletedChanged: BehaviorSubject<boolean>;
88
- readonly purchaseOrderAllocateGoodsCompletedChanged: BehaviorSubject<boolean>;
92
+ readonly salesOrderAllocateGoodsCompletedChanged: BehaviorSubject<boolean>;
89
93
  readonly purchaseOrderReceiveGoodsCompletedChanged: BehaviorSubject<boolean>;
90
94
  readonly purchaseOrderConfirmationCompletedChanged: BehaviorSubject<boolean>;
91
95
  readonly overwritePurchaseOrderConfirmationCompletedChanged: Subject<void>;
@@ -116,5 +120,17 @@ export declare class TransactionEventService {
116
120
  readonly headerPopupWantsToClose: Subject<void>;
117
121
  readonly headerPopupClose: Subject<boolean>;
118
122
  readonly addDocumentToLineClicked: Subject<TransactionLineInfo>;
123
+ readonly activeRubricChange: BehaviorSubject<TransactionTypeCategory>;
124
+ readonly quantitySelectedLineChanged: BehaviorSubject<boolean>;
125
+ readonly lineSelectedForDelivery: BehaviorSubject<{
126
+ lineUuid: string;
127
+ selected: boolean;
128
+ }>;
129
+ readonly lineSelectedForInvoice: BehaviorSubject<{
130
+ lineUuid: string;
131
+ selected: boolean;
132
+ }>;
133
+ readonly allLinesSelectedForDelivery: Subject<void>;
134
+ readonly allLinesSelectedForInvoice: Subject<void>;
119
135
  constructor();
120
136
  }
@@ -1,6 +1,6 @@
1
- import { ObjectConfiguration } from "@colijnit/ioneconnector/build/model/object-configuration";
2
- import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
3
- import { TransactionService } from "./transaction.service";
1
+ import { ObjectConfiguration } from '@colijnit/ioneconnector/build/model/object-configuration';
2
+ import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
3
+ import { TransactionService } from './transaction.service';
4
4
  export declare class TransactionScreenConfigurationService {
5
5
  private _transactionService;
6
6
  private _screenConfigurationObjectCache;
@@ -99,18 +99,18 @@ import { ChangeHeaderExpectedScoringDateRequest } from '@colijnit/transactionapi
99
99
  import { ChangeHeaderRetailStadiumRequest } from '@colijnit/transactionapi/build/model/change-header-retail-stadium-request';
100
100
  import { RetailStadium } from '@colijnit/transactionapi/build/model/retail-stadium.bo';
101
101
  import { WorkFlowStatus } from '@colijnit/transactionapi/build/model/workflow-status.bo';
102
- import { IFrameArticleRequest } from "@colijnit/transactionapi/build/model/iFrame-article-request";
102
+ import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
103
+ import { IFrameArticleRequest } from '@colijnit/transactionapi/build/model/iFrame-article-request';
103
104
  export declare class TransactionService extends PendingReasonService {
105
+ remainingAmount: number;
104
106
  private readonly _createTransactionMethods;
105
107
  private readonly _relationKindFromTransactionKind;
106
108
  private readonly _focusStatusIndex;
107
109
  private _boFactory;
108
110
  private _answerRecalculationDeposit;
109
111
  private _dontAskForRecalculationDeposit;
110
- internalParameterAllowsDropShipment: boolean;
111
- internalParameterPartialInvoice: boolean;
112
- internalParameterReceiveGoodsWithDataTerminal: boolean;
113
112
  logOut(): Promise<void>;
113
+ preparePakBinnenInternalParam(): void;
114
114
  prepareDropShipmentInternalParam(): void;
115
115
  preparePartialInvoiceInternalParam(): void;
116
116
  prepareReceiveGoodsWithDataTerminalInternalParam(): void;
@@ -150,6 +150,8 @@ export declare class TransactionService extends PendingReasonService {
150
150
  updateReferenceTransactionLine(uuid: string, lineUuid: string, reference: string): Promise<boolean>;
151
151
  updateGoodDescriptionTransactionLine(uuid: string, lineUuid: string, goodDescription: string): Promise<boolean>;
152
152
  updateQuantityTransactionLine(uuid: string, lineUuid: string, quantity: number): Promise<boolean>;
153
+ updateQuantitySelectedForAllLines(transaction: TransactionInfoResponse, selected: boolean): Promise<void>;
154
+ updateQuantitySelectedTransactionLine(uuid: string, lines: ChangeLineQuantitySelectedLineRequest[], saveTransaction?: boolean, rememberTransaction?: boolean): Promise<boolean>;
153
155
  updateDeliveryDateTransactionLine(uuid: string, lineUuid: string, date: Date): Promise<boolean>;
154
156
  updatePriceListTransactionLine(uuid: string, lineUuid: string, priceList: string): Promise<boolean>;
155
157
  updateVatTransactionLine(uuid: string, lineUuid: string, id: number): Promise<boolean>;
@@ -192,7 +194,6 @@ export declare class TransactionService extends PendingReasonService {
192
194
  changeLineSequence(lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
193
195
  deleteTransactionLine(transactionUuid: string, TransactionLineUuid: string): Promise<boolean>;
194
196
  changeTransactionLineQuantity(transactionUuid: string, lineUuid: string, newQuantity: number): Promise<boolean>;
195
- setRelationByUser(username: string, password: string): Promise<boolean>;
196
197
  getGoodsReceiptHistory(transId: number, lineNr: number): Promise<GoodsReceiptHistory>;
197
198
  receiveGoodsForPurchaseOrder(transactionId: number, version: number, request: ReceiveGoodsForPurchaseOrderRequest): Promise<boolean>;
198
199
  receiveGoodsForPurchaseOrderCorrection(transactionId: number, version: number, request: ReceiveGoodsForPurchaseOrderCorrectionRequest): Promise<boolean>;
@@ -218,6 +219,7 @@ export declare class TransactionService extends PendingReasonService {
218
219
  getOnHoldCodes(): Promise<OnHoldCode[]>;
219
220
  getWarehouses(): Promise<Warehouse[]>;
220
221
  getWarehouseStockInfoByGoodAndBranch(goodId: number): Promise<WarehouseStockInfo[]>;
222
+ getMaxConfirmedDeliveryDateForPurchaseOrder(transId: number): Promise<Date>;
221
223
  getHistoricStateValues(): Promise<CodeDescription[]>;
222
224
  getCustomerGroups(): Promise<CustomerGroup[]>;
223
225
  getWorkFlowStatuses(transactionKind: TransactionKind): Promise<WorkFlowStatus[]>;
@@ -296,6 +298,7 @@ export declare class TransactionService extends PendingReasonService {
296
298
  getPurchaseOrderForTransactionLine(transId: number, lineNr: number): Promise<TransactionInfoHistory[]>;
297
299
  commitAndRefreshTransaction(): Promise<void>;
298
300
  checkBranch(): Promise<void>;
301
+ protected _handleBeforeRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
299
302
  protected _handleAfterRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
300
303
  private _handleBusinessRuleDepositPercentageAmount;
301
304
  private _handleBusinessRuleDepositAmount;
@@ -12,7 +12,7 @@ $tp-color-select: #f0f5ff !default;
12
12
  $tp-color-hover: #e8eceb !default;
13
13
  $tp-color-active: #429777 !default;
14
14
  $tp-color-grey: #DAD9D9 !default;
15
- $tp-color-error: #C1002A !default;
15
+ $tp-color-error: #FF4141 !default;
16
16
  $tp-color-warning: #DF7C2A !default;
17
17
  $tp-color-label: #8083A3 !default;
18
18
  $tp-color-font: #171721 !default;
@@ -28,6 +28,7 @@ $tp-color-light: #FFFFFF !default;
28
28
  $tp-color-light-accent: #DCE4EA !default;
29
29
 
30
30
  $tp-color-active-light: #5FDCB3 !default;
31
+ $tp-color-active-light-additional: #d1d1d1 !default;
31
32
  $tp-color-dark-accent: #475060 !default;
32
33
 
33
34
  $tp-color-stock-low: $tp-color-error !default;
@@ -74,6 +74,10 @@
74
74
  color: $tp-color-negative-value;
75
75
  }
76
76
 
77
+ .transaction-red-label {
78
+ color: $tp-color-error;
79
+ }
80
+
77
81
  .payment-to-pay-keypad {
78
82
  .key-pad-wrapper {
79
83
  background: transparent;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@colijnit/transaction",
3
- "version": "12.1.144",
3
+ "version": "12.1.146",
4
4
  "description": "Colijn IT transaction module for Angular 12",
5
5
  "repository": "npm/npm",
6
6
  "author": "Colijn IT",
@@ -14,11 +14,12 @@
14
14
  "@colijnit/corecomponents": ">=1.12.0",
15
15
  "@colijnit/corecomponents_v12": ">=12.1.8",
16
16
  "@colijnit/ioneconnector": ">=3.1.6",
17
- "@colijnit/mainapi": ">=1.0.23",
17
+ "@colijnit/mainapi": ">=1.0.24",
18
+ "@colijnit/product": ">=12.0.0",
18
19
  "@colijnit/relationapi": ">=1.0.8",
19
20
  "@colijnit/sharedapi": ">=1.0.16",
20
21
  "@colijnit/sharedcomponents": ">=1.0.46",
21
- "@colijnit/transactionapi": ">=1.1.101",
22
+ "@colijnit/transactionapi": ">=1.1.103",
22
23
  "@types/three": ">=0.125.0",
23
24
  "@tweenjs/tween.js": ">=17.2.0",
24
25
  "three": ">=0.125.0"