@colijnit/transaction 256.1.12 → 256.1.14
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 +215 -64
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/add-product/add-product.component.js +52 -33
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.js +30 -27
- package/esm2015/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.js +73 -64
- package/esm2015/lib/component/purchase-confirmation-lines/purchase-confirmation-lines.component.js +37 -33
- package/esm2015/lib/component/purchase-confirmation-lines/purchase-confirmation-lines.module.js +4 -3
- package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.js +16 -5
- package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse.component.js +6 -6
- package/esm2015/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.js +19 -3
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-purchase-reservation-order-tile/transaction-purchase-reservation-order-tile.component.js +2 -2
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-pos-order-tile/transaction-search-pos-order-tile.component.js +64 -63
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-purchase-order-tile/transaction-search-purchase-order-tile.component.js +24 -22
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-order-tile/transaction-search-sales-order-tile.component.js +27 -29
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-quotation-tile/transaction-search-sales-quotation-tile.component.js +23 -19
- package/esm2015/lib/component/transaction-search/transaction-shipping-method-dialog/transaction-shipping-method-dialog.component.js +33 -4
- package/esm2015/lib/enum/icon.enum.js +3 -1
- package/esm2015/lib/model/icon-svg.js +3 -1
- package/esm2015/lib/service/pending-reason.service.js +2 -1
- package/esm2015/lib/service/transaction-base.service.js +4 -1
- package/esm2015/lib/service/transaction-event.service.js +2 -1
- package/esm2015/lib/service/transaction.service.js +11 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +416 -302
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/add-product/add-product.component.d.ts +9 -3
- package/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.d.ts +1 -0
- package/lib/component/purchase-confirmation-lines/style/_layout.scss +70 -25
- package/lib/component/purchase-confirmation-lines/style/_material-definition.scss +21 -1
- package/lib/component/service-wizard-qa/question-answer-item/style/_material-definition.scss +1 -1
- package/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.d.ts +4 -1
- package/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.d.ts +3 -1
- package/lib/component/transaction-search/transaction-search-tile/transaction-search-tile/style/_layout.scss +90 -46
- package/lib/component/transaction-search/transaction-search-tile/transaction-search-tile/style/_material-definition.scss +8 -6
- package/lib/component/transaction-search/transaction-search-tile/transaction-search-tile/style/_theme.scss +6 -2
- package/lib/component/transaction-search/transaction-shipping-method-dialog/transaction-shipping-method-dialog.component.d.ts +4 -1
- package/lib/enum/icon.enum.d.ts +2 -0
- package/lib/service/transaction-event.service.d.ts +1 -0
- package/lib/service/transaction.service.d.ts +1 -0
- package/package.json +3 -3
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { ChangeDetectorRef, EventEmitter } from '@angular/core';
|
|
1
|
+
import { ChangeDetectorRef, EventEmitter, OnInit } from '@angular/core';
|
|
2
2
|
import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
|
|
3
3
|
import { Icon } from '../../enum/icon.enum';
|
|
4
4
|
import { IconCacheService } from '../../service/icon-cache.service';
|
|
5
5
|
import { TransactionService } from '../../service/transaction.service';
|
|
6
6
|
import { SafeHtml } from '@angular/platform-browser';
|
|
7
7
|
import { InputScannerComponent } from '@colijnit/corecomponents_v12';
|
|
8
|
+
import { TransactionEventService } from "../../service/transaction-event.service";
|
|
8
9
|
export interface AddArticleInterface {
|
|
9
10
|
article: ArticleExtended;
|
|
10
11
|
quantity: number;
|
|
@@ -12,9 +13,10 @@ export interface AddArticleInterface {
|
|
|
12
13
|
belowLineNr: number;
|
|
13
14
|
lastArticle: boolean;
|
|
14
15
|
}
|
|
15
|
-
export declare class AddProductComponent {
|
|
16
|
+
export declare class AddProductComponent implements OnInit {
|
|
16
17
|
iconService: IconCacheService;
|
|
17
18
|
transactionService: TransactionService;
|
|
19
|
+
transactionEventService: TransactionEventService;
|
|
18
20
|
private _changeDetector;
|
|
19
21
|
readonly icons: typeof Icon;
|
|
20
22
|
handleAddArticleInternally: boolean;
|
|
@@ -26,12 +28,16 @@ export declare class AddProductComponent {
|
|
|
26
28
|
catalogParameters: any;
|
|
27
29
|
isSearchInputFocused: boolean;
|
|
28
30
|
searchText: string;
|
|
31
|
+
showRelatedProductsPopup: boolean;
|
|
29
32
|
cartPlusIcon: SafeHtml;
|
|
30
33
|
cartMinIcon: SafeHtml;
|
|
31
34
|
set showCatalog(value: boolean);
|
|
32
35
|
get showCatalog(): boolean;
|
|
33
36
|
private _showCatalog;
|
|
34
|
-
|
|
37
|
+
private _subs;
|
|
38
|
+
constructor(iconService: IconCacheService, transactionService: TransactionService, transactionEventService: TransactionEventService, _changeDetector: ChangeDetectorRef);
|
|
39
|
+
ngOnInit(): void;
|
|
40
|
+
ngOnDestroy(): void;
|
|
35
41
|
handleSearch(text: string): Promise<void>;
|
|
36
42
|
handleInputFocus(isFocused: boolean): void;
|
|
37
43
|
handleAddArticle(article: ArticleExtended): Promise<void>;
|
|
@@ -33,6 +33,7 @@ export declare class DialogCatalogComponent implements OnInit, OnDestroy {
|
|
|
33
33
|
returnArticleOnTileClick: boolean;
|
|
34
34
|
transaction: TransactionInfoResponse;
|
|
35
35
|
isReturn: boolean;
|
|
36
|
+
showRelatedProductsPopup: boolean;
|
|
36
37
|
closeClick: EventEmitter<MouseEvent>;
|
|
37
38
|
articleClicked: EventEmitter<ArticleExtended>;
|
|
38
39
|
iFrameFeedback: EventEmitter<{
|
|
@@ -46,19 +46,18 @@
|
|
|
46
46
|
.purchase-confirmation-lines-drag-drop-list.cdk-drop-list-dragging .draggable-confirmation-line:not(.cdk-drag-placeholder) {
|
|
47
47
|
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
|
|
48
48
|
}
|
|
49
|
+
.purchase-confirmation-lines-drag-drop-list {
|
|
50
|
+
padding: 30px 15px;
|
|
51
|
+
background: #FFF;
|
|
52
|
+
border-radius: 5px;
|
|
53
|
+
}
|
|
49
54
|
.purchase-confirmation-table {
|
|
50
55
|
width: 100%;
|
|
51
56
|
border-collapse: collapse;
|
|
52
57
|
text-align: left;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
.right-align {
|
|
59
|
-
text-align: end;
|
|
60
|
-
white-space: nowrap;
|
|
61
|
-
}
|
|
58
|
+
display: flex;
|
|
59
|
+
flex-direction: column;
|
|
60
|
+
gap: 10px;
|
|
62
61
|
}
|
|
63
62
|
.purchase-confirmation-line-drag-handle.co-icon {
|
|
64
63
|
cursor: grab;
|
|
@@ -68,27 +67,73 @@
|
|
|
68
67
|
.draggable-purchase-confirmation-line {
|
|
69
68
|
font-family: $tp-co-purchase-confirmation-font-family;
|
|
70
69
|
font-size: $tp-co-purchase-confirmation-font-size;
|
|
71
|
-
//display: flex;
|
|
72
|
-
//align-items: center;
|
|
73
70
|
height: $tp-co-purchase-confirmation-height;
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
// minmax(auto, $tp-co-purchase-confirmation-quantity-width)
|
|
81
|
-
// minmax(auto, $tp-co-purchase-confirmation-article-nr-width)
|
|
82
|
-
// minmax(auto, $tp-co-purchase-confirmation-description-width)
|
|
83
|
-
// minmax(auto, $tp-co-purchase-confirmation-date-width)
|
|
84
|
-
// minmax(auto, $tp-co-purchase-confirmation-price-width)
|
|
85
|
-
// minmax(auto, $tp-co-purchase-confirmation-link-button-width);
|
|
86
|
-
// grid-column-gap: $tp-co-purchase-confirmation-column-gap;
|
|
87
|
-
//}
|
|
71
|
+
border-width: $tp-co-draggable-purchase-confirmation-border-width;
|
|
72
|
+
border-style: solid;
|
|
73
|
+
border-color: $tp-co-draggable-purchase-confirmation-border-color;
|
|
74
|
+
border-radius: $tp-co-draggable-purchase-confirmation-border-radius;
|
|
75
|
+
padding: $tp-co-draggable-purchase-confirmation-padding;
|
|
76
|
+
position: relative;
|
|
88
77
|
.link-button {
|
|
89
78
|
cursor: pointer;
|
|
90
79
|
text-align: center;
|
|
91
80
|
vertical-align: middle;
|
|
81
|
+
position: absolute;
|
|
82
|
+
right: $tp-co-draggable-purchase-confirmation-link-right;
|
|
83
|
+
top: $tp-co-draggable-purchase-confirmation-link-top;
|
|
84
|
+
co-button {
|
|
85
|
+
width: $tp-co-draggable-purchase-confirmation-link-icon-size;
|
|
86
|
+
height: $tp-co-draggable-purchase-confirmation-link-icon-size;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
.draggable-color-drag {
|
|
90
|
+
position: absolute;
|
|
91
|
+
left: $tp-co-draggable-purchase-confirmation-color-right;
|
|
92
|
+
height: 100%;
|
|
93
|
+
top: $tp-co-draggable-purchase-confirmation-color-top;
|
|
94
|
+
display: flex;
|
|
95
|
+
align-items: center;
|
|
96
|
+
.color-drag {
|
|
97
|
+
height: 100%;
|
|
98
|
+
width: $tp-co-draggable-purchase-confirmation-color-width;
|
|
99
|
+
border-radius: $tp-co-draggable-purchase-confirmation-color-border-radius;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
.draggable-content-line {
|
|
103
|
+
display: flex;
|
|
104
|
+
flex-direction: column;
|
|
105
|
+
justify-content: space-between;
|
|
106
|
+
height: 100%;
|
|
107
|
+
}
|
|
108
|
+
.draggable-description {
|
|
109
|
+
font-size: $tp-co-draggable-purchase-confirmation-description-font-size;
|
|
110
|
+
height: $tp-co-draggable-purchase-confirmation-description-height;
|
|
111
|
+
line-height: $tp-co-draggable-purchase-confirmation-description-height;
|
|
112
|
+
display: -webkit-box;
|
|
113
|
+
-webkit-line-clamp: 1;
|
|
114
|
+
-webkit-box-orient: vertical;
|
|
115
|
+
overflow: hidden;
|
|
116
|
+
text-overflow: ellipsis;
|
|
117
|
+
padding: $tp-co-draggable-purchase-confirmation-description-padding;
|
|
118
|
+
}
|
|
119
|
+
.draggable-top-line {
|
|
120
|
+
display: flex;
|
|
121
|
+
flex-direction: column;
|
|
122
|
+
gap: $tp-co-draggable-purchase-confirmation-top-line-gap;
|
|
123
|
+
}
|
|
124
|
+
.draggable-bottom-line {
|
|
125
|
+
display: flex;
|
|
126
|
+
justify-content: space-between;
|
|
127
|
+
> div {
|
|
128
|
+
display: flex;
|
|
129
|
+
flex-direction: column;
|
|
130
|
+
align-items: center;
|
|
131
|
+
gap: $tp-co-draggable-purchase-confirmation-bottom-line-gap;
|
|
132
|
+
}
|
|
133
|
+
label {
|
|
134
|
+
font-size: $tp-co-draggable-purchase-confirmation-bottom-label-font-size;
|
|
135
|
+
color: $tp-co-draggable-purchase-confirmation-bottom-label-font-color;
|
|
136
|
+
}
|
|
92
137
|
}
|
|
93
138
|
}
|
|
94
139
|
|
|
@@ -7,7 +7,7 @@ $tp-co-purchase-confirmation-header-font-weight: bold !default;
|
|
|
7
7
|
$tp-co-purchase-confirmation-header-height: 50px !default;
|
|
8
8
|
|
|
9
9
|
$tp-co-purchase-confirmation-background: white !default;
|
|
10
|
-
$tp-co-purchase-confirmation-height:
|
|
10
|
+
$tp-co-purchase-confirmation-height: 120px !default;
|
|
11
11
|
$tp-co-purchase-confirmation-drag-handle-width: 30px !default;
|
|
12
12
|
|
|
13
13
|
$tp-co-purchase-confirmation-icon-size: 40px !default;
|
|
@@ -22,3 +22,23 @@ $tp-co-purchase-confirmation-link-button-width: 50px !default;
|
|
|
22
22
|
$tp-co-purchase-confirmation-column-gap: 10px !default;
|
|
23
23
|
|
|
24
24
|
$tp-co-purchase-confirmation-linked-color-width: 10px !default;
|
|
25
|
+
|
|
26
|
+
$tp-co-draggable-purchase-confirmation-border-width: 1px !default;
|
|
27
|
+
$tp-co-draggable-purchase-confirmation-border-color: #cccccc !default;
|
|
28
|
+
$tp-co-draggable-purchase-confirmation-border-radius: 5px !default;
|
|
29
|
+
$tp-co-draggable-purchase-confirmation-padding: 15px 30px 15px 45px !default;
|
|
30
|
+
$tp-co-draggable-purchase-confirmation-link-right: 5px !default;
|
|
31
|
+
$tp-co-draggable-purchase-confirmation-link-top: 5px !default;
|
|
32
|
+
$tp-co-draggable-purchase-confirmation-link-icon-size: 26px !default;
|
|
33
|
+
$tp-co-draggable-purchase-confirmation-color-right: 0px !default;
|
|
34
|
+
$tp-co-draggable-purchase-confirmation-color-top: 0px !default;
|
|
35
|
+
$tp-co-draggable-purchase-confirmation-color-border-radius: 5px 0 0 5px !default;
|
|
36
|
+
$tp-co-draggable-purchase-confirmation-color-width: 5px !default;
|
|
37
|
+
$tp-co-draggable-purchase-confirmation-description-font-size: 14px !default;
|
|
38
|
+
$tp-co-draggable-purchase-confirmation-description-height: 17px !default;
|
|
39
|
+
$tp-co-draggable-purchase-confirmation-description-padding: 0 10px 0 0 !default;
|
|
40
|
+
$tp-co-draggable-purchase-confirmation-top-line-gap: 3px !default;
|
|
41
|
+
$tp-co-draggable-purchase-confirmation-bottom-line-gap: 2px !default;
|
|
42
|
+
$tp-co-draggable-purchase-confirmation-bottom-label-font-size: 10px !default;
|
|
43
|
+
$tp-co-draggable-purchase-confirmation-bottom-label-font-color: #8083A3 !default;
|
|
44
|
+
|
package/lib/component/service-wizard-qa/question-answer-item/style/_material-definition.scss
CHANGED
|
@@ -7,7 +7,7 @@ $tp-co-purchase-confirmation-header-font-weight: bold !default;
|
|
|
7
7
|
$tp-co-purchase-confirmation-header-height: 50px !default;
|
|
8
8
|
|
|
9
9
|
$tp-co-purchase-confirmation-background: white !default;
|
|
10
|
-
$tp-co-purchase-confirmation-height:
|
|
10
|
+
$tp-co-purchase-confirmation-height: 120px !default;
|
|
11
11
|
$tp-co-purchase-confirmation-drag-handle-width: 30px !default;
|
|
12
12
|
|
|
13
13
|
$tp-co-purchase-confirmation-icon-size: 40px !default;
|
package/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.d.ts
CHANGED
|
@@ -18,11 +18,14 @@ export declare class TransactionLineWarehouseLocationComponent extends Transacti
|
|
|
18
18
|
protected imageService: TransactionImageService;
|
|
19
19
|
protected changeDetector: ChangeDetectorRef;
|
|
20
20
|
private _articleService;
|
|
21
|
-
warehouseNr: number;
|
|
21
|
+
set warehouseNr(value: number);
|
|
22
|
+
get warehouseNr(): number;
|
|
22
23
|
protected codeField: string;
|
|
23
24
|
protected checkField: string;
|
|
24
25
|
protected propsForLabel: CheckboxListPropertyInterface[];
|
|
26
|
+
private _warehouseNr;
|
|
25
27
|
constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _articleService: ArticleService);
|
|
26
28
|
ngOnInit(): void;
|
|
27
29
|
commit(locationNr: string): Promise<boolean>;
|
|
30
|
+
private _getLocations;
|
|
28
31
|
}
|
|
@@ -7,6 +7,7 @@ import { TransactionScreenConfigurationService } from '../../../service/transact
|
|
|
7
7
|
import { DeliveryPlanningService } from "../../delivery-planning/service/delivery-planning.service";
|
|
8
8
|
import { TransactionService } from "../../../service/transaction.service";
|
|
9
9
|
import { DialogService } from "../../../service/dialog.service";
|
|
10
|
+
import { BatchTransactionSendingRequest } from "@colijnit/transactionapi/build/model/batch-transaction-sending-request";
|
|
10
11
|
export declare class TransactionSearchResultComponent implements OnInit, OnChanges, OnDestroy {
|
|
11
12
|
searchService: TransactionSearchService;
|
|
12
13
|
screenConfigService: TransactionScreenConfigurationService;
|
|
@@ -31,6 +32,7 @@ export declare class TransactionSearchResultComponent implements OnInit, OnChang
|
|
|
31
32
|
showBatchOptions: boolean;
|
|
32
33
|
showShippingMethodDialog: boolean;
|
|
33
34
|
selectedTransactions: TransactionSearchView[];
|
|
35
|
+
batchTransactionSendingRequest: BatchTransactionSendingRequest;
|
|
34
36
|
private _activeContentViewMode;
|
|
35
37
|
private _fullscreen;
|
|
36
38
|
private _subs;
|
|
@@ -52,7 +54,7 @@ export declare class TransactionSearchResultComponent implements OnInit, OnChang
|
|
|
52
54
|
onProcessOrders(): Promise<void>;
|
|
53
55
|
onSelectAllOrders(allSelected: boolean): void;
|
|
54
56
|
shippingDialogCancelClicked(): void;
|
|
55
|
-
shippingDialogSaveClicked(): void;
|
|
57
|
+
shippingDialogSaveClicked(request: BatchTransactionSendingRequest): void;
|
|
56
58
|
private _createRequestLines;
|
|
57
59
|
private _showBatchOptions;
|
|
58
60
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
font-size: $tp-transaction-tile-font-size;
|
|
7
7
|
line-height: $tp-transaction-tile-line-height;
|
|
8
8
|
height: $tp-transaction-tile-height;
|
|
9
|
-
|
|
9
|
+
position: relative;
|
|
10
10
|
@media(max-width: 600px) {
|
|
11
11
|
width: $tp-transaction-tile-width-mobile;
|
|
12
12
|
}
|
|
@@ -30,18 +30,6 @@
|
|
|
30
30
|
display: flex;
|
|
31
31
|
align-items: center;
|
|
32
32
|
column-gap: 10px;
|
|
33
|
-
|
|
34
|
-
.type-indicator {
|
|
35
|
-
width: 20px;
|
|
36
|
-
height: 20px;
|
|
37
|
-
font-size: 10px;
|
|
38
|
-
color: white;
|
|
39
|
-
background-color: #569eee;
|
|
40
|
-
border-radius: 9px;
|
|
41
|
-
display: flex;
|
|
42
|
-
align-items: center;
|
|
43
|
-
justify-content: center;
|
|
44
|
-
}
|
|
45
33
|
}
|
|
46
34
|
|
|
47
35
|
.text {
|
|
@@ -53,23 +41,60 @@
|
|
|
53
41
|
display: -webkit-box;
|
|
54
42
|
-webkit-line-clamp: 1;
|
|
55
43
|
-webkit-box-orient: vertical;
|
|
44
|
+
font-size: 11px;
|
|
56
45
|
}
|
|
57
46
|
|
|
58
47
|
co-avatar {
|
|
59
48
|
width: $tp-transaction-tile-avatar-width;
|
|
60
49
|
height: $tp-transaction-tile-avatar-height;
|
|
50
|
+
background: #cccccc;
|
|
51
|
+
.co-image-display {
|
|
52
|
+
width: $tp-transaction-tile-avatar-width;
|
|
53
|
+
height: $tp-transaction-tile-avatar-height;
|
|
54
|
+
}
|
|
61
55
|
}
|
|
62
56
|
|
|
63
57
|
.status-bar-wrapper {
|
|
58
|
+
.co-statusbar-wrapper {
|
|
59
|
+
height: auto;
|
|
60
|
+
.statuses {
|
|
61
|
+
gap: 1px;
|
|
62
|
+
}
|
|
63
|
+
.co-linear-gauge {
|
|
64
|
+
.linear-gauge {
|
|
65
|
+
margin: 0;
|
|
66
|
+
border-radius: 0;
|
|
67
|
+
min-width: 11px;
|
|
68
|
+
height: 11px;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
.type-indicator {
|
|
64
74
|
position: absolute;
|
|
75
|
+
left: 0;
|
|
65
76
|
top: 0;
|
|
66
|
-
|
|
77
|
+
height: 100%;
|
|
78
|
+
width: 5px;
|
|
79
|
+
border-radius: 5px 0 0 5px;
|
|
80
|
+
&.color-V {
|
|
81
|
+
background: #569eee;
|
|
82
|
+
}
|
|
83
|
+
&.color-I {
|
|
84
|
+
background: #45b8bf;
|
|
85
|
+
}
|
|
86
|
+
&.color-S {
|
|
87
|
+
background: #d0a46b;
|
|
88
|
+
}
|
|
89
|
+
&.color-O {
|
|
90
|
+
background: #8083a3;
|
|
91
|
+
}
|
|
92
|
+
&.color-K {
|
|
93
|
+
background: #0b378c;
|
|
94
|
+
}
|
|
67
95
|
}
|
|
68
|
-
|
|
69
96
|
.total-price-vat {
|
|
70
|
-
|
|
71
|
-
top: 17px;
|
|
72
|
-
right: 0;
|
|
97
|
+
|
|
73
98
|
}
|
|
74
99
|
|
|
75
100
|
.label {
|
|
@@ -79,11 +104,11 @@
|
|
|
79
104
|
.value {
|
|
80
105
|
display: flex;
|
|
81
106
|
flex-direction: row;
|
|
82
|
-
align-items:
|
|
107
|
+
align-items: center;
|
|
83
108
|
min-width: max-content;
|
|
84
109
|
font-size: $tp-transaction-tile-font-size-small;
|
|
85
|
-
height: $tp-transaction-tile-value-height;
|
|
86
|
-
|
|
110
|
+
line-height: $tp-transaction-tile-value-height;
|
|
111
|
+
gap: 5px;
|
|
87
112
|
co-icon {
|
|
88
113
|
height: $tp-transaction-tile-icon-height;
|
|
89
114
|
width: $tp-transaction-tile-icon-width;
|
|
@@ -100,40 +125,50 @@
|
|
|
100
125
|
}
|
|
101
126
|
|
|
102
127
|
.tile-header {
|
|
103
|
-
display:
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
128
|
+
display: flex;
|
|
129
|
+
justify-content: space-between;
|
|
130
|
+
gap: 10px;
|
|
131
|
+
align-items: center;
|
|
132
|
+
}
|
|
133
|
+
.transaction-tile-avatar {
|
|
134
|
+
display: flex;
|
|
135
|
+
align-items: center;
|
|
136
|
+
gap: 10px;
|
|
137
|
+
span {
|
|
138
|
+
font-weight: 600;
|
|
139
|
+
}
|
|
108
140
|
}
|
|
109
|
-
|
|
110
141
|
.tile-upper-left {
|
|
111
|
-
|
|
142
|
+
|
|
112
143
|
}
|
|
113
144
|
|
|
114
145
|
.tile-upper-middle {
|
|
115
|
-
grid-area: 1 / 2 / 2 / 3;
|
|
116
146
|
display: flex;
|
|
117
|
-
flex-direction:
|
|
118
|
-
|
|
147
|
+
flex-direction: row;
|
|
148
|
+
align-items: center;
|
|
149
|
+
gap: 5px;
|
|
150
|
+
co-icon {
|
|
151
|
+
width: 14px;
|
|
152
|
+
height: 14px;
|
|
153
|
+
}
|
|
154
|
+
.text {
|
|
155
|
+
line-height: 14px;
|
|
156
|
+
font-weight: 600;
|
|
157
|
+
}
|
|
119
158
|
}
|
|
120
159
|
|
|
121
160
|
.tile-upper-right {
|
|
122
|
-
grid-area: 1 / 3 / 2 / 4;
|
|
123
161
|
display: flex;
|
|
124
162
|
flex-direction: column;
|
|
125
163
|
align-items: flex-end;
|
|
126
|
-
row-gap: 3px;
|
|
127
164
|
position: relative;
|
|
128
165
|
}
|
|
129
166
|
|
|
130
167
|
|
|
131
168
|
.tile-body {
|
|
132
169
|
display: grid;
|
|
133
|
-
grid-template-columns:
|
|
134
|
-
grid-template-rows: 1.5fr;
|
|
170
|
+
grid-template-columns: 24px 2.6fr 0fr;
|
|
135
171
|
gap: 0 10px;
|
|
136
|
-
grid-area: 2 / 1 / 3 / 2;
|
|
137
172
|
align-items: center;
|
|
138
173
|
}
|
|
139
174
|
|
|
@@ -151,29 +186,38 @@
|
|
|
151
186
|
}
|
|
152
187
|
|
|
153
188
|
.tile-footer {
|
|
154
|
-
display:
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
189
|
+
display: flex;
|
|
190
|
+
justify-content: space-between;
|
|
191
|
+
gap: 10px;
|
|
192
|
+
align-items: center;
|
|
193
|
+
padding-left: 5px;
|
|
159
194
|
}
|
|
160
195
|
|
|
161
196
|
.tile-bottom-left {
|
|
162
|
-
|
|
197
|
+
|
|
163
198
|
}
|
|
164
199
|
|
|
165
200
|
.tile-bottom-middle {
|
|
166
|
-
grid-area: 1 / 2 / 2 / 3;
|
|
167
201
|
display: flex;
|
|
168
202
|
flex-direction: column;
|
|
169
203
|
align-items: center;
|
|
170
204
|
}
|
|
171
205
|
|
|
172
206
|
.tile-bottom-right {
|
|
173
|
-
|
|
207
|
+
|
|
208
|
+
}
|
|
209
|
+
.order-info-section {
|
|
174
210
|
display: flex;
|
|
175
|
-
|
|
176
|
-
|
|
211
|
+
align-items: center;
|
|
212
|
+
gap: 5px;
|
|
213
|
+
co-icon {
|
|
214
|
+
width: 14px;
|
|
215
|
+
height: 14px;
|
|
216
|
+
&.unlock-icon, &.lock-icon {
|
|
217
|
+
position: relative;
|
|
218
|
+
left: -5px;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
177
221
|
}
|
|
178
222
|
}
|
|
179
223
|
}
|
|
@@ -4,8 +4,8 @@ $tp-transaction-tile-background-color-selected: $tp-color-select !default;
|
|
|
4
4
|
|
|
5
5
|
$tp-transaction-tile-font-family: $tp-font-family !default;
|
|
6
6
|
$tp-transaction-tile-font-size: $tp-font-size !default;
|
|
7
|
-
$tp-transaction-tile-height:
|
|
8
|
-
$tp-transaction-tile-content-height:
|
|
7
|
+
$tp-transaction-tile-height: auto !default;
|
|
8
|
+
$tp-transaction-tile-content-height: 90px !default;
|
|
9
9
|
$tp-transaction-tile-body-height: 100px !default;
|
|
10
10
|
$tp-transaction-tile-width: 300px !default;
|
|
11
11
|
$tp-transaction-tile-width-mobile: 85 vw !default;
|
|
@@ -13,7 +13,9 @@ $tp-transaction-tile-padding: 10px 15px !default;
|
|
|
13
13
|
$tp-transaction-tile-row-gap: 10px !default;
|
|
14
14
|
$tp-transaction-tile-column-gap: 10px !default;
|
|
15
15
|
$tp-transaction-tile-font-size-small: $tp-font-size-small !default;
|
|
16
|
-
$tp-transaction-tile-font-color: #
|
|
16
|
+
$tp-transaction-tile-font-color: #171721 !default;
|
|
17
|
+
$tp-transaction-tile-left-border-size: 0 0 0 0 !default;
|
|
18
|
+
$tp-transaction-tile-right-border-size: 0 0 0 0 !default;
|
|
17
19
|
$tp-transaction-tile-font-color-dark: $tp-color-font !default;
|
|
18
20
|
$tp-transaction-tile-header-font-size: $tp-font-size !default;
|
|
19
21
|
$tp-transaction-tile-header-font-weight: bold !default;
|
|
@@ -21,15 +23,15 @@ $tp-transaction-tile-header-font-color: $tp-color-font !default;
|
|
|
21
23
|
$tp-transaction-tile-footer-border-color: $tp-transaction-tile-font-color !default;
|
|
22
24
|
$tp-transaction-tile-footer-padding: 10px 0 !default;
|
|
23
25
|
$tp-transaction-tile-footer-middle-section-padding: 0 15px !default;
|
|
24
|
-
$tp-transaction-tile-value-height:
|
|
26
|
+
$tp-transaction-tile-value-height: 14px !default;
|
|
25
27
|
$tp-transaction-tile-border-color: $tp-color-border !default;
|
|
26
28
|
$tp-transaction-tile-button-color: $tp-color-active-light !default;
|
|
27
29
|
$tp-transaction-tile-button-border-radius: $tp-default-border-radius !default;
|
|
28
30
|
$tp-transaction-tile-button-height: 25px !default;
|
|
29
31
|
$tp-transaction-tile-button-margin-top: 10px !default;
|
|
30
32
|
$tp-transaction-tile-button-font-weight: bold !default;
|
|
31
|
-
$tp-transaction-tile-avatar-height:
|
|
32
|
-
$tp-transaction-tile-avatar-width:
|
|
33
|
+
$tp-transaction-tile-avatar-height: 24px !default;
|
|
34
|
+
$tp-transaction-tile-avatar-width: 24px !default;
|
|
33
35
|
$tp-transaction-tile-icon-width: 1.2rem !default;
|
|
34
36
|
$tp-transaction-tile-icon-height: 1.2rem !default;
|
|
35
37
|
$tp-transaction-tile-icon-active-color: $tp-color-active !default;
|
|
@@ -14,11 +14,15 @@
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
.tile-bottom-left {
|
|
17
|
-
border-
|
|
17
|
+
border-width: $tp-transaction-tile-left-border-size;
|
|
18
|
+
border-style: solid;
|
|
19
|
+
border-color: $tp-transaction-tile-border-color;
|
|
18
20
|
}
|
|
19
21
|
|
|
20
22
|
.tile-bottom-right {
|
|
21
|
-
border-
|
|
23
|
+
border-width: $tp-transaction-tile-right-border-size;
|
|
24
|
+
border-style: solid;
|
|
25
|
+
border-color: $tp-transaction-tile-border-color;
|
|
22
26
|
}
|
|
23
27
|
|
|
24
28
|
.order-info-section {
|
|
@@ -7,13 +7,14 @@ import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report
|
|
|
7
7
|
import { TransactionBaseService } from "../../../service/transaction-base.service";
|
|
8
8
|
import { Printer } from "@colijnit/mainapi/build/model/printer.bo";
|
|
9
9
|
import { TransactionSearchView } from "@colijnit/transactionapi/build/model/transaction-search-view.bo";
|
|
10
|
+
import { BatchTransactionSendingRequest } from "@colijnit/transactionapi/build/model/batch-transaction-sending-request";
|
|
10
11
|
export declare class ShippingMethodDialogComponent implements OnInit {
|
|
11
12
|
iconService: IconCacheService;
|
|
12
13
|
transactionService: TransactionService;
|
|
13
14
|
transBaseService: TransactionBaseService;
|
|
14
15
|
category: string;
|
|
15
16
|
selectedTransactions: TransactionSearchView[];
|
|
16
|
-
saveClicked: EventEmitter<
|
|
17
|
+
saveClicked: EventEmitter<BatchTransactionSendingRequest>;
|
|
17
18
|
cancelClicked: EventEmitter<void>;
|
|
18
19
|
showClass(): boolean;
|
|
19
20
|
readonly icons: typeof Icon;
|
|
@@ -25,6 +26,7 @@ export declare class ShippingMethodDialogComponent implements OnInit {
|
|
|
25
26
|
printerList: Printer[];
|
|
26
27
|
selectedPrinter: Printer;
|
|
27
28
|
useDefaultShippingMethods: boolean;
|
|
29
|
+
batchTransactionSendingRequest: BatchTransactionSendingRequest;
|
|
28
30
|
constructor(iconService: IconCacheService, transactionService: TransactionService, transBaseService: TransactionBaseService);
|
|
29
31
|
ngOnInit(): void;
|
|
30
32
|
saveButtonClicked(): void;
|
|
@@ -32,4 +34,5 @@ export declare class ShippingMethodDialogComponent implements OnInit {
|
|
|
32
34
|
private _getPrintLayouts;
|
|
33
35
|
private _getEmailLayouts;
|
|
34
36
|
private _getPrinters;
|
|
37
|
+
private _getDefaultSendMethod;
|
|
35
38
|
}
|
package/lib/enum/icon.enum.d.ts
CHANGED
|
@@ -99,6 +99,7 @@ export declare enum Icon {
|
|
|
99
99
|
RegularCartFlatbedBoxesCircleCheck = "regular_cart_flatbed_boxes_circle_check",
|
|
100
100
|
RegularCartShoppingCircleQuestion = "regular_cart_shopping_circle_question",
|
|
101
101
|
RegularCartShoppingClock = "regular_cart_shopping_clock",
|
|
102
|
+
RegularCartShoppingTag = "regular_cart_shopping_tag",
|
|
102
103
|
RegularEuroSignMinus = "regular_euro_sign_minus",
|
|
103
104
|
RegularIndustryClock = "regular_industry_clock",
|
|
104
105
|
RegularIndustryTag = "regular_industry_tag",
|
|
@@ -122,6 +123,7 @@ export declare enum Icon {
|
|
|
122
123
|
SlideIn = "slide_in",
|
|
123
124
|
SquareFull = "square_full",
|
|
124
125
|
SquareFullSolid = "square_full_solid",
|
|
126
|
+
StoreLight = "store_light",
|
|
125
127
|
SyncAlt = "sync_alt",
|
|
126
128
|
Tag = "tag",
|
|
127
129
|
TagLight = "tag_light",
|
|
@@ -158,4 +158,5 @@ export declare class TransactionEventService {
|
|
|
158
158
|
readonly blockScreen: BehaviorSubject<boolean>;
|
|
159
159
|
readonly saveTransactionClick: Subject<void>;
|
|
160
160
|
readonly cancelTransactionClick: Subject<void>;
|
|
161
|
+
readonly afterAddTransactionLine: Subject<boolean>;
|
|
161
162
|
}
|
|
@@ -420,5 +420,6 @@ export declare class TransactionService extends PendingReasonService {
|
|
|
420
420
|
protected _handleBeforeRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
|
|
421
421
|
protected _handleAfterRememberCurrentTransaction(): Promise<void>;
|
|
422
422
|
private _checkAndSaveLinesForAIConfirmation;
|
|
423
|
+
private _checkAndAddRelationTransaction;
|
|
423
424
|
private _checkAndCreateTransaction;
|
|
424
425
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@colijnit/transaction",
|
|
3
|
-
"version": "256.1.
|
|
3
|
+
"version": "256.1.14",
|
|
4
4
|
"description": "Colijn IT transaction module for Angular 12",
|
|
5
5
|
"repository": "npm/npm",
|
|
6
6
|
"author": "Colijn IT",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"@angular/common": ">=12.2.0",
|
|
11
11
|
"@angular/core": ">=12.2.0",
|
|
12
12
|
"@colijnit/articleapi": ">=256.1.0",
|
|
13
|
-
"@colijnit/catalog": ">=256.1.
|
|
13
|
+
"@colijnit/catalog": ">=256.1.7",
|
|
14
14
|
"@colijnit/corecomponents": ">=1.12.0",
|
|
15
15
|
"@colijnit/corecomponents_v12": ">=256.1.4",
|
|
16
16
|
"@colijnit/ioneconnector": ">=256.1.0",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@colijnit/relationapi": ">=256.1.0",
|
|
21
21
|
"@colijnit/sharedapi": ">=1.0.20",
|
|
22
22
|
"@colijnit/sharedcomponents": ">=256.1.0",
|
|
23
|
-
"@colijnit/transactionapi": ">=256.1.
|
|
23
|
+
"@colijnit/transactionapi": ">=256.1.5",
|
|
24
24
|
"@types/three": ">=0.125.0",
|
|
25
25
|
"@tweenjs/tween.js": ">=17.2.0",
|
|
26
26
|
"three": ">=0.125.0",
|