Merge pull request 'svtech requirement' (#289) from svtechissue into main

Reviewed-on: Pozomind/pozo-retail-app#289

src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponent.jsx

@@ -1661,6 +1661,7 @@ const SelectionComponent = forwardRef((props, ref) => {
                 ''
               )}
             </div>
+
             <Checkbox.Group
               style={{
                 width: '100%',
@@ -1670,7 +1671,15 @@ const SelectionComponent = forwardRef((props, ref) => {
             >
               <Row>
                 {sizeCheckList
-                  ?.filter((item) => item.ConfigName)
+                  ?.filter((item) => {
+                    if (item.ConfigName?.toLowerCase?.() === 'rate with tax') {
+                      const rateConfigId = sizeCheckList?.find(
+                        (opt) => opt.ConfigName?.toLowerCase?.() === 'rate'
+                      )?.ConfigId;
+                      return selectedSizeCheckedValues?.includes(rateConfigId);
+                    }
+                    return Boolean(item.ConfigName);
+                  })
                   ?.map((value, key) => (
                     <Checkbox
                       style={{ padding: '12px' }}

src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx

@@ -74,6 +74,7 @@ const TaxInvoice = ({
   const FieldDetails = useSelector(GloabalFieldDetails);
   console.log(FieldDetails, "FieldDetails")
   const Discount = FieldDetails?.['Discount'];
+  const rate_with_tax = FieldDetails?.['Rate with Tax'];
   console.log(Discount, "Discount")
   // Function to convert number to words
   const numberToWords = (num) => {
@@ -984,7 +985,7 @@ const TaxInvoice = ({
                       >
                         {Number(
                           table2Data?.OrderType !== 'E'
-                            ? item.Rate - (item?.SinglePc === 'Y' ? (item?.TaxAmt / item?.SalesQty) : item.ProdTaxAmt)
+                            ? rate_with_tax ? item.Rate : item.Rate - (item?.SinglePc === 'Y' ? (item?.TaxAmt / item?.SalesQty) : item.ProdTaxAmt)
                             : item.Rate || 0
                         ).toLocaleString('en-IN', {
                           minimumFractionDigits: 2,