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

Merge pull request 'Responsive masters' (#123) from Feb10Res into main 

Reviewed-on: Pozomind/pozo-retail-app#123
This commit is contained in:
karthikalakshmi 2026-02-10 16:34:34 +05:30
parent ee5a123e63 7536be8bb9
commit 06c17e23aa
8 changed files with 1785 additions and 1722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ const PreferenceList = () => {
const buildInitialValues = () => ({ const buildInitialValues = () => ({
dashboard: allSettingsMap['dashboard'] === 'Y', dashboard: allSettingsMap['dashboard'] === 'Y',
shortcutkeys:allSettingsMap['shortcutkeys']==="Y", shortcutkeys: allSettingsMap['shortcutkeys'] === 'Y',
autoreceivestock: allSettingsMap['autoreceivestock'] === 'Y', autoreceivestock: allSettingsMap['autoreceivestock'] === 'Y',
decimal: allSettingsMap['decimal'] === 'Y', decimal: allSettingsMap['decimal'] === 'Y',
enabledModules: [ enabledModules: [
@ -287,7 +287,7 @@ const PreferenceList = () => {
const key = setting.SettingIdName.toLowerCase(); const key = setting.SettingIdName.toLowerCase();
const boolValues = { const boolValues = {
dashboard: values.dashboard, dashboard: values.dashboard,
shortcutkeys:values.shortcutkeys, shortcutkeys: values.shortcutkeys,
autoreceivestock: values.autoreceivestock, autoreceivestock: values.autoreceivestock,
decimal: values.decimal, decimal: values.decimal,
searchfocus: values.searchfocus, searchfocus: values.searchfocus,
@ -564,7 +564,7 @@ const PreferenceList = () => {
Sales Page Sales Page
</div> </div>
{renderCheckbox('searchfocus', 'Always focus the search bar?')} {renderCheckbox('searchfocus', 'Always focus the search bar?')}
{renderCheckbox( {renderCheckbox(
'shortcutkeys', 'shortcutkeys',
'Would you like to enable the shortcut keys?' 'Would you like to enable the shortcut keys?'
)} )}
@ -589,7 +589,7 @@ const PreferenceList = () => {
</Checkbox.Group> </Checkbox.Group>
</Form.Item> </Form.Item>
)} )}
{((allSettingsMap['dinein'] !== undefined && dinePreference) || {((allSettingsMap['dinein'] !== undefined && dinePreference) ||
allSettingsMap['estimation'] !== undefined) && ( allSettingsMap['estimation'] !== undefined) && (
<Form.Item <Form.Item
name="enabledModules" name="enabledModules"
@ -627,7 +627,7 @@ const PreferenceList = () => {
'customisedbillnumber', 'customisedbillnumber',
'Do you Want Customised Bill Number?' 'Do you Want Customised Bill Number?'
)} )}
{renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')} {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
{renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')} {renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')}
{/* {renderCheckbox('editbill', 'Do you want to edit the previously created bill?')} */} {/* {renderCheckbox('editbill', 'Do you want to edit the previously created bill?')} */}
</div> </div>
@ -749,7 +749,6 @@ const PreferenceList = () => {
'estimateprintheader', 'estimateprintheader',
'Do you want to include a header when printing Estimate bills?' 'Do you want to include a header when printing Estimate bills?'
)} )}
</div> </div>
<div className="PreferencesBTN"> <div className="PreferencesBTN">
<Buttons <Buttons

18
src/Pages/Preference/PreferenceList.scss
View File

@ -18,7 +18,7 @@
color: #1890ff; // Ant Design blue color: #1890ff; // Ant Design blue
} }
.ant-form-item-label>label { .ant-form-item-label > label {
font-weight: 500; font-weight: 500;
color: #000000; color: #000000;
font-size: 16px; font-size: 16px;
@ -62,7 +62,7 @@
.submitButton { .submitButton {
position: unset; position: unset;
>button { > button {
width: max-content; width: max-content;
bottom: 30px; bottom: 30px;
} }
@ -83,7 +83,7 @@
.menu-section { .menu-section {
padding: 10px 0; padding: 10px 0;
>div { > div {
font-family: "Poppins"; font-family: "Poppins";
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
@ -99,6 +99,14 @@
&:hover { &:hover {
background-color: #c0cbf8; background-color: #c0cbf8;
} }
@media (max-width: 500px) {
border: none !important;
text-decoration: none !important;
font-style: unset !important;
}
}
@media (max-width: 500px) {
overflow: auto;
} }
} }
@ -118,7 +126,7 @@
font-size: 1rem; font-size: 1rem;
} }
.ant-form-item-label>label { .ant-form-item-label > label {
font-size: 14px; font-size: 14px;
} }
@ -141,7 +149,7 @@
margin: 0; margin: 0;
text-decoration: underline; text-decoration: underline;
>div { > div {
font-size: 12px; font-size: 12px;
margin: 0; margin: 0;
background-color: unset; background-color: unset;

2345
src/Pages/Product/ProductForm.jsx
View File

File diff suppressed because it is too large Load Diff

1025
src/Pages/Reports/EmployeeSettlement/EmployeeSettlement.jsx
View File

File diff suppressed because it is too large Load Diff

45
src/Pages/StockMaster/StockList.jsx
View File

@ -241,7 +241,6 @@ const StockList = () => {
if (Response?.data?.statusCode === 1) { if (Response?.data?.statusCode === 1) {
return Response?.data?.data; return Response?.data?.data;
} else { } else {
return []; return [];
} }
}; };
@ -295,7 +294,6 @@ const StockList = () => {
setpage(1); setpage(1);
return Response?.data?.data; return Response?.data?.data;
} else { } else {
return []; return [];
} }
} }
@ -892,25 +890,25 @@ const StockList = () => {
PaymentAmount: PaymentAmount.toFixed(2), PaymentAmount: PaymentAmount.toFixed(2),
InvoiceDate: groupInfo.InwardDate InvoiceDate: groupInfo.InwardDate
? moment(groupInfo.InwardDate, 'YYYY-MM-DD').format( ? moment(groupInfo.InwardDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
SuppInvoiceNo: groupInfo.SupplierInvoiceNumber, SuppInvoiceNo: groupInfo.SupplierInvoiceNumber,
SuppInvoiceDate: groupInfo.SupplierInvoiceDate SuppInvoiceDate: groupInfo.SupplierInvoiceDate
? moment(groupInfo.SupplierInvoiceDate, 'YYYY-MM-DD').format( ? moment(groupInfo.SupplierInvoiceDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
DeliveryChallanNo: groupInfo.DeliveryChallanNo, DeliveryChallanNo: groupInfo.DeliveryChallanNo,
DeliveryInvoiceDate: groupInfo.DeliveryInvoiceDate DeliveryInvoiceDate: groupInfo.DeliveryInvoiceDate
? moment(groupInfo.DeliveryInvoiceDate, 'YYYY-MM-DD').format( ? moment(groupInfo.DeliveryInvoiceDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
DueDate: groupInfo.DueDate DueDate: groupInfo.DueDate
? moment(groupInfo.DueDate, 'YYYY-MM-DD').format( ? moment(groupInfo.DueDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
InvoiceAmount: Totalamount.toFixed(2), InvoiceAmount: Totalamount.toFixed(2),
TaxAmount: Totaltax.toFixed(2), TaxAmount: Totaltax.toFixed(2),
@ -928,13 +926,13 @@ const StockList = () => {
FreeQty: item.FreeQty, FreeQty: item.FreeQty,
ManufDate: item.ManufactureDate ManufDate: item.ManufactureDate
? moment(item.ManufactureDate, 'YYYY-MM-DD').format( ? moment(item.ManufactureDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
ExpDate: item.ExpireDate ExpDate: item.ExpireDate
? moment(item.ExpireDate, 'YYYY-MM-DD').format( ? moment(item.ExpireDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
BatchNo: item.BatchNo, BatchNo: item.BatchNo,
ModelNo: item.ModelNo, ModelNo: item.ModelNo,
@ -991,7 +989,6 @@ const StockList = () => {
(e) => `${e.ProdName} (${e.Size} ${e.UomName})` (e) => `${e.ProdName} (${e.Size} ${e.UomName})`
); );
const SupplierNames = SupplierData?.map((e) => e.SuppName); const SupplierNames = SupplierData?.map((e) => e.SuppName);
const TaxDatas = TaxData.map((e) => e.TaxIdName); const TaxDatas = TaxData.map((e) => e.TaxIdName);
@ -1006,9 +1003,6 @@ const StockList = () => {
const InwardDtlIds = Varientdata?.map((e) => e.InwardDtlId); const InwardDtlIds = Varientdata?.map((e) => e.InwardDtlId);
const StockProductId = Varientdata?.map((e) => e.ProdId); const StockProductId = Varientdata?.map((e) => e.ProdId);
const onFinish = async () => { const onFinish = async () => {
const template = barcodeTemplateDetails?.find( const template = barcodeTemplateDetails?.find(
(find) => find.SessionName === dropdownValue (find) => find.SessionName === dropdownValue
@ -1164,7 +1158,7 @@ const StockList = () => {
? countData?.length ? countData?.length
: 0 : 0
: data?.[0]?.TotalCount; : data?.[0]?.TotalCount;
console.log(debouncedSearchText, countData, data, "kkkk", countOfProduct) console.log(debouncedSearchText, countData, data, 'kkkk', countOfProduct);
return ( return (
<div className="userPageTable"> <div className="userPageTable">
<div className="userPageContent"> <div className="userPageContent">
@ -1178,9 +1172,10 @@ const StockList = () => {
<FormHeader title={'Product Receipt'} /> <FormHeader title={'Product Receipt'} />
</div> </div>
<div <div
className="searchAddDiv" className="StocklistsearchAddDiv"
style={{ justifyContent: 'flex-start' }} style={{ justifyContent: 'flex-start', flexWrap: 'wrap' }}
><Tooltip title="Search using Invoice No,Supp Name"> >
<Tooltip title="Search using Invoice No,Supp Name">
<div className="formSearch" style={{ Width: '200px' }}> <div className="formSearch" style={{ Width: '200px' }}>
<Search <Search
placeholder="Search by Invoice No" placeholder="Search by Invoice No"
@ -1229,7 +1224,7 @@ const StockList = () => {
data={filteredData} data={filteredData}
dataSource={filteredData} dataSource={filteredData}
onChange={handleChange} onChange={handleChange}
// pagination={handlePageChange} // pagination={handlePageChange}
/>{' '} />{' '}
{countOfProduct > 10 && ( {countOfProduct > 10 && (
<Pagination <Pagination
@ -1393,7 +1388,9 @@ const StockList = () => {
generateQRCodeCopy={(code) => generateQRCodeCopy={(code) =>
generateQRCodeCopy(QrandbarcodeDatas, code) generateQRCodeCopy(QrandbarcodeDatas, code)
} }
generateCodeImage={(code, codeType = 'Q') => generateCodeImage(code, codeType, QrandbarcodeDatas)} generateCodeImage={(code, codeType = 'Q') =>
generateCodeImage(code, codeType, QrandbarcodeDatas)
}
imageTagBarcodeAndQR={imageTagBarcodeAndQR} imageTagBarcodeAndQR={imageTagBarcodeAndQR}
dropdownValue={dropdownValue} dropdownValue={dropdownValue}
barcodeTemplateDetails={barcodeTemplateDetails} barcodeTemplateDetails={barcodeTemplateDetails}

4
src/Styles/Dining/DiningForm.scss
View File

@ -13,7 +13,6 @@ input::-webkit-inner-spin-button {
.Dinein-Form-Structure { .Dinein-Form-Structure {
width: 80vw; width: 80vw;
background-color: #fff; background-color: #fff;
padding: 0rem 2rem;
border-radius: 15px; border-radius: 15px;
} }
.Dinein-Form { .Dinein-Form {
@ -21,7 +20,8 @@ input::-webkit-inner-spin-button {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
padding-top: 2rem; padding-top: 2rem;
gap: 1rem; gap: 0;
column-gap: 1rem;
border-radius: 10px; border-radius: 10px;
flex-wrap: wrap; flex-wrap: wrap;
} }

15
src/Styles/Employee/EmpMaster.scss
View File

@ -3,7 +3,7 @@
} }
.required:after { .required:after {
content: ' *'; content: " *";
color: #ff4d4f; color: #ff4d4f;
} }
@ -18,7 +18,7 @@
border: none; border: none;
} }
.subinputForm .ant-input-affix-wrapper>input.ant-input { .subinputForm .ant-input-affix-wrapper > input.ant-input {
font-size: inherit; font-size: inherit;
border: none; border: none;
padding: 18px 14px 6px 1px !important; padding: 18px 14px 6px 1px !important;
@ -96,7 +96,6 @@
} }
} }
.image-preview__content { .image-preview__content {
background-color: #f5f5f5; background-color: #f5f5f5;
margin: 1rem; margin: 1rem;
@ -144,8 +143,6 @@
&:active { &:active {
background-color: #5e5e5e; background-color: #5e5e5e;
} }
} }
.padding-less-modal { .padding-less-modal {
@ -153,3 +150,11 @@
padding: 34px !important; padding: 34px !important;
} }
} }
.StocklistsearchAddDiv {
display: flex;
align-items: center;
gap: 1rem;
flex-wrap: wrap;
margin-bottom: 10px;
}

34
src/Styles/Product/Product.scss
View File

@ -28,6 +28,7 @@
.productinputForm { .productinputForm {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
gap: 6px;
& .field-DropDown { & .field-DropDown {
width: 200px !important; width: 200px !important;
@ -124,6 +125,24 @@
left: 2px; left: 2px;
} }
} }
.ProSubRowFlex {
display: flex;
flex-wrap: wrap;
flex-direction: row;
gap: 1.5rem;
width: 100%;
.ant-form-item,
.float-label {
margin-bottom: 0;
}
.ant-form-item-explain-error {
position: relative;
top: 16px;
left: 2px;
}
}
.scannerdiv { .scannerdiv {
display: flex; display: flex;
@ -469,10 +488,12 @@
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;
padding-bottom: 0; padding-bottom: 0;
flex-direction: row !important;
@media (max-width: 768px) { @media (max-width: 768px) {
gap: 10px; gap: 10px;
align-items: flex-start; align-items: flex-start;
justify-content: space-between;
} }
} }
@ -488,7 +509,8 @@
} }
.productFormproductImg { .productFormproductImg {
width: 350px; width: 250px;
height: 190px;
align-items: center; align-items: center;
} }
@ -510,3 +532,13 @@
bottom: 8px; bottom: 8px;
} }
} }
.ProductMainRowFlex {
display: flex;
align-items: flex-start;
gap: 1rem;
width: 100%;
@media (max-width: 768px) {
flex-direction: column;
}
}