@colijnit/transaction 255.1.45 → 255.1.47
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 +595 -240
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/avatar/avatar.component.js +8 -3
- package/esm2015/lib/component/checkout/checkout-overview-delivery-edit/checkout-overview-delivery-edit.component.js +10 -1
- package/esm2015/lib/component/checkout/checkout.module.js +6 -2
- package/esm2015/lib/component/delivery-planning/service/delivery-planning.service.js +99 -33
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-popup/delivery-planning-overview-popup.component.js +39 -25
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-short-line/delivery-planning-overview-short-line.component.js +4 -4
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-tile-line/delivery-planning-overview-tile-line.component.js +29 -11
- 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 +67 -16
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component.js +39 -17
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.js +56 -30
- package/esm2015/lib/component/delivery-planning-main/delivery-planning-main.component.js +59 -46
- package/esm2015/lib/component/transaction-card/transaction-card-planning/transaction-card-planning.component.js +18 -3
- package/esm2015/lib/component/transaction-card/transaction-card-purchase-confirmation/transaction-card-purchase-confirmation.component.js +101 -96
- package/esm2015/lib/component/transaction-cash-register-dialog/transaction-cash-register-dialog.component.js +4 -4
- package/esm2015/lib/component/transaction-header/transaction-header/transaction-header.component.js +13 -11
- package/esm2015/lib/component/transaction-header/transaction-header-delivery/transaction-header-delivery.component.js +2 -3
- package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-order.component.js +7 -2
- package/esm2015/lib/component/transaction-internal/transaction-internal.component.js +3 -8
- package/esm2015/lib/component/transaction-line/transaction-planning-line/transaction-planning-line.component.js +10 -4
- package/esm2015/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/transaction-lines-side-panel-service-order.component.js +6 -4
- package/esm2015/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/transaction-lines-side-panel-service-order.module.js +4 -3
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-planning/transaction-quick-access-planning.component.js +5 -2
- package/esm2015/lib/component/transaction-service-overview/components/transaction-service-message.component.js +3 -2
- package/esm2015/lib/component/transaction-service-overview/transaction-service-overview.component.js +29 -20
- package/esm2015/lib/component/transaction-service-overview/transaction-service-overview.module.js +4 -3
- package/esm2015/lib/enum/checkout-cfg-name.enum.js +3 -1
- package/esm2015/lib/enum/delivery-planning-update-actions.enum.js +8 -0
- package/esm2015/lib/enum/transaction-cfg-name.enum.js +12 -1
- package/esm2015/lib/service/transaction-connector-adapter.service.js +12 -1
- package/esm2015/lib/service/transaction-connector.service.js +6 -1
- package/esm2015/lib/service/transaction-payment.service.js +3 -3
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +622 -322
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/delivery-planning/service/delivery-planning.service.d.ts +11 -7
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-popup/delivery-planning-overview-popup.component.d.ts +10 -7
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-short-line/delivery-planning-overview-short-line.component.d.ts +1 -1
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-tile-line/delivery-planning-overview-tile-line.component.d.ts +9 -2
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-tile-line/style/_layout.scss +6 -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 +18 -7
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-tile-status/style/_layout.scss +12 -0
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component.d.ts +20 -5
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/style/_layout.scss +2 -2
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/style/_material-definition.scss +1 -1
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.d.ts +23 -10
- package/lib/component/delivery-planning-main/delivery-planning-main.component.d.ts +14 -7
- package/lib/component/transaction-card/transaction-card/style/_layout.scss +14 -1
- package/lib/component/transaction-card/transaction-card-planning/transaction-card-planning.component.d.ts +2 -0
- package/lib/component/transaction-header/transaction-header/style/_layout.scss +4 -0
- package/lib/component/transaction-line/transaction-planning-line/transaction-planning-line.component.d.ts +3 -2
- package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/transaction-lines-side-panel-service-order.component.d.ts +2 -0
- package/lib/component/transaction-quick-access/transaction-quick-access-planning/transaction-quick-access-planning.component.d.ts +1 -0
- package/lib/component/transaction-quick-access/transaction-quick-access-send-method-base.component.d.ts +1 -1
- package/lib/component/transaction-service-overview/style/_layout.scss +14 -6
- package/lib/enum/checkout-cfg-name.enum.d.ts +2 -0
- package/lib/enum/delivery-planning-update-actions.enum.d.ts +6 -0
- package/lib/enum/transaction-cfg-name.enum.d.ts +12 -1
- package/lib/service/transaction-connector-adapter.service.d.ts +1 -0
- package/lib/service/transaction-connector.service.d.ts +1 -0
- package/package.json +2 -2
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { QueryList } from '@angular/core';
|
|
2
1
|
import { TransactionConnectorService } from "../../../service/transaction-connector.service";
|
|
3
2
|
import { DeliveryPlanningCalendarModes } from "../../../enum/delivery-planning-calendar-modes.enum";
|
|
4
3
|
import { CalendarView } from '@colijnit/sharedcomponents';
|
|
@@ -14,19 +13,18 @@ import { District } from "@colijnit/transactionapi/build/model/district.bo";
|
|
|
14
13
|
import { Skill } from "@colijnit/transactionapi/build/model/skill.bo";
|
|
15
14
|
import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
|
|
16
15
|
import { UserGroup } from "@colijnit/transactionapi/build/model/user-group.bo";
|
|
17
|
-
import { DeliveryPlanningOverviewTileComponent } from "../../delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component";
|
|
18
16
|
import { DeliveryPlanningTileModes } from "../../../enum/delivery-planning-tile-modes.enum";
|
|
19
17
|
import { Subject } from "rxjs";
|
|
20
18
|
export declare class DeliveryPlanningService {
|
|
21
19
|
private _transaction;
|
|
22
20
|
private _dragging;
|
|
23
21
|
private _planTransportWeek;
|
|
22
|
+
private _planTransportWeekArr;
|
|
24
23
|
private _deliveryMethods;
|
|
25
24
|
private _districts;
|
|
26
25
|
private _skills;
|
|
27
26
|
private _employees;
|
|
28
27
|
private _userGroups;
|
|
29
|
-
private _tilesQueryList;
|
|
30
28
|
currentCalendarMode: DeliveryPlanningCalendarModes;
|
|
31
29
|
currentTileMode: DeliveryPlanningTileModes;
|
|
32
30
|
datePlanningMode: CalendarView;
|
|
@@ -34,19 +32,23 @@ export declare class DeliveryPlanningService {
|
|
|
34
32
|
currentPlanningMode: DeliveryPlanningModes;
|
|
35
33
|
currentPlanning: Planning;
|
|
36
34
|
currentStartDate: Date;
|
|
35
|
+
planOrderDate: Date;
|
|
37
36
|
currentTransId: number;
|
|
37
|
+
deletingOrder: PlanOrder;
|
|
38
38
|
linesPlanOrder: PlanOrder;
|
|
39
39
|
availabilityCheckEvent: Subject<number>;
|
|
40
|
+
reRenderHourScheduling: Subject<void>;
|
|
40
41
|
get dragging(): boolean;
|
|
41
42
|
get planTransportWeek(): PlanningTransportWeek[];
|
|
43
|
+
get planTransportWeekArr(): PlanningTransportWeekDay[][];
|
|
42
44
|
get deliveryMethods(): DeliveryMethod[];
|
|
43
45
|
get districts(): District[];
|
|
44
46
|
get employees(): RelationListObject[];
|
|
45
47
|
get skills(): Skill[];
|
|
46
48
|
get userGroups(): UserGroup[];
|
|
47
|
-
get queryList(): QueryList<DeliveryPlanningOverviewTileComponent>;
|
|
48
49
|
set dragging(value: boolean);
|
|
49
50
|
set planTransportWeek(value: PlanningTransportWeek[]);
|
|
51
|
+
set planTransportWeekArr(value: PlanningTransportWeekDay[][]);
|
|
50
52
|
set deliveryMethods(methods: DeliveryMethod[]);
|
|
51
53
|
set districts(districts: District[]);
|
|
52
54
|
set employees(employees: RelationListObject[]);
|
|
@@ -56,8 +58,10 @@ export declare class DeliveryPlanningService {
|
|
|
56
58
|
getOrderSequenceValue(): Promise<number>;
|
|
57
59
|
getTransportOrders(planningTransportWeekDay: PlanningTransportWeekDay): Promise<PlanningTransportWeekDay>;
|
|
58
60
|
makeOrderLinesPlannedRequest(order: PlanOrder): OrderLinesPlannedRequest;
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
61
|
+
getPlanningTransportWeek(): Promise<void>;
|
|
62
|
+
updatePlanningTransportValues(): Promise<void>;
|
|
63
|
+
private _updateChangedProperties;
|
|
64
|
+
convertPlanningTransportWeekToArray(planningTransportWeek: PlanningTransportWeek[]): PlanningTransportWeekDay[][];
|
|
65
|
+
convertToPlanTransportWeek(nestedArray: PlanningTransportWeekDay[][]): PlanningTransportWeek[];
|
|
62
66
|
totalAssemblyTime(planOrder: PlanOrder): number;
|
|
63
67
|
}
|
|
@@ -3,10 +3,10 @@ import { IconCacheService } from "../../../../../../service/icon-cache.service";
|
|
|
3
3
|
import { Icon } from "../../../../../../enum/icon.enum";
|
|
4
4
|
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
5
5
|
import { PlanningTransportWeekDay } from "@colijnit/transactionapi/build/model/planning-transport-week-day.bo";
|
|
6
|
-
import { PlanningTransportWeek } from "@colijnit/transactionapi/build/model/planning-transport-week.bo";
|
|
7
6
|
import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
|
|
8
7
|
import { TransactionService } from "../../../../../../service/transaction.service";
|
|
9
8
|
import { DeliveryPlanningService } from "../../../../../delivery-planning/service/delivery-planning.service";
|
|
9
|
+
import { InputTextComponent } from "@colijnit/corecomponents_v12";
|
|
10
10
|
export declare class DeliveryPlanningOverviewPopupComponent implements OnDestroy {
|
|
11
11
|
iconCacheService: IconCacheService;
|
|
12
12
|
private _transaction;
|
|
@@ -17,18 +17,21 @@ export declare class DeliveryPlanningOverviewPopupComponent implements OnDestroy
|
|
|
17
17
|
transaction: TransactionInfoResponse;
|
|
18
18
|
set transportDay(transportWeekDay: PlanningTransportWeekDay);
|
|
19
19
|
get transportDay(): PlanningTransportWeekDay;
|
|
20
|
-
week:
|
|
20
|
+
week: PlanningTransportWeekDay[];
|
|
21
21
|
closeEvent: EventEmitter<void>;
|
|
22
|
-
onSucceededPlanAction: EventEmitter<[PlanOrder, PlanningTransportWeekDay,
|
|
22
|
+
onSucceededPlanAction: EventEmitter<[PlanOrder, PlanningTransportWeekDay, PlanningTransportWeekDay[]]>;
|
|
23
|
+
startTimeCompRef: InputTextComponent;
|
|
24
|
+
endTimeCompRef: InputTextComponent;
|
|
23
25
|
showClass(): boolean;
|
|
24
26
|
constructor(iconCacheService: IconCacheService, _transaction: TransactionService, deliveryPlanningService: DeliveryPlanningService);
|
|
25
27
|
ngOnDestroy(): void;
|
|
26
28
|
impactTime(): number;
|
|
27
29
|
closePopup(): void;
|
|
28
30
|
handleCommitClick(): void;
|
|
29
|
-
startTimeForOrder():
|
|
30
|
-
endTimeForOrder():
|
|
31
|
-
handleStartTimeChange(
|
|
32
|
-
handleEndTimeChange(
|
|
31
|
+
startTimeForOrder(): string;
|
|
32
|
+
endTimeForOrder(): string;
|
|
33
|
+
handleStartTimeChange(): void;
|
|
34
|
+
handleEndTimeChange(): void;
|
|
33
35
|
handleInitialTimePlanning(transportWeekDay: PlanningTransportWeekDay): void;
|
|
36
|
+
handleDateChange(text: string): Date;
|
|
34
37
|
}
|
|
@@ -8,7 +8,7 @@ export declare class DeliveryPlanningOverviewShortLineComponent {
|
|
|
8
8
|
showNoteDialog: boolean;
|
|
9
9
|
expanded: boolean;
|
|
10
10
|
order: PlanOrder;
|
|
11
|
-
|
|
11
|
+
deleteOrderEvent: EventEmitter<PlanOrder>;
|
|
12
12
|
showClass(): boolean;
|
|
13
13
|
constructor(iconCacheService: IconCacheService);
|
|
14
14
|
handleDeleteLineClick(order: PlanOrder): void;
|
|
@@ -11,11 +11,18 @@ export declare class DeliveryPlanningOverviewTileLineComponent {
|
|
|
11
11
|
orderLines: boolean;
|
|
12
12
|
order: PlanOrder;
|
|
13
13
|
isActive: boolean;
|
|
14
|
-
|
|
14
|
+
deleteOrderEvent: EventEmitter<PlanOrder>;
|
|
15
|
+
deleteOrderLineEvent: EventEmitter<{
|
|
16
|
+
order: PlanOrder;
|
|
17
|
+
line: PlanOrderLine;
|
|
18
|
+
}>;
|
|
19
|
+
editOrderEvent: EventEmitter<PlanOrder>;
|
|
15
20
|
showClass(): boolean;
|
|
16
21
|
constructor(iconCacheService: IconCacheService);
|
|
17
|
-
|
|
22
|
+
handleDeleteOrderClick(order: PlanOrder): void;
|
|
23
|
+
handleDeleteOrderLineClick(order: PlanOrder, line: PlanOrderLine): void;
|
|
18
24
|
setLinesActive(): void;
|
|
19
25
|
showOrderLines(event: Event): void;
|
|
20
26
|
getPlannedLines(lines: PlanOrderLine[]): PlanOrderLine[];
|
|
27
|
+
handleEditOrderEvent(planOrder: PlanOrder): void;
|
|
21
28
|
}
|
|
@@ -1,13 +1,24 @@
|
|
|
1
|
-
import { OnInit } from "@angular/core";
|
|
1
|
+
import { ChangeDetectorRef, OnInit } from "@angular/core";
|
|
2
2
|
export declare class DeliveryPlanningTileStatusComponent implements OnInit {
|
|
3
|
-
|
|
4
|
-
timeTotal: number;
|
|
5
|
-
currentVolume: number;
|
|
6
|
-
currentTimeTotal: number;
|
|
3
|
+
private _changeDetector;
|
|
7
4
|
volumePercent: number;
|
|
8
5
|
timePercent: number;
|
|
6
|
+
private _maxVolume;
|
|
7
|
+
private _timeTotal;
|
|
8
|
+
private _currentVolume;
|
|
9
|
+
private _currentTimeTotal;
|
|
10
|
+
get maxVolume(): number;
|
|
11
|
+
set maxVolume(value: number);
|
|
12
|
+
get timeTotal(): number;
|
|
13
|
+
set timeTotal(value: number);
|
|
14
|
+
get currentVolume(): number;
|
|
15
|
+
set currentVolume(value: number);
|
|
16
|
+
get currentTimeTotal(): number;
|
|
17
|
+
set currentTimeTotal(value: number);
|
|
9
18
|
showClass(): boolean;
|
|
10
|
-
constructor();
|
|
19
|
+
constructor(_changeDetector: ChangeDetectorRef);
|
|
11
20
|
ngOnInit(): void;
|
|
12
|
-
|
|
21
|
+
calculateVolumePercent(): void;
|
|
22
|
+
calculateTimePercent(): void;
|
|
23
|
+
calculatePercentages(): void;
|
|
13
24
|
}
|
|
@@ -45,6 +45,11 @@
|
|
|
45
45
|
position: absolute;
|
|
46
46
|
top: 4px;
|
|
47
47
|
}
|
|
48
|
+
&.overload {
|
|
49
|
+
&::before {
|
|
50
|
+
background: $status-overload-colour;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
48
53
|
}
|
|
49
54
|
.volume-wrapper::before {
|
|
50
55
|
content: '';
|
|
@@ -54,6 +59,7 @@
|
|
|
54
59
|
height: 100%;
|
|
55
60
|
background: $status-first-colour;
|
|
56
61
|
white-space: nowrap;
|
|
62
|
+
max-width:100%;
|
|
57
63
|
}
|
|
58
64
|
|
|
59
65
|
.time-wrapper {
|
|
@@ -63,6 +69,11 @@
|
|
|
63
69
|
position: absolute;
|
|
64
70
|
top: 4px;
|
|
65
71
|
}
|
|
72
|
+
&.overload {
|
|
73
|
+
&::before {
|
|
74
|
+
background: $status-overload-colour;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
66
77
|
}
|
|
67
78
|
.time-wrapper::before {
|
|
68
79
|
content: '';
|
|
@@ -72,6 +83,7 @@
|
|
|
72
83
|
height: 100%;
|
|
73
84
|
background: $status-second-colour;
|
|
74
85
|
white-space: nowrap;
|
|
86
|
+
max-width: 100%;
|
|
75
87
|
}
|
|
76
88
|
}
|
|
77
89
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventEmitter, OnInit } from "@angular/core";
|
|
1
|
+
import { EventEmitter, OnDestroy, OnInit } from "@angular/core";
|
|
2
2
|
import { CdkDragDrop } from '@angular/cdk/drag-drop';
|
|
3
3
|
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
4
4
|
import { PlanningTransportWeekDay } from "@colijnit/transactionapi/build/model/planning-transport-week-day.bo";
|
|
@@ -7,34 +7,48 @@ import { DeliveryPlanningService } from "../../../../../delivery-planning/servic
|
|
|
7
7
|
import { Icon } from "../../../../../../enum/icon.enum";
|
|
8
8
|
import { IconCacheService } from "../../../../../../service/icon-cache.service";
|
|
9
9
|
import { DeliveryPlanningTileModes } from "../../../../../../enum/delivery-planning-tile-modes.enum";
|
|
10
|
-
|
|
10
|
+
import { HourSchedulingComponent } from "@colijnit/corecomponents_v12";
|
|
11
|
+
import { PlanOrderLine } from "@colijnit/transactionapi/build/model/plan-order-line.bo";
|
|
12
|
+
export declare class DeliveryPlanningOverviewTileComponent implements OnInit, OnDestroy {
|
|
11
13
|
private _datePipe;
|
|
12
14
|
private _deliveryPlanningService;
|
|
13
15
|
iconCacheService: IconCacheService;
|
|
14
16
|
readonly icons: typeof Icon;
|
|
15
17
|
readonly tileModes: typeof DeliveryPlanningTileModes;
|
|
16
18
|
ordersLoaded: boolean;
|
|
19
|
+
private _subs;
|
|
17
20
|
disabled: boolean;
|
|
18
21
|
transportDay: PlanningTransportWeekDay;
|
|
19
22
|
expandedEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
20
|
-
|
|
23
|
+
deleteOrderEvent: EventEmitter<[PlanOrder, PlanningTransportWeekDay]>;
|
|
24
|
+
deleteOrderLineEvent: EventEmitter<{
|
|
25
|
+
order: PlanOrder;
|
|
26
|
+
line: PlanOrderLine;
|
|
27
|
+
}>;
|
|
28
|
+
editOrderEvent: EventEmitter<PlanOrder>;
|
|
21
29
|
getTransportOrdersEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
22
|
-
|
|
30
|
+
timeChangeEvent: EventEmitter<Object>;
|
|
23
31
|
openSettingsDialogEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
24
32
|
calendarPlanEvent: EventEmitter<{
|
|
25
33
|
currentHour: string;
|
|
26
34
|
data: string;
|
|
27
35
|
}>;
|
|
36
|
+
hourSchedulingComp: HourSchedulingComponent;
|
|
28
37
|
get tileMode(): DeliveryPlanningTileModes;
|
|
29
38
|
expanded: boolean;
|
|
30
39
|
showClass(): boolean;
|
|
31
40
|
constructor(_datePipe: DatePipe, _deliveryPlanningService: DeliveryPlanningService, iconCacheService: IconCacheService);
|
|
32
41
|
ngOnInit(): Promise<void>;
|
|
42
|
+
ngOnDestroy(): Promise<void>;
|
|
33
43
|
drop(event: CdkDragDrop<string[]>): void;
|
|
34
44
|
handleDrop(event: DragEvent): void;
|
|
35
45
|
formattedDate(date: Date): string;
|
|
36
46
|
expandedChange(): void;
|
|
37
|
-
|
|
47
|
+
handleDeleteOrderClick(order: PlanOrder): void;
|
|
48
|
+
handleDeleteOrderLineClick(data: {
|
|
49
|
+
order: PlanOrder;
|
|
50
|
+
line: PlanOrderLine;
|
|
51
|
+
}): void;
|
|
38
52
|
handleSettingsSave(): void;
|
|
39
53
|
onCustomDragStart(event: DragEvent, obj: PlanOrder): void;
|
|
40
54
|
openSettingsDialog(): void;
|
|
@@ -43,4 +57,5 @@ export declare class DeliveryPlanningOverviewTileComponent implements OnInit {
|
|
|
43
57
|
currentHour: string;
|
|
44
58
|
data: string;
|
|
45
59
|
}): void;
|
|
60
|
+
handleEditOrderEvent(planOrder: PlanOrder): void;
|
|
46
61
|
}
|
|
@@ -14,6 +14,8 @@ import { DeliveryPlanningOverviewTileComponent } from "./component/delivery-plan
|
|
|
14
14
|
import { IconCacheService } from "../../../../service/icon-cache.service";
|
|
15
15
|
import { Icon } from "../../../../enum/icon.enum";
|
|
16
16
|
import { DeliveryPlanningTileModes } from "../../../../enum/delivery-planning-tile-modes.enum";
|
|
17
|
+
import { DeliveryPlanningUpdateActions } from "../../../../enum/delivery-planning-update-actions.enum";
|
|
18
|
+
import { PlanOrderLine } from "@colijnit/transactionapi/build/model/plan-order-line.bo";
|
|
17
19
|
export declare class DeliveryPlanningOverviewComponent implements AfterViewChecked {
|
|
18
20
|
private _deliveryPlanningService;
|
|
19
21
|
private _transaction;
|
|
@@ -22,6 +24,7 @@ export declare class DeliveryPlanningOverviewComponent implements AfterViewCheck
|
|
|
22
24
|
private _changeDetector;
|
|
23
25
|
iconCacheService: IconCacheService;
|
|
24
26
|
readonly icons: typeof Icon;
|
|
27
|
+
readonly planningActions: typeof DeliveryPlanningUpdateActions;
|
|
25
28
|
readonly tileModes: typeof DeliveryPlanningTileModes;
|
|
26
29
|
deliveryPlanningViewModes: typeof DeliveryPlanningViewModes;
|
|
27
30
|
availability: {
|
|
@@ -37,24 +40,28 @@ export declare class DeliveryPlanningOverviewComponent implements AfterViewCheck
|
|
|
37
40
|
currentMode: DeliveryPlanningCalendarModes;
|
|
38
41
|
currentViewMode: CalendarView;
|
|
39
42
|
currentPlanningViewMode: DeliveryPlanningViewModes;
|
|
40
|
-
updatePlanningTransportEvent: EventEmitter<
|
|
43
|
+
updatePlanningTransportEvent: EventEmitter<{
|
|
44
|
+
oldWeek: PlanningTransportWeekDay[];
|
|
45
|
+
week: PlanningTransportWeekDay[];
|
|
46
|
+
action: DeliveryPlanningUpdateActions;
|
|
47
|
+
}>;
|
|
41
48
|
resetPlanningTransportEvent: EventEmitter<void>;
|
|
42
49
|
tileSize: number;
|
|
43
50
|
planningPopupRef: DeliveryPlanningOverviewPopupComponent;
|
|
44
|
-
date: Date;
|
|
45
51
|
available: boolean;
|
|
46
52
|
showNoteDialog: boolean;
|
|
47
53
|
showSettingsDialog: boolean;
|
|
48
54
|
tilesQueryList: QueryList<DeliveryPlanningOverviewTileComponent>;
|
|
49
55
|
selectedTransportDay: PlanningTransportWeekDay;
|
|
50
|
-
get
|
|
56
|
+
get planTransportWeekArr(): PlanningTransportWeekDay[][];
|
|
51
57
|
get currentTileMode(): DeliveryPlanningTileModes;
|
|
52
58
|
set currentTileMode(tileMode: DeliveryPlanningTileModes);
|
|
59
|
+
currentDate(): Date;
|
|
53
60
|
constructor(_deliveryPlanningService: DeliveryPlanningService, _transaction: TransactionService, _transactionCon: TransactionConnectorService, _dialog: DialogService, _changeDetector: ChangeDetectorRef, iconCacheService: IconCacheService);
|
|
54
61
|
ngAfterViewChecked(): void;
|
|
55
62
|
showClass(): boolean;
|
|
56
63
|
onResize(event: any): void;
|
|
57
|
-
dropped(ev: DragEvent, week:
|
|
64
|
+
dropped(ev: DragEvent, week: PlanningTransportWeekDay[], transportDay: PlanningTransportWeekDay, transportDays: PlanningTransportWeekDay[]): Promise<void>;
|
|
58
65
|
allowDrop(ev: any, transportDay: PlanningTransportWeekDay): boolean;
|
|
59
66
|
setColNum(): void;
|
|
60
67
|
dragEnd(ev: any): void;
|
|
@@ -62,25 +69,31 @@ export declare class DeliveryPlanningOverviewComponent implements AfterViewCheck
|
|
|
62
69
|
filterWeekArray(weekArray: PlanningTransportWeekDay[]): PlanningTransportWeekDay[];
|
|
63
70
|
addHours(date: any, hours: any): any;
|
|
64
71
|
handleDateRangeChange(newDate: Date): void;
|
|
65
|
-
handleDeleteOrder(deleteResult: [PlanOrder, PlanningTransportWeekDay], planningTransportWeek:
|
|
72
|
+
handleDeleteOrder(deleteResult: [PlanOrder, PlanningTransportWeekDay], planningTransportWeek: PlanningTransportWeekDay[]): Promise<void>;
|
|
73
|
+
handleDeleteLine(deleteResult: {
|
|
74
|
+
order: PlanOrder;
|
|
75
|
+
line: PlanOrderLine;
|
|
76
|
+
}, weekDay: PlanningTransportWeekDay, transportWeekRow: PlanningTransportWeekDay[]): void;
|
|
66
77
|
getOrderLinesPlanned(order: PlanOrder): Promise<void>;
|
|
67
78
|
getTransportOrders(order: PlanOrder, transportDay: PlanningTransportWeekDay): Promise<void>;
|
|
68
|
-
planOrderLines(order: PlanOrder, transportDay: PlanningTransportWeekDay, week:
|
|
69
|
-
planSelectedLines(transportDay: PlanningTransportWeekDay, week:
|
|
79
|
+
planOrderLines(order: PlanOrder, transportDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[]): Promise<void>;
|
|
80
|
+
planSelectedLines(transportDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[]): Promise<void>;
|
|
70
81
|
getSequenceOrderValue(order: PlanOrder): Promise<void>;
|
|
71
|
-
handlePopupPlanEvent(event: [PlanOrder, PlanningTransportWeekDay,
|
|
82
|
+
handlePopupPlanEvent(event: [PlanOrder, PlanningTransportWeekDay, PlanningTransportWeekDay[]]): Promise<void>;
|
|
72
83
|
handleSettingsSave(changed: boolean): void;
|
|
73
84
|
openSettingsDialog(transportDay: PlanningTransportWeekDay): void;
|
|
74
85
|
handleCalendarPlanEvent(data: {
|
|
75
86
|
currentHour: string;
|
|
76
87
|
data: string;
|
|
77
|
-
}, transportWeekDay: PlanningTransportWeekDay, week:
|
|
88
|
+
}, transportWeekDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[]): Promise<void>;
|
|
78
89
|
calculateStartTime(transportWeekDay: PlanningTransportWeekDay, currentHour: string): Date;
|
|
79
90
|
calculateEndTime(startDate: Date, currentHour: string, planOrder: PlanOrder): Date;
|
|
80
|
-
openPlanningPopup(planOrder: PlanOrder, transportDay: PlanningTransportWeekDay, week:
|
|
91
|
+
openPlanningPopup(planOrder: PlanOrder, transportDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[]): void;
|
|
81
92
|
handleAvailabilityChecked(value: {
|
|
82
93
|
transportDay: PlanningTransportWeekDay;
|
|
83
94
|
available: boolean;
|
|
84
95
|
}): void;
|
|
85
96
|
checkAvailable(transportDay: PlanningTransportWeekDay): boolean;
|
|
97
|
+
handleTimeChangeEvent(transportDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[], obj: Object): void;
|
|
98
|
+
handleEditPlannedOrder(planOrder: PlanOrder, transportDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[]): void;
|
|
86
99
|
}
|
|
@@ -4,26 +4,33 @@ import { DeliveryPlanningService } from "../delivery-planning/service/delivery-p
|
|
|
4
4
|
import { SearchViewModeService } from "../search/search-view-mode.service";
|
|
5
5
|
import { CalendarView } from '@colijnit/sharedcomponents';
|
|
6
6
|
import { Planning } from "@colijnit/transactionapi/build/model/planning.bo";
|
|
7
|
-
import { PlanningTransportWeek } from "@colijnit/transactionapi/build/model/planning-transport-week.bo";
|
|
8
7
|
import { TransactionConnectorService } from "../../service/transaction-connector.service";
|
|
8
|
+
import { TransactionEventService } from "../../service/transaction-event.service";
|
|
9
|
+
import { DeliveryPlanningUpdateActions } from "../../enum/delivery-planning-update-actions.enum";
|
|
10
|
+
import { PlanningTransportWeekDay } from "@colijnit/transactionapi/build/model/planning-transport-week-day.bo";
|
|
9
11
|
export declare class DeliveryPlanningMainComponent implements OnInit, AfterViewInit {
|
|
10
12
|
private _deliveryPlanningService;
|
|
11
13
|
private _viewModeService;
|
|
12
14
|
private _transaction;
|
|
13
15
|
private _changeDetector;
|
|
16
|
+
private _transactionEventService;
|
|
14
17
|
planning: Planning;
|
|
15
|
-
fullPlanningTransportWeek: PlanningTransportWeek[];
|
|
16
18
|
get currentMode(): DeliveryPlanningCalendarModes;
|
|
17
19
|
get currentViewMode(): CalendarView;
|
|
18
20
|
get currentStartDate(): Date;
|
|
21
|
+
set currentStartDate(date: Date);
|
|
19
22
|
showClass(): boolean;
|
|
20
|
-
constructor(_deliveryPlanningService: DeliveryPlanningService, _viewModeService: SearchViewModeService, _transaction: TransactionConnectorService, _changeDetector: ChangeDetectorRef);
|
|
23
|
+
constructor(_deliveryPlanningService: DeliveryPlanningService, _viewModeService: SearchViewModeService, _transaction: TransactionConnectorService, _changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService);
|
|
21
24
|
ngOnInit(): void;
|
|
22
25
|
ngAfterViewInit(): void;
|
|
23
26
|
planningChanged(planning: Planning): void;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
updatePlanTransportWeek(updateData: {
|
|
28
|
+
oldWeek: PlanningTransportWeekDay[];
|
|
29
|
+
week: PlanningTransportWeekDay[];
|
|
30
|
+
action: DeliveryPlanningUpdateActions;
|
|
31
|
+
}): Promise<void>;
|
|
32
|
+
updateNewValues(): Promise<void>;
|
|
33
|
+
resetPlanningTransportWeek(): Promise<void>;
|
|
34
|
+
getPlanningTransportWeek(): Promise<void>;
|
|
28
35
|
getListData(): void;
|
|
29
36
|
}
|
|
@@ -16,7 +16,9 @@
|
|
|
16
16
|
padding: 12px;
|
|
17
17
|
width: 100%;
|
|
18
18
|
|
|
19
|
-
co-input-number-picker,
|
|
19
|
+
co-input-number-picker,
|
|
20
|
+
.transaction-card-price,
|
|
21
|
+
co-input-text {
|
|
20
22
|
display: flex;
|
|
21
23
|
align-items: center;
|
|
22
24
|
justify-content: center;
|
|
@@ -25,16 +27,27 @@
|
|
|
25
27
|
width: auto;
|
|
26
28
|
min-width: 100px;
|
|
27
29
|
height: 26px;
|
|
30
|
+
|
|
28
31
|
.co-input-text {
|
|
29
32
|
border: none;
|
|
33
|
+
|
|
30
34
|
input {
|
|
31
35
|
margin: 4px 0 0;
|
|
32
36
|
}
|
|
33
37
|
}
|
|
38
|
+
|
|
34
39
|
&.price {
|
|
35
40
|
width: auto;
|
|
36
41
|
font-weight: bold;
|
|
37
42
|
}
|
|
43
|
+
|
|
44
|
+
&.warning {
|
|
45
|
+
border-color: $tp-color-error;
|
|
46
|
+
|
|
47
|
+
&:before {
|
|
48
|
+
box-shadow: inset 0 0 0 1px $tp-color-error;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
38
51
|
}
|
|
39
52
|
|
|
40
53
|
.transaction-card-content-wrapper {
|
|
@@ -30,4 +30,6 @@ export declare class TransactionCardPlanningComponent extends TransactionBaseCom
|
|
|
30
30
|
statusBarConfigNames: StatusBarCfgNames;
|
|
31
31
|
discountConfigNames: LineDiscountCfgNames;
|
|
32
32
|
dragStarted(ev: any): void;
|
|
33
|
+
lineNotPlanned(line: TransactionLineInfo): boolean;
|
|
34
|
+
allowPartialDelivery(): boolean;
|
|
33
35
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChangeDetectorRef, EventEmitter, OnInit } from '@angular/core';
|
|
1
|
+
import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
|
|
2
2
|
import { StockStatus } from '@colijnit/transactionapi/build/enum/refcode/stock-status.enum';
|
|
3
3
|
import { TransactionLineActionButtonsComponent } from '../../transaction-line-action-buttons/transaction-line-action-buttons.component';
|
|
4
4
|
import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
|
|
@@ -14,7 +14,7 @@ import { DictionaryService } from '../../../service/dictionary.service';
|
|
|
14
14
|
import { TransactionService } from '../../../service/transaction.service';
|
|
15
15
|
import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
|
|
16
16
|
import { DeliveryPlanningService } from "../../delivery-planning/service/delivery-planning.service";
|
|
17
|
-
export declare class TransactionPlanningLineComponent extends TransactionBaseComponent implements OnInit {
|
|
17
|
+
export declare class TransactionPlanningLineComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
|
|
18
18
|
private _deliveryPlanningService;
|
|
19
19
|
transactionEventService: TransactionEventService;
|
|
20
20
|
iconCacheService: IconCacheService;
|
|
@@ -39,6 +39,7 @@ export declare class TransactionPlanningLineComponent extends TransactionBaseCom
|
|
|
39
39
|
private _subscriptions;
|
|
40
40
|
constructor(_deliveryPlanningService: DeliveryPlanningService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
|
|
41
41
|
ngOnInit(): void;
|
|
42
|
+
ngOnDestroy(): void;
|
|
42
43
|
handleCheckBoxValueChanged(value: boolean, line: TransactionLineInfo): void;
|
|
43
44
|
handleLineClicked(mouseClick: PointerEvent): void;
|
|
44
45
|
dragStarted(ev: any): void;
|
|
@@ -7,6 +7,7 @@ import { TransactionImageService } from '../../../service/transaction-image.serv
|
|
|
7
7
|
import { DictionaryService } from '../../../service/dictionary.service';
|
|
8
8
|
import { TransactionService } from '../../../service/transaction.service';
|
|
9
9
|
import { Icon } from '../../../enum/icon.enum';
|
|
10
|
+
import { TransactionCfgName } from "../../../enum/transaction-cfg-name.enum";
|
|
10
11
|
export declare class TransactionLinesSidePanelServiceOrderComponent extends TransactionBaseComponent implements OnInit {
|
|
11
12
|
transactionEventService: TransactionEventService;
|
|
12
13
|
iconCacheService: IconCacheService;
|
|
@@ -16,6 +17,7 @@ export declare class TransactionLinesSidePanelServiceOrderComponent extends Tran
|
|
|
16
17
|
protected transactionService: TransactionService;
|
|
17
18
|
protected changeDetector: ChangeDetectorRef;
|
|
18
19
|
readonly Icon: typeof Icon;
|
|
20
|
+
readonly cfgNames: typeof TransactionCfgName;
|
|
19
21
|
showClass(): boolean;
|
|
20
22
|
showDetails: boolean;
|
|
21
23
|
image: string;
|
|
@@ -39,4 +39,5 @@ export declare class TransactionQuickAccessPlanningComponent extends Transaction
|
|
|
39
39
|
get selectedLines(): import("@colijnit/transactionapi/build/model/transaction-line-info.bo").TransactionLineInfo[];
|
|
40
40
|
togglePopup(): void;
|
|
41
41
|
allowPartialDelivery(): boolean;
|
|
42
|
+
isOrderFullyPlanned(): boolean;
|
|
42
43
|
}
|
|
@@ -38,7 +38,7 @@ export declare abstract class TransactionQuickAccessSendMethodBaseComponent exte
|
|
|
38
38
|
defaultSendMethodIcon: string;
|
|
39
39
|
emailAddresses: string[];
|
|
40
40
|
showSendMethodDialog: boolean;
|
|
41
|
-
sendMethods: import("@colijnit/sharedcomponents").ɵ
|
|
41
|
+
sendMethods: import("@colijnit/sharedcomponents").ɵbs[];
|
|
42
42
|
showLoader: boolean;
|
|
43
43
|
signatureDocumentId: number;
|
|
44
44
|
historicReports: HistoricReport[];
|
|
@@ -4,7 +4,9 @@
|
|
|
4
4
|
height: 100%;
|
|
5
5
|
display: flex;
|
|
6
6
|
.service-order-lines-wrapper {
|
|
7
|
-
|
|
7
|
+
flex: 1;
|
|
8
|
+
padding-left: 60px;
|
|
9
|
+
max-width: 800px;
|
|
8
10
|
display: flex;
|
|
9
11
|
flex-direction: column;
|
|
10
12
|
gap: 15px;
|
|
@@ -106,16 +108,23 @@
|
|
|
106
108
|
.service-message-and-image-wrapper {
|
|
107
109
|
display: flex;
|
|
108
110
|
flex-direction: row;
|
|
109
|
-
gap:
|
|
111
|
+
gap: 60px;
|
|
110
112
|
padding: 0 0 15px 0;
|
|
111
113
|
margin-bottom: 15px;
|
|
112
114
|
border-bottom: 5px solid #F4F4F9;
|
|
115
|
+
|
|
113
116
|
.service-message-wrapper {
|
|
114
|
-
width: 65%;
|
|
115
|
-
height: 100%;
|
|
116
117
|
display: flex;
|
|
117
|
-
flex-direction: column;
|
|
118
118
|
gap: 10px;
|
|
119
|
+
flex: 1;
|
|
120
|
+
justify-content: space-between;
|
|
121
|
+
.service-message {
|
|
122
|
+
display: flex;
|
|
123
|
+
flex-direction: column;
|
|
124
|
+
gap: 10px;
|
|
125
|
+
width: 65%;
|
|
126
|
+
height: 100%;
|
|
127
|
+
}
|
|
119
128
|
.transaction-service-message {
|
|
120
129
|
min-height: 80px;
|
|
121
130
|
.co-input-text {
|
|
@@ -157,7 +166,6 @@
|
|
|
157
166
|
}
|
|
158
167
|
|
|
159
168
|
.co-files-upload {
|
|
160
|
-
width: 35%;
|
|
161
169
|
min-height: auto;
|
|
162
170
|
overflow-x: auto;
|
|
163
171
|
.co-drag-drop-container {
|
|
@@ -38,6 +38,8 @@ export declare enum CheckoutCfgName {
|
|
|
38
38
|
DepositAmount = "depositAmount",
|
|
39
39
|
Branch = "branch",
|
|
40
40
|
AdministrativeManager = "administrativeManager",
|
|
41
|
+
SalesPerson = "salesPerson",
|
|
42
|
+
PaymentCondition = "paymentCondition",
|
|
41
43
|
MarketingCode = "marketingCode",
|
|
42
44
|
Definitive = "definitive",
|
|
43
45
|
OnHoldCodes = "onHoldCodes"
|
|
@@ -154,5 +154,16 @@ export declare enum TransactionCfgName {
|
|
|
154
154
|
LineQuantityToReceive = "lineQuantityToReceive",
|
|
155
155
|
StickerAmount = "stickerAmount",
|
|
156
156
|
LineWarehouseLocationReceived = "lineWarehouseLocationReceived",
|
|
157
|
-
ServiceMessage = "serviceMessage"
|
|
157
|
+
ServiceMessage = "serviceMessage",
|
|
158
|
+
ServiceWizardMessage = "serviceWizardMessage",
|
|
159
|
+
ServiceOverviewImage = "serviceOverviewImage",
|
|
160
|
+
ServicePriority = "servicePriority",
|
|
161
|
+
ServiceCauseCode = "serviceCauseCode",
|
|
162
|
+
ServiceEntryType = "serviceEntryType",
|
|
163
|
+
HeaderTaskCreator = "headerTaskCreator",
|
|
164
|
+
HeaderActivityList = "headerActivityList",
|
|
165
|
+
HeaderHistActivities = "headerHistActivities",
|
|
166
|
+
HeaderProductDetails = "headerProductDetails",
|
|
167
|
+
HeaderOrderDetails = "headerOrderDetails",
|
|
168
|
+
HeaderPurchaseDetails = "headerPurchaseDetails"
|
|
158
169
|
}
|
|
@@ -504,6 +504,7 @@ export declare class TransactionConnectorAdapterService {
|
|
|
504
504
|
getEmployees(): Promise<RelationListObject[]>;
|
|
505
505
|
getSkills(): Promise<Skill[]>;
|
|
506
506
|
getUserGroups(): Promise<UserGroup[]>;
|
|
507
|
+
restoreDeliverySettings(ordersToBeRestored: PlanOrder[]): Promise<boolean>;
|
|
507
508
|
private _openPdfContent;
|
|
508
509
|
private _handleExceptionFromResponse;
|
|
509
510
|
private _handleMessageFromSuccessResponse;
|