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

Merge pull request 'Fix = TaxInvoice Printer Design Issue #41' (#42) from StandPrint into main 

Reviewed-on: Pozomind/pozo-retail-app#42
This commit is contained in:
karthikalakshmi 2026-01-30 16:24:10 +05:30
parent b0f724d92c 2cb2199390
commit 2f680dbd1a
7 changed files with 1021 additions and 1001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
src/Pages/BookingScreen/Components/UtillComponents/MultipleSearch.jsx
View File

@ -1,126 +1,125 @@
import React, { useEffect, useState } from "react";
import { getSession } from "../../../../Services/Others";
import { useDispatch } from "react-redux";
import { getmultipleSearch, PostProductSearch } from "../../../../Features/BookingScreen/BookingData/BookingData";
import {
getmultipleSearch,
PostProductSearch,
} from "../../../../Features/BookingScreen/BookingData/BookingData";
import Buttons from "../../../../Components/Forms/Buttons";
const MultipleSearch = ({ close }) => {
const CompId = getSession("CompId");
const BranchId = getSession("BranchId");
const AppId = getSession("AppId");
const dispatch = useDispatch();
const CompId = getSession("CompId");
const BranchId = getSession("BranchId");
const AppId = getSession("AppId");
const dispatch = useDispatch();
const options = [
{ label: "Product Name", value: "ProdName" },
{ label: "Product Variant Name", value: "ProdVariantName" },
// { label: "Product ID", value: "ProdId" },
{ label: "One Piece QR", value: "OnePcQR" },
{ label: "QR Code", value: "QrCode" },
{ label: "Product Name Code", value: "ProdNameCode" },
{ label: "Category Name", value: "CategoryName" },
{ label: "Sub Category Name", value: "SubCategoryName" },
{ label: "Brand Name", value: "BrandName" },
];
const options = [
{ label: "Product Name", value: "ProdName" },
{ label: "Product Variant Name", value: "ProdVariantName" },
// { label: "Product ID", value: "ProdId" },
{ label: "One Piece QR", value: "OnePcQR" },
{ label: "QR Code", value: "QrCode" },
{ label: "Product Name Code", value: "ProdNameCode" },
{ label: "Category Name", value: "CategoryName" },
{ label: "Sub Category Name", value: "SubCategoryName" },
{ label: "Brand Name", value: "BrandName" },
];
const [selectedValues, setSelectedValues] = useState([]);
console.log(selectedValues, "selectedValuesselectedValues");
useEffect(() => {
GetmultipleSearchData();
}, []);
const [selectedValues, setSelectedValues] = useState([]);
console.log(selectedValues, 'selectedValuesselectedValues');
const postMultipleSearch = async () => {
if (selectedValues.length === 0) {
alert("Please select at least one option!");
return;
}
const data = {
CompId: CompId,
BranchId: BranchId,
AppId: AppId,
SearchTerms: selectedValues,
};
try {
const response = await dispatch(PostProductSearch(data)).unwrap();
console.log("Search Response:", response);
if (response?.data?.statusCode == 1) {
setSelectedValues("");
close(false);
}
} catch (error) {
console.error("Search Error:", error);
}
};
useEffect(() => {
GetmultipleSearchData();
}, []);
const postMultipleSearch = async () => {
if (selectedValues.length === 0) {
alert("Please select at least one option!");
return;
}
const data = {
CompId: CompId,
BranchId: BranchId,
AppId: AppId,
SearchTerms: selectedValues,
};
try {
const response = await dispatch(PostProductSearch(data)).unwrap();
console.log("Search Response:", response);
if (response?.data?.statusCode == 1) {
setSelectedValues('')
close(false);
}
} catch (error) {
console.error("Search Error:", error);
}
const GetmultipleSearchData = async () => {
const data = {
AppId,
CompId,
BranchId,
};
try {
const response = await dispatch(getmultipleSearch(data)).unwrap();
const GetmultipleSearchData = async () => {
const data = {
AppId,
CompId,
BranchId,
};
if (response?.data?.statusCode === 1) {
const selected =
response?.data?.data?.[0]?.SearchTermDtl?.map(
(item) => item?.SearchTerm,
) || [];
try {
const response = await dispatch(getmultipleSearch(data)).unwrap();
setSelectedValues(selected);
}
} catch (error) {
console.error("Get Search Terms Error:", error);
}
};
if (response?.data?.statusCode === 1) {
const selected = response?.data?.data?.[0]?.SearchTermDtl?.map(
(item) => item?.SearchTerm
) || [];
setSelectedValues(selected);
}
} catch (error) {
console.error("Get Search Terms Error:", error);
}
};
return (
<>
<div>
{options.map((item) => (
<label
key={item.value}
style={{
display: "block",
marginBottom: "6px",
cursor: "pointer",
fontSize: "14px",
color: "#333",
}}
>
<input
type="checkbox"
checked={selectedValues.includes(item.value)}
onChange={() => {
setSelectedValues((prev) =>
prev.includes(item.value)
? prev.filter((i) => i !== item.value)
: [...prev, item.value]
);
}}
style={{ marginRight: "8px" }}
/>
{item.label}
</label>
))}
</div>
<div>
<Buttons
buttonText={'Submit'}
handleSubmit={postMultipleSearch}
color="901D77"
// icon={<PlusOutlined />}
/>
</div>
</>
);
return (
<>
<div
style={{ fontFamily: "Poppins", fontWeight: "500", marginTop: "10px" }}
>
{options.map((item) => (
<label
key={item.value}
style={{
display: "block",
marginBottom: "6px",
cursor: "pointer",
fontSize: "14px",
color: "#333",
margin: "6px 0",
}}
>
<input
type="checkbox"
checked={selectedValues.includes(item.value)}
onChange={() => {
setSelectedValues((prev) =>
prev.includes(item.value)
? prev.filter((i) => i !== item.value)
: [...prev, item.value],
);
}}
style={{ marginRight: "8px" }}
/>
{item.label}
</label>
))}
</div>
<div style={{ display: "flex", width: "100%", marginTop: "2rem" }}>
<Buttons
buttonText={"Submit"}
handleSubmit={postMultipleSearch}
color="901D77"
/>
</div>
</>
);
};
export default MultipleSearch;

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

File diff suppressed because it is too large Load Diff

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

@ -750,7 +750,16 @@ const PreferenceList = () => {
{renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
</div>
<div className="submitButton">
</Form>
</div>
<Form
ref={formRef}
layout="vertical"
onFinish={handleSubmit}
initialValues={initialValues}
className="preferences-list"
>
<div className="PreferencesBTN">
<Buttons
buttonText="Submit Preferences"
color="901D77"
@ -759,8 +768,7 @@ const PreferenceList = () => {
icon={<ArrowRightOutlined />}
/>
</div>
</Form>
</div>
</Form>
</div>
</>
);

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

@ -1,12 +1,12 @@
.preferences-list {
max-height: 84vh;
max-height: 75vh;
overflow-y: auto;
background: #fff;
width: 100%;
scrollbar-width: thin;
scroll-behavior: smooth;
border-radius: 12px;
padding-bottom: 4rem;
padding-bottom: 3rem;
.preference-headers {
font-size: 1.2rem;
@ -41,7 +41,7 @@
}
.ant-form-item {
margin-bottom: 1.2rem;
margin-bottom: 1rem;
}
.ant-checkbox-wrapper,
@ -49,11 +49,6 @@
margin-right: 1rem;
}
.ant-btn {
margin-top: 2rem;
float: right;
}
// Optional: Scrollbar for long modals
&::-webkit-scrollbar {
width: 6px;
@ -89,7 +84,7 @@
padding: 10px 0;
> div {
font-family: 'Poppins';
font-family: "Poppins";
font-weight: 400;
font-size: 14px;
margin: 4px 0;
@ -154,3 +149,13 @@
}
}
}
.PreferencesBTN {
display: flex;
align-items: flex-start;
justify-content: flex-end;
width: 100%;
margin-top: 1rem;
.primary_Button {
width: 200px !important;
}
}

2
src/Styles/BookingScreen/Components/BSCategories/BSCategoryHorizontal.scss
View File

@ -325,7 +325,7 @@
}
.CategoryHorizontalNew {
padding: 1rem 1rem;
padding: 10px 10px;
font-family: 'Inter', sans-serif;
display: flex;
align-items: center;

2
src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
View File

@ -116,7 +116,7 @@
.CustomerActions {
display: flex;
align-items: center;
gap: 0.1rem;
gap: 0.3rem;
.RiVerifiedBadgeFill {
transition: all 0.2s ease-in-out;

23
src/Styles/Reports/KOT/kot.scss
View File

@ -71,7 +71,7 @@
.kot-date {
display: flex;
font-size: 14px;
font-family: 'Gilroy';
font-family: "Gilroy";
font-weight: 500;
border-radius: 5px;
color: #212529 !important;
@ -122,7 +122,7 @@
right: 0;
}
.ant-segmented-item-label {
font-family: 'Poppins';
font-family: "Poppins";
font-size: 12px !important;
}
.ant-segmented-item-selected {
@ -134,9 +134,7 @@
}
}
.kot-search-dev
:where(.css-dev-only-do-not-override-2i2tap).ant-segmented
.ant-segmented-group {
.kot-search-dev :where(.css-dev-only-do-not-override-2i2tap).ant-segmented .ant-segmented-group {
position: relative;
display: flex;
//srinath
@ -149,9 +147,7 @@
rgba(0, 0, 0, 0.3) 0px 3px 7px -3px;
}
.kot-search-dev
:where(.css-dev-only-do-not-override-2i2tap).ant-segmented
.ant-segmented-item-selected {
.kot-search-dev :where(.css-dev-only-do-not-override-2i2tap).ant-segmented .ant-segmented-item-selected {
background-color: #ffffff;
box-shadow:
0 1px 2px 0 rgba(0, 0, 0, 0.03),
@ -168,6 +164,13 @@
margin: 12px 0 12px 0;
height: 70vh;
overflow: scroll;
.ant-table-thead {
background-color: #2c88ee !important;
}
.ant-table-cell {
padding: 6px !important;
}
@media (max-width: 768px) {
height: 60vh;
scrollbar-width: thin;
@ -179,7 +182,7 @@
}
table {
tbody {
font-family: 'Poppins';
font-family: "Poppins";
> tr:nth-child(even) {
background-color: #b4b4b4;
}
@ -221,7 +224,7 @@
transition: all 0.2s ease;
min-width: 70px;
text-align: center;
font-family: 'Poppins', sans-serif;
font-family: "Poppins", sans-serif;
color: #fff;
-webkit-text-stroke-width: 0.1px;