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

after resolve conflicts

This commit is contained in:
Your Name 2026-02-25 16:59:05 +05:30
parent 76c6d44ef3
commit bdd9ea7a39
2 changed files with 750 additions and 693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1357
src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
View File

File diff suppressed because it is too large Load Diff

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

@ -37,6 +37,7 @@
text-align: center;
}
.BSItemCard-master-container {
display: flex;
flex-direction: row;
@ -162,6 +163,7 @@
column-gap: 0.3rem;
row-gap: 0.5rem;
cursor: pointer;
// vicky
justify-content: space-around;
}
@ -239,6 +241,7 @@
column-gap: 0.5rem !important;
}
.ant-modal .ant-modal-content {
padding: 1rem !important;
}
@ -266,9 +269,12 @@
.BSItemCard-itemPrice {
font-size: 9px !important;
//nk
width: 60px !important;
//
}
//nk
.qtyUomName-itemCard {
width: 78px !important;
}
@ -309,7 +315,9 @@
.BSItemCard-master-container {
padding: 0px 0px;
justify-content: center !important;
// padding-bottom: 10rem !important;
padding-bottom: 1rem !important;
// column-gap: 0.1rem !important;
}
.BSItemCard-container {
@ -325,6 +333,7 @@
width: 8rem !important;
height: 6rem !important;
}
.BSItemCard-itemName {
width: 60px !important;
font-size: 10px;
@ -335,10 +344,12 @@
.bs-item-card-masterdiv {
height: inherit;
}
}
@media (min-width: 500px) and (max-width: 767px) {
.bs-item-card-masterdiv {
// height: 77vh !important;
height: inherit;
}
@ -352,6 +363,7 @@
@media (min-width: 280px) and (max-width: 499px) {
.bs-item-card-masterdiv {
// height: 60vh !important;
height: inherit;
}
@ -362,6 +374,7 @@
}
}
.QRStockchange-table thead {
position: sticky;
top: 0;
@ -373,7 +386,7 @@
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;
font-weight: 600 !important;
font-size: 14px;
@ -393,7 +406,10 @@
}
.BkPrdCardDeActive {
// pointer-events: none;
border: 1px solid #f10000;
// border-radius: 8px;
.BSItemCard-container-smallimage {
width: 10.9rem;
}
@ -496,6 +512,7 @@
flex-direction: column;
justify-content: center;
column-gap: 0.1rem;
border-radius: 2px;
}
@ -505,19 +522,6 @@
font-family: "Gilroy";
text-align: center;
}
.qtyprice {
font-size: 16px;
background-color: var(--DEFAULT_SELECTED_COLOR);
color: #fff;
// padding: 0rem 2rem;
width: 105px;
display: flex;
font-family: var(--PARA_FONT_FAMILY);
justify-content: center;
text-align: center;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}
//nk
.qtyUomName-itemCard {
@ -531,6 +535,20 @@
width: 105px;
}
.qtyprice {
font-size: 16px;
background-color: var(--DEFAULT_SELECTED_COLOR);
color: #fff;
// padding: 0rem 2rem;
width: 105px;
display: flex;
font-family: var(--PARA_FONT_FAMILY);
justify-content: center;
text-align: center;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}
.Card-modal-table .ant-pagination {
position: sticky;
bottom: 0;
@ -539,13 +557,13 @@
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;
font-weight: 600 !important;
font-size: 14px;
}
.Card-modal-table .ant-table-row > td {
.Card-modal-table .ant-table-row>td {
color: black !important;
font-weight: 500 !important;
font-size: 16px;
@ -800,6 +818,8 @@
.Payment-loader1 {
.Payment-loader {
// column-gap: 1rem;
.contener_mixte {
top: 5px;
right: 12rem;
@ -810,26 +830,28 @@
.EditQuantity-Master {
.Re-Print-table {
width: 100% !important;
scrollbar-width: none;
}
.ant-table-thead tr {
background-color: #1292ee !important;
}
}
.webkit-ul {
height: 35vh;
overflow-y: auto;
/* Firefox */
scrollbar-width: thin;
/* Options: auto | thin | none */
scrollbar-color: #c1c1c1 transparent;
}
/* WebKit Browsers: Chrome, Edge, Safari */
.webkit-ul::-webkit-scrollbar {
width: 25px;
/* Adjust width as needed */
}
.webkit-ul::-webkit-scrollbar-track {
background: #f0f0f0;
/* Optional: add contrast to track */
border-radius: 10px;
}
@ -837,6 +859,7 @@
background-color: #c1c1c1;
border-radius: 10px;
border: 6px solid transparent;
/* Adjust for padding inside thumb */
background-clip: content-box;
transition: background-color 0.3s ease;
}
@ -999,6 +1022,7 @@
gap: 1.7rem !important;
overflow: scroll;
height: 100%;
scrollbar-width: none;
@media (max-width: 500px) {
gap: 0.5rem !important;
@ -1088,12 +1112,21 @@
}
.booked-text {
// color: #070;
color: rgb(241, 16, 16);
font-weight: 600;
cursor: not-allowed !important;
margin-top: 4px;
}
// .Available-text{
// color: rgb(41, 201, 41);
// font-weight: 600;
// cursor: not-allowed !important;
// margin-top: 4px;
// }
.slot-btn.incart {
background: #ffe066;
color: #222;
@ -1322,7 +1355,7 @@
font-family: "Poppins";
font-size: 0.8rem;
> div:nth-child(1) {
>div:nth-child(1) {
font-size: 0.8rem;
font-weight: 600;
}
@ -1631,6 +1664,7 @@
color: #ffffff;
border-color: #f44336;
cursor: not-allowed;
&:hover {
color: #c90b0b;
background-color: #ffff;
@ -1647,6 +1681,7 @@
background-color: #ffe8bf;
color: #5f4204;
border-color: #ff9800;
&:hover {
background-color: #5f4204;
color: #ffe8bf;
@ -1658,6 +1693,10 @@
color: #ffffff;
border-color: #31a0f0;
cursor: not-allowed;
// &:hover{
// color:#148498;
// background-color: #fff;
// }
}
&.selected {
@ -2221,9 +2260,11 @@
cursor: pointer;
height: 270px;
width: 195px;
// background-color: #fff;
border-radius: 0.75rem;
display: flex;
flex-direction: column;
// justify-content: space-between;
margin-top: 10px;
position: relative;
border: 2px solid rgba(0, 0, 0, 0.3);
@ -2231,6 +2272,7 @@
.voiceToTextIcon {
position: fixed;
// width: max-content;
top: 7px;
left: 10px;
display: flex;
@ -2275,4 +2317,4 @@
top: 2px;
left: 8px;
}
}
}