@bjsdistribution/dms-client-return 0.1.7-prod → 0.1.8-prod
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/dist/components/order-view/notes/order-dropdown/NewReturnDropdown.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/BaseChargeConfirmationModal.d.ts +7 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/ForceDebriefModal.d.ts +11 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/Selector.d.ts +11 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/charges/adhoc/index.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/charges/base-charge/index.d.ts +8 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/charges/collection-add-ons/index.d.ts +7 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/charges/delivery-add-ons/index.d.ts +7 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/charges/disposal-charges/index.d.ts +7 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/charges/order-charges/index.d.ts +7 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/escalation/EscalationCategory.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/escalation/EscalationLevel.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/escalation/EscalationReason.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/escalation/index.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/notifications/FlagsTemplate.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/notifications/OrderTemplate.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/notifications/Tabs.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/notifications/index.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/RadioButtons.d.ts +7 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/CancellationReasonDropdown.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/FailureReasonDropdown.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/OrderHoldReasonDropdown.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/StatusDropdown.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/ZoneDropdown.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/failure-content/index.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/index.d.ts +4 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/order-info/success-content/index.d.ts +3 -0
- package/dist/components/order-view/order-actions/actions/force-debrief/styles.d.ts +8 -0
- package/dist/components/order-view/products-info/expanded-content/index.d.ts +4 -1
- package/dist/components/order-view/return-client-products/ProductTable.d.ts +4 -1
- package/dist/components/order-view/return-client-products/product-table/ReturnProductTable.d.ts +4 -1
- package/dist/components/order-view/store.d.ts +14 -2
- package/dist/components/order-view/types.d.ts +49 -1
- package/dist/components/order-view/utils.d.ts +3 -0
- package/dist/dms-client-return.cjs.development.js +2636 -335
- package/dist/dms-client-return.cjs.development.js.map +1 -1
- package/dist/dms-client-return.cjs.production.min.js +1 -1
- package/dist/dms-client-return.cjs.production.min.js.map +1 -1
- package/dist/dms-client-return.esm.js +2700 -399
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +5 -3
- package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx +43 -15
- package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx +24 -11
- package/src/components/order-view/details-filters/right-side-filters/Details.tsx +28 -3
- package/src/components/order-view/index.tsx +29 -0
- package/src/components/order-view/notes/AddNote.tsx +14 -34
- package/src/components/order-view/notes/order-dropdown/NewReturnDropdown.tsx +8 -10
- package/src/components/order-view/order-actions/actions/force-debrief/BaseChargeConfirmationModal.tsx +94 -0
- package/src/components/order-view/order-actions/actions/force-debrief/ForceDebriefModal.tsx +620 -0
- package/src/components/order-view/order-actions/actions/force-debrief/Selector.tsx +65 -0
- package/src/components/order-view/order-actions/actions/force-debrief/charges/adhoc/index.tsx +94 -0
- package/src/components/order-view/order-actions/actions/force-debrief/charges/base-charge/index.tsx +106 -0
- package/src/components/order-view/order-actions/actions/force-debrief/charges/collection-add-ons/index.tsx +77 -0
- package/src/components/order-view/order-actions/actions/force-debrief/charges/delivery-add-ons/index.tsx +78 -0
- package/src/components/order-view/order-actions/actions/force-debrief/charges/disposal-charges/index.tsx +77 -0
- package/src/components/order-view/order-actions/actions/force-debrief/charges/order-charges/index.tsx +124 -0
- package/src/components/order-view/order-actions/actions/force-debrief/escalation/EscalationCategory.tsx +92 -0
- package/src/components/order-view/order-actions/actions/force-debrief/escalation/EscalationLevel.tsx +90 -0
- package/src/components/order-view/order-actions/actions/force-debrief/escalation/EscalationReason.tsx +122 -0
- package/src/components/order-view/order-actions/actions/force-debrief/escalation/index.tsx +16 -0
- package/src/components/order-view/order-actions/actions/force-debrief/notifications/FlagsTemplate.tsx +46 -0
- package/src/components/order-view/order-actions/actions/force-debrief/notifications/OrderTemplate.tsx +117 -0
- package/src/components/order-view/order-actions/actions/force-debrief/notifications/Tabs.tsx +32 -0
- package/src/components/order-view/order-actions/actions/force-debrief/notifications/index.tsx +180 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/RadioButtons.tsx +201 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/CancellationReasonDropdown.tsx +40 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/FailureReasonDropdown.tsx +108 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/OrderHoldReasonDropdown.tsx +37 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/StatusDropdown.tsx +48 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/dropdowns/ZoneDropdown.tsx +27 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/failure-content/index.tsx +187 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/index.tsx +55 -0
- package/src/components/order-view/order-actions/actions/force-debrief/order-info/success-content/index.tsx +221 -0
- package/src/components/order-view/order-actions/actions/force-debrief/styles.tsx +51 -0
- package/src/components/order-view/order-actions/index.tsx +10 -0
- package/src/components/order-view/order-details/expanded-content/instruction-section/index.tsx +1 -1
- package/src/components/order-view/products-info/expanded-content/index.tsx +27 -11
- package/src/components/order-view/products-info/index.tsx +4 -4
- package/src/components/order-view/return-client-products/ProductTable.tsx +6 -2
- package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx +54 -15
- package/src/components/order-view/store.ts +106 -0
- package/src/components/order-view/types.ts +54 -1
- package/src/components/order-view/utils.ts +37 -0
|
@@ -50,7 +50,8 @@ export type OrderActionsType =
|
|
|
50
50
|
| 'unrelease-order'
|
|
51
51
|
| 'clear-date'
|
|
52
52
|
| 'uncancel-order'
|
|
53
|
-
| 'remove-from-route'
|
|
53
|
+
| 'remove-from-route'
|
|
54
|
+
| 'force-debrief';
|
|
54
55
|
|
|
55
56
|
export interface ChargeLogData {
|
|
56
57
|
id: number;
|
|
@@ -127,6 +128,10 @@ export interface OrderRouteType {
|
|
|
127
128
|
feedback_received?: boolean;
|
|
128
129
|
is_active?: boolean;
|
|
129
130
|
}
|
|
131
|
+
|
|
132
|
+
export interface orderType {
|
|
133
|
+
type: string | null;
|
|
134
|
+
}
|
|
130
135
|
export interface OrdersType {
|
|
131
136
|
depot_id: number | null;
|
|
132
137
|
gsit_order_id: number | null;
|
|
@@ -168,6 +173,7 @@ export interface OrdersType {
|
|
|
168
173
|
recipient_name: any;
|
|
169
174
|
postcode: any;
|
|
170
175
|
carrier_id: number | null;
|
|
176
|
+
order_type: orderType;
|
|
171
177
|
}
|
|
172
178
|
|
|
173
179
|
export type DeleteProds = {
|
|
@@ -269,3 +275,50 @@ export interface CancelOrderProductsType {
|
|
|
269
275
|
product_type?: string;
|
|
270
276
|
previous_product_type?: string;
|
|
271
277
|
}
|
|
278
|
+
|
|
279
|
+
//force debrief
|
|
280
|
+
export interface AdhocCharge {
|
|
281
|
+
adhoc_charges_description: string;
|
|
282
|
+
adhoc_charges: number;
|
|
283
|
+
id: string; // required for state updations only
|
|
284
|
+
}
|
|
285
|
+
export interface ChargesType {
|
|
286
|
+
base_charge_type: number;
|
|
287
|
+
base_charge: number;
|
|
288
|
+
weight: number;
|
|
289
|
+
drop_time: number;
|
|
290
|
+
timed_service: number;
|
|
291
|
+
wait_time: number;
|
|
292
|
+
extra_floor: number;
|
|
293
|
+
bulky_items: number;
|
|
294
|
+
re_label: number;
|
|
295
|
+
extra_cube: number;
|
|
296
|
+
additional_box: number;
|
|
297
|
+
additional_item: number;
|
|
298
|
+
weekend: number;
|
|
299
|
+
re_allocation: number;
|
|
300
|
+
pre_dated: number;
|
|
301
|
+
re_package: number;
|
|
302
|
+
disassemble: number;
|
|
303
|
+
qc: number;
|
|
304
|
+
collection_qc: number;
|
|
305
|
+
return_to_client: number;
|
|
306
|
+
roc: number;
|
|
307
|
+
unpack: number;
|
|
308
|
+
packaging_disposal: number;
|
|
309
|
+
assembly: number;
|
|
310
|
+
debrief_notes: string;
|
|
311
|
+
recycle: number;
|
|
312
|
+
admin: number;
|
|
313
|
+
disposal: number;
|
|
314
|
+
disposal_recycling: number;
|
|
315
|
+
debrief_status: string;
|
|
316
|
+
new_order_status: string;
|
|
317
|
+
adhoc_charges: AdhocCharge[];
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
export interface AdhocCharge {
|
|
321
|
+
adhoc_charges_description: string;
|
|
322
|
+
adhoc_charges: number;
|
|
323
|
+
id: string; // required for state updations only
|
|
324
|
+
}
|
|
@@ -14,7 +14,44 @@ export const capitalize = (input: string) => {
|
|
|
14
14
|
return char.toUpperCase();
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
|
+
export const getBaseUrlSymbol = (): string => {
|
|
18
|
+
const storedSymbol = localStorage.getItem('baseUrlSymbol');
|
|
19
|
+
if (!storedSymbol) {
|
|
20
|
+
localStorage.setItem('baseUrlSymbol', '£');
|
|
21
|
+
return '£';
|
|
22
|
+
}
|
|
23
|
+
return storedSymbol;
|
|
24
|
+
};
|
|
25
|
+
export const handleKeyDownDebrief = (
|
|
26
|
+
e: React.KeyboardEvent<HTMLInputElement>
|
|
27
|
+
) => {
|
|
28
|
+
// Allowed keys: numbers (0-9), '.'
|
|
29
|
+
const allowedKeys = [
|
|
30
|
+
'0',
|
|
31
|
+
'1',
|
|
32
|
+
'2',
|
|
33
|
+
'3',
|
|
34
|
+
'4',
|
|
35
|
+
'5',
|
|
36
|
+
'6',
|
|
37
|
+
'7',
|
|
38
|
+
'8',
|
|
39
|
+
'9',
|
|
40
|
+
'.',
|
|
41
|
+
'ArrowLeft',
|
|
42
|
+
'ArrowRight',
|
|
43
|
+
];
|
|
17
44
|
|
|
45
|
+
// Allow backspace, delete and Tab keys
|
|
46
|
+
if (e.key === 'Backspace' || e.key === 'Delete' || e.key === 'Tab') {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
// Prevent input if key is not in allowedKeys
|
|
51
|
+
if (!allowedKeys.includes(e.key)) {
|
|
52
|
+
e.preventDefault();
|
|
53
|
+
}
|
|
54
|
+
};
|
|
18
55
|
export const RepackData = [
|
|
19
56
|
{
|
|
20
57
|
packaging_type: 'Recycled Cardboard',
|