karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'FIX #57 Print header color issue Integration' (#58) from newdeployment into main 

Reviewed-on: Pozomind/pozo-retail-app#58
This commit is contained in:
karthikalakshmi 2026-02-03 13:49:35 +05:30
parent 1a67e75151 b2b86477ca
commit 33dd450740
15 changed files with 17967 additions and 7376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Features/ThemeChange/ThemeChange.js
View File

@ -470,6 +470,7 @@ const initialState = {
notes: false, notes: false,
SignatureImage: '', SignatureImage: '',
BillName: '', BillName: '',
SelectedHeaderColor: '#000000',
allColors: [], allColors: [],
allColorsCat: [], allColorsCat: [],
LayoutOverallColorsList: [], LayoutOverallColorsList: [],
@ -2146,6 +2147,9 @@ const ThemeSlice = createSlice({
changeBillName: (state, action) => { changeBillName: (state, action) => {
state.BillName = action?.payload; state.BillName = action?.payload;
}, },
changeSelectedHeaderColor: (state, action) => {
state.SelectedHeaderColor = action?.payload;
},
changeCurrentColor: (state, action) => { changeCurrentColor: (state, action) => {
const { color } = action?.payload; const { color } = action?.payload;
state.CurrentColor = color; state.CurrentColor = color;
@ -2690,6 +2694,7 @@ export const {
changeOthersTheme, changeOthersTheme,
changeActiveTheme, changeActiveTheme,
changeScanTemplate, changeScanTemplate,
changeSelectedHeaderColor,
} = ThemeSlice.actions; } = ThemeSlice.actions;
export const GlobalPricingAppPricingName = (state) => export const GlobalPricingAppPricingName = (state) =>
@ -2720,6 +2725,8 @@ export const GlobalthemeFormat = (state) => state.theme?.themeFormat;
export const Globalnotes = (state) => state.theme?.notes; export const Globalnotes = (state) => state.theme?.notes;
export const GlobalSignatureImage = (state) => state.theme?.SignatureImage; export const GlobalSignatureImage = (state) => state.theme?.SignatureImage;
export const GlobalBillName = (state) => state.theme?.BillName; export const GlobalBillName = (state) => state.theme?.BillName;
export const GlobalSelectedPrintHeaderColor = (state) =>
state.theme?.SelectedHeaderColor;
export const changeCurrentColorValue = (state) => state.theme?.CurrentColor; export const changeCurrentColorValue = (state) => state.theme?.CurrentColor;
export const changeCurrentTextValue = (state) => state.theme?.CurrentText; export const changeCurrentTextValue = (state) => state.theme?.CurrentText;

53
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
View File

@ -87,11 +87,13 @@ const BSBillingEditQuantity = (props) => {
); );
const ReorderProductData = useSelector(GlobalReorderProductDetails); const ReorderProductData = useSelector(GlobalReorderProductDetails);
const templateData = useSelector(getTemplateData); const templateData = useSelector(getTemplateData);
const OfferCheckedInSetup = templateData?.BookingNavbar?.[1].some( const OfferCheckedInSetup =
templateData?.BookingNavbar?.[1].some(
(item) => item?.OptionName == 'Offer' (item) => item?.OptionName == 'Offer'
) || (templateData?.BookingCombo1?.[1]?.some( ) ||
templateData?.BookingCombo1?.[1]?.some(
(item) => item?.OptionName == 'Offer' (item) => item?.OptionName == 'Offer'
)); );
const [ClearQuantity, setClearQuantity] = useState(false); const [ClearQuantity, setClearQuantity] = useState(false);
const CartOrderDetails = useSelector(GlobalOrderCardDetails); const CartOrderDetails = useSelector(GlobalOrderCardDetails);
const SettingDataSelector = useSelector(PreferenceData); const SettingDataSelector = useSelector(PreferenceData);
@ -3158,9 +3160,10 @@ const BSBillingEditQuantity = (props) => {
const UpdatedCartItemWithOffer = { const UpdatedCartItemWithOffer = {
...updatedProduct, ...updatedProduct,
Offer: (bestOffer?.OfferMode === 'I' || bestOffer?.OfferMode === 'Q') ? Offer:
bestOffer?.OfferAmount || updatedProduct.Offer : bestOffer?.OfferMode === 'I' || bestOffer?.OfferMode === 'Q'
updatedProduct.Offer || bestOffer?.OfferAmount, ? bestOffer?.OfferAmount || updatedProduct.Offer
: updatedProduct.Offer || bestOffer?.OfferAmount,
OfferType: updatedProduct?.OfferType || bestOffer?.OfferType, OfferType: updatedProduct?.OfferType || bestOffer?.OfferType,
OfferMessage: updatedProduct?.OfferMessage || bestOffer?.OfferMessage, OfferMessage: updatedProduct?.OfferMessage || bestOffer?.OfferMessage,
}; };
@ -3175,10 +3178,11 @@ const BSBillingEditQuantity = (props) => {
!c.SalesId && !c.SalesId &&
((c?.OfferModeType && c?.OfferMode === 'B' ((c?.OfferModeType && c?.OfferMode === 'B'
? true ? true
: c?.OfferMode !== 'B') : c?.OfferMode !== 'B') &&
&& c?.OfferMode !== 'P' c?.OfferMode !== 'P' &&
&& c?.OfferMode !== 'C' && c?.OfferMode !== 'O' c?.OfferMode !== 'C' &&
&& c?.OfferMode !== 'L' c?.OfferMode !== 'O' &&
c?.OfferMode !== 'L'
? true ? true
: c?.Offer === 0); : c?.Offer === 0);
@ -3708,9 +3712,10 @@ const BSBillingEditQuantity = (props) => {
/> />
<DefaultModal <DefaultModal
title={ title={
<div className="EditQuantity-title"> 'Change'
<FormHeader title={'Change'} /> // <div className="EditQuantity-title">
</div> // <FormHeader title={'Change'} />
// </div>
} }
open={EditOpen} open={EditOpen}
width={600} width={600}
@ -3817,38 +3822,38 @@ const BSBillingEditQuantity = (props) => {
&#x2716; &#x2716;
</button> </button>
</div> </div>
<div className="grid-container"> <div className="gridEQcontainer">
<div className="grid-item" onClick={() => AddQuantity(1)}> <div className="gridEQitem" onClick={() => AddQuantity(1)}>
1 1
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(2)}> <div className="gridEQitem" onClick={() => AddQuantity(2)}>
2 2
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(3)}> <div className="gridEQitem" onClick={() => AddQuantity(3)}>
3 3
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(4)}> <div className="gridEQitem" onClick={() => AddQuantity(4)}>
4 4
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(5)}> <div className="gridEQitem" onClick={() => AddQuantity(5)}>
5 5
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(6)}> <div className="gridEQitem" onClick={() => AddQuantity(6)}>
6 6
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(7)}> <div className="gridEQitem" onClick={() => AddQuantity(7)}>
7 7
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(8)}> <div className="gridEQitem" onClick={() => AddQuantity(8)}>
8 8
</div> </div>
<div className="grid-item" onClick={() => AddQuantity(9)}> <div className="gridEQitem" onClick={() => AddQuantity(9)}>
9 9
</div> </div>
<div></div> <div></div>
<div className="grid-item" onClick={() => AddQuantity(0)}> <div className="gridEQitem" onClick={() => AddQuantity(0)}>
0 0
</div> </div>
<div></div> <div></div>

23
src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponent.jsx
View File

@ -68,6 +68,7 @@ import {
changeSelectedLogo, changeSelectedLogo,
changeSelectedCredit, changeSelectedCredit,
changeSelectedTax, changeSelectedTax,
changeSelectedHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import '../../../../Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss'; import '../../../../Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss';
import { useAuth } from '../../../../AuthContext.jsx'; import { useAuth } from '../../../../AuthContext.jsx';
@ -732,6 +733,13 @@ const SelectionComponent = forwardRef((props, ref) => {
) )
? dispatch(changeNotes(true)) ? dispatch(changeNotes(true))
: dispatch(changeNotes(false)); : dispatch(changeNotes(false));
checkedValues?.includes(
sizeCheckList.find((item) => item.ConfigName === 'Header Colour')
?.ConfigId
)
? setisheadercolour(true)
: setisheadercolour(false);
}; };
const handleOptions = async () => { const handleOptions = async () => {
@ -1278,12 +1286,7 @@ const SelectionComponent = forwardRef((props, ref) => {
> >
<Row> <Row>
{sizeCheckList {sizeCheckList
?.filter( ?.filter((item) => item.ConfigName)
(item) =>
item.ConfigName &&
(SelectedStyleName == 'TaxInvoice' ||
item.ConfigName != 'Header Colour')
)
?.map((value, key) => ( ?.map((value, key) => (
<Checkbox <Checkbox
style={{ padding: '12px' }} style={{ padding: '12px' }}
@ -1383,14 +1386,18 @@ const SelectionComponent = forwardRef((props, ref) => {
</Modal> </Modal>
</div> </div>
)} )}
{isheadercolour && SelectedStyleName == 'TaxInvoice' && ( {isheadercolour && (
// {isheadercolour && SelectedStyleName == 'TaxInvoice' && (
<div style={{ marginTop: '1rem' }}> <div style={{ marginTop: '1rem' }}>
<Title level={5} style={{ marginBottom: 12 }}> <Title level={5} style={{ marginBottom: 12 }}>
Header Color Header Color
</Title> </Title>
<ColorPicker <ColorPicker
value={selectedColour} value={selectedColour}
onChange={setSelectedColour} onChange={(color) => {
setSelectedColour(color);
dispatch(changeSelectedHeaderColor(color));
}}
placeholder="Select color" placeholder="Select color"
/> />
</div> </div>

11
src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx
View File

@ -1,6 +1,7 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Modal, List, Typography, Tooltip } from 'antd'; import { List, Typography, Tooltip } from 'antd';
import { FaKeyboard } from 'react-icons/fa'; import { FaKeyboard } from 'react-icons/fa';
import { DefaultModal } from '../../../../Components/Modal/DefaultModal';
const { Title, Text } = Typography; const { Title, Text } = Typography;
@ -40,15 +41,15 @@ const ShortcutKeyHelper = ({}) => {
</div> </div>
</Tooltip> </Tooltip>
<Modal <DefaultModal
title={ title={
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
<FaKeyboard /> <FaKeyboard />
<Title level={4} style={{ margin: 0 }}>Keyboard Shortcuts</Title> Keyboard Shortcuts
</div> </div>
} }
open={isModalOpen} open={isModalOpen}
onCancel={() => setIsModalOpen(false)} handleCancel={() => setIsModalOpen(false)}
footer={null} footer={null}
width={500} width={500}
> >
@ -65,7 +66,7 @@ const ShortcutKeyHelper = ({}) => {
</List.Item> </List.Item>
)} )}
/> />
</Modal> </DefaultModal>
</> </>
); );
}; };

2700
src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
View File

File diff suppressed because it is too large Load Diff

298
src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
View File

@ -546,7 +546,7 @@ const PrintA4Style11 = ({
textAlign: 'center', textAlign: 'center',
}} }}
> >
{ WeightasKg ?'Qty/Kg' :'Qty'} {WeightasKg ? 'Qty/Kg' : 'Qty'}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData
@ -623,7 +623,8 @@ const PrintA4Style11 = ({
Tax % Tax %
</th> </th>
) )
: (Tax && table2Data?.OrderType !== 'E') && ( : Tax &&
table2Data?.OrderType !== 'E' && (
<th <th
style={{ style={{
width: '8%', width: '8%',
@ -816,7 +817,8 @@ const PrintA4Style11 = ({
? GlobalTax && ( ? GlobalTax && (
<td>{item.ProdTaxPercentage}</td> <td>{item.ProdTaxPercentage}</td>
) )
: (Tax && table2Data?.OrderType !== 'E') && ( : Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0} {item?.ProdTaxPercentage || 0}
</td> </td>
@ -1014,25 +1016,62 @@ const PrintA4Style11 = ({
)} )}
<hr className="PrintA4Style11-print-dottline" /> <hr className="PrintA4Style11-print-dottline" />
{(table2Data?.OrderType !== "E") && OrderDetailGST?.length > 0 && {table2Data?.OrderType !== 'E' &&
OrderDetailGST?.length > 0 &&
OrderDetailGST?.[0]?.TaxAmt > 0 && ( OrderDetailGST?.[0]?.TaxAmt > 0 && (
<> <>
<p style={{ margin: 0, padding: 0, fontSize: "12px", textAlign: "center" }}> <p
--------- GST Breakup Details -----------</p> style={{
margin: 0,
padding: 0,
fontSize: '12px',
textAlign: 'center',
}}
>
--------- GST Breakup Details
-----------
</p>
<table className="PrintA4Style11-print-table"> <table className="PrintA4Style11-print-table">
<thead> <thead>
<tr> <tr>
<th style={{ width: '10px', textAlign: 'center' }}>GST Rate</th> <th
<th style={{ width: '10px', textAlign: 'right' }}> style={{
width: '10px',
textAlign: 'center',
}}
>
GST Rate
</th>
<th
style={{
width: '10px',
textAlign: 'right',
}}
>
Taxable Amount Taxable Amount
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{
width: '10px',
textAlign: 'right',
}}
>
CGST CGST
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{
width: '10px',
textAlign: 'right',
}}
>
SGST SGST
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{
width: '10px',
textAlign: 'right',
}}
>
Total Total
</th> </th>
</tr> </tr>
@ -1040,28 +1079,52 @@ const PrintA4Style11 = ({
<tbody> <tbody>
{OrderDetailGST?.map((item) => ( {OrderDetailGST?.map((item) => (
<tr> <tr>
<td style={{ textAlign: 'center' }}> <td
style={{
textAlign: 'center',
}}
>
{item?.TaxPercentage}%{' '} {item?.TaxPercentage}%{' '}
</td> </td>
<td style={{ textAlign: 'right' }}>
{' '}
{Number(item.WithOutTaxAmount).toFixed(2)}{' '}
</td>
<td style={{ textAlign: 'right' }}>
{' '}
{Number(item.CGST).toFixed(2)}
</td>
<td <td
style={{ textAlign: 'right' }} style={{
textAlign: 'right',
}}
> >
{' '} {' '}
{Number(item.SGST).toFixed(2)} {Number(
item.WithOutTaxAmount
).toFixed(2)}{' '}
</td> </td>
<td <td
style={{ textAlign: 'right' }} style={{
textAlign: 'right',
}}
> >
{' '} {' '}
{Number(item.TotalAmt).toFixed(2)} {Number(item.CGST).toFixed(
2
)}
</td>
<td
style={{
textAlign: 'right',
}}
>
{' '}
{Number(item.SGST).toFixed(
2
)}
</td>
<td
style={{
textAlign: 'right',
}}
>
{' '}
{Number(
item.TotalAmt
).toFixed(2)}
</td> </td>
</tr> </tr>
))} ))}
@ -1506,7 +1569,7 @@ const PrintA4Style11 = ({
textAlign: 'center', textAlign: 'center',
}} }}
> >
{ WeightasKg ?'Qty/Kg' :'Qty'} {WeightasKg ? 'Qty/Kg' : 'Qty'}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData
@ -1583,7 +1646,8 @@ const PrintA4Style11 = ({
Tax % Tax %
</th> </th>
) )
: (Tax && table2Data?.OrderType !== 'E') && ( : Tax &&
table2Data?.OrderType !== 'E' && (
<th <th
style={{ style={{
width: '8%', width: '8%',
@ -1756,7 +1820,8 @@ const PrintA4Style11 = ({
? GlobalTax && ( ? GlobalTax && (
<td>{item.ProdTaxPercentage}</td> <td>{item.ProdTaxPercentage}</td>
) )
: (Tax && table2Data?.OrderType !== 'E') && ( : Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0} {item?.ProdTaxPercentage || 0}
</td> </td>
@ -1954,25 +2019,62 @@ const PrintA4Style11 = ({
)} )}
<hr className="PrintA4Style11-print-dottline" /> <hr className="PrintA4Style11-print-dottline" />
{(table2Data?.OrderType !== "E") && OrderDetailGST?.length > 0 && {table2Data?.OrderType !== 'E' &&
OrderDetailGST?.length > 0 &&
OrderDetailGST?.[0]?.TaxAmt > 0 && ( OrderDetailGST?.[0]?.TaxAmt > 0 && (
<> <>
<p style={{ margin: 0, padding: 0, fontSize: "12px", textAlign: "center" }}> <p
--------- GST Breakup Details -----------</p> style={{
margin: 0,
padding: 0,
fontSize: '12px',
textAlign: 'center',
}}
>
--------- GST Breakup Details
-----------
</p>
<table className="PrintA4Style11-print-table"> <table className="PrintA4Style11-print-table">
<thead> <thead>
<tr> <tr>
<th style={{ width: '10px', textAlign: 'center' }}>GST Rate</th> <th
<th style={{ width: '10px', textAlign: 'right' }}> style={{
width: '10px',
textAlign: 'center',
}}
>
GST Rate
</th>
<th
style={{
width: '10px',
textAlign: 'right',
}}
>
Taxable Amount Taxable Amount
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{
width: '10px',
textAlign: 'right',
}}
>
CGST CGST
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{
width: '10px',
textAlign: 'right',
}}
>
SGST SGST
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{
width: '10px',
textAlign: 'right',
}}
>
Total Total
</th> </th>
</tr> </tr>
@ -1980,28 +2082,52 @@ const PrintA4Style11 = ({
<tbody> <tbody>
{OrderDetailGST?.map((item) => ( {OrderDetailGST?.map((item) => (
<tr> <tr>
<td style={{ textAlign: 'center' }}> <td
style={{
textAlign: 'center',
}}
>
{item?.TaxPercentage}%{' '} {item?.TaxPercentage}%{' '}
</td> </td>
<td style={{ textAlign: 'right' }}>
{' '}
{Number(item.WithOutTaxAmount).toFixed(2)}{' '}
</td>
<td style={{ textAlign: 'right' }}>
{' '}
{Number(item.CGST).toFixed(2)}
</td>
<td <td
style={{ textAlign: 'right' }} style={{
textAlign: 'right',
}}
> >
{' '} {' '}
{Number(item.SGST).toFixed(2)} {Number(
item.WithOutTaxAmount
).toFixed(2)}{' '}
</td> </td>
<td <td
style={{ textAlign: 'right' }} style={{
textAlign: 'right',
}}
> >
{' '} {' '}
{Number(item.TotalAmt).toFixed(2)} {Number(item.CGST).toFixed(
2
)}
</td>
<td
style={{
textAlign: 'right',
}}
>
{' '}
{Number(item.SGST).toFixed(
2
)}
</td>
<td
style={{
textAlign: 'right',
}}
>
{' '}
{Number(
item.TotalAmt
).toFixed(2)}
</td> </td>
</tr> </tr>
))} ))}
@ -2493,25 +2619,46 @@ const PrintA4Style11 = ({
)} )}
<hr className="PrintA4Style11-print-dottline" /> <hr className="PrintA4Style11-print-dottline" />
{(table2Data?.OrderType !== "E") && OrderDetailGST?.length > 0 && {table2Data?.OrderType !== 'E' &&
OrderDetailGST?.length > 0 &&
OrderDetailGST?.[0]?.TaxAmt > 0 && ( OrderDetailGST?.[0]?.TaxAmt > 0 && (
<> <>
<p style={{ margin: 0, padding: 0, fontSize: "12px", textAlign: "center" }}> <p
--------- GST Breakup Details -----------</p> style={{
margin: 0,
padding: 0,
fontSize: '12px',
textAlign: 'center',
}}
>
--------- GST Breakup Details -----------
</p>
<table className="PrintA4Style11-print-table"> <table className="PrintA4Style11-print-table">
<thead> <thead>
<tr> <tr>
<th style={{ width: '10px', textAlign: 'center' }}>GST Rate</th> <th
<th style={{ width: '10px', textAlign: 'right' }}> style={{ width: '10px', textAlign: 'center' }}
>
GST Rate
</th>
<th
style={{ width: '10px', textAlign: 'right' }}
>
Taxable Amount Taxable Amount
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{ width: '10px', textAlign: 'right' }}
>
CGST CGST
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{ width: '10px', textAlign: 'right' }}
>
SGST SGST
</th> </th>
<th style={{ width: '10px', textAlign: 'right' }}> <th
style={{ width: '10px', textAlign: 'right' }}
>
Total Total
</th> </th>
</tr> </tr>
@ -2524,21 +2671,19 @@ const PrintA4Style11 = ({
</td> </td>
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{' '} {' '}
{Number(item.WithOutTaxAmount).toFixed(2)}{' '} {Number(item.WithOutTaxAmount).toFixed(
2
)}{' '}
</td> </td>
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{' '} {' '}
{Number(item.CGST).toFixed(2)} {Number(item.CGST).toFixed(2)}
</td> </td>
<td <td style={{ textAlign: 'right' }}>
style={{ textAlign: 'right' }}
>
{' '} {' '}
{Number(item.SGST).toFixed(2)} {Number(item.SGST).toFixed(2)}
</td> </td>
<td <td style={{ textAlign: 'right' }}>
style={{ textAlign: 'right' }}
>
{' '} {' '}
{Number(item.TotalAmt).toFixed(2)} {Number(item.TotalAmt).toFixed(2)}
</td> </td>
@ -2998,15 +3143,26 @@ const PrintA4Style11 = ({
)} )}
<hr className="PrintA4Style11-print-dottline" /> <hr className="PrintA4Style11-print-dottline" />
{(table2Data?.OrderType !== "E") && OrderDetailGST?.length > 0 && {table2Data?.OrderType !== 'E' &&
OrderDetailGST?.length > 0 &&
OrderDetailGST?.[0]?.TaxAmt > 0 && ( OrderDetailGST?.[0]?.TaxAmt > 0 && (
<> <>
<p style={{ margin: 0, padding: 0, fontSize: "12px", textAlign: "center" }}> <p
--------- GST Breakup Details -----------</p> style={{
margin: 0,
padding: 0,
fontSize: '12px',
textAlign: 'center',
}}
>
--------- GST Breakup Details -----------
</p>
<table className="PrintA4Style11-print-table"> <table className="PrintA4Style11-print-table">
<thead> <thead>
<tr> <tr>
<th style={{ width: '10px', textAlign: 'center' }}>GST Rate</th> <th style={{ width: '10px', textAlign: 'center' }}>
GST Rate
</th>
<th style={{ width: '10px', textAlign: 'right' }}> <th style={{ width: '10px', textAlign: 'right' }}>
Taxable Amount Taxable Amount
</th> </th>
@ -3035,15 +3191,11 @@ const PrintA4Style11 = ({
{' '} {' '}
{Number(item.CGST).toFixed(2)} {Number(item.CGST).toFixed(2)}
</td> </td>
<td <td style={{ textAlign: 'right' }}>
style={{ textAlign: 'right' }}
>
{' '} {' '}
{Number(item.SGST).toFixed(2)} {Number(item.SGST).toFixed(2)}
</td> </td>
<td <td style={{ textAlign: 'right' }}>
style={{ textAlign: 'right' }}
>
{' '} {' '}
{Number(item.TotalAmt).toFixed(2)} {Number(item.TotalAmt).toFixed(2)}
</td> </td>

1745
src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
View File

File diff suppressed because it is too large Load Diff

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
View File

@ -30,6 +30,7 @@ import {
GlobalprintLogo, GlobalprintLogo,
GlobalprintCredit, GlobalprintCredit,
GlobalprintTax, GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.scss'; import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.scss';
import QRCode from 'react-qr-code'; import QRCode from 'react-qr-code';
@ -95,6 +96,7 @@ const PrintStyle1 = ({
const GlobalCashierName = useSelector(GlobalprintCashierName); const GlobalCashierName = useSelector(GlobalprintCashierName);
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions); const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
const GlobalSignatureImages = useSelector(GlobalSignatureImage); const GlobalSignatureImages = useSelector(GlobalSignatureImage);
@ -225,9 +227,12 @@ const PrintStyle1 = ({
} }
}); });
const hasMappedOffer = offers.some((offer) => const hasMappedOffer = offers.some((offer) =>
['ItemWiseOffers', 'BundleOffers', 'QuantityWiseOffers', 'MemberShip'].includes( [
offer.TableName 'ItemWiseOffers',
) 'BundleOffers',
'QuantityWiseOffers',
'MemberShip',
].includes(offer.TableName)
); );
if (hasMappedOffer) { if (hasMappedOffer) {
@ -436,6 +441,7 @@ const PrintStyle1 = ({
style={{ style={{
fontSize: 'clamp(2rem, 2.5vw, 2rem)', fontSize: 'clamp(2rem, 2.5vw, 2rem)',
fontWeight: '600', fontWeight: '600',
color: SelectedHeaderColor,
}} }}
> >
{' '} {' '}
@ -3562,6 +3568,7 @@ const PrintStyle1 = ({
style={{ style={{
fontSize: 'clamp(2rem, 2.5vw, 2rem)', fontSize: 'clamp(2rem, 2.5vw, 2rem)',
fontWeight: '600', fontWeight: '600',
color: SelectedHeaderColor,
}} }}
> >
{' '} {' '}

15
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
View File

@ -27,6 +27,7 @@ import {
GlobalprintLogo, GlobalprintLogo,
GlobalprintCredit, GlobalprintCredit,
GlobalprintTax, GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import { import {
GlobalUpiIDprint, GlobalUpiIDprint,
@ -121,6 +122,7 @@ const PrintStyle10 = ({
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
let TermsAndConditions = printDatas?.TermsandConditions; let TermsAndConditions = printDatas?.TermsandConditions;
let SignatureImg = printDatas?.Signature; let SignatureImg = printDatas?.Signature;
@ -407,7 +409,13 @@ const PrintStyle10 = ({
</div> </div>
<div className="Address" style={{ fontWeight: '600' }}> <div className="Address" style={{ fontWeight: '600' }}>
<div className="ShopName" style={{ fontWeight: '600' }}> <div
className="ShopName"
style={{
fontWeight: '600',
color: SelectedHeaderColor,
}}
>
{GlobaldummyData {GlobaldummyData
? 'ABC Shop' ? 'ABC Shop'
: table2Data?.BrName}{' '} : table2Data?.BrName}{' '}
@ -2926,7 +2934,10 @@ const PrintStyle10 = ({
</div> </div>
<div className="Address" style={{ fontWeight: '600' }}> <div className="Address" style={{ fontWeight: '600' }}>
<div className="ShopName" style={{ fontWeight: '600' }}> <div
className="ShopName"
style={{ fontWeight: '600', color: SelectedHeaderColor }}
>
{GlobaldummyData ? 'ABC Shop' : table2Data?.BrName}{' '} {GlobaldummyData ? 'ABC Shop' : table2Data?.BrName}{' '}
</div> </div>
{GlobaldummyData {GlobaldummyData

4572
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
View File

File diff suppressed because it is too large Load Diff

4592
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
View File

File diff suppressed because it is too large Load Diff

18
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
View File

@ -28,6 +28,7 @@ import {
GlobalprintLogo, GlobalprintLogo,
GlobalprintCredit, GlobalprintCredit,
GlobalprintTax, GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import Logo from '../../../../Images/Logo.jpg'; import Logo from '../../../../Images/Logo.jpg';
import QRCode from 'react-qr-code'; import QRCode from 'react-qr-code';
@ -93,6 +94,7 @@ const Printstyle2 = ({
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
console.log(Qrcodet, 'Qrcodet', paymentTypeUPI); console.log(Qrcodet, 'Qrcodet', paymentTypeUPI);
const GlobalSignature = useSelector(GlobalprintSignature); const GlobalSignature = useSelector(GlobalprintSignature);
const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions); const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
@ -399,7 +401,13 @@ const Printstyle2 = ({
fontWeight: '600', fontWeight: '600',
}} }}
> >
<div style={{ fontSize: '18px', fontWeight: '600' }}> <div
style={{
fontSize: '18px',
fontWeight: '600',
color: SelectedHeaderColor,
}}
>
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName} {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
</div> </div>
@ -2937,7 +2945,13 @@ const Printstyle2 = ({
fontWeight: '600', fontWeight: '600',
}} }}
> >
<div style={{ fontSize: '18px', fontWeight: '600' }}> <div
style={{
fontSize: '18px',
fontWeight: '600',
color: SelectedHeaderColor,
}}
>
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName} {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
</div> </div>

5159
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
View File

File diff suppressed because it is too large Load Diff

10
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -28,9 +28,13 @@ import {
GlobalprintLogo, GlobalprintLogo,
GlobalprintCredit, GlobalprintCredit,
GlobalprintTax, GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.scss'; import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.scss';
import { GlobalUpiIDprint, PreferenceData } from '../../../../Features/BookingScreen/BookingData/BookingData'; import {
GlobalUpiIDprint,
PreferenceData,
} from '../../../../Features/BookingScreen/BookingData/BookingData';
import QRCode from 'react-qr-code'; import QRCode from 'react-qr-code';
import signature from '../../../../Images/signatureimage.jpg'; import signature from '../../../../Images/signatureimage.jpg';
import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin'; import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin';
@ -131,6 +135,7 @@ const Printstyle4 = ({
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
console.log(GlobalDiscount, Discount, 'Discount'); console.log(GlobalDiscount, Discount, 'Discount');
@ -412,6 +417,7 @@ const Printstyle4 = ({
fontWeight: '600', fontWeight: '600',
width: '100%', width: '100%',
textAlign: 'center', textAlign: 'center',
color: SelectedHeaderColor,
}} }}
> >
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}{' '} {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}{' '}
@ -559,7 +565,7 @@ const Printstyle4 = ({
textAlign: 'right', textAlign: 'right',
}} }}
> >
{WeightasKg ?'Qty/Kg' :'Qty'} {WeightasKg ? 'Qty/Kg' : 'Qty'}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData

5
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
View File

@ -28,6 +28,7 @@ import {
GlobalprintLogo, GlobalprintLogo,
GlobalprintCredit, GlobalprintCredit,
GlobalprintTax, GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import { import {
GlobalUpiIDprint, GlobalUpiIDprint,
@ -124,6 +125,8 @@ const PrintStyle5 = ({
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
console.log(GlobalDiscount, Discount, 'Discount'); console.log(GlobalDiscount, Discount, 'Discount');
let TermsAndConditions = printDatas?.TermsandConditions; let TermsAndConditions = printDatas?.TermsandConditions;
@ -383,6 +386,7 @@ const PrintStyle5 = ({
style={{ style={{
fontSize: 'clamp(2rem, 2.5vw, 2rem)', fontSize: 'clamp(2rem, 2.5vw, 2rem)',
fontWeight: '600', fontWeight: '600',
color: SelectedHeaderColor,
}} }}
> >
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName} {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
@ -2595,6 +2599,7 @@ const PrintStyle5 = ({
style={{ style={{
fontSize: 'clamp(2rem, 2.5vw, 2rem)', fontSize: 'clamp(2rem, 2.5vw, 2rem)',
fontWeight: '600', fontWeight: '600',
color: SelectedHeaderColor,
}} }}
> >
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName} {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}