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

Merge pull request 'Voice to Text' (#208) from OptimUpdate into main 

Reviewed-on: Pozomind/pozo-retail-app#208
Reviewed-by: karthikalakshmi <karthigalakshmi@pozomind.com>
This commit is contained in:
karthikalakshmi 2026-03-02 16:48:06 +05:30
parent b27a87d389 81dbee5072
commit 3d2275a904
2 changed files with 541 additions and 530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx
View File

@ -3693,7 +3693,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdName === ProdName (a) => a?.ProdName === ProdName
); );
@ -3894,7 +3894,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return ( return (
@ -3930,7 +3930,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
parseInt(ItemQuantity) > parseInt(ItemQuantity) >
@ -4016,7 +4016,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return ( return (
@ -4055,7 +4055,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
parseInt(ItemQuantity) > parseInt(ItemQuantity) >
@ -4147,7 +4147,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
); );
@ -4190,7 +4190,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
@ -4274,7 +4274,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
); );
@ -4321,7 +4321,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
@ -5222,8 +5222,7 @@ const BSItemCard = (props) => {
if (variantWithDetails) { if (variantWithDetails) {
// Access the details of the first variant with ProdVariantDetails // Access the details of the first variant with ProdVariantDetails
const firstVariantDetails = const firstVariantDetails =
variantWithDetails?.ProdVariantDetails?.[0]?.StockDetails?.[0] variantWithDetails?.ProdVariantDetails?.[0]?.StockDetails?.[0]?.MRP;
?.MRP;
return firstVariantDetails; return firstVariantDetails;
} else { } else {
// Handle the case where no variant satisfies the condition // Handle the case where no variant satisfies the condition
@ -6076,10 +6075,22 @@ const BSItemCard = (props) => {
position: 'absolute', position: 'absolute',
zIndex: '12', zIndex: '12',
top: top:
templateData?.BookingLayout?.[0] === 'Layout5' || templateData?.BookingNavbar?.[0] === 'Navbar3' &&
templateData?.BookingLayout?.[0] === 'Layout4' || [
templateData?.BookingLayout?.[0] === 'Layout6' 'Layout1',
? '2.5rem' 'Layout2',
'Layout3',
'Layout4',
'Layout5',
'Layout6',
].includes(templateData?.BookingLayout?.[0])
? '4.4rem'
: ['Layout4', 'Layout5', 'Layout6'].includes(
templateData?.BookingLayout?.[0]
)
? '2.8rem'
: templateData?.BookingNavbar?.[0] === 'Navbar3'
? '3rem'
: '', : '',
}} }}
> >
@ -6485,8 +6496,9 @@ const BSItemCard = (props) => {
: '', : '',
}} }}
> >
{ItemMRP(item) > 0 ? `MRP: ₹ ${ItemMRP(item)}` : ''} {ItemMRP(item) > 0
? `MRP: ₹ ${ItemMRP(item)}`
: ''}
</p> </p>
)} )}
{cardFunction?.Price && {cardFunction?.Price &&
@ -6932,8 +6944,9 @@ const BSItemCard = (props) => {
: '', : '',
}} }}
> >
{ItemMRP(item) > 0 ? `MRP: ₹ ${ItemMRP(item)}` : ''} {ItemMRP(item) > 0
? `MRP: ₹ ${ItemMRP(item)}`
: ''}
</p> </p>
)} )}
{cardFunction?.Price && {cardFunction?.Price &&
@ -7240,7 +7253,8 @@ const BSItemCard = (props) => {
</p> </p>
)} )}
</div> </div>
{cardFunction?.MRP && ((item?.OverAllQty !== undefined && {cardFunction?.MRP &&
((item?.OverAllQty !== undefined &&
!preferenceSingleSales !preferenceSingleSales
? returnCount( ? returnCount(
item?.ProductDetail?.[0]?.ProdName, item?.ProductDetail?.[0]?.ProdName,
@ -7258,11 +7272,13 @@ const BSItemCard = (props) => {
)) && ( )) && (
<div className="card4PriceUom"> <div className="card4PriceUom">
<div className="card4MRP"> <div className="card4MRP">
{ItemMRP(item) > 0 ? `MRP: ₹ ${ItemMRP(item)}` : ''} {ItemMRP(item) > 0
? `MRP: ₹ ${ItemMRP(item)}`
: ''}
</div> </div>
</div> </div>
)} )}
{ ((item?.OverAllQty !== undefined && {((item?.OverAllQty !== undefined &&
!preferenceSingleSales !preferenceSingleSales
? returnCount( ? returnCount(
item?.ProductDetail?.[0]?.ProdName, item?.ProductDetail?.[0]?.ProdName,

21
src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss
View File

@ -9,7 +9,7 @@
} }
.voiceToTextIcon { .voiceToTextIcon {
top: 10px; top: 13px;
} }
} }
@ -37,7 +37,6 @@
text-align: center; text-align: center;
} }
.BSItemCard-master-container { .BSItemCard-master-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -251,7 +250,6 @@
column-gap: 0.5rem !important; column-gap: 0.5rem !important;
} }
.ant-modal .ant-modal-content { .ant-modal .ant-modal-content {
padding: 1rem !important; padding: 1rem !important;
} }
@ -360,7 +358,6 @@
.bs-item-card-masterdiv { .bs-item-card-masterdiv {
height: inherit; height: inherit;
} }
} }
@media (min-width: 500px) and (max-width: 767px) { @media (min-width: 500px) and (max-width: 767px) {
@ -390,7 +387,6 @@
} }
} }
.QRStockchange-table thead { .QRStockchange-table thead {
position: sticky; position: sticky;
top: 0; top: 0;
@ -402,7 +398,7 @@
border-spacing: 0px; border-spacing: 0px;
} }
.QRStockchange-table .ant-table-wrapper .ant-table-thead>tr>th { .QRStockchange-table .ant-table-wrapper .ant-table-thead > tr > th {
color: black !important; color: black !important;
font-weight: 600 !important; font-weight: 600 !important;
font-size: 14px; font-size: 14px;
@ -573,13 +569,13 @@
background-color: #fafafa; background-color: #fafafa;
} }
.Card-modal-table .ant-table-wrapper .ant-table-thead>tr>th { .Card-modal-table .ant-table-wrapper .ant-table-thead > tr > th {
color: black !important; color: black !important;
font-weight: 600 !important; font-weight: 600 !important;
font-size: 14px; font-size: 14px;
} }
.Card-modal-table .ant-table-row>td { .Card-modal-table .ant-table-row > td {
color: black !important; color: black !important;
font-weight: 500 !important; font-weight: 500 !important;
font-size: 16px; font-size: 16px;
@ -834,7 +830,6 @@
.Payment-loader1 { .Payment-loader1 {
.Payment-loader { .Payment-loader {
// column-gap: 1rem; // column-gap: 1rem;
.contener_mixte { .contener_mixte {
top: 5px; top: 5px;
@ -992,14 +987,14 @@
} }
} }
.card4MRP { .card4MRP {
font-size: 0.80rem; font-size: 0.8rem;
line-height: 0.80rem; line-height: 0.8rem;
font-weight: 600; font-weight: 600;
color: #059669; color: #059669;
-webkit-text-stroke-width: 0.3px; -webkit-text-stroke-width: 0.3px;
@media (max-width: 500px) { @media (max-width: 500px) {
font-size: 0.50rem; font-size: 0.5rem;
} }
} }
@ -1382,7 +1377,7 @@
font-family: "Poppins"; font-family: "Poppins";
font-size: 0.8rem; font-size: 0.8rem;
>div:nth-child(1) { > div:nth-child(1) {
font-size: 0.8rem; font-size: 0.8rem;
font-weight: 600; font-weight: 600;
} }