@bjsdistribution/dms-client-return 0.1.62-prod → 0.1.63-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/common/date-picker/CustomDatePicker.d.ts +11 -1
- package/dist/common/date-picker/FilterByType.d.ts +3 -1
- package/dist/common/date-picker/header/ClearDate.d.ts +4 -1
- package/dist/common/date-picker/header/DatePickerHeader.d.ts +5 -1
- package/dist/common/date-picker/header/Header.d.ts +3 -1
- package/dist/common/date-picker/legend/DateLegend.d.ts +7 -1
- package/dist/common/date-picker/legend/index.d.ts +3 -1
- package/dist/common/date-picker/modal/Modal.d.ts +6 -1
- package/dist/common/date-picker/range-date-filter/Seperator.d.ts +3 -1
- package/dist/common/date-picker/single-date-filter/SingleDateFilter.d.ts +8 -1
- package/dist/common/utils.d.ts +1 -1
- package/dist/components/client-portal/ReturnRTFilters.d.ts +5 -3
- package/dist/components/order-daily-overview/filters/BulkFilterStyle.d.ts +3 -2
- package/dist/components/order-daily-overview/filters/FilterStyle.d.ts +9 -8
- package/dist/components/order-daily-overview/header/checkbox-wrapper/CheckBoxWrapper.d.ts +2 -2
- package/dist/components/order-daily-overview/header/route-header/ClientRouterHeader.d.ts +1 -1
- package/dist/components/order-daily-overview/header/route-header/RouterHeader.d.ts +1 -1
- package/dist/components/order-daily-overview/header/route-header/RouterHeaderStyle.d.ts +5 -4
- package/dist/components/order-daily-overview/header/table-filter/TableFilterStyle.d.ts +5 -4
- package/dist/components/order-daily-overview/header-filters/Styledfilters.d.ts +27 -14
- package/dist/components/order-daily-overview/return-after-table/table-filters/ReturnOrderFilter.d.ts +1 -1
- package/dist/components/order-daily-overview/return-order-table/return-orders-filters/returnstyles.d.ts +23 -21
- package/dist/components/order-daily-overview/shared/elements/PrintDropDown.d.ts +4 -2
- package/dist/components/order-daily-overview/shared/utlis.d.ts +2 -2
- package/dist/components/order-daily-overview/table/table-data/styles.d.ts +44 -37
- package/dist/components/order-daily-overview/table-view/PaginationStyle.d.ts +12 -9
- package/dist/components/order-daily-overview/table-view/TableStyle.d.ts +38 -29
- package/dist/components/order-view/details-filters/left-side-filters/actions/ActionStyles.d.ts +4 -3
- package/dist/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.d.ts +1 -1
- package/dist/components/order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn.d.ts +4 -2
- package/dist/components/order-view/fakedata.d.ts +4 -0
- package/dist/components/order-view/generic-table/AuditLogs.d.ts +1 -1
- package/dist/components/order-view/modalsPopup/CreateReturnModal.d.ts +1 -1
- package/dist/components/order-view/notes/logs/NotestableStyles.d.ts +3 -2
- package/dist/components/order-view/order-actions/actions/cancel-order/CancelOrderTable.d.ts +2 -2
- package/dist/components/order-view/order-actions/actions/charge-log/index.d.ts +8 -8
- package/dist/components/order-view/order-actions/actions/confirm-order/tables/ReminderStyles.d.ts +9 -8
- package/dist/components/order-view/order-actions/actions/create-task-reminder/SharedComponents.d.ts +22 -9
- package/dist/components/order-view/order-actions/actions/force-debrief/ForceDebriefModal.d.ts +2 -2
- package/dist/components/order-view/order-actions/actions/force-debrief/styles.d.ts +8 -7
- package/dist/components/order-view/order-actions/actions/modalstyle.d.ts +35 -33
- package/dist/components/order-view/order-actions/actions/send-sms/SendSmsModal.d.ts +1 -1
- package/dist/components/order-view/order-actions/actions/uncancel-order/UncancelOrderTable.d.ts +2 -2
- package/dist/components/order-view/order-actions/utils.d.ts +1 -1
- package/dist/components/order-view/order-details/expanded-content/orders-section/Depot.d.ts +2 -1
- package/dist/components/order-view/return-client-products/product-table/ReturnProductTable.d.ts +1 -1
- package/dist/components/order-view/store.d.ts +1 -1
- package/dist/components/order-view/view-reminder/ViewReminder.d.ts +1 -1
- package/dist/components/order-view/view-reminder/reminder-styles.d.ts +27 -19
- package/dist/dms-client-return.cjs.development.js +2280 -2320
- 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 +2280 -2320
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.tsx +6 -0
- package/src/components/order-view/details-filters/left-side-filters/dropdowns/OptionsDropDown.tsx +8 -2
- package/src/components/order-view/fakedata.ts +20 -0
package/package.json
CHANGED
package/src/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.tsx
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { bjsMenu } from '../../../fakedata';
|
|
3
3
|
import { useCurrentAction, useStatusDetails } from '../../../store';
|
|
4
|
+
import { useClientPortal } from '../../../../store';
|
|
4
5
|
import ArrowDownIcon from '../../../../../assets/icons/ArrowDownIcon';
|
|
5
6
|
import { Dropdown, Space } from 'antd';
|
|
6
7
|
import styled from 'styled-components';
|
|
@@ -12,6 +13,11 @@ function BjsMenuDropDown() {
|
|
|
12
13
|
};
|
|
13
14
|
|
|
14
15
|
const [orderStatus] = useStatusDetails();
|
|
16
|
+
const [clientPortal] = useClientPortal();
|
|
17
|
+
|
|
18
|
+
if (clientPortal) {
|
|
19
|
+
return null; // hide completely for client portal!
|
|
20
|
+
}
|
|
15
21
|
|
|
16
22
|
const isReleased = orderStatus[0]?.released;
|
|
17
23
|
|
package/src/components/order-view/details-filters/left-side-filters/dropdowns/OptionsDropDown.tsx
CHANGED
|
@@ -7,13 +7,14 @@ import {
|
|
|
7
7
|
// useOrderId,
|
|
8
8
|
useStatusDetails,
|
|
9
9
|
} from '../../../store';
|
|
10
|
-
import { optionsMenu } from '../../../fakedata';
|
|
10
|
+
import { optionsMenu, optionsMenuClientPortal } from '../../../fakedata';
|
|
11
11
|
import {
|
|
12
12
|
useCreateReminderPayload,
|
|
13
13
|
useCreateTaskPayload,
|
|
14
14
|
} from '../../../order-actions/store';
|
|
15
15
|
import { Dropdown, Space } from 'antd';
|
|
16
16
|
import ArrowDownIcon from '../../../../../assets/icons/ArrowDownIcon';
|
|
17
|
+
import { useClientPortal } from '../../../../store';
|
|
17
18
|
|
|
18
19
|
function Options() {
|
|
19
20
|
const [, setCurrentAction] = useCurrentAction();
|
|
@@ -22,6 +23,11 @@ function Options() {
|
|
|
22
23
|
const [, setTaskPayload] = useCreateTaskPayload();
|
|
23
24
|
const [orderStatus] = useStatusDetails();
|
|
24
25
|
const [orderDetails] = useOrderDetails();
|
|
26
|
+
const [isClientPortal] = useClientPortal();
|
|
27
|
+
|
|
28
|
+
const clientPortalMenuItems = isClientPortal
|
|
29
|
+
? optionsMenuClientPortal
|
|
30
|
+
: optionsMenu;
|
|
25
31
|
|
|
26
32
|
const handleSelectChange = (selectedOption: any) => {
|
|
27
33
|
setCurrentAction(selectedOption);
|
|
@@ -45,7 +51,7 @@ function Options() {
|
|
|
45
51
|
const isOrderOnHold = orderDetails?.status === 'OO';
|
|
46
52
|
const isOrderCancelled = orderDetails?.status === 'CO';
|
|
47
53
|
|
|
48
|
-
const filteredOptions =
|
|
54
|
+
const filteredOptions = clientPortalMenuItems?.filter(option => {
|
|
49
55
|
let shouldExclude = false;
|
|
50
56
|
|
|
51
57
|
if (isOrderOnHold && option.value === 'hold-order') {
|
|
@@ -11,6 +11,26 @@ export const bjsMenu = [
|
|
|
11
11
|
},
|
|
12
12
|
];
|
|
13
13
|
|
|
14
|
+
export const optionsMenuClientPortal = [
|
|
15
|
+
{ label: 'Create Task', value: 'create-task' },
|
|
16
|
+
{
|
|
17
|
+
label: 'On Hold',
|
|
18
|
+
value: 'hold-order',
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
label: 'Un Hold',
|
|
22
|
+
value: 'unhold-order',
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
label: 'Cancel',
|
|
26
|
+
value: 'cancel-order',
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
label: 'Un-Cancel',
|
|
30
|
+
value: 'uncancel-order',
|
|
31
|
+
},
|
|
32
|
+
];
|
|
33
|
+
|
|
14
34
|
export const optionsMenu = [
|
|
15
35
|
{ label: 'Create Reminder', value: 'create-reminder' },
|
|
16
36
|
{ label: 'Create Task', value: 'create-task' },
|