@colijnit/transaction 12.1.15 → 12.1.18
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 +1755 -518
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.d.ts +146 -136
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/colijnit-transaction.js +147 -137
- package/esm2015/lib/assets/dictionary/text.properties.js +37 -2
- package/esm2015/lib/component/avatar/avatar.component.js +9 -6
- package/esm2015/lib/component/checkout/checkout.component.js +8 -7
- package/esm2015/lib/component/core/base/transaction-grid-base.component.js +5 -2
- package/esm2015/lib/component/core/relation/customer-groups.component.js +3 -3
- package/esm2015/lib/component/payment/payment.component.js +112 -30
- package/esm2015/lib/component/payment/payment.module.js +7 -3
- package/esm2015/lib/component/payment-tile/payment-tile.component.js +4 -2
- package/esm2015/lib/component/relation-address/relation-address.component.js +3 -3
- package/esm2015/lib/component/transaction/transaction.component.js +7 -3
- package/esm2015/lib/component/transaction-confirmation-history/transaction-confirmation-history.component.js +2 -2
- package/esm2015/lib/component/transaction-grid/transaction-base-grid/transaction-base-grid.component.js +7 -2
- package/esm2015/lib/component/transaction-grid/transaction-grid/transaction-grid.component.js +3 -1
- package/esm2015/lib/component/transaction-grid/transaction-history-grid/transaction-history-grid.component.js +31 -14
- package/esm2015/lib/component/transaction-grid/transaction-history-grid/transaction-history-grid.module.js +4 -3
- package/esm2015/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.js +131 -17
- package/esm2015/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.module.js +5 -3
- package/esm2015/lib/component/transaction-header/transaction-header-delivery/transaction-header-delivery.component.js +2 -2
- package/esm2015/lib/component/transaction-header/transaction-header-order/transaction-header-order.component.js +6 -2
- package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +19 -2
- package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.module.js +6 -3
- package/esm2015/lib/component/transaction-history-grid-status/transaction-history-grid-status.component.js +16 -3
- package/esm2015/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.js +20 -8
- package/esm2015/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.js +49 -6
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access/transaction-quick-access.component.js +1 -1
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.js +48 -10
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.module.js +4 -3
- package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.js +131 -19
- package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.module.js +5 -2
- package/esm2015/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.js +57 -11
- package/esm2015/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.module.js +6 -3
- package/esm2015/lib/component/transaction-search/service/filter-request.service.js +65 -22
- package/esm2015/lib/component/transaction-search/service/transaction-search.service.js +1 -1
- package/esm2015/lib/component/transaction-search/transaction-filter/transaction-filter.component.js +4 -7
- package/esm2015/lib/component/transaction-search/transaction-filter-content-article/transaction-filter-content-article.component.js +83 -44
- package/esm2015/lib/component/transaction-search/transaction-filter-content-logistics/transaction-filter-content-logistics.component.js +101 -112
- package/esm2015/lib/component/transaction-search/transaction-filter-content-logistics/transaction-filter-content-logistics.module.js +6 -3
- package/esm2015/lib/component/transaction-search/transaction-filter-content-order/transaction-filter-content-order.component.js +86 -70
- package/esm2015/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.component.js +60 -0
- package/esm2015/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.module.js +24 -0
- package/esm2015/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.js +16 -6
- package/esm2015/lib/component/transaction-search/transaction-search-result/transaction-search-result.module.js +4 -2
- package/esm2015/lib/component/transaction-search/transaction-search.component.js +5 -6
- package/esm2015/lib/component/transaction-search/transaction-tile/transaction-tile.component.js +2 -5
- package/esm2015/lib/component/transaction-search-grid/transaction-search-grid.component.js +86 -0
- package/esm2015/lib/component/transaction-search-grid/transaction-search-grid.module.js +26 -0
- package/esm2015/lib/component/view-mode-buttons/view-mode-buttons.component.js +5 -3
- package/esm2015/lib/enum/icon.enum.js +4 -1
- package/esm2015/lib/enum/position-grid-row.enum.js +6 -0
- package/esm2015/lib/enum/status-type.enum.js +3 -1
- package/esm2015/lib/model/icon-svg.js +4 -1
- package/esm2015/lib/model/payment.viewmodel.js +6 -0
- package/esm2015/lib/model/received-goods-view-model.js +11 -0
- package/esm2015/lib/service/article-connector.service.js +113 -0
- package/esm2015/lib/service/article.service.js +25 -0
- package/esm2015/lib/service/options.service.js +3 -1
- package/esm2015/lib/service/payment.service.js +51 -0
- package/esm2015/lib/service/pending-reason.service.js +10 -6
- package/esm2015/lib/service/shared-connector.service.js +53 -0
- package/esm2015/lib/service/shared.service.js +38 -0
- package/esm2015/lib/service/transaction-connector.service.js +1051 -0
- package/esm2015/lib/service/transaction-event.service.js +29 -0
- package/esm2015/lib/service/transaction-image.service.js +5 -5
- package/esm2015/lib/service/transaction-mapping.service.js +2 -2
- package/esm2015/lib/service/transaction.service.js +36 -8
- package/fesm2015/colijnit-transaction.js +1707 -492
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/avatar/avatar.component.d.ts +4 -2
- package/lib/component/core/base/components/transaction-header-block/style/_layout.scss +3 -3
- package/lib/component/core/base/components/transaction-header-block/style/_material-definition.scss +2 -2
- package/lib/component/core/base/transaction-grid-base.component.d.ts +2 -0
- package/lib/component/core/relation/customer-groups.component.d.ts +2 -2
- package/lib/component/payment/payment.component.d.ts +22 -5
- package/lib/component/payment/style/_layout.scss +23 -1
- package/lib/component/payment/style/_material-definition.scss +0 -1
- package/lib/component/payment/style/_theme.scss +24 -0
- package/lib/component/payment-tile/payment-tile.component.d.ts +1 -0
- package/lib/component/payment-tile/style/_layout.scss +2 -1
- package/lib/component/relation-address/relation-address.component.d.ts +2 -2
- package/lib/component/transaction/style/_material-definition.scss +1 -1
- package/lib/component/transaction/transaction.component.d.ts +2 -2
- package/lib/component/transaction-button-bar/style/_layout.scss +6 -3
- package/lib/component/transaction-button-bar/style/_material-definition.scss +4 -3
- package/lib/component/transaction-grid/transaction-base-grid/style/_theme.scss +6 -0
- package/lib/component/transaction-grid/transaction-grid/transaction-grid.component.d.ts +1 -0
- package/lib/component/transaction-grid/transaction-history-grid/style/_layout.scss +8 -0
- package/lib/component/transaction-grid/transaction-history-grid/style/_material-definition.scss +1 -0
- package/lib/component/transaction-grid/transaction-history-grid/transaction-history-grid.component.d.ts +10 -5
- package/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.d.ts +34 -1
- package/lib/component/transaction-header/transaction-header-delivery/style/_layout.scss +5 -0
- package/lib/component/transaction-header/transaction-header-delivery/style/_material-definition.scss +1 -0
- package/lib/component/transaction-header/transaction-header-delivery/style/_theme.scss +8 -0
- package/lib/component/transaction-header/transaction-header-order/style/_layout.scss +5 -0
- package/lib/component/transaction-header/transaction-header-payment/style/_layout.scss +1 -0
- package/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.d.ts +2 -0
- package/lib/component/transaction-history-grid-status/style/_layout.scss +7 -7
- package/lib/component/transaction-history-grid-status/style/_material-definition.scss +8 -0
- package/lib/component/transaction-history-grid-status/transaction-history-grid-status.component.d.ts +2 -0
- package/lib/component/transaction-line/style/_layout.scss +2 -1
- package/lib/component/transaction-line/style/_material-definition.scss +4 -3
- package/lib/component/transaction-line/style/_theme.scss +5 -0
- package/lib/component/transaction-line-side-panel/style/_layout.scss +7 -4
- package/lib/component/transaction-line-side-panel/style/_material-definition.scss +1 -1
- package/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.d.ts +8 -3
- package/lib/component/transaction-line-side-panel-default/style/_layout.scss +3 -0
- package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts +14 -1
- package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts +24 -1
- package/lib/component/transaction-receiving-goods-details/style/_layout.scss +4 -4
- package/lib/component/transaction-receiving-goods-details/style/_material-definition.scss +3 -1
- package/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.d.ts +27 -3
- package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.d.ts +14 -1
- package/lib/component/transaction-search/service/filter-request.service.d.ts +15 -5
- package/lib/component/transaction-search/style/_material-definition.scss +3 -1
- package/lib/component/transaction-search/transaction-filter-content-article/transaction-filter-content-article.component.d.ts +32 -9
- package/lib/component/transaction-search/transaction-filter-content-logistics/style/material.scss +1 -0
- package/lib/component/transaction-search/transaction-filter-content-logistics/transaction-filter-content-logistics.component.d.ts +11 -12
- package/lib/component/transaction-search/transaction-filter-content-order/transaction-filter-content-order.component.d.ts +17 -19
- package/lib/component/transaction-search/transaction-filter-historic-state/style/_layout.scss +9 -0
- package/lib/component/transaction-search/transaction-filter-historic-state/style/_material-definition.scss +0 -0
- package/lib/component/transaction-search/transaction-filter-historic-state/style/_theme.scss +4 -0
- package/lib/component/transaction-search/transaction-filter-historic-state/style/material.scss +4 -0
- package/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.component.d.ts +22 -0
- package/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.module.d.ts +2 -0
- package/lib/component/transaction-search/transaction-search-result/style/_layout.scss +6 -2
- package/lib/component/transaction-search/transaction-search-result/style/_theme.scss +4 -0
- package/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.d.ts +6 -2
- package/lib/component/transaction-search-grid/style/_layout.scss +6 -0
- package/lib/component/transaction-search-grid/style/_material-definition.scss +1 -0
- package/lib/component/transaction-search-grid/style/_theme.scss +6 -0
- package/lib/component/transaction-search-grid/style/material.scss +7 -0
- package/lib/component/transaction-search-grid/transaction-search-grid.component.d.ts +13 -0
- package/lib/component/transaction-search-grid/transaction-search-grid.module.d.ts +2 -0
- package/lib/component/view-mode-buttons/style/_material-definition.scss +1 -1
- package/lib/component/view-mode-buttons/view-mode-buttons.component.d.ts +4 -3
- package/lib/enum/icon.enum.d.ts +3 -0
- package/lib/enum/position-grid-row.enum.d.ts +4 -0
- package/lib/enum/status-type.enum.d.ts +3 -1
- package/lib/model/payment.viewmodel.d.ts +6 -0
- package/lib/model/received-goods-view-model.d.ts +10 -0
- package/lib/service/article-connector.service.d.ts +20 -0
- package/lib/service/article.service.d.ts +6 -0
- package/lib/service/options.service.d.ts +1 -0
- package/lib/service/payment.service.d.ts +9 -0
- package/lib/service/pending-reason.service.d.ts +5 -3
- package/lib/service/shared-connector.service.d.ts +12 -0
- package/lib/service/shared.service.d.ts +13 -0
- package/lib/service/{ione-connector-adapter.service.d.ts → transaction-connector.service.d.ts} +12 -2
- package/lib/service/transaction-event.service.d.ts +65 -0
- package/lib/service/transaction-image.service.d.ts +2 -2
- package/lib/service/transaction.service.d.ts +15 -2
- package/lib/style/_variables.scss +2 -0
- package/lib/style/transaction-globals.scss +2 -0
- package/package.json +3 -3
- package/esm2015/lib/enum/tab-category.enum.js +0 -10
- package/esm2015/lib/service/ione-connector-adapter.service.js +0 -970
- package/lib/enum/tab-category.enum.d.ts +0 -8
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { TransactionService } from "../../service/transaction.service";
|
|
2
2
|
import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
|
|
3
|
+
import { SharedService } from "../../service/shared.service";
|
|
3
4
|
export declare class AvatarComponent {
|
|
4
|
-
private
|
|
5
|
+
private _transactionService;
|
|
6
|
+
private _sharedService;
|
|
5
7
|
set relationId(value: number);
|
|
6
8
|
get relationId(): number;
|
|
7
9
|
relation: RelationListObject;
|
|
8
10
|
showClass(): boolean;
|
|
9
11
|
image: string;
|
|
10
12
|
private _relationId;
|
|
11
|
-
constructor(
|
|
13
|
+
constructor(_transactionService: TransactionService, _sharedService: SharedService);
|
|
12
14
|
private _getRelation;
|
|
13
15
|
}
|
|
@@ -35,13 +35,13 @@
|
|
|
35
35
|
flex-basis: 1px;
|
|
36
36
|
column-gap: $tp-transaction-header-block-content-column-gap;
|
|
37
37
|
.transaction-header-block-content-first {
|
|
38
|
-
min-width: 130px;
|
|
38
|
+
//min-width: 130px;
|
|
39
39
|
}
|
|
40
40
|
.transaction-header-block-content-second {
|
|
41
|
-
min-width: 130px;
|
|
41
|
+
//min-width: 130px;
|
|
42
42
|
}
|
|
43
43
|
.transaction-header-block-content-third {
|
|
44
|
-
min-width: 130px;
|
|
44
|
+
//min-width: 130px;
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
.transaction-header-block-divider {
|
package/lib/component/core/base/components/transaction-header-block/style/_material-definition.scss
CHANGED
|
@@ -4,7 +4,7 @@ $tp-transaction-header-block-label-font-family: $tp-transaction-header-font-fami
|
|
|
4
4
|
$tp-transaction-header-block-label-font-size: $tp-transaction-header-font-size !default;
|
|
5
5
|
$tp-transaction-header-block-label-font-color: $tp-transaction-header-font-color !default;
|
|
6
6
|
$tp-transaction-header-block-label-font-weight: bold !default;
|
|
7
|
-
$tp-transaction-header-block-header-margin: 0
|
|
7
|
+
$tp-transaction-header-block-header-margin: 0 !default;
|
|
8
8
|
$tp-transaction-header-block-header-min-height: 40px !default;
|
|
9
9
|
|
|
10
10
|
$tp-transaction-header-block-content-divider-background: $tp-color-border !default;
|
|
@@ -12,7 +12,7 @@ $tp-transaction-header-block-content-column-gap: 20px !default;
|
|
|
12
12
|
|
|
13
13
|
$tp-transaction-header-block-width: 200px !default;
|
|
14
14
|
$tp-transaction-header-block-margin: 0 !default;
|
|
15
|
-
$tp-transaction-header-block-padding:
|
|
15
|
+
$tp-transaction-header-block-padding: 4px 20px !default;
|
|
16
16
|
$tp-transaction-header-block-border: 1px solid !default;
|
|
17
17
|
$tp-transaction-header-block-border-radius: 10px !default;
|
|
18
18
|
$tp-transaction-header-block-border-color: $tp-color-border !default;
|
|
@@ -8,9 +8,11 @@ export declare abstract class TransactionGridBaseComponent {
|
|
|
8
8
|
readonly icons: typeof Icon;
|
|
9
9
|
readonly align: typeof ColumnAlign;
|
|
10
10
|
set content(columnComponents: QueryList<SimpleGridColumnDirective>);
|
|
11
|
+
transactionId: number;
|
|
11
12
|
set transactionLines(value: TransactionLineInfo[]);
|
|
12
13
|
get transactionLines(): TransactionLineInfo[];
|
|
13
14
|
sidePanelClicked: EventEmitter<TransactionLineInfo>;
|
|
15
|
+
rowVisible: EventEmitter<any>;
|
|
14
16
|
extraColumns: SimpleGridColumnDirective[];
|
|
15
17
|
private _transactionLines;
|
|
16
18
|
constructor(imageService: TransactionImageService);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter, OnInit } from "@angular/core";
|
|
2
|
-
import {
|
|
2
|
+
import { TransactionConnectorService } from "../../../service/transaction-connector.service";
|
|
3
3
|
import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
|
|
4
4
|
export declare class CustomerGroupsComponent implements OnInit {
|
|
5
5
|
private _connector;
|
|
@@ -8,6 +8,6 @@ export declare class CustomerGroupsComponent implements OnInit {
|
|
|
8
8
|
modelChange: EventEmitter<CustomerGroup>;
|
|
9
9
|
customerGroups: CustomerGroup[];
|
|
10
10
|
fields: Object;
|
|
11
|
-
constructor(_connector:
|
|
11
|
+
constructor(_connector: TransactionConnectorService);
|
|
12
12
|
ngOnInit(): Promise<void>;
|
|
13
13
|
}
|
|
@@ -1,18 +1,35 @@
|
|
|
1
1
|
import { OnInit } from "@angular/core";
|
|
2
2
|
import { Icon } from "../../enum/icon.enum";
|
|
3
3
|
import { TransactionService } from "../../service/transaction.service";
|
|
4
|
+
import { PaymentService } from "../../service/payment.service";
|
|
5
|
+
import { SharedService } from "../../service/shared.service";
|
|
6
|
+
import { PaymentMethod } from "@colijnit/transactionapi/build/model/payment-method.bo";
|
|
7
|
+
import { PaymentViewmodel } from "../../model/payment.viewmodel";
|
|
4
8
|
export declare class PaymentComponent implements OnInit {
|
|
5
9
|
private _transactionService;
|
|
10
|
+
private _sharedService;
|
|
11
|
+
private _paymentService;
|
|
6
12
|
readonly icons: typeof Icon;
|
|
13
|
+
transactionUuid: string;
|
|
7
14
|
amount: number;
|
|
15
|
+
currencyCode: number;
|
|
8
16
|
showClass(): boolean;
|
|
9
17
|
paymentMethodIdx: number;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
description: string;
|
|
13
|
-
}[];
|
|
18
|
+
cashRegisterIdx: number;
|
|
19
|
+
paymentMethods: PaymentViewmodel[];
|
|
14
20
|
cashRegisters: any[];
|
|
15
|
-
|
|
21
|
+
showCashRegisters: boolean;
|
|
22
|
+
showKeyPad: boolean;
|
|
23
|
+
constructor(_transactionService: TransactionService, _sharedService: SharedService, _paymentService: PaymentService);
|
|
16
24
|
ngOnInit(): void;
|
|
25
|
+
paymentMethodSelected(method: PaymentMethod, index: number): void;
|
|
26
|
+
handlePayment(): void;
|
|
27
|
+
handleKeyPadModelChange(model: number): void;
|
|
28
|
+
/**
|
|
29
|
+
*
|
|
30
|
+
* @private
|
|
31
|
+
*/
|
|
32
|
+
private _prepareCashRegisters;
|
|
17
33
|
private _getCashRegisters;
|
|
34
|
+
private _getPaymentMethods;
|
|
18
35
|
}
|
|
@@ -33,11 +33,20 @@
|
|
|
33
33
|
column-gap: 5px;
|
|
34
34
|
flex-wrap: wrap;
|
|
35
35
|
}
|
|
36
|
+
.payment-to-pay-wrapper {
|
|
37
|
+
display: grid;
|
|
38
|
+
grid-template-columns: 50% 50%;
|
|
39
|
+
grid-template-rows: auto auto;
|
|
40
|
+
row-gap: 10px;
|
|
41
|
+
column-gap: 10px;
|
|
42
|
+
}
|
|
36
43
|
.payment-to-pay {
|
|
37
44
|
display: flex;
|
|
38
45
|
flex-direction: column;
|
|
39
46
|
align-items: flex-start;
|
|
40
47
|
row-gap: $tp-payment-row-gap;
|
|
48
|
+
grid-column: 1 / 1;
|
|
49
|
+
grid-row: 1 / 1;
|
|
41
50
|
}
|
|
42
51
|
.payment-amount {
|
|
43
52
|
display: flex;
|
|
@@ -47,8 +56,21 @@
|
|
|
47
56
|
font-family: $tp-payment-amount-font-family;
|
|
48
57
|
font-size: $tp-payment-amount-font-size;
|
|
49
58
|
font-weight: $tp-payment-amount-font-weight;
|
|
50
|
-
padding: $tp-payment-amount-padding;
|
|
51
59
|
border-radius: 5px;
|
|
60
|
+
height: 100%;
|
|
61
|
+
width: 100%;
|
|
62
|
+
}
|
|
63
|
+
.payment-to-pay-button {
|
|
64
|
+
grid-column: 1 / 1;
|
|
65
|
+
grid-row: 2 / 2;
|
|
66
|
+
.co-button {
|
|
67
|
+
justify-content: center;
|
|
68
|
+
border-radius: 5px;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
.payment-to-pay-keypad {
|
|
72
|
+
grid-column: 2 / 2;
|
|
73
|
+
grid-row: 1 / 3;
|
|
52
74
|
}
|
|
53
75
|
}
|
|
54
76
|
}
|
|
@@ -10,7 +10,6 @@ $tp-payment-row-gap: 20px !default;
|
|
|
10
10
|
$tp-payment-amount-font-family: $tp-font-family !default;
|
|
11
11
|
$tp-payment-amount-font-size: 32px !default;
|
|
12
12
|
$tp-payment-amount-font-weight: bold !default;
|
|
13
|
-
$tp-payment-amount-padding: 25px 90px !default;
|
|
14
13
|
$tp-payment-amount-color: rgba(0, 0, 0, 0.5) !default;
|
|
15
14
|
$tp-payment-amount-border: 1px solid !default;
|
|
16
15
|
$tp-payment-amount-border-color: $tp-color-border !default;
|
|
@@ -12,5 +12,29 @@
|
|
|
12
12
|
border-color: $tp-payment-amount-border-color;
|
|
13
13
|
background-color: $tp-payment-amount-background-color;
|
|
14
14
|
}
|
|
15
|
+
.payment-to-pay-button {
|
|
16
|
+
.co-button {
|
|
17
|
+
background-color: $tp-color-colijn-orange;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
.payment-to-pay-keypad {
|
|
21
|
+
.key-pad-wrapper {
|
|
22
|
+
background: transparent;
|
|
23
|
+
border-color: $tp-payment-amount-border-color;
|
|
24
|
+
}
|
|
25
|
+
.key-pad-button {
|
|
26
|
+
background-color: $tp-payment-amount-background-color;
|
|
27
|
+
color: $tp-payment-amount-color;
|
|
28
|
+
font-weight: bold;
|
|
29
|
+
.co-icon {
|
|
30
|
+
svg { // for fontawesome icons
|
|
31
|
+
fill: $tp-payment-amount-color;
|
|
32
|
+
}
|
|
33
|
+
& [fill] { // for own icons
|
|
34
|
+
fill: $tp-payment-amount-color;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
15
39
|
}
|
|
16
40
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter, OnInit } from "@angular/core";
|
|
2
2
|
import { Address } from "@colijnit/transactionapi/build/model/address.bo";
|
|
3
3
|
import { Country } from "@colijnit/transactionapi/build/model/country.bo";
|
|
4
|
-
import {
|
|
4
|
+
import { TransactionConnectorService } from "../../service/transaction-connector.service";
|
|
5
5
|
import { DictionaryService } from "../../service/dictionary.service";
|
|
6
6
|
import { FormMasterService } from "@colijnit/corecomponents_v12";
|
|
7
7
|
export declare class RelationAddressComponent implements OnInit {
|
|
@@ -16,7 +16,7 @@ export declare class RelationAddressComponent implements OnInit {
|
|
|
16
16
|
showClass(): boolean;
|
|
17
17
|
countries: Country[];
|
|
18
18
|
fields: Object;
|
|
19
|
-
constructor(_dictionary: DictionaryService, _connector:
|
|
19
|
+
constructor(_dictionary: DictionaryService, _connector: TransactionConnectorService, _formMasterService: FormMasterService);
|
|
20
20
|
postalCodeCheckErrorMessage: string;
|
|
21
21
|
private _prevPostalCodeForCheck;
|
|
22
22
|
private _prevHouseNoForCheck;
|
|
@@ -5,7 +5,6 @@ import { ContentViewMode } from "../../enum/content-view-mode.enum";
|
|
|
5
5
|
import { Icon } from "../../enum/icon.enum";
|
|
6
6
|
import { IconCacheService } from "../../service/icon-cache.service";
|
|
7
7
|
import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
|
|
8
|
-
import { TabCategory } from "../../enum/tab-category.enum";
|
|
9
8
|
import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
|
|
10
9
|
import { TransactionBarButton } from "../../model/transaction-bar-button";
|
|
11
10
|
import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
|
|
@@ -13,11 +12,11 @@ export declare class TransactionComponent implements OnDestroy {
|
|
|
13
12
|
iconCacheService: IconCacheService;
|
|
14
13
|
private _service;
|
|
15
14
|
readonly viewModes: typeof ContentViewMode;
|
|
16
|
-
readonly tabCategory: typeof TabCategory;
|
|
17
15
|
readonly icons: typeof Icon;
|
|
18
16
|
set transaction(value: TransactionInfoResponse);
|
|
19
17
|
get transaction(): TransactionInfoResponse;
|
|
20
18
|
set transactionId(value: number);
|
|
19
|
+
get transactionId(): number;
|
|
21
20
|
showHeader: boolean;
|
|
22
21
|
showQuickAccess: boolean;
|
|
23
22
|
showButtonBar: boolean;
|
|
@@ -29,6 +28,7 @@ export declare class TransactionComponent implements OnDestroy {
|
|
|
29
28
|
sidePanelTransactionLine: TransactionLineInfo;
|
|
30
29
|
private _subs;
|
|
31
30
|
private _transaction;
|
|
31
|
+
private _transactionId;
|
|
32
32
|
constructor(iconCacheService: IconCacheService, _service: TransactionService);
|
|
33
33
|
ngOnDestroy(): void;
|
|
34
34
|
addDiscount(): void;
|
|
@@ -6,13 +6,15 @@
|
|
|
6
6
|
font-size: $tp-co-transaction-button-bar-font-size;
|
|
7
7
|
.button-bar-wrapper {
|
|
8
8
|
display: flex;
|
|
9
|
-
|
|
9
|
+
justify-content: center;
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
.custom-button-wrapper {
|
|
13
13
|
padding: 2px;
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
.co-transaction-button-bar-button {
|
|
16
|
+
flex: 1;
|
|
17
|
+
}
|
|
16
18
|
.button-wrapper {
|
|
17
19
|
//height: $tp-co-transaction-button-bar-button-size;
|
|
18
20
|
//min-width: $tp-co-transaction-button-bar-button-size;
|
|
@@ -25,7 +27,8 @@
|
|
|
25
27
|
justify-content: center;
|
|
26
28
|
cursor: pointer;
|
|
27
29
|
.button-title {
|
|
28
|
-
|
|
30
|
+
font-size: $tp-co-transaction-button-bar-label-font-size;
|
|
31
|
+
//padding: 0 7px 4px 7px;
|
|
29
32
|
}
|
|
30
33
|
.co-transaction-button-bar-icon {
|
|
31
34
|
height: $tp-co-transaction-button-bar-icon-size;
|
|
@@ -3,9 +3,10 @@ $tp-co-transaction-button-bar-font-size: $tp-font-size !default;
|
|
|
3
3
|
$tp-co-transaction-button-bar-button-size: 65px !default;
|
|
4
4
|
$tp-co-transaction-button-bar-button-background-color: white !default;
|
|
5
5
|
$tp-co-transaction-button-bar-button-border-radius: 10px !default;
|
|
6
|
-
$tp-co-transaction-button-bar-button-padding:
|
|
6
|
+
$tp-co-transaction-button-bar-button-padding: 5px !default;
|
|
7
7
|
$tp-co-transaction-button-bar-button-selected-box-shadow: 0 0 0 1px $tp-color-action inset !default;
|
|
8
8
|
$tp-co-transaction-button-bar-button-selected-box-border: 2px solid $tp-color-action !default;
|
|
9
9
|
$tp-co-transaction-button-bar-icon-color: $tp-color-font !default;
|
|
10
|
-
$tp-co-transaction-button-bar-icon-size:
|
|
11
|
-
$tp-co-transaction-button-bar-icon-margin: 0 0
|
|
10
|
+
$tp-co-transaction-button-bar-icon-size: 20px !default;
|
|
11
|
+
$tp-co-transaction-button-bar-icon-margin: 0 0 5px 0 !default;
|
|
12
|
+
$tp-co-transaction-button-bar-label-font-size: $tp-font-size-small !default;
|
|
@@ -13,6 +13,7 @@ export declare class TransactionGridComponent {
|
|
|
13
13
|
get transactionType(): TransactionKind;
|
|
14
14
|
set activeCategory(value: TransactionTypeCategory);
|
|
15
15
|
get activeCategory(): TransactionTypeCategory;
|
|
16
|
+
transactionId: number;
|
|
16
17
|
transactionLines: TransactionLineInfo[];
|
|
17
18
|
sidePanelClicked: EventEmitter<TransactionLineInfo>;
|
|
18
19
|
showClass(): boolean;
|
|
@@ -3,5 +3,13 @@
|
|
|
3
3
|
@include export-module('co-transaction-history-grid-layout') {
|
|
4
4
|
.co-transaction-history-grid {
|
|
5
5
|
|
|
6
|
+
.history-grid-wrapper {
|
|
7
|
+
padding: $tp-co-transaction-history-grid-padding;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
.delete-button-wrapper {
|
|
11
|
+
display: flex;
|
|
12
|
+
justify-content: flex-end;
|
|
13
|
+
}
|
|
6
14
|
}
|
|
7
15
|
}
|
package/lib/component/transaction-grid/transaction-history-grid/style/_material-definition.scss
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
$tp-co-transaction-history-grid-padding: 0 !default;
|
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
import { QueryList } from "@angular/core";
|
|
2
|
-
import { TabCategory } from "../../../enum/tab-category.enum";
|
|
3
|
-
import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
|
|
1
|
+
import { EventEmitter, QueryList } from "@angular/core";
|
|
4
2
|
import { SimpleGridColumnDirective } from "@colijnit/corecomponents_v12";
|
|
5
3
|
import { StatusType } from "../../../enum/status-type.enum";
|
|
4
|
+
import { Icon } from "../../../enum/icon.enum";
|
|
5
|
+
import { IconCacheService } from "../../../service/icon-cache.service";
|
|
6
6
|
export declare class TransactionHistoryGridComponent {
|
|
7
|
-
|
|
7
|
+
iconsService: IconCacheService;
|
|
8
8
|
readonly statusType: typeof StatusType;
|
|
9
|
+
readonly icons: typeof Icon;
|
|
9
10
|
set content(columnComponents: QueryList<SimpleGridColumnDirective>);
|
|
10
|
-
|
|
11
|
+
collection: any;
|
|
12
|
+
deleteSelectedRow: EventEmitter<any>;
|
|
11
13
|
showClass(): boolean;
|
|
12
14
|
extraColumns: SimpleGridColumnDirective[];
|
|
15
|
+
selectedRow: any;
|
|
16
|
+
constructor(iconsService: IconCacheService);
|
|
13
17
|
handleSelectRow(row: any): void;
|
|
18
|
+
handleDeleteClick(): void;
|
|
14
19
|
}
|
|
@@ -1,4 +1,37 @@
|
|
|
1
|
+
import { OnDestroy, OnInit } from "@angular/core";
|
|
1
2
|
import { TransactionGridBaseComponent } from "../../core/base/transaction-grid-base.component";
|
|
2
|
-
|
|
3
|
+
import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
|
|
4
|
+
import { ReceiveGoodsViewModel } from "../../../model/received-goods-view-model";
|
|
5
|
+
import { TransactionImageService } from "../../../service/transaction-image.service";
|
|
6
|
+
import { TransactionService } from "../../../service/transaction.service";
|
|
7
|
+
import { ArticleService } from "../../../service/article.service";
|
|
8
|
+
import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
|
|
9
|
+
import { TransactionEventService } from "../../../service/transaction-event.service";
|
|
10
|
+
export declare class TransactionReceivedGoodsGridComponent extends TransactionGridBaseComponent implements OnInit, OnDestroy {
|
|
11
|
+
private _imageService;
|
|
12
|
+
private _transactionService;
|
|
13
|
+
private _transactionEventService;
|
|
14
|
+
private _articleService;
|
|
3
15
|
showClass(): boolean;
|
|
16
|
+
locations: string[];
|
|
17
|
+
locationDropdownFields: {};
|
|
18
|
+
rowViewModels: Map<TransactionLineInfo, ReceiveGoodsViewModel>;
|
|
19
|
+
private _subscriptions;
|
|
20
|
+
constructor(_imageService: TransactionImageService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _articleService: ArticleService);
|
|
21
|
+
ngOnInit(): void;
|
|
22
|
+
ngOnDestroy(): void;
|
|
23
|
+
handleRowVisible(row: any): Promise<void>;
|
|
24
|
+
locationRequired(row: TransactionLineInfo): boolean;
|
|
25
|
+
handleDropDownSelected(warehouseNr: number): Promise<void>;
|
|
26
|
+
getRowViewModel(row: TransactionLineInfo): ReceiveGoodsViewModel;
|
|
27
|
+
handleReceiveSelectedPurchaseOrders(value: {
|
|
28
|
+
checkboxValue: boolean;
|
|
29
|
+
date: Date;
|
|
30
|
+
id: string;
|
|
31
|
+
}): Promise<void>;
|
|
32
|
+
private _handleAfterCommitReceivedOrders;
|
|
33
|
+
handleTransactionLineChanged(change: {
|
|
34
|
+
transactionLine: TransactionLineInfo;
|
|
35
|
+
goodsReceiptStatus: GoodsReceiptStatusWithHistory;
|
|
36
|
+
}): void;
|
|
4
37
|
}
|
package/lib/component/transaction-header/transaction-header-delivery/style/_material-definition.scss
CHANGED
|
@@ -4,3 +4,4 @@ $tp-transaction-header-delivery-planning-request-button-border: 1px solid !defau
|
|
|
4
4
|
$tp-transaction-header-delivery-planning-request-button-border-color: $tp-color-border !default;
|
|
5
5
|
$tp-transaction-header-delivery-planning-request-button-border-radius: 5px !default;
|
|
6
6
|
$tp-transaction-header-delivery-definitive-button-color: $tp-color-active-light !default;
|
|
7
|
+
$tp-transaction-header-delivery-delivery-truck-color: $tp-color-font !default;
|
|
@@ -13,5 +13,13 @@
|
|
|
13
13
|
fill: $tp-transaction-header-delivery-definitive-button-color;
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
+
.header-delivery-truck-icon {
|
|
17
|
+
svg { // for fontawesome icons
|
|
18
|
+
fill: $tp-transaction-header-delivery-delivery-truck-color;
|
|
19
|
+
}
|
|
20
|
+
& [fill] { // for own icons
|
|
21
|
+
fill: $tp-transaction-header-delivery-delivery-truck-color;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
16
24
|
}
|
|
17
25
|
}
|
|
@@ -4,25 +4,25 @@
|
|
|
4
4
|
.co-transaction-history-grid-status {
|
|
5
5
|
.transaction-status-indication {
|
|
6
6
|
display: flex;
|
|
7
|
-
width:
|
|
7
|
+
width: $tp-co-transaction-history-grid-status-button-width;
|
|
8
8
|
border-radius: 22px;
|
|
9
|
-
height:
|
|
10
|
-
background:
|
|
11
|
-
border:
|
|
9
|
+
height: $tp-co-transaction-history-grid-status-button-height;
|
|
10
|
+
background: $tp-co-transaction-history-grid-status-button-background;
|
|
11
|
+
border: $tp-co-transaction-history-grid-status-button-border;
|
|
12
12
|
align-items: center;
|
|
13
13
|
justify-content: center;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
.status-color-circle {
|
|
17
|
-
height:
|
|
18
|
-
width:
|
|
17
|
+
height: $tp-co-transaction-history-grid-status-circle-height;
|
|
18
|
+
width: $tp-co-transaction-history-grid-status-circle-width;
|
|
19
19
|
border-radius: 6px;
|
|
20
20
|
background: #dce4ea;
|
|
21
21
|
margin-right: 10px;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
.status-text {
|
|
25
|
-
|
|
25
|
+
font-family: $tp-co-transaction-history-grid-status-button-font-family;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
$tp-co-transaction-history-grid-status-button-font-family: $tp-font-family !default;
|
|
2
|
+
$tp-co-transaction-history-grid-status-button-width: 130px !default;
|
|
3
|
+
$tp-co-transaction-history-grid-status-button-height: 44px !default;
|
|
4
|
+
$tp-co-transaction-history-grid-status-button-background: white !default;
|
|
5
|
+
$tp-co-transaction-history-grid-status-button-border: 1px solid #dce4ea !default;
|
|
6
|
+
|
|
7
|
+
$tp-co-transaction-history-grid-status-circle-width: 12px !default;
|
|
8
|
+
$tp-co-transaction-history-grid-status-circle-height: 12px !default;
|
package/lib/component/transaction-history-grid-status/transaction-history-grid-status.component.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { AfterViewInit, ElementRef } from "@angular/core";
|
|
2
2
|
import { StatusType } from "../../enum/status-type.enum";
|
|
3
3
|
export declare class TransactionHistoryGridStatusComponent implements AfterViewInit {
|
|
4
|
+
readonly type: typeof StatusType;
|
|
4
5
|
statusType: StatusType;
|
|
6
|
+
subType: string;
|
|
5
7
|
statusIndicator: ElementRef;
|
|
6
8
|
showClass(): boolean;
|
|
7
9
|
private _getStatusIndicatorColor;
|
|
@@ -94,6 +94,8 @@
|
|
|
94
94
|
flex-shrink: 0;
|
|
95
95
|
height: $tp-transaction-line-amount-height;
|
|
96
96
|
padding: $tp-transaction-line-inner-padding;
|
|
97
|
+
width: 100px;
|
|
98
|
+
justify-content: flex-end;
|
|
97
99
|
}
|
|
98
100
|
.transaction-line-buttons {
|
|
99
101
|
display: flex;
|
|
@@ -170,7 +172,6 @@
|
|
|
170
172
|
font-family: $tp-transaction-line-font-family;
|
|
171
173
|
font-size: $tp-transaction-line-article-text-font-size;
|
|
172
174
|
padding: $tp-transaction-line-article-text-padding;
|
|
173
|
-
background-color: $tp-transaction-line-background-color;
|
|
174
175
|
}
|
|
175
176
|
//.cdk-drop-list-dragging .drag-drop-list:not(.cdk-drag-placeholder) {
|
|
176
177
|
// transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
|
|
@@ -11,9 +11,9 @@ $tp-transaction-line-border-color: $tp-color-action !default;
|
|
|
11
11
|
$tp-transaction-line-image-border: 1px solid $tp-color-border !default;
|
|
12
12
|
$tp-transaction-line-column-gap: 15px !default;
|
|
13
13
|
$tp-transaction-line-row-gap: 15px !default;
|
|
14
|
-
$tp-transaction-line-image-width:
|
|
14
|
+
$tp-transaction-line-image-width: 67px !default;
|
|
15
15
|
$tp-transaction-line-preview-image-width: 75px !default;
|
|
16
|
-
$tp-transaction-line-image-height:
|
|
16
|
+
$tp-transaction-line-image-height: 50px !default;
|
|
17
17
|
$tp-transaction-line-preview-image-height: 50px !default;
|
|
18
18
|
$tp-transaction-line-amount-height: 50px !default;
|
|
19
19
|
$tp-transaction-line-amount-input-width: 50px !default;
|
|
@@ -25,5 +25,6 @@ $tp-transaction-line-buttons-overview-background-color: $tp-color-active-light !
|
|
|
25
25
|
$tp-transaction-line-buttons-overview-text-color: $tp-color-light !default;
|
|
26
26
|
$tp-transaction-line-buttons-add-text-background-color: $tp-color-action !default;
|
|
27
27
|
$tp-transaction-line-buttons-add-text-text-color: $tp-color-light !default;
|
|
28
|
-
$tp-transaction-line-article-text-font-size: $tp-font-size
|
|
28
|
+
$tp-transaction-line-article-text-font-size: $tp-font-size !default;
|
|
29
|
+
$tp-transaction-line-article-text-font-color: $tp-color-label !default;
|
|
29
30
|
$tp-transaction-line-article-text-padding: 2px !default;
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
.co-transaction-line {
|
|
5
5
|
background-color: $tp-transaction-line-background-color;
|
|
6
6
|
border-color: $tp-transaction-line-border-color;
|
|
7
|
+
color: $tp-color-font;
|
|
7
8
|
.transaction-line-image {
|
|
8
9
|
border: $tp-transaction-line-image-border;
|
|
9
10
|
}
|
|
@@ -37,5 +38,9 @@
|
|
|
37
38
|
fill: $tp-transaction-line-buttons-add-text-text-color;
|
|
38
39
|
}
|
|
39
40
|
}
|
|
41
|
+
.article-text {
|
|
42
|
+
color: $tp-transaction-line-article-text-font-color;
|
|
43
|
+
background-color: $tp-transaction-line-background-color;
|
|
44
|
+
}
|
|
40
45
|
}
|
|
41
46
|
}
|
|
@@ -35,10 +35,12 @@
|
|
|
35
35
|
width: 1px;
|
|
36
36
|
margin: 5px;
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
}
|
|
39
|
+
.close-button {
|
|
40
|
+
display: flex;
|
|
41
|
+
align-self: flex-end;
|
|
42
|
+
width: 25px;
|
|
43
|
+
height: 25px;
|
|
42
44
|
}
|
|
43
45
|
.transaction-line-side-panel-nav-bar {
|
|
44
46
|
display: flex;
|
|
@@ -50,6 +52,7 @@
|
|
|
50
52
|
flex-direction: column;
|
|
51
53
|
flex-basis: 100%;
|
|
52
54
|
overflow-y: auto;
|
|
55
|
+
overflow-x: hidden;
|
|
53
56
|
}
|
|
54
57
|
.save-cancel-wrapper {
|
|
55
58
|
display: flex;
|
|
@@ -2,7 +2,7 @@ $tp-transaction-line-side-panel-font-family: $tp-font-family !default;
|
|
|
2
2
|
$tp-transaction-line-side-panel-font-size: $tp-font-size !default;
|
|
3
3
|
$tp-transaction-line-side-panel-top: 0 !default;
|
|
4
4
|
$tp-transaction-line-side-panel-height: 100% !default;
|
|
5
|
-
$tp-transaction-line-side-panel-width:
|
|
5
|
+
$tp-transaction-line-side-panel-width: 450px !default;
|
|
6
6
|
$tp-transaction-line-side-panel-box-shadow: -3px 0px 16px 1px rgb(0, 0, 0, 0.2) !default;
|
|
7
7
|
$tp-transaction-line-side-panel-padding: 10px !default;
|
|
8
8
|
$tp-transaction-line-side-panel-header-label-font-family: $tp-font-family !default;
|