@bjsdistribution/dms-client-return 0.0.1 → 0.0.3

package/src/components/order-view/order-details/expanded-content/customer-section/location-info/Longitude.tsx

@@ -38,6 +38,7 @@ function Longitude() {
 }
 
 const CustomInput = styled(Input)`
+  border-radius: 25px;
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {
     -webkit-appearance: none;

package/src/components/order-view/order-details/expanded-content/customer-section/location-info/Postcode.tsx

@@ -41,6 +41,7 @@ function Postcode() {
         value={orderRecipient?.postcode || ''}
         onChange={onChange}
         autoComplete="off"
+        style={{ borderRadius: '25px' }}
       />
     </Container>
   );

package/src/components/order-view/order-details/expanded-content/customer-section/location-info/What3words.tsx

@@ -64,6 +64,7 @@ const Wrapper = styled.div`
 `;
 
 const CustomInput = styled(Input)`
+  border-radius: 25px;
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {
     -webkit-appearance: none;

package/src/components/order-view/order-details/expanded-content/footer/index.tsx

@@ -98,9 +98,10 @@ const Container = styled.div`
   background: #f8fafc;
   /* margin: 0px -15px -15px -15px; */
   border-radius: 0px 0px 8px 8px;
-  margin-bottom: 22px;
+  /* margin-bottom: 22px; */
   position: relative;
-  top: 21px;
+  align-items: center;
+  /* top: 21px; */
 `;
 
 export default OrderDetailsFooter;

package/src/components/order-view/order-details/expanded-content/index.tsx

@@ -49,7 +49,7 @@ const HalfWidth = styled.div`
 const Container = styled.div`
   display: flex;
   flex-wrap: wrap;
-  gap: 25px;
+  gap: 20px;
   justify-content: space-between;
 
   @media (min-width: 769px) {

package/src/components/order-view/order-details/expanded-content/instruction-section/index.tsx

@@ -21,7 +21,7 @@ function InstructionSection() {
 const FormInputs = styled.div`
   display: flex;
   flex-direction: column;
-  gap: 15px;
+  gap: 7px;
   flex: 1;
 `;
 
@@ -30,6 +30,7 @@ const CustomFormSection = styled(FormSection)`
   border-radius: 8px;
   background: #f8fafc;
   box-shadow: 0px 1px 3px 0px rgba(16, 24, 40, 0.1);
+  padding: 10px !important;
 `;
 
 export default InstructionSection;

package/src/components/order-view/order-details/expanded-content/orders-section/Carrier.tsx

@@ -11,7 +11,13 @@ function Carrier() {
         <Label label="Carrier" htmlFor="carrier" />
         <CopyText text="hello234e" />
       </Wrapper>
-      <Input name="carrier" type="text" placeholder="Carrier" disabled />
+      <Input
+        name="carrier"
+        type="text"
+        placeholder="Carrier"
+        disabled
+        style={{ borderRadius: '25PX' }}
+      />
     </Container>
   );
 }

package/src/components/order-view/order-details/expanded-content/orders-section/DeliveryDate.tsx

@@ -53,6 +53,7 @@ function DeliveryDate() {
         onChange={onChange}
         value={actionDate === null ? actionDate : dayjs(actionDate)}
         format="DD/MM/YY"
+        style={{ borderRadius: '25px' }}
       />
     </MainContainer>
   );

package/src/components/order-view/order-details/expanded-content/orders-section/Depot.tsx

@@ -1,4 +1,8 @@
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import {
+  Label,
+  SelectDropdown,
+  dropdownStyles,
+} from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { useDepotOptions, useOrderDetails } from '../../../store';
@@ -26,6 +30,15 @@ function DepotDropdown() {
         )}
         options={depotOptions || []}
         onChange={onChange}
+        styles={{
+          ...dropdownStyles,
+
+          control: styles => ({
+            ...styles,
+            borderRadius: '25px',
+            cursor: 'pointer',
+          }),
+        }}
       />
     </FormContainer>
   );

package/src/components/order-view/order-details/expanded-content/orders-section/Droptime.tsx

@@ -7,7 +7,7 @@ import { handleKeyDown } from '../../../utils';
 function Droptime() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
   const orderRoutes = orderDetails?.order_routes;
-  
+
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const val = parseFloat(e.target.value);
     const updatedOrderRoutes = {
@@ -39,6 +39,7 @@ function Droptime() {
 }
 
 const CustomInput = styled(Input)`
+  border-radius: 25px;
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {
     -webkit-appearance: none;

package/src/components/order-view/order-details/expanded-content/orders-section/OrderNumber.tsx

@@ -10,7 +10,7 @@ function OrderNumber() {
     orderDetails?.order_number !== null &&
     orderDetails?.order_number !== undefined &&
     orderDetails?.order_number?.length > 0;
-    
+
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setOrderDetails(prev => {
       return {
@@ -31,6 +31,7 @@ function OrderNumber() {
         placeholder="Order Number"
         value={orderDetails?.order_number || ''}
         onChange={onChange}
+        style={{ borderRadius: '25px' }}
       />
     </Container>
   );

package/src/components/order-view/order-details/expanded-content/orders-section/RecipientReference.tsx

@@ -5,7 +5,7 @@ import { useOrderDetails } from '../../../store';
 
 function RecipientReference() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
-  
+
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setOrderDetails(prev => {
       return {
@@ -23,6 +23,7 @@ function RecipientReference() {
         placeholder="Enter Recipient Reference"
         value={orderDetails.recipient_reference || ''}
         onChange={onChange}
+        style={{ borderRadius: '25px' }}
       />
     </Container>
   );

package/src/components/order-view/order-details/expanded-content/orders-section/ScheduleAfter.tsx

@@ -52,6 +52,7 @@ function ScheduleAfter() {
         onChange={onChange}
         value={scheduleDate === null ? scheduleDate : dayjs(scheduleDate)}
         format="DD/MM/YY"
+        style={{ borderRadius: '25px' }}
       />
     </MainContainer>
   );

package/src/components/order-view/order-details/expanded-content/orders-section/VehicleType.tsx

@@ -1,4 +1,8 @@
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import {
+  Label,
+  SelectDropdown,
+  dropdownStyles,
+} from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { vehicleTypeOptions } from '../../helper';
@@ -14,6 +18,14 @@ function VehicleTypeDropdown() {
         openMenuOnFocus
         isDisabled={true}
         value={vehicleTypeOptions[1]}
+        styles={{
+          ...dropdownStyles,
+          control: styles => ({
+            ...styles,
+            borderRadius: '25px',
+            cursor: 'pointer',
+          }),
+        }}
       />
     </FormContainer>
   );

package/src/components/order-view/order-details/expanded-content/services-section/DeliveryPoint.tsx

@@ -1,5 +1,9 @@
 import React from 'react';
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import {
+  Label,
+  SelectDropdown,
+  dropdownStyles,
+} from '@bjsdistribution/dms-component-library';
 import { useOrderDetails, useOrderStaticData } from '../../../store';
 import styled from 'styled-components';
 import { capitalize } from '../../../utils';
@@ -38,6 +42,14 @@ function DeliveryPointDropdown() {
         )}
         openMenuOnFocus
         onChange={onChange}
+        styles={{
+          ...dropdownStyles,
+          control: styles => ({
+            ...styles,
+            borderRadius: '25px',
+            cursor: 'pointer',
+          }),
+        }}
       />
     </Container>
   );

package/src/components/order-view/order-details/expanded-content/services-section/ServiceType.tsx

@@ -1,5 +1,9 @@
 import React from 'react';
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import {
+  Label,
+  SelectDropdown,
+  dropdownStyles,
+} from '@bjsdistribution/dms-component-library';
 import { useOrderDetails, useOrderStaticData } from '../../../store';
 import styled from 'styled-components';
 import { capitalize } from '../../../utils';
@@ -32,6 +36,14 @@ function ServiceTypeDropdown() {
         inputId="serviceTypeDropdown"
         openMenuOnFocus
         onChange={onChange}
+        styles={{
+          ...dropdownStyles,
+          control: styles => ({
+            ...styles,
+            borderRadius: '25px',
+            cursor: 'pointer',
+          }),
+        }}
       />
     </Container>
   );

package/src/components/order-view/order-details/expanded-content/services-section/TimedService.tsx

@@ -1,6 +1,10 @@
 import React from 'react';
 import { useOrderDetails, useOrderStaticData } from '../../../store';
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import {
+  Label,
+  SelectDropdown,
+  dropdownStyles,
+} from '@bjsdistribution/dms-component-library';
 import styled from 'styled-components';
 import { capitalize } from '../../../utils';
 
@@ -37,6 +41,15 @@ function TimedServiceDropdown() {
         )}
         inputId="timedServiceDropdown"
         onChange={onChange}
+        styles={{
+          ...dropdownStyles,
+
+          control: styles => ({
+            ...styles,
+            borderRadius: '25px',
+            cursor: 'pointer',
+          }),
+        }}
       />
     </Container>
   );

package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx

@@ -5,11 +5,11 @@ import {
 } from '../../../order-daily-overview/return-order-table/return-orders-filters/returnstyles';
 import { Checkbox } from '@bjsdistribution/dms-component-library';
 import { data } from '../../../order-daily-overview/table/table-data/Fakedata';
-import { useSelectedEmail } from '../../../store';
 import ActionIcon from '../../../../assets/icons/ActionIcon';
+import { useSelectedOrders } from '../../../store';
 
 const ReturnProductTable = () => {
-  const [selectedInvoices, setSelectedInvoices] = useSelectedEmail();
+  const [selectedInvoices, setSelectedInvoices] = useSelectedOrders();
   const [selectAll, setSelectAll] = useState(false);
 
   const handleSelectAll = (e: any) => {

package/src/components/order-view/store.ts

@@ -1,6 +1,13 @@
 import { atom, useAtom } from 'jotai';
 import { atomWithReducer } from 'jotai/utils';
-import { CreateProduct, OrderActionsType, OrdersType, UnRecieveOrderProduct, UpdateOrderProduct } from './types';
+import {
+  CreateProduct,
+  OrderActionsType,
+  OrdersType,
+  UnRecieveOrderProduct,
+  UpdateOrderProduct,
+} from './types';
+import { ClientData } from '../order-daily-overview/common/interface';
 // OrderActionsType
 const activeTabAtom = atom<string>('active');
 const infoAtom = atom<boolean | undefined>(false);
@@ -11,6 +18,11 @@ const date = atom(new Date());
 
 const orderStaticDataAtom = atom<any>({});
 
+const clientDataAtom = atom<ClientData[]>([]);
+const returnDataAtom = atom<any[]>([]);
+
+const returnAfterOrderAtom = atom<any[]>([]);
+
 export const ordersInitialValue: OrdersType = {
   depot_id: null,
   gsit_order_id: null,
@@ -92,18 +104,18 @@ export const orderProductInitialvalue: CreateProduct = {
 };
 
 export const unrecieveOrderProducts: UnRecieveOrderProduct = {
-    unrecieve_reason_id: 0,
-    unrecieve_note: '',
-    // id: 0
+  unrecieve_reason_id: 0,
+  unrecieve_note: '',
+  // id: 0
 };
 
 export const updateOrderProducts: UpdateOrderProduct = {
   id: 0,
-    order_id: 0,
-    product_type_id: 0,
-    product_return_action_id: 0,
-    return_location: '',
-    return_reason_id: 0
+  order_id: 0,
+  product_type_id: 0,
+  product_return_action_id: 0,
+  return_location: '',
+  return_reason_id: 0,
 };
 
 export const usedate = () => {
@@ -126,6 +138,17 @@ function useOrderStaticData() {
   return useAtom(orderStaticDataAtom);
 }
 
+function useClientData() {
+  return useAtom(clientDataAtom);
+}
+
+function useReturnData() {
+  return useAtom(returnDataAtom);
+}
+
+function useReturnAfterOrderData() {
+  return useAtom(returnAfterOrderAtom);
+}
 // Define initial modal state
 export const initialModalState = {
   openModalType: null,
@@ -191,7 +214,9 @@ function useCreateOrderProducts() {
   return useAtom(createOrderProduct);
 }
 
-const unrevieveOrderProduct = atom<UnRecieveOrderProduct>(unrecieveOrderProducts);
+const unrevieveOrderProduct = atom<UnRecieveOrderProduct>(
+  unrecieveOrderProducts
+);
 function useRecieveOrderProducts() {
   return useAtom(unrevieveOrderProduct);
 }
@@ -209,7 +234,7 @@ export const errorAtom = atom({
   homeError: '',
   mobileError: '',
   emailError: '',
-  w3wError: ''
+  w3wError: '',
 });
 
 export {
@@ -224,7 +249,10 @@ export {
   useDeleteProdsID,
   useCreateOrderProducts,
   useRecieveOrderProducts,
-  useUpdateOrderProducts
+  useUpdateOrderProducts,
+  useClientData,
+  useReturnData,
+  useReturnAfterOrderData,
 };
 // Popup state Manage
 const initialState = null;

package/src/components/store.ts

@@ -21,6 +21,12 @@ const reminderTableData = atom<any[]>([]);
 
 const inQueueDataAtom = atom<any>({});
 
+const customerData = atom<any>([]);
+
+const actionTypeData = atom<any>([]);
+
+const locationData = atom<any>([]);
+
 function useReminderData() {
   return useAtom(reminderTableData);
 }
@@ -49,10 +55,10 @@ function useEmailInvoice() {
   return useAtom(emailInvoiceData);
 }
 
-const selectedEmailList = atom<any[]>([]);
+const selectedOrderlList = atom<any[]>([]);
 
-function useSelectedEmail() {
-  return useAtom(selectedEmailList);
+function useSelectedOrders() {
+  return useAtom(selectedOrderlList);
 }
 
 // Sticky menu state
@@ -61,6 +67,18 @@ export const useStickyStatus = () => {
   return useAtom(stickyStatus);
 };
 
+function useCustomerData() {
+  return useAtom(customerData);
+}
+
+function useActionType() {
+  return useAtom(actionTypeData);
+}
+
+function useLocationData() {
+  return useAtom(locationData);
+}
+
 export {
   useAtom,
   useFilter,
@@ -70,5 +88,9 @@ export {
   useReminderData,
   useInQueueData,
   useEmailInvoice,
-  useSelectedEmail
+  // useSelectedEmail,
+  useCustomerData,
+  useActionType,
+  useLocationData,
+  useSelectedOrders,
 };

package/src/components/types.ts

@@ -9,10 +9,6 @@ export type SelectDateType = {
 
 export type OrderViewType = 'add' | 'view' | 'edit';
 
-
-
-
-
 export interface ColumnConfig {
   key: string;
   label: string;
@@ -33,7 +29,7 @@ export interface Column {
   render?: (data: any, row: TableRow) => React.ReactNode;
   callback?: (data: any) => void;
   sortable?: boolean;
-  showIcon?: boolean
+  showIcon?: boolean;
 }
 
 export interface TableRow {
@@ -45,7 +41,7 @@ export interface ApiResponse {
   code: number;
   error: string | null;
   error_traceback: string | null;
-  data: any;
+  data: any[];
 }
 
 export interface InvoiceData {

package/dist/components/order-daily-overview/table/InfiniteScrolling.d.ts

@@ -1,5 +0,0 @@
-declare const useInfiniteScroll: (paginationData: any, setShouldPerformAction: Function, tableScrolling: any) => {
-    page: number;
-    scrollActivated: boolean;
-};
-export default useInfiniteScroll;

package/dist/components/order-daily-overview/table/Return.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-declare const RFI: React.FC;
-export default RFI;

package/dist/components/order-daily-overview/table/table-data/MyTable.d.ts

@@ -1,18 +0,0 @@
-import React from 'react';
-import { Column } from '../../../types';
-export declare const selectedValueAtom: import("jotai/esm/").PrimitiveAtom<null> & {
-    init: null;
-};
-export declare const selectedIDAtom: import("jotai/esm/").PrimitiveAtom<null> & {
-    init: null;
-};
-interface MyTableProps {
-    columns: Column[];
-    data: any;
-    loading: boolean;
-    loadingskeleton?: boolean;
-    view?: 'rfi';
-}
-declare const MyTable: React.FC<MyTableProps>;
-export default MyTable;
-export declare const CoverDiv: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;

package/dist/components/order-daily-overview/table/table-data/Table.d.ts

@@ -1,18 +0,0 @@
-import React from 'react';
-import { Column } from '../../../types';
-export declare const selectedValueAtom: import("jotai/esm/").PrimitiveAtom<null> & {
-    init: null;
-};
-export declare const selectedIDAtom: import("jotai/esm/").PrimitiveAtom<null> & {
-    init: null;
-};
-interface MyTableProps {
-    columns: Column[];
-    data: any;
-    loading: boolean;
-    loadingskeleton?: boolean;
-    view?: 'rfi';
-}
-declare const Table: React.FC<MyTableProps>;
-export default Table;
-export declare const CoverDiv: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;

package/src/components/order-daily-overview/table/InfiniteScrolling.tsx

@@ -1,54 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-const useInfiniteScroll = (
-  paginationData: any,
-  setShouldPerformAction: Function,
-  tableScrolling: any
-) => {
-  const [page, setPage] = useState(1);
-  const [scrollActivated, setScrollActivated] = useState(false);
-  const debounce = (func: Function, wait: number) => {
-    let timeout: ReturnType<typeof setTimeout>;
-    return (...args: any[]) => {
-      clearTimeout(timeout);
-      timeout = setTimeout(() => func(...args), wait);
-    };
-  };
-
-  const handleInfiniteScroll = useCallback(
-    debounce(() => {
-      setScrollActivated(true);
-      const element = document.getElementById(tableScrolling);
-      if (element) {
-        const { scrollHeight, offsetHeight, scrollTop } = element;
-        let totalPages;
-        if (paginationData) {
-          totalPages = JSON.parse(paginationData)?.total_pages;
-        }
-        if (
-          offsetHeight + scrollTop >= scrollHeight &&
-          totalPages >= page &&
-          totalPages > page
-        ) {
-          setShouldPerformAction(true);
-          setPage(prev => prev + 1);
-        }
-      }
-    }, 700),
-    [paginationData, page, setShouldPerformAction]
-  );
-  useEffect(() => {
-    const element = document.getElementById(tableScrolling);
-    if (element) {
-      element.addEventListener('scroll', handleInfiniteScroll);
-    }
-    return () => {
-      if (element) {
-        element.removeEventListener('scroll', handleInfiniteScroll);
-      }
-    };
-  }, [handleInfiniteScroll]);
-  return { page, scrollActivated };
-};
-
-export default useInfiniteScroll;