{
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ >
@@ -3614,6 +3647,10 @@ const BSBillingEditQuantity = (props) => {
type="number"
value={Quantity}
onChange={(e) => setQuantity(e.target.value)}
+ onBlur={() => {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
className="EditQuantity-Quantitybox"
/>
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
index adb7a6b..8a51da2 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
@@ -3859,7 +3859,8 @@ export default function BST1Payment() {
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{' '}
{' '}
{
const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails);
if (calculatedOverAllQty + 1 > maxQtyLimit) {
message.warning(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`);
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+ const inwardQtyMap = CartOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr.InwardDtlId;
+ const qty = Number(curr.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ message.warning(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
return;
}
}
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
index d059d55..bc3de2f 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
@@ -100,6 +100,11 @@ const BSBillingTable3 = () => {
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
setting?.SettingValue === 'Y'
);
+ const salesaskiosk = preferenceDatas?.[0]?.SettingDtlDetails?.find(
+ (setting) =>
+ setting?.SettingIdName?.toLowerCase() === 'salespageaskiosk' &&
+ setting?.SettingValue === 'Y'
+ );
const SessionData = useSelector(StoredSessionData);
const BranchId = SessionData?.BranchId;
const AppId = SessionData?.AppId;
@@ -366,8 +371,6 @@ const BSBillingTable3 = () => {
await dispatch(changeUnpaidData(false));
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
- await dispatch(ChangeSelectedCustDisable(false));
- await dispatch(changeSelectedOption(false));
await dispatch(changeBookingType(defaultBookingType || 'TakeAway'));
// await dispatch(changeholddata([]))
await dispatch(changeOrderType());
@@ -2357,7 +2360,7 @@ const BSBillingTable3 = () => {
fontSize: '16px',
}}
>
- {tableData?.length > 0 ? (
+ {(tableData?.length > 0)? (
import('../../UtillComponents/PaymentGatewayEmbedded.jsx')
);
@@ -269,6 +270,7 @@ const BSBillingTable3Pay = () => {
const previousOrderOfferDetails = useSelector(
GlobalPreviousOrderOfferDetails
);
+ const CustomerMobileNumber = useSelector(GlobalSelCustId, shallowEqual);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const FreeProdList = useSelector(GlobalFreeProdList);
const offerAppliedProducts = useSelector(
@@ -301,6 +303,7 @@ const BSBillingTable3Pay = () => {
const FontFamily = useSelector(GlobalSelectedFont);
const GetCustId = useSelector(GlobalCustId);
const SelCustId = useSelector(GlobalSelCustId);
+ console.log(GetCustId, SelCustId, 'GetCustId, SelCustId');
const selOption = useSelector(GlobalSelOption);
const SelectedTableDetails = useSelector(GlobalSelectedTableDetails);
const defaultBookingType = useSelector(GlobalDefaultBookingType);
@@ -378,6 +381,17 @@ const BSBillingTable3Pay = () => {
const [PrintOrderDetails, setPrintOrderDetails] = useState([]);
const OrderCardDetail = useSelector(GlobalOrderCardDetails);
const [customerPreviesOrders, setCustomerPreviesOrders] = useState(false);
+ const [CustomerOtpmodalopen, setCustomerOtpmodalopen] = useState(false);
+ const isOtpEnabled = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
+ (setting) =>
+ setting?.SettingIdName?.toLowerCase() === 'kioskotp' &&
+ setting?.SettingValue === 'Y'
+ );
+ const salesaskiosk = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
+ (setting) =>
+ setting?.SettingIdName?.toLowerCase() === 'salespageaskiosk' &&
+ setting?.SettingValue === 'Y'
+ );
console.log(OrderCardDetail, 'OrderCardDetail');
//Total calculation
@@ -707,6 +721,10 @@ const BSBillingTable3Pay = () => {
// dispatch(getPrintSelectionComponentData(Data1)).unwrap();
}, []);
+ useEffect(() => {
+ (!CustomerMobileNumber && isOtpEnabled && salesaskiosk) && setCustomerOtpmodalopen(true);
+ }, [PrintOrderDetails, CustomerMobileNumber]);
+
useEffect(() => {
const getPrintData = async () => {
try {
@@ -875,7 +893,7 @@ const BSBillingTable3Pay = () => {
//mohan end
useEffect(() => {
- if (OrderCardDetail?.length <= 0) {
+ if (OrderCardDetail?.length <= 0 && !salesaskiosk) {
dispatch(changeCustomerID(null));
dispatch(changeSelectedCustId(null));
dispatch(changeSelectedOption(null));
@@ -1072,9 +1090,9 @@ const BSBillingTable3Pay = () => {
setDefaultPaymentMode([]);
}
};
- if (salesBillEdit) {
+ // if (salesBillEdit) {
setDefaultPaymentOption();
- }
+ // }
}, [defaultPaymentTrigger, salesBillEdit]);
const TokenPrint = async (index) => {
@@ -3791,7 +3809,8 @@ const BSBillingTable3Pay = () => {
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{
}
/>
)}
+
+ {(CustomerOtpmodalopen && isOtpEnabled && salesaskiosk) && (
+ setCustomerOtpmodalopen(false)}
+ />
+ )}
);
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
index 47011ad..0bc7c84 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
@@ -3920,7 +3920,8 @@ const BSBilling4Payment = () => {
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{' '}
+
+
+
+
{isMobile && (
import('../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx')
);
-const OtherServiceMobilePrint = lazy(
- () => import('../../BookingFunctionality/OtherServiceMobilePrint.jsx')
-);
const BSOtherServiceClaim = lazy(
() => import('../../UtillComponents/BSOtherServiceClaim.jsx')
);
@@ -4165,7 +4163,8 @@ const BSBillingTable5 = () => {
''
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{' '}
+
+ {
setMessageType('warning');
return;
}
+ } else if (itemWiseLimitPreferenece) {
+ const inwardQtyMap = TableData.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMessageData(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setMessageType('warning');
+ return;
+ }
}
}
const OtherOrderDatas = TableData?.filter(
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
index e9afb8d..bf21da6 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
@@ -4152,7 +4152,8 @@ const BST6Payment = () => {
''
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{' '}
{
setMessageType('warning');
return;
}
+ } else if (itemWiseLimitPreferenece) {
+ const inwardQtyMap = CartOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = Qty || 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log('Final InwardDtlId Qty Map:', inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMessageData(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setMessageType('warning');
+ return;
+ }
}
}
diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
index c35dc25..237b9da 100644
--- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
+++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
@@ -157,6 +157,7 @@ import { FaParking } from 'react-icons/fa';
import { isMobile } from 'react-device-detect';
import { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx';
import '../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss';
+import { RiFullscreenExitFill, RiFullscreenFill } from 'react-icons/ri';
const subDirectory = import.meta.env.ENV_BASE_URL;
const commonUrl = import.meta.env.ENV_COMMON_BASE_URL;
@@ -263,6 +264,30 @@ const BSNavbar1 = (props) => {
setAccIsOpen(false);
}
};
+ const [isFullscreen, setIsFullscreen] = useState(false);
+
+
+
+ const handleFullscreen = useCallback(async () => {
+ if (!isFullscreen) {
+ try {
+ await document.documentElement.requestFullscreen();
+ setIsFullscreen(true);
+ } catch (error) {
+ console.error('Fullscreen error:', error);
+ }
+ } else {
+ try {
+ if (document.fullscreenElement) {
+ await document.exitFullscreen();
+ }
+ setIsFullscreen(false);
+ } catch (error) {
+ console.error('Exit fullscreen error:', error);
+ }
+ }
+ }, [isFullscreen]);
+
useEffect(() => {
if (!FeatureAddonData?.FeatureDtls?.length) return;
@@ -967,6 +992,20 @@ const BSNavbar1 = (props) => {
{formattedDate}
{
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{' '}
{' '}
OnfocusTrue()}
+ // onClick={() => OnfocusTrue()}
/>
{ProductSearch?.length > 5 &&
@@ -4724,8 +4758,8 @@ export default function BSC1Search(props) {
{
const formRef = useRef(null);
const dispatch = useDispatch();
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
const CartOrderDetails = useSelector(GlobalOrderCardDetails);
+ const selectStatuscust = useSelector(GlobalfocusStatusCust);
const [DeviceDetailOpen, setDeviceDetailOpen] = useState(props.DeviceDetails);
const [ProductDetail, setProductDetail] = useState(props.ProductDetail);
const [RadioBtnSelection, setRadioBtnSelection] = useState('Serial');
@@ -51,8 +55,8 @@ const BSImeiDetails = (props) => {
);
formRef?.current?.setFieldsValue({
- description: productidentifier?.[0]?.Description || "",
- })
+ description: productidentifier?.[0]?.Description || '',
+ });
}, []);
const CloseDeviceDetailModal = () => {
props.handleDeviceDetailClose();
@@ -72,8 +76,7 @@ const BSImeiDetails = (props) => {
} else {
setSerialNumberList([...SerialNumberList, e]);
}
- }
- else {
+ } else {
setMessageType('error');
setMessageData('Already Selected ');
}
@@ -94,7 +97,6 @@ const BSImeiDetails = (props) => {
setMessageData('you cant enter more than Order Qty');
}
formRef.current?.resetFields(['SerialNumbertext', 'IMEINumbertext']);
-
};
const IMEINumberOnchange = (e) => {
@@ -139,8 +141,10 @@ const BSImeiDetails = (props) => {
setMessageType(null);
}, []);
const AddDeviceDetails = () => {
-
- console.log(formRef?.current?.getFieldsValue, "formRef?.current?.getFieldsValue")
+ console.log(
+ formRef?.current?.getFieldsValue,
+ 'formRef?.current?.getFieldsValue'
+ );
const maxLength = Math.max(SerialNumberList.length, IMEINumberList.length);
// Create the new object array
const IdentifyDetails = Array.from({ length: maxLength }, (_, index) => {
@@ -165,17 +169,16 @@ const BSImeiDetails = (props) => {
cartItem // if the item is already in the cart, increase the quantity of the item
) =>
cartItem.ProdId === ProductDetail.ProdId &&
- cartItem.InwardDtlId === ProductDetail.InwardDtlId &&
- cartItem?.OrderRate === ProductDetail?.OrderRate &&
- cartItem?.BookingTypeName === ProductDetail?.BookingTypeName
+ cartItem.InwardDtlId === ProductDetail.InwardDtlId &&
+ cartItem?.OrderRate === ProductDetail?.OrderRate &&
+ cartItem?.BookingTypeName === ProductDetail?.BookingTypeName
? { ...cartItem, ProductIdentifierDtls: IdentifyDetails }
: cartItem // otherwise, return the cart item
)
)
);
- formRef?.current?.resetFields()
+ formRef?.current?.resetFields();
CloseDeviceDetailModal();
-
};
console.log(ProductDetail, 'ProductDetaildevice');
return (
@@ -239,7 +242,7 @@ const BSImeiDetails = (props) => {
{RadioBtnSelection == 'Serial' && (
}
handleCancel={CloseDeviceDetailModal}
/>
-
+
);
};
export default BSImeiDetails;
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
index a7ff4b7..5df19c0 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
@@ -190,7 +190,7 @@ import {
getExpireProductsList,
getLowStockAlertProductsList,
} from '../../../../../Features/ProductPage/ProductPage.js';
-
+
// Jsx Files
const CustomerOrders = lazy(
() => import('../../BookingFunctionality/CustomerOrders.jsx')
@@ -198,13 +198,9 @@ const CustomerOrders = lazy(
const PaymentGatewayEmbedded = lazy(
() => import('../../UtillComponents/PaymentGatewayEmbedded.jsx')
);
-const MobileMultiPdfPrintTrigger = lazy(
- () => import('../../UtillComponents/MobileMultiPdfPrintTrigger.jsx')
-);
-const OtherServicePrintStyle1 = lazy(
- () =>
- import('../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx')
-);
+import MobileMultiPdfPrintTrigger from '../../UtillComponents/MobileMultiPdfPrintTrigger.jsx';
+import OtherServicePrintStyle1 from '../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx';
+
import OtherServiceMobilePrint from '../../BookingFunctionality/OtherServiceMobilePrint.jsx';
const QrinScreen = lazy(
@@ -215,9 +211,8 @@ const SMSShare = lazy(() => import('../../../../WhatsAppShare/SmsShare'));
const WhatsAppShare = lazy(
() => import('../../../../WhatsAppShare/whatsAppShare')
);
-const TokensinglePrint = lazy(
- () => import('../../../../paymentpdfPage/TokenOnlyPrints/TokeninsinglePrint')
-);
+
+import TokensinglePrint from '../../../../paymentpdfPage/TokenOnlyPrints/TokeninsinglePrint';
import { useApplyOfferto_CardDetail } from '../../UtillComponents/BSNavBarOffer/BSNavBarOffer_CustomHooks.jsx';
// Icons File
@@ -2840,7 +2835,10 @@ const StandardTablePayment = () => {
setPaybtnselected(PaymentOptionsModeId);
setQrCode(false);
setUpinotSelected(false);
- if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) {
+ if (
+ holdCheckedSalesSetup ||
+ NavBarOptions?.some((e) => e?.OptionName == 'Hold')
+ ) {
getHolddata();
}
setCurrentOrderNetAmount(0);
@@ -3527,7 +3525,8 @@ const StandardTablePayment = () => {
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
- {ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
+ {ProductDetail?.FullProductIdentifierDtls?.length > 0 && (
{
onChangeFunction={(e) => SerialNumberOnchange(e)}
/>
-
- }
+ )}
{
-
await validateSafeInput(value);
return Promise.resolve();
},
},
]}
>
- {
- // if (['e', 'E', '+', '-', '.'].includes(e.key)) {
- // e.preventDefault();
- // }
- // }}
- />
+
{
)}
-
{RadioBtnSelection == 'IMEI' && (
{
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ >
+ {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ />
+
- {ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
+ {ProductDetail?.FullProductIdentifierDtls?.length > 0 && (
{
className="field-DropDown"
onChangeFunction={(e) => IMEINumberOnchange(e)}
/>
- }
+
+ )}
{
-
await validateSafeInput(value);
return Promise.resolve();
},
},
]}
>
- {
- // if (['e', 'E', '+', '-', '.'].includes(e.key)) {
- // e.preventDefault();
- // }
- // }}
- />
+
{
)}
- {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ >
+ {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ />
+
+
Description..}
@@ -411,7 +423,6 @@ const BSImeiDetails = (props) => {
-
{
icon={
-
+ {
)}
{/* Customer Orders */}
- {SelCustId && (
+ {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+ .length === 1) && (
{' '}
),
@@ -4633,7 +4667,7 @@ export default function BSC1Search(props) {
offer?.FreeProductsList?.FreeProdId ===
- matchingFreeProduct?.FreeProdId &&
+ matchingFreeProduct?.FreeProdId &&
offer?.TableName === matchingFreeProduct?.TableName &&
offer?.TableUniqueName ===
- matchingFreeProduct?.TableUniqueName &&
+ matchingFreeProduct?.TableUniqueName &&
offer?.OfferId === matchingFreeProduct?.OfferId &&
offer?.OfferMode === matchingFreeProduct?.OfferMode &&
offer?.FreeProductsList?.ProdVariantDetails?.[0]
@@ -1695,7 +1695,7 @@ export default function BSC1Search(props) {
0 ||
- record.StockCount === 'Stock Not Maintained'
+ record.StockCount === 'Stock Not Maintained'
? { color: '#000', cursor: 'pointer' }
: { color: '#f49898', cursor: 'not-allowed' }
}
@@ -1725,7 +1725,7 @@ export default function BSC1Search(props) {
0 ||
- record.StockCount === 'Stock Not Maintained'
+ record.StockCount === 'Stock Not Maintained'
? { color: '#000', cursor: 'pointer' }
: { color: '#f49898', cursor: 'not-allowed' }
}
@@ -1755,7 +1755,7 @@ export default function BSC1Search(props) {
0 ||
- record.StockCount === 'Stock Not Maintained'
+ record.StockCount === 'Stock Not Maintained'
? { color: '#000', cursor: 'pointer' }
: { color: '#f49898', cursor: 'not-allowed' }
}
@@ -1919,11 +1919,11 @@ export default function BSC1Search(props) {
StockCount:
qtydata?.ProductDetail?.[0]?.StockAvailable === 'Y'
? returnVariantStock(
- qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
- item?.OverAllQty,
- CartOrderDetails,
- item?.ProdVariantName
- )
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item?.ProdVariantName
+ )
: 'Stock Not Maintained',
});
});
@@ -1939,17 +1939,17 @@ export default function BSC1Search(props) {
'Batch No': item?.BatchRef,
StockCount: onePeiceFlow
? returnCountStock(
- item?.ProdId,
- item?.BalanceQty,
- CartOrderDetails,
- item?.InwardDtlId
- ) * item?.NoOfPcs
+ item?.ProdId,
+ item?.BalanceQty,
+ CartOrderDetails,
+ item?.InwardDtlId
+ ) * item?.NoOfPcs
: returnCountStock(
- item?.ProdId,
- item?.BalanceQty,
- CartOrderDetails,
- item?.InwardDtlId
- ),
+ item?.ProdId,
+ item?.BalanceQty,
+ CartOrderDetails,
+ item?.InwardDtlId
+ ),
'Stock Date': StockDate(item?.InwardDate),
Price: onePeiceFlow ? item?.OnePcsPrice : item?.SellPrice,
ExpDate:
@@ -2003,13 +2003,13 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.SellPrice &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -2018,9 +2018,9 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2062,11 +2062,11 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
+ ?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[0]?.SellPrice &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
+ ?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -2075,9 +2075,9 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2155,13 +2155,13 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -2169,11 +2169,11 @@ export default function BSC1Search(props) {
let Isincartonepc = CartOrderDetails?.filter(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2237,11 +2237,11 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
- ?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
+ ?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
- ?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
+ ?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -2250,9 +2250,9 @@ export default function BSC1Search(props) {
(cartItem) =>
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2327,15 +2327,15 @@ export default function BSC1Search(props) {
let Isincart = CartOrderDetails?.find(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -2343,11 +2343,11 @@ export default function BSC1Search(props) {
let Isincartonepc = CartOrderDetails?.filter(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndexs
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndexs
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2425,15 +2425,15 @@ export default function BSC1Search(props) {
let Isincart = CartOrderDetails?.find(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -2441,11 +2441,11 @@ export default function BSC1Search(props) {
let Isincartonepc = CartOrderDetails?.filter(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2565,7 +2565,7 @@ export default function BSC1Search(props) {
const isKgsProduct =
(a?.ProductDetail?.[QtyIndex]?.UomName?.toLowerCase() === 'kgs' ||
a?.ProductDetail?.[QtyIndex]?.UomName?.toLowerCase() ===
- 'kg'?.toLowerCase()) &&
+ 'kg'?.toLowerCase()) &&
a?.ProductDetail?.[QtyIndex]?.Size === '1';
if (
@@ -2578,11 +2578,11 @@ export default function BSC1Search(props) {
parseFloat(
onePcs
? (a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.OnePcsPrice /
- 1000) *
- (parseFloat(WeightScaleWeight) * 1000)
+ ?.StockDetails?.[stockIndex]?.OnePcsPrice /
+ 1000) *
+ (parseFloat(WeightScaleWeight) * 1000)
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.SellPrice / 1000
+ ?.StockDetails?.[stockIndex]?.SellPrice / 1000
) *
(parseFloat(WeightScaleWeight) * 1000);
let data = {
@@ -2638,9 +2638,9 @@ export default function BSC1Search(props) {
?.StockDetails?.[stockIndex]?.InwardId,
MRP: onePcs
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.OnePcsPrice
+ ?.StockDetails?.[stockIndex]?.OnePcsPrice
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.MRP,
+ ?.StockDetails?.[stockIndex]?.MRP,
FullProductIdentifierDtls:
a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
?.StockDetails?.[stockIndex]?.ProductIdentifierDtls,
@@ -2748,19 +2748,19 @@ export default function BSC1Search(props) {
?.StockDetails?.[stockIndex]?.InwardId,
MRP: onePcs
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.OnePcsPrice
+ ?.StockDetails?.[stockIndex]?.OnePcsPrice
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.MRP,
+ ?.StockDetails?.[stockIndex]?.MRP,
OrderRate: onePcs
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.OnePcsPrice
+ ?.StockDetails?.[stockIndex]?.OnePcsPrice
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.SellPrice,
+ ?.StockDetails?.[stockIndex]?.SellPrice,
SellingPrice: onePcs
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.OnePcsPrice
+ ?.StockDetails?.[stockIndex]?.OnePcsPrice
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[stockIndex]?.SellPrice,
+ ?.StockDetails?.[stockIndex]?.SellPrice,
SuppId:
a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
?.StockDetails?.[stockIndex]?.SuppId,
@@ -2851,6 +2851,40 @@ export default function BSC1Search(props) {
setMessageType('warning');
return;
}
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = CartOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMessageData(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setMessageType('warning');
+ return;
+ }
}
}
@@ -2944,15 +2978,15 @@ export default function BSC1Search(props) {
const isExistsInFreeProdList = hasOffer
? FreeProdList?.filter(
- (f) =>
- f?.FreeProdId === item?.ProdId &&
- f?.ProdVariantDetails?.some((variant) =>
- variant?.StockDetails?.some(
- (stock) => stock?.FreeInwardDtlId === item?.InwardDtlId
- )
- ) &&
- f?.RemainingQty > 0
- )
+ (f) =>
+ f?.FreeProdId === item?.ProdId &&
+ f?.ProdVariantDetails?.some((variant) =>
+ variant?.StockDetails?.some(
+ (stock) => stock?.FreeInwardDtlId === item?.InwardDtlId
+ )
+ ) &&
+ f?.RemainingQty > 0
+ )
: [];
const calculateTaxAmounts = (qty, rate, taxPercentage) => {
@@ -3019,10 +3053,10 @@ export default function BSC1Search(props) {
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B'
? true
: cartItem?.OfferMode !== 'B') &&
- cartItem?.OfferMode !== 'P' &&
- cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O' &&
- cartItem?.OfferMode !== 'L'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O' &&
+ cartItem?.OfferMode !== 'L'
? true
: cartItem?.Offer === 0)
);
@@ -3039,10 +3073,10 @@ export default function BSC1Search(props) {
(cartItem) =>
itemMatchCondition(cartItem) &&
(cartItem?.OfferMode !== 'B' &&
- cartItem?.OfferMode !== 'P' &&
- cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O' &&
- cartItem?.OfferMode !== 'L'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O' &&
+ cartItem?.OfferMode !== 'L'
? true
: cartItem?.Offer === 0)
);
@@ -3056,10 +3090,10 @@ export default function BSC1Search(props) {
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B'
? true
: cartItem?.OfferMode !== 'B') &&
- cartItem?.OfferMode !== 'P' &&
- cartItem?.OfferMode !== 'L' &&
- cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'L' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O'
? true
: cartItem?.Offer === 0)
)
@@ -3070,10 +3104,10 @@ export default function BSC1Search(props) {
!(
itemMatchCondition(cartItem) &&
(cartItem?.OfferMode !== 'B' &&
- cartItem?.OfferMode !== 'P' &&
- cartItem?.OfferMode !== 'L' &&
- cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'L' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O'
? true
: cartItem?.Offer === 0)
)
@@ -3146,8 +3180,8 @@ export default function BSC1Search(props) {
isItemInCart,
item?.OtherProduct === 'Others' || item?.ScaleType === 'weight'
? (
- (item?.OrderQty || 0) + parseFloat(isItemInCart?.OrderQty)
- )?.toFixed(3)
+ (item?.OrderQty || 0) + parseFloat(isItemInCart?.OrderQty)
+ )?.toFixed(3)
: null
);
const updatedData = addFirst
@@ -3274,9 +3308,9 @@ export default function BSC1Search(props) {
isItemInCartHold,
item?.OtherProduct === 'Others' || item?.ScaleType === 'weight'
? (
- (item?.OrderQty || 0) +
- parseFloat(isItemInCartHold?.OrderQty)
- )?.toFixed(3)
+ (item?.OrderQty || 0) +
+ parseFloat(isItemInCartHold?.OrderQty)
+ )?.toFixed(3)
: null
);
const updatedData = addFirst
@@ -3528,14 +3562,14 @@ export default function BSC1Search(props) {
updatedCartData = cartData.map((item, idx) =>
idx === indexToCheck
? {
- ...item,
- Offer: null,
- OfferMessage: undefined,
- OfferMode: undefined,
- OfferModeType: false,
- OfferType: undefined,
- OfferValue: null,
- }
+ ...item,
+ Offer: null,
+ OfferMessage: undefined,
+ OfferMode: undefined,
+ OfferModeType: false,
+ OfferType: undefined,
+ OfferValue: null,
+ }
: item
);
}
@@ -3586,8 +3620,8 @@ export default function BSC1Search(props) {
...item,
Offer:
sameProduct ||
- bestOffer?.OfferMode === 'I' ||
- bestOffer?.OfferMode === 'Q'
+ bestOffer?.OfferMode === 'I' ||
+ bestOffer?.OfferMode === 'Q'
? bestOffer?.OfferAmount || item.Offer
: item.Offer || bestOffer?.OfferAmount,
OfferType: item?.OfferType || bestOffer?.OfferType,
@@ -3604,10 +3638,10 @@ export default function BSC1Search(props) {
((c?.OfferModeType && c?.OfferMode === 'B'
? true
: c?.OfferMode !== 'B') &&
- c?.OfferMode !== 'P' &&
- c?.OfferMode !== 'C' &&
- c?.OfferMode !== 'O' &&
- c?.OfferMode !== 'L'
+ c?.OfferMode !== 'P' &&
+ c?.OfferMode !== 'C' &&
+ c?.OfferMode !== 'O' &&
+ c?.OfferMode !== 'L'
? true
: c?.Offer === 0);
@@ -3915,10 +3949,10 @@ export default function BSC1Search(props) {
return FreeProdList.map((f, i) =>
i === index
? {
- ...existing,
- ...newFreeProd,
- ProdVariantDetails: existing.ProdVariantDetails,
- }
+ ...existing,
+ ...newFreeProd,
+ ProdVariantDetails: existing.ProdVariantDetails,
+ }
: f
);
} else {
@@ -3988,7 +4022,7 @@ export default function BSC1Search(props) {
const cycleSize = buyQty + getQty;
const fullCycles = Math.floor(
freeCartItem?.reduce((acc, fc) => acc + (fc?.OrderQty || 0), 0) /
- cycleSize
+ cycleSize
);
const totalFreeQty = fullCycles * getQty;
@@ -4591,15 +4625,15 @@ export default function BSC1Search(props) {
{option.ProductDetail?.filter(
(item) => item.OnePcsAvailable == 'Y'
).length !== 0 && (
- {
- setOnePeiceFlow(true);
- }}
- />
- )}
+ {
+ setOnePeiceFlow(true);
+ }}
+ />
+ )}
+ {isFullscreen ?
+
-
- {SalesMode?.SettingValue === 'Y' && !OtherServicesglobal && (
-
)}
+
+
+ {SalesMode?.SettingValue === 'Y' && !OtherServicesglobal && (
+
{!OtherServicesglobal && ScanLayoutScreen?.SettingValue === 'Y' && (
+ {isFullscreen ?
+ {
+ const SettingDataSelector = useSelector(PreferenceData);
+ const CustomerMobileNumber = useSelector(globalKioskCustomerMobileNo);
+
+ const SessionData = useSelector(StoredSessionData, shallowEqual);
+ const dispatch = useDispatch();
+ const [number, setNumber] = useState(
+ CustomerMobileNumber ? CustomerMobileNumber : ''
+ );
+ const [messageType, setMessageType] = useState(null);
+ const [messageData, setMessageData] = useState(null);
+ const [canResend, setCanResend] = useState(true);
+ const [otpInput, setOtpInput] = useState(['', '', '', '']);
+ const [otpIndex, setOtpIndex] = useState(0);
+ const [otpSent, setOtpSent] = useState(false);
+ const [otpVerifed, setOtpVerified] = useState(false);
+ const [otpNumber, setOTPNumber] = useState(null);
+ const [maxLimitExceeded, setMaxLimitExceeded] = useState(null);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
+ const isOtpEnabled = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
+ (setting) =>
+ setting?.SettingIdName?.toLowerCase() === 'kioskotp' &&
+ setting?.SettingValue === 'Y'
+ );
+ const isTimeLimitEnabled = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
+ (setting) =>
+ (setting?.SettingIdName?.toLowerCase() === 'hours' ||
+ setting?.SettingIdName?.toLowerCase() === 'minutes') &&
+ setting?.SettingValue === 'Y'
+ );
+
+ useEffect(() => {
+ isIndianMobile(number) && fetchCustomerDetails(number);
+ }, [number]);
+ useEffect(() => {
+ if (otpInput.every((input) => input !== '')) {
+ verifyOtp();
+ }
+ }, [otpInput]);
+ const fetchCustomerDetails = async (number) => {
+ const response = await dispatch(
+ getAddCustomerDetails({
+ MobileNo: number,
+ AppId: SessionData.AppId,
+ CompId: SessionData.CompId,
+ BranchId: SessionData.BranchId,
+ })
+ )?.unwrap();
+ if (response?.data?.statusCode === 1) {
+ console.log(
+ 'response?.data?.CustomerId',
+ response?.data,
+ response?.data?.data?.[0]?.CustId
+ );
+ dispatch(changeCustomerID(response?.data?.data?.[0]?.CustId));
+ let custvalues = {
+ value: number,
+ label: response?.data?.data?.[0]?.CustName || number,
+ CustId: response?.data?.data?.[0]?.CustId,
+ ...response?.data?.data?.[0],
+ };
+ // {value: '8428086416', label: 'mohan', CustId: 'CUST1-281-437-74', CustName: 'mohan', Address1: undefined, …}
+ await dispatch(changeSelectedOption(custvalues));
+ await dispatch(changeSelectedCustId(response?.data?.data?.[0]?.CustId));
+ await dispatch(
+ ChangeSelectedCustDisable(true)
+ );
+ }else{
+ let postdata = {
+ "CustMobile":number,
+ "CustomerProfile": null,
+ "AppId": SessionData.AppId,
+ "CompId": SessionData.CompId,
+ "BranchId": SessionData.BranchId,
+ "CreatedBy": SessionData.UserId,
+ "InitialOutStanding": null,
+ "OfferType": "P",
+ "MarriedStatus": "N",
+ "CustomerAddressDtl": []
+ }
+ let response1 = await dispatch(postAddCustomerDetails(postdata)).unwrap();
+
+ if (response1?.data?.statusCode == 1) {
+ dispatch(changeSelectedOption(null));
+ dispatch(
+ changeCustomerID(
+ response1?.data?.CustomerDetails?.[
+ response1?.data?.CustomerDetails.length - 1
+ ]
+ )
+ );
+ dispatch(
+ changeSelectedCustId(response1?.data?.CustomerDetails?.[0]?.CustId)
+ );
+ dispatch(
+ ChangeSelectedCustDisable(true)
+ );
+
+ } else{
+ setMessageData('Invalid mobile No.');
+ setMessageType('error');
+ setNumber('');
+ }
+ }
+ };
+ const setNumberFun = (newValue) => {
+ setNumber((prevNumber) => {
+ if (prevNumber.length < 10) {
+ return prevNumber + newValue;
+ }
+ return prevNumber;
+ });
+ };
+
+ const handleOtpNumber = (num) => {
+ if (otpIndex > 3) return;
+
+ const newOtp = [...otpInput];
+ newOtp[otpIndex] = num.toString();
+ setOtpInput(newOtp);
+
+ if (otpIndex < 3) {
+ setOtpIndex(otpIndex + 1);
+ }
+ };
+
+ const handleOtpBackspace = () => {
+ if (otpIndex < 0) return;
+
+ const newOtp = [...otpInput];
+
+ if (newOtp[otpIndex]) {
+ newOtp[otpIndex] = '';
+ } else if (otpIndex > 0) {
+ newOtp[otpIndex - 1] = '';
+ setOtpIndex(otpIndex - 1);
+ }
+
+ setOtpInput(newOtp);
+ };
+
+ const handleBackspace = () => {
+ setNumber((prevNumber) => prevNumber.slice(0, -1));
+ };
+ const checkLast30MinOrder = async (MobileNo) => {
+ const response = await dispatch(
+ checkLastOrderTimeLimit({
+ MobileNo,
+ AppId: SessionData.AppId,
+ CompId: SessionData.CompId,
+ BranchId: SessionData.BranchId,
+ })
+ )?.unwrap();
+ return response?.data;
+ };
+ const sendOTP = async () => {
+ const valid = isIndianMobile(number);
+ if (valid) {
+ if (isTimeLimitEnabled) {
+ const withinTimeLimit = await checkLast30MinOrder(number);
+ if (withinTimeLimit?.IsEligible === false) {
+ // setMessageData(withinTimeLimit?.response);
+ // setMessageType('warning');
+ setMaxLimitExceededMessage(withinTimeLimit?.response);
+ setMaxLimitExceeded(true);
+ await dispatch(changeSelectedOption(null));
+ await dispatch(changeSelectedCustId(null));
+ // Reset after 3 seconds
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2500);
+ return;
+ }
+ }
+ } else {
+ setMessageData('Please enter valid mobile No.');
+ setMessageType('warning');
+ return;
+ }
+ try {
+ setOtpIndex(0);
+ setOtpSent(true);
+ let response = await dispatch(
+ sendupiotp({
+ MobileNo: number,
+ CreatedBy: 0,
+ })
+ )?.unwrap();
+ if (response?.data?.statusCode == 1) {
+ setMessageData('OTP sent to your mobile number');
+ setMessageType('success');
+ setOTPNumber(response?.data?.OTP);
+ startResendTimer();
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ };
+ const verifyOtp = () => {
+ const enteredOtp = otpInput.join('');
+
+ if (enteredOtp === otpNumber?.toString()) {
+ setMessageType('success');
+ setMessageData('OTP Verified Successfully');
+ setOtpSent(false);
+ setOtpInput(['', '', '', '']);
+ HandleCloseModal();
+ // setShowPaymentMethods(true);
+ setOtpVerified(true);
+ } else {
+ setMessageType('error');
+ setMessageData('Invalid OTP');
+ setOtpInput(['', '', '', '']);
+ setOtpIndex(0);
+ }
+ };
+ const onComplete = useCallback(() => {
+ setMessageData(null);
+ setMessageType(null);
+ }, []);
+ return (
+ <>
+ 768 ? 900 : 700}
+ children={
+
+
+ }
+ />
+
+ );
+};
+export default CustomerMobileNumberModal;
diff --git a/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOtp.scss b/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOtp.scss
new file mode 100644
index 0000000..e68c81a
--- /dev/null
+++ b/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOtp.scss
@@ -0,0 +1,701 @@
+.BSOTPpaymentModal_main {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-start;
+ width: 100%;
+ height: 100%;
+ gap: 10px;
+
+ .BSOTPprompt {
+ width: 100%;
+ display: flex;
+ align-items: flex-start;
+ justify-content: flex-start;
+ text-align: left;
+
+ p {
+ text-align: left;
+ font-family: 'Gilroy';
+ font-weight: 700;
+ font-size: 26px;
+ }
+ }
+
+ .BSOTPKioskPayment-inputModal {
+ align-content: center;
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ padding: 1rem 1rem;
+ flex-direction: column;
+
+ .input-err {
+ color: red;
+ font-size: 13px;
+ margin-top: 4px;
+ font-family: 'Poppins', sans-serif;
+ }
+
+ input {
+ width: 50vw;
+ height: 4rem;
+ padding: 0rem 1rem;
+ font-family: 'Gilroy', sans-serif;
+ font-size: 22px;
+ border: none;
+ letter-spacing: 1px;
+ font-weight: 500;
+ border: 1px solid rgba(0, 0, 0, 0.199);
+ border-radius: 8px;
+ }
+ }
+
+ .BSOTPKiosk-dailpadModal {
+ background-color: #e1eef1;
+ display: flex;
+ flex-direction: column;
+ row-gap: 16px;
+ padding: 10px 10px;
+ border-radius: 8px;
+ width: 60%;
+ @media (max-width: 768px) {
+ width: 100%;
+ }
+ }
+
+ .BSOTPpaymentChoise {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ column-gap: 3rem;
+ row-gap: 1rem;
+
+ .BSOTPupi {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-around;
+ width: 110px;
+ height: 110px;
+ border: 1px solid rgba(0, 0, 0, 0.199);
+ border-radius: 8px;
+ cursor: pointer;
+
+ p {
+ font-weight: 500;
+ font-size: 16px;
+ }
+ }
+ }
+
+ .BSOTPchoiseTitle {
+ display: flex;
+ width: 100%;
+ align-items: flex-start;
+ padding: 1rem 2rem;
+ }
+
+ .BSOTPKioskPayment-dailpad-main {
+ display: flex;
+ flex-direction: column;
+ row-gap: 12px;
+ padding: 16px 0px;
+ align-items: center;
+ width: 100%;
+ overflow-x: hidden;
+ }
+ .BSOTPKioskPayment-dailpad-1,
+ .BSOTPKioskPayment-dailpad-2,
+ .BSOTPKioskPayment-dailpad-3 {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ column-gap: 1.5rem;
+ row-gap: 2rem;
+
+ p {
+ background-color: #fff;
+ padding: 10px 10px;
+ width: 25%;
+ text-align: center;
+ border-radius: 12px;
+ cursor: pointer;
+ font-family: 'Gilroy', sans-serif;
+ font-weight: 600;
+ font-size: 28px;
+ }
+ }
+
+ .BSOTPKioskPayment-dailpad-4 {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: row-reverse;
+ column-gap: 1.5rem;
+
+ p {
+ background-color: #fff;
+ padding: 10px 10px;
+ width: 25%;
+ text-align: center;
+ border-radius: 12px;
+ cursor: pointer;
+ font-family: 'Gilroy', sans-serif;
+ font-weight: 600;
+ font-size: 28px;
+ }
+ }
+
+ .ant-modal .ant-modal-content {
+ height: 90vh !important;
+ }
+}
+
+.BSOTPTitlepayment {
+ margin: 0;
+ color: rgba(0, 0, 0, 0.88);
+ font-weight: 600;
+ font-size: 16px;
+ line-height: 1.5;
+ word-wrap: break-word;
+ font-family: 'Barlow Condensed';
+ font-size: 24px !important;
+}
+
+.BSOTPpaymentCardMain {
+ display: flex;
+ align-items: flex-start;
+ width: 100%;
+ flex-direction: row;
+ justify-content: space-around;
+ background-color: #fff;
+ box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
+ padding: 1rem 1rem;
+ height: 45vh;
+ position: relative;
+
+ .ant-radio-wrapper .ant-radio-checked .ant-radio-inner {
+ background-color: var(--SELECTED_COLOR) !important;
+ border-color: var(--SELECTED_COLOR) !important;
+ }
+
+ .BSOTPcardChooice {
+ width: 40%;
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ row-gap: 10px;
+ column-gap: 10px;
+ }
+
+ .BSOTPcardoption {
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ column-gap: 10px;
+ // box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;
+ box-shadow:
+ rgba(0, 0, 0, 0.1) 0px 10px 36px 0px,
+ rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
+ border-radius: 6px;
+
+ padding: 4px 14px;
+ cursor: pointer;
+ width: 95%;
+
+ img {
+ width: 30px;
+ height: 22px;
+ }
+ }
+
+ .BSOTPcardname {
+ font-size: 16px;
+ font-weight: 550;
+ }
+
+ .BSOTPcardname2 {
+ font-size: 11px;
+ font-weight: 550;
+ margin-top: -1px;
+ }
+
+ .BSOTPbankChooice {
+ width: 60%;
+ border-radius: 6px;
+
+ .searchbar {
+ display: flex;
+ padding: 1px 12px;
+ // border: 1px solid #1c1c1c;
+ // box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
+ box-shadow:
+ rgba(0, 0, 0, 0.16) 0px 10px 36px 0px,
+ rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
+
+ border-radius: 6px;
+ align-items: center;
+ // border: 1px solid black;
+ }
+
+ input {
+ border: none;
+ outline: none;
+ padding: 1px 10px;
+ }
+
+ .titlechoose {
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ column-gap: 1rem;
+ padding-bottom: 9px;
+ border-bottom: 1px solid #1c1c1c;
+ }
+
+ .choosecardMain {
+ padding: 10px 10px;
+ margin-top: -1rem;
+ }
+
+ .bankname {
+ display: flex;
+ align-items: center;
+ column-gap: 10px;
+ font-size: 16px;
+ padding: 10px 10px;
+ font-weight: 500;
+ text-transform: capitalize;
+ }
+ }
+
+ .BSOTPbuttonOfpay {
+ position: absolute;
+ bottom: -60px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ column-gap: 11rem;
+ padding: 1rem 4rem;
+
+ .inr {
+ font-size: 22px;
+ color: #4eb14e;
+ font-weight: 600;
+ }
+
+ .primary_Button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 10px 16px;
+ cursor: pointer;
+ background-color: #4eb14e !important;
+ color: #fff;
+ border-radius: 6px;
+ }
+ }
+}
+
+.searchbar :focus {
+ .ant-input-outlined {
+ box-shadow: none;
+ }
+}
+
+.searchbar:focus-within {
+ .ant-input-outlined {
+ box-shadow: none;
+ }
+}
+
+.searchbar .ant-input-search .ant-input:focus {
+ background-color: #fff !important;
+ border: #fff !important;
+}
+
+.searchbar .ant-input-search .ant-input:focus {
+ border-color: #fff !important;
+}
+
+.paymentCardMain .ant-collapse {
+ width: 100%;
+ border: none;
+ // box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
+ box-shadow:
+ rgba(0, 0, 0, 0.16) 0px 10px 36px 0px,
+ rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
+}
+
+.paymentCardMain .ant-radio-group,
+.ant-radio-wrapper span.ant-radio + * {
+ padding: 10px 10px;
+}
+
+.paymentCardMain .ant-modal .ant-modal-content {
+ padding: 54px 35px !important;
+}
+
+.paymentCardMain
+ .ant-collapse
+ .ant-collapse-item:last-child
+ > .ant-collapse-content {
+ overflow: scroll;
+ height: 26vh;
+}
+
+.paymentCardMain .ant-input-search .ant-input:hover,
+.paymentCardMain .ant-input:hover {
+ border: none;
+ outline: none;
+
+ &:focus {
+ border: none;
+ outline: none;
+ }
+}
+
+@media (max-width: 768px) {
+ .BSOTPpaymentModal_main .BSOTPKiosk-dailpadModal {
+ padding: 2rem 0rem;
+ }
+
+ .BSOTPpaymentModal_main .BSOTPpaymentChoise {
+ column-gap: 1rem;
+ }
+
+ .BSOTPpaymentModal_main .BSOTPpaymentChoise .upi {
+ width: 100px;
+ }
+
+ .BSOTPpaymentModal_main .BSOTPbuttonOfpay {
+ width: max-content;
+ }
+
+ .BSOTPTitlepayment {
+ text-wrap: nowrap;
+ font-size: 19px !important;
+ }
+}
+
+.BSOTPpayment-modal {
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+ background: white;
+ width: 420px;
+ height: 540px;
+ border-radius: 12px;
+ box-shadow: 0 4px 25px rgba(0, 0, 0, 0.2);
+ padding: 16px;
+ z-index: 10;
+}
+
+.BSOTPmodal-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 10px;
+ // filter: blur(5px);
+ // pointer-events: none;
+ // user-select: none;
+ width: 70vw;
+ margin: 1rem 0;
+ font-family: 'Poppins';
+ font-weight: 500;
+
+ @media (max-width: 768px) {
+ width: 95vw;
+ }
+}
+
+.BSOTPpayment-modal {
+ position: fixed;
+ z-index: 1000;
+ top: 50%;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ width: 100%;
+ border-radius: 0;
+ height: 100%;
+ backdrop-filter: blur(5px);
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ justify-content: center;
+ background-color: rgba(255, 255, 255, 0.2);
+ backdrop-filter: blur(8px);
+ -webkit-backdrop-filter: blur(8px);
+ /* for Safari */
+}
+
+.BSOTPpaymentclose-btn {
+ width: max-content;
+ height: max-content;
+ border: none;
+ background-color: unset;
+ color: #ff0000;
+ cursor: pointer;
+ font-size: 20px;
+ padding: 4px;
+}
+
+.BSOTPpayment-frame {
+ width: 70vw;
+ height: 70vh;
+
+ @media (max-width: 768px) {
+ width: 95vw;
+ height: 80vh;
+ }
+}
+
+.BSOTPKioskOPTBTn {
+ width: 60%;
+ padding: 12px 16px;
+ font-size: 20px;
+ font-family: 'Poppins';
+ font-weight: 400;
+ border: none;
+ outline: none;
+ background-color: #000000;
+ color: #fff;
+ border-radius: 10px;
+ cursor: pointer;
+ @media (max-width: 768px) {
+ width: 100%;
+ }
+}
+
+.BSOTPotp-section {
+ text-align: center;
+ width: 100%;
+
+ .BSOTPotp-mobile-row {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ gap: 15px;
+ margin-bottom: 20px;
+ font-family: 'Poppins';
+
+ .BSOTPotp-mobile-number {
+ font-size: 20px;
+ font-weight: 600;
+ letter-spacing: 1px;
+ }
+
+ .BSOTPotp-edit-btn {
+ background: none;
+ border: none;
+ color: #007bff;
+ font-size: 14px;
+ cursor: pointer;
+ font-family: 'Poppins';
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+ }
+
+ .BSOTPotp-input-container {
+ display: flex;
+ justify-content: center;
+ gap: 20px;
+
+ .BSOTP-otp-box {
+ width: 65px;
+ height: 65px;
+ font-size: 28px;
+ text-align: center;
+ border: 2px solid #ccc;
+ border-radius: 8px;
+ outline: none;
+ transition: 0.2s ease;
+
+ &:focus {
+ border-color: #28a745;
+ box-shadow: 0 0 6px rgba(40, 167, 69, 0.4);
+ }
+ }
+
+ .otp-box.active {
+ border: 2px solid #28a745;
+ }
+ }
+
+ .BSOTPotp-buttons {
+ display: flex;
+ justify-content: center;
+ gap: 20px;
+
+ button {
+ min-width: 140px;
+ padding: 12px 18px;
+ font-size: 16px;
+ font-weight: 500;
+ border-radius: 8px;
+ cursor: pointer;
+ transition: 0.2s ease;
+ font-family: 'Poppins', sans-serif !important;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ &:disabled {
+ opacity: 0.5;
+ cursor: not-allowed;
+ }
+ }
+
+ .verify-btn {
+ background-color: #28a745;
+ border: none;
+ color: #fff;
+
+ &:hover:not(:disabled) {
+ background-color: #218838;
+ }
+ }
+
+ .BSOTPresend-btn {
+ background-color: #ffc107;
+ border: none;
+ color: #000;
+
+ &:hover:not(:disabled) {
+ background-color: #e0a800;
+ }
+ }
+ }
+}
+.BSOTPItem3Warning {
+ position: fixed;
+ top: 0%;
+ left: 0%;
+ bottom: 0;
+ right: 0%;
+ background-color: #00000096;
+ z-index: 100;
+ font-family: 'Poppins';
+ font-size: 16px;
+ font-weight: 500;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 10px;
+ flex-direction: column;
+ backdrop-filter: blur(4px);
+
+ /* Animation initial state */
+ opacity: 0;
+ visibility: hidden;
+ transition:
+ opacity 0.3s ease,
+ visibility 0.3s ease;
+
+ p {
+ display: flex;
+ box-shadow:
+ rgba(0, 0, 0, 0.16) 0px 10px 36px 0px,
+ rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
+ align-items: center;
+ justify-content: center;
+ gap: 10px;
+ background-color: #fff;
+ padding: 15px 20px;
+ border-radius: 8px;
+
+ /* popup animation */
+ transform: scale(0.8);
+ transition: transform 0.3s ease;
+ }
+}
+
+/* When visible */
+.BSOTPItem3Warning.showing {
+ opacity: 1;
+ visibility: visible;
+
+ p {
+ transform: scale(1);
+ }
+}
+
+.BSOTPinputModal {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ .input-err {
+ font-family: 'Poppins', sans-serif;
+ font-size: 12px;
+ margin-top: 6px;
+ color: rgb(224, 0, 0);
+ }
+ input {
+ width: 60%;
+ outline: none;
+ font-family: 'Poppins', sans-serif;
+ font-weight: 600;
+ margin: 0;
+ text-align: center;
+ height: 45px;
+ border-radius: 6px;
+ border: 1px solid #333;
+ font-size: 20px;
+ @media (max-width: 768px) {
+ width: 100%;
+ }
+ }
+}
+.BSOTPdailpad-main {
+ display: flex;
+ flex-direction: column;
+ row-gap: 12px;
+ padding: 14px 0px;
+ align-items: center;
+ overflow-x: hidden;
+ width: 100%;
+}
+
+.BSOTPotp-box {
+ width: 55px;
+ height: 55px;
+ font-size: 24px;
+ text-align: center;
+ border: 2px solid #ccc;
+ border-radius: 8px;
+ outline: none;
+ transition: 0.2s ease;
+ font-family: 'Poppins';
+ font-weight: 500;
+
+ &:focus {
+ border-color: #28a745;
+ box-shadow: 0 0 6px rgba(40, 167, 69, 0.4);
+ }
+}
+
+.BSOTPotp-box.active {
+ border: 2px solid #28a745;
+}
+.BSOTPpaymentModal-Master {
+ scrollbar-width: thin;
+ height: 90vh;
+ overflow: auto;
+}
+.optEnterResendOTP {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 1rem;
+}
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSSelectCustomer.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSSelectCustomer.jsx
index 58ddafc..b466313 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSSelectCustomer.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSSelectCustomer.jsx
@@ -136,8 +136,11 @@ const BSCustomerSelect = ({ TopName = null }) => {
);
const BSLayout1Data = useSelector(getTemplateData);
const selOption = useSelector(GlobalSelOption);
+ console.log(selOption, 'selOption');
const GetCustId = useSelector(GlobalCustId);
+ console.log(GetCustId, 'GetCustId');
const Custdisable = useSelector(GlobalSelectedCustDisable);
+ console.log(Custdisable, 'Custdisable');
const SessionData = useSelector(StoredSessionData);
const OrderOfferDetails = useSelector(
GlobalOfferAppliedProducts,
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/CustomisedInvoiceChange.jsx b/src/Pages/BookingScreen/Components/UtillComponents/CustomisedInvoiceChange.jsx
index 4ff3a51..32176f8 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/CustomisedInvoiceChange.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/CustomisedInvoiceChange.jsx
@@ -172,7 +172,7 @@ const CustomisedInvoiceChange = () => {
/>
+ {isOtpEnabled ? 'Enter Mobile Number To Order' : 'PAYMENT'} +
+
+ {!otpSent && !otpVerifed && (
+ <>
+
+
+ {/*
+
+
+ Get your order bill on your mobile
+ via SMS / Whatsapp
+
+
+ {number?.length === 10 && !isIndianMobile(number) && (
+
+
+ {/* input boxxes */}
+
+ Please Enter Valid Mobile Number
+
+ )}
+
+
+ {isOtpEnabled && (
+ <>
+
+
+ )}
+
+ )}
+ {isOtpEnabled && otpSent && (
+
+
+
+
+ setNumberFun(1)}>1
+setNumberFun(2)}>2
+setNumberFun(3)}>3
+
+
+ setNumberFun(4)}>4
+setNumberFun(5)}>5
+setNumberFun(6)}>6
+
+
+ setNumberFun(7)}>7
+setNumberFun(8)}>8
+setNumberFun(9)}>9
+
+
+
+
setNumberFun(0)}>0
+ +
+
+ )}
+ {/* {(!isOtpEnabled || (otpVerifed)) && <>
+
+ Enter OTP
+
+ {/* Mobile Number + Edit */}
+
+ {number}
+
+ ``{' '}
+
+
+ {/* 4 Digit OTP Input */}
+
+
+
+ {otpInput.map((digit, index) => (
+ setOtpIndex(index)}
+ readOnly
+ />
+ ))}
+
+
+
+ {/* */}
+
+
+
+
+
+
+ {/* Buttons */}
+
+
+
+
+ handleOtpNumber(1)}>1
+handleOtpNumber(2)}>2
+handleOtpNumber(3)}>3
+
+
+ handleOtpNumber(4)}>4
+handleOtpNumber(5)}>5
+handleOtpNumber(6)}>6
+
+
+ handleOtpNumber(7)}>7
+handleOtpNumber(8)}>8
+handleOtpNumber(9)}>9
+
+
+
+
handleOtpNumber(0)}>0
+ +Select Payment Method
+ {console.log('selectedOption', selectedPaymentOption)} +
+
+ {counterAvailability && (
+
+ } */}
+ handlePaymentOption('Counter')}
+ >
+
+ )}
+ {paymentOptionDetailsBusinessUpi && (
+ + PAY AT THE COUNTER +
+ handlePaymentOption('BU')}
+ >
+ 
+
+ )}
+ {!paymentOptionDetailsBusinessUpi && !counterAvailability && (
+ UPI
+
+ Please Set Payment Options Contact Admin
+
+ )}
+
+
+
+
-
+
i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader =
@@ -146,8 +146,7 @@ const Printstyle4 = ({
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
- (setting) =>
- setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
+ (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
@@ -185,7 +184,7 @@ const Printstyle4 = ({
let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S'
);
- const isEditedBill = PaymentStatus?.some(payment => {
+ const isEditedBill = PaymentStatus?.some((payment) => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
@@ -195,7 +194,7 @@ const Printstyle4 = ({
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
- )
+ );
const keysLength = Object.keys(table2Data ?? {}).length;
if (keysLength > 0) {
@@ -225,7 +224,7 @@ const Printstyle4 = ({
const TakeawayData = table2Data?.productDetails?.filter(
(item) => item.BookingTypeName?.toLowerCase() === 'takeaway'
);
- console.log(TakeawayData, "TakeawayData")
+ console.log(TakeawayData, 'TakeawayData');
const DineInData = table2Data?.productDetails?.filter(
(item) => item.BookingTypeName?.toLowerCase() === 'dine in'
);
@@ -373,6 +372,7 @@ const Printstyle4 = ({
: 0;
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10);
+ console.log(paginatedChunks, 'paginatedChunks')
const headerStyle = {
backgroundColor: GlobaldummyData
? SelectedHeaderColor
@@ -444,8 +444,8 @@ const Printstyle4 = ({
flexDirection: 'column',
justifyContent:
chunkIndex === paginatedChunks.length - 1 &&
- !shouldFooterBeOnNewPage &&
- FormatTheme
+ !shouldFooterBeOnNewPage &&
+ FormatTheme
? 'space-between'
: '',
height: isMobile
@@ -495,7 +495,7 @@ const Printstyle4 = ({
/>
) : null}
{base64Image &&
- (PrintLogo?.SettingValue === 'Y' || LogoField) ? (
+ (PrintLogo?.SettingValue === 'Y' || LogoField) ? (
@@ -620,7 +620,7 @@ const Printstyle4 = ({
>
{(TakeawayData?.length > 0 || GlobaldummyData) && (
<>
- {takeAwayPreference &&
+ {takeAwayPreference && (
{' '}
@@ -561,12 +561,12 @@ const Printstyle4 = ({
>
Dt: {GlobaldummyData ? formattedDate : Date1}
-
- {SalesModePref?.SettingValue == 'Y' &&
+ {SalesModePref?.SettingValue == 'Y' && (
+ )}
{' '}
- Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
-
}
+ Name : {table2Data?.SalesMode == 'R' ? 'RT' : 'WS'}{' '}
+
@@ -574,10 +574,10 @@ const Printstyle4 = ({
{GlobaldummyData
? '51'
: table2Data?.OrderId &&
- extractLastNumberOrderId(
- table2Data?.OrderId,
- table2Data?.FYStatus
- )}
+ extractLastNumberOrderId(
+ table2Data?.OrderId,
+ table2Data?.FYStatus
+ )}
{/* {GlobaldummyData ? formattedDate : Date1}
*/}
TakeAway
- }
+ )}
| # | +# | ) - : SLNO &&# | } + : SLNO &&# | } {GlobaldummyData ? GlobalItem &&Item | : Item &&Item | } @@ -651,7 +651,7 @@ const Printstyle4 = ({ ? GlobalQuantity && (|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {chunkIndex * chunkSize + index + 1} | - } + : SLNO && ( ++ {chunkIndex * chunkSize + index + 1} + | + )} {/* ITEM COLUMN */} {GlobaldummyData ? GlobalItem &&{item?.ProdName} | : Item && ( -
- {/* Product Name */}
- {item?.ProdName}
+ |
+ {/* Product Name */}
+ {item?.ProdName}
- {/* Package OR Size */}
- {packageList.length > 0 ? (
-
- {packageList.map((pkg, i) => (
-
- ) : (
-
- {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
-
- ))}
-
- {(UomPrint?.SettingValue === 'Y'
- ? (item?.Size || '1') +
- (item?.SinglePc === 'Y'
- ? ' PCS'
- : item?.Type !== 'C'
- ? ` ${item?.UomName}`
- : ' COMBO')
- : '')}
- {item?.BrandName || ""}
-
- )}
+ {/* Package OR Size */}
+ {packageList.length > 0 ? (
+
+ {packageList.map((pkg, i) => (
+
+ ) : (
+
+ {pkg.ParcelCount} PCS{' '}
+ {pkg.ParcelQty} PACK (
+ {pkg.ParcelType})
+
+ ))}
+
+ {UomPrint?.SettingValue === 'Y'
+ ? (item?.Size || '1') +
+ (item?.SinglePc === 'Y'
+ ? ' PCS'
+ : item?.Type !== 'C'
+ ? ` ${item?.UomName}`
+ : ' COMBO')
+ : ''}
+ {item?.BrandName || ''}
+
+ )}
- {/* Serials */}
- {serials.map((s, i) => (
- {s}
- ))}
+ {/* Serials */}
+ {serials.map((s, i) => (
+ {s}
+ ))}
- {/* IMEIs */}
- {imeis.map((iVal, i) => (
- {iVal}
- ))}
+ {/* IMEIs */}
+ {imeis.map((iVal, i) => (
+ {iVal}
+ ))}
- {/* Description from first identifier */}
- {descriptions[0] && (
- {descriptions[0]}
- )}
- |
- )
- }
+ {/* Description from first identifier */}
+ {descriptions[0] && (
+ + {(GlobaldummyData + ? GlobalQuantity + : Quantity) && ( + | {item?.SalesQty} | )} {/* HSN */} - {(GlobaldummyData ? GlobalHsnCode : HsnCode) && ( -+ {(GlobaldummyData + ? GlobalHsnCode + : HsnCode) && ( + | {item?.HSN} | )} {/* MRP */} {(GlobaldummyData ? GlobalMRP : MRP) && ( -- {item?.SinglePc === "Y" ? item?.Rate : item?.MRP} + | + {item?.SinglePc === 'Y' + ? item?.Rate + : item?.MRP} | )} {/* Discount */} - {(GlobaldummyData ? GlobalDiscount : Discount) && ( -- {item?.Type !== "C" + {(GlobaldummyData + ? GlobalDiscount + : Discount) && ( + | + {item?.Type !== 'C' ? item?.OfferAmt || 0 : item?.OfferValue || 0} | @@ -915,20 +930,21 @@ const Printstyle4 = ({ {/* Rate */} {(GlobaldummyData ? GlobalRate : Rate) && ( -+ | {item?.Rate} | )} {/* Amount */} {(GlobaldummyData ? GlobalAmount : Amount) && ( -- {item?.Type !== "C" - ? (item?.TotalAmt || 0) - (item?.OfferAmt || 0) - : (item?.TotalAmt || 0) - (item?.OfferValue || 0)} + | + {item?.Type !== 'C' + ? (item?.TotalAmt || 0) - + (item?.OfferAmt || 0) + : (item?.TotalAmt || 0) - + (item?.OfferValue || 0)} | )} -{index + 1} : SLNO && ( - | - {chunkIndex * chunkSize + index + 1} - | - )} ++ {chunkIndex * chunkSize + index + 1} + | + )} {GlobaldummyData ? GlobalItem &&{item?.ProdName} | : Item && ( -
- {item?.ProdName}
- {UomPrint?.SettingValue === 'Y' &&
-
- ({item?.Size ? item?.Size : '1'}{' '}
- {item?.SinglePc == 'Y'
- ? 'PCS'
- : item?.Type != 'C'
- ? item?.UomName
- : 'COMBO'}
- )
-
- }
- |
- )}
+
+ {item?.ProdName}
+ {UomPrint?.SettingValue === 'Y' && (
+
+ ({item?.Size ? item?.Size : '1'}{' '}
+ {item?.SinglePc == 'Y'
+ ? 'PCS'
+ : item?.Type != 'C'
+ ? item?.UomName
+ : 'COMBO'}
+ )
+
+ )}
+ |
+ )}
{GlobaldummyData
? GlobalQuantity && (
- - {item?.SalesQty} - | - ) ++ {item?.SalesQty} + | + ) : Quantity && ( -- {item?.SalesQty} - | - )} ++ {item?.SalesQty} + | + )} {GlobaldummyData ? GlobalHsnCode && ( -- {item?.HSN} - | - ) ++ {item?.HSN} + | + ) : HsnCode && ( -- {item?.HSN} - | - )} ++ {item?.HSN} + | + )} {GlobaldummyData ? GlobalMRP && ( -- {item?.MRP} - | - ) ++ {item?.MRP} + | + ) : MRP && ( -- {item?.SinglePc === 'Y' - ? item?.Rate - : item?.MRP} - | - )} ++ {item?.SinglePc === 'Y' + ? item?.Rate + : item?.MRP} + | + )} {GlobaldummyData ? GlobalDiscount && ( -- {item.discount} - | - ) ++ {item.discount} + | + ) : Discount && ( -- {item?.Type != 'C' - ? item?.OfferAmt || 0 - : item?.OfferValue || 0} - | - )} ++ {item?.Type != 'C' + ? item?.OfferAmt || 0 + : item?.OfferValue || 0} + | + )} {GlobaldummyData ? GlobalTax && ( -- {item?.ProdTaxPercentage || 0} - | - ) ++ {item?.ProdTaxPercentage || 0} + | + ) : Tax && - table2Data?.OrderType !== 'E' && ( -- {item?.ProdTaxPercentage || 0} - | - )} + table2Data?.OrderType !== 'E' && ( ++ {item?.ProdTaxPercentage || 0} + | + )} {GlobaldummyData ? GlobalRate && ( -- {item?.Rate} - | - ) ++ {item?.Rate} + | + ) : Rate && ( -- {item?.Rate} - | - )} ++ {item?.Rate} + | + )} {GlobaldummyData ? GlobalAmount && ( -- {item?.TotalAmt} - | - ) ++ {item?.TotalAmt} + | + ) : Amount && ( -- {' '} - {item?.Type != 'C' - ? item?.TotalAmt - item?.OfferAmt || 0 - : item?.TotalAmt - item?.OfferValue || - 0} - | - )} ++ {' '} + {item?.Type != 'C' + ? item?.TotalAmt - item?.OfferAmt || 0 + : item?.TotalAmt - item?.OfferValue || + 0} + | + )} ); })} @@ -1281,64 +1298,40 @@ const Printstyle4 = ({ : Number(table2Data?.NetAmount).toFixed(2)} - {/*
| + | Dis{' '} | ) @@ -3418,18 +3466,18 @@ const Printstyle4 = ({ ) : Rate && ( -- Rate + | + Amt | )} {GlobaldummyData ? GlobalAmount && ( -+ | Amt | ) : Amount && ( -+ | Amt | )} @@ -3457,212 +3505,246 @@ const Printstyle4 = ({ {GlobaldummyData ? GlobalItem &&{item?.ProdName} | : Item && ( -
- {item?.ProdName}
+ |
+ {item?.ProdName}
- {/* Serial Numbers */}
- {item?.ProductIdentifierDtls
- ?.filter(d => d.SerialNumber)
- ?.map((d, i) => (
+ {/* Serial Numbers */}
+ {item?.ProductIdentifierDtls?.filter(
+ (d) => d.SerialNumber
+ )?.map((d, i) => (
{d.SerialNumber}
))}
- {/* IMEI Numbers */}
- {item?.ProductIdentifierDtls
- ?.filter(d => d.IMEI1 || d.IMEI2)
- ?.map((d, i) => (
+ {/* IMEI Numbers */}
+ {item?.ProductIdentifierDtls?.filter(
+ (d) => d.IMEI1 || d.IMEI2
+ )?.map((d, i) => (
- {[d.IMEI1, d.IMEI2].filter(Boolean).join(", ")}
+ {[d.IMEI1, d.IMEI2]
+ .filter(Boolean)
+ .join(', ')}
))}
- {/* Description from first identifier */}
- {item?.ProductIdentifierDtls?.find(d => d.SerialNumber || d.IMEI1 || d.IMEI2)?.Description && (
-
- {item.ProductIdentifierDtls.find(d => d.SerialNumber || d.IMEI1 || d.IMEI2).Description}
-
- )}
- |
- )}
+ {/* Description from first identifier */}
+ {item?.ProductIdentifierDtls?.find(
+ (d) =>
+ d.SerialNumber || d.IMEI1 || d.IMEI2
+ )?.Description && (
+ - {item?.SalesQty} + |
+ {item?.SalesQty}
-
-
- {/* Package Details */}
- {PackageDetails?.filter(pkg => pkg.ProdId === item.ProdId).length > 0 ? (
-
- {PackageDetails
- ?.filter(pkg => pkg.ProdId === item.ProdId)
- ?.map((pkg, index) => (
+
+ {/* Package Details */}
+ {PackageDetails?.filter(
+ (pkg) => pkg.ProdId === item.ProdId
+ ).length > 0 ? (
+
-
+ {PackageDetails?.filter(
+ (pkg) => pkg.ProdId === item.ProdId
+ )?.map((pkg, index) => (
- ) : (
-
- {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
+ {pkg.ParcelCount} PCS{' '}
+ {pkg.ParcelQty} PACK (
+ {pkg.ParcelType})
))}
- {/* Serial */}
- {item?.ProductIdentifierDtls
- ?.filter(d => d.SerialNumber)
- ?.map((d, i) => (
+ {/* Serial */}
+ {item?.ProductIdentifierDtls?.filter(
+ (d) => d.SerialNumber
+ )?.map((d, i) => (
{d.SerialNumber}
))}
- {/* IMEI */}
- {item?.ProductIdentifierDtls
- ?.filter(d => d.IMEI1 || d.IMEI2)
- ?.map((d, i) => (
+ {/* IMEI */}
+ {item?.ProductIdentifierDtls?.filter(
+ (d) => d.IMEI1 || d.IMEI2
+ )?.map((d, i) => (
- {[d.IMEI1, d.IMEI2].filter(Boolean).join(', ')}
+ {[d.IMEI1, d.IMEI2]
+ .filter(Boolean)
+ .join(', ')}
))}
- {/* Description from first identifier */}
- {item?.ProductIdentifierDtls?.find(d => d.SerialNumber || d.IMEI1 || d.IMEI2)?.Description && (
-
- {item.ProductIdentifierDtls.find(d => d.SerialNumber || d.IMEI1 || d.IMEI2).Description}
-
- )}
-
-
- {UomPrint?.SettingValue === 'Y' && (
- <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
- )}
- {item?.BrandName || ""}
-
- )}
-
- |
- )
+ {/* Description from first identifier */}
+ {item?.ProductIdentifierDtls?.find(
+ (d) =>
+ d.SerialNumber ||
+ d.IMEI1 ||
+ d.IMEI2
+ )?.Description && (
+ - {item?.SalesQty} - | - )} ++ {item?.SalesQty} + | + )} {GlobaldummyData ? GlobalHsnCode && ( -- {item?.HSN} - | - ) ++ {item?.HSN} + | + ) : HsnCode && ( -- {item?.HSN} - | - )} ++ {item?.HSN} + | + )} {GlobaldummyData ? GlobalMRP && ( -- {item?.MRP} - | - ) ++ {item?.MRP} + | + ) : MRP && ( -- {item?.SinglePc === 'Y' - ? item?.Rate - : item?.MRP} - {GlobaldummyData - ? GlobalTax && ( - | - {/* */} - - GST:{' '} - {' '} - {item?.ProdTaxPercentage || 0} - | - ) - : Tax == true && - table2Data?.OrderType !== 'E' && ( -- {/* */} - - GST:{' '} - {' '} - {item?.ProdTaxPercentage || 0} - | - )} - - )} ++ {item?.SinglePc === 'Y' + ? item?.Rate + : item?.MRP} + {GlobaldummyData + ? GlobalTax && ( + | + {/* */} + + GST:{' '} + {' '} + {item?.ProdTaxPercentage || 0} + | + ) + : Tax == true && + table2Data?.OrderType !== 'E' && ( ++ {/* */} + + GST:{' '} + {' '} + {item?.ProdTaxPercentage || 0} + | + )} + + )} {GlobaldummyData ? GlobalDiscount && ( -- {item.discount} - | - ) ++ {item.discount} + | + ) : Discount && ( -- {item?.Type != 'C' - ? item?.OfferAmt || 0 - : item?.OfferValue || 0} - | - )} ++ {item?.Type != 'C' + ? item?.OfferAmt || 0 + : item?.OfferValue || 0} + | + )} {GlobaldummyData ? GlobalRate && ( -- {item?.Rate} - | - ) ++ {item?.Rate} + | + ) : Rate && ( -- {item?.Rate} - | - )} ++ {item?.Rate} + | + )} {GlobaldummyData ? GlobalAmount && ( -- {item?.TotalAmt} - | - ) ++ {item?.TotalAmt} + | + ) : Amount && ( -- {' '} - {item?.Type != 'C' - ? item?.TotalAmt - item?.OfferAmt || 0 - : item?.TotalAmt - item?.OfferValue || 0} - | - )} ++ {' '} + {item?.Type != 'C' + ? item?.TotalAmt - item?.OfferAmt || 0 + : item?.TotalAmt - item?.OfferValue || 0} + | + )} ); } @@ -3697,48 +3779,48 @@ const Printstyle4 = ({ : Item &&Item | } {GlobaldummyData ? GlobalQuantity && ( -- Qty - | - ) ++ Qty + | + ) : Quantity && ( -- Qty - | - )} ++ Qty + | + )} {GlobaldummyData ? GlobalHsnCode && ( -- HSN - | - ) ++ HSN + | + ) : HsnCode && ( -- HSN - | - )} ++ HSN + | + )} {GlobaldummyData ? GlobalMRP && ( -- MRP - | - ) ++ MRP + | + ) : MRP && ( -- MRP - | - )} ++ MRP + | + )} {GlobaldummyData ? GlobalDiscount && ( -- Dis{' '} - | - ) ++ Dis{' '} + | + ) : Discount && ( -- Dis{' '} - | - )} ++ Dis{' '} + | + )} {/* {GlobaldummyData ? GlobalTax && (- Rate - | - ) ++ Rate + | + ) : Rate && ( -- Rate - | - )} ++ Rate + | + )} {GlobaldummyData ? GlobalAmount && ( -- Amt - | - ) ++ Amt + | + ) : Amount && ( -- Amt - | - )} ++ Amt + | + )} @@ -3807,159 +3889,160 @@ const Printstyle4 = ({ {GlobaldummyData ? GlobalItem &&{item?.ProdName} | : Item && ( -
- {item?.ProdName}
- {(
- (item?.ProductIdentifierDtls
- ?.length > 0
- ? item?.ProductIdentifierDtls.filter(
- (items) => items.SerialNumber
- )
- .map(
- (a, index) =>
- ` ${a.SerialNumber}`
- )
- .join('')
- : '') +
- (item?.ProductIdentifierDtls
- ?.length > 0
- ? item?.ProductIdentifierDtls.filter(
- (item1) =>
- item1.IMEI1 || item1.IMEI2
- )
- .map((item2) => {
- const imei1 =
- item2.IMEI1 || '';
- const imei2 =
- item2.IMEI2 || '';
- return ` ${[imei1, imei2].filter(Boolean).join(',')}`;
- })
- .join('')
- : '')
- +
- (item?.ProductIdentifierDtls?.length > 0 &&
+ |
+ {item?.ProdName}
+ {(
+ (item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (items) => items.SerialNumber
+ )
+ .map(
+ (a, index) => ` ${a.SerialNumber}`
+ )
+ .join('')
+ : '') +
+ (item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (item1) =>
+ item1.IMEI1 || item1.IMEI2
+ )
+ .map((item2) => {
+ const imei1 = item2.IMEI1 || '';
+ const imei2 = item2.IMEI2 || '';
+ return ` ${[imei1, imei2].filter(Boolean).join(',')}`;
+ })
+ .join('')
+ : '') +
+ (item?.ProductIdentifierDtls?.length >
+ 0 &&
item?.ProductIdentifierDtls.find(
(item1) =>
- item1.IMEI1 || item1.IMEI2 || item1.SerialNumber
+ item1.IMEI1 ||
+ item1.IMEI2 ||
+ item1.SerialNumber
)?.Description
- ? ` ${item.ProductIdentifierDtls.find(
- (item1) =>
- item1.IMEI1 || item1.IMEI2 || item1.SerialNumber
- ).Description}`
- : '')
- ).trim()}
- |
- )}
+ ? ` ${
+ item.ProductIdentifierDtls.find(
+ (item1) =>
+ item1.IMEI1 ||
+ item1.IMEI2 ||
+ item1.SerialNumber
+ ).Description
+ }`
+ : '')
+ ).trim()}
+
+ )}
{GlobaldummyData
? GlobalQuantity && (
-
- {item?.SalesQty}
-
- ({item?.Size ? item?.Size : '1'}{' '}
- {item?.SinglePc == 'Y'
- ? 'PCS'
- : item?.Type != 'C'
- ? item?.UomName
- : 'COMBO'}
- )
-
- |
- )
+
+ {item?.SalesQty}
+
+ ({item?.Size ? item?.Size : '1'}{' '}
+ {item?.SinglePc == 'Y'
+ ? 'PCS'
+ : item?.Type != 'C'
+ ? item?.UomName
+ : 'COMBO'}
+ )
+
+ |
+ )
: Quantity && (
-
- {item?.SalesQty}
- {UomPrint?.SettingValue === 'Y' &&
-
- ({item?.Size ? item?.Size : '1'}{' '}
- {item?.SinglePc == 'Y'
- ? 'PCS'
- : item?.Type != 'C'
- ? item?.UomName
- : 'COMBO'}
- )
-
- }
- |
- )}
+
+ {item?.SalesQty}
+ {UomPrint?.SettingValue === 'Y' && (
+
+ ({item?.Size ? item?.Size : '1'}{' '}
+ {item?.SinglePc == 'Y'
+ ? 'PCS'
+ : item?.Type != 'C'
+ ? item?.UomName
+ : 'COMBO'}
+ )
+
+ )}
+ |
+ )}
{GlobaldummyData
? GlobalHsnCode && (
- - {item?.HSN} - | - ) ++ {item?.HSN} + | + ) : HsnCode && ( -- {item?.HSN} - | - )} ++ {item?.HSN} + | + )} {GlobaldummyData ? GlobalMRP && ( -- {item?.MRP} - | - ) ++ {item?.MRP} + | + ) : MRP && ( -- {item?.SinglePc === 'Y' - ? item?.Rate - : item?.MRP} - | - )} ++ {item?.SinglePc === 'Y' + ? item?.Rate + : item?.MRP} + | + )} {GlobaldummyData ? GlobalDiscount && ( -- {item.discount} - | - ) ++ {item.discount} + | + ) : Discount && ( -- {item?.Type != 'C' - ? item?.OfferAmt || 0 - : item?.OfferValue || 0} - | - )} ++ {item?.Type != 'C' + ? item?.OfferAmt || 0 + : item?.OfferValue || 0} + | + )} {GlobaldummyData ? GlobalTax && ( -- {item?.ProdTaxPercentage || 0} - | - ) ++ {item?.ProdTaxPercentage || 0} + | + ) : Tax == true && - table2Data?.OrderType !== 'E' && ( -- {item?.ProdTaxPercentage || 0} - | - )} + table2Data?.OrderType !== 'E' && ( ++ {item?.ProdTaxPercentage || 0} + | + )} {GlobaldummyData ? GlobalRate && ( -- {item?.Rate} - | - ) ++ {item?.Rate} + | + ) : Rate && ( -- {item?.Rate} - | - )} ++ {item?.Rate} + | + )} {GlobaldummyData ? GlobalAmount && ( -- {item?.TotalAmt} - | - ) ++ {item?.TotalAmt} + | + ) : Amount && ( -- {' '} - {item?.Type != 'C' - ? item?.TotalAmt - item?.OfferAmt || 0 - : item?.TotalAmt - item?.OfferValue || 0} - | - )} ++ {' '} + {item?.Type != 'C' + ? item?.TotalAmt - item?.OfferAmt || 0 + : item?.TotalAmt - item?.OfferValue || 0} + | + )} ); } @@ -3980,7 +4063,6 @@ const Printstyle4 = ({ )}
|---|
| S.No | : - SLNO == true &&S.No | } + ? GlobalSlNo && ( ++ S.No + | + ) + : SLNO == true && ( ++ S.No + | + )} {GlobaldummyData - ? GlobalItem &&Item | : - Item == true &&Item | } - + ? GlobalItem && ( ++ Item + | + ) + : Item == true && ( ++ Item + | + )} {/* {GlobaldummyData ? GlobalHsnCode &&HSN | : HsnCode == true &&HSN | } */} {GlobaldummyData - ? GlobalQuantity &&Qty | - : Quantity == true &&Qty | } + ? GlobalQuantity && ( ++ Qty + | + ) + : Quantity == true && ( ++ Qty + | + )} {/*UOM | UOM | */} @@ -901,80 +1204,110 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit {GlobaldummyData ? GlobalAmount &&Amount | : Amount == true &&Amount | } */} -
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - {chunkIndex * chunkSize + idx + 1} - | - ) - : SLNO == true && ( -- {chunkIndex * chunkSize + idx + 1} - | - )} - {GlobaldummyData - ? GlobalItem &&{item?.ProdName} | - : Item == true && ( -
- {item?.ProdName}
-
- ({item?.Size ? item?.Size : "1"}{" "}
- {item?.SinglePc == "Y"
- ? "PCS"
- : item?.Type != "C"
- ? item?.UomName
- : "COMBO"}
- ) {item?.RequestVariantName ? item?.RequestVariantName : ""}
-
- {" "}
- {item?.BrandName !== null
- ? item?.BrandName
- : ""}
-
- {item?.ProductIdentifierDtls?.length > 0
- ? item?.ProductIdentifierDtls?.filter(
- (items) =>
- !(
- items.SerialNumber == "" ||
- items.SerialNumber == null
- )
- )?.map((a) => {
- return {a.SerialNumber} ;
- })
- : ""}{" "}
- {item?.ProductIdentifierDtls?.length > 0
- ? item?.ProductIdentifierDtls.filter(
- (item1) =>
- item1.IMEI1 !== "" || item1.IMEI2 !== ""
- )?.map((item2) => {
- const imei1 = item2.IMEI1 || "";
- const imei2 = item2.IMEI2 || "";
- return (
-
- {[imei1, imei2]
- .filter(Boolean)
- .join(",")}
-
- );
- })
- : ""}
- |
-
- )}
- {/* {GlobaldummyData
+ {((GlobaldummyData ? products : dataChunk) || []).map(
+ (item, idx) => (
+ ||||||||||||||
| + {chunkIndex * chunkSize + idx + 1} + | + ) + : SLNO == true && ( ++ {chunkIndex * chunkSize + idx + 1} + | + )} + {GlobaldummyData + ? GlobalItem && ( ++ {item?.ProdName} + | + ) + : Item == true && ( +
+ {item?.ProdName}
+
+ ({item?.Size ? item?.Size : '1'}{' '}
+ {item?.SinglePc == 'Y'
+ ? 'PCS'
+ : item?.Type != 'C'
+ ? item?.UomName
+ : 'COMBO'}
+ )
+ {item?.RequestVariantName
+ ? item?.RequestVariantName
+ : ''}
+
+ {' '}
+ {item?.BrandName !== null
+ ? item?.BrandName
+ : ''}
+
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls?.filter(
+ (items) =>
+ !(
+ items.SerialNumber == '' ||
+ items.SerialNumber == null
+ )
+ )?.map((a) => {
+ return {a.SerialNumber} ;
+ })
+ : ''}{' '}
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (item1) =>
+ item1.IMEI1 !== '' ||
+ item1.IMEI2 !== ''
+ )?.map((item2) => {
+ const imei1 = item2.IMEI1 || '';
+ const imei2 = item2.IMEI2 || '';
+ return (
+
+ {[imei1, imei2]
+ .filter(Boolean)
+ .join(',')}
+
+ );
+ })
+ : ''}
+ |
+ )}
+ {/* {GlobaldummyData
? GlobalHsnCode && (
{item?.HSN} @@ -985,18 +1318,27 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit {item?.HSN} | )} */} - {GlobaldummyData - ? GlobalQuantity && ( -- {item?.SalesQty} - | - ) - : Quantity == true && ( -- {item?.Qty || item?.DispatchedQty} - | - )} - {/* {GlobaldummyData + {GlobaldummyData + ? GlobalQuantity && ( ++ {item?.SalesQty} + | + ) + : Quantity == true && ( ++ {item?.Qty || item?.DispatchedQty} + | + )} + {/* {GlobaldummyData ? GlobalMRP && ({item?.MRP} @@ -1039,11 +1381,9 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit {item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} | )} */} -
-
- {/* Summary */}
-
- {/* {GlobaldummyData ?
+ {chunkIndex === paginatedChunks.length - 1 &&
+ !shouldFooterBeOnNewPage &&
+ FormatTheme && (
+
+ {/* Summary */}
+
+ {/* {GlobaldummyData ?
-
-
- {/*
+
+ {/*
*/}
- {/*
Total Amount Before Tax
{GlobaldummyData ? 736 : table2Data?.BillAmount}
+ {/*
*/} - {shouldFooterBeOnNewPage && FormatTheme && + {shouldFooterBeOnNewPage && FormatTheme && (
{OrderDetailGST?.map((item, index) => (
))}
{/*
@@ -1158,135 +1502,254 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit
))}
*/}
- {/*
+ {/*
*/} + {/*
*/} - {/*
//
GST Payable on Reverse Charge
*/}
- {/* */} + {/*
*/} - {/*
+ {/*
*/}
- {/*
- }
+ )}
Total Amount After Tax :
{GlobaldummyData ? 736 : table2Data?.NetAmount}
+ {/*
-
- {/* Footer */}
-
Total Amount After Tax
{GlobaldummyData ? 736 : table2Data?.NetAmount}
*/}
- {/*
+ {/*
-
{GlobaldummyData ? 736 : table2Data?.NetAmount}
*/}
-
-
*/}
-
-
-
-
- {/* Copy Labels */}
-
- {(BankDetails?.length > 0) && (<>
-
- )} - -
- Bank Details:
-
-
- Bank Name: {BankDetails?.[0]?.BankName}
- Account No.: {BankDetails?.[0]?.AccountNo}
- IFSC Code: {BankDetails?.[0]?.IFSCCode}
- Branch Name: {BankDetails?.[0]?.BankBranch}
- - )} - -
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
- {/*
-
- Certified that the particulars given above are true and correct.
-
- {GlobaldummyData ?
*/}
+
+ {/* Copy Labels */}
+ Company Name
- :"For" {companyName}
} -Authorised Signatory
- {GlobaldummyData ? GlobalSignature && (
- 
-
) : Signature == true && (
-
- 
-
+ {/* Footer */}
+
+
+ {/*
+ {BankDetails?.length > 0 && (
+ <>
+
+ )} -
+ + Bank Details: +
+
+
+
+ Bank Name:{' '}
+ {BankDetails?.[0]?.BankName}
+
+
+ Account No.:{' '}
+ {BankDetails?.[0]?.AccountNo}
+
+
+ IFSC Code:{' '}
+ {BankDetails?.[0]?.IFSCCode}
+
+
+ Branch Name:{' '}
+ {BankDetails?.[0]?.BankBranch}
+
+ + )} -
(Common Seal)
+ +
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
+
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not + exchangeable or refundable. + +
- + Please check the product before leaving + the counter. + +
+
+ )}
+ + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
+
+
+ + Certified that the particulars given above are + true and correct. +
+
+ {GlobaldummyData ? (
+
Company Name
+ ) : ( ++ {' '} + "For" {companyName} +
+ )} ++ Authorised Signatory +
+ + {GlobaldummyData + ? GlobalSignature && ( +
+
+
+ )
+ : Signature == true && (
+
+
+
+ )}
+ (Common Seal)
+
+ {GlobaldummyData
+ ? GlobalIsnotes && (
+
+
+
+ )
+ : Notestext && (
+ + Notes : 10 days Return policy +
+ ++
+
*/} +
+ )}
+ + {Notestext} +
+ + {/**/} +
- {GlobaldummyData ? GlobalIsnotes &&
- (
-
-
-
) :
- Notestext && (Notes : 10 days Return policy
- --
-
*/} -
)
- }
- {Notestext}
- - {/**/} -
*/} - {shouldFooterBeOnNewPage && FormatTheme && + {shouldFooterBeOnNewPage && FormatTheme && (
-
<>
-
{/*
*/} {/* Summary */} {/*
*/} {/* Summary */} {/*
*/}
@@ -1297,7 +1760,6 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit
} */}
{/* */}
-
{/*
Total Amount Before Tax
@@ -1354,55 +1816,169 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit
{/*
*/}
{/* Footer */}
-
+
- }
-
+ )}
);
};
-export default DCInvoiceTemplate;
\ No newline at end of file
+export default DCInvoiceTemplate;
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintA4Style11.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintA4Style11.jsx
index b999801..8f99621 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintA4Style11.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintA4Style11.jsx
@@ -20,6 +20,15 @@ import {
GlobalprintSlNo,
GlobalprinttermsAndConditions,
GlobalPritdummyData,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
GlobalSignatureImage,
GlobalthemeFormat,
} from '../../../../Features/ThemeChange/ThemeChange';
@@ -200,6 +209,72 @@ const DCPrintA4Style11 = ({
lastChunkRows > (!isMobile ? 10 : PageSize === 'A5' ? 5 : 14);
console.log(lastChunkRows, shouldFooterBeOnNewPage, 'dataSourcedataSource');
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
- {BankDetails?.length > 0 && (<>
-
- )} + {BankDetails?.length > 0 && ( + <> +
+ + )}
- Bank Details:
-
-
- Bank Name: {BankDetails?.[0]?.BankName}
- Account No.: {BankDetails?.[0]?.AccountNo}
- IFSC Code: {BankDetails?.[0]?.IFSCCode}
- Branch Name: {BankDetails?.[0]?.BankBranch}
- - )} + {BankDetails?.length > 0 && ( + <> +
Bank Details:
+
+
+
+ Bank Name:{' '}
+ {BankDetails?.[0]?.BankName}
+
+
+ Account No.:{' '}
+ {BankDetails?.[0]?.AccountNo}
+
+
+ IFSC Code:{' '}
+ {BankDetails?.[0]?.IFSCCode}
+
+
+ Branch Name:{' '}
+ {BankDetails?.[0]?.BankBranch}
+
+ + + )}
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+ - Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not + exchangeable or refundable. + +
- + Please check the product before leaving the + counter. + +
+
+ )}
+ Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
+
@@ -1411,28 +1987,39 @@ const DCInvoiceTemplate = ({ BranchName, BranchDetails, BranchAddress, BranchCit
{/* Copy Labels */}
-
Certified that the particulars given above are true and correct.
++ Certified that the particulars given above are true + and correct. +
- {GlobaldummyData ?
Company Name
- :"For" {companyName}
} + {GlobaldummyData ? ( +Company Name
+ ) : ( +"For" {companyName}
+ )}Authorised Signatory
- {GlobaldummyData ? GlobalSignature && (
-
-
) : Signature == true && (
-
-
)}
+ {GlobaldummyData
+ ? GlobalSignature && (
+
+
+
+ )
+ : Signature == true && (
+
+
+
+ )}
(Common Seal)
- {GlobaldummyData ? GlobalIsnotes &&
- (
-
*/} +
+ )}
Notes : 10 days Return policy
+ {GlobaldummyData + ? GlobalIsnotes && ( +
+
-
) :
- Notestext && (+ Notes : 10 days Return policy +
--
-
+
+ )
+ : Notestext && (
+ {Notestext}
++
+
*/} -
)
- }
+ {/* + {Notestext} +
- {/**/} -
*/} +
@@ -248,6 +324,8 @@ const DCPrintA4Style11 = ({
alignItems: 'center',
padding: '12px 0',
borderBottom: '1px solid black',
+ ...headerStyle,
+ width: '100%',
}}
>
{/* Logo Image */}
@@ -583,6 +661,7 @@ const DCPrintA4Style11 = ({
style={{
width: '10%',
textAlign: 'center',
+ ...tableHeaderStyle,
}}
>
S.No
@@ -593,25 +672,30 @@ const DCPrintA4Style11 = ({
style={{
width: '10%',
textAlign: 'center',
+ ...tableHeaderStyle,
}}
>
S.No
)}
{GlobaldummyData
- ? GlobalItem && Item
- : Item == true && Item }
- {/* {GlobaldummyData
- ? GlobalHsnCode && HSN
- : HsnCode == true && (
- HSN
- )} */}
+ ? GlobalItem && (
+
+ Item
+
+ )
+ : Item == true && (
+
+ Item
+
+ )}
{GlobaldummyData
? GlobalQuantity && (
Qty
@@ -622,6 +706,7 @@ const DCPrintA4Style11 = ({
style={{
width: '10%',
textAlign: 'center',
+ ...tableHeaderStyle,
}}
>
Qty
@@ -656,7 +741,22 @@ const DCPrintA4Style11 = ({
{dataChunk?.map((item, index) => (
-
+
{GlobaldummyData
? GlobalSlNo && (
@@ -1070,6 +1170,7 @@ const DCPrintA4Style11 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
@@ -1260,6 +1361,7 @@ const DCPrintA4Style11 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintStyleA5.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintStyleA5.jsx
index 133dd7f..8686133 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintStyleA5.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCA4/DCPrintStyleA5.jsx
@@ -1,20 +1,62 @@
import React, { useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
-import moment from "moment";
-import { extractLastNumberOrderId, getSession } from '../../../../Services/Others';
+import moment from 'moment';
+import {
+ extractLastNumberOrderId,
+ getSession,
+} from '../../../../Services/Others';
import { getBranchDetail } from '../../../../Features/BrachLogin/BranchLogin';
-import QRcode from '../../../../Images/QRcode.png'
-import { printDiv } from "../../../../Services/Others";
+import QRcode from '../../../../Images/QRcode.png';
+import { printDiv } from '../../../../Services/Others';
// import HpyImg from "../../../../Images/happyemoji.png"
-import '../../../../Styles/BookingScreen/PrintTemplates/A4/DCPrintA4Style11.scss'
+import '../../../../Styles/BookingScreen/PrintTemplates/A4/DCPrintA4Style11.scss';
import { useSelector } from 'react-redux';
-import { GloabalFieldDetails, GlobalBillName, Globalnotes, GlobalprintAmount, GlobalprintDiscount, GlobalprintHsnCode, GlobalprintItem, GlobalprintMRP, GlobalprintQrcodet, GlobalprintQuantity, GlobalprintRate, GlobalprintSignature, GlobalprintSlNo, GlobalprinttermsAndConditions, GlobalPritdummyData, GlobalSignatureImage, GlobalthemeFormat } from '../../../../Features/ThemeChange/ThemeChange';
-import signature from "../../../../Images/signatureimage.jpg"
+import {
+ GloabalFieldDetails,
+ GlobalBillName,
+ Globalnotes,
+ GlobalprintAmount,
+ GlobalprintDiscount,
+ GlobalprintHsnCode,
+ GlobalprintItem,
+ GlobalprintMRP,
+ GlobalprintQrcodet,
+ GlobalprintQuantity,
+ GlobalprintRate,
+ GlobalprintSignature,
+ GlobalprintSlNo,
+ GlobalprinttermsAndConditions,
+ GlobalPritdummyData,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSignatureImage,
+ GlobalthemeFormat,
+} from '../../../../Features/ThemeChange/ThemeChange';
+import signature from '../../../../Images/signatureimage.jpg';
import QRCode from 'react-qr-code';
-const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity, BranchZip, Date1, base64Image,
- table2Data, PaymentStatus, PrintGreeting, printDatas, DCPrintTemplateDtl }) => {
- const GlobalthemeFormatr = useSelector(GlobalthemeFormat)
+const DCPrintStyleA5 = ({
+ BranchName,
+ BranchDetails,
+ BranchAddress,
+ BranchCity,
+ BranchZip,
+ Date1,
+ base64Image,
+ table2Data,
+ PaymentStatus,
+ PrintGreeting,
+ printDatas,
+ DCPrintTemplateDtl,
+}) => {
+ const GlobalthemeFormatr = useSelector(GlobalthemeFormat);
const GlobalSignature = useSelector(GlobalprintSignature);
const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
let FieldDetails = DCPrintTemplateDtl?.FieldDetails?.reduce((acc, item) => {
@@ -23,19 +65,19 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
}, {});
const GlobalIsnotes = useSelector(Globalnotes);
const GlobalSignatureImages = useSelector(GlobalSignatureImage);
- console.log(FieldDetails, "FieldDetails")
- const SLNO = FieldDetails?.["Sl.No"];
- const Item = FieldDetails?.["Item"];
- const MRP = FieldDetails?.["MRP"];
- const Discount = FieldDetails?.["Discount"];
- const Quantity = FieldDetails?.["Quantity"];
- const Rate = FieldDetails?.["Rate"];
- const Amount = FieldDetails?.["Amount"];
- const HsnCode = FieldDetails?.["HsnCode"];
- const Qrcodet = FieldDetails?.["Qrcode"];
- const Signature = FieldDetails?.["signature"];
- const TermsnAdCondition = FieldDetails?.["terms&conditions"];
- const isNotes = FieldDetails?.["Notes"];
+ console.log(FieldDetails, 'FieldDetails');
+ const SLNO = FieldDetails?.['Sl.No'];
+ const Item = FieldDetails?.['Item'];
+ const MRP = FieldDetails?.['MRP'];
+ const Discount = FieldDetails?.['Discount'];
+ const Quantity = FieldDetails?.['Quantity'];
+ const Rate = FieldDetails?.['Rate'];
+ const Amount = FieldDetails?.['Amount'];
+ const HsnCode = FieldDetails?.['HsnCode'];
+ const Qrcodet = FieldDetails?.['Qrcode'];
+ const Signature = FieldDetails?.['signature'];
+ const TermsnAdCondition = FieldDetails?.['terms&conditions'];
+ const isNotes = FieldDetails?.['Notes'];
const GlobalSlNo = useSelector(GlobalprintSlNo);
const GlobalItem = useSelector(GlobalprintItem);
const GlobalMRP = useSelector(GlobalprintMRP);
@@ -46,23 +88,23 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
const GlobalHsnCode = useSelector(GlobalprintHsnCode);
const GlobalQrcodet = useSelector(GlobalprintQrcodet);
const GlobaldummyData = useSelector(GlobalPritdummyData);
- const GlobalBilltext = useSelector(GlobalBillName)
+ const GlobalBilltext = useSelector(GlobalBillName);
const currentDate = new Date();
- console.log(FieldDetails, "FieldDetails")
- const day = currentDate.getDate().toString().padStart(2, "0");
+ console.log(FieldDetails, 'FieldDetails');
+ const day = currentDate.getDate().toString().padStart(2, '0');
const monthNames = [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec",
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec',
];
const monthIndex = currentDate.getMonth();
const year = currentDate.getFullYear().toString().slice(-2);
@@ -90,13 +132,13 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
return day && month && year ? `${day}-${month}-${year}` : '-';
};
const TakeawayData = table2Data?.productDetails?.filter(
- (item) => item.BookingTypeName?.toLowerCase() === "takeaway"
+ (item) => item.BookingTypeName?.toLowerCase() === 'takeaway'
);
const DineInData = table2Data?.productDetails?.filter(
- (item) => item.BookingTypeName?.toLowerCase() === "dine in"
+ (item) => item.BookingTypeName?.toLowerCase() === 'dine in'
);
let PaymentStatusSuccess = PaymentStatus?.filter(
- (ps) => ps.PaymentStatus === "S"
+ (ps) => ps.PaymentStatus === 'S'
);
const TakeawayTotal = TakeawayData?.reduce(
(accumulator, currentValue) => accumulator + currentValue.TotalAmt,
@@ -121,14 +163,14 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
},
{}
);
- let TermsAndConditions = DCPrintTemplateDtl?.TermsandConditions
- let SignatureImg = DCPrintTemplateDtl?.Signature
- let Notestext = DCPrintTemplateDtl?.Notes
- let BillName = DCPrintTemplateDtl?.PrintHdrName
- let FormatTheme = DCPrintTemplateDtl?.PrintType == "S" ? true : false
- let PageSize = DCPrintTemplateDtl?.PageSize
+ let TermsAndConditions = DCPrintTemplateDtl?.TermsandConditions;
+ let SignatureImg = DCPrintTemplateDtl?.Signature;
+ let Notestext = DCPrintTemplateDtl?.Notes;
+ let BillName = DCPrintTemplateDtl?.PrintHdrName;
+ let FormatTheme = DCPrintTemplateDtl?.PrintType == 'S' ? true : false;
+ let PageSize = DCPrintTemplateDtl?.PageSize;
- console.log(FormatTheme, "TermsAndConditions")
+ console.log(FormatTheme, 'TermsAndConditions');
const productsData = table2Data?.productDetails || [];
const offers = table2Data?.OrderOfferDetails || [];
@@ -137,7 +179,7 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
const products = [
{
id: 1,
- name: "Butter Naan",
+ name: 'Butter Naan',
price: 88.0,
quantity: 2,
mrp: 50,
@@ -146,7 +188,7 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
},
{
id: 2,
- name: "Grill Chicken (f)",
+ name: 'Grill Chicken (f)',
price: 300.0,
quantity: 1,
mrp: 50,
@@ -155,7 +197,7 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
},
{
id: 3,
- name: "Tandoori Chicken (H) ",
+ name: 'Tandoori Chicken (H) ',
price: 200.0,
quantity: 1,
mrp: 50,
@@ -164,7 +206,7 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
},
{
id: 4,
- name: "Kulfi",
+ name: 'Kulfi',
price: 30.0,
quantity: 1,
mrp: 50,
@@ -173,7 +215,7 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
},
{
id: 1,
- name: "Butter Naan",
+ name: 'Butter Naan',
price: 88.0,
quantity: 2,
mrp: 50,
@@ -182,7 +224,7 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
},
{
id: 2,
- name: "Grill Chicken (f)",
+ name: 'Grill Chicken (f)',
price: 300.0,
quantity: 1,
mrp: 50,
@@ -194,39 +236,136 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
const chunkSize = 11;
let dataSource = table2Data?.ProductDetails || [];
-
-
// Paginate the data
const paginatedChunks = [];
for (let i = 0; i < dataSource.length; i += chunkSize) {
paginatedChunks.push(dataSource.slice(i, i + chunkSize));
}
- const lastChunkRows = paginatedChunks.length > 0 ? paginatedChunks[paginatedChunks.length - 1].length : 0;
+ const lastChunkRows =
+ paginatedChunks.length > 0
+ ? paginatedChunks[paginatedChunks.length - 1].length
+ : 0;
const shouldFooterBeOnNewPage = lastChunkRows > 6;
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
-
-
-
-
+
+
{paginatedChunks.map((dataChunk, chunkIndex) => (
-
-
-
-
-
-
+
+
+ textAlign: 'left',
+ }}
+ >
+
{/* Logo Image */}
{/* {base64Image && (
@@ -244,148 +383,376 @@ const DCPrintStyleA5 = ({ BranchName, BranchDetails, BranchAddress, BranchCity,
)} */}
{/* Store Info */}
-
-
- } - {(table2Data?.CustMobile || table2Data?.CustName || table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) && + {table2Data?.ToBranchDtl?.length > 0 && ( <> -
- {GlobaldummyData ? "XYZ Shop" : BranchName}
+
- {table2Data?.ToBranchDtl?.length > 0 && <>
-
+
-
-
-
-
+ {GlobaldummyData ? 'XYZ Shop' : BranchName}
{/* Address */}
-
+
{GlobaldummyData
- ? "BranchAddress, Town- 635XXX City - State"
- : [
- BranchAddress,
- BranchCity,
- BranchZip
- ].filter(Boolean).join(' - ')
- }
+ ? 'BranchAddress, Town- 635XXX City - State'
+ : [BranchAddress, BranchCity, BranchZip]
+ .filter(Boolean)
+ .join(' - ')}
- {BranchDetails?.BrGSTIN &&
{/* Order Type */}
-
-
-
- {BranchDetails?.BrGSTIN &&
GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : BranchDetails?.BrGSTIN}, CIN :u00045hhsgbubufsdug
}
-
- {BranchDetails?.BrMobile && Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : BranchDetails?.BrMobile}
}
+ {BranchDetails?.BrGSTIN && (
+
+ GST NO :
+ {GlobaldummyData
+ ? '334bhbsagbysfgbfgbu'
+ : BranchDetails?.BrGSTIN}
+ , CIN :u00045hhsgbubufsdug
+
+ )}
+ {BranchDetails?.BrMobile && (
+
+ {' '}
+ Mobile : +91{' '}
+ {GlobaldummyData
+ ? '986XXXXXXX'
+ : BranchDetails?.BrMobile}
+
+ )}
-
- Delivery To :
-
-
- {table2Data?.ToBranchDtl?.[0]?.BranchName}
- {table2Data?.ToBranchDtl?.[0]?.Address1 && {table2Data?.ToBranchDtl?.[0]?.Address1}
}
- {(table2Data?.ToBranchDtl?.[0]?.City || table2Data?.ToBranchDtl?.[0]?.Dist || table2Data?.ToBranchDtl?.[0]?.Zip) && {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
}
- {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
}
- - } - {(table2Data?.CustMobile || table2Data?.CustName || table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) && + {table2Data?.ToBranchDtl?.length > 0 && ( <> -
- {(table2Data?.CustMobile || table2Data?.CustName) &&
-
-
- } + )} + {(table2Data?.CustMobile || + table2Data?.CustName || + table2Data?.VehicleNo || + table2Data?.TransporterId || + table2Data?.TransporterName) && ( + <> +
+ + )} - {table2Data?.dispatchPrint !== true &&
- < br /> +
-
Delivery Details
- {table2Data?.CustMobile && Mobile NO :{table2Data?.CustMobile}
}
- {table2Data?.CustName && Name:{table2Data?.CustName}
}
+
+
+ Delivery To :
+
+
+
+ {table2Data?.ToBranchDtl?.[0]?.BranchName}
- }
- {(table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) &&
-
-
- }
+ {table2Data?.ToBranchDtl?.[0]?.Address1 && (
+ Vehicle Details
- {table2Data?.VehicleNo && Vehicle No :{table2Data?.VehicleNo}
}
- {table2Data?.TransporterId && Transporter Id :{table2Data?.TransporterId}
}
- {table2Data?.TransporterName && Transporter Name :{table2Data?.TransporterName}
}
-
+ {table2Data?.ToBranchDtl?.[0]?.Address1}
+
+ )}
+ {(table2Data?.ToBranchDtl?.[0]?.City ||
+ table2Data?.ToBranchDtl?.[0]?.Dist ||
+ table2Data?.ToBranchDtl?.[0]?.Zip) && (
+ {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
+ )}
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && (
+
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
+
+ )}
+ - } + )} + {(table2Data?.CustMobile || + table2Data?.CustName || + table2Data?.VehicleNo || + table2Data?.TransporterId || + table2Data?.TransporterName) && ( + <> +
+ {(table2Data?.CustMobile || table2Data?.CustName) && (
+
+
+
+ )}
+ {(table2Data?.VehicleNo ||
+ table2Data?.TransporterId ||
+ table2Data?.TransporterName) && (
+
+ Delivery Details
+
+ {table2Data?.CustMobile && (
+
+ {' '}
+ Mobile NO :{table2Data?.CustMobile}{' '}
+
+ )}
+ {table2Data?.CustName && (
+
+ {' '}
+ Name:{table2Data?.CustName}
+
+ )}
+
+
+ )}
+
+ Vehicle Details
+
+ {table2Data?.VehicleNo && (
+
+ {' '}
+ Vehicle No :{table2Data?.VehicleNo}
+
+ )}
+ {table2Data?.TransporterId && (
+
+ {' '}
+ Transporter Id :{table2Data?.TransporterId}
+
+ )}
+ {table2Data?.TransporterName && (
+
+ {' '}
+ Transporter Name :{table2Data?.TransporterName}
+
+ )}
+ + + )} - {table2Data?.dispatchPrint !== true &&
-
-
}
-
- {table2Data?.dispatchPrint === true && Delivery Challan NO :{GlobaldummyData ? '51' : table2Data?.DCNo}
- {GlobaldummyData ? 'Cash Bill' : BillName ? BillName : "Delivery Challan"}
- {Date1}
-
-
}
- {table2Data?.dispatchPrint === true && Dispatch No #:{table2Data?.DispatchId}
- {"Delivery Challan"}
- Dispatch Date: {formatDate(table2Data?.CreatedDate)}
-
-
-
}
+ {table2Data?.dispatchPrint !== true && (
+ Ref No #:{table2Data?.RequestId}
- Requested Date: {formatDate(table2Data?.RequestedDate)}
+
+ )}
+ {table2Data?.dispatchPrint === true && (
+
+ {' '}
+ Delivery Challan NO :
+ {GlobaldummyData ? '51' : table2Data?.DCNo}{' '}
+
+
+ {GlobaldummyData
+ ? 'Cash Bill'
+ : BillName
+ ? BillName
+ : 'Delivery Challan'}{' '}
+
+
+ {' '}
+
+ {Date1}
{' '}
+
+
+ )}
+ {table2Data?.dispatchPrint === true && (
+
+ {' '}
+ Dispatch No #:{table2Data?.DispatchId}{' '}
+
+
+ {'Delivery Challan'}{' '}
+
+
+ {' '}
+
+
+ Dispatch Date: {formatDate(table2Data?.CreatedDate)}
+
{' '}
+
+
+
+ )}
+ {' '}
+ Ref No #:{table2Data?.RequestId}{' '}
+
+
+ {' '}
+
+
+ Requested Date: {formatDate(table2Data?.RequestedDate)}
+
{' '}
+ - < br /> +
-
{(table2Data?.ProductDetails?.length > 0 || GlobaldummyData) && (
<>
- 0) ? "6rem" : "2rem" }}>
+ 0
+ ? '6rem'
+ : '2rem',
+ }}
+ >
)}
-
-
+ {chunkIndex === paginatedChunks.length - 1 &&
+ !shouldFooterBeOnNewPage &&
+ FormatTheme && (
+
|
{/* Placeholder for the fixed-position header */}
- |
|||||||||||||||||||||||||||||
|
-
-
-
|
+ {GlobaldummyData
+ ? GlobalIsnotes && (
+
+ )}
+
))}
{shouldFooterBeOnNewPage && FormatTheme && (
+
+
+ )
+ : Notestext && (
+ + Notes : 10 days Return policy +
++
+
+
+ )}
+ + {Notestext} +
++
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
- )}
-
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not exchangeable + or refundable. + +
- + Please check the product before leaving the + counter. + +
+
+ )}
-
- {((chunkIndex === paginatedChunks.length - 1) && (!shouldFooterBeOnNewPage)) && FormatTheme && (
- + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
-
- {GlobaldummyData ? GlobalIsnotes &&
- (
-
-
-
) :
- Notestext && (Notes : 10 days Return policy
- --
-
-
)
- }
-
-
- {Notestext}
- --
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
-
- {GlobaldummyData ? GlobalSignature && (- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
-
) : Signature == true && (Signature
-
-
-
)}
-
+ {GlobaldummyData
+ ? GlobalSignature && (
+ Signature
-
+
+
+ )
+ : Signature == true && (
+ + Signature +
+
+
+
+ )}
+ + Signature +
+
-
-
-
);
};
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCInvicePrint.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCInvicePrint.jsx
index 524dd96..873ae12 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCInvicePrint.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCInvicePrint.jsx
@@ -1,815 +1,1980 @@
-
import { useSelector } from 'react-redux';
import { isMobile } from 'react-device-detect';
import moment from 'moment';
-import { GlobalPritdummyData } from '../../../../Features/ThemeChange/ThemeChange';
+import {
+ GlobalPritdummyData,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+} from '../../../../Features/ThemeChange/ThemeChange';
import { extractLastNumberOrderId } from '../../../../Services/Others';
const DCInvicePrint = ({
- index,
- table2Data,
- Date1,
- totalQuantity,
- OrderDetailGST,
- OrderDetailIGST,
- PaymentStatus,
- printDatas,
- BranchDetails,
- BankDetails
+ index,
+ table2Data,
+ Date1,
+ totalQuantity,
+ OrderDetailGST,
+ OrderDetailIGST,
+ PaymentStatus,
+ printDatas,
+ BranchDetails,
+ BankDetails,
+ DCPrintTemplateDtl,
}) => {
- const GlobaldummyData = useSelector(GlobalPritdummyData);
- let BillName = printDatas?.PrintHdrName
- console.log(table2Data, 'table2Datatable2Data');
+ const GlobaldummyData = useSelector(GlobalPritdummyData);
+ let BillName = printDatas?.PrintHdrName;
+ console.log(table2Data, 'table2Datatable2Data');
- const numberToWords = (num) => {
- const a = [
- "", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten",
- "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen",
- "Eighteen", "Nineteen"
- ];
- const b = ["", "", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"];
+ let FieldDetails = DCPrintTemplateDtl?.FieldDetails?.reduce((acc, item) => {
+ acc[item.ConfigName] = true;
+ return acc;
+ }, {});
- if (num === 0) return "Zero";
- if (num < 20) return a[num];
- if (num < 100) return b[Math.floor(num / 10)] + (num % 10 ? " " + a[num % 10] : "");
- if (num < 1000)
- return a[Math.floor(num / 100)] + " Hundred" + (num % 100 ? " and " + numberToWords(num % 100) : "");
- if (num < 100000)
- return numberToWords(Math.floor(num / 1000)) + " Thousand" + (num % 1000 ? " " + numberToWords(num % 1000) : "");
- if (num < 10000000)
- return numberToWords(Math.floor(num / 100000)) + " Lakh" + (num % 100000 ? " " + numberToWords(num % 100000) : "");
- if (num < 1000000000)
- return numberToWords(Math.floor(num / 10000000)) + " Crore" + (num % 10000000 ? " " + numberToWords(num % 10000000) : "");
+ const numberToWords = (num) => {
+ const a = [
+ '',
+ 'One',
+ 'Two',
+ 'Three',
+ 'Four',
+ 'Five',
+ 'Six',
+ 'Seven',
+ 'Eight',
+ 'Nine',
+ 'Ten',
+ 'Eleven',
+ 'Twelve',
+ 'Thirteen',
+ 'Fourteen',
+ 'Fifteen',
+ 'Sixteen',
+ 'Seventeen',
+ 'Eighteen',
+ 'Nineteen',
+ ];
+ const b = [
+ '',
+ '',
+ 'Twenty',
+ 'Thirty',
+ 'Forty',
+ 'Fifty',
+ 'Sixty',
+ 'Seventy',
+ 'Eighty',
+ 'Ninety',
+ ];
- return "Number too large";
- };
+ if (num === 0) return 'Zero';
+ if (num < 20) return a[num];
+ if (num < 100)
+ return b[Math.floor(num / 10)] + (num % 10 ? ' ' + a[num % 10] : '');
+ if (num < 1000)
+ return (
+ a[Math.floor(num / 100)] +
+ ' Hundred' +
+ (num % 100 ? ' and ' + numberToWords(num % 100) : '')
+ );
+ if (num < 100000)
+ return (
+ numberToWords(Math.floor(num / 1000)) +
+ ' Thousand' +
+ (num % 1000 ? ' ' + numberToWords(num % 1000) : '')
+ );
+ if (num < 10000000)
+ return (
+ numberToWords(Math.floor(num / 100000)) +
+ ' Lakh' +
+ (num % 100000 ? ' ' + numberToWords(num % 100000) : '')
+ );
+ if (num < 1000000000)
+ return (
+ numberToWords(Math.floor(num / 10000000)) +
+ ' Crore' +
+ (num % 10000000 ? ' ' + numberToWords(num % 10000000) : '')
+ );
- const invoiceData = {
- // Company Details - mapped from A4Standard
- companyName: table2Data?.CompName || BranchDetails?.BrName || "",
- companyspecname: table2Data?.AppSpecificName || "",
- companyAddress: {
- address1: BranchDetails?.Address1 || "",
- address2: BranchDetails?.Address2 || "",
- city: BranchDetails?.City || "",
- state: BranchDetails?.State || "",
- zip: BranchDetails?.Zip || ""
- },
- companyGSTIN: table2Data?.CompGSTIN || BranchDetails?.GSTIN || "",
- companyEmail: table2Data?.CompanyEmail || BranchDetails?.BrEmail || "",
- companyMobile: BranchDetails?.BrMobile || "",
- companyMobile2: BranchDetails?.BrMobile2 || "",
+ return 'Number too large';
+ };
- // Invoice Details - mapped from A4Standard
- invoiceNo: table2Data?.[0]?.DCNo ?
- extractLastNumberOrderId(
- table2Data?.[0]?.DCNo,
- ) : "",
- invoiceDate: moment(Date1).format('DD-MM-YYYY') || "",
+ const invoiceData = {
+ // Company Details - mapped from A4Standard
+ companyName: table2Data?.CompName || BranchDetails?.BrName || '',
+ companyspecname: table2Data?.AppSpecificName || '',
+ companyAddress: {
+ address1: BranchDetails?.Address1 || '',
+ address2: BranchDetails?.Address2 || '',
+ city: BranchDetails?.City || '',
+ state: BranchDetails?.State || '',
+ zip: BranchDetails?.Zip || '',
+ },
+ companyGSTIN: table2Data?.CompGSTIN || BranchDetails?.GSTIN || '',
+ companyEmail: table2Data?.CompanyEmail || BranchDetails?.BrEmail || '',
+ companyMobile: BranchDetails?.BrMobile || '',
+ companyMobile2: BranchDetails?.BrMobile2 || '',
- // Customer Details - mapped from A4Standard CustomerDetails array
- customerName: table2Data?.[0]?.CustName || table2Data?.CustName
- || "",
- customerMobile: table2Data?.[0]?.CustMobile || table2Data?.CustMobile || "",
- customerGSTIN: table2Data?.[0]?.SuppGSTIN || table2Data?.CustGSTIN || "",
- VehicleNo: table2Data?.[0]?.VehicleNo || table2Data?.VehicleNo || "",
- TransporterId: table2Data?.[0]?.TransporterId || table2Data?.TransporterId || "",
- TransporterName: table2Data?.[0]?.TransporterName || table2Data?.TransporterName || "",
- customerAddress: {
- address1: table2Data?.CustomerDetails?.[0]?.Address1 || "",
- address2: table2Data?.CustomerDetails?.[0]?.Address2 || "",
- state: table2Data?.CustomerDetails?.[0]?.State || ""
- },
+ // Invoice Details - mapped from A4Standard
+ invoiceNo: table2Data?.[0]?.DCNo
+ ? extractLastNumberOrderId(table2Data?.[0]?.DCNo)
+ : '',
+ invoiceDate: moment(Date1).format('DD-MM-YYYY') || '',
- // Product Details - mapped from A4Standard productDetails
- productDetails: table2Data?.[0]?.ProductDetails || [],
+ // Customer Details - mapped from A4Standard CustomerDetails array
+ customerName: table2Data?.[0]?.CustName || table2Data?.CustName || '',
+ customerMobile: table2Data?.[0]?.CustMobile || table2Data?.CustMobile || '',
+ customerGSTIN: table2Data?.[0]?.SuppGSTIN || table2Data?.CustGSTIN || '',
+ VehicleNo: table2Data?.[0]?.VehicleNo || table2Data?.VehicleNo || '',
+ TransporterId:
+ table2Data?.[0]?.TransporterId || table2Data?.TransporterId || '',
+ TransporterName:
+ table2Data?.[0]?.TransporterName || table2Data?.TransporterName || '',
+ customerAddress: {
+ address1: table2Data?.CustomerDetails?.[0]?.Address1 || '',
+ address2: table2Data?.CustomerDetails?.[0]?.Address2 || '',
+ state: table2Data?.CustomerDetails?.[0]?.State || '',
+ },
- // Totals - mapped from A4Standard
- totalAmount: Number(table2Data?.[0]?.TotalAmount || table2Data?.TotalAmt),
- taxAmount: Number(OrderDetailGST),
- grandTotal: Number(table2Data?.[0]?.TotalAmount || table2Data?.GrandTotal),
- totalBillAmount: Number(table2Data?.[0]?.BillAmount || table2Data?.NetAmount || 0),
- // Bank Details - mapped from A4Standard
- bankDetails: BankDetails?.[0] || null
- };
+ // Product Details - mapped from A4Standard productDetails
+ productDetails: table2Data?.[0]?.ProductDetails || [],
- console.log(table2Data, "Date1Date1", invoiceData,)
+ // Totals - mapped from A4Standard
+ totalAmount: Number(table2Data?.[0]?.TotalAmount || table2Data?.TotalAmt),
+ taxAmount: Number(OrderDetailGST),
+ grandTotal: Number(table2Data?.[0]?.TotalAmount || table2Data?.GrandTotal),
+ totalBillAmount: Number(
+ table2Data?.[0]?.BillAmount || table2Data?.NetAmount || 0
+ ),
+ // Bank Details - mapped from A4Standard
+ bankDetails: BankDetails?.[0] || null,
+ };
- let PageSize = printDatas?.PageSize
+ console.log(table2Data, 'Date1Date1', invoiceData);
+ let PageSize = printDatas?.PageSize;
- const cgstTotal = OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.CGST || 0), 0))?.toFixed(2)
- : 0;
- const sgstTotal = OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.SGST || 0), 0))?.toFixed(2)
- : 0;
- const igstTotal = OrderDetailIGST && OrderDetailIGST.length > 0
- ? Number(OrderDetailIGST.reduce((sum, item) => sum + (item.IGST || 0), 0))?.toFixed(2)
- : 0;
+ const cgstTotal =
+ OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce((sum, item) => sum + (item.CGST || 0), 0)
+ )?.toFixed(2)
+ : 0;
+ const sgstTotal =
+ OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce((sum, item) => sum + (item.SGST || 0), 0)
+ )?.toFixed(2)
+ : 0;
+ const igstTotal =
+ OrderDetailIGST && OrderDetailIGST.length > 0
+ ? Number(
+ OrderDetailIGST.reduce((sum, item) => sum + (item.IGST || 0), 0)
+ )?.toFixed(2)
+ : 0;
- // Calculate round off value
- const roundOffValue = Number(invoiceData.grandTotal) - (
- Number(invoiceData.totalBillAmount) +
- Number(cgstTotal) +
- Number(sgstTotal) +
- Number(igstTotal)
+ // Calculate round off value
+ const roundOffValue =
+ Number(invoiceData.grandTotal) -
+ (Number(invoiceData.totalBillAmount) +
+ Number(cgstTotal) +
+ Number(sgstTotal) +
+ Number(igstTotal));
+
+ function RoundOffFun(amount) {
+ const roundedAmount = Math.round(amount);
+ const roundOffValue = parseFloat((roundedAmount - amount).toFixed(2));
+ // const symbol = roundOffValue > 0 ? '+' : ''; // Add "+" symbol for positive values ${symbol}
+ console.log(
+ 'Rounded Amount:',
+ roundedAmount,
+ 'Round Off Value:',
+ roundOffValue
+ );
+ return `${roundOffValue.toFixed(2)}`;
+ }
+
+ // Allow up to 10 items per page
+ const chunkSize = isMobile ? 7 : PageSize == 'A5' ? 9 : 8;
+ let dataSource = [];
+ dataSource = table2Data?.[0]?.ProductDetails || [];
+ if (!Array.isArray(dataSource)) {
+ dataSource = [];
+ }
+
+ console.log('Final DataSource:', table2Data);
+
+ const paginatedChunks = [];
+
+ // Always create at least one chunk, even if empty
+ if (dataSource.length === 0) {
+ paginatedChunks.push([]);
+ } else {
+ // Split data into chunks
+ for (let i = 0; i < dataSource.length; i += chunkSize) {
+ const chunk = dataSource.slice(i, i + chunkSize);
+ paginatedChunks.push(chunk);
+ }
+ }
+
+ const lastChunkRows =
+ paginatedChunks.length > 0
+ ? paginatedChunks[paginatedChunks.length - 1].length
+ : 0;
+ // If last page has more than 6 items, move footer to new page
+ const shouldFooterBeOnNewPage = lastChunkRows === chunkSize;
+
+ // If footer should be on new page, add an empty chunk for footer-only page
+ if (shouldFooterBeOnNewPage && paginatedChunks.length > 0) {
+ paginatedChunks.push([]); // Empty chunk for footer-only page
+ }
+
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
+ return (
+
+ {GlobaldummyData
+ ? GlobalIsnotes && (
+
)}
+
-
)
- }
-
-
- + Notes : 10 days Return policy +
- {GlobaldummyData ? GlobalIsnotes && - (
-
+
+ )
+ : Notestext && (
+ Notes : 10 days Return policy
++
+
-
) :
- Notestext && (+ {Notestext} +
--
-
+
+ )}
- {Notestext}
++
-
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
-
- {GlobaldummyData ? GlobalSignature && (- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
-
) : Signature == true && (Signature
-
-
-
)}
+ Signature
-
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not exchangeable or + refundable. + +
- + Please check the product before leaving the counter. + +
+
+ )}
+ {GlobaldummyData
+ ? GlobalSignature && (
+ + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
+
+
+ )
+ : Signature == true && (
+ + Signature +
+
+
+
+ )}
+ Signature +
+
+ {paginatedChunks.map((dataChunk, chunkIndex) => (
+
+ );
+
+ function renderInvoiceContent(dataChunk, chunkIndex) {
+ console.log(
+ `Rendering page ${chunkIndex + 1}, chunk has ${dataChunk.length} items:`,
+ dataChunk
);
- function RoundOffFun(amount) {
- const roundedAmount = Math.round(amount);
- const roundOffValue = parseFloat((roundedAmount - amount).toFixed(2));
- // const symbol = roundOffValue > 0 ? '+' : ''; // Add "+" symbol for positive values ${symbol}
- console.log("Rounded Amount:", roundedAmount, "Round Off Value:", roundOffValue);
- return `${roundOffValue.toFixed(2)}`;
-
- }
-
- // Allow up to 10 items per page
- const chunkSize = isMobile ? 7 : PageSize == "A5" ? 9 : 8;
- let dataSource = [];
- dataSource = table2Data?.[0]?.ProductDetails || [];
- if (!Array.isArray(dataSource)) {
- dataSource = [];
- }
-
- console.log("Final DataSource:", table2Data,);
-
- const paginatedChunks = [];
-
- // Always create at least one chunk, even if empty
- if (dataSource.length === 0) {
- paginatedChunks.push([]);
- } else {
- // Split data into chunks
- for (let i = 0; i < dataSource.length; i += chunkSize) {
- const chunk = dataSource.slice(i, i + chunkSize);
- paginatedChunks.push(chunk);
- }
- }
-
- const lastChunkRows = paginatedChunks.length > 0 ? paginatedChunks[paginatedChunks.length - 1].length : 0;
- // If last page has more than 6 items, move footer to new page
- const shouldFooterBeOnNewPage = lastChunkRows === chunkSize;
-
- // If footer should be on new page, add an empty chunk for footer-only page
- if (shouldFooterBeOnNewPage && paginatedChunks.length > 0) {
- paginatedChunks.push([]); // Empty chunk for footer-only page
- }
+ const isFirstPage = chunkIndex === 0;
+ const isLastPage = chunkIndex === paginatedChunks.length - 1;
+ const isFooterOnlyPage =
+ isLastPage && dataChunk.length === 0 && shouldFooterBeOnNewPage;
+ console.log(
+ `Page ${chunkIndex + 1}: isFirstPage=${isFirstPage}, isLastPage=${isLastPage}, isFooterOnlyPage=${isFooterOnlyPage}`
+ );
return (
- 0 ? ' print-page-break' : ''}`
+ }
+ style={{
+ display: 'flex',
+ flexDirection: 'column',
+ // justifyContent: ((chunkIndex === paginatedChunks.length - 1) && (!shouldFooterBeOnNewPage)) ? "space-between" : "",
+ height: isMobile ? '275mm' : PageSize == 'A5' ? '130mm' : '245mm',
+ marginBottom: '0',
+ pageBreakAfter:
+ chunkIndex < paginatedChunks.length - 1 ? 'always' : 'auto',
+ }}
+ >
+ {renderInvoiceContent(dataChunk, chunkIndex)}
+
+ ))}
+
- {paginatedChunks.map((dataChunk, chunkIndex) => (
-
0 ? ' print-page-break' : ''}`}
- style={{
- display: "flex",
- flexDirection: "column",
- // justifyContent: ((chunkIndex === paginatedChunks.length - 1) && (!shouldFooterBeOnNewPage)) ? "space-between" : "",
- height: isMobile ? "275mm" : PageSize == "A5" ? '130mm' : "245mm",
- marginBottom: "0",
- pageBreakAfter: chunkIndex < paginatedChunks.length - 1 ? 'always' : 'auto'
- }}
- >
- {renderInvoiceContent(dataChunk, chunkIndex)}
+ <>
+ {/* Header - Only on first page */}
+ {isFirstPage && (
+ <>
+
+
+ )}
- function renderInvoiceContent(dataChunk, chunkIndex) {
- console.log(`Rendering page ${chunkIndex + 1}, chunk has ${dataChunk.length} items:`, dataChunk);
+ {/* Main Container - Always show */}
+
+
+
+ + {table2Data?.OrderType === 'E' + ? 'Estimate' + : BillName + ? BillName + : 'Tax Invoice'} +
+
+
- );
+
+ (ORIGINAL FOR RECIPIENT)
- ))}
-
+ {/* Top Section - Company and Invoice Details - Only on first page */}
+ {isFirstPage && (
+
+ {/* Left - Company Details */}
+
+ )}
+
+ {/* Continuation header for non-first pages */}
+ {!isFirstPage && (
+
+
- console.log(`Page ${chunkIndex + 1}: isFirstPage=${isFirstPage}, isLastPage=${isLastPage}, isFooterOnlyPage=${isFooterOnlyPage}`);
+ {/* Right - Invoice Details */}
+
+
+ {/* Buyer Details */}
+
+ {invoiceData.companyName}
+
+
+ {invoiceData.companyspecname}
+
+ {invoiceData.companyAddress.address1}
+ {invoiceData.companyAddress.address2}
+
+ {invoiceData.companyAddress.city}{' '}
+ {invoiceData.companyAddress.zip
+ ? ` - ${invoiceData.companyAddress.zip}`
+ : ''}
+
+ {invoiceData.companyAddress.state}
+ GSTIN/UIN: {invoiceData.companyGSTIN}
+ {/* State Name: Tamil Nadu, Code: 33
*/}
+ {invoiceData.companyEmail && (
+ E-Mail: {invoiceData.companyEmail}
+ )}
+ {invoiceData.companyMobile && (
+
+ Mobile: +91 {invoiceData.companyMobile}
+ {invoiceData.companyMobile2
+ ? `, ${invoiceData.companyMobile2}`
+ : ''}
+
+ )}
+
+
+
+ Buyer (Bill to)
+
+
+ {invoiceData.customerName}
+
+ {invoiceData.customerAddress.address1 && (
+ {invoiceData.customerAddress.address1}
+ )}
+ {invoiceData.customerAddress.address2 && (
+ {invoiceData.customerAddress.address2}
+ )}
+ {invoiceData.customerMobile && (
+ Mobile: {invoiceData.customerMobile}
+ )}
+ {invoiceData.customerGSTIN && (
+ GSTIN/UIN: {invoiceData.customerGSTIN}
+ )}
+ {invoiceData.customerAddress.state && (
+ State Name: {invoiceData.customerAddress.state}
+ )}
+ {invoiceData.VehicleNo && (
+ Vehicle No : {invoiceData.VehicleNo}
+ )}
+ {invoiceData.TransporterName && (
+ Transporter Name: {invoiceData.TransporterName}
+ )}
+ {invoiceData.TransporterId && (
+ Transporter Id: {invoiceData.TransporterId}
+ )}
+
+ {/* Invoice No and Date */}
+
+
+
- return (
- <>
- {/* Header - Only on first page */}
- {isFirstPage && (
+ {/* Delivery Note and Payment Terms */}
+
+
+
+ Invoice No.
+
+
+ {invoiceData.invoiceNo}
+
+
+
+ Dated
+
+ {invoiceData.invoiceDate}
+
+
+
+
+ {/* Reference and Other References */}
+
+
+
+ Delivery Note
+
+
+
+
+
+ Mode/Terms of Payment
+
+
+
+
+
+ {/* Buyer's Order */}
+
+
+
+ Reference No. & Date
+
+
+
+
+
+ Other References
+
+
+
+
+
+ {/* Dispatch Details */}
+
+
+
+ Buyer's Order No.
+
+
+
+
+
+ Dated
+
+
+
+
+
+ {/* Dispatched through and Destination */}
+
+
+
+ Dispatch Doc No.
+
+
+
+
+
+ Delivery Note Date
+
+
+
+
+
+ {/* Terms of Delivery */}
+
+
+
+ Dispatched through
+
+
+
+
+
+ Destination
+
+
+
+
+
+ Terms of Delivery
+
+
+
+
+ )}
+
+ {/* Items Table - Show only if there are items or not a footer-only page */}
+ {(dataChunk.length > 0 || !isFooterOnlyPage) && (
+ + {isFooterOnlyPage ? 'Tax Invoice' : 'Tax Invoice '} +
+
+ Invoice No: {invoiceData.invoiceNo}
+
+
+ {/* Table Header */}
+
+
+
+ {/* Table Rows - Dynamic data from dataChunk */}
+ {dataChunk && dataChunk.length > 0 ? (
+ <>
+ {dataChunk?.map((item, index) => (
+
+ Sl.No
+
+
+ Description of Goods
+
+
+ HSN/SAC
+
+
+ Quantity
+
+
+ Rate
+
+
+ per
+
+
+ Amount
+
+
+
+ ))}
+ {/* Tax summary */}
+ {isLastPage && (
<>
-
+ {chunkIndex * chunkSize + index + 1}
+
+
+
+
+ {item.ProdName || 'Product Name'}
+
+ {item.BrandName && (
+
+ {item.BrandName}
+
+ )}
+
+ {item.HSN || ''}
+
+
+ {item.Qty || 0} {item.UomName || 'NOS'}
+
+
+ {Number(item.ProductRate || 0)?.toLocaleString(
+ 'en-IN',
+ { minimumFractionDigits: 2, maximumFractionDigits: 2 }
+ )}
+
+
+ {item.UomName || 'NOS'}
+
+
+ {Number(item.TotalAmount || 0)?.toLocaleString(
+ 'en-IN',
+ { minimumFractionDigits: 2, maximumFractionDigits: 2 }
+ )}
+
+
-
-
+ )}
+ {/* Tax summary - Only on last page */}
- {/* Main Container - Always show */}
- {table2Data?.OrderType === "E" ? "Estimate" : (BillName ? BillName : "Tax Invoice")}
-
-
+ {/* Total without tax amount */}
+ (ORIGINAL FOR RECIPIENT)
-
+
+
+
+
+
+
+
+ {/* CGST */}
+ {OrderDetailGST && OrderDetailGST.length > 0 && (
+
+ ₹{' '}
+ {Number(invoiceData?.totalAmount).toLocaleString(
+ 'en-IN',
+ {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ }
+ )}
+
+
+
+ )}
+ {/* SGST */}
+ {OrderDetailGST && OrderDetailGST.length > 0 && (
+
+ CGST
+
+
+
+
+
+ {
+
+ {OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce(
+ (sum, item) => sum + (item.CGST || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+ }
+
+
+
+ )}
+ {/* IGST */}
+ {OrderDetailIGST && OrderDetailIGST.length > 0 && (
+
+ SGST
+
+
+
+
+
+
+ {OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce(
+ (sum, item) => sum + (item.SGST || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+
+
+
+ )}
+ {/* Rounding Off */}
+
+ IGST
+
+
+
+
+
+
+
+ {OrderDetailIGST && OrderDetailIGST.length > 0
+ ? Number(
+ OrderDetailIGST.reduce(
+ (sum, item) => sum + (item.IGST || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+
+
+
+ {Array.from({
+ length: chunkSize - dataChunk.length,
+ })?.map((_, idx) => (
+
+ ROUNDING OFF
+
+
+
+
+
+
+
+ {RoundOffFun(roundOffValue)}
+
+
+
+ ))}
+ {/* Total */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- )}
+ )}
+
+ ) : (
+ // Show empty row when no data
+
+ Total
+
+
+
+ {totalQuantity ||
+ invoiceData.productDetails?.reduce(
+ (sum, item) => sum + (item.Qty || 0),
+ 0
+ ) ||
+ 0}{' '}
+ NOS
+
+
+
+
+ ₹{' '}
+ {Number(invoiceData.grandTotal).toLocaleString(
+ 'en-IN',
+ {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ }
+ )}
+
+
+
+ )}
+
+ -
+
+
+ No items to display
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ {/* Footer content - Only on last page */}
+ {isLastPage && (
+ <>
+ {/* Amount in Words */}
+
+
- {/* Top Section - Company and Invoice Details - Only on first page */}
- {isFirstPage && (
-
+
+
+ Amount Chargeable (in words)
+
+
+ INR {numberToWords(Math.floor(invoiceData.grandTotal))} Only
+
+ E. & O.E
+
+ {/* Tax Breakdown Table */}
+ {OrderDetailIGST && OrderDetailIGST.length > 0 && (
+
+ {/* Tax Table Header - Main Headers */}
+
-
- {/* Right - Invoice Details */}
-
+
- {/* Left - Company Details */}
-
+ HSN/SAC
+
+
+ Taxable Value
+
+
+ CGST
+
+
+ SGST/UTGST
+
+
+ Tax Amount
+
+
-
- {/* Buyer Details */}
-
+
+
+
- fontSize: '11px',
- textAlign: 'left'
- }}>
-
-
+ Rate
+
+
+ Amount
+
+
+ Rate
+
+
+ Amount
+
+
+
- {invoiceData.companyName}
-
- {invoiceData.companyspecname}
- {invoiceData.companyAddress.address1}
- {invoiceData.companyAddress.address2}
- {invoiceData.companyAddress.city} {invoiceData.companyAddress.zip ? ` - ${invoiceData.companyAddress.zip}` : ""}
- {invoiceData.companyAddress.state}
- GSTIN/UIN: {invoiceData.companyGSTIN}
- {/* State Name: Tamil Nadu, Code: 33
*/}
- {invoiceData.companyEmail && E-Mail: {invoiceData.companyEmail}
}
- {invoiceData.companyMobile && Mobile: +91 {invoiceData.companyMobile}{invoiceData.companyMobile2 ? `, ${invoiceData.companyMobile2}` : ""}
}
-
-
-
- Buyer (Bill to)
- {invoiceData.customerName}
- {invoiceData.customerAddress.address1 && {invoiceData.customerAddress.address1}
}
- {invoiceData.customerAddress.address2 && {invoiceData.customerAddress.address2}
}
- {invoiceData.customerMobile && Mobile: {invoiceData.customerMobile}
}
- {invoiceData.customerGSTIN && GSTIN/UIN: {invoiceData.customerGSTIN}
}
- {invoiceData.customerAddress.state && State Name: {invoiceData.customerAddress.state}
}
- {invoiceData.VehicleNo && Vehicle No : {invoiceData.VehicleNo}
}
- {invoiceData.TransporterName && Transporter Name: {invoiceData.TransporterName}
}
- {invoiceData.TransporterId && Transporter Id: {invoiceData.TransporterId}
}
-
-
- {/* Invoice No and Date */}
-
+ {/* Tax Table Rows - Dynamic from OrderDetailGST */}
+ {OrderDetailGST && OrderDetailGST.length > 0 ? (
+ OrderDetailGST?.map((taxItem, index) => (
+
-
-
- {/* Delivery Note and Payment Terms */}
-
-
- Invoice No.
- {invoiceData.invoiceNo}
-
-
- Dated
- {invoiceData.invoiceDate}
-
-
-
- {/* Reference and Other References */}
-
-
- Delivery Note
-
-
-
- Mode/Terms of Payment
-
-
-
-
- {/* Buyer's Order */}
-
-
- Reference No. & Date
-
-
-
- Other References
-
-
-
-
- {/* Dispatch Details */}
-
-
- Buyer's Order No.
-
-
-
- Dated
-
-
-
-
- {/* Dispatched through and Destination */}
-
-
- Dispatch Doc No.
-
-
-
- Delivery Note Date
-
-
-
-
- {/* Terms of Delivery */}
-
-
- Dispatched through
-
-
-
- Destination
-
-
-
-
- Terms of Delivery
-
-
+
+
+ {/* Footer - Only on last page */}
+ {isLastPage && (
+
+ {taxItem.HSN || ''}
- )}
-
- {/* Continuation header for non-first pages */}
- {!isFirstPage && (
-
-
+ )}
+
+ {/* Tax Amount in Words */}
+ {OrderDetailIGST && OrderDetailIGST.length > 0 && (
+ - {isFooterOnlyPage ? 'Tax Invoice' : 'Tax Invoice '} -
-Invoice No: {invoiceData.invoiceNo}
+
+ {Number(taxItem.WithoutTaxRate || 0).toLocaleString(
+ 'en-IN',
+ {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ }
+ )}
- )}
-
- {/* Items Table - Show only if there are items or not a footer-only page */}
- {(dataChunk.length > 0 || !isFooterOnlyPage) && (
-
- {/* Table Header */}
-
+ ))
+ ) : (
+ // Show 0 values when no GST data
+
-
-
- {/* Table Rows - Dynamic data from dataChunk */}
- {(dataChunk && dataChunk.length > 0) ? (
- <>
- {dataChunk?.map((item, index) => (
- Sl.No
- Description of Goods
- HSN/SAC
- Quantity
- Rate
- per
- Amount
-
-
- ))}
- {/* Tax summary */}
- {isLastPage &&
- (
- <>
- {/* Total without tax amount */}
- {chunkIndex * chunkSize + index + 1}
-
-
- {item.ProdName || 'Product Name'}
- {item.BrandName && {item.BrandName}
}
- {item.HSN || ''}
- {item.Qty || 0} {item.UomName || 'NOS'}
- {Number(item.ProductRate || 0)?.toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
- {item.UomName || 'NOS'}
- {Number(item.TotalAmount || 0)?.toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
-
-
-
-
-
-
-
-
- {/* CGST */}
- {OrderDetailGST && OrderDetailGST.length > 0 &&
- ₹ {Number(invoiceData?.totalAmount).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
-
-
-
-
}
- {/* SGST */}
- {OrderDetailGST && OrderDetailGST.length > 0 && CGST
-
-
-
-
- {
- {OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.CGST || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"}
-
}
-
-
-
}
- {/* IGST */}
- {OrderDetailIGST && OrderDetailIGST.length > 0 && (
- SGST
-
-
-
-
-
- {OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.SGST || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"}
-
-
-
-
- )}
- {/* Rounding Off */}
- IGST
-
-
-
-
-
-
- {OrderDetailIGST && OrderDetailIGST.length > 0
- ? Number(OrderDetailIGST.reduce((sum, item) => sum + (item.IGST || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"}
-
-
-
-
- {Array.from({ length: chunkSize - dataChunk.length })?.map((_, idx) => (
- ROUNDING OFF
-
-
-
-
-
-
- {RoundOffFun(roundOffValue)}
-
-
-
-
-
-
-
-
-
-
- ))}
- {/* Total */}
-
-
-
-
- )}
-
- ) : (
-
- // Show empty row when no data
- Total
-
-
- {totalQuantity ||
- (invoiceData.productDetails?.reduce((sum, item) => sum + (item.Qty || 0), 0)) ||
- 0} NOS
-
-
-
-
- ₹ {Number(invoiceData.grandTotal).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
-
-
-
- )}
+ -
- No items to display
- -
- -
- -
- -
- -
-
+ {taxItem.TaxPercentage
+ ? taxItem.TaxPercentage / 2 + '%'
+ : '0%'}
+
+ {Number(taxItem.CGST || 0).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })}
+
+
+ {taxItem.TaxPercentage
+ ? taxItem.TaxPercentage / 2 + '%'
+ : '0%'}
+
+
+ {Number(taxItem.SGST || 0).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })}
+
+
+ {Number(
+ (taxItem.CGST || 0) + (taxItem.SGST || 0)
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })}
+
+
+
+ )}
+
+ {/* Tax Table Total */}
+
+ -
+
+
+ 0.00
+
+
+ 0%
+
+
+ 0.00
+
+
+ 0%
+
+
+ 0.00
+
+
+ 0.00
+
+
+
+
+ Total
+
+
+ {OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce(
+ (sum, item) => sum + (item.WithoutTaxRate || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+
+
+ {OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce(
+ (sum, item) => sum + (item.CGST || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+
+
+ {OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce(
+ (sum, item) => sum + (item.SGST || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+
+ {OrderDetailGST && OrderDetailGST.length > 0
+ ? Number(
+ OrderDetailGST.reduce(
+ (sum, item) =>
+ sum +
+ (item.CGST || 0) +
+ (item.SGST || 0) +
+ (item.WithoutTaxRate || 0),
+ 0
+ )
+ ).toLocaleString('en-IN', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ : '0.00'}
+
+
+
+ )}
+
+ {/* Bank Details and Signature */}
+
+ Tax Amount (in words): INR{' '}
+ {numberToWords(
+ Math.floor(
+ invoiceData.taxAmount ||
+ OrderDetailGST?.reduce(
+ (sum, item) =>
+ sum + (item.CGST || 0) + (item.SGST || 0),
+ 0
+ ) ||
+ 0
+ )
+ )}{' '}
+ Only
+
+
+ {/* Declaration */}
+
- );
- }
+ )}
+
+
+
+ {/* Signature Section */}
+
+
+
+ Declaration
+
+
+ We declare that this invoice shows the actual price of the
+ goods described and that all particulars are true and
+ correct.
+
+
+ {/* Bank Details */}
+
+
+
+
+ Company's Bank Details
+
+
+
+ A/c Holder's Name:
+ {' '}
+ {invoiceData.companyName}
+
+
+ Bank Name:{' '}
+ {invoiceData.bankDetails?.BankName || ''}
+
+
+ A/c No.:{' '}
+ {invoiceData.bankDetails?.AccountNo || ''}
+
+
+
+ Branch & IFS Code:
+ {' '}
+ {invoiceData.bankDetails?.BankBranch || ''} &{' '}
+ {invoiceData.bankDetails?.IFSCCode || ''}
+
+ {invoiceData.bankDetails?.SWIFTCode && (
+
+ SWIFT Code:{' '}
+ {invoiceData.bankDetails?.SWIFTCode || ''}
+
)}
- {/* Tax summary - Only on last page */}
-
- {/* Footer content - Only on last page */}
- {isLastPage && (
- <>
- {/* Amount in Words */}
-
-
-
-
- {/* Tax Breakdown Table */}
- {OrderDetailIGST && OrderDetailIGST.length > 0 &&
-
- Amount Chargeable (in words)
- INR {numberToWords(Math.floor(invoiceData.grandTotal))} Only
- E. & O.E
-
-
- {/* Tax Table Header - Main Headers */}
-
}
-
- {/* Tax Amount in Words */}
- {OrderDetailIGST && OrderDetailIGST.length > 0 &&
-
-
- {/* Tax Table Sub-Headers */}
- HSN/SAC
- Taxable Value
- CGST
- SGST/UTGST
- Tax Amount
-
-
-
-
-
- {/* Tax Table Rows - Dynamic from OrderDetailGST */}
- {OrderDetailGST && OrderDetailGST.length > 0 ? (
- OrderDetailGST?.map((taxItem, index) => (
- Rate
- Amount
- Rate
- Amount
-
-
-
- ))
- ) : (
- // Show 0 values when no GST data
- {taxItem.HSN || ''}
- {Number(taxItem.WithoutTaxRate || 0).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
- {taxItem.TaxPercentage ? (taxItem.TaxPercentage / 2) + '%' : '0%'}
- {Number(taxItem.CGST || 0).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
- {taxItem.TaxPercentage ? (taxItem.TaxPercentage / 2) + '%' : '0%'}
- {Number(taxItem.SGST || 0).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
- {Number((taxItem.CGST || 0) + (taxItem.SGST || 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
-
-
- )}
-
- {/* Tax Table Total */}
- -
- 0.00
- 0%
- 0.00
- 0%
- 0.00
- 0.00
-
-
- Total
-
- {OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.WithoutTaxRate || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"
- }
-
-
-
- {OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.CGST || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"
- }
-
-
-
- {OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.SGST || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"
- }
-
-
- {OrderDetailGST && OrderDetailGST.length > 0
- ? Number(OrderDetailGST.reduce((sum, item) => sum + (item.CGST || 0) + (item.SGST || 0) + (item.WithoutTaxRate || 0), 0)).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
- : "0.00"
- }
-
-
-
}
-
- {/* Bank Details and Signature */}
-
- Tax Amount (in words): INR {numberToWords(Math.floor(invoiceData.taxAmount || (OrderDetailGST?.reduce((sum, item) => sum + (item.CGST || 0) + (item.SGST || 0), 0) || 0)))} Only
-
-
- {/* Declaration */}
-
- )}
+
-
-
-
- {/* Signature Section */}
-
-
- Declaration
- We declare that this invoice shows the actual price of the goods described and that all particulars are true and correct.
-
- {/* Bank Details */}
-
+
-
- Company's Bank Details
- A/c Holder's Name: {invoiceData.companyName}
- Bank Name: {invoiceData.bankDetails?.BankName || ""}
- A/c No.: {invoiceData.bankDetails?.AccountNo || ""}
- Branch & IFS Code: {invoiceData.bankDetails?.BankBranch || ""} & {invoiceData.bankDetails?.IFSCCode || ""}
- {invoiceData.bankDetails?.SWIFTCode && SWIFT Code: {invoiceData.bankDetails?.SWIFTCode || ""}
}
-
-
-
- {/* Footer - Only on last page */}
- {isLastPage && (
- for {invoiceData.companyName}
-
-
-
- )}
-
-
-
-
- {/*
+ DD
+
+
-
+ for {invoiceData.companyName}
+
+
+
-
+
-
+ {/*
- DD
TECHNOLOGIES
ELECTRONICS
*/}
- Authorised Signatory
-
-
+ This is a Computer Generated Invoice
+
+ Authorised Signatory
+
+
+ )}
+
+ );
+ }
};
export default DCInvicePrint;
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle1.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle1.jsx
index b0f451b..e7dca4e 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle1.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle1.jsx
@@ -1,9 +1,9 @@
-import React from "react";
-import { useDispatch, useSelector } from "react-redux";
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
import {
extractLastNumber,
extractLastNumberOrderId,
-} from "../../../../Services/Others";
+} from '../../../../Services/Others';
import {
GlobalprintSlNo,
GlobalprintItem,
@@ -23,33 +23,52 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
-} from "../../../../Features/ThemeChange/ThemeChange";
-import "../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.scss";
-import QRCode from "react-qr-code";
-import { GlobalUpiIDprint } from "../../../../Features/BookingScreen/BookingData/BookingData";
-import signature from "../../../../Images/signatureimage.jpg"
-import { ApplicationPreferences } from "../../../../Features/BrachLogin/BranchLogin";
-import { isMobile } from "react-device-detect";
-const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedNetAmountColor,
+ GlobalSelectedNetAmountFontColor,
+} from '../../../../Features/ThemeChange/ThemeChange';
+import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.scss';
+import QRCode from 'react-qr-code';
+import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
+import signature from '../../../../Images/signatureimage.jpg';
+import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin';
+import { isMobile } from 'react-device-detect';
+const DCPrintStyle1 = ({
+ BranchName,
+ BranchDetails,
+ BranchAddress,
BranchCity,
- BranchZip, Date1,
- table2Data, PaymentStatus, PrintGreeting, printDatas, DCPrintTemplateDtl }) => {
-
+ BranchZip,
+ Date1,
+ table2Data,
+ PaymentStatus,
+ PrintGreeting,
+ printDatas,
+ DCPrintTemplateDtl,
+}) => {
const dispatch = useDispatch();
let FieldDetails = DCPrintTemplateDtl?.FieldDetails?.reduce((acc, item) => {
acc[item.ConfigName] = true;
return acc;
}, {});
- const SLNO = FieldDetails?.["Sl.No"];
- const Item = FieldDetails?.["Item"];
- console.log(Item, "Item")
- const MRP = FieldDetails?.["MRP"];
- const Discount = FieldDetails?.["Discount"];
- const Quantity = FieldDetails?.["Quantity"];
- const Rate = FieldDetails?.["Rate"];
- const Amount = FieldDetails?.["Amount"];
- const HsnCode = FieldDetails?.["HsnCode"];
- const Qrcodet = FieldDetails?.["Qrcode"];
+ const SLNO = FieldDetails?.['Sl.No'];
+ const Item = FieldDetails?.['Item'];
+ console.log(Item, 'Item');
+ const MRP = FieldDetails?.['MRP'];
+ const Discount = FieldDetails?.['Discount'];
+ const Quantity = FieldDetails?.['Quantity'];
+ const Rate = FieldDetails?.['Rate'];
+ const Amount = FieldDetails?.['Amount'];
+ const HsnCode = FieldDetails?.['HsnCode'];
+ const Qrcodet = FieldDetails?.['Qrcode'];
const GlobalSlNo = useSelector(GlobalprintSlNo);
const GlobalItem = useSelector(GlobalprintItem);
const GlobalMRP = useSelector(GlobalprintMRP);
@@ -64,20 +83,51 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
const GlobalSignatureImages = useSelector(GlobalSignatureImage);
const GlobalIsnotes = useSelector(Globalnotes);
- const GlobalthemeFormatr = useSelector(GlobalthemeFormat)
- const GlobalBilltext = useSelector(GlobalBillName)
+ const GlobalthemeFormatr = useSelector(GlobalthemeFormat);
+ const GlobalBilltext = useSelector(GlobalBillName);
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+ const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
+ const SelectedNetAmountFontColor = useSelector(
+ GlobalSelectedNetAmountFontColor
+ );
const keysLength = Object.keys(table2Data ?? {}).length;
- console.log(GlobalDiscount, Discount, "Discount");
- console.log(printDatas, "GlobalthemeFormatr");
- let TermsAndConditions = DCPrintTemplateDtl?.TermsandConditions
- let SignatureImg = DCPrintTemplateDtl?.Signature
- let Notestext = DCPrintTemplateDtl?.Notes
- let BillName = DCPrintTemplateDtl?.PrintHdrName
- let FormatTheme = DCPrintTemplateDtl?.PrintType == "S" ? true : false
- let PageSize = DCPrintTemplateDtl?.PageSize
- const Signature = FieldDetails?.["signature"];
- const TermsnAdCondition = FieldDetails?.["terms&conditions"];
+ let TermsAndConditions = DCPrintTemplateDtl?.TermsandConditions;
+ let SignatureImg = DCPrintTemplateDtl?.Signature;
+ let Notestext = DCPrintTemplateDtl?.Notes;
+ let BillName = DCPrintTemplateDtl?.PrintHdrName;
+ let FormatTheme = DCPrintTemplateDtl?.PrintType == 'S' ? true : false;
+ let PageSize = DCPrintTemplateDtl?.PageSize;
+ const Signature = FieldDetails?.['signature'];
+ const TermsnAdCondition = FieldDetails?.['terms&conditions'];
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+ const netAmtColor = printColors?.find((obj) => obj.netAmtColor)?.netAmtColor;
const formatDate = (dateString = '') => {
const date = new Date(dateString);
@@ -99,26 +149,26 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
const month = months[date.getMonth()];
const year = date.getFullYear();
return day && month && year ? `${day}-${month}-${year}` : '-';
- }
+ };
if (keysLength > 0) {
dispatch(changeReprintDataFound(true));
}
const currentDate = new Date();
- const day = currentDate.getDate().toString().padStart(2, "0");
+ const day = currentDate.getDate().toString().padStart(2, '0');
const monthNames = [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec",
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec',
];
const monthIndex = currentDate.getMonth();
const year = currentDate.getFullYear().toString().slice(-2);
@@ -132,74 +182,73 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
0
);
-
const products = [
{
- ProdName: "ITEM 1",
+ ProdName: 'ITEM 1',
Rate: 88.0,
SalesQty: 2,
MRP: 100,
TotalAmt: 176,
discount: 0,
- HSN: "01",
+ HSN: '01',
},
{
- ProdName: "ITEM 2",
+ ProdName: 'ITEM 2',
Rate: 300.0,
SalesQty: 1,
MRP: 350,
TotalAmt: 300,
discount: 0,
- HSN: "02",
+ HSN: '02',
},
{
- ProdName: "ITEM 3",
+ ProdName: 'ITEM 3',
Rate: 200.0,
SalesQty: 1,
MRP: 250,
TotalAmt: 200,
discount: 0,
- HSN: "03",
+ HSN: '03',
},
{
- ProdName: "ITEM 4",
+ ProdName: 'ITEM 4',
Rate: 30.0,
SalesQty: 1,
MRP: 50,
TotalAmt: 30,
discount: 0,
- HSN: "04",
+ HSN: '04',
},
{
- ProdName: "ITEM 5",
+ ProdName: 'ITEM 5',
Rate: 30.0,
SalesQty: 1,
MRP: 50,
TotalAmt: 30,
discount: 0,
- HSN: "05",
+ HSN: '05',
},
{
- ProdName: "ITEM 6",
+ ProdName: 'ITEM 6',
Rate: 130.0,
SalesQty: 1,
MRP: 150,
TotalAmt: 130,
discount: 0,
- HSN: "06",
+ HSN: '06',
},
{
- ProdName: "ITEM 7",
+ ProdName: 'ITEM 7',
Rate: 230.0,
SalesQty: 1,
MRP: 250,
TotalAmt: 230,
discount: 0,
- HSN: "08",
+ HSN: '08',
},
];
- const chunkSize = PageSize == "A5" ? 9 : 13;
+ const chunkSize = PageSize == 'A5' ? 9 : 13;
let dataSource = table2Data?.ProductDetails || [];
@@ -208,185 +257,346 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
for (let i = 0; i < dataSource.length; i += chunkSize) {
paginatedChunks.push(dataSource.slice(i, i + chunkSize));
}
- const lastChunkRows = paginatedChunks.length > 0 ? paginatedChunks[paginatedChunks.length - 1].length : 0;
- const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == "A5" ? 5 : 10);
+ const lastChunkRows =
+ paginatedChunks.length > 0
+ ? paginatedChunks[paginatedChunks.length - 1].length
+ : 0;
+ const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10);
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+ const netAmountStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedNetAmountColor
+ : netAmtColor?.background,
+
+ color: GlobaldummyData ? SelectedNetAmountFontColor : netAmtColor?.font,
+ };
return (
-
-
<>
This is a Computer Generated Invoice
+
{paginatedChunks.map((dataChunk, chunkIndex) => (
-
0 ? ' print-page-break' : ''}`} style={{ display: "flex", flexDirection: "column", height: FormatTheme ? PageSize == "A5" ? '170mm' : "257mm" : "", }} key={chunkIndex}>
-
-
+
0 ? ' print-page-break' : ''}`}
+ style={{
+ display: 'flex',
+ flexDirection: 'column',
+ height: FormatTheme ? (PageSize == 'A5' ? '170mm' : '257mm') : '',
+ }}
+ key={chunkIndex}
+ >
{/*
*/}
-
-
+
+
- {" "}
- {GlobaldummyData ? "XYZ Shop" : BranchName}
+ {' '}
+ {GlobaldummyData ? 'XYZ Shop' : BranchName}
-
+
-
{GlobaldummyData
- ? "BranchAddress, Town- 635XXX City - State"
- : (BranchAddress || "") +
- (BranchCity
- ? (BranchAddress && BranchCity ? "-" : "") + BranchCity
- : "") +
- (BranchZip
- ? (BranchCity &&
- BranchZip
- ? "-"
- : "") + BranchZip
- : "")}
+ ? 'BranchAddress, Town- 635XXX City - State'
+ : (BranchAddress || '') +
+ (BranchCity
+ ? (BranchAddress && BranchCity ? '-' : '') + BranchCity
+ : '') +
+ (BranchZip
+ ? (BranchCity && BranchZip ? '-' : '') + BranchZip
+ : '')}
- {BranchDetails?.BrGSTIN && GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : BranchDetails?.BrGSTIN}, CIN :u00045hhsgbubufsdug
}
- {BranchDetails?.BrMobile &&
-
- {" "}
- Mobile : +91 {GlobaldummyData ? "986XXXXXXX" : BranchDetails?.BrMobile}
+ {BranchDetails?.BrGSTIN && (
+
- {table2Data?.ToBranchDtl?.length > 0 && <>
-
+ GST NO :
+ {GlobaldummyData
+ ? '334bhbsagbysfgbfgbu'
+ : BranchDetails?.BrGSTIN}
+ , CIN :u00045hhsgbubufsdug
- }
+ )}
+ {BranchDetails?.BrMobile && (
+
+ {' '}
+ Mobile : +91{' '}
+ {GlobaldummyData ? '986XXXXXXX' : BranchDetails?.BrMobile}
+
+ )}
-
-
{GlobaldummyData ? 'Cash Bill' : BillName ? BillName : "Delivery Challan"}
-
+
+ {GlobaldummyData
+ ? 'Cash Bill'
+ : BillName
+ ? BillName
+ : 'Delivery Challan'}{' '}
+
-
-
{/* orderdetails */} - {(((GlobaldummyData - ? "121" - : table2Data?.DCNo) || (GlobaldummyData ? formattedDate : Date1)) && table2Data?.dispatchPrint !== true) &&
Delivery To :
-
-
+
- }
+
+ )}
{table2Data?.ToBranchDtl?.[0]?.BranchName}
- {table2Data?.ToBranchDtl?.[0]?.Address1 && {table2Data?.ToBranchDtl?.[0]?.Address1}
}
- {(table2Data?.ToBranchDtl?.[0]?.City || table2Data?.ToBranchDtl?.[0]?.Dist || table2Data?.ToBranchDtl?.[0]?.Zip) && {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
}
- {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
}
+ {table2Data?.ToBranchDtl?.length > 0 && (
+ <>
+ +
+
-
+ Delivery To :
+
+
+
+ {table2Data?.ToBranchDtl?.[0]?.BranchName}
+
+ {table2Data?.ToBranchDtl?.[0]?.Address1 && (
+
+ {table2Data?.ToBranchDtl?.[0]?.Address1}
+
+ )}
+ {(table2Data?.ToBranchDtl?.[0]?.City ||
+ table2Data?.ToBranchDtl?.[0]?.Dist ||
+ table2Data?.ToBranchDtl?.[0]?.Zip) && (
+ {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
+ )}
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && (
+
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
+
+ )}
+ {/* orderdetails */} - {(((GlobaldummyData - ? "121" - : table2Data?.DCNo) || (GlobaldummyData ? formattedDate : Date1)) && table2Data?.dispatchPrint !== true) &&
-
+ {((GlobaldummyData ? '121' : table2Data?.DCNo) ||
+ (GlobaldummyData ? formattedDate : Date1)) &&
+ table2Data?.dispatchPrint !== true && (
+
+
+
-
+ {' '}
+ Delivery ChallanNo:
+ {GlobaldummyData ? '121' : table2Data?.DCNo}
+
+
- {" "}
- Delivery ChallanNo:
- {GlobaldummyData
- ? "121"
- : table2Data?.DCNo}
+
+ )}
-
+
+ {' '}
+ Date : {GlobaldummyData ? formattedDate : Date1}{' '}
+
-
- {" "}
- Date : {GlobaldummyData ? formattedDate : Date1}{" "}
+ {table2Data?.dispatchPrint === true &&
+ (table2Data?.RequestId ||
+ formatDate(table2Data?.CreatedDate)) && (
+
}
-
- {(table2Data?.dispatchPrint === true && ((table2Data?.RequestId) || (formatDate(table2Data?.CreatedDate)))) &&
+
-
+
+
+
+ {' '}
+ Ref No #:
+ {table2Data?.RequestId}
+
+
+
+ {' '}
+ Dispatched Date :{' '}
+ {formatDate(table2Data?.CreatedDate)}{' '}
+
-
-
- {(table2Data?.CustMobile || table2Data?.CustName || table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) && + {(table2Data?.CustMobile || + table2Data?.CustName || + table2Data?.VehicleNo || + table2Data?.TransporterId || + table2Data?.TransporterName) && ( <>
- } + )} {/* itemdata (loop) */} -
-
- {" "}
- Ref No #:
- {table2Data?.RequestId}
+ )}
+ {table2Data?.dispatchPrint === true && table2Data?.DispatchId && (
+
}
- {((table2Data?.dispatchPrint === true && table2Data?.DispatchId)) &&
+
-
-
+
+ {' '}
+ Dispatch No #:
+ {table2Data?.DispatchId}
+
-
-
- {" "}
- Dispatched Date : {formatDate(table2Data?.CreatedDate)}{" "}
-
-
-
}
+ )}
{/* orderdetails */}
-
-
- {" "}
- Dispatch No #:
- {table2Data?.DispatchId}
-
- - {(table2Data?.CustMobile || table2Data?.CustName || table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) && + {(table2Data?.CustMobile || + table2Data?.CustName || + table2Data?.VehicleNo || + table2Data?.TransporterId || + table2Data?.TransporterName) && ( <>
- {(table2Data?.CustMobile || table2Data?.CustName) &&
+ {(table2Data?.CustMobile || table2Data?.CustName) && (
-
- }
- {(table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) &&
+ )}
+ {(table2Data?.VehicleNo ||
+ table2Data?.TransporterId ||
+ table2Data?.TransporterName) && (
Delivery Details
- {table2Data?.CustMobile && Mobile NO :{table2Data?.CustMobile}
}
- {table2Data?.CustName && Name:{table2Data?.CustName}
}
+
+ Delivery Details
+
+ {table2Data?.CustMobile && (
+
+ {' '}
+ Mobile NO :{table2Data?.CustMobile}{' '}
+
+ )}
+ {table2Data?.CustName && (
+
+ {' '}
+ Name:{table2Data?.CustName}
+
+ )}
-
- }
+ )}
Vehicle Details
- {table2Data?.VehicleNo && Vehicle No :{table2Data?.VehicleNo}
}
- {table2Data?.TransporterId && Transporter Id :{table2Data?.TransporterId}
}
- {table2Data?.TransporterName && Transporter Name :{table2Data?.TransporterName}
}
+
+ Vehicle Details
+
+ {table2Data?.VehicleNo && (
+
+ {' '}
+ Vehicle No :{table2Data?.VehicleNo}
+
+ )}
+ {table2Data?.TransporterId && (
+
+ {' '}
+ Transporter Id :{table2Data?.TransporterId}
+
+ )}
+ {table2Data?.TransporterName && (
+
+ {' '}
+ Transporter Name :{table2Data?.TransporterName}
+
+ )}
- } + )} {/* itemdata (loop) */} -
-
+
{(table2Data?.ProductDetails?.length > 0 || GlobaldummyData) && (
<>
-
-
-
@@ -521,97 +750,212 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
)}
{/* itemdata */}
-
-
-
- {((chunkIndex === paginatedChunks.length - 1)) &&
-
+ {chunkIndex === paginatedChunks.length - 1 && (
<>
| S.No | - : SLNO == true &&S.No | } + ? GlobalSlNo && ( ++ S.No + | + ) + : SLNO == true && ( ++ S.No + | + )} {GlobaldummyData ? GlobalItem &&Item | - : Item == true &&Item | } + : Item == true && ( +Item | + )} {/* {GlobaldummyData ? GlobalHsnCode &&HSN | : HsnCode == true && (HSN | )} */} {GlobaldummyData - ? GlobalQuantity &&Qty | + ? GlobalQuantity && ( +Qty | + ) : Quantity == true && ( -Qty | - )} ++ Qty + | + )} {/* {GlobaldummyData ? GlobalMRP &&MRP | : MRP == true &&MRP | } @@ -414,38 +624,58 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + {dataChunk?.map((item, index) => ( + | ||||||||||||||
| {index + 1} | ) - : SLNO == true && ( -+ : SLNO == true && ( + | {chunkIndex * chunkSize + index + 1} | )} - {GlobaldummyData - ? GlobalItem &&{item?.ProdName} | - : Item == true && ( + {GlobaldummyData + ? GlobalItem &&{item?.ProdName} | + : Item == true && (
{item?.ProdName}
- {!(item?.ProdVariantName || item?.RequestVariantName)?.toLowerCase()?.includes(
- 'variant'
- ) && Variant:{item?.ProdVariantName || item?.RequestVariantName} }
- {" "}
-
+ {!(
+ item?.ProdVariantName ||
+ item?.RequestVariantName
+ )
+ ?.toLowerCase()
+ ?.includes('variant') && (
+
+ Variant:
+ {item?.ProdVariantName ||
+ item?.RequestVariantName}{' '}
+
+ )}
+
|
)}
- {/* {GlobaldummyData
+ {/* {GlobaldummyData
? GlobalHsnCode && (
{item?.HSN} @@ -456,18 +686,18 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress, {item?.HSN} | )} */} - {GlobaldummyData - ? GlobalQuantity && ( -+ {GlobaldummyData + ? GlobalQuantity && ( + | {item?.SalesQty} | ) - : Quantity == true && ( -+ : Quantity == true && ( + | {item?.Qty || item?.DispatchedQty} | )} - {/* {GlobaldummyData + {/* {GlobaldummyData ? GlobalMRP && ({item?.MRP} @@ -511,9 +741,8 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress, | )} */} -
-
{/* {ExtraChargeTotal > 0 &&
-
-
- Extra Charges:{ExtraChargeTotal}
} */} - - - -
- {GlobaldummyData ? GlobalIsnotes &&
- (
-
);
};
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle10.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle10.jsx
index f4389c8..9a5ddfb 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle10.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle10.jsx
@@ -23,6 +23,15 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
} from '../../../../Features/ThemeChange/ThemeChange';
import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.scss';
@@ -304,6 +313,72 @@ const DCPrintStyle10 = ({
const shouldFooterBeOnNewPage =
lastChunkRows > (!isMobile ? 15 : PageSize == 'A5' ? 5 : 10);
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
{FormatTheme ? (
@@ -353,7 +428,7 @@ const DCPrintStyle10 = ({
width: '100%',
}}
>
-
-
+
+ )}
+ Notes : 10 days Return policy
+ {GlobaldummyData + ? GlobalIsnotes && ( +
+
-
) :
- Notestext && (+ Notes : 10 days Return policy +
--
-
+
+ )
+ : Notestext && (
+ {Notestext}
++
+
-
)
- }
+ + {Notestext} +
--
+
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
))}
-
-
-
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not exchangeable + or refundable. + +
- + Please check the product before leaving the + counter. + +
+
+ )}
- + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
- {PrintGreeting?.SettingValue === "Y" && (
+ {PrintGreeting?.SettingValue === 'Y' && (
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
-
- {GlobaldummyData ? GlobalSignature && (- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
-
) : Signature == true && (Signature
-
-
-
)}
-
+ {GlobaldummyData
+ ? GlobalSignature && (
+ Signature
-
+
+
+ )
+ : Signature == true && (
+ + Signature +
+
+
+
+ )}
+ Signature +
+
Thank You Visit Again
@@ -619,16 +963,10 @@ const DCPrintStyle1 = ({ BranchName, BranchDetails, BranchAddress,
)}
-
- }
-
+ )}
+
{GlobaldummyData
? GlobalSlNo && (
- S.N
+
+ S.N
+
)
- : SLNO && S.N }
+ : SLNO && (
+
+ S.N
+
+ )}
{GlobaldummyData
? GlobalItem && (
- Item
+
+ Item
+
)
- : Item && Item }
+ : Item && (
+
+ Item
+
+ )}
{GlobaldummyData
? GlobalQuantity && (
Qty
)
: Quantity && (
Qty
)}
- {/* {GlobaldummyData ? GlobalHsnCode && HSN : HsnCode && HSN }
- {GlobaldummyData ? GlobalMRP && MRP : MRP && MRP }
- {GlobaldummyData ? GlobalDiscount && Dis : Discount && Dis }
- {GlobaldummyData ? GlobalRate && Rate : Rate && Rate }
- {GlobaldummyData ? GlobalAmount && Amt : Amount && Amt } */}
{dataChunk?.map((item, index) => {
return (
-
+
{GlobaldummyData
? GlobalSlNo && (
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle11.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle11.jsx
index b7c9ce6..10ded40 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle11.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle11.jsx
@@ -25,6 +25,15 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedTableBodyFontColor,
} from '../../../../Features/ThemeChange/ThemeChange';
import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.scss';
@@ -287,6 +296,72 @@ const DCPrintStyle11 = ({
: 0;
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10);
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
{FormatTheme ? (
@@ -331,6 +406,7 @@ const DCPrintStyle11 = ({
padding: 0,
fontWeight: 600,
textAlign: 'center',
+ ...headerStyle,
}}
>
{dataChunk?.map((item, index) => {
return (
-
+
{GlobaldummyData
? GlobalSlNo && {index + 1}
: SLNO && (
@@ -695,11 +808,6 @@ const DCPrintStyle11 = ({
{item?.Qty || item?.DispatchedQty}
)}
- {/* {GlobaldummyData ? GlobalHsnCode && {item?.HSN} : HsnCode && {item?.HSN} }
- {GlobaldummyData ? GlobalMRP && {item?.MRP} : MRP && {item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} }
- {GlobaldummyData ? GlobalDiscount && {item.discount} : Discount && {item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0} }
- {GlobaldummyData ? GlobalRate && {item?.Rate} : Rate && {item?.Rate} }
- {GlobaldummyData ? GlobalAmount && {item?.TotalAmt} : Amount && {item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} } */}
);
})}
@@ -751,6 +859,7 @@ const DCPrintStyle11 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle12.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle12.jsx
index 84d0a69..0ec42e5 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle12.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle12.jsx
@@ -26,6 +26,15 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
} from '../../../../Features/ThemeChange/ThemeChange';
import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.scss';
@@ -433,6 +442,72 @@ const DCPrintstyle12 = ({
await printDiv('DCPrintStyle12', style12, 'FontApply');
};
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
{FormatTheme ? (
@@ -483,7 +558,10 @@ const DCPrintstyle12 = ({
width: '100%',
}}
>
-
{GlobaldummyData
@@ -360,7 +437,7 @@ const DCPrintStyle11 = ({
width: '100%',
}}
>
-
+
{base64Image ? (
![]()
{GlobaldummyData
? GlobalSlNo && (
- S.No
+
+ S.No
+
)
- : SLNO && S.No }
+ : SLNO && (
+
+ S.No
+
+ )}
{GlobaldummyData
? GlobalItem && (
- Item
+
+ Item
+
)
- : Item && Item }
+ : Item && (
+
+ Item
+
+ )}
{GlobaldummyData
? GlobalQuantity && (
Qty
)
: Quantity && (
Qty
)}
- {/* {GlobaldummyData ? GlobalHsnCode && HSN : HsnCode && HSN }
- {GlobaldummyData ? GlobalMRP && MRP : MRP && MRP }
- {GlobaldummyData ? GlobalDiscount && Dis : Discount && Dis }
- {GlobaldummyData ? GlobalRate && Rate : Rate && Rate }
- {GlobaldummyData ? GlobalAmount && Amt : Amount && Amt } */}
+
{GlobaldummyData
- ? GlobalSlNo && S.No
- : SLNO && S.No }
+ ? GlobalSlNo && (
+ S.No
+ )
+ : SLNO && (
+ S.No
+ )}
{GlobaldummyData
- ? GlobalItem && Description
- : Item && Des }
+ ? GlobalItem && (
+
+ Description
+
+ )
+ : Item && (
+ Des
+ )}
{GlobaldummyData
? GlobalQuantity && (
- Qty
+
+ Qty
+
)
: Quantity && (
- Qty
+
+ Qty
+
)}
- {/* {GlobaldummyData ? GlobalMRP && MRP : MRP && MRP }
- {GlobaldummyData ? GlobalRate && Rate : Rate && Rate }
- {GlobaldummyData ? GlobalHsnCode && HSN : HsnCode && HSN }
- {GlobaldummyData ? GlobalDiscount && (%) : Discount && (%) }
- {GlobaldummyData ? GlobalAmount && Amt : Amount && Amt } */}
{dataChunk?.map((item, index) => {
return (
-
+
{GlobaldummyData
? GlobalSlNo && (
@@ -841,11 +951,6 @@ const DCPrintstyle12 = ({
{item?.Qty || item?.DispatchedQty}
)}
- {/* {GlobaldummyData ? GlobalMRP && {item?.MRP} : MRP && {item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} }
- {GlobaldummyData ? GlobalRate && {item?.Rate} : Rate && {item?.Rate} }
- {GlobaldummyData ? GlobalHsnCode && {item?.HSN} : HsnCode && {item?.HSN} }
- {GlobaldummyData ? GlobalDiscount && {item?.discount} : Discount && {item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0} }
- {GlobaldummyData ? GlobalAmount && {item?.TotalAmt} : Amount && {item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} } */}
);
})}
@@ -898,6 +1003,7 @@ const DCPrintstyle12 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle2.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle2.jsx
index e75c9c4..e3a3c1d 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle2.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle2.jsx
@@ -1,383 +1,912 @@
-import React from "react";
-import { useDispatch, useSelector } from "react-redux";
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
import {
- GlobalprintSlNo,
- GlobalprintItem,
- GlobalprintMRP,
- GlobalprintDiscount,
- GlobalprintQuantity,
- GlobalprintRate,
- GlobalprintAmount,
- GlobalprintHsnCode,
- GlobalprintQrcodet,
- GlobalPritdummyData,
- changeReprintDataFound,
- GloabalFieldDetails,
- GlobalprintSignature,
- GlobalprinttermsAndConditions,
- GlobalSignatureImage,
- Globalnotes,
- GlobalthemeFormat,
- GlobalBillName,
-} from "../../../../Features/ThemeChange/ThemeChange";
+ GlobalprintSlNo,
+ GlobalprintItem,
+ GlobalprintMRP,
+ GlobalprintDiscount,
+ GlobalprintQuantity,
+ GlobalprintRate,
+ GlobalprintAmount,
+ GlobalprintHsnCode,
+ GlobalprintQrcodet,
+ GlobalPritdummyData,
+ changeReprintDataFound,
+ GloabalFieldDetails,
+ GlobalprintSignature,
+ GlobalprinttermsAndConditions,
+ GlobalSignatureImage,
+ Globalnotes,
+ GlobalthemeFormat,
+ GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedFooterColor,
+ GlobalSelectedNetAmountColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalRowType,
+} from '../../../../Features/ThemeChange/ThemeChange';
+import signature from '../../../../Images/signatureimage.jpg';
+import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.scss';
+import { isMobile } from 'react-device-detect';
+const DCPrintstyle2 = ({
+ BranchName,
+ BranchDetails,
+ BranchAddress,
+ BranchCity,
+ BranchZip,
+ Date1,
+ table2Data,
+ PaymentStatus,
+ PrintGreeting,
+ base64Image,
+ DCPrintTemplateDtl,
+}) => {
+ const dispatch = useDispatch();
+ let FieldDetails = DCPrintTemplateDtl?.FieldDetails?.reduce((acc, item) => {
+ acc[item.ConfigName] = true;
+ return acc;
+ }, {});
-import signature from "../../../../Images/signatureimage.jpg"
-import "../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.scss";
-import { isMobile } from "react-device-detect";
-const DCPrintstyle2 = ({ BranchName, BranchDetails, BranchAddress,
- BranchCity,
- BranchZip, Date1,
- table2Data, PaymentStatus, PrintGreeting, base64Image, DCPrintTemplateDtl }) => {
-
- const dispatch = useDispatch();
- let FieldDetails = DCPrintTemplateDtl?.FieldDetails?.reduce((acc, item) => {
- acc[item.ConfigName] = true;
- return acc;
- }, {});
-
- const formatDate = (dateString = '') => {
- const date = new Date(dateString);
- const day = date.getDate().toString().padStart(2, '0');
- const months = [
- 'Jan',
- 'Feb',
- 'Mar',
- 'Apr',
- 'May',
- 'Jun',
- 'Jul',
- 'Aug',
- 'Sep',
- 'Oct',
- 'Nov',
- 'Dec',
- ];
- const month = months[date.getMonth()];
- const year = date.getFullYear();
- return day && month && year ? `${day}-${month}-${year}` : '-';
- }
-
-
- console.log(FieldDetails, "FieldDetails")
- const SLNO = FieldDetails?.["Sl.No"];
- const Item = FieldDetails?.["Item"];
- console.log(Item, "Item")
- const MRP = FieldDetails?.["MRP"];
- const Discount = FieldDetails?.["Discount"];
- const Quantity = FieldDetails?.["Quantity"];
- const Rate = FieldDetails?.["Rate"];
- const Amount = FieldDetails?.["Amount"];
- const HsnCode = FieldDetails?.["HsnCode"];
- const Qrcodet = FieldDetails?.["Qrcode"];
- const GlobalSlNo = useSelector(GlobalprintSlNo);
- const GlobalItem = useSelector(GlobalprintItem);
- const GlobalMRP = useSelector(GlobalprintMRP);
- const GlobalDiscount = useSelector(GlobalprintDiscount);
- const GlobalQuantity = useSelector(GlobalprintQuantity);
- const GlobalRate = useSelector(GlobalprintRate);
- const GlobalAmount = useSelector(GlobalprintAmount);
- const GlobalHsnCode = useSelector(GlobalprintHsnCode);
- const GlobalQrcodet = useSelector(GlobalprintQrcodet);
- const GlobaldummyData = useSelector(GlobalPritdummyData);
- const GlobalSignature = useSelector(GlobalprintSignature);
- const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
- const GlobalSignatureImages = useSelector(GlobalSignatureImage);
- const GlobalIsnotes = useSelector(Globalnotes);
- const GlobalthemeFormatr = useSelector(GlobalthemeFormat)
- const GlobalBilltext = useSelector(GlobalBillName)
-
- let TermsAndConditions = DCPrintTemplateDtl?.TermsandConditions
- let SignatureImg = DCPrintTemplateDtl?.Signature
- let Notestext = DCPrintTemplateDtl?.Notes
- let BillName = DCPrintTemplateDtl?.PrintHdrName
- let FormatTheme = DCPrintTemplateDtl?.PrintType == "S" ? true : false
- let PageSize = DCPrintTemplateDtl?.PageSize
- const Signature = FieldDetails?.["signature"];
- const TermsnAdCondition = FieldDetails?.["terms&conditions"];
- console.log(Signature, TermsnAdCondition, TermsAndConditions, SignatureImg, "FormatTheme");
-
-
- let PaymentStatusSuccess = PaymentStatus?.filter(ps => ps.PaymentStatus === "S")
- const keysLength = Object.keys(table2Data ?? {}).length;
- if (keysLength > 0) {
- dispatch(changeReprintDataFound(true));
- }
- const currentDate = new Date();
- const day = currentDate.getDate().toString().padStart(2, "0");
- const monthNames = [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec",
+ const formatDate = (dateString = '') => {
+ const date = new Date(dateString);
+ const day = date.getDate().toString().padStart(2, '0');
+ const months = [
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec',
];
- const monthIndex = currentDate.getMonth();
- const year = currentDate.getFullYear().toString().slice(-2);
+ const month = months[date.getMonth()];
+ const year = date.getFullYear();
+ return day && month && year ? `${day}-${month}-${year}` : '-';
+ };
- const formattedDate = `${day}-${monthNames[monthIndex]}-${year}`;
+ console.log(FieldDetails, 'FieldDetails');
+ const SLNO = FieldDetails?.['Sl.No'];
+ const Item = FieldDetails?.['Item'];
+ console.log(Item, 'Item');
+ const MRP = FieldDetails?.['MRP'];
+ const Discount = FieldDetails?.['Discount'];
+ const Quantity = FieldDetails?.['Quantity'];
+ const Rate = FieldDetails?.['Rate'];
+ const Amount = FieldDetails?.['Amount'];
+ const HsnCode = FieldDetails?.['HsnCode'];
+ const Qrcodet = FieldDetails?.['Qrcode'];
+ const GlobalSlNo = useSelector(GlobalprintSlNo);
+ const GlobalItem = useSelector(GlobalprintItem);
+ const GlobalMRP = useSelector(GlobalprintMRP);
+ const GlobalDiscount = useSelector(GlobalprintDiscount);
+ const GlobalQuantity = useSelector(GlobalprintQuantity);
+ const GlobalRate = useSelector(GlobalprintRate);
+ const GlobalAmount = useSelector(GlobalprintAmount);
+ const GlobalHsnCode = useSelector(GlobalprintHsnCode);
+ const GlobalQrcodet = useSelector(GlobalprintQrcodet);
+ const GlobaldummyData = useSelector(GlobalPritdummyData);
+ const GlobalSignature = useSelector(GlobalprintSignature);
+ const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
+ const GlobalSignatureImages = useSelector(GlobalSignatureImage);
+ const GlobalIsnotes = useSelector(Globalnotes);
+ const GlobalthemeFormatr = useSelector(GlobalthemeFormat);
+ const GlobalBilltext = useSelector(GlobalBillName);
+ let TermsAndConditions = DCPrintTemplateDtl?.TermsandConditions;
+ let SignatureImg = DCPrintTemplateDtl?.Signature;
+ let Notestext = DCPrintTemplateDtl?.Notes;
+ let BillName = DCPrintTemplateDtl?.PrintHdrName;
+ let FormatTheme = DCPrintTemplateDtl?.PrintType == 'S' ? true : false;
+ let PageSize = DCPrintTemplateDtl?.PageSize;
+ const Signature = FieldDetails?.['signature'];
+ const TermsnAdCondition = FieldDetails?.['terms&conditions'];
+ console.log(
+ Signature,
+ TermsnAdCondition,
+ TermsAndConditions,
+ SignatureImg,
+ 'FormatTheme'
+ );
- const products = [
- { ProdName: 'ITEM 1', Rate: 88.00, SalesQty: 2, MRP: 100, TotalAmt: 176, discount: 0, HSN: '01' },
- { ProdName: 'ITEM 2', Rate: 300.00, SalesQty: 1, MRP: 350, TotalAmt: 300, discount: 0, HSN: '02' },
- { ProdName: 'ITEM 3', Rate: 200.00, SalesQty: 1, MRP: 250, TotalAmt: 200, discount: 0, HSN: '03' },
- { ProdName: 'ITEM 4', Rate: 30.00, SalesQty: 1, MRP: 50, TotalAmt: 30, discount: 0, HSN: '04' },
- { ProdName: 'ITEM 5', Rate: 30.00, SalesQty: 1, MRP: 50, TotalAmt: 30, discount: 0, HSN: '05' },
- { ProdName: 'ITEM 6', Rate: 130.00, SalesQty: 1, MRP: 150, TotalAmt: 130, discount: 0, HSN: '06' },
- { ProdName: 'ITEM 7', Rate: 230.00, SalesQty: 1, MRP: 250, TotalAmt: 230, discount: 0, HSN: '08' },
- ];
+ let PaymentStatusSuccess = PaymentStatus?.filter(
+ (ps) => ps.PaymentStatus === 'S'
+ );
+ const keysLength = Object.keys(table2Data ?? {}).length;
+ if (keysLength > 0) {
+ dispatch(changeReprintDataFound(true));
+ }
+ const currentDate = new Date();
+ const day = currentDate.getDate().toString().padStart(2, '0');
+ const monthNames = [
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec',
+ ];
+ const monthIndex = currentDate.getMonth();
+ const year = currentDate.getFullYear().toString().slice(-2);
- const chunkSize = !isMobile ? 11 : PageSize == "A5" ? 11 : 16;
+ const formattedDate = `${day}-${monthNames[monthIndex]}-${year}`;
- let dataSource = table2Data?.ProductDetails || [];
+ const products = [
+ {
+ ProdName: 'ITEM 1',
+ Rate: 88.0,
+ SalesQty: 2,
+ MRP: 100,
+ TotalAmt: 176,
+ discount: 0,
+ HSN: '01',
+ },
+ {
+ ProdName: 'ITEM 2',
+ Rate: 300.0,
+ SalesQty: 1,
+ MRP: 350,
+ TotalAmt: 300,
+ discount: 0,
+ HSN: '02',
+ },
+ {
+ ProdName: 'ITEM 3',
+ Rate: 200.0,
+ SalesQty: 1,
+ MRP: 250,
+ TotalAmt: 200,
+ discount: 0,
+ HSN: '03',
+ },
+ {
+ ProdName: 'ITEM 4',
+ Rate: 30.0,
+ SalesQty: 1,
+ MRP: 50,
+ TotalAmt: 30,
+ discount: 0,
+ HSN: '04',
+ },
+ {
+ ProdName: 'ITEM 5',
+ Rate: 30.0,
+ SalesQty: 1,
+ MRP: 50,
+ TotalAmt: 30,
+ discount: 0,
+ HSN: '05',
+ },
+ {
+ ProdName: 'ITEM 6',
+ Rate: 130.0,
+ SalesQty: 1,
+ MRP: 150,
+ TotalAmt: 130,
+ discount: 0,
+ HSN: '06',
+ },
+ {
+ ProdName: 'ITEM 7',
+ Rate: 230.0,
+ SalesQty: 1,
+ MRP: 250,
+ TotalAmt: 230,
+ discount: 0,
+ HSN: '08',
+ },
+ ];
- // Paginate the data
- const paginatedChunks = [];
- for (let i = 0; i < dataSource.length; i += chunkSize) {
- paginatedChunks.push(dataSource.slice(i, i + chunkSize));
- }
- const lastChunkRows = paginatedChunks.length > 0 ? paginatedChunks[paginatedChunks.length - 1].length : 0;
- const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == "A5" ? 5 : 10);
+ const chunkSize = !isMobile ? 11 : PageSize == 'A5' ? 11 : 16;
- return (
- <>
+ let dataSource = table2Data?.ProductDetails || [];
+ // Paginate the data
+ const paginatedChunks = [];
+ for (let i = 0; i < dataSource.length; i += chunkSize) {
+ paginatedChunks.push(dataSource.slice(i, i + chunkSize));
+ }
+ const lastChunkRows =
+ paginatedChunks.length > 0
+ ? paginatedChunks[paginatedChunks.length - 1].length
+ : 0;
+ const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10);
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+ const netAmtColor = printColors?.find((obj) => obj.netAmtColor)?.netAmtColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
+ return (
+ <>
+
+ {paginatedChunks.map((dataChunk, chunkIndex) => (
+
0 ? ' print-page-break' : ''}`}
+ style={{
+ display: 'flex',
+ flexDirection: 'column',
+ height: PageSize == 'A5' ? '170mm' : '257mm',
+ }}
+ key={chunkIndex}
+ >
+ className="header"
+ style={{
+ position: isMobile
+ ? GlobaldummyData
+ ? 'absolute'
+ : 'fixed'
+ : '',
+ top: 0,
+ width: '100%',
+ ...headerStyle,
+ }}
+ >
+
+
+ {base64Image ? (
+ 
+ ) : null}
+
- {paginatedChunks.map((dataChunk, chunkIndex) => (
- 0 ? ' print-page-break' : ''}`} style={{ display: "flex", flexDirection: "column", height: PageSize == "A5" ? '170mm' : "257mm", }} key={chunkIndex}>
+
- {table2Data?.dispatchPrint === true && <> -
- } - {table2Data?.ToBranchDtl?.length > 0 && <> -
+ {table2Data?.dispatchPrint === true && ( + <> +
+ + )} + {table2Data?.ToBranchDtl?.length > 0 && ( + <> +
+
+ );
+};
+
+export default DCPrintstyle2;
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle3.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle3.jsx
index 2862325..bba185b 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle3.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle3.jsx
@@ -23,6 +23,15 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedFooterColor,
+ GlobalRowType,
} from '../../../../Features/ThemeChange/ThemeChange';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.scss';
import QRCode from 'react-qr-code';
@@ -232,6 +241,70 @@ const DCPrintStyle3 = ({
lastChunkRows > (!isMobile ? 10 : PageSize == 'A5' ? 5 : 10);
console.log(paginatedChunks, dataSource, 'dataSourcedataSource');
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
+
-
-
+ {GlobaldummyData ? 'XYZ Shop' : BranchName}
+
-
-
-
+
+
+ {GlobaldummyData
+ ? 'BranchAddress, Town- 635XXX City - State'
+ : (BranchAddress || '') +
+ (BranchCity
+ ? (BranchAddress && BranchCity ? '-' : '') +
+ BranchCity
+ : '') +
+ (BranchZip
+ ? (BranchCity && BranchZip ? '-' : '') + BranchZip
+ : '')}
+
+ {BranchDetails?.BrGSTIN && (
+
+ GST NO :
+ {GlobaldummyData
+ ? '334bhbsagbysfgbfgbu'
+ : BranchDetails?.BrGSTIN}
+ , CIN :u00045hhsgbubufsdug
+
+ )}
-
- {(base64Image) ? : null}
-
+ {BranchDetails?.BrMobile && (
+
+ {' '}
+ Mobile : +91{' '}
+ {GlobaldummyData ? '986XXXXXXX' : BranchDetails?.BrMobile}
+
+ )}
+
-
-
- {GlobaldummyData ? 'XYZ Shop' : BranchName}
+
+ {GlobaldummyData
+ ? 'Cash Bill'
+ : BillName
+ ? BillName
+ : 'Delivery Challan'}{' '}
+
- {GlobaldummyData ?
- 'BranchAddress, Town- 635XXX City - State' :
- (BranchAddress || '') + (BranchCity ? (BranchAddress && BranchCity ? '-' : '') + BranchCity : '') + (BranchZip ? (BranchCity && BranchZip ? '-' : '') + BranchZip : '')}
-
- {BranchDetails?.BrGSTIN && GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : BranchDetails?.BrGSTIN}, CIN :u00045hhsgbubufsdug
}
-
- {BranchDetails?.BrMobile && Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : BranchDetails?.BrMobile}
}
-
- {GlobaldummyData ? 'Cash Bill' : BillName ? BillName : "Delivery Challan"}
-
-
- {table2Data?.dispatchPrint !== true &&
-
}
- {table2Data?.dispatchPrint === true &&
-
- Delivery Challan No :{GlobaldummyData ? 'A22' : table2Data?.DCNo}
- {GlobaldummyData ? formattedDate : Date1}
-
-
}
-
-
- Ref No #:{table2Data?.RequestId}
- Requested Date :{formatDate(table2Data?.RequestedDate)}
- - {table2Data?.dispatchPrint === true && <> -
-
-
-
- Dispatch No #:{table2Data?.DispatchId}
- Dispatch Date :{formatDate(table2Data?.CreatedDate)}
- - } - {table2Data?.ToBranchDtl?.length > 0 && <> -
-
- }
+ {table2Data?.dispatchPrint !== true && (
+ Delivery To :
-
-
- {table2Data?.ToBranchDtl?.[0]?.BranchName}
- {table2Data?.ToBranchDtl?.[0]?.Address1 && {table2Data?.ToBranchDtl?.[0]?.Address1}
}
- {(table2Data?.ToBranchDtl?.[0]?.City || table2Data?.ToBranchDtl?.[0]?.Dist || table2Data?.ToBranchDtl?.[0]?.Zip) && {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
}
- {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
}
-
+
+ )}
+ {table2Data?.dispatchPrint === true && (
+
+
+
+ Delivery Challan No :
+ {GlobaldummyData ? 'A22' : table2Data?.DCNo}
+
+
+ {GlobaldummyData ? formattedDate : Date1}
+
+
+
+ )}
+
+
+
+ Ref No #:{table2Data?.RequestId}
+
+
+ Requested Date :{formatDate(table2Data?.RequestedDate)}
+
+ + {table2Data?.dispatchPrint === true && ( + <> +
+
+
+
+
+ Dispatch No #:{table2Data?.DispatchId}
+
+
+ Dispatch Date :{formatDate(table2Data?.CreatedDate)}
+
+ + + )} + {table2Data?.ToBranchDtl?.length > 0 && ( + <> +
+
+ ))}
+
+ Delivery To :
+
+
+
+
+ {table2Data?.ToBranchDtl?.[0]?.BranchName}
+
+ {table2Data?.ToBranchDtl?.[0]?.Address1 && (
+
+ {table2Data?.ToBranchDtl?.[0]?.Address1}
-
- {(table2Data?.CustMobile || table2Data?.CustName || table2Data?.VehicleNo || table2Data?.TransporterId || table2Data?.TransporterName) &&
- <>
-
-
+
+ )}
+
- {(table2Data?.CustMobile || table2Data?.CustName) &&
-
+
-
+ )}
+ {(table2Data?.ToBranchDtl?.[0]?.City ||
+ table2Data?.ToBranchDtl?.[0]?.Dist ||
+ table2Data?.ToBranchDtl?.[0]?.Zip) && (
+ Delivery Details
- {table2Data?.CustMobile && Mobile NO :{table2Data?.CustMobile}
}
- {table2Data?.CustName && Name:{table2Data?.CustName}
}
- {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
+ )}
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && (
+
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
+
+ )}
+
+ {(table2Data?.CustMobile ||
+ table2Data?.CustName ||
+ table2Data?.VehicleNo ||
+ table2Data?.TransporterId ||
+ table2Data?.TransporterName) && (
+ <>
+
+
+ + )} +
+ {chunkIndex === paginatedChunks.length - 1 && (
+ <>
+
+ {(table2Data?.CustMobile || table2Data?.CustName) && (
+
+
+
+ )}
+ {(table2Data?.VehicleNo ||
+ table2Data?.TransporterId ||
+ table2Data?.TransporterName) && (
+
+ Delivery Details
+
+ {table2Data?.CustMobile && (
+
+ {' '}
+ Mobile NO :{table2Data?.CustMobile}{' '}
+
+ )}
+ {table2Data?.CustName && (
+
+ {' '}
+ Name:{table2Data?.CustName}
+
+ )}
+
+
+ )}
+
+ Vehicle Details
+
+ {table2Data?.VehicleNo && (
+
+ {' '}
+ Vehicle No :{table2Data?.VehicleNo}
+
+ )}
+ {table2Data?.TransporterId && (
+
+ {' '}
+ Transporter Id :{table2Data?.TransporterId}
+
+ )}
+ {table2Data?.TransporterName && (
+
+ {' '}
+ Transporter Name :{table2Data?.TransporterName}
+
+ )}
+ + + )} +
+
+ {(table2Data?.ProductDetails?.length > 0 ||
+ GlobaldummyData) && (
+
+
+
+
+
- ))}
-
-
-
-
+ )}
+ | + S.No + | + ) + : SLNO && ( ++ S.No + | + )} + {GlobaldummyData + ? GlobalItem && ( +Item | + ) + : Item && ( +Item | + )} + {GlobaldummyData + ? GlobalQuantity && ( ++ Qty + | + ) + : Quantity && ( ++ Qty + | + )} +||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| S.No | : SLNO &&S.No | } - {GlobaldummyData ? GlobalItem &&Item | : Item &&Item | } - {/* {GlobaldummyData ? GlobalHsnCode &&HSN | : HsnCode &&HSN | } */} - {GlobaldummyData ? GlobalQuantity &&Qty | : Quantity &&Qty | } - {/* {GlobaldummyData ? GlobalMRP &&MRP | : MRP &&MRP | } - {GlobaldummyData ? GlobalAmount &&Amt | : Amount &&Amt | } - {GlobaldummyData ? GlobalDiscount &&Dis | : Discount &&Dis | } - {GlobaldummyData ? GlobalRate &&Rate | : Rate &&Rate | } */} -||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {index + 1} | : SLNO &&{chunkIndex * chunkSize + index + 1} | } - {GlobaldummyData ? GlobalItem &&{item?.ProdName}({item?.Size + item?.UomName}) | : Item && -
- {item?.ProdName}
- {!(item?.ProdVariantName || item?.RequestVariantName)?.toLowerCase()?.includes('variant') && Variant:{item?.ProdVariantName || item?.RequestVariantName} }
- |
- }
- {/* {GlobaldummyData ? GlobalHsnCode && {item?.HSN} | : HsnCode &&{item?.HSN} | } */} - {GlobaldummyData ? GlobalQuantity &&{item?.SalesQty} | : Quantity &&{item?.Qty || item?.DispatchedQty} | } - {/* {GlobaldummyData ? GlobalMRP &&{item?.MRP} | : MRP &&{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} | } + : {} + } + > + {GlobaldummyData + ? GlobalSlNo && ( ++ {index + 1} + | + ) + : SLNO && ( ++ {chunkIndex * chunkSize + index + 1} + | + )} + {GlobaldummyData + ? GlobalItem && ( ++ {item?.ProdName}( + {item?.Size + item?.UomName}) + | + ) + : Item && ( +
+ {item?.ProdName}
+ {!(
+ item?.ProdVariantName ||
+ item?.RequestVariantName
+ )
+ ?.toLowerCase()
+ ?.includes('variant') && (
+
+ Variant:
+ {item?.ProdVariantName ||
+ item?.RequestVariantName}{' '}
+
+ )}
+ |
+ )}
+ {/* {GlobaldummyData ? GlobalHsnCode && {item?.HSN} | : HsnCode &&{item?.HSN} | } */} + {GlobaldummyData + ? GlobalQuantity && ( ++ {item?.SalesQty} + | + ) + : Quantity && ( ++ {item?.Qty || item?.DispatchedQty} + | + )} + {/* {GlobaldummyData ? GlobalMRP &&{item?.MRP} | : MRP &&{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} | } {GlobaldummyData ? GlobalAmount &&{item?.TotalAmt} | : Amount &&{item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} | } {GlobaldummyData ? GlobalDiscount &&{item?.discount} | : Discount &&{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0} | } {GlobaldummyData ? GlobalRate &&{item?.Rate} | : Rate &&{item?.Rate} | } */} -
- {GlobaldummyData ? GlobalIsnotes &&
- (
-
- {PrintGreeting?.SettingValue === "Y" &&
-
-
-
) :
- Notestext && (Notes : 10 days Return policy
- --
-
-
)
- }
-
-
- {Notestext}
- --
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
-
- {GlobaldummyData ? GlobalSignature && (- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
-
) : Signature == true && (Signature
-
-
-
)}
-
- Signature
-
- Thank You Visit Again
-
- }
-
-
-
-
- }
+
+ {GlobaldummyData
+ ? GlobalIsnotes && (
+
+
+ {PrintGreeting?.SettingValue === 'Y' && (
+
+
+
+ )
+ : Notestext && (
+ + Notes : 10 days Return policy +
- - ) -} ++
+
+
+ )}
+
+ {Notestext}
-export default DCPrintstyle2 ++
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
+
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not exchangeable + or refundable. + +
- + Please check the product before leaving the + counter. + +
+
+ )}
+
+ {GlobaldummyData
+ ? GlobalSignature && (
+ + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
+
+
+ )
+ : Signature == true && (
+ + Signature +
+
+
+
+ )}
+ + Signature +
+
+ Thank You Visit Again
+
+ )}
+
+ )}
+
-
+
{GlobaldummyData ? 'XYZ Shop' : BranchName}
@@ -473,6 +546,7 @@ const DCPrintStyle3 = ({
width: '100%',
fontweight: '600',
gap: '0.2rem',
+ ...tableHeaderStyle,
}}
>
{GlobaldummyData
@@ -559,6 +633,11 @@ const DCPrintStyle3 = ({
justifyContent: 'space-between',
width: '100%',
gap: '0.2rem',
+ ...(index % 2 !== 1 && rowtypeStyle === 'even'
+ ? { ...tableBodyStyle }
+ : index % 2 === 1 && rowtypeStyle === 'odd'
+ ? { ...tableBodyStyle }
+ : {}),
}}
>
{GlobaldummyData
@@ -688,6 +767,7 @@ const DCPrintStyle3 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle4.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle4.jsx
index 8731029..c585bde 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle4.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle4.jsx
@@ -17,19 +17,25 @@ import {
GlobalprintQrcodet,
GlobalPritdummyData,
changeReprintDataFound,
- GloabalFieldDetails,
GlobalprintSignature,
GlobalprinttermsAndConditions,
GlobalSignatureImage,
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalRowType,
+ GlobalSelectedFooterColor,
+ GlobalSelectedFooterFontColor,
} from '../../../../Features/ThemeChange/ThemeChange';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.scss';
-import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
import QRCode from 'react-qr-code';
import signature from '../../../../Images/signatureimage.jpg';
-import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin';
import { isMobile } from 'react-device-detect';
const DCPrintstyle4 = ({
@@ -219,6 +225,71 @@ const DCPrintstyle4 = ({
? paginatedChunks[paginatedChunks.length - 1].length
: 0;
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 11 : 20);
+
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
{GlobaldummyData
? GlobalSlNo && (
- S.No
+
+ S.No
+
)
- : SLNO && S.No }
+ : SLNO && (
+
+ S.No
+
+ )}
{GlobaldummyData
- ? GlobalItem && Item
- : Item && Item }
+ ? GlobalItem && (
+ Item
+ )
+ : Item && (
+ Item
+ )}
{GlobaldummyData
? GlobalQuantity && (
Qty
)
: Quantity && (
Qty
)}
- {/* {GlobaldummyData ? GlobalHsnCode && HSN : HsnCode && HSN }
- {GlobaldummyData ? GlobalMRP && MRP : MRP && MRP }
- {GlobaldummyData ? GlobalDiscount && Dis : Discount && Dis }
- {GlobaldummyData ? GlobalRate && Rate : Rate && Rate }
- {GlobaldummyData ? GlobalAmount && Amt : Amount && Amt } */}
{dataChunk?.map((item, index) => {
return (
-
+
{GlobaldummyData
? GlobalSlNo && {index + 1}
: SLNO && (
@@ -547,11 +649,6 @@ const DCPrintstyle4 = ({
{item?.Qty || item?.DispatchedQty}
)}
- {/* {GlobaldummyData ? GlobalHsnCode && {item?.HSN} : HsnCode && {item?.HSN} }
- {GlobaldummyData ? GlobalMRP && {item?.MRP} : MRP && {item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} }
- {GlobaldummyData ? GlobalDiscount && {item.discount} : Discount && {item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0} }
- {GlobaldummyData ? GlobalRate && {item?.Rate} : Rate && {item?.Rate} }
- {GlobaldummyData ? GlobalAmount && {item?.TotalAmt} : Amount && {item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} } */}
);
})}
@@ -604,6 +701,7 @@ const DCPrintstyle4 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle5.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle5.jsx
index 7b955ef..d808a8f 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle5.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle5.jsx
@@ -24,6 +24,15 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedFooterColor,
+ GlobalRowType,
} from '../../../../Features/ThemeChange/ThemeChange';
import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.scss';
@@ -203,6 +212,74 @@ const DCPrintStyle5 = ({
: 0;
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 15 : 15);
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+ const netAmtColor = printColors?.find((obj) => obj.netAmtColor)?.netAmtColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
-
))}
@@ -666,6 +721,7 @@ const DCPrintStyle5 = ({
? 'space-between'
: 'flex-end',
alignItems: 'center',
+ ...footerColorStyle,
}}
>
{GlobaldummyData
diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle6.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle6.jsx
index 3be9a9c..1428629 100644
--- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle6.jsx
+++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle6.jsx
@@ -24,6 +24,15 @@ import {
Globalnotes,
GlobalthemeFormat,
GlobalBillName,
+ GlobalSelectedPrintHeaderColor,
+ GlobalSelectedPrintHeaderFontColor,
+ GlobalSelectedTableHeaderColor,
+ GlobalSelectedTableHeaderFontColor,
+ GlobalSelectedTableBodyColor,
+ GlobalSelectedTableBodyFontColor,
+ GlobalSelectedFooterFontColor,
+ GlobalSelectedFooterColor,
+ GlobalRowType,
} from '../../../../Features/ThemeChange/ThemeChange';
import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.scss';
@@ -219,6 +228,72 @@ const DCPrintstyle6 = ({
: 0;
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 20 : 24);
+ //
+ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+ const SelectedHeaderFontColor = useSelector(
+ GlobalSelectedPrintHeaderFontColor
+ );
+ const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
+ const SelectedTableHeaderFontColor = useSelector(
+ GlobalSelectedTableHeaderFontColor
+ );
+ const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
+ const SelectedTableBodyFontColor = useSelector(
+ GlobalSelectedTableBodyFontColor
+ );
+ const SelectedRowType = useSelector(GlobalRowType);
+ const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
+ const SelectedTableFooterFontColor = useSelector(
+ GlobalSelectedFooterFontColor
+ );
+
+ //
+ let printColors = DCPrintTemplateDtl?.PrintColors;
+ const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor;
+ const tableHeaderColor = printColors?.find(
+ (obj) => obj.tableHeaderColor
+ )?.tableHeaderColor;
+ const tableBodyColor = printColors?.find(
+ (obj) => obj.tableBodyColor
+ )?.tableBodyColor;
+ const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor;
+
+ //
+ const headerStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedHeaderColor
+ : headerColor?.background,
+
+ color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
+ };
+ const tableHeaderStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableHeaderColor
+ : tableHeaderColor?.background,
+
+ color: GlobaldummyData
+ ? SelectedTableHeaderFontColor
+ : tableHeaderColor?.font,
+ };
+
+ const tableBodyStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableBodyColor
+ : tableBodyColor?.background,
+ color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font,
+ };
+
+ const rowtypeStyle = GlobaldummyData
+ ? SelectedRowType
+ : tableBodyColor?.rowType;
+
+ const footerColorStyle = {
+ backgroundColor: GlobaldummyData
+ ? SelectedTableFooterColor
+ : footerColor?.background,
+ color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font,
+ };
+
return (
<>
+
@@ -521,6 +595,15 @@ const DCPrintStyle5 = ({ fontWeight: '600', width: '95%', gap: '0.5rem', + ...(index % 2 !== 1 && rowtypeStyle === 'even' + ? { + ...tableBodyStyle, + } + : index % 2 === 1 && rowtypeStyle === 'odd' + ? { + ...tableBodyStyle, + } + : {}), }} > {GlobaldummyData @@ -576,31 +659,6 @@ const DCPrintStyle5 = ({ item?.RequestVariantName}{' '} )} - {/*
@@ -617,9 +675,6 @@ const DCPrintStyle5 = ({
{item?.Qty || item?.DispatchedQty}
)}
- {/* {GlobaldummyData ? GlobalRate &&
{GlobaldummyData
@@ -502,10 +580,6 @@ const DCPrintStyle5 = ({
QTY
)}
- {/* {GlobaldummyData ? GlobalMRP && MRP
: MRP && MRP
}
- {GlobaldummyData ? GlobalRate && RATE
: Rate && RATE
}
- {GlobaldummyData ? GlobalDiscount && DIS
: Discount && DIS
}
- {GlobaldummyData ? GlobalAmount && Amt
: Amount && AMT
} */}
@@ -521,6 +595,15 @@ const DCPrintStyle5 = ({ fontWeight: '600', width: '95%', gap: '0.5rem', + ...(index % 2 !== 1 && rowtypeStyle === 'even' + ? { + ...tableBodyStyle, + } + : index % 2 === 1 && rowtypeStyle === 'odd' + ? { + ...tableBodyStyle, + } + : {}), }} > {GlobaldummyData @@ -576,31 +659,6 @@ const DCPrintStyle5 = ({ item?.RequestVariantName}{' '} )} - {/*
- {
- (item?.Size || "1") +
- (item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO") +
- (item?.BrandName || "") +
- (
- item?.ProductIdentifierDtls?.filter(
- (items) => items.SerialNumber && items.SerialNumber !== ""
- )?.map((a, index) =>
*/}
}
{a.SerialNumber}
) || ""
- ) +
- (
- item?.ProductIdentifierDtls?.filter(
- (item1) => item1.IMEI1 || item1.IMEI2
- )?.map((item2, index) => {
- const imei1 = item2.IMEI1 || "";
- const imei2 = item2.IMEI2 || "";
- return (
-
- {[imei1, imei2].filter(Boolean).join(",")}
-
- );
- }) || "") +
- "-" + (GlobaldummyData ? (GlobalQuantity && item?.SalesQty) : item?.SalesQty)
- }
- {item?.Rate}
: Rate && {item?.Rate}
}
- {GlobaldummyData ? GlobalDiscount && {item?.discount}
: Discount && {item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0}
}
- {GlobaldummyData ? GlobalAmount && {item?.TotalAmt}
: Amount && {item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0}
} */}
-
+
-
| S.No | ++ S.No + | ) : SLNO && (S.No | )} {GlobaldummyData ? ( (GlobalItem || GlobalQuantity) && ( -+ | {GlobaldummyData ? GlobalItem && 'ITEM /DES' : 'ITEM /DES'}{' '} | ) ) : ( -+ | {GlobaldummyData ? GlobalItem && 'ITEM /DES' : Item && 'ITEM /DES'}{' '} @@ -500,14 +585,22 @@ const DCPrintstyle6 = ({ {GlobaldummyData ? GlobalQuantity && ( | QTY | ) : Quantity && (QTY | @@ -557,7 +650,20 @@ const DCPrintstyle6 = ({|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {index + 1} | : SLNO && ( @@ -749,6 +855,7 @@ const DCPrintstyle6 = ({ ? 'space-between' : 'flex-end', alignItems: 'center', + ...footerColorStyle, }} > {GlobaldummyData diff --git a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle7.jsx b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle7.jsx index e3eec62..8442e79 100644 --- a/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle7.jsx +++ b/src/Pages/DeliveryChallan/DCPrintTemplates/DCThermalPrinter/DCPrintStyle7.jsx @@ -21,6 +21,15 @@ import { Globalnotes, GlobalthemeFormat, GlobalBillName, + GlobalSelectedPrintHeaderColor, + GlobalSelectedPrintHeaderFontColor, + GlobalSelectedTableHeaderColor, + GlobalSelectedTableHeaderFontColor, + GlobalSelectedTableBodyColor, + GlobalSelectedTableBodyFontColor, + GlobalRowType, + GlobalSelectedFooterColor, + GlobalSelectedFooterFontColor, } from '../../../../Features/ThemeChange/ThemeChange'; import { GlobalUpiIDprint } from '../../../../Features/BookingScreen/BookingData/BookingData'; import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.scss'; @@ -246,6 +255,73 @@ const DCPrintStyle7 = ({ : 0; const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10); console.log(BranchName, 'paginatedChunks'); + + // + const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); + const SelectedHeaderFontColor = useSelector( + GlobalSelectedPrintHeaderFontColor + ); + const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor); + const SelectedTableHeaderFontColor = useSelector( + GlobalSelectedTableHeaderFontColor + ); + const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor); + const SelectedTableBodyFontColor = useSelector( + GlobalSelectedTableBodyFontColor + ); + const SelectedRowType = useSelector(GlobalRowType); + const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor); + const SelectedTableFooterFontColor = useSelector( + GlobalSelectedFooterFontColor + ); + + // + let printColors = DCPrintTemplateDtl?.PrintColors; + const headerColor = printColors?.find((obj) => obj.headerColor)?.headerColor; + const tableHeaderColor = printColors?.find( + (obj) => obj.tableHeaderColor + )?.tableHeaderColor; + const tableBodyColor = printColors?.find( + (obj) => obj.tableBodyColor + )?.tableBodyColor; + const footerColor = printColors?.find((obj) => obj.footerColor)?.footerColor; + + // + const headerStyle = { + backgroundColor: GlobaldummyData + ? SelectedHeaderColor + : headerColor?.background, + + color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font, + }; + const tableHeaderStyle = { + backgroundColor: GlobaldummyData + ? SelectedTableHeaderColor + : tableHeaderColor?.background, + + color: GlobaldummyData + ? SelectedTableHeaderFontColor + : tableHeaderColor?.font, + }; + + const tableBodyStyle = { + backgroundColor: GlobaldummyData + ? SelectedTableBodyColor + : tableBodyColor?.background, + color: GlobaldummyData ? SelectedTableBodyFontColor : tableBodyColor?.font, + }; + + const rowtypeStyle = GlobaldummyData + ? SelectedRowType + : tableBodyColor?.rowType; + + const footerColorStyle = { + backgroundColor: GlobaldummyData + ? SelectedTableFooterColor + : footerColor?.background, + color: GlobaldummyData ? SelectedTableFooterFontColor : footerColor?.font, + }; + return ( <>|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| S.No | ++ S.No + | ) : SLNO == true && ( -S.No | ++ S.No + | )} {GlobaldummyData - ? GlobalItem &&Item | - : Item == true &&Item | } - {/* {GlobaldummyData ? GlobalHsnCode &&HSN | : HsnCode == true &&HSN | } */} + ? GlobalItem && ( +Item | + ) + : Item == true && ( +Item | + )} {GlobaldummyData ? GlobalQuantity && ( -Qty | ++ Qty + | ) : Quantity == true && ( -Qty | ++ Qty + | )} - {/* {GlobaldummyData ? GlobalMRP &&MRP | : MRP == true &&MRP | } - {GlobaldummyData ? GlobalRate &&Rate | : Rate == true &&Rate | } - {GlobaldummyData ? GlobalDiscount &&Dis | : Discount == true &&Dis | } - {GlobaldummyData ? GlobalAmount &&Amt | : Amount == true &&Amt | } */}||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| @@ -598,10 +714,6 @@ const DCPrintStyle7 = ({ {item?.Qty || item?.DispatchedQty} | )} - {/* {GlobaldummyData ? GlobalMRP &&{item?.MRP} | : MRP == true &&{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} | } - {GlobaldummyData ? GlobalRate &&{item?.Rate} | : Rate == true &&{item?.Rate} | } - {GlobaldummyData ? GlobalDiscount &&{item.discount} | : Discount == true &&{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0} | } - {GlobaldummyData ? GlobalAmount &&{item?.TotalAmt} | : Amount == true &&{item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} | } */}
| S.No | : SLNO &&S.No | } - {GlobaldummyData ? GlobalItem &&Item | : Item &&Item | } - {/* {GlobaldummyData ? GlobalHsnCode &&HSN | : HsnCode &&HSN | } */} - {/* {GlobaldummyData ? GlobalMRP &&MRP | : MRP &&MRP | } - {GlobaldummyData ? GlobalRate &&Rate | : Rate &&Rt | } - {GlobaldummyData ? GlobalDiscount &&(%) | : Discount &&(%) | } */} - {GlobaldummyData ? GlobalQuantity &&Qty | : Quantity &&Qty | } - {/* {GlobaldummyData ? GlobalAmount &&Amt | : Amount &&Amt | } */} -||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {chunkIndex * chunkSize + index + 1} | : SLNO &&{chunkIndex * chunkSize + index + 1} | } - {GlobaldummyData ? GlobalItem &&{item?.ProdName} | : Item &&
- {item?.ProdName}
- ({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"}){item?.RequestVariantName ? `${item?.RequestVariantName}` : ''}
- | }
- {/* {GlobaldummyData ? GlobalHsnCode && {item?.HSN} | : HsnCode &&{item?.HSN} | } */} - {/* {GlobaldummyData ? GlobalMRP &&{item?.MRP} | : MRP &&{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} | } +
| + S.No + | + ) + : SLNO && ( ++ S.No + | + )} + {GlobaldummyData + ? GlobalItem && ( +Item | + ) + : Item && ( ++ Item + | + )} + {GlobaldummyData + ? GlobalQuantity && ( ++ Qty + | + ) + : Quantity && ( ++ Qty + | + )} +||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + {chunkIndex * chunkSize + index + 1} + | + ) + : SLNO && ( ++ {chunkIndex * chunkSize + index + 1} + | + )} + {GlobaldummyData + ? GlobalItem &&{item?.ProdName} | + : Item && ( +
+ {item?.ProdName}
+
+ ({item?.Size ? item?.Size : '1'}{' '}
+ {item?.SinglePc == 'Y'
+ ? 'PCS'
+ : item?.Type != 'C'
+ ? item?.UomName
+ : 'COMBO'}
+ )
+ {item?.RequestVariantName
+ ? `${item?.RequestVariantName}`
+ : ''}
+
+ |
+ )}
+ {/* {GlobaldummyData ? GlobalHsnCode && {item?.HSN} | : HsnCode &&{item?.HSN} | } */} + {/* {GlobaldummyData ? GlobalMRP &&{item?.MRP} | : MRP &&{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP} | } {GlobaldummyData ? GlobalRate &&{item?.Rate} | : Rate &&{item?.Rate} | } {GlobaldummyData ? GlobalDiscount &&{item?.discount} | : Discount &&{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0} | } */} - {GlobaldummyData ? GlobalQuantity &&{item?.SalesQty} | : Quantity &&{item?.Qty || item?.DispatchedQty} | } - {/* {GlobaldummyData ? GlobalAmount &&{item?.TotalAmt} | : Amount &&{item?.Type != "C" ? item?.TotalAmt - item?.OfferAmt || 0 : item?.TotalAmt - item?.OfferValue || 0} | } */} -
- {GlobaldummyData ? GlobalIsnotes &&
- (
-
-
- {PrintGreeting?.SettingValue === "Y" &&
-
-
-
) :
- Notestext && (Notes : 10 days Return policy
- --
-
-
)
- }
-
-
- {Notestext}
- --
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
-
- {GlobaldummyData ? GlobalSignature && (- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
-
) : Signature == true && (Signature
-
-
-
)}
-
- Signature
-
- Thank You Visit Again
-
- }
-
- }
-
- ))}
-
-
-
+ {GlobaldummyData
+ ? GlobalQuantity && (
+
+ {GlobaldummyData
+ ? GlobalIsnotes && (
+
+
+ {PrintGreeting?.SettingValue === 'Y' && (
+
+
+
+ )
+ : Notestext && (
+ + Notes : 10 days Return policy +
+ ++
+
+
+ )}
+
+ {Notestext}
+ ++
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
+
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not exchangeable + or refundable. + +
- + Please check the product before leaving the + counter. + +
+
+ )}
+
+ {GlobaldummyData
+ ? GlobalSignature && (
+ + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
+
+
+ )
+ : Signature == true && (
+ + Signature +
+
+
+
+ )}
+ + Signature +
+
+ Thank You Visit Again
+
+ )}
+
+ )}
+
+
{paginatedChunks.map((dataChunk, chunkIndex) => (
-
0 ? ' print-page-break' : ''}`} style={{ display: "flex", flexDirection: "column", justifyContent: ((chunkIndex === paginatedChunks.length - 1) && (!shouldFooterBeOnNewPage)) && FormatTheme ? "space-between" : "", height: FormatTheme ? PageSize == "A5" ? '170mm' : "257mm" : "", }} key={chunkIndex}>
-
+
0 ? ' print-page-break' : ''}`}
+ style={{
+ display: 'flex',
+ flexDirection: 'column',
+ justifyContent:
+ chunkIndex === paginatedChunks.length - 1 &&
+ !shouldFooterBeOnNewPage &&
+ FormatTheme
+ ? 'space-between'
+ : '',
+ height: FormatTheme ? (PageSize == 'A5' ? '170mm' : '257mm') : '',
+ }}
+ key={chunkIndex}
+ >
-
- {GlobaldummyData ? 'Cash Bill' : BillName ? BillName : "Delivery Challan"}
-
+
+ {GlobaldummyData
+ ? 'Cash Bill'
+ : BillName
+ ? BillName
+ : 'Delivery Challan'}{' '}
+
-
-
{GlobaldummyData ? "XYZ Shop" : BranchName}
- Low Prices... Love the Saving...
-
-
- {GlobaldummyData
- ? "BranchAddress, Town- 635XXX City - State"
- : (BranchAddress || "") +
- (BranchCity
- ? (BranchAddress && BranchCity ? "-" : "") + BranchCity
- : "") +
- (BranchZip
- ? (BranchCity &&
- BranchZip
- ? "-"
- : "") + BranchZip
- : "")}
-
-
- {BranchDetails?.BrGSTIN && GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : BranchDetails?.BrGSTIN}, CIN :u00045hhsgbubufsdug
}
- {BranchDetails?.BrMobile &&
-
- {" "}
- Mobile : +91 {GlobaldummyData ? "986XXXXXXX" : BranchDetails?.BrMobile}
+
+
+
- {table2Data?.ToBranchDtl?.length > 0 && <> -
- } +
+ + )} {/* orderdetails */} - {table2Data?.dispatchPrint !== true &&
+
+ {GlobaldummyData ? 'XYZ Shop' : BranchName}
- }
+
+ Low Prices... Love the Saving...
+
+
+
+ {GlobaldummyData
+ ? 'BranchAddress, Town- 635XXX City - State'
+ : (BranchAddress || '') +
+ (BranchCity
+ ? (BranchAddress && BranchCity ? '-' : '') +
+ BranchCity
+ : '') +
+ (BranchZip
+ ? (BranchCity && BranchZip ? '-' : '') + BranchZip
+ : '')}
+
+
+ {BranchDetails?.BrGSTIN && (
+
+ GST NO :
+ {GlobaldummyData
+ ? '334bhbsagbysfgbfgbu'
+ : BranchDetails?.BrGSTIN}
+ , CIN :u00045hhsgbubufsdug
+
+ )}
+ {BranchDetails?.BrMobile && (
+
+ {' '}
+ Mobile : +91{' '}
+ {GlobaldummyData ? '986XXXXXXX' : BranchDetails?.BrMobile}
+
+ )}
+ - {table2Data?.ToBranchDtl?.length > 0 && <> -
Delivery To :
-
-
+ {table2Data?.ToBranchDtl?.length > 0 && (
+ <>
+ {table2Data?.ToBranchDtl?.[0]?.BranchName}
- {table2Data?.ToBranchDtl?.[0]?.Address1 && {table2Data?.ToBranchDtl?.[0]?.Address1}
}
- {(table2Data?.ToBranchDtl?.[0]?.City || table2Data?.ToBranchDtl?.[0]?.Dist || table2Data?.ToBranchDtl?.[0]?.Zip) && {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
}
- {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
}
-
+ Delivery To :
+
+
+
-
+ {table2Data?.ToBranchDtl?.[0]?.BranchName}
+
+ {table2Data?.ToBranchDtl?.[0]?.Address1 && (
+
+ {table2Data?.ToBranchDtl?.[0]?.Address1}
+
+ )}
+ {(table2Data?.ToBranchDtl?.[0]?.City ||
+ table2Data?.ToBranchDtl?.[0]?.Dist ||
+ table2Data?.ToBranchDtl?.[0]?.Zip) && (
+ {`${table2Data?.ToBranchDtl?.[0]?.City}, ${table2Data?.ToBranchDtl?.[0]?.Dist} - ${table2Data?.ToBranchDtl?.[0]?.Zip}`}
+ )}
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN && (
+
+ {table2Data?.ToBranchDtl?.[0]?.BrGSTIN}
+
+ )}
+ - } +
+ + )} {/* orderdetails */} - {table2Data?.dispatchPrint !== true &&
-
}
- {table2Data?.dispatchPrint === true &&
-
-
-
- {" "}
- Delivery ChallanNo:
- {GlobaldummyData
- ? "121"
- : table2Data?.DCNo}
-
-
-
-
- {" "}
- Date : {GlobaldummyData ? formattedDate : Date1}{" "}
-
-
+ {table2Data?.dispatchPrint !== true && (
-
))}
diff --git a/src/Pages/Kiosk/CardPage/CardPage2.jsx b/src/Pages/Kiosk/CardPage/CardPage2.jsx
index 0c058ea..75c7b7a 100644
--- a/src/Pages/Kiosk/CardPage/CardPage2.jsx
+++ b/src/Pages/Kiosk/CardPage/CardPage2.jsx
@@ -28,6 +28,7 @@ const CardPage2 = (props) => {
const BookingType = useSelector(GlobalBookingTypeKiosk);
const kioskTemplateData = props?.data;
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const [openQuantity, setopenQuantity] = useState(false);
const [VariantOpen, setVariantOpen] = useState(false);
const [onePeiceFlow, setOnePeiceFlow] = useState(false);
@@ -59,20 +60,6 @@ const CardPage2 = (props) => {
//Card on click function
const CardOnClick = async (item, Parameter) => {
- if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
- if (overAllLimitPreferenece) {
- const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
- if ((calculatedOverAllQty + 1) > maxQtyLimit) {
- setMaxLimitExceeded(true);
- // Reset after 3 seconds
- setTimeout(() => {
- setMaxLimitExceeded(false);
- }, 2000);
- return;
- }
- }
- }
-
setOnePeiceFlow(Parameter === 'OnePeiceProduct');
const transformedItem = {
@@ -321,6 +308,61 @@ const CardPage2 = (props) => {
};
// add Product in cart state
const AddOrderDetails = (item) => {
+ if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
+ if (overAllLimitPreferenece) {
+ const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
+ if ((calculatedOverAllQty + 1) > maxQtyLimit) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+ return;
+ }
+ }
+ }
const isItemInCart = KioskOrderDetails?.find(
(cartItem) =>
cartItem.ProdId === item.ProdId &&
@@ -601,7 +643,7 @@ const CardPage2 = (props) => {
)}
{
const getKioskLightColourdata = useSelector(getKioskLightColour);
const BookingType = useSelector(GlobalBookingTypeKiosk);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const [openQuantity, setopenQuantity] = useState(false);
const [VariantOpen, setVariantOpen] = useState(false);
const [onePeiceFlow, setOnePeiceFlow] = useState(false);
@@ -58,19 +59,6 @@ const CardPage3 = (props) => {
}, []);
//Card on click function
const CardOnClick = async (item, Parameter) => {
- if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
- if (overAllLimitPreferenece) {
- const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
- if ((calculatedOverAllQty + 1) > maxQtyLimit) {
- setMaxLimitExceeded(true);
- // Reset after 3 seconds
- setTimeout(() => {
- setMaxLimitExceeded(false);
- }, 2000);
- return;
- }
- }
- }
setOnePeiceFlow(Parameter === 'OnePeiceProduct');
const transformedItem = {
@@ -318,6 +306,61 @@ const CardPage3 = (props) => {
};
// add Product in cart state
const AddOrderDetails = (item) => {
+ if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
+ if (overAllLimitPreferenece) {
+ const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
+ if ((calculatedOverAllQty + 1) > maxQtyLimit) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+ return;
+ }
+ }
+ }
const isItemInCart = KioskOrderDetails?.find(
(cartItem) =>
cartItem.ProdId === item.ProdId &&
@@ -604,7 +647,7 @@ const CardPage3 = (props) => {
)}
{
const getKioskLightColourdata = useSelector(getKioskLightColour);
const BookingType = useSelector(GlobalBookingTypeKiosk);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const [quantities, setQuantities] = useState({});
const [openQuantity, setopenQuantity] = useState(false);
const [VariantOpen, setVariantOpen] = useState(false);
@@ -89,19 +90,6 @@ const CardPage4 = (props) => {
//Card on click function
const CardOnClick = async (item, Parameter) => {
- if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
- if (overAllLimitPreferenece) {
- const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
- if ((calculatedOverAllQty + 1) > maxQtyLimit) {
- setMaxLimitExceeded(true);
- // Reset after 3 seconds
- setTimeout(() => {
- setMaxLimitExceeded(false);
- }, 2000);
- return;
- }
- }
- }
setOnePeiceFlow(Parameter === 'OnePeiceProduct');
const transformedItem = {
@@ -342,6 +330,61 @@ const CardPage4 = (props) => {
};
// add Product in cart state
const AddOrderDetails = (item) => {
+ if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
+ if (overAllLimitPreferenece) {
+ const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
+ if ((calculatedOverAllQty + 1) > maxQtyLimit) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+ return;
+ }
+ }
+ }
const isItemInCart = KioskOrderDetails?.find(
(cartItem) =>
cartItem.ProdId === item.ProdId &&
@@ -625,7 +668,7 @@ const CardPage4 = (props) => {
)}
{
const dispatch = useDispatch();
const kioskTemplateData = useSelector(getKioskTemplateData);
+ console.log(kioskTemplateData, 'kioskTemplateData');
const [devicePresent, setDevicePresent] = useState(false);
const [deviceAccess, setDeviceAccess] = useState(true);
const [deviceAddress, setDeviceAddress] = useState(null);
diff --git a/src/Pages/Kiosk/OrderCart/OrderCart1.jsx b/src/Pages/Kiosk/OrderCart/OrderCart1.jsx
index ac6b5d1..1db6a1c 100644
--- a/src/Pages/Kiosk/OrderCart/OrderCart1.jsx
+++ b/src/Pages/Kiosk/OrderCart/OrderCart1.jsx
@@ -9,9 +9,11 @@ import { PreferenceData } from '../../../Features/BookingScreen/BookingData/Book
import { calculateOverAllQtyLimit } from '../../../utils/calculations';
import { IoIosWarning } from 'react-icons/io';
import { useState } from 'react';
+import { message } from 'antd';
const KisokOrderCart1 = (props) => {
const dispatch = useDispatch();
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
const preferenceDatas = useSelector(PreferenceData);
const overAllLimitPreferenece =
@@ -45,10 +47,51 @@ const KisokOrderCart1 = (props) => {
if ((calculatedOverAllQty + 1) > maxQtyLimit) {
setMaxLimitExceeded(true);
// Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
setTimeout(() => {
setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
}, 2000);
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
return;
}
}
@@ -209,13 +252,14 @@ const KisokOrderCart1 = (props) => {
remove
-
diff --git a/src/Pages/Kiosk/OrderCart/OrderCart3.jsx b/src/Pages/Kiosk/OrderCart/OrderCart3.jsx
index 3fd5c13..f3a3824 100644
--- a/src/Pages/Kiosk/OrderCart/OrderCart3.jsx
+++ b/src/Pages/Kiosk/OrderCart/OrderCart3.jsx
@@ -19,6 +19,7 @@ const KisokOrderCart3 = (props) => {
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
const getKioskDarkColourdata = useSelector(getKioskDarkColour);
const preferenceDatas = useSelector(PreferenceData);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const overAllLimitPreferenece =
preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
(item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y');
@@ -52,8 +53,50 @@ const KisokOrderCart3 = (props) => {
if ((calculatedOverAllQty + 1) > maxQtyLimit) {
setMaxLimitExceeded(true);
// Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
setTimeout(() => {
setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
}, 2000);
return;
}
@@ -245,7 +288,7 @@ const KisokOrderCart3 = (props) => {
diff --git a/src/Pages/Kiosk/OrderView/OrderView1.jsx b/src/Pages/Kiosk/OrderView/OrderView1.jsx
index c3d39bc..80f2e2d 100644
--- a/src/Pages/Kiosk/OrderView/OrderView1.jsx
+++ b/src/Pages/Kiosk/OrderView/OrderView1.jsx
@@ -27,6 +27,7 @@ const OrderView1 = (props) => {
: null;
const dispatch = useDispatch();
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const KioskOrderDetails = useSelector(GlobalKioskOrderDetails);
const getKioskLightColourdata = useSelector(getKioskLightColour);
const preferenceDatas = useSelector(PreferenceData);
@@ -57,16 +58,56 @@ const OrderView1 = (props) => {
);
};
const increase = async (item) => {
-
-
if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
if (overAllLimitPreferenece) {
const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
if ((calculatedOverAllQty + 1) > maxQtyLimit) {
setMaxLimitExceeded(true);
// Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
setTimeout(() => {
setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
}, 2000);
return;
}
@@ -258,13 +299,14 @@ const OrderView1 = (props) => {
remove
-
diff --git a/src/Pages/Kiosk/OrderView/OrderView3.jsx b/src/Pages/Kiosk/OrderView/OrderView3.jsx
index f9ff4a5..be6f334 100644
--- a/src/Pages/Kiosk/OrderView/OrderView3.jsx
+++ b/src/Pages/Kiosk/OrderView/OrderView3.jsx
@@ -32,6 +32,7 @@ const KioskOrderView = (props) => {
const KioskOrderDetails = useSelector(GlobalKioskOrderDetails);
const getKioskLightColourdata = useSelector(getKioskLightColour);
const preferenceDatas = useSelector(PreferenceData);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
const overAllLimitPreferenece =
preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
@@ -60,15 +61,56 @@ const KioskOrderView = (props) => {
);
};
const increase = async (item) => {
-
if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
if (overAllLimitPreferenece) {
const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
if ((calculatedOverAllQty + 1) > maxQtyLimit) {
setMaxLimitExceeded(true);
// Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
setTimeout(() => {
setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
}, 2000);
return;
}
@@ -331,7 +373,7 @@ const KioskOrderView = (props) => {
diff --git a/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx b/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
index 6275047..3329419 100644
--- a/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
+++ b/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
@@ -968,16 +968,6 @@ const KioskPayment = (props) => {
};
await dispatch(sendSms(postData));
}
- const goFullScreen = () => {
- const elem = document.documentElement;
-
- if (!document.fullscreenElement) {
- elem.requestFullscreen?.().catch((err) => {
- console.log("Fullscreen error:", err);
- });
- }
- };
- goFullScreen();
clearAllStates();
} else {
if (
@@ -1954,7 +1944,7 @@ const KioskPayment = (props) => {
open={open}
handleCancel={!selectedPaymentOption && HandleCloseModal}
footer={false}
- width={width > 768 ? 900 : 700}
+ width={width > 768 ? 800 : 600}
children={
showPaymentGatewayOptions ? (
-
- {PrintingData?.[0]?.ToBranchDtl?.length > 0 &&
- {" "}
- Dispatch No #:
- {table2Data?.DispatchId}
+
+ {' '}
+ Delivery ChallanNo:
+ {GlobaldummyData ? '121' : table2Data?.DCNo}
-
-
- {" "}
- Dispatched Date : {formatDate(table2Data?.CreatedDate)}{" "}
+
+ {' '}
+ Date : {GlobaldummyData ? formattedDate : Date1}{' '}
-
-
-
- {" "}
- Ref No #:
- {table2Data?.RequestId}
+ )}
+ {table2Data?.dispatchPrint === true && (
+
-
-
+
}
+ )}
{/* orderdetails */}
+
-
+
-
+ {' '}
+ Dispatch No #:
+ {table2Data?.DispatchId}
+
-
-
- {" "}
- Requested Date : {formatDate(table2Data?.RequestedDate)}{" "}
+
+
+
+
+ {' '}
+ Dispatched Date :{' '}
+ {formatDate(table2Data?.CreatedDate)}{' '}
+
+
+
+
+
+
+ {' '}
+ Ref No #:
+ {table2Data?.RequestId}
+
+
+
+ {' '}
+ Requested Date :{' '}
+ {formatDate(table2Data?.RequestedDate)}{' '}
+
- {(table2Data?.ProductDetails?.length > 0) &&
+
- - -
-
-
-
);
-}
+};
-export default DCPrintStyle9;
\ No newline at end of file
+export default DCPrintStyle9;
diff --git a/src/Pages/DeliveryChallan/DeliveryPrint.jsx b/src/Pages/DeliveryChallan/DeliveryPrint.jsx
index bbcd6f5..6eae3ac 100644
--- a/src/Pages/DeliveryChallan/DeliveryPrint.jsx
+++ b/src/Pages/DeliveryChallan/DeliveryPrint.jsx
@@ -7,6 +7,7 @@ import moment from 'moment';
import DCPrintA4Style11 from './DCPrintTemplates/DCA4/DCPrintA4Style11';
import { useSelector } from 'react-redux';
import { GlobalDCPrintTemplate } from '../../Features/ThemeChange/ThemeChange';
+import DCPrintStyle1 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle1';
import DCPrintstyle2 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle2';
import DCPrintStyle3 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle3';
import DCPrintstyle4 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle4';
@@ -20,32 +21,13 @@ import DCPrintStyle11 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle11';
import DCPrintstyle12 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle12';
import DCPrintStyleA5 from './DCPrintTemplates/DCA4/DCPrintStyleA5';
import DCA4Standard from './DCPrintTemplates/DCA4/DCA4Standard';
-import DCPrintStyle1 from './DCPrintTemplates/DCThermalPrinter/DCPrintStyle1';
import DCInvicePrint from './DCPrintTemplates/DCThermalPrinter/DCInvicePrint';
-// const PrintStyles = `
-// @media print {
-// @page {
-// size: A4;
-// margin: 0;
-// }
-// body {
-// margin: 1.6cm;
-// }
-// .Quo-Print-Body {
-// padding: 20px;
-// page-break-after: always;
-// }
-// .Quo-Print-Content {
-// break-inside: avoid;
-// }
-// .no-print {
-// display: none;
-// }
-// }
-// `;
-
-const DeliveryPrint = ({ PrintingData1, DCprinterTemplateStyle, DCPrintTemplateDtl }) => {
+const DeliveryPrint = ({
+ PrintingData1,
+ DCprinterTemplateStyle,
+ DCPrintTemplateDtl,
+}) => {
const PrintingData = PrintingData1?.[0];
console.log(PrintingData, 'PrintingData');
const dispatch = useDispatch();
@@ -159,20 +141,29 @@ const DeliveryPrint = ({ PrintingData1, DCprinterTemplateStyle, DCPrintTemplateD
{/*
+ {table2Data?.ProductDetails?.length > 0 && (
<>
-
- }
-
+ )}
- {(chunkIndex === paginatedChunks.length - 1) &&
+ {chunkIndex === paginatedChunks.length - 1 && (
<>
| S.No | : SLNO &&S.No | } - {GlobaldummyData ? GlobalItem &&Item | : Item &&Item | } - {GlobaldummyData ? GlobalQuantity &&Qty | : Quantity &&Qty | } + {GlobaldummyData + ? GlobalSlNo && ( ++ S.No + | + ) + : SLNO && ( ++ S.No + | + )} + {GlobaldummyData + ? GlobalItem && ( ++ Item + | + ) + : Item && ( ++ Item + | + )} + {GlobaldummyData + ? GlobalQuantity && ( ++ Qty + | + ) + : Quantity && ( ++ Qty + | + )} {/* {GlobaldummyData ? GlobalHsnCode &&HSN | : HsnCode &&HSN | } {GlobaldummyData ? GlobalMRP &&MRP | : MRP &&MRP | } {GlobaldummyData ? GlobalDiscount &&Dis | : Discount &&Dis | } @@ -279,151 +616,283 @@ const DCPrintStyle9 = ({ BranchName, BranchDetails, BranchAddress, BranchCity, B {GlobaldummyData ? GlobalAmount &&Amt | : Amount &&Amt | } */}
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - {index + 1} - | - ) ++ {index + 1} + | + ) : SLNO == true && ( -- {chunkIndex * chunkSize + index + 1} - | - )} ++ {chunkIndex * chunkSize + index + 1} + | + )} {GlobaldummyData ? GlobalItem &&{item?.ProdName} | : Item == true && ( -
- {item?.ProdName}
- {!(item?.ProdVariantName || item?.RequestVariantName)?.toLowerCase()?.includes(
- 'variant'
- ) && Variant:{item?.ProdVariantName || item?.RequestVariantName} }
- {" "}
-
-
-
-
- |
- )}
+
+ {item?.ProdName}
+ {!(
+ item?.ProdVariantName ||
+ item?.RequestVariantName
+ )
+ ?.toLowerCase()
+ ?.includes('variant') && (
+
+ Variant:
+ {item?.ProdVariantName ||
+ item?.RequestVariantName}{' '}
+
+ )}
+
+ |
+ )}
{GlobaldummyData
? GlobalQuantity && (
- - {item?.SalesQty} - | - ) ++ {item?.SalesQty} + | + ) : Quantity == true && ( -- {item?.Qty || item?.DispatchedQty} - | - )} ++ {item?.Qty || item?.DispatchedQty} + | + )}
- - -
- {GlobaldummyData ? GlobalIsnotes &&
- (
))}
-
-
-
+
+ )}
+ Notes : 10 days Return policy
+ {GlobaldummyData + ? GlobalIsnotes && ( +
+
-
) :
- Notestext && (+ Notes : 10 days Return policy +
--
-
+
+ )
+ : Notestext && (
+ {Notestext}
++
+
-
)
- }
+ {Notestext}
--
+
+ {GlobaldummyData
+ ? GlobaltermsAndConditions && (
+
+
+ )
+ : TermsnAdCondition == true &&
+ TermsAndConditions?.length > 0 && (
+ + Terms & Conditions +
+-
+
- + Once goods are sold, they are not exchangeable + or refundable. + +
- + Please check the product before leaving the + counter. + +
+
+ )}
- + Terms & Conditions +
+-
+ {TermsAndConditions?.map((item) => (
+
- + {item?.TermsandConditions} + + ))} + {/*
- Please check the product before leaving the counter. */} +
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
-
)
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions -
--
-
- Once goods are sold, they are not exchangeable or refundable. -
- Please check the product before leaving the counter. -
-
)
- }
-
- {GlobaldummyData ? GlobalSignature && (- Terms & Conditions -
--
- {TermsAndConditions?.map(item => (
- {item?.TermsandConditions} ))} - {/*
- Please check the product before leaving the counter. */} -
-
-
) : Signature == true && (Signature
-
-
-
)}
-
+ {GlobaldummyData
+ ? GlobalSignature && (
+ Signature
-
+
+
+ )
+ : Signature == true && (
+ + Signature +
+
+
+
+ )}
+ Signature +
+
- {PrintGreeting?.SettingValue === "Y" &&
+ {PrintGreeting?.SettingValue === 'Y' && (
<>
-
- }
+ )}
-
-
- }
+ )}
Thank You Visit Again
+
+ Thank You Visit Again
+
Gst No:33AAACH7409R1Z8
*/}
- {PrintingData?.[0]?.DCNo &&
- Delivery Challan No: {PrintingData?.[0]?.DCNo}
-
}
- {PrintingData?.[0]?.RequestId &&
- Ref No #: {PrintingData?.[0]?.RequestId}
-
}
- {PrintingData?.[0]?.DCDate &&
- Order Date:{' '}
- {dateFormatChange1(PrintingData?.[0]?.DCDate)}
-
}
- {PrintingData?.[0]?.RequestedDate &&
- Requested Date:{' '}
- {dateFormatChange1(PrintingData?.[0]?.RequestedDate)}
-
}
+ {PrintingData?.[0]?.DCNo && (
+
+ Delivery Challan No: {PrintingData?.[0]?.DCNo}
+
+ )}
+ {PrintingData?.[0]?.RequestId && (
+
+ Ref No #:{' '}
+ {PrintingData?.[0]?.RequestId}
+
+ )}
+ {PrintingData?.[0]?.DCDate && (
+
+ Order Date:{' '}
+ {dateFormatChange1(PrintingData?.[0]?.DCDate)}
+
+ )}
+ {PrintingData?.[0]?.RequestedDate && (
+
+ Requested Date:
+ {dateFormatChange1(PrintingData?.[0]?.RequestedDate)}
+
+ )}
{PrintingData?.[0]?.ModeOfTransport && (
Transport Mode: {PrintingData?.[0]?.ModeOfTransport}
@@ -193,41 +184,66 @@ const DeliveryPrint = ({ PrintingData1, DCprinterTemplateStyle, DCPrintTemplateD
Vehicle No: {PrintingData?.[0]?.VehicleNo}
)}
-
-
)} */}
- {(item?.ProdVariantName || item?.RequestVariantName) && (
- (item?.RequestVariantName || item?.ProdVariantName) !== 'Variant 1' &&
-
-
@@ -270,12 +286,18 @@ const DeliveryPrint = ({ PrintingData1, DCprinterTemplateStyle, DCPrintTemplateD
Variant: {item?.ProdVariantName}
Delivery To :
-
-
}
+ )}
{PrintingData?.[0]?.ToBranchDtl?.[0]?.BranchName}
- {PrintingData?.[0]?.ToBranchDtl?.[0]?.Address1 && {PrintingData?.[0]?.ToBranchDtl?.[0]?.Address1}
}
- {(PrintingData?.[0]?.ToBranchDtl?.[0]?.City || PrintingData?.[0]?.ToBranchDtl?.[0]?.Dist || PrintingData?.[0]?.ToBranchDtl?.[0]?.Zip) && {`${PrintingData?.[0]?.ToBranchDtl?.[0]?.City}, ${PrintingData?.[0]?.ToBranchDtl?.[0]?.Dist} - ${PrintingData?.[0]?.ToBranchDtl?.[0]?.Zip}`}
}
- {PrintingData?.[0]?.ToBranchDtl?.[0]?.BrGSTIN && {PrintingData?.[0]?.ToBranchDtl?.[0]?.BrGSTIN}
}
- {/* Gst No:33AAACH7409R1Z8
*/}
+ {PrintingData?.[0]?.ToBranchDtl?.length > 0 && (
+
+
-
+
+
+ Delivery To :
+
+
+
+
+ {PrintingData?.[0]?.ToBranchDtl?.[0]?.BranchName}
+
+ {PrintingData?.[0]?.ToBranchDtl?.[0]?.Address1 && (
+
+ {PrintingData?.[0]?.ToBranchDtl?.[0]?.Address1}
+
+ )}
+ {(PrintingData?.[0]?.ToBranchDtl?.[0]?.City ||
+ PrintingData?.[0]?.ToBranchDtl?.[0]?.Dist ||
+ PrintingData?.[0]?.ToBranchDtl?.[0]?.Zip) && (
+ {`${PrintingData?.[0]?.ToBranchDtl?.[0]?.City}, ${PrintingData?.[0]?.ToBranchDtl?.[0]?.Dist} - ${PrintingData?.[0]?.ToBranchDtl?.[0]?.Zip}`}
+ )}
+ {PrintingData?.[0]?.ToBranchDtl?.[0]?.BrGSTIN && (
+
+ {PrintingData?.[0]?.ToBranchDtl?.[0]?.BrGSTIN}
+
+ )}
+ {/* Gst No:33AAACH7409R1Z8
*/}
+
+ {PrintingData?.[0]?.DispatchId && (
+
+ Dispatch No #:{' '}
+ {PrintingData?.[0]?.DispatchId}
+
+ )}
+ {PrintingData?.[0]?.CreatedDate && (
+
+ Dispatch Date:
+ {dateFormatChange1(PrintingData?.[0]?.CreatedDate)}
+
+ )}
- {PrintingData?.[0]?.DispatchId &&
-
- Dispatch No #: {PrintingData?.[0]?.DispatchId}
-
}
- {PrintingData?.[0]?.CreatedDate &&
- Dispatch Date:{' '}
- {dateFormatChange1(PrintingData?.[0]?.CreatedDate)}
-
}
-
-
Delivery Details
- {PrintingData?.[0]?.CustName &&
- Name: {PrintingData?.[0]?.CustName}
-
}
+ Delivery Details
+ {PrintingData?.[0]?.CustName && (
+
+ Name: {PrintingData?.[0]?.CustName}
+
+ )}
{/* {PrintingData?.[0]?.CustMobile && ( */}
- {PrintingData?.[0]?.CustMobile &&
- Mobile: {PrintingData?.[0]?.CustMobile}
-
}
-
+ {PrintingData?.[0]?.CustMobile && (
+
+ Mobile: {PrintingData?.[0]?.CustMobile}
+
+ )}
- Variant: {item?.RequestVariantName || item?.ProdVariantName}
-
- )}
+ {(item?.ProdVariantName ||
+ item?.RequestVariantName) &&
+ (item?.RequestVariantName ||
+ item?.ProdVariantName) !== 'Variant 1' && (
+
+ Variant:{' '}
+ {item?.RequestVariantName ||
+ item?.ProdVariantName}
+
+ )}
{DCprinterTemplateStyle === 'Style 1' && (
diff --git a/src/Pages/Kiosk/CardPage/CardPage1.jsx b/src/Pages/Kiosk/CardPage/CardPage1.jsx
index ad6a3a0..bb3cbed 100644
--- a/src/Pages/Kiosk/CardPage/CardPage1.jsx
+++ b/src/Pages/Kiosk/CardPage/CardPage1.jsx
@@ -35,6 +35,7 @@ const CardPage1 = (props) => {
const [QtyIndex, setQtyIndex] = useState(0);
const [ConfigDataList, setConfigDataList] = useState([]);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const kioskTemplateData = props?.data;
const SettingDataSelector = useSelector(settingDataSelector);
const UomPrint = SettingDataSelector?.[0]?.SettingDtlDetails.filter(
@@ -60,20 +61,6 @@ const CardPage1 = (props) => {
//Card on click function
const CardOnClick = async (item, Parameter) => {
- if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
- if (overAllLimitPreferenece) {
- const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
- if ((calculatedOverAllQty + 1) > maxQtyLimit) {
- setMaxLimitExceeded(true);
- // Reset after 3 seconds
- setTimeout(() => {
- setMaxLimitExceeded(false);
- }, 2000);
-
- return;
- }
- }
- }
setOnePeiceFlow(Parameter === 'OnePeiceProduct');
const transformedItem = {
@@ -321,6 +308,61 @@ const CardPage1 = (props) => {
};
// add Product in cart state
const AddOrderDetails = (item) => {
+ if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
+ if (overAllLimitPreferenece) {
+ const calculatedOverAllQty = calculateOverAllQtyLimit(KioskOrderDetails);
+ if ((calculatedOverAllQty + 1) > maxQtyLimit) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+ return;
+ }
+ }
+ }
const isItemInCart = KioskOrderDetails?.find(
(cartItem) =>
cartItem.ProdId === item.ProdId &&
@@ -792,7 +834,7 @@ const CardPage1 = (props) => {
/>
-
-
-
-
-
+
))}
+
-
+
);
diff --git a/src/Pages/Kiosk/OrderCart/OrderCart2.jsx b/src/Pages/Kiosk/OrderCart/OrderCart2.jsx
index 697d723..c7092cc 100644
--- a/src/Pages/Kiosk/OrderCart/OrderCart2.jsx
+++ b/src/Pages/Kiosk/OrderCart/OrderCart2.jsx
@@ -17,6 +17,7 @@ const KisokOrderCart2 = (props) => {
const dispatch = useDispatch();
const preferenceDatas = useSelector(PreferenceData);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const overAllLimitPreferenece =
preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
(item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y');
@@ -49,8 +50,50 @@ const KisokOrderCart2 = (props) => {
if ((calculatedOverAllQty + 1) > maxQtyLimit) {
setMaxLimitExceeded(true);
// Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
setTimeout(() => {
setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
}, 2000);
return;
}
@@ -232,7 +275,7 @@ const KisokOrderCart2 = (props) => {
+
-
-
-
+
))}
+
-
+
+
{
: null;
const dispatch = useDispatch();
const preferenceDatas = useSelector(PreferenceData);
+ const [maxLimitExceededMessage, setMaxLimitExceededMessage] = useState(null);
const [maxLimitExceeded, setMaxLimitExceeded] = useState(false);
const overAllLimitPreferenece =
preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
@@ -73,8 +74,50 @@ const KioskOrderView2 = (props) => {
if ((calculatedOverAllQty + 1) > maxQtyLimit) {
setMaxLimitExceeded(true);
// Reset after 3 seconds
+ setMaxLimitExceededMessage(`Maximum Quantity (${maxQtyLimit}) Reached`);
setTimeout(() => {
setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
+ }, 2000);
+
+ return;
+ }
+ } else if (itemWiseLimitPreferenece) {
+
+ const inwardQtyMap = KioskOrderDetails.reduce((acc, curr) => {
+ const inwardId = curr?.InwardDtlId;
+ const qty = Number(curr?.OrderQty) || 0;
+
+ if (acc[inwardId]) {
+ acc[inwardId] += qty;
+ } else {
+ acc[inwardId] = qty;
+ }
+
+ return acc;
+ }, {});
+
+ const currentInwardId = item?.InwardDtlId;
+ const addQty = 1;
+
+ if (inwardQtyMap[currentInwardId]) {
+ inwardQtyMap[currentInwardId] += addQty;
+ } else {
+ inwardQtyMap[currentInwardId] = addQty;
+ }
+
+ console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
+ const isExceeded = Object.values(inwardQtyMap).some(
+ (qty) => qty > maxQtyLimit
+ );
+
+ if (isExceeded) {
+ setMaxLimitExceeded(true);
+ // Reset after 3 seconds
+ setMaxLimitExceededMessage(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
+ setTimeout(() => {
+ setMaxLimitExceeded(false);
+ setMaxLimitExceededMessage(null);
}, 2000);
return;
}
@@ -339,7 +382,7 @@ const KioskOrderView2 = (props) => {
-
-
diff --git a/src/Pages/Kiosk/Payment/KioskPaymentWithModal.scss b/src/Pages/Kiosk/Payment/KioskPaymentWithModal.scss
index 0e9d260..9e27acb 100644
--- a/src/Pages/Kiosk/Payment/KioskPaymentWithModal.scss
+++ b/src/Pages/Kiosk/Payment/KioskPaymentWithModal.scss
@@ -560,4 +560,5 @@
}
}
}
-}
\ No newline at end of file
+}
+
diff --git a/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx b/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
index ba1ed67..5eda141 100644
--- a/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
+++ b/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
@@ -31,6 +31,7 @@ import { DefaultModal } from '../../../Components/Modal/DefaultModal.jsx';
import { DropDowns } from '../../../Components/Forms/DropDown.jsx';
import { useAuth } from '../../../AuthContext.jsx';
import { FeatureAddon } from '../../../Features/BookingScreen/BookingData/BookingData.js';
+ import "../../../Pages/openingStock/openingStockForm.scss"
const PaymentDetailsList = () => {
const { SadminuserAccess } = useAuth();
diff --git a/src/Pages/Preference/PreferenceList.jsx b/src/Pages/Preference/PreferenceList.jsx
index 25a14aa..e056ba1 100644
--- a/src/Pages/Preference/PreferenceList.jsx
+++ b/src/Pages/Preference/PreferenceList.jsx
@@ -67,6 +67,7 @@ const PreferenceList = () => {
dashboard: allSettingsMap['dashboard']?.value === 'Y',
shortcutkeys: allSettingsMap['shortcutkeys']?.value === 'Y',
autoreceivestock: allSettingsMap['autoreceivestock']?.value === 'Y',
+ salespageaskiosk: allSettingsMap['salespageaskiosk']?.value === 'Y',
kioskotp: allSettingsMap['kioskotp']?.value === 'Y',
decimal: allSettingsMap['decimal']?.value === 'Y',
enabledModules: [
@@ -119,7 +120,7 @@ const PreferenceList = () => {
],
scanlayout: allSettingsMap['scanlayout']?.value === 'Y',
verifyproduct: allSettingsMap['verifyproduct']?.value === 'Y',
- imeidetails:allSettingsMap['imeidetails']?.value === 'Y',
+ imeidetails: allSettingsMap['imeidetails']?.value === 'Y',
customisedbillnumber: allSettingsMap['customisedbillnumber']?.value === 'Y',
upiqr: allSettingsMap['upiqr']?.value === 'Y',
lowstockreport: allSettingsMap['lowstockreport']?.value === 'Y',
@@ -308,6 +309,7 @@ const PreferenceList = () => {
dashboard: values.dashboard,
shortcutkeys: values.shortcutkeys,
autoreceivestock: values.autoreceivestock,
+ salespageaskiosk: values.salespageaskiosk,
kioskotp: values.kioskotp,
decimal: values.decimal,
searchfocus: values.searchfocus,
@@ -323,7 +325,7 @@ const PreferenceList = () => {
mobilea4: values.mobilea4,
scanlayout: values.scanlayout,
verifyproduct: values.verifyproduct,
- imeidetails:values.imeidetails,
+ imeidetails: values.imeidetails,
customisedbillnumber: values.customisedbillnumber,
upiqr: values.upiqr,
lowstockreport: values.lowstockreport,
@@ -512,6 +514,10 @@ const PreferenceList = () => {
{renderCheckbox(
'decimal',
'Display values with 2 decimal places throughout the app?'
+ )}
+ {renderCheckbox(
+ 'salespageaskiosk',
+ 'Do you want to open sales page as kiosk layout?'
)}
{(allSettingsMap['onlineindividualslots'] !== undefined ||
allSettingsMap['allow individual booking'] !== undefined ||
@@ -549,8 +555,12 @@ const PreferenceList = () => {
<>
formRef.current?.setFieldsValue({ maxtime: undefined })}>
- Minutes
- Hours
+ {allSettingsMap['minutes'] !== undefined && (
+ Minutes
+ )}
+ {allSettingsMap['hours'] !== undefined && (
+ Hours
+ )}
@@ -739,8 +749,12 @@ const PreferenceList = () => {
<>
formRef.current?.setFieldsValue({ maxquantity: undefined })}>
- Overall Order Quantity
- Item-wise Quantity
+ {allSettingsMap['overalllimit'] !== undefined && (
+ Overall Order Quantity
+ )}
+ {allSettingsMap['itemwiselimit'] !== undefined && (
+ Item-wise Quantity
+ )}
diff --git a/src/Pages/Preference/PreferenceList.scss b/src/Pages/Preference/PreferenceList.scss
index f8f0ccf..5078ee6 100644
--- a/src/Pages/Preference/PreferenceList.scss
+++ b/src/Pages/Preference/PreferenceList.scss
@@ -166,7 +166,6 @@
display: flex;
align-items: flex-start;
justify-content: flex-end;
- width: 100%;
margin-top: 1rem;
position: fixed;
bottom: 1.3rem;
diff --git a/src/Pages/UpiDetails/UpiDetailslist.jsx b/src/Pages/UpiDetails/UpiDetailslist.jsx
index 68a4cb5..5feeaae 100644
--- a/src/Pages/UpiDetails/UpiDetailslist.jsx
+++ b/src/Pages/UpiDetails/UpiDetailslist.jsx
@@ -23,6 +23,7 @@ import {
} from '../../Features/UpiDetails/UpiDetails.js';
import { changeBreadCrumb } from '../../Features/AppPage/CenterPage.js';
import { DefaultModal } from '../../Components/Modal/DefaultModal.jsx';
+ import "../../Pages/openingStock/openingStockForm.scss"
const UpiDetailslist = () => {
const navigateTo = useNavigate();
diff --git a/src/Pages/openingStock/openingStockForm.scss b/src/Pages/openingStock/openingStockForm.scss
index 338ade5..a791dfa 100644
--- a/src/Pages/openingStock/openingStockForm.scss
+++ b/src/Pages/openingStock/openingStockForm.scss
@@ -299,3 +299,12 @@
.purchase-entry-form {
width: 100%;
}
+.otpInput {
+ width: 2.5rem !important;
+ height: 2.5rem;
+ margin: 0 0.14rem;
+ font-size: 1rem;
+ text-align: center;
+ border-radius: 4px;
+ border: 1px solid rgba(0, 0, 0, 0.3);
+}
\ No newline at end of file
diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
index b8d1122..749f34d 100644
--- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
+++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
@@ -144,7 +144,7 @@ input::-webkit-inner-spin-button {
justify-content: center;
gap: 0.2rem;
background-color: #dbdbdb;
- font-family: "Poppins", sans-serif;
+ font-family: 'Poppins', sans-serif;
}
.payment-div-0-userplus {
@@ -243,6 +243,7 @@ input::-webkit-inner-spin-button {
background-color: var(--DEFAULT_SELECTED_COLOR);
font-size: 14px;
font-weight: 500;
+ border: none;
height: 40px;
width: 75px;
border-radius: 7.2px;
@@ -251,17 +252,20 @@ input::-webkit-inner-spin-button {
display: flex;
gap: 0.2rem;
align-items: center;
- font-family: "Poppins";
+ font-family: 'Poppins';
justify-content: center;
cursor: pointer;
text-transform: capitalize;
+ outline: none;
}
.Btn-payment-mode {
background-color: var(--SELECTED_COLOR);
font-size: 14px;
+ border: none;
font-weight: 500;
height: 40px;
+ outline: none;
width: 75px;
border-radius: 7.2px;
color: #fff;
@@ -269,8 +273,9 @@ input::-webkit-inner-spin-button {
display: flex;
gap: 0.2rem;
align-items: center;
- font-family: "Poppins";
+ font-family: 'Poppins';
justify-content: center;
cursor: pointer;
text-transform: capitalize;
+ outline: none;
}
diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
index 55e5bde..9356a46 100644
--- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
+++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
@@ -205,8 +205,9 @@ input::-webkit-inner-spin-button {
.Btn-payment-mode {
background-color: var(--SELECTED_COLOR);
font-size: 13px !important;
- font-weight: 500;
+ font-weight: 500;border: none;
height: 40px;
+ outline: none;
flex-grow: 1;
flex: 1;
width: max-content !important;
@@ -242,6 +243,7 @@ input::-webkit-inner-spin-button {
background-color: var(--DEFAULT_SELECTED_COLOR);
font-size: 13px !important;
font-weight: 500;
+ outline: none;border: none;
height: 40px;
width: max-content !important;
flex: 1;
diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
index 6abc975..ad64d5c 100644
--- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
+++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
@@ -109,6 +109,7 @@
.Btn-payment-mode {
background-color: var(--SELECTED_COLOR);
color: #ffffff;
+ outline: none;border: none;
font-size: 12px;
display: flex;
flex-direction: row;
@@ -126,6 +127,8 @@
background-color: var(--DEFAULT_SELECTED_COLOR);
color: rgb(255, 255, 255);
font-size: 12px;
+ outline: none;
+ border: none;
cursor: pointer;
display: flex;
flex-direction: row;
diff --git a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss
index 3816df2..db0b57b 100644
--- a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss
+++ b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss
@@ -514,6 +514,7 @@
position: absolute;
z-index: 10;
left: 6px;
+ background-color: unset !important;
}
.custom-input {
padding: 10px 30px 10px 30px;
@@ -522,3 +523,28 @@
top: 53%;
}
}
+.BsNavbar1FullScreen {
+ background-color: #1292ee;
+ height: 28px;
+ width: 28px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 4px;
+ cursor: pointer;
+ font-size: 18px;
+ color: #fff;
+}
+
+.BsNavbar1FullScreenExit {
+ background-color: #ef4444;
+ height: 28px;
+ width: 28px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 4px;
+ color: #fff;
+ font-size: 18px;
+ cursor: pointer;
+}
diff --git a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar2.scss b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar2.scss
index fc0ce5f..2b902ef 100644
--- a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar2.scss
+++ b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar2.scss
@@ -423,3 +423,29 @@
left: 11px;
top: 10px;
}
+
+.BsNavbar1FullScreen {
+ background-color: #1292ee;
+ height: 28px;
+ width: 28px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 4px;
+ cursor: pointer;
+ font-size: 18px;
+ color: #fff;
+}
+
+.BsNavbar1FullScreenExit {
+ background-color: #ef4444;
+ height: 28px;
+ width: 28px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 4px;
+ color: #fff;
+ font-size: 18px;
+ cursor: pointer;
+}
diff --git a/src/Styles/Payment/PaymentDetails/PaymentDetails.scss b/src/Styles/Payment/PaymentDetails/PaymentDetails.scss
index a295e1f..0627393 100644
--- a/src/Styles/Payment/PaymentDetails/PaymentDetails.scss
+++ b/src/Styles/Payment/PaymentDetails/PaymentDetails.scss
@@ -30,6 +30,7 @@
display: flex;
flex-direction: row;
column-gap: 0.5rem;
+ margin-top: 10px;
}
.defaultandCustomisedTheme {
diff --git a/src/Styles/UpiDetails/upidetails.scss b/src/Styles/UpiDetails/upidetails.scss
index 8789f38..3ff2191 100644
--- a/src/Styles/UpiDetails/upidetails.scss
+++ b/src/Styles/UpiDetails/upidetails.scss
@@ -27,8 +27,8 @@
display: flex;
flex-direction: row;
column-gap: 0.5rem;
+ margin-top: 10px;
}
-
// Branch Login Design by Vicky
.branchLoginMaster {