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

FIX #60 Print Header Integrated code missing

This commit is contained in:
karthikalakshmi 2026-02-03 13:55:24 +05:30
parent b2b86477ca
commit f176132670
9 changed files with 11019 additions and 5174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
View File

@ -29,6 +29,7 @@ import {
GlobalprintLogo,
GlobalprintCredit,
GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange';
import {
GlobalUpiIDprint,
@ -123,6 +124,7 @@ const Printstyle6 = ({
const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI'
);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
console.log(GlobalDiscount, Discount, 'Discount');
@ -400,8 +402,10 @@ const Printstyle6 = ({
/>
) : null}
</div>
<div style={{ color: SelectedHeaderColor }}>
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
</div>
</div>
<div style={{ fontSize: 'clamp(0.75rem, 2.5vw, 1rem)' }}>
{GlobaldummyData
@ -3170,8 +3174,10 @@ const Printstyle6 = ({
/>
) : null}
</div>
<div style={{ color: SelectedHeaderColor }}>
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
</div>
</div>
<div style={{ fontSize: 'clamp(0.75rem, 2.5vw, 1rem)' }}>
{GlobaldummyData

4352
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
View File

File diff suppressed because it is too large Load Diff

4777
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
View File

File diff suppressed because it is too large Load Diff

179
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
View File

@ -28,9 +28,13 @@ import {
GlobalprintLogo,
GlobalprintCredit,
GlobalprintTax,
GlobalSelectedPrintHeaderColor,
} from '../../../../Features/ThemeChange/ThemeChange';
import Logo from '../../../../Images/Logo.jpg';
import { GlobalUpiIDprint, PreferenceData } from '../../../../Features/BookingScreen/BookingData/BookingData';
import {
GlobalUpiIDprint,
PreferenceData,
} from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.scss';
import QRCode from 'react-qr-code';
import signature from '../../../../Images/signatureimage.jpg';
@ -119,6 +123,7 @@ const PrintStyle9 = ({
const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI'
);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
let TermsAndConditions = printDatas?.TermsandConditions;
let SignatureImg = printDatas?.Signature;
let Notestext = printDatas?.Notes;
@ -230,7 +235,7 @@ const PrintStyle9 = ({
HSN: '01',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 5
ProdTaxPercentage: 5,
},
{
ProdName: 'ITEM 2',
@ -242,7 +247,7 @@ const PrintStyle9 = ({
HSN: '02',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 5
ProdTaxPercentage: 5,
},
{
ProdName: 'ITEM 3',
@ -254,7 +259,7 @@ const PrintStyle9 = ({
HSN: '03',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 0
ProdTaxPercentage: 0,
},
{
ProdName: 'ITEM 4',
@ -266,7 +271,7 @@ const PrintStyle9 = ({
HSN: '04',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 18
ProdTaxPercentage: 18,
},
{
ProdName: 'ITEM 5',
@ -278,7 +283,7 @@ const PrintStyle9 = ({
HSN: '05',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 40
ProdTaxPercentage: 40,
},
{
ProdName: 'ITEM 6',
@ -290,7 +295,7 @@ const PrintStyle9 = ({
HSN: '06',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 0
ProdTaxPercentage: 0,
},
{
ProdName: 'ITEM 7',
@ -302,7 +307,7 @@ const PrintStyle9 = ({
HSN: '08',
Size: 250,
UomName: 'g',
ProdTaxPercentage: 5
ProdTaxPercentage: 5,
},
];
@ -411,6 +416,7 @@ const PrintStyle9 = ({
style={{
fontSize: 'clamp(1.5rem, 2.5vw, 2rem)',
fontWeight: '600',
color: SelectedHeaderColor,
}}
className="PrintStyle9-Branch"
>
@ -619,16 +625,22 @@ const PrintStyle9 = ({
Dis{' '}
</th>
)}
{GlobaldummyData ?
GlobalTax &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax %
</th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
{GlobaldummyData
? GlobalTax && (
<th
style={{ width: '10px', textAlign: 'right' }}
>
Tax %
</th>
}
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<th
style={{ width: '10px', textAlign: 'right' }}
>
Tax %
</th>
)}
{GlobaldummyData
? GlobalRate && (
<th
@ -833,15 +845,17 @@ const PrintStyle9 = ({
</td>
)}
{GlobaldummyData
? GlobalTax &&
? GlobalTax && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage}
</td> :
(Tax && table2Data?.OrderType !== 'E') &&
</td>
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0}
</td>
}
)}
{GlobaldummyData
? GlobalRate && (
<td style={{ textAlign: 'right' }}>
@ -961,16 +975,22 @@ const PrintStyle9 = ({
Dis{' '}
</th>
)}
{GlobaldummyData ?
GlobalTax &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax %
</th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
{GlobaldummyData
? GlobalTax && (
<th
style={{ width: '10px', textAlign: 'right' }}
>
Tax %
</th>
}
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<th
style={{ width: '10px', textAlign: 'right' }}
>
Tax %
</th>
)}
{GlobaldummyData
? GlobalRate && (
<th
@ -1084,15 +1104,17 @@ const PrintStyle9 = ({
</td>
)}
{GlobaldummyData
? GlobalTax &&
? GlobalTax && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage}
</td> :
(Tax && table2Data?.OrderType !== 'E') &&
</td>
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0}
</td>
}
)}
{GlobaldummyData
? GlobalRate && (
<td style={{ textAlign: 'right' }}>
@ -1322,7 +1344,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -1415,7 +1439,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -1503,7 +1529,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -2237,7 +2265,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -2328,7 +2358,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -2414,7 +2446,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -2967,6 +3001,7 @@ const PrintStyle9 = ({
style={{
fontSize: 'clamp(1.5rem, 2.5vw, 2rem)',
fontWeight: '600',
color: SelectedHeaderColor,
}}
className="PrintStyle9-Branch"
>
@ -3164,16 +3199,18 @@ const PrintStyle9 = ({
Dis{' '}
</th>
)}
{GlobaldummyData ?
GlobalTax &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax %
</th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
{GlobaldummyData
? GlobalTax && (
<th style={{ width: '10px', textAlign: 'right' }}>
Tax %
</th>
}
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<th style={{ width: '10px', textAlign: 'right' }}>
Tax %
</th>
)}
{GlobaldummyData
? GlobalRate && (
<th style={{ width: '10px', textAlign: 'right' }}>
@ -3308,15 +3345,17 @@ const PrintStyle9 = ({
</td>
)}
{GlobaldummyData
? GlobalTax &&
? GlobalTax && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage}
</td> :
(Tax && table2Data?.OrderType !== 'E') &&
</td>
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0}
</td>
}
)}
{GlobaldummyData
? GlobalRate && (
<td style={{ textAlign: 'right' }}>
@ -3416,16 +3455,18 @@ const PrintStyle9 = ({
Dis{' '}
</th>
)}
{GlobaldummyData ?
GlobalTax &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax %
</th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
{GlobaldummyData
? GlobalTax && (
<th style={{ width: '10px', textAlign: 'right' }}>
Tax %
</th>
}
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<th style={{ width: '10px', textAlign: 'right' }}>
Tax %
</th>
)}
{GlobaldummyData
? GlobalRate && (
<th style={{ width: '10px', textAlign: 'right' }}>
@ -3528,15 +3569,17 @@ const PrintStyle9 = ({
</td>
)}
{GlobaldummyData
? GlobalTax &&
? GlobalTax && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage}
</td> :
(Tax && table2Data?.OrderType !== 'E') &&
</td>
)
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0}
</td>
}
)}
{GlobaldummyData
? GlobalRate && (
<td style={{ textAlign: 'right' }}>
@ -3754,7 +3797,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -3845,7 +3890,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',
@ -3929,7 +3976,9 @@ const PrintStyle9 = ({
fontSize: '11px',
textAlign: 'right',
}}
>{item?.TaxPercentage || 0}%</td>
>
{item?.TaxPercentage || 0}%
</td>
<td
style={{
fontSize: '11px',

11
src/Pages/Preference/PreferenceList.jsx
View File

@ -749,16 +749,6 @@ const PreferenceList = () => {
{renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
</div>
</Form>
</div>
<Form
ref={formRef}
layout="vertical"
onFinish={handleSubmit}
initialValues={initialValues}
className="preferences-list"
>
<div className="PreferencesBTN">
<Buttons
buttonText="Submit Preferences"
@ -770,6 +760,7 @@ const PreferenceList = () => {
</div>
</Form>
</div>
</div>
</>
);
};

571
src/Pages/StockMaster/StockForm.jsx
View File

File diff suppressed because it is too large Load Diff

43
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.scss
View File

@ -42,22 +42,30 @@
justify-content: center;
border-radius: 10px;
}
.grid-container {
.gridEQcontainer {
display: grid;
grid-template-columns: auto auto auto;
padding: 5px;
padding: 12px;
border-radius: 6px;
background: #e1eef1;
margin: 5px;
}
.grid-item {
.gridEQitem {
background-color: rgba(255, 255, 255, 0.8);
// border: 1px solid rgba(0, 0, 0, 0.8);
padding: 5px;
font-size: 30px;
text-align: center;
border-radius: 25px;
margin: 6px;
// margin-left: 10px;
border-radius: 30px;
margin: 5px;
height: 60px;
width: 90%;
cursor: pointer;
font-family: "Poppins";
display: flex;
align-items: center;
justify-content: center;
font-weight: 400;
}
.grid-item-add {
background-color: var(--SELECTED_COLOR);
@ -90,14 +98,27 @@
flex-direction: row;
align-items: center;
column-gap: 0.5rem;
font-family: 'Poppins';
font-family: "Poppins", sans-serif;
}
.EditQuantity-Quantitybox {
width: 5rem;
height: 2rem;
border: none;
background-color: #eff3f3;
border: 1px solid #e4e4e4;
padding-left: 5px;
border-radius: 4px;
font-family: "Poppins", sans-serif;
font-size: 15px;
font-weight: 400;
letter-spacing: 0.3px;
outline: none !important;
&:focus {
border-color: #a6daff;
}
&:active {
border-color: #a6daff;
}
}
.EditQuantity-Pricebox {
width: 5rem;
@ -110,6 +131,14 @@
height: 2rem;
width: 2rem;
border: none;
border: 1px solid #ffdfdf;
border-radius: 4px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
background-color: #ffeded;
color: #c21919;
}
.EditQuantity-PriceChange {
display: flex;

20
src/Styles/BookingScreen/Components/BSBillingTables/BSPacking/BSPacking.scss
View File

@ -41,10 +41,10 @@ $white: #ffffff;
.packing-container {
max-width: 50rem;
// margin: 0 auto;
padding: 1.5rem;
@include gradient-bg(#eff6ff, #e0e7ff);
margin: 1rem 0;
padding: 1rem;
@include gradient-bg(#e6f1ff, #dfe7ff);
border-radius: 1rem;
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1);
// Header section
.header {
@ -121,13 +121,13 @@ $white: #ffffff;
// grid-template-columns: 120px 120px 120px 120px 100px; // Type, Qty, Count, Total, Action
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
background: $gray-100;
padding: 0.75rem 1rem;
padding: 0.5rem 0.5rem;
font-weight: 600;
font-size: 0.875rem;
color: $gray-700;
border-radius: 0.5rem;
border: 1px solid $gray-200;
margin-bottom: 0.50rem;
margin-bottom: 0.5rem;
.header-cell {
text-align: center;
@ -279,9 +279,8 @@ $white: #ffffff;
gap: 0.5rem;
.action-button {
width: 2.0rem;
height: 2.0rem;
width: 2rem;
height: 2rem;
border-radius: 50%;
border: none;
color: $white;
@ -311,7 +310,7 @@ $white: #ffffff;
min-width: 2rem;
.total-display {
padding: 0.25rem 0.70rem;
padding: 0.25rem 0.7rem;
background: $gray-50;
// border: 1px solid $gray-200;
// border-radius: 0.5rem;
@ -338,8 +337,7 @@ $white: #ffffff;
background: $white;
border-radius: 0.75rem;
padding: 1.5rem;
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1);
border: 2px solid $gray-100;
border: 2px solid #d6e1ff;
.summary-content {
display: flex;

12
src/Styles/PurchaseReturn/purchasereturn.scss
View File

@ -338,7 +338,7 @@
display: flex;
align-items: center;
gap: 7px;
padding: 10px 16px;
padding: 8px 16px;
background-color: #0bad77;
border-radius: 7px;
color: white;
@ -346,7 +346,7 @@
font-family: 'Poppins';
font-weight: 400;
white-space: nowrap;
font-size: 14px;
font-size: 13.5px;
transition: all 0.2s;
&:hover {
background-color: #069666;
@ -356,15 +356,15 @@
display: flex;
align-items: center;
gap: 7px;
padding: 10px 16px;
background-color: #0ea5e9;
padding: 8px 16px;
background-color: #1292ee;
border-radius: 7px;
color: white;
cursor: pointer;
font-family: 'Poppins';
font-family: "Poppins";
font-weight: 400;
white-space: nowrap;
font-size: 14px;
font-size: 13.5px;
transition: all 0.2s;
&:hover {
background-color: #0985be;