@bjsdistribution/dms-client-return 0.0.94-prod → 0.0.95-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/assets/icons/ArrowDownIcon.d.ts +6 -0
- package/dist/assets/icons/DeliverProductIcon.d.ts +3 -0
- package/dist/assets/icons/ReturnProductIcon.d.ts +3 -0
- package/dist/common/checkbox/index.d.ts +2 -0
- package/dist/common/modals/order-action-modal/OrderActionModal.d.ts +3 -1
- package/dist/components/order-view/details-filters/left-side-filters/dropdowns/DropDowns.d.ts +1 -0
- package/dist/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.d.ts +2 -2
- package/dist/components/order-view/flags-action-modal/Actions.d.ts +6 -2
- package/dist/components/order-view/flags-action-modal/Dropdowns.d.ts +1 -0
- package/dist/components/order-view/flags-action-modal/Header.d.ts +1 -1
- package/dist/components/order-view/notification/FlagTemplate.d.ts +1 -1
- package/dist/components/order-view/notification/OrderTemplate.d.ts +1 -1
- package/dist/components/order-view/notification/Tabs.d.ts +1 -1
- package/dist/components/order-view/order-actions/actions/cancel-order/CancelOrderTable.d.ts +5 -0
- package/dist/components/order-view/order-actions/actions/cancel-order/index.d.ts +7 -1
- package/dist/components/order-view/order-actions/actions/change-customer-account/ChangeCustomerAccModal.d.ts +4 -1
- package/dist/components/order-view/order-actions/actions/charge-log/index.d.ts +11 -0
- package/dist/components/order-view/order-actions/actions/create-task-reminder/CreateReminderModal.d.ts +1 -13
- package/dist/components/order-view/order-actions/actions/create-task-reminder/TaskModal.d.ts +5 -1
- package/dist/components/order-view/order-actions/actions/create-task-reminder/index.d.ts +6 -2
- package/dist/components/order-view/order-actions/actions/hold-order/HoldOrderModal.d.ts +6 -1
- package/dist/components/order-view/order-actions/actions/log-service-refusal/DeliveryPoint.d.ts +5 -1
- package/dist/components/order-view/order-actions/actions/log-service-refusal/Notes.d.ts +5 -3
- package/dist/components/order-view/order-actions/actions/log-service-refusal/OrderServices.d.ts +5 -1
- package/dist/components/order-view/order-actions/actions/log-service-refusal/index.d.ts +1 -1
- package/dist/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.d.ts +7 -1
- package/dist/components/order-view/order-actions/actions/uncancel-order/UncancelOrderTable.d.ts +5 -0
- package/dist/components/order-view/order-actions/actions/unhold-order/UnholdOrder.d.ts +6 -1
- package/dist/components/order-view/order-actions/store.d.ts +10 -8
- package/dist/components/order-view/order-actions/types.d.ts +38 -60
- package/dist/components/order-view/order-actions/utils.d.ts +2 -1
- package/dist/components/order-view/store.d.ts +48 -3
- package/dist/components/order-view/types.d.ts +11 -0
- package/dist/components/order-view/utils.d.ts +1 -0
- package/dist/components/order-view/view-reminder/ViewReminder.d.ts +5 -1
- package/dist/components/order-view/view-reminder/reminder-styles.d.ts +3 -1
- package/dist/components/store.d.ts +2 -1
- package/dist/dms-client-return.cjs.development.js +4812 -3095
- 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 +4815 -3098
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +2 -2
- package/src/assets/icons/ArrowDownIcon.tsx +28 -0
- package/src/assets/icons/DeliverProductIcon.tsx +42 -0
- package/src/assets/icons/ReturnProductIcon.tsx +23 -0
- package/src/common/checkbox/index.tsx +60 -17
- package/src/common/modals/order-action-modal/OrderActionModal.tsx +13 -7
- package/src/common/radio-group/RadioButtonGroup.tsx +3 -4
- package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx +29 -26
- package/src/components/order-daily-overview/header-filters/filterStore.ts +6 -8
- package/src/components/order-daily-overview/index.tsx +20 -7
- package/src/components/order-daily-overview/return-after-table/ReturnAfterTable.tsx +2 -2
- package/src/components/order-daily-overview/return-after-table/table/OrderTable.tsx +19 -19
- package/src/components/order-daily-overview/return-after-table/table-filters/ReturnFilterStore.ts +11 -9
- package/src/components/order-daily-overview/return-after-table/table-filters/ReturnOrderFilter.tsx +19 -4
- package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx +41 -59
- package/src/components/order-daily-overview/table/ReturnTable.tsx +1 -30
- package/src/components/order-view/details-filters/left-side-filters/dropdowns/DropDowns.tsx +52 -2
- package/src/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.tsx +37 -43
- package/src/components/order-view/details-filters/left-side-filters/dropdowns/OptionsDropDown.tsx +75 -44
- package/src/components/order-view/fakedata.ts +7 -6
- package/src/components/order-view/flags-action-modal/Actions.tsx +51 -25
- package/src/components/order-view/flags-action-modal/DetailSection.tsx +5 -5
- package/src/components/order-view/flags-action-modal/Dropdowns.tsx +75 -89
- package/src/components/order-view/flags-action-modal/Header.tsx +32 -23
- package/src/components/order-view/flags-action-modal/TextSection.tsx +9 -6
- package/src/components/order-view/flags-action-modal/index.tsx +54 -67
- package/src/components/order-view/general-information/dropdowns/Print.tsx +136 -70
- package/src/components/order-view/generic-table/AuditLogs.tsx +5 -4
- package/src/components/order-view/index.tsx +9 -42
- package/src/components/order-view/modalsPopup/CreateReturnModal.tsx +20 -18
- package/src/components/order-view/modalsPopup/ModalManager.tsx +4 -10
- package/src/components/order-view/notes/logs/index.tsx +1 -1
- package/src/components/order-view/notes/order-dropdown/NewReturnDropdown.tsx +5 -7
- package/src/components/order-view/notification/FlagTemplate.tsx +8 -8
- package/src/components/order-view/notification/OrderTemplate.tsx +169 -175
- package/src/components/order-view/notification/ReminderTemplate.tsx +23 -14
- package/src/components/order-view/notification/Tabs.tsx +15 -14
- package/src/components/order-view/notification/index.tsx +164 -92
- package/src/components/order-view/order-actions/actions/add-resources/index.tsx +19 -29
- package/src/components/order-view/order-actions/actions/cancel-order/CancelOrderTable.tsx +345 -0
- package/src/components/order-view/order-actions/actions/cancel-order/index.tsx +146 -71
- package/src/components/order-view/order-actions/actions/change-customer-account/ChangeCustomerAccModal.tsx +95 -32
- package/src/components/order-view/order-actions/actions/charge-log/index.tsx +395 -0
- package/src/components/order-view/order-actions/actions/clear-booking-status/ClearBookingStatus.tsx +1 -1
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ActionDropdown.tsx +34 -17
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ContactMobile.tsx +2 -3
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ContactPhone.tsx +2 -3
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ContactWork.tsx +2 -3
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/DeliveryDate.tsx +39 -25
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/EmailAddress.tsx +1 -1
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/TimedServiceDropdown.tsx +4 -2
- package/src/components/order-view/order-actions/actions/confirm-order/customer-info/index.tsx +1 -1
- package/src/components/order-view/order-actions/actions/confirm-order/index.tsx +254 -66
- package/src/components/order-view/order-actions/actions/confirm-order/slot-and-instructions/index.tsx +1 -1
- package/src/components/order-view/order-actions/actions/confirm-order/tables/NotesTable.tsx +13 -9
- package/src/components/order-view/order-actions/actions/confirm-order/tables/ProductTable.tsx +1 -1
- package/src/components/order-view/order-actions/actions/create-task-reminder/CreateReminderModal.tsx +213 -117
- package/src/components/order-view/order-actions/actions/create-task-reminder/CreateTaskModal.tsx +97 -152
- package/src/components/order-view/order-actions/actions/create-task-reminder/TaskModal.tsx +30 -87
- package/src/components/order-view/order-actions/actions/create-task-reminder/index.tsx +77 -83
- package/src/components/order-view/order-actions/actions/hold-order/HoldOrderModal.tsx +57 -65
- package/src/components/order-view/order-actions/actions/log-service-refusal/DeliveryPoint.tsx +10 -16
- package/src/components/order-view/order-actions/actions/log-service-refusal/Notes.tsx +21 -4
- package/src/components/order-view/order-actions/actions/log-service-refusal/OrderServices.tsx +39 -11
- package/src/components/order-view/order-actions/actions/log-service-refusal/index.tsx +79 -8
- package/src/components/order-view/order-actions/actions/send-email/SendEmailModal.tsx +114 -17
- package/src/components/order-view/order-actions/actions/send-sms/SendSmsModal.tsx +115 -7
- package/src/components/order-view/order-actions/actions/split-order/index.tsx +14 -4
- package/src/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.tsx +176 -87
- package/src/components/order-view/order-actions/actions/uncancel-order/UncancelOrderTable.tsx +352 -0
- package/src/components/order-view/order-actions/actions/unhold-order/UnholdOrder.tsx +35 -59
- package/src/components/order-view/order-actions/index.tsx +237 -22
- package/src/components/order-view/order-actions/store.ts +50 -48
- package/src/components/order-view/order-actions/types.ts +40 -65
- package/src/components/order-view/order-actions/utils.ts +15 -8
- package/src/components/order-view/order-details/expanded-content/customer-section/contact-info/ContactEmail.tsx +2 -1
- package/src/components/order-view/order-details/expanded-content/footer/index.tsx +80 -39
- package/src/components/order-view/order-details/expanded-content/orders-section/Carrier.tsx +10 -14
- package/src/components/order-view/order-details/expanded-content/orders-section/DeliveryDate.tsx +10 -1
- package/src/components/order-view/order-details/expanded-content/orders-section/ScheduleAfter.tsx +2 -1
- package/src/components/order-view/products-info/expanded-content/index.tsx +3 -2
- package/src/components/order-view/products-info/index.tsx +14 -11
- package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx +26 -24
- package/src/components/order-view/store.ts +59 -2
- package/src/components/order-view/system-event-logs/columns/Date.tsx +4 -2
- package/src/components/order-view/system-event-logs/columns/Event.tsx +9 -9
- package/src/components/order-view/system-event-logs/columns/Note.tsx +1 -1
- package/src/components/order-view/system-event-logs/expanded-content/index.tsx +25 -25
- package/src/components/order-view/types.ts +13 -0
- package/src/components/order-view/utils.ts +4 -0
- package/src/components/order-view/view-reminder/AssigneeDropdown.tsx +183 -12
- package/src/components/order-view/view-reminder/ViewReminder.tsx +234 -143
- package/src/components/order-view/view-reminder/reminder-styles.tsx +14 -8
- package/src/components/store.ts +6 -0
- package/src/index.tsx +28 -18
|
@@ -1,27 +1,196 @@
|
|
|
1
|
-
import { Label,
|
|
2
|
-
import {
|
|
3
|
-
import React from 'react';
|
|
1
|
+
import { Label, useAxios } from '@bjsdistribution/dms-component-library';
|
|
2
|
+
import React, { useEffect, useState } from 'react';
|
|
4
3
|
import styled from 'styled-components';
|
|
4
|
+
import {
|
|
5
|
+
useDeptData,
|
|
6
|
+
useReminderById,
|
|
7
|
+
useUpdateReminderData,
|
|
8
|
+
} from '../order-actions/store';
|
|
9
|
+
import { Select } from 'antd';
|
|
10
|
+
import { ApiResponse } from '../types';
|
|
5
11
|
|
|
6
12
|
function AssigneeDropdown() {
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
13
|
+
const [reminderData] = useReminderById();
|
|
14
|
+
const [reminderPayload, setReminderPayload] = useUpdateReminderData();
|
|
15
|
+
const [departmentData, setDepartmentData] = useDeptData();
|
|
16
|
+
const [selectedDeptId, setSelectedDeptId] = useState<any | null>(null);
|
|
17
|
+
const [, setFilteredUsers] = useState<typeof allUsers>([]);
|
|
18
|
+
const [allUsers, setAllUsers] = useState<
|
|
19
|
+
{
|
|
20
|
+
fName: string;
|
|
21
|
+
lName: string;
|
|
22
|
+
id: string;
|
|
23
|
+
username: string;
|
|
24
|
+
deptId: number | null;
|
|
25
|
+
legacyId: any;
|
|
26
|
+
}[]
|
|
27
|
+
>([]);
|
|
28
|
+
|
|
29
|
+
const disabled = reminderData?.status === true;
|
|
30
|
+
|
|
31
|
+
const handleSelectChange = (value: string[]) => {
|
|
32
|
+
setReminderPayload((prev: any) => ({
|
|
33
|
+
...prev,
|
|
34
|
+
assigned_to: value,
|
|
35
|
+
}));
|
|
12
36
|
};
|
|
37
|
+
|
|
38
|
+
// Normalize legacyId to id when reminderData is first loaded
|
|
39
|
+
useEffect(() => {
|
|
40
|
+
if (
|
|
41
|
+
reminderData?.assigned_to &&
|
|
42
|
+
typeof reminderData.assigned_to === 'string'
|
|
43
|
+
) {
|
|
44
|
+
const matched = allUsers.find(
|
|
45
|
+
user => user.legacyId === reminderData?.assigned_to
|
|
46
|
+
);
|
|
47
|
+
|
|
48
|
+
if (matched) {
|
|
49
|
+
const id = matched?.id;
|
|
50
|
+
setReminderPayload((prev: any) => ({ ...prev, assigned_to: [id] }));
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}, [reminderData?.assigned_to, allUsers]);
|
|
54
|
+
|
|
55
|
+
const deptData =
|
|
56
|
+
departmentData?.map((item: any) => ({
|
|
57
|
+
label: item?.label,
|
|
58
|
+
value: item?.value,
|
|
59
|
+
})) || [];
|
|
60
|
+
|
|
61
|
+
const handleDepartmentChange = (value: string, option: { label: string }) => {
|
|
62
|
+
setSelectedDeptId(value);
|
|
63
|
+
|
|
64
|
+
setReminderPayload((prevState: any) => ({
|
|
65
|
+
...prevState,
|
|
66
|
+
department: option?.label,
|
|
67
|
+
assigned_to: null,
|
|
68
|
+
}));
|
|
69
|
+
};
|
|
70
|
+
|
|
71
|
+
// SSO Departments
|
|
72
|
+
const { fetchData: getSSOData, data: fetchData } = useAxios<{
|
|
73
|
+
data: ApiResponse[];
|
|
74
|
+
}>({
|
|
75
|
+
endpoint: `/sso/departments/`,
|
|
76
|
+
method: 'GET',
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
useEffect(() => {
|
|
80
|
+
const fetchAllSSOData = async () => {
|
|
81
|
+
try {
|
|
82
|
+
getSSOData();
|
|
83
|
+
} catch (error) {
|
|
84
|
+
console.error('Error fetching SSO data:', error);
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
fetchAllSSOData();
|
|
88
|
+
}, []);
|
|
89
|
+
|
|
90
|
+
const { fetchData: getUsersData } = useAxios<{ data: any }>({
|
|
91
|
+
endpoint: `/sso/users/`,
|
|
92
|
+
method: 'GET',
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
useEffect(() => {
|
|
96
|
+
const fetchAllPages = async () => {
|
|
97
|
+
try {
|
|
98
|
+
let page = 0;
|
|
99
|
+
let usersList: any[] = [];
|
|
100
|
+
let totalPages = 1;
|
|
101
|
+
|
|
102
|
+
while (page < totalPages) {
|
|
103
|
+
const res = (await getUsersData({
|
|
104
|
+
endPointQuery: `?page=${page}&limit=500`,
|
|
105
|
+
})) as { data: any };
|
|
106
|
+
|
|
107
|
+
const data = res?.data;
|
|
108
|
+
|
|
109
|
+
if (data) {
|
|
110
|
+
usersList = [...usersList, ...(data?.users || [])];
|
|
111
|
+
totalPages = data.pages || 1;
|
|
112
|
+
page += 1;
|
|
113
|
+
} else {
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
setAllUsers(
|
|
119
|
+
usersList?.map(user => ({
|
|
120
|
+
id: user?.id,
|
|
121
|
+
username: user?.username,
|
|
122
|
+
deptId: user?.department_id,
|
|
123
|
+
fName: user?.first_names,
|
|
124
|
+
lName: user?.last_name,
|
|
125
|
+
legacyId: user?.legacy_id,
|
|
126
|
+
}))
|
|
127
|
+
);
|
|
128
|
+
} catch (error) {
|
|
129
|
+
console.error('Error fetching paginated SSO data:', error);
|
|
130
|
+
}
|
|
131
|
+
};
|
|
132
|
+
|
|
133
|
+
fetchAllPages();
|
|
134
|
+
}, []);
|
|
135
|
+
|
|
136
|
+
useEffect(() => {
|
|
137
|
+
if (selectedDeptId !== null && allUsers?.length > 0) {
|
|
138
|
+
const matchedUsers = allUsers?.filter(
|
|
139
|
+
user => user?.deptId?.toString() === selectedDeptId?.toString()
|
|
140
|
+
);
|
|
141
|
+
setFilteredUsers(matchedUsers);
|
|
142
|
+
} else {
|
|
143
|
+
setFilteredUsers([]);
|
|
144
|
+
}
|
|
145
|
+
}, [selectedDeptId, allUsers]);
|
|
146
|
+
|
|
147
|
+
useEffect(() => {
|
|
148
|
+
if (fetchData && fetchData?.data) {
|
|
149
|
+
const deptList =
|
|
150
|
+
fetchData?.data?.map((item: any) => ({
|
|
151
|
+
label: item?.name,
|
|
152
|
+
value: item?.id,
|
|
153
|
+
})) || [];
|
|
154
|
+
setDepartmentData(deptList);
|
|
155
|
+
}
|
|
156
|
+
}, [fetchData]);
|
|
157
|
+
|
|
158
|
+
const userOptions = allUsers?.map(user => ({
|
|
159
|
+
label: `${user?.fName?.trim()} ${user?.lName?.trim()}`, // shown in dropdown
|
|
160
|
+
value: user?.id, // used internally and stored
|
|
161
|
+
}));
|
|
162
|
+
|
|
13
163
|
return (
|
|
14
164
|
<FormContainer>
|
|
165
|
+
<Label label="Department" required />
|
|
166
|
+
<StyledAntSelect
|
|
167
|
+
disabled={disabled}
|
|
168
|
+
options={deptData}
|
|
169
|
+
placeholder="Select Department"
|
|
170
|
+
onChange={handleDepartmentChange}
|
|
171
|
+
style={{ width: '8vw' }}
|
|
172
|
+
value={reminderPayload?.department || undefined}
|
|
173
|
+
showSearch
|
|
174
|
+
dis
|
|
175
|
+
/>
|
|
15
176
|
<Label label="Assigned To" required htmlFor="assigneDropdown" />
|
|
16
177
|
<StyledAntSelect
|
|
17
|
-
|
|
178
|
+
disabled={disabled}
|
|
179
|
+
options={userOptions}
|
|
180
|
+
placeholder="Select User"
|
|
18
181
|
onChange={handleSelectChange}
|
|
19
|
-
|
|
20
|
-
|
|
182
|
+
style={{ width: '100%' }}
|
|
183
|
+
value={reminderPayload?.assigned_to || []}
|
|
184
|
+
showSearch
|
|
185
|
+
filterOption={(input: any, option: any) =>
|
|
186
|
+
(option?.label as string).toLowerCase().includes(input.toLowerCase())
|
|
187
|
+
}
|
|
188
|
+
mode="multiple"
|
|
21
189
|
/>
|
|
22
190
|
</FormContainer>
|
|
23
191
|
);
|
|
24
192
|
}
|
|
193
|
+
|
|
25
194
|
const FormContainer = styled.div`
|
|
26
195
|
display: flex;
|
|
27
196
|
flex-direction: column;
|
|
@@ -29,5 +198,7 @@ const FormContainer = styled.div`
|
|
|
29
198
|
flex: 1;
|
|
30
199
|
width: 325px;
|
|
31
200
|
`;
|
|
32
|
-
|
|
201
|
+
|
|
202
|
+
const StyledAntSelect: any = styled(Select)``;
|
|
203
|
+
|
|
33
204
|
export default AssigneeDropdown;
|