@colijnit/transaction 12.1.130 → 12.1.131
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.
- package/bundles/colijnit-transaction.umd.js +1692 -448
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.d.ts +378 -366
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/colijnit-transaction.js +379 -367
- package/esm2015/lib/component/checkout/checkout-overview-delivery-edit/checkout-overview-delivery-edit.component.js +2 -2
- package/esm2015/lib/component/core/base/transaction-base.component.js +2 -2
- package/esm2015/lib/component/deposit-payment/deposit-payment.component.js +17 -5
- package/esm2015/lib/component/discount/discount.component.js +110 -0
- package/esm2015/lib/component/discount/discount.module.js +29 -0
- package/esm2015/lib/component/payment/payment.component.js +57 -38
- package/esm2015/lib/component/payment/payment.module.js +4 -2
- package/esm2015/lib/component/payment-to-pay/payment-to-pay.component.js +26 -0
- package/esm2015/lib/component/payment-to-pay/payment-to-pay.module.js +21 -0
- package/esm2015/lib/component/transaction/transaction.module.js +4 -2
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/transaction-cash-register-dialog.component.js +177 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/transaction-cash-register-dialog.module.js +27 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.component.js +83 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.module.js +24 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.js +177 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order.module.js +41 -0
- package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +11 -2
- package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-payment.component.js +97 -4
- package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup.module.js +8 -3
- package/esm2015/lib/component/transaction-header-fields/transaction-header-amount-to-settle.component.js +55 -0
- package/esm2015/lib/component/transaction-header-fields/transaction-header-amount-to-settle.module.js +24 -0
- package/esm2015/lib/component/transaction-header-fields/transaction-header-deposit-amount.component.js +24 -3
- package/esm2015/lib/component/transaction-header-fields/transaction-header-divide-evenly.component.js +38 -0
- package/esm2015/lib/component/transaction-header-fields/transaction-header-divide-evenly.module.js +25 -0
- package/esm2015/lib/component/transaction-header-fields/transaction-header-payment-button/transaction-header-payment-button.component.js +14 -3
- package/esm2015/lib/component/transaction-line/transaction-cash-register-order-line/transaction-cash-register-order-line.component.js +52 -0
- package/esm2015/lib/component/transaction-line/transaction-cash-register-order-line/transaction-cash-register-order-line.module.js +36 -0
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/transaction-quick-access-order-delivery.component.js +13 -13
- package/esm2015/lib/enum/icon.enum.js +2 -1
- package/esm2015/lib/enum/order-discount-type.enum.js +7 -0
- package/esm2015/lib/enum/transaction-type-category.enum.js +2 -1
- package/esm2015/lib/model/icon-svg.js +2 -1
- package/esm2015/lib/model/payment-transaction-view-model.js +3 -0
- package/esm2015/lib/res/dictionary/dictionaries.js +3 -3
- package/esm2015/lib/service/payment.service.js +24 -5
- package/esm2015/lib/service/transaction-connector-adapter.service.js +155 -2
- package/esm2015/lib/service/transaction-connector.service.js +50 -2
- package/esm2015/lib/service/transaction-event.service.js +2 -1
- package/esm2015/lib/service/transaction-mapping.service.js +4 -2
- package/esm2015/lib/service/transaction.service.js +58 -5
- package/esm2015/lib/transaction-version.js +3 -3
- package/esm2015/public_api.js +3 -1
- package/fesm2015/colijnit-transaction.js +1228 -64
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/checkout/checkout-overview-relation-edit/style/_layout.scss +9 -0
- package/lib/component/checkout/checkout-overview-relation-edit/style/_material-definition.scss +4 -1
- package/lib/component/checkout/checkout-overview-relation-edit/style/_theme.scss +3 -0
- package/lib/component/checkout-simple/checkout-simple-overview-relation-edit/style/_layout.scss +9 -0
- package/lib/component/checkout-simple/checkout-simple-overview-relation-edit/style/_material-definition.scss +4 -1
- package/lib/component/checkout-simple/checkout-simple-overview-relation-edit/style/_theme.scss +3 -0
- package/lib/component/core/base/transaction-base.component.d.ts +1 -1
- package/lib/component/deposit-payment/deposit-payment.component.d.ts +9 -3
- package/lib/component/discount/discount.component.d.ts +19 -0
- package/lib/component/discount/discount.module.d.ts +2 -0
- package/lib/component/discount/style/_layout.scss +0 -0
- package/lib/component/discount/style/_material-definition.scss +0 -0
- package/lib/component/discount/style/_theme.scss +0 -0
- package/lib/component/discount/style/material.scss +0 -0
- package/lib/component/payment/payment.component.d.ts +14 -6
- package/lib/component/payment/style/_layout.scss +5 -0
- package/lib/component/payment/style/_material-definition.scss +3 -6
- package/lib/component/payment/style/_theme.scss +0 -24
- package/lib/component/payment/style/material.scss +1 -0
- package/lib/component/payment-to-pay/payment-to-pay.component.d.ts +4 -0
- package/lib/component/payment-to-pay/payment-to-pay.module.d.ts +2 -0
- package/lib/component/payment-to-pay/style/_layout.scss +26 -0
- package/lib/component/payment-to-pay/style/_material-definition.scss +6 -0
- package/lib/component/payment-to-pay/style/_theme.scss +9 -0
- package/lib/component/payment-to-pay/style/material.scss +4 -0
- package/lib/component/quick-send-button/style/_layout.scss +24 -0
- package/lib/component/quick-send-button/style/_material-definition.scss +2 -0
- package/lib/component/tile/style/_layout.scss +4 -0
- package/lib/component/transaction-cash-register-order/style/_layout.scss +129 -0
- package/lib/component/transaction-cash-register-order/style/_material-definition.scss +0 -0
- package/lib/component/transaction-cash-register-order/style/_theme.scss +4 -0
- package/lib/component/transaction-cash-register-order/style/material.scss +7 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/style/_layout.scss +28 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/style/_material-definition.scss +0 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/style/_theme.scss +4 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/style/material.scss +4 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/transaction-cash-register-dialog.component.d.ts +34 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-dialog/transaction-cash-register-dialog.module.d.ts +2 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/style/_layout.scss +37 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/style/_material-definition.scss +0 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/style/_theme.scss +4 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/style/material.scss +5 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.component.d.ts +17 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.module.d.ts +2 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.d.ts +41 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order.module.d.ts +2 -0
- package/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.d.ts +5 -2
- package/lib/component/transaction-header/transaction-header-popup/style/_layout.scss +33 -0
- package/lib/component/transaction-header/transaction-header-popup/style/_material-definition.scss +5 -0
- package/lib/component/transaction-header/transaction-header-popup/style/_theme.scss +10 -0
- package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-payment.component.d.ts +32 -1
- package/lib/component/transaction-header-fields/transaction-header-amount-to-settle.component.d.ts +8 -0
- package/lib/component/transaction-header-fields/transaction-header-amount-to-settle.module.d.ts +2 -0
- package/lib/component/transaction-header-fields/transaction-header-deposit-amount.component.d.ts +6 -0
- package/lib/component/transaction-header-fields/transaction-header-divide-evenly.component.d.ts +5 -0
- package/lib/component/transaction-header-fields/transaction-header-divide-evenly.module.d.ts +2 -0
- package/lib/component/transaction-header-fields/transaction-header-payment-button/transaction-header-payment-button.component.d.ts +7 -3
- package/lib/component/transaction-line/transaction-cash-register-order-line/style/_layout.scss +21 -0
- package/lib/component/transaction-line/transaction-cash-register-order-line/style/_material-definition.scss +0 -0
- package/lib/component/transaction-line/transaction-cash-register-order-line/style/_theme.scss +4 -0
- package/lib/component/transaction-line/transaction-cash-register-order-line/style/material.scss +4 -0
- package/lib/component/transaction-line/transaction-cash-register-order-line/transaction-cash-register-order-line.component.d.ts +4 -0
- package/lib/component/transaction-line/transaction-cash-register-order-line/transaction-cash-register-order-line.module.d.ts +2 -0
- package/lib/component/transaction-lines/style/material.scss +1 -0
- package/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/transaction-quick-access-order-delivery.component.d.ts +13 -13
- package/lib/enum/icon.enum.d.ts +1 -0
- package/lib/enum/order-discount-type.enum.d.ts +5 -0
- package/lib/enum/transaction-type-category.enum.d.ts +2 -1
- package/lib/model/payment-transaction-view-model.d.ts +12 -0
- package/lib/res/dictionary/dictionaries.d.ts +11 -2
- package/lib/service/payment.service.d.ts +7 -2
- package/lib/service/transaction-connector-adapter.service.d.ts +22 -4
- package/lib/service/transaction-connector.service.d.ts +37 -22
- package/lib/service/transaction-event.service.d.ts +1 -0
- package/lib/service/transaction.service.d.ts +15 -0
- package/package.json +2 -2
- package/public_api.d.ts +2 -0
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
@include export-module('cc-transaction-cash-register-order-receipt-dialog-layout') {
|
|
2
|
+
.co-transaction-cash-register-order-receipt-dialog {
|
|
3
|
+
|
|
4
|
+
.dialog-content-wrapper {
|
|
5
|
+
display: flex;
|
|
6
|
+
column-gap: 15px;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
.receipt-option {
|
|
10
|
+
display: flex;
|
|
11
|
+
align-items: center;
|
|
12
|
+
grid-column-gap: 10px;
|
|
13
|
+
column-gap: 10px;
|
|
14
|
+
border: 1px solid #1a73e8;
|
|
15
|
+
color: #1a73e8;
|
|
16
|
+
padding: 10px;
|
|
17
|
+
border-radius: 8px;
|
|
18
|
+
min-width: 140px;
|
|
19
|
+
justify-content: center;
|
|
20
|
+
|
|
21
|
+
&:hover {
|
|
22
|
+
background-color: rgba(26, 115, 232, 0.21);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
.co-icon {
|
|
26
|
+
width: 20px;
|
|
27
|
+
height: 20px;
|
|
28
|
+
svg { // for fontawesome icons
|
|
29
|
+
fill: #1a73e8;
|
|
30
|
+
}
|
|
31
|
+
& [fill] { // for own icons
|
|
32
|
+
fill: #1a73e8;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
File without changes
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { EventEmitter } from "@angular/core";
|
|
2
|
+
import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
|
|
3
|
+
import { SafeHtml } from "@angular/platform-browser";
|
|
4
|
+
import { PaymentTransactionViewModel } from "../../../model/payment-transaction-view-model";
|
|
5
|
+
export declare class TransactionCashRegisterOrderReceiptDialogComponent extends TransactionBaseComponent {
|
|
6
|
+
cashRegisterPaymentDetails: PaymentTransactionViewModel;
|
|
7
|
+
handleReceiptOptionSelected: EventEmitter<void>;
|
|
8
|
+
receiptOptions: {
|
|
9
|
+
title: string;
|
|
10
|
+
iconData: SafeHtml;
|
|
11
|
+
}[];
|
|
12
|
+
showClass(): boolean;
|
|
13
|
+
emailReceipt(): void;
|
|
14
|
+
printReceipt(): void;
|
|
15
|
+
noPrintReceipt(): void;
|
|
16
|
+
handleClickReceipt(title: string): void;
|
|
17
|
+
}
|
package/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.d.ts
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { ChangeDetectorRef, OnInit } from "@angular/core";
|
|
2
|
+
import { TransactionService } from "../../service/transaction.service";
|
|
3
|
+
import { IconCacheService } from "../../service/icon-cache.service";
|
|
4
|
+
import { TransactionBaseComponent } from "../core/base/transaction-base.component";
|
|
5
|
+
import { TransactionEventService } from "../../service/transaction-event.service";
|
|
6
|
+
import { DictionaryService } from "../../service/dictionary.service";
|
|
7
|
+
import { TransactionImageService } from "../../service/transaction-image.service";
|
|
8
|
+
import { PaymentViewmodel } from "../../model/payment.viewmodel";
|
|
9
|
+
import { PaymentService } from "../../service/payment.service";
|
|
10
|
+
import { PaymentMethod } from "@colijnit/transactionapi/build/model/payment-method.bo";
|
|
11
|
+
import { TransactionScreenConfigurationService } from "../../service/transaction-screen-configuration.service";
|
|
12
|
+
import { PaymentTransactionViewModel } from "../../model/payment-transaction-view-model";
|
|
13
|
+
export declare class TransactionCashRegisterOrderComponent extends TransactionBaseComponent implements OnInit {
|
|
14
|
+
transactionEventService: TransactionEventService;
|
|
15
|
+
iconCacheService: IconCacheService;
|
|
16
|
+
transactionScreenConfigurationService: TransactionScreenConfigurationService;
|
|
17
|
+
protected dictionaryService: DictionaryService;
|
|
18
|
+
protected imageService: TransactionImageService;
|
|
19
|
+
protected changeDetector: ChangeDetectorRef;
|
|
20
|
+
protected _transactionService: TransactionService;
|
|
21
|
+
private _paymentService;
|
|
22
|
+
amountToPay: number;
|
|
23
|
+
paymentMethods: PaymentViewmodel[];
|
|
24
|
+
paymentMethodIdx: number;
|
|
25
|
+
showCashRegisterDialog: boolean;
|
|
26
|
+
showReceiptDialog: boolean;
|
|
27
|
+
showDiscountDialog: boolean;
|
|
28
|
+
cashRegisterPaymentDetails: PaymentTransactionViewModel;
|
|
29
|
+
private _subs;
|
|
30
|
+
showClass(): boolean;
|
|
31
|
+
constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _transactionService: TransactionService, _paymentService: PaymentService);
|
|
32
|
+
ngOnInit(): void;
|
|
33
|
+
handleAddArticle(articleNr: string, quantity?: number): Promise<void>;
|
|
34
|
+
handleKeyPadModelChange(model: number): void;
|
|
35
|
+
handlePayment(): void;
|
|
36
|
+
paymentMethodSelected(method: PaymentMethod, index: number): void;
|
|
37
|
+
openDiscountDialog(event: MouseEvent): void;
|
|
38
|
+
private _getPaymentMethods;
|
|
39
|
+
handleFinishedPayment(): void;
|
|
40
|
+
handlePaymentDetailsSelected(paymentDetailsSelected: PaymentTransactionViewModel): void;
|
|
41
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChangeDetectorRef } from '@angular/core';
|
|
1
|
+
import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
|
|
2
2
|
import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
|
|
3
3
|
import { Icon } from '../../../enum/icon.enum';
|
|
4
4
|
import { IconCacheService } from '../../../service/icon-cache.service';
|
|
@@ -10,7 +10,7 @@ import { DictionaryService } from '../../../service/dictionary.service';
|
|
|
10
10
|
import { TransactionEventService } from '../../../service/transaction-event.service';
|
|
11
11
|
import { TransactionImageService } from '../../../service/transaction-image.service';
|
|
12
12
|
import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
|
|
13
|
-
export declare class TransactionHeaderPaymentComponent extends TransactionBaseComponent {
|
|
13
|
+
export declare class TransactionHeaderPaymentComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
|
|
14
14
|
transactionEventService: TransactionEventService;
|
|
15
15
|
service: TransactionService;
|
|
16
16
|
iconCacheService: IconCacheService;
|
|
@@ -28,7 +28,10 @@ export declare class TransactionHeaderPaymentComponent extends TransactionBaseCo
|
|
|
28
28
|
showLoaderDepositPayments: boolean;
|
|
29
29
|
paid: number;
|
|
30
30
|
toPay: number;
|
|
31
|
+
private _subs;
|
|
31
32
|
constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _paymentService: PaymentService);
|
|
33
|
+
ngOnInit(): void;
|
|
34
|
+
ngOnDestroy(): void;
|
|
32
35
|
openPayment(event: MouseEvent): Promise<void>;
|
|
33
36
|
transactionSet(): Promise<void>;
|
|
34
37
|
private _getDepositPaymentInfo;
|
|
@@ -135,5 +135,38 @@
|
|
|
135
135
|
width: $tp-transaction-header-popup-save-button-icon-size;
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
+
.transaction-header-popup-already-paid {
|
|
139
|
+
display: flex;
|
|
140
|
+
column-gap: $tp-transaction-header-popup-section-grid-column-gap;
|
|
141
|
+
.co-input-text {
|
|
142
|
+
&:before {
|
|
143
|
+
box-shadow: none;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
.transaction-header-popup-business-rule-applied {
|
|
148
|
+
display: flex;
|
|
149
|
+
column-gap: 5px;
|
|
150
|
+
align-items: center;
|
|
151
|
+
.co-icon {
|
|
152
|
+
height: $tp-transaction-header-popup-business-rule-applied-icon-size;
|
|
153
|
+
width: $tp-transaction-header-popup-business-rule-applied-icon-size;
|
|
154
|
+
svg {
|
|
155
|
+
fill: $tp-transaction-header-popup-business-rule-applied-icon-color;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
span {
|
|
159
|
+
font-size: $tp-transaction-header-popup-business-rule-applied-font-size;
|
|
160
|
+
font-weight: $tp-transaction-header-popup-business-rule-applied-font-weight;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
.co-transaction-header-payment-button {
|
|
164
|
+
.co-transaction-button {
|
|
165
|
+
height: $tp-item-size;
|
|
166
|
+
}
|
|
167
|
+
.payment-payed-wrapper {
|
|
168
|
+
margin: 5px 0 0 0;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
138
171
|
}
|
|
139
172
|
}
|
package/lib/component/transaction-header/transaction-header-popup/style/_material-definition.scss
CHANGED
|
@@ -45,3 +45,8 @@ $tp-transaction-header-popup-section-grid-column-gap: 20px !default;
|
|
|
45
45
|
$tp-transaction-header-popup-save-button-size: 40px !default;
|
|
46
46
|
$tp-transaction-header-popup-save-button-icon-size: 20px !default;
|
|
47
47
|
$tp-transaction-header-popup-save-button-icon-color: $tp-color-action !default;
|
|
48
|
+
|
|
49
|
+
$tp-transaction-header-popup-business-rule-applied-icon-size: 20px !default;
|
|
50
|
+
$tp-transaction-header-popup-business-rule-applied-icon-color: red !default;
|
|
51
|
+
$tp-transaction-header-popup-business-rule-applied-font-size: $tp-font-size !default;
|
|
52
|
+
$tp-transaction-header-popup-business-rule-applied-font-weight: normal !default;
|
|
@@ -25,5 +25,15 @@
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
.transaction-header-popup-business-rule-applied {
|
|
29
|
+
.co-icon {
|
|
30
|
+
svg {
|
|
31
|
+
fill: $tp-transaction-header-popup-business-rule-applied-icon-color;
|
|
32
|
+
}
|
|
33
|
+
& [fill] {
|
|
34
|
+
fill: $tp-transaction-header-popup-business-rule-applied-icon-color;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
28
38
|
}
|
|
29
39
|
}
|
|
@@ -1,4 +1,35 @@
|
|
|
1
|
+
import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
|
|
1
2
|
import { TransactionHeaderPopupBaseComponent } from './transaction-header-popup-base.component';
|
|
2
|
-
|
|
3
|
+
import { TransactionEventService } from '../../../service/transaction-event.service';
|
|
4
|
+
import { TransactionService } from '../../../service/transaction.service';
|
|
5
|
+
import { IconCacheService } from '../../../service/icon-cache.service';
|
|
6
|
+
import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
|
|
7
|
+
import { DictionaryService } from '../../../service/dictionary.service';
|
|
8
|
+
import { TransactionImageService } from '../../../service/transaction-image.service';
|
|
9
|
+
import { DialogService } from '../../../service/dialog.service';
|
|
10
|
+
import { FormMasterService } from '@colijnit/corecomponents_v12';
|
|
11
|
+
import { RelationService } from '../../../service/relation.service';
|
|
12
|
+
import { PaymentService } from '../../../service/payment.service';
|
|
13
|
+
export declare class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseComponent implements OnInit, OnDestroy {
|
|
14
|
+
transactionEventService: TransactionEventService;
|
|
15
|
+
service: TransactionService;
|
|
16
|
+
iconCacheService: IconCacheService;
|
|
17
|
+
transactionScreenConfigurationService: TransactionScreenConfigurationService;
|
|
18
|
+
protected dictionaryService: DictionaryService;
|
|
19
|
+
protected imageService: TransactionImageService;
|
|
20
|
+
protected changeDetector: ChangeDetectorRef;
|
|
21
|
+
protected dialogService: DialogService;
|
|
22
|
+
protected formMasterService: FormMasterService;
|
|
23
|
+
protected relationService: RelationService;
|
|
24
|
+
private _paymentService;
|
|
3
25
|
showClass(): boolean;
|
|
26
|
+
paidDown: number;
|
|
27
|
+
settled: number;
|
|
28
|
+
showBusinessRuleInfo: boolean;
|
|
29
|
+
private _ownSubs;
|
|
30
|
+
constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, dialogService: DialogService, formMasterService: FormMasterService, relationService: RelationService, _paymentService: PaymentService);
|
|
31
|
+
ngOnInit(): Promise<void>;
|
|
32
|
+
ngOnDestroy(): Promise<void>;
|
|
33
|
+
protected transactionSet(): void;
|
|
34
|
+
private _getDepositInfo;
|
|
4
35
|
}
|
package/lib/component/transaction-header-fields/transaction-header-amount-to-settle.component.d.ts
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { InputTextComponent } from '@colijnit/corecomponents_v12';
|
|
2
|
+
import { TransactionInputFieldBaseComponent } from '../core/base/transaction-input-field-base.component';
|
|
3
|
+
export declare class TransactionHeaderAmountToSettleComponent extends TransactionInputFieldBaseComponent {
|
|
4
|
+
set child(content: any);
|
|
5
|
+
showClass: boolean;
|
|
6
|
+
input: InputTextComponent;
|
|
7
|
+
commit(amount: number): Promise<boolean>;
|
|
8
|
+
}
|
package/lib/component/transaction-header-fields/transaction-header-deposit-amount.component.d.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
|
+
import { EventEmitter } from '@angular/core';
|
|
1
2
|
import { InputTextComponent } from '@colijnit/corecomponents_v12';
|
|
2
3
|
import { TransactionInputFieldBaseComponent } from '../core/base/transaction-input-field-base.component';
|
|
3
4
|
export declare class TransactionHeaderDepositAmountComponent extends TransactionInputFieldBaseComponent {
|
|
4
5
|
set child(content: any);
|
|
6
|
+
businessRuleApplied: EventEmitter<boolean>;
|
|
7
|
+
showClass: boolean;
|
|
5
8
|
input: InputTextComponent;
|
|
9
|
+
amount: number;
|
|
6
10
|
commit(amount: number): Promise<boolean>;
|
|
11
|
+
protected transactionSet(): void;
|
|
12
|
+
private _checkBusinessRule;
|
|
7
13
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChangeDetectorRef } from '@angular/core';
|
|
1
|
+
import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
|
|
2
2
|
import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
|
|
3
3
|
import { DepositPaymentViewModel } from '../../../model/deposit-payment-view-model';
|
|
4
4
|
import { TransactionEventService } from '../../../service/transaction-event.service';
|
|
@@ -7,8 +7,8 @@ import { IconCacheService } from '../../../service/icon-cache.service';
|
|
|
7
7
|
import { DictionaryService } from '../../../service/dictionary.service';
|
|
8
8
|
import { TransactionImageService } from '../../../service/transaction-image.service';
|
|
9
9
|
import { PaymentService } from '../../../service/payment.service';
|
|
10
|
-
import { TransactionScreenConfigurationService } from
|
|
11
|
-
export declare class TransactionHeaderPaymentButtonComponent extends TransactionBaseComponent {
|
|
10
|
+
import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
|
|
11
|
+
export declare class TransactionHeaderPaymentButtonComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
|
|
12
12
|
transactionEventService: TransactionEventService;
|
|
13
13
|
service: TransactionService;
|
|
14
14
|
iconCacheService: IconCacheService;
|
|
@@ -17,12 +17,16 @@ export declare class TransactionHeaderPaymentButtonComponent extends Transaction
|
|
|
17
17
|
protected imageService: TransactionImageService;
|
|
18
18
|
protected changeDetector: ChangeDetectorRef;
|
|
19
19
|
private _paymentService;
|
|
20
|
+
label: string;
|
|
20
21
|
showClass(): boolean;
|
|
21
22
|
paid: number;
|
|
22
23
|
toPay: number;
|
|
23
24
|
depositPayments: DepositPaymentViewModel[];
|
|
24
25
|
showPaymentDialog: boolean;
|
|
26
|
+
private _subs;
|
|
25
27
|
constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _paymentService: PaymentService);
|
|
28
|
+
ngOnInit(): void;
|
|
29
|
+
ngOnDestroy(): void;
|
|
26
30
|
openPayment(event: MouseEvent): Promise<void>;
|
|
27
31
|
handleCloseDialogClick(event: MouseEvent): void;
|
|
28
32
|
transactionInfoSet(): Promise<void>;
|
package/lib/component/transaction-line/transaction-cash-register-order-line/style/_layout.scss
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
@include export-module('cc-transaction-cash-register-order-line-layout') {
|
|
2
|
+
.co-transaction-cash-register-order-line {
|
|
3
|
+
|
|
4
|
+
.line-content-wrapper {
|
|
5
|
+
display: grid;
|
|
6
|
+
grid-template-columns:
|
|
7
|
+
$tp-transaction-default-button-width
|
|
8
|
+
$tp-transaction-default-button-width
|
|
9
|
+
100px
|
|
10
|
+
$tp-transaction-default-button-width
|
|
11
|
+
100px
|
|
12
|
+
100px
|
|
13
|
+
100px;
|
|
14
|
+
grid-template-rows: $tp-transaction-default-button-height;
|
|
15
|
+
gap: 0 10px;
|
|
16
|
+
grid-template-areas:
|
|
17
|
+
". . . . . . .";
|
|
18
|
+
padding: 8px;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
File without changes
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
@import "../../../component/transaction-line/transaction-purchase-overview-line/style/material";
|
|
17
17
|
@import "../../../component/transaction-line/transaction-picked-line/style/material";
|
|
18
18
|
@import "../../../component/transaction-line/transaction-to-be-picked-line/style/material";
|
|
19
|
+
@import "../../../component/transaction-line/transaction-cash-register-order-line/style/material";
|
|
19
20
|
@import "../../../component/transaction-line-fields/transaction-line-price/style/material";
|
|
20
21
|
@import "../../shared/transaction-article-text/style/material";
|
|
21
22
|
@import "../../shared/transaction-article-text-overview/style/material";
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { AfterViewInit } from '@angular/core';
|
|
2
|
-
import { TransactionQuickAccessSendMethodBaseComponent } from
|
|
3
|
-
import { ReportLayoutSelectionPrint } from
|
|
4
|
-
import { ReportLayoutSelectionEmail } from
|
|
5
|
-
import { EmailDeliveryNoteRequest } from
|
|
6
|
-
import { PrintDeliveryNoteRequest } from
|
|
7
|
-
import { PdfDeliveryNoteRequest } from
|
|
8
|
-
import { TransactionSendDocumentsComponent } from
|
|
9
|
-
import { ReportingDocumentPdfBaseRequest } from
|
|
10
|
-
import { EmailHistoricDeliveryNoteRequest } from
|
|
11
|
-
import { PrintHistoricDeliveryNoteRequest } from
|
|
12
|
-
import { PdfHistoricDeliveryNoteRequest } from
|
|
13
|
-
import { ReportingDocumentEmailSignDocBaseRequest } from
|
|
14
|
-
import { ReportingDocumentPrintSignDocBaseRequest } from
|
|
2
|
+
import { TransactionQuickAccessSendMethodBaseComponent } from '../transaction-quick-access-send-method-base.component';
|
|
3
|
+
import { ReportLayoutSelectionPrint } from '@colijnit/mainapi/build/model/report-layout-selection-print.bo';
|
|
4
|
+
import { ReportLayoutSelectionEmail } from '@colijnit/mainapi/build/model/report-layout-selection-email.bo';
|
|
5
|
+
import { EmailDeliveryNoteRequest } from '@colijnit/transactionapi/build/model/email-delivery-note-request';
|
|
6
|
+
import { PrintDeliveryNoteRequest } from '@colijnit/transactionapi/build/model/print-delivery-note-request';
|
|
7
|
+
import { PdfDeliveryNoteRequest } from '@colijnit/transactionapi/build/model/pdf-delivery-note-request';
|
|
8
|
+
import { TransactionSendDocumentsComponent } from '../../transaction-send-documents/transaction-send-documents.component';
|
|
9
|
+
import { ReportingDocumentPdfBaseRequest } from '@colijnit/mainapi/build/model/reporting-document-pdf-base-request';
|
|
10
|
+
import { EmailHistoricDeliveryNoteRequest } from '@colijnit/transactionapi/build/model/email-historic-delivery-note-request';
|
|
11
|
+
import { PrintHistoricDeliveryNoteRequest } from '@colijnit/transactionapi/build/model/print-historic-delivery-note-request';
|
|
12
|
+
import { PdfHistoricDeliveryNoteRequest } from '@colijnit/transactionapi/build/model/pdf-historic-delivery-note-request';
|
|
13
|
+
import { ReportingDocumentEmailSignDocBaseRequest } from '@colijnit/mainapi/build/model/reporting-document-email-sign-doc-base-request';
|
|
14
|
+
import { ReportingDocumentPrintSignDocBaseRequest } from '@colijnit/mainapi/build/model/reporting-document-print-sign-doc-base-request';
|
|
15
15
|
export declare class TransactionQuickAccessOrderDeliveryComponent extends TransactionQuickAccessSendMethodBaseComponent implements AfterViewInit {
|
|
16
16
|
sendDocumentsComponent: TransactionSendDocumentsComponent;
|
|
17
17
|
showClass(): boolean;
|
package/lib/enum/icon.enum.d.ts
CHANGED
|
@@ -26,6 +26,7 @@ export declare enum Icon {
|
|
|
26
26
|
CheckDialog = "check_dialog",
|
|
27
27
|
CheckDuotone = "check_duotone",
|
|
28
28
|
CheckThin = "check_thin",
|
|
29
|
+
CircleExclamationRegular = "circle_exclamation_regular",
|
|
29
30
|
CloseDialog = "close_dialog",
|
|
30
31
|
CreditCardRegular = "credit_card_regular",
|
|
31
32
|
CreditCardSolid = "credit_card_solid",
|
|
@@ -14,5 +14,6 @@ export declare enum TransactionTypeCategory {
|
|
|
14
14
|
SalesOrderLogistics = "salesOrderLogistics",
|
|
15
15
|
SalesOrderPlanning = "salesOrderPlanning",
|
|
16
16
|
SalesOrderDeliveryNote = "salesOrderDeliveryNote",
|
|
17
|
-
SalesOrderInvoice = "salesOrderInvoice"
|
|
17
|
+
SalesOrderInvoice = "salesOrderInvoice",
|
|
18
|
+
SalesOrderCashRegister = "salesOrderCashRegister"
|
|
18
19
|
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
|
|
2
|
+
import { CashDrawer } from "@colijnit/transactionapi/build/model/cash-drawer.bo";
|
|
3
|
+
import { Printer } from "@colijnit/mainapi/build/model/printer.bo";
|
|
4
|
+
import { ReportLayoutSelectionPrint } from "@colijnit/mainapi/build/model/report-layout-selection-print.bo";
|
|
5
|
+
import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report-layout-selection-email.bo";
|
|
6
|
+
export declare class PaymentTransactionViewModel {
|
|
7
|
+
cashRegister: CashRegister;
|
|
8
|
+
cashDrawer: CashDrawer;
|
|
9
|
+
printer: Printer;
|
|
10
|
+
printerLayout: ReportLayoutSelectionPrint;
|
|
11
|
+
emailLayout: ReportLayoutSelectionEmail;
|
|
12
|
+
}
|
|
@@ -3801,6 +3801,7 @@ export declare class Dictionaries {
|
|
|
3801
3801
|
EMAIL_BODY_TEMPLATE: string;
|
|
3802
3802
|
EMAIL_DEFAULT_CANNOT_BE_SIGNED: string;
|
|
3803
3803
|
EMAIL_FORGOT_PW_NOT_SENT: string;
|
|
3804
|
+
EMAIL_LAYOUT: string;
|
|
3804
3805
|
EMAIL_MORE: string;
|
|
3805
3806
|
EMAIL_NOTIFIER: string;
|
|
3806
3807
|
EMAIL_ONE_MORE: string;
|
|
@@ -5702,6 +5703,7 @@ export declare class Dictionaries {
|
|
|
5702
5703
|
ORDERS_TO_PICK: string;
|
|
5703
5704
|
ORDER_2: string;
|
|
5704
5705
|
ORDER_ADVICE: string;
|
|
5706
|
+
ORDER_ADVICE_LABEL: string;
|
|
5705
5707
|
ORDER_AMOUNT: string;
|
|
5706
5708
|
ORDER_BY: string;
|
|
5707
5709
|
ORDER_BY_ARTICLENAME: string;
|
|
@@ -6176,9 +6178,10 @@ export declare class Dictionaries {
|
|
|
6176
6178
|
PRIMARY_VALUE: string;
|
|
6177
6179
|
PRINT: string;
|
|
6178
6180
|
PRINTER: string;
|
|
6181
|
+
PRINTER_LAYOUT: string;
|
|
6182
|
+
PRINTER_SELECTION_TITLE: string;
|
|
6179
6183
|
PRINTERS: string;
|
|
6180
6184
|
PRINTERS_USERS_BRANCHES: string;
|
|
6181
|
-
PRINTER_SELECTION_TITLE: string;
|
|
6182
6185
|
PRINTING_NO_TEMPLATE: string;
|
|
6183
6186
|
PRINTING_NO_TEMPLATES: string;
|
|
6184
6187
|
PRINTING_SUCCES: string;
|
|
@@ -11745,6 +11748,7 @@ export declare class Dictionaries {
|
|
|
11745
11748
|
DELIVERY_TIME_SPECIFICATION: string;
|
|
11746
11749
|
DELIVERY_TIME_WHEN_NO_STOCK: string;
|
|
11747
11750
|
DELIVERY_TIME_WHEN_NO_STOCK_UNIT: string;
|
|
11751
|
+
DELIVERY_TOTAL: string;
|
|
11748
11752
|
DEPARTMENT: string;
|
|
11749
11753
|
DEPARTMENTS: string;
|
|
11750
11754
|
DEPARTMENT_CODE: string;
|
|
@@ -11752,6 +11756,7 @@ export declare class Dictionaries {
|
|
|
11752
11756
|
DEPARTMENT_NO: string;
|
|
11753
11757
|
DEPARTMENT_NUMBER: string;
|
|
11754
11758
|
DEPOSIT: string;
|
|
11759
|
+
DEPOSIT_BUSINESS_RULE_APPLIED: string;
|
|
11755
11760
|
DEPOSIT_PERCENTAGE: string;
|
|
11756
11761
|
DEPOSIT_RECALCULATE: string;
|
|
11757
11762
|
DEPRECIATION: string;
|
|
@@ -12042,6 +12047,7 @@ export declare class Dictionaries {
|
|
|
12042
12047
|
EMAIL_BODY_TEMPLATE: string;
|
|
12043
12048
|
EMAIL_DEFAULT_CANNOT_BE_SIGNED: string;
|
|
12044
12049
|
EMAIL_FORGOT_PW_NOT_SENT: string;
|
|
12050
|
+
EMAIL_LAYOUT: string;
|
|
12045
12051
|
EMAIL_MORE: string;
|
|
12046
12052
|
EMAIL_NOTIFIER: string;
|
|
12047
12053
|
EMAIL_ONE_MORE: string;
|
|
@@ -14199,6 +14205,7 @@ export declare class Dictionaries {
|
|
|
14199
14205
|
ORDERS_TO_PICK: string;
|
|
14200
14206
|
ORDER_2: string;
|
|
14201
14207
|
ORDER_ADVICE: string;
|
|
14208
|
+
ORDER_ADVICE_LABEL: string;
|
|
14202
14209
|
ORDER_AMOUNT: string;
|
|
14203
14210
|
ORDER_AMOUNT_DECIM_NOT_COMPLIANT_W_PURCH_UNIT: string;
|
|
14204
14211
|
ORDER_AMOUNT_INTERN: string;
|
|
@@ -14713,9 +14720,10 @@ export declare class Dictionaries {
|
|
|
14713
14720
|
PRIMARY_VALUE: string;
|
|
14714
14721
|
PRINT: string;
|
|
14715
14722
|
PRINTER: string;
|
|
14723
|
+
PRINTER_LAYOUT: string;
|
|
14724
|
+
PRINTER_SELECTION_TITLE: string;
|
|
14716
14725
|
PRINTERS: string;
|
|
14717
14726
|
PRINTERS_USERS_BRANCHES: string;
|
|
14718
|
-
PRINTER_SELECTION_TITLE: string;
|
|
14719
14727
|
PRINTING_NO_TEMPLATE: string;
|
|
14720
14728
|
PRINTING_NO_TEMPLATES: string;
|
|
14721
14729
|
PRINTING_SUCCES: string;
|
|
@@ -16475,6 +16483,7 @@ export declare class Dictionaries {
|
|
|
16475
16483
|
TO_STATE: string;
|
|
16476
16484
|
TO_SUPPLIER: string;
|
|
16477
16485
|
TO_TRANSFER: string;
|
|
16486
|
+
TOTAL_PAID_DOWN: string;
|
|
16478
16487
|
TP_BE_PLANNED: string;
|
|
16479
16488
|
TRACE_ACTIVE: string;
|
|
16480
16489
|
TRACE_CHANGES: string;
|
|
@@ -9,19 +9,24 @@ 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";
|
|
12
13
|
export declare class PaymentService {
|
|
13
14
|
private _adapterService;
|
|
14
15
|
private _selectMultipleCacheService;
|
|
15
16
|
private _selectMultipleParameterizedCacheService;
|
|
16
17
|
private _transactionService;
|
|
17
18
|
private _sharedService;
|
|
19
|
+
readonly transKind: typeof TransactionKind;
|
|
18
20
|
constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _transactionService: TransactionService, _sharedService: SharedService);
|
|
19
21
|
registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<boolean>;
|
|
20
22
|
createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
|
|
21
23
|
doPinPayment(transId: number, paymentMethodCode: string, cashRegisterNr: number, cashRegisterGroupId: number, amount: number): Promise<string>;
|
|
24
|
+
doPayment(transId: number, paymentMethodCode: string, amount: number, currencyId: number, cashRegisterNr: number, cashRegisterGroupId: number, cashRegisterDrawerId?: number): Promise<string>;
|
|
22
25
|
getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
|
|
23
26
|
getPspTransactionStatus(pspTransactionUuid: string): Promise<PspTransactionStatus>;
|
|
24
27
|
getDepositPaymentInfo(uuid: string): Promise<TransactionDepositPaymentInfo>;
|
|
25
|
-
|
|
26
|
-
|
|
28
|
+
getPaymentMethodsForSalesOrder(branchNr: string): Promise<PaymentMethod[]>;
|
|
29
|
+
getPaymentMethodsForCashRegister(branchNr: string): Promise<PaymentMethod[]>;
|
|
30
|
+
processPosTransactionByUuid(uuid: string): Promise<boolean>;
|
|
31
|
+
getPaymentMethodsViewModels(branchNr: string, transactionKind: TransactionKind): Promise<PaymentViewmodel[]>;
|
|
27
32
|
}
|