@bjsdistribution/dms-client-return 0.1.19-dev → 0.1.21-dev

package/src/components/order-view/order-actions/actions/force-debrief/order-info/success-content/index.tsx

@@ -0,0 +1,221 @@
+import React from 'react';
+import styled from 'styled-components';
+import {
+  CalendarIcon,
+  Label,
+  TextArea,
+} from '@bjsdistribution/dms-component-library';
+import { Input } from '../../styles';
+import {
+  useChargesState,
+  useOrderDetails,
+  useProductDetails,
+} from '../../../../../store';
+import { getBaseUrlSymbol } from '../../../../../utils';
+
+const formatDate = (date: any) => {
+  const padZero = (num: any) => num.toString().padStart(2, '0');
+  const year = new Date(date).getFullYear();
+  const month = padZero(new Date(date).getMonth() + 1);
+  const day = padZero(new Date(date).getDate());
+  return `${day}/${month}/${year}`;
+};
+
+function SuccessContent() {
+  const [orderDetails] = useOrderDetails();
+  const [chargesState] = useChargesState();
+  const baseUrlSymbol = getBaseUrlSymbol();
+
+  const [productdata] = useProductDetails();
+  const sortedProductData = productdata?.sort((a: any, b: any) => {
+    return a?.status === b?.status ? 0 : a?.status ? -1 : 1;
+  });
+
+  const products = Array.isArray(sortedProductData)
+    ? sortedProductData?.filter(item => item?.status === true)
+    : [];
+
+  const excludedFields = [
+    'debrief_notes',
+    'new_order_status',
+    'base_charge_type',
+    'adhoc_charges',
+    'debrief_status',
+  ]; // Fields to exclude
+  let totalChargesAmount = 0;
+
+  for (const [key, value] of Object.entries(chargesState)) {
+    if (!excludedFields.includes(key) && typeof value === 'number') {
+      totalChargesAmount += value;
+    }
+  }
+
+  const formattedDate =
+    orderDetails?.action_date === null
+      ? ' '
+      : formatDate(orderDetails?.action_date);
+
+  const adhocTotalCharges =
+    chargesState?.adhoc_charges?.length > 0
+      ? chargesState?.adhoc_charges?.reduce(
+          (acc, item) => acc + item.adhoc_charges,
+          0
+        )
+      : 0;
+
+  return (
+    <Wrapper>
+      <FieldGroup>
+        <Label label="Signed By" htmlFor="signedby" />
+        <StyledInput
+          id="signedby"
+          placeholder=""
+          value={orderDetails?.order_recipient?.recipient_name || ''}
+          onChange={() => {}}
+          disabled
+        />
+
+        <Label label="Date" htmlFor="datefield" />
+        <DateInput>
+          <Text>{formattedDate}</Text>
+          <CalendarIcon />
+        </DateInput>
+
+        <GroupedFields>
+          <PairGroup>
+            <SmallGroup>
+              <Label label="Items" htmlFor="items" />
+              <Text>{products?.length}</Text>
+            </SmallGroup>
+            <SmallGroup>
+              <Label label="Zone" htmlFor="zone" />
+              <Text>{orderDetails?.zone_code}</Text>
+            </SmallGroup>
+          </PairGroup>
+
+          <PairGroup>
+            <SmallGroup>
+              <Label label="Weight" htmlFor="weight" />
+              <Text>{orderDetails?.weight}Kg</Text>
+            </SmallGroup>
+
+            <SmallGroup>
+              <Label label="Total Charge" htmlFor="totalCharge" />
+              <div
+                style={{ display: 'flex', gap: '4px', alignItems: 'center' }}
+              >
+                <CurrencyWrapper>{baseUrlSymbol}</CurrencyWrapper>
+                <Text>{totalChargesAmount + adhocTotalCharges}</Text>
+              </div>
+            </SmallGroup>
+          </PairGroup>
+        </GroupedFields>
+      </FieldGroup>
+
+      <DropdownGrid>
+        <FieldGroup wide>
+          <Label label="Order Status Notes" htmlFor="notes" />
+          <TextInput
+            id="notes"
+            placeholder="Type notes here..."
+            value={orderDetails?.order_status_note || ''}
+            readOnly
+          />
+        </FieldGroup>
+
+        <FieldGroup wide>
+          <Label label="Charge Description" htmlFor="chargedescription" />
+          <TextInput
+            id="chargedescription"
+            placeholder="Type charge description here..."
+            onChange={() => {}}
+          />
+        </FieldGroup>
+      </DropdownGrid>
+    </Wrapper>
+  );
+}
+
+const CurrencyWrapper = styled.span`
+  display: flex;
+  align-items: center;
+  color: #999;
+`;
+
+const DropdownGrid = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  width: 48%;
+`;
+
+const GroupedFields = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 7px;
+`;
+
+const PairGroup = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 20px;
+
+  @media (max-width: 768px) {
+    flex-direction: column;
+  }
+`;
+
+const SmallGroup = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  flex: 1;
+  width: 48%;
+`;
+
+const Wrapper = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  width: 100%;
+  padding: 10px 0;
+`;
+
+const FieldGroup = styled.div<{ wide?: boolean }>`
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  flex: ${props => (props.wide ? 2 : 1)};
+`;
+
+const TextInput = styled(TextArea)`
+  resize: none;
+  width: 100%;
+  min-height: 180px;
+`;
+
+const StyledInput = styled(Input)`
+  width: 100%;
+  height: 38px;
+`;
+
+const DateInput = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 12px;
+  border-radius: 6px;
+  border: 1px solid #e0e2e7;
+  background-color: #fff;
+  color: #363a30;
+  height: 38px;
+  font-size: 14px;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+`;
+
+const Text = styled.div`
+  color: #363a30;
+  font-size: 14px;
+`;
+
+export default SuccessContent;

package/src/components/order-view/order-actions/actions/force-debrief/styles.tsx

@@ -0,0 +1,51 @@
+import styled from 'styled-components';
+
+export const Title = styled.span`
+  font-family: 'Lato', sans-serif;
+  font-size: 16px;
+  font-weight: 600;
+  color: #6a7378;
+`;
+
+export const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+`;
+
+export const FieldRow = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 300px;
+  justify-content: space-between;
+`;
+
+export const Label = styled.label`
+  font-size: 14px;
+  color: #7b7874;
+`;
+
+export const Input = styled.input`
+  width: 70px;
+  padding: 6px;
+  font-size: 14px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  &::-webkit-inner-spin-button,
+  &::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    margin: 0;
+  }
+`;
+
+export const MainContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+`;
+export const CurrencySymbol = styled.span`
+  color: #858d9d;
+`;

package/src/components/order-view/order-actions/actions/hold-order/HoldOrderModal.tsx

@@ -25,6 +25,7 @@ import { useClientPortal } from '../../../../store';
 interface IProps {
   callOrderAlertsApi: any;
   callOrdersApi?: any;
+  callOrderStatusApi: any;
   callUnresolvedTaskApi?: any;
 }
 
@@ -93,6 +94,7 @@ function HoldOrderModal(props: IProps) {
           await props?.callUnresolvedTaskApi();
         }
         await props?.callOrderAlertsApi();
+        await props?.callOrderStatusApi();
         await props?.callOrdersApi();
       }
       if (response?.code !== 200) {

package/src/components/order-view/order-actions/actions/remove-from-route/RemoveFromRoute.tsx

@@ -15,12 +15,16 @@ import {
 } from '../../../store';
 import { notification } from 'antd';
 
-function RemoveFromRoute() {
+function RemoveFromRoute(props: any) {
   const [orderId] = useOrderId();
   const [, setCurrentAction] = useCurrentAction();
   const [, setRecalling] = useLiveRecalling();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
 
+  const callOrdersApi = async () => {
+    await props?.callOrderAlertsApi();
+  };
+
   const { data: response, setShouldPerformAction: setAction } = useApiHook<{
     data: ApiResponse[];
   }>({
@@ -37,9 +41,10 @@ function RemoveFromRoute() {
           //@ts-ignore
           response?.message || 'Order has been removed successfully',
       });
-      setCurrentAction(undefined);
+      callOrdersApi();
       setRecalling(true);
       setRecallAuditLog(true);
+      setCurrentAction(undefined);
     }
     if (response?.data === null) {
       notification.error({

package/src/components/order-view/order-actions/actions/unhold-order/UnholdOrder.tsx

@@ -13,6 +13,7 @@ interface IProps {
   callOrderAlertsApi: any;
   callOrdersApi?: any;
   callUnresolvedTaskApi?: any;
+  callOrderStatusApi: any;
 }
 
 const UnholdOrder = (props: IProps) => {
@@ -46,6 +47,7 @@ const UnholdOrder = (props: IProps) => {
         }
         await props?.callOrderAlertsApi();
         await props?.callOrdersApi();
+        await props?.callOrderStatusApi();
       }
       if (response?.code !== 200) {
         notification.error({

package/src/components/order-view/order-actions/index.tsx

@@ -34,6 +34,7 @@ import { useReminderNotiData, useTasksData } from './store';
 import ChargeLog from './actions/charge-log';
 import ReminderModal from './actions/create-task-reminder';
 import TaskModal from './actions/create-task-reminder/TaskModal';
+import ForceDebriefModal from './actions/force-debrief/ForceDebriefModal';
 
 function OrderActions() {
   const [currentAction, setCurrentAction] = useCurrentAction();
@@ -93,8 +94,8 @@ function OrderActions() {
       setProductDetails(productsData?.data);
       setProductDetailsCopy(productsData?.data);
     } else {
-      setProductDetails(null);
-      setProductDetailsCopy(null);
+      setProductDetails([]);
+      setProductDetailsCopy([]);
     }
   }, [orderProductsLoading]);
 
@@ -176,6 +177,7 @@ function OrderActions() {
     method: 'GET',
     pagination: { is_pagination: false },
     filters: [{ field: 'order_id', op: '=', value: orderId }],
+    showLoader: false,
   });
 
   useEffect(() => {
@@ -234,9 +236,18 @@ function OrderActions() {
           />
         );
       case 'confirm-order':
-        return <ConfirmOrder />;
+        return <ConfirmOrder callOrderAlertsApi={callOrderAlertsApi} />;
       case 'send-sms':
         return <SendSmsModal />;
+
+      case 'force-debrief':
+        return (
+          <ForceDebriefModal
+            callOrdersApi={callOrdersApi}
+            callOrderStatusApi={fetchStatusData}
+            callOrderAlertsApi={callOrderAlertsApi}
+          />
+        );
       case 'send-email':
         return <SendEmailModal />;
       case 'change-customer-account':
@@ -247,6 +258,7 @@ function OrderActions() {
           <HoldOrderModal
             callOrdersApi={callOrdersApi}
             callOrderAlertsApi={callOrderAlertsApi}
+            callOrderStatusApi={fetchStatusData}
             callUnresolvedTaskApi={callUnresolvedTaskApi}
           />
         );
@@ -272,6 +284,7 @@ function OrderActions() {
             callOrdersApi={callOrdersApi}
             callOrderAlertsApi={callOrderAlertsApi}
             callUnresolvedTaskApi={callUnresolvedTaskApi}
+            callOrderStatusApi={fetchStatusData}
           />
         );
       case 'view-reminder':
@@ -281,9 +294,9 @@ function OrderActions() {
       case 'view-flag':
         return <ViewFlag />;
       case 'clear-date':
-        return <ClearBookingStatus />;
+        return <ClearBookingStatus callOrderAlertsApi={callOrderAlertsApi} />;
       case 'remove-from-route':
-        return <RemoveFromRoute />;
+        return <RemoveFromRoute callOrderAlertsApi={callOrderAlertsApi} />;
       default:
         return null;
     }

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

@@ -18,7 +18,7 @@ export const initialPayload: CreateTaskPayload = {
   flag_type: '',
   priority: 3,
   status: 'AD',
-  due_datetime: '',
+  // due_datetime: '',
 };
 
 export const initialValue: CreateReminderPayload = {

package/src/components/order-view/order-actions/types.ts

@@ -22,7 +22,7 @@ export interface CreateTaskPayload {
   flag_type: string | null;
   priority: number | null;
   status: string | null;
-  due_datetime: string | null;
+  due_datetime?: string | null;
 }
 export interface resolveTaskPayload {
   task_ids: number[] | null;
@@ -31,7 +31,7 @@ export interface resolveTaskPayload {
 export interface CreateReminderPayload {
   due_datetime: Date | null;
   description: string | null;
-  assigned_to: string | null;
+  assigned_to: any | null;
   order_id: number | null;
   priority: number | null;
   department: string | null;
@@ -49,7 +49,7 @@ export interface SingleResolvedPayload {
 export interface UpdateReminderPayload {
   due_datetime: any | null;
   description: any | null;
-  assigned_to: string | null;
+  assigned_to: any | null;
   order_id: number | null;
   priority: number | null;
   department: any | null;

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

@@ -11,6 +11,7 @@ import {
   useGlobalStateHitAuditLog,
   useOrderStaticData,
   useGlobalStateHitOrder,
+  useLiveRecalling,
 } from '../../../store';
 // import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -28,7 +29,7 @@ function OrderDetailsFooter() {
   const [orderStaticData] = useOrderStaticData();
   const [, setRecallOrders] = useGlobalStateHitOrder();
   const [isClientPortal] = useClientPortal();
-
+  const [, setRecalling] = useLiveRecalling();
   //update order
   const { fetchData: callUpdateOrderAPI } = useAxios<{
     data: ApiResponse[];
@@ -91,6 +92,7 @@ function OrderDetailsFooter() {
   const onSave = async () => {
     setRecallAuditLog(false);
     setRecallOrders(false);
+    setRecalling(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const clone = [...orderDetails?.order_services];
 
@@ -141,6 +143,10 @@ function OrderDetailsFooter() {
         [key: string]: any;
       };
       // const response = await updateOrder([payload]);
+      setRecalling(true);
+      setTimeout(() => {
+        setRecalling(false);
+      }, 2000);
       setRecallOrders(true);
       if (response.code == 200 && response?.data?.length > 0) {
         notification.success({

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

@@ -5,24 +5,38 @@ import OrdersSection from './orders-section';
 import InstructionSection from './instruction-section';
 import ServicesSection from './services-section';
 import OrderDetailsFooter from './footer';
+import { Skeleton } from 'antd';
+import { FormSection } from '@bjsdistribution/dms-component-library';
 
-function ExpandedContent() {
+function ExpandedContent({ orderLoading, depotDataLoading }: any) {
   return (
-    <MainContainer>
-      <Container>
-        <HalfWidth>
-          <CustomerSection />
-        </HalfWidth>
-        <HalfWidth>
-          <OrdersSection />
-        </HalfWidth>
-        <InstructionSection />
-      </Container>
-      {/* <InstructionContainer>
-      </InstructionContainer> */}
-      <ServicesSection />
-      <OrderDetailsFooter />
-    </MainContainer>
+    <>
+      <MainContainer>
+        {orderLoading || depotDataLoading ? (
+          <>
+            <CustomFormSection>
+              <Skeleton paragraph={{ rows: 4 }} />
+              <Skeleton paragraph={{ rows: 4 }} />
+            </CustomFormSection>
+          </>
+        ) : (
+          <>
+            <Container>
+              <HalfWidth>
+                <CustomerSection />
+              </HalfWidth>
+              <HalfWidth>
+                <OrdersSection />
+              </HalfWidth>
+              <InstructionSection />
+            </Container>
+
+            <ServicesSection />
+            <OrderDetailsFooter />
+          </>
+        )}
+      </MainContainer>
+    </>
   );
 }
 
@@ -86,4 +100,11 @@ const MainContainer = styled.div`
   }
 `;
 
+const CustomFormSection = styled(FormSection)`
+  flex: 1;
+  border-radius: 8px;
+  background: #f8fafc;
+  box-shadow: 0px 1px 3px 0px rgba(16, 24, 40, 0.1);
+`;
+
 export default ExpandedContent;

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

@@ -30,7 +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;
+  padding: 24px !important;
 `;
 
 export default InstructionSection;

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

@@ -8,13 +8,12 @@ function ServiceLevel() {
   const [orderStaticData] = useOrderStaticData();
   const [orderData, setOrderData] = useOrderDetails();
 
-  const serviceLevelId =
-    orderData?.order_services_detail?.order_service_level_id;
+  const serviceLevelId = orderData?.order_services_detail?.order_service_level_id?.toString();
 
   const serviceLevelOptions = orderStaticData?.order_service_levels?.map(
     (option: any) => ({
       label: capitalize(option.type.replaceAll('_', ' ')),
-      value: option.id.toString(),
+      value: option?.id?.toString(),
     })
   );
 
@@ -32,7 +31,7 @@ function ServiceLevel() {
   return (
     <Container disabled={isDisabled}>
       <RadioButtonGroup
-        selectedValue={serviceLevelId?.toString() || ''}
+        selectedValue={serviceLevelId || ''}
         heading="Service Level"
         options={serviceLevelOptions || []}
         onChange={radioGroupHandler}

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

@@ -14,7 +14,7 @@ interface ApiResponse {
   setShouldPerformAction: boolean;
 }
 
-function OrderDetails() {
+function OrderDetails({ orderLoading, depotDataLoading }: any) {
   const [orderData] = useOrderDetails();
   const customerData = orderData;
   const id = customerData?.customer_id;
@@ -44,7 +44,10 @@ function OrderDetails() {
 
   return (
     <>
-      <ExpandedContent />
+      <ExpandedContent
+        orderLoading={orderLoading}
+        depotDataLoading={depotDataLoading}
+      />
     </>
   );
 }

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

@@ -6,7 +6,7 @@ import DynamicTable from '../../DynamicTable';
 import { useOrderProductsResources } from '../../store';
 import { tableColumns } from '../helper';
 
-function Order() {
+function Order({ loading }: any) {
   const [orderResources] = useOrderProductsResources();
 
   const data =
@@ -17,7 +17,7 @@ function Order() {
   return (
     <Table>
       <CollapsableForm collapsedContent={<CollapsedContent />}>
-        <DynamicTable columns={tableColumns} data={data} />
+        <DynamicTable columns={tableColumns} data={data} loading={loading} />
       </CollapsableForm>
     </Table>
   );