@bjsdistribution/dms-client-return 0.0.80 → 0.0.82
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-daily-overview/header-filters/overViewFilter.d.ts +1 -0
- package/dist/components/order-view/DynamicTable.d.ts +4 -1
- package/dist/components/order-view/order-actions/Dropdown.d.ts +1 -0
- package/dist/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.d.ts +3 -0
- package/dist/dms-client-return.cjs.development.js +609 -391
- 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 +609 -391
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/order-daily-overview/header/route-header/search/SearchType.tsx +58 -2
- package/src/components/order-daily-overview/header-filters/overViewFilter.ts +37 -14
- package/src/components/order-daily-overview/index.tsx +2 -1
- package/src/components/order-view/DynamicTable.tsx +115 -90
- package/src/components/order-view/fakedata.ts +4 -2
- package/src/components/order-view/generic-table/AuditLogs.tsx +23 -81
- package/src/components/order-view/index.tsx +6 -7
- package/src/components/order-view/notes/NoteType.tsx +12 -1
- package/src/components/order-view/notes/index.tsx +46 -33
- package/src/components/order-view/order-actions/Dropdown.tsx +10 -1
- package/src/components/order-view/order-actions/actions/cancel-order/index.tsx +21 -2
- package/src/components/order-view/order-actions/actions/confirm-order/tables/NotesTable.tsx +51 -48
- package/src/components/order-view/order-actions/actions/split-order/SplitOrderTable.tsx +28 -19
- package/src/components/order-view/order-actions/actions/split-order/index.tsx +24 -2
- package/src/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.tsx +166 -0
- package/src/components/order-view/order-actions/index.tsx +3 -2
- package/src/components/order-view/order-details/expanded-content/footer/index.tsx +9 -6
|
@@ -18,6 +18,7 @@ import TaskReminderModal from './actions/create-task-reminder';
|
|
|
18
18
|
import OrderLock from './actions/order-lock';
|
|
19
19
|
import ViewFlag from '../flags-action-modal/index';
|
|
20
20
|
import ReleaseOrder from './actions/release-order/ReleaseOrder';
|
|
21
|
+
import UncancelOrder from './actions/uncancel-order/UncancelOrder';
|
|
21
22
|
|
|
22
23
|
function OrderActions() {
|
|
23
24
|
const [currentAction] = useCurrentAction();
|
|
@@ -36,8 +37,8 @@ function OrderActions() {
|
|
|
36
37
|
return <LogServiceRefusal />;
|
|
37
38
|
case 'cancel-order':
|
|
38
39
|
return <CancelOrder />;
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
case 'uncancel-order':
|
|
41
|
+
return <UncancelOrder />;
|
|
41
42
|
case 'confirm-order':
|
|
42
43
|
return <ConfirmOrder />;
|
|
43
44
|
case 'send-sms':
|
|
@@ -9,6 +9,8 @@ import {
|
|
|
9
9
|
errorAtom,
|
|
10
10
|
useCustomerInfo,
|
|
11
11
|
useUpdateApiCall,
|
|
12
|
+
useLiveRecalling,
|
|
13
|
+
useGlobalStateHitAuditLog,
|
|
12
14
|
} from '../../../store';
|
|
13
15
|
import useUpdateOrder from '../../../hooks/useUpdateOrder';
|
|
14
16
|
import { compareOrderDetailsStates, filterObject } from '../../../utils';
|
|
@@ -21,6 +23,8 @@ function OrderDetailsFooter() {
|
|
|
21
23
|
const updateOrder = useUpdateOrder();
|
|
22
24
|
const [errorState] = useAtom(errorAtom);
|
|
23
25
|
const [, setCallApi] = useUpdateApiCall(); //single detail
|
|
26
|
+
const [, setRecalling] = useLiveRecalling();
|
|
27
|
+
const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
|
|
24
28
|
const errorFound = () => {
|
|
25
29
|
const isError =
|
|
26
30
|
errorState?.w3wError.length > 0 ||
|
|
@@ -84,14 +88,13 @@ function OrderDetailsFooter() {
|
|
|
84
88
|
recipient_name: response?.data[0]?.order_recipient?.recipient_name,
|
|
85
89
|
postcode: response?.data[0]?.order_recipient?.postcode,
|
|
86
90
|
});
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
91
|
+
setRecalling(true);
|
|
92
|
+
setTimeout(() => {
|
|
93
|
+
setRecalling(false);
|
|
94
|
+
setRecallAuditLog(false);
|
|
95
|
+
}, 1000);
|
|
90
96
|
setCallApi(true);
|
|
91
|
-
// }, 2000);
|
|
92
97
|
} else {
|
|
93
|
-
// setLogsCallAPi(false);
|
|
94
|
-
// setCallApi(false);
|
|
95
98
|
setOrderDetails(prevOrderDetails);
|
|
96
99
|
}
|
|
97
100
|
};
|