@colijnit/transaction 12.1.198 → 12.1.199
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 +484 -124
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.d.ts +18 -15
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/colijnit-transaction.js +19 -16
- package/esm2015/lib/component/core/base/transaction-base.component.js +10 -1
- package/esm2015/lib/component/delivery-planning/delivery-planning.component.js +7 -2
- package/esm2015/lib/component/delivery-planning/service/delivery-planning.service.js +30 -1
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-tile-status/delivery-planning-tile-status.component.js +14 -3
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component.js +38 -37
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.js +70 -31
- package/esm2015/lib/component/delivery-planning-main/delivery-planning-main.component.js +19 -15
- package/esm2015/lib/component/transaction-button/transaction-button.component.js +7 -2
- package/esm2015/lib/component/transaction-internal/transaction-internal.component.js +29 -1
- package/esm2015/lib/component/transaction-internal/transaction-internal.module.js +4 -2
- package/esm2015/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.js +50 -39
- package/esm2015/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.module.js +4 -2
- package/esm2015/lib/component/transaction-margin/component/transaction-margin-block/transaction-margin-block.component.js +32 -0
- package/esm2015/lib/component/transaction-margin/transaction-margin.component.js +29 -0
- package/esm2015/lib/component/transaction-margin/transaction-margin.module.js +27 -0
- package/esm2015/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-order/transaction-purchase-order-filter-content-order.component.js +17 -2
- package/esm2015/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-order/transaction-sales-order-filter-content-order.component.js +17 -1
- package/esm2015/lib/component/transaction-search/transaction-filter-content/sales-quotation-filter-content/transaction-sales-quotation-filter-content-order/transaction-sales-quotation-filter-content-order.component.js +17 -1
- package/esm2015/lib/enum/icon.enum.js +2 -1
- package/esm2015/lib/model/icon-svg.js +2 -1
- package/esm2015/lib/service/transaction-connector-adapter.service.js +39 -1
- package/esm2015/lib/service/transaction-connector.service.js +16 -1
- package/esm2015/lib/service/transaction-mapping.service.js +2 -1
- package/esm2015/lib/service/transaction.service.js +6 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +447 -128
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/core/base/transaction-base.component.d.ts +4 -0
- package/lib/component/delivery-planning/delivery-planning.component.d.ts +4 -1
- package/lib/component/delivery-planning/service/delivery-planning.service.d.ts +7 -0
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-tile-status/delivery-planning-tile-status.component.d.ts +6 -1
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component.d.ts +13 -16
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.d.ts +2 -4
- package/lib/component/delivery-planning-main/delivery-planning-main.component.d.ts +2 -2
- package/lib/component/transaction-button/style/_layout.scss +8 -0
- package/lib/component/transaction-button/style/_material-definition.scss +2 -0
- package/lib/component/transaction-button/transaction-button.component.d.ts +2 -0
- package/lib/component/transaction-internal/style/_layout.scss +12 -2
- package/lib/component/transaction-internal/transaction-internal.component.d.ts +3 -0
- package/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.d.ts +1 -2
- package/lib/component/transaction-margin/component/transaction-margin-block/style/_layout.scss +25 -0
- package/lib/component/transaction-margin/component/transaction-margin-block/style/_material-definition.scss +4 -0
- package/lib/component/transaction-margin/component/transaction-margin-block/style/_theme.scss +4 -0
- package/lib/component/transaction-margin/component/transaction-margin-block/style/material.scss +4 -0
- package/lib/component/transaction-margin/component/transaction-margin-block/transaction-margin-block.component.d.ts +7 -0
- package/lib/component/transaction-margin/style/_layout.scss +20 -0
- package/lib/component/transaction-margin/style/_material-definition.scss +3 -0
- package/lib/component/transaction-margin/style/_theme.scss +5 -0
- package/lib/component/transaction-margin/style/material.scss +3 -0
- package/lib/component/transaction-margin/transaction-margin.component.d.ts +5 -0
- package/lib/component/transaction-margin/transaction-margin.module.d.ts +2 -0
- package/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-order/transaction-purchase-order-filter-content-order.component.d.ts +6 -0
- package/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-order/transaction-sales-order-filter-content-order.component.d.ts +6 -0
- package/lib/component/transaction-search/transaction-filter-content/sales-quotation-filter-content/transaction-sales-quotation-filter-content-order/transaction-sales-quotation-filter-content-order.component.d.ts +6 -0
- package/lib/enum/icon.enum.d.ts +1 -0
- package/lib/service/transaction-connector-adapter.service.d.ts +7 -0
- package/lib/service/transaction-connector.service.d.ts +7 -0
- package/lib/service/transaction.service.d.ts +2 -0
- package/package.json +1 -1
|
@@ -21,6 +21,7 @@ import { ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
|
|
|
21
21
|
import { TransactionCfgName } from '../../../enum/transaction-cfg-name.enum';
|
|
22
22
|
import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
|
|
23
23
|
import { TransactionServiceInfo } from "@colijnit/transactionapi/build/model/transaction-service-info.bo";
|
|
24
|
+
import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
|
|
24
25
|
export declare abstract class TransactionBaseComponent implements OnInit, OnDestroy, ScreenConfigAdapterComponent {
|
|
25
26
|
transactionEventService: TransactionEventService;
|
|
26
27
|
iconCacheService: IconCacheService;
|
|
@@ -40,6 +41,8 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
|
|
|
40
41
|
get transaction(): TransactionInfoResponse;
|
|
41
42
|
set transactionLine(value: TransactionLineInfo);
|
|
42
43
|
get transactionLine(): TransactionLineInfo;
|
|
44
|
+
set transactionMarginInfo(marginInfo: TransactionMarginInfo);
|
|
45
|
+
get transactionMarginInfo(): TransactionMarginInfo;
|
|
43
46
|
set transactionInfo(value: TransactionInfo);
|
|
44
47
|
get transactionInfo(): TransactionInfo;
|
|
45
48
|
set orderLineSets(value: OrderLineSetInfo[]);
|
|
@@ -114,6 +117,7 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
|
|
|
114
117
|
private _relation;
|
|
115
118
|
private _transaction;
|
|
116
119
|
private _transactionLine;
|
|
120
|
+
private _transactionMarginInfo;
|
|
117
121
|
private _transactionInfo;
|
|
118
122
|
private _orderLineSets;
|
|
119
123
|
private _transactionTotal;
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { EventEmitter } from "@angular/core";
|
|
2
2
|
import { DeliveryPlanningService } from "./service/delivery-planning.service";
|
|
3
3
|
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
4
|
+
import { DeliveryPlanningViewModes } from "../../enum/delivery-planning-view-modes.enum";
|
|
4
5
|
export declare class DeliveryPlanningComponent {
|
|
5
6
|
private _deliveryPlanningService;
|
|
7
|
+
readonly viewModes: typeof DeliveryPlanningViewModes;
|
|
6
8
|
planOrders: PlanOrder[];
|
|
7
9
|
planOrderClickedEvent: EventEmitter<PlanOrder>;
|
|
8
|
-
set currentPlanningViewMode(mode:
|
|
10
|
+
set currentPlanningViewMode(mode: DeliveryPlanningViewModes);
|
|
11
|
+
get currentPlanningViewMode(): DeliveryPlanningViewModes;
|
|
9
12
|
showClass(): boolean;
|
|
10
13
|
constructor(_deliveryPlanningService: DeliveryPlanningService);
|
|
11
14
|
newPlanOrders(planOrders: PlanOrder[]): void;
|
|
@@ -3,15 +3,22 @@ import { DeliveryPlanningModes } from "../../../enum/delivery-planning-modes.enu
|
|
|
3
3
|
import { CalendarView } from '@colijnit/sharedcomponents';
|
|
4
4
|
import { DeliveryPlanningViewModes } from "../../../enum/delivery-planning-view-modes.enum";
|
|
5
5
|
import { Planning } from "@colijnit/transactionapi/build/model/planning.bo";
|
|
6
|
+
import { PlanningTransportWeekDay } from "@colijnit/transactionapi/build/model/planning-transport-week-day.bo";
|
|
7
|
+
import { PlanningTransportWeek } from "@colijnit/transactionapi/build/model/planning-transport-week.bo";
|
|
6
8
|
export declare class DeliveryPlanningService {
|
|
7
9
|
private _transaction;
|
|
8
10
|
private _dragging;
|
|
11
|
+
_planTransportWeek: PlanningTransportWeek[];
|
|
9
12
|
currentMode: DeliveryPlanningModes;
|
|
10
13
|
datePlanningMode: CalendarView;
|
|
11
14
|
viewMode: DeliveryPlanningViewModes;
|
|
12
15
|
currentPlanning: Planning;
|
|
13
16
|
private _boFactory;
|
|
14
17
|
get dragging(): boolean;
|
|
18
|
+
get planTransportWeek(): PlanningTransportWeek[];
|
|
15
19
|
set dragging(value: boolean);
|
|
20
|
+
set planTransportWeek(value: PlanningTransportWeek[]);
|
|
16
21
|
constructor(_transaction: TransactionConnectorService);
|
|
22
|
+
getOrderSequenceValue(): Promise<number>;
|
|
23
|
+
getTransportOrders(planningTransportWeekDay: PlanningTransportWeekDay): Promise<PlanningTransportWeekDay>;
|
|
17
24
|
}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
import { OnInit } from "@angular/core";
|
|
2
|
+
export declare class DeliveryPlanningTileStatusComponent implements OnInit {
|
|
2
3
|
maxVolume: number;
|
|
3
4
|
timeTotal: number;
|
|
4
5
|
currentVolume: number;
|
|
5
6
|
currentTimeTotal: number;
|
|
7
|
+
volumePercent: number;
|
|
8
|
+
timePercent: number;
|
|
6
9
|
showClass(): boolean;
|
|
10
|
+
constructor();
|
|
11
|
+
ngOnInit(): void;
|
|
7
12
|
percent(first: number, second: number): number;
|
|
8
13
|
}
|
|
@@ -1,25 +1,22 @@
|
|
|
1
|
+
import { EventEmitter, OnInit } from "@angular/core";
|
|
1
2
|
import { CdkDragDrop } from '@angular/cdk/drag-drop';
|
|
2
|
-
import {
|
|
3
|
-
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
3
|
+
import { PlanningTransportWeekDay } from "@colijnit/transactionapi/build/model/planning-transport-week-day.bo";
|
|
4
4
|
import { DatePipe } from "@angular/common";
|
|
5
|
-
|
|
5
|
+
import { TransactionConnectorService } from "../../../../../../service/transaction-connector.service";
|
|
6
|
+
import { DeliveryPlanningService } from "../../../../../delivery-planning/service/delivery-planning.service";
|
|
7
|
+
export declare class DeliveryPlanningOverviewTileComponent implements OnInit {
|
|
6
8
|
private _datePipe;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
startTime: Date;
|
|
11
|
-
endTime: Date;
|
|
12
|
-
planningOrders: PlanOrder[];
|
|
9
|
+
private _transactionCon;
|
|
10
|
+
private _deliveryPlanningService;
|
|
11
|
+
transportDay: PlanningTransportWeekDay;
|
|
13
12
|
expanded: boolean;
|
|
13
|
+
expandedEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
14
|
+
getTransportOrdersEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
14
15
|
selectedIndex: number;
|
|
15
|
-
maxVolume: number;
|
|
16
|
-
curentVolume: number;
|
|
17
|
-
currentTimeTotal: number;
|
|
18
|
-
timeTotal: number;
|
|
19
|
-
relationName: string;
|
|
20
16
|
drop(event: CdkDragDrop<string[]>): void;
|
|
21
17
|
showClass(): boolean;
|
|
22
|
-
constructor(_datePipe: DatePipe);
|
|
18
|
+
constructor(_datePipe: DatePipe, _transactionCon: TransactionConnectorService, _deliveryPlanningService: DeliveryPlanningService);
|
|
19
|
+
ngOnInit(): Promise<void>;
|
|
23
20
|
formattedDate(date: Date): string;
|
|
24
|
-
|
|
21
|
+
expandedChange(): void;
|
|
25
22
|
}
|
|
@@ -20,20 +20,18 @@ export declare class DeliveryPlanningOverviewComponent {
|
|
|
20
20
|
date: Date;
|
|
21
21
|
planTransportWeekArr: PlanningTransportWeekDay[];
|
|
22
22
|
available: boolean;
|
|
23
|
-
private _planTransportWeek;
|
|
24
|
-
set planTransportWeek(value: PlanningTransportWeek[]);
|
|
25
23
|
planOrders: PlanOrder[];
|
|
26
24
|
currentMode: DeliveryPlanningModes;
|
|
27
25
|
currentViewMode: CalendarView;
|
|
28
26
|
currentPlanningViewMode: DeliveryPlanningViewModes;
|
|
29
27
|
updatePlanningTransportEvent: EventEmitter<PlanningTransportWeek>;
|
|
30
28
|
get planTransportWeek(): PlanningTransportWeek[];
|
|
31
|
-
get currentPlanningLayout(): DeliveryPlanningViewModes;
|
|
32
29
|
get dragging(): boolean;
|
|
33
30
|
showClass(): boolean;
|
|
34
31
|
constructor(_deliveryPlanningService: DeliveryPlanningService, _transaction: TransactionService, _datePipe: DatePipe, _transactionCon: TransactionConnectorService);
|
|
35
32
|
dropped(ev: DragEvent, week: PlanningTransportWeek, transportDay: PlanningTransportWeekDay): Promise<void>;
|
|
36
|
-
allowDrop(ev: any):
|
|
33
|
+
allowDrop(ev: any, transportDay: PlanningTransportWeekDay): boolean;
|
|
37
34
|
dragEnd(ev: any): void;
|
|
38
35
|
weekArray(arr: PlanningTransportWeek): PlanningTransportWeekDay[];
|
|
36
|
+
addHours(date: any, hours: any): any;
|
|
39
37
|
}
|
|
@@ -14,10 +14,10 @@ export declare class DeliveryPlanningMainComponent implements OnInit {
|
|
|
14
14
|
private _transaction;
|
|
15
15
|
readonly viewModes: typeof DeliveryPlanningViewModes;
|
|
16
16
|
planning: Planning;
|
|
17
|
-
planningTransportWeek: PlanningTransportWeek[];
|
|
18
17
|
fullPlanningTransportWeek: PlanningTransportWeek[];
|
|
19
18
|
planOrders: PlanOrder[];
|
|
20
19
|
planOrdersEvent: EventEmitter<PlanOrder[]>;
|
|
20
|
+
get planTransportWeek(): PlanningTransportWeek[];
|
|
21
21
|
get currentMode(): DeliveryPlanningModes;
|
|
22
22
|
get currentViewMode(): CalendarView;
|
|
23
23
|
get currentPlanningViewMode(): DeliveryPlanningViewModes;
|
|
@@ -25,7 +25,7 @@ export declare class DeliveryPlanningMainComponent implements OnInit {
|
|
|
25
25
|
constructor(_deliveryPlanningService: DeliveryPlanningService, _viewModeService: SearchViewModeService, _transaction: TransactionConnectorService);
|
|
26
26
|
ngOnInit(): void;
|
|
27
27
|
planningChanged(planning: Planning): void;
|
|
28
|
-
weekFilter(planTransportWeek: PlanningTransportWeek[]):
|
|
28
|
+
weekFilter(planTransportWeek: PlanningTransportWeek[]): void;
|
|
29
29
|
updatePlanTransportWeek(planningTransportWeek: PlanningTransportWeek): void;
|
|
30
30
|
resetTransportWeek(): void;
|
|
31
31
|
}
|
|
@@ -40,6 +40,14 @@
|
|
|
40
40
|
|
|
41
41
|
.transaction-button-title {
|
|
42
42
|
color: $tp-transaction-button-title-color;
|
|
43
|
+
|
|
44
|
+
&.positive {
|
|
45
|
+
color: $tp-transaction-button-title-color-positive;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
&.negative {
|
|
49
|
+
color: $tp-transaction-button-title-color-negative;
|
|
50
|
+
}
|
|
43
51
|
}
|
|
44
52
|
}
|
|
45
53
|
&:not(.no-border) {
|
|
@@ -18,3 +18,5 @@ $tp-transaction-button-label-color: rgba(0, 0, 0, 0.7) !default;
|
|
|
18
18
|
$tp-transaction-button-label-title-wrapper-row-gap: 9px !default;
|
|
19
19
|
$tp-transaction-button-label-title-wrapper-padding: 0 10px !default;
|
|
20
20
|
$tp-transaction-button-title-color: rgba(0, 0, 0, 0.7) !default;
|
|
21
|
+
$tp-transaction-button-title-color-positive: #37c949 !default;
|
|
22
|
+
$tp-transaction-button-title-color-negative: #FF4141 !default;
|
|
@@ -5,6 +5,7 @@ export declare class TransactionButtonComponent implements ScreenConfigAdapterCo
|
|
|
5
5
|
private _screenConfigService;
|
|
6
6
|
label: string;
|
|
7
7
|
title: string;
|
|
8
|
+
statusColor: boolean;
|
|
8
9
|
readonly: boolean;
|
|
9
10
|
hidden: boolean;
|
|
10
11
|
iconData: SafeHtml | undefined;
|
|
@@ -20,4 +21,5 @@ export declare class TransactionButtonComponent implements ScreenConfigAdapterCo
|
|
|
20
21
|
decimals: number;
|
|
21
22
|
redErrorBackground: boolean;
|
|
22
23
|
constructor(_screenConfigService: TransactionScreenConfigurationService);
|
|
24
|
+
titleNumber(title: string): number;
|
|
23
25
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
padding: $tp-transaction-padding;
|
|
6
6
|
.transaction-footer-wrapper {
|
|
7
7
|
display: grid;
|
|
8
|
-
grid-template-columns: repeat(
|
|
8
|
+
grid-template-columns: repeat(3, minmax(33%, 1fr));
|
|
9
9
|
flex-direction: row;
|
|
10
10
|
//grid-template-areas: 'column1 column2';
|
|
11
11
|
margin: $tp-transaction-totals-margin;
|
|
@@ -47,8 +47,18 @@
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
|
|
51
|
+
.transaction-footer-center {
|
|
51
52
|
grid-column: 2/2;
|
|
53
|
+
justify-self: center;
|
|
54
|
+
display: flex;
|
|
55
|
+
align-items: center;
|
|
56
|
+
gap: 10px;
|
|
57
|
+
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
.co-transaction-totals {
|
|
61
|
+
grid-column: 3/3;
|
|
52
62
|
justify-self: flex-end;
|
|
53
63
|
width: 300px;
|
|
54
64
|
}
|
|
@@ -22,6 +22,7 @@ import { TransactionConnectorService } from '../../service/transaction-connector
|
|
|
22
22
|
import { PurchaseConfirmationService } from '../../service/purchase-confirmation.service';
|
|
23
23
|
import { PosOrderData } from '../../model/pos-order-data';
|
|
24
24
|
import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
|
|
25
|
+
import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
|
|
25
26
|
export declare class TransactionInternalComponent implements OnDestroy {
|
|
26
27
|
iconCacheService: IconCacheService;
|
|
27
28
|
service: TransactionService;
|
|
@@ -69,6 +70,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
|
|
|
69
70
|
loaded: boolean;
|
|
70
71
|
textToEdit: string;
|
|
71
72
|
historicTransactionLines: TransactionLineInfo[] | null;
|
|
73
|
+
transactionMarginInfo: TransactionMarginInfo;
|
|
72
74
|
lineDraggedOver: number;
|
|
73
75
|
statusBarConfigNames: StatusBarCfgNames;
|
|
74
76
|
private _subs;
|
|
@@ -110,4 +112,5 @@ export declare class TransactionInternalComponent implements OnDestroy {
|
|
|
110
112
|
private _hideTransactionTextDialog;
|
|
111
113
|
private _hideArticleTextOverviewDialog;
|
|
112
114
|
private updateTransactionLine;
|
|
115
|
+
getTransactionMarginInfo(transactionId: number): void;
|
|
113
116
|
}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { TransactionOrderDeliveryLineBaseComponent } from './transaction-order-delivery-line-base.component';
|
|
2
|
-
import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
|
|
3
2
|
import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
|
|
4
3
|
export declare class TransactionOrderDeliveryLineComponent extends TransactionOrderDeliveryLineBaseComponent {
|
|
5
4
|
showClass(): boolean;
|
|
5
|
+
get lineMarginInfo(): import("@colijnit/transactionapi/build/model/transaction-line-margin-info.bo").TransactionLineMarginInfo;
|
|
6
6
|
discountConfigNames: LineDiscountCfgNames;
|
|
7
|
-
statusBarConfigNames: StatusBarCfgNames;
|
|
8
7
|
}
|
package/lib/component/transaction-margin/component/transaction-margin-block/style/_layout.scss
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
@include export-module('cc-transaction-margin-block-layout') {
|
|
2
|
+
.co-transaction-margin-block {
|
|
3
|
+
.wrapper {
|
|
4
|
+
display: flex;
|
|
5
|
+
flex-direction: column;
|
|
6
|
+
justify-content: center;
|
|
7
|
+
align-items: center;
|
|
8
|
+
gap: 0.5em;
|
|
9
|
+
|
|
10
|
+
span {
|
|
11
|
+
&.header {
|
|
12
|
+
color: $margin-block-color-text-normal;
|
|
13
|
+
font-size: $margin-block-text-font-size;
|
|
14
|
+
}
|
|
15
|
+
&.positive {
|
|
16
|
+
color: $margin-block-color-text-green;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
&.negative {
|
|
20
|
+
color: $margin-block-color-text-red;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
@import "../../../style/mixin";
|
|
2
|
+
@import "../component/transaction-margin-block/style/material";
|
|
3
|
+
|
|
4
|
+
@include export-module('co-transaction-margin-layout') {
|
|
5
|
+
.co-transaction-margin {
|
|
6
|
+
display: block;
|
|
7
|
+
.transaction-margin-wrapper {
|
|
8
|
+
padding: 1em;
|
|
9
|
+
border-radius: 8px;
|
|
10
|
+
border: $transaction-margin-border-color-thickness solid rgba($transaction-margin-border-color, $transaction-margin-border-color-opacity);
|
|
11
|
+
display: flex;
|
|
12
|
+
.row {
|
|
13
|
+
display: flex;
|
|
14
|
+
flex-direction: row;
|
|
15
|
+
gap: 2em;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
}
|
|
20
|
+
}
|
|
@@ -28,6 +28,11 @@ export declare class TransactionPurchaseOrderFilterContentOrderComponent extends
|
|
|
28
28
|
text: any;
|
|
29
29
|
value: any;
|
|
30
30
|
};
|
|
31
|
+
paymentConditions: FilterItemViewmodel[];
|
|
32
|
+
paymentConditionsFields: {
|
|
33
|
+
text: any;
|
|
34
|
+
value: any;
|
|
35
|
+
};
|
|
31
36
|
orderFullyPaid: FilterItemViewmodel[];
|
|
32
37
|
orderFullyPaidFields: {
|
|
33
38
|
text: any;
|
|
@@ -56,6 +61,7 @@ export declare class TransactionPurchaseOrderFilterContentOrderComponent extends
|
|
|
56
61
|
private _setPurchasePersons;
|
|
57
62
|
private _setTags;
|
|
58
63
|
private _setBranches;
|
|
64
|
+
private _setPaymentConditions;
|
|
59
65
|
private _setOnHoldCodes;
|
|
60
66
|
private _setCommissionCodes;
|
|
61
67
|
private _setOrderDefinitive;
|
|
@@ -18,6 +18,11 @@ export declare class TransactionSalesOrderFilterContentOrderComponent extends Tr
|
|
|
18
18
|
text: any;
|
|
19
19
|
value: any;
|
|
20
20
|
};
|
|
21
|
+
paymentConditions: FilterItemViewmodel[];
|
|
22
|
+
paymentConditionsFields: {
|
|
23
|
+
text: any;
|
|
24
|
+
value: any;
|
|
25
|
+
};
|
|
21
26
|
onHoldCodes: FilterItemViewmodel[];
|
|
22
27
|
onHoldCodeFields: {
|
|
23
28
|
text: any;
|
|
@@ -64,6 +69,7 @@ export declare class TransactionSalesOrderFilterContentOrderComponent extends Tr
|
|
|
64
69
|
private _setSalesPersons;
|
|
65
70
|
private _setTags;
|
|
66
71
|
private _setBranches;
|
|
72
|
+
private _setPaymentConditions;
|
|
67
73
|
private _setOnHoldCodes;
|
|
68
74
|
private _setCommissionCodes;
|
|
69
75
|
private _setOrderDefinitive;
|
|
@@ -18,6 +18,11 @@ export declare class TransactionSalesQuotationFilterContentOrderComponent extend
|
|
|
18
18
|
text: any;
|
|
19
19
|
value: any;
|
|
20
20
|
};
|
|
21
|
+
paymentConditions: FilterItemViewmodel[];
|
|
22
|
+
paymentConditionsFields: {
|
|
23
|
+
text: any;
|
|
24
|
+
value: any;
|
|
25
|
+
};
|
|
21
26
|
commissionCodes: FilterItemViewmodel[];
|
|
22
27
|
commissionCodeFields: {
|
|
23
28
|
text: any;
|
|
@@ -58,6 +63,7 @@ export declare class TransactionSalesQuotationFilterContentOrderComponent extend
|
|
|
58
63
|
private _setSalesPersons;
|
|
59
64
|
private _setTags;
|
|
60
65
|
private _setBranches;
|
|
66
|
+
private _setPaymentConditions;
|
|
61
67
|
private _setCommissionCodes;
|
|
62
68
|
private _setOrderDefinitive;
|
|
63
69
|
private _setOrderFullyPaid;
|
package/lib/enum/icon.enum.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ export declare enum Icon {
|
|
|
24
24
|
CartShoppingRegular = "cart_shopping_regular",
|
|
25
25
|
CartShoppingSolid = "cart_shopping_solid",
|
|
26
26
|
CashRegister = "cash_register",
|
|
27
|
+
ChartPieSimpleRegular = "chart_pie_simple_regular",
|
|
27
28
|
Check = "check",
|
|
28
29
|
CheckDialog = "check_dialog",
|
|
29
30
|
CheckDuotone = "check_duotone",
|
|
@@ -151,6 +151,10 @@ import { PlanningFilterObject } from "@colijnit/transactionapi/build/model/plann
|
|
|
151
151
|
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
152
152
|
import { PlanningTransportWeek } from "@colijnit/transactionapi/build/model/planning-transport-week.bo";
|
|
153
153
|
import { Planning } from "@colijnit/transactionapi/build/model/planning.bo";
|
|
154
|
+
import { GetTransportOrdersRequest } from "@colijnit/transactionapi/build/model/get-transport-orders-request.bo";
|
|
155
|
+
import { OrderLinesToPlanRequest } from "@colijnit/transactionapi/build/model/order-lines-to-plan-request.bo";
|
|
156
|
+
import { PlanOrderLine } from "@colijnit/transactionapi/build/model/plan-order-line.bo";
|
|
157
|
+
import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
|
|
154
158
|
export declare class TransactionConnectorAdapterService {
|
|
155
159
|
private _optionsService;
|
|
156
160
|
private _selectMultipleCacheService;
|
|
@@ -414,6 +418,9 @@ export declare class TransactionConnectorAdapterService {
|
|
|
414
418
|
getPlanOrders(filterObject: PlanningFilterObject, planningId: number): Promise<PlanOrder[]>;
|
|
415
419
|
getPlanTransportWeek(startDate: Date, planningId: number): Promise<PlanningTransportWeek[]>;
|
|
416
420
|
updatePlanTransportWeek(planTransportWeek: PlanningTransportWeek): Promise<PlanningTransportWeek>;
|
|
421
|
+
getTransactionMarginInfo(transactionId: number): Promise<TransactionMarginInfo>;
|
|
422
|
+
getTransportOrders(request: GetTransportOrdersRequest): Promise<PlanOrder[]>;
|
|
423
|
+
getOrderLinesToPlan(request: OrderLinesToPlanRequest): Promise<PlanOrderLine[]>;
|
|
417
424
|
private _openPdfContent;
|
|
418
425
|
private _handleExceptionFromResponse;
|
|
419
426
|
}
|
|
@@ -139,6 +139,10 @@ import { Planning } from "@colijnit/transactionapi/build/model/planning.bo";
|
|
|
139
139
|
import { PlanningFilterObject } from "@colijnit/transactionapi/build/model/planning-filter-object.bo";
|
|
140
140
|
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
141
141
|
import { PlanningTransportWeek } from "@colijnit/transactionapi/build/model/planning-transport-week.bo";
|
|
142
|
+
import { GetTransportOrdersRequest } from "@colijnit/transactionapi/build/model/get-transport-orders-request.bo";
|
|
143
|
+
import { OrderLinesToPlanRequest } from "@colijnit/transactionapi/build/model/order-lines-to-plan-request.bo";
|
|
144
|
+
import { PlanOrderLine } from "@colijnit/transactionapi/build/model/plan-order-line.bo";
|
|
145
|
+
import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
|
|
142
146
|
export declare class TransactionConnectorService {
|
|
143
147
|
private _adapterService;
|
|
144
148
|
private _selectSingleCacheService;
|
|
@@ -385,4 +389,7 @@ export declare class TransactionConnectorService {
|
|
|
385
389
|
deleteDocument(documentId: number): Promise<ValidationResult>;
|
|
386
390
|
getComponentActivitiesWithoutRelationFiltering(transactionId: number): Promise<Activity[]>;
|
|
387
391
|
getHistoricActivities(transactionId: number): Promise<Activity[]>;
|
|
392
|
+
getTransactionMarginInfo(transactionId: number): Promise<TransactionMarginInfo>;
|
|
393
|
+
getTransportOrders(request: GetTransportOrdersRequest): Promise<PlanOrder[]>;
|
|
394
|
+
getOrderLinesToPlan(request: OrderLinesToPlanRequest): Promise<PlanOrderLine[]>;
|
|
388
395
|
}
|
|
@@ -117,6 +117,7 @@ import { TransactionAddPaymentLineRequest } from '@colijnit/transactionapi/build
|
|
|
117
117
|
import { PdfTransactionSearchOverviewResponse } from "@colijnit/transactionapi/build/model/pdf-transaction-search-overview-response";
|
|
118
118
|
import { PrintPurchaseOrderForSalesOrderRequest } from "@colijnit/transactionapi/build/model/print-purchase-order-for-sales-order-request";
|
|
119
119
|
import { Activity } from "@colijnit/mainapi/build/model/activity.bo";
|
|
120
|
+
import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
|
|
120
121
|
export declare class TransactionService extends PendingReasonService {
|
|
121
122
|
remainingAmount: number;
|
|
122
123
|
private readonly _createTransactionMethods;
|
|
@@ -337,6 +338,7 @@ export declare class TransactionService extends PendingReasonService {
|
|
|
337
338
|
getPurchaseOrderForTransactionLine(transId: number, lineNr: number): Promise<TransactionInfoHistory[]>;
|
|
338
339
|
commitAndRefreshTransaction(): Promise<void>;
|
|
339
340
|
checkBranch(): Promise<void>;
|
|
341
|
+
getTransactionMarginInfo(transactionId: number): Promise<TransactionMarginInfo>;
|
|
340
342
|
printSalesOrdersOverview(request: TransactionSearchViewRequest): Promise<PdfTransactionSearchOverviewResponse>;
|
|
341
343
|
loadDocumentsOfTransaction(key: string): Promise<CoDocument[]>;
|
|
342
344
|
loadDocumentContent(docId: number): Promise<string>;
|