Merge pull request 'Design isued fix in all modal' (#180) from OptimUpdate into main

Reviewed-on: Pozomind/pozo-retail-app#180
2026-02-25 18:30:45 +05:30 · 2026-02-25 18:30:45 +05:30 · d24945f7bd
parent 5bd84fe7d4 49017e7307
commit d24945f7bd
17 changed files with 825 additions and 807 deletions
--- a/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx
@ -16,6 +16,8 @@ import { TiDelete } from 'react-icons/ti';
 import BSBillingEbill from '../BSBillingEwayBill/BSBillingEbill';
 import Search from '../../../../../Components/Forms/Search';
 import { IoEye } from 'react-icons/io5';
+// src\Styles\BookingScreen\Components\UtillComponents\BSNavBarComponents.scss
+import "../../../../../Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss"
 const { RangePicker } = DatePicker;

 const ListOfSalesInvoices = (props) => {
@ -422,16 +424,6 @@ const ListOfSalesInvoices = (props) => {
                />
              </div>
            </div>
-            {/* <Button
-                    className="BSC1Payment-HoldModel-cancleall"
-                    type="primary"
-                    danger
-                    onClick={removeAll}
-                  // onClick={() => statusFormatter(record,index)}
-    
-                  >
-                    Clear All
-                  </Button> */}

            <div className="BSC1Payment-Tablediv">
              <Tables
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx
@ -21,6 +21,7 @@ import { TbAlertTriangleFilled } from 'react-icons/tb';
 import { IoEye } from 'react-icons/io5';
 import { DefaultModal } from '../../../../Components/Modal/DefaultModal';
 import { Tables } from '../../../../Components/Tables/Table';
+ import '../../../../Styles/OverAllStyle/OverAllStyle.scss';

 const NoDataComponent = () => (
  <div style={{ textAlign: 'center', padding: 20 }}>
@ -232,12 +233,12 @@ const BSExpireProductsList = () => {
    },
  ];
  const lowStockIwordCulumn = [
-     {
-          title: 'Stock Date',
-          dataIndex: 'InwardDate',
-          key: 'InwardDate',
-          render: (d) => (d ? ExtractDateFormate(d) : '-'),
-        },
+    {
+      title: 'Stock Date',
+      dataIndex: 'InwardDate',
+      key: 'InwardDate',
+      render: (d) => (d ? ExtractDateFormate(d) : '-'),
+    },
    {
      title: 'Balance Qty',
      align: 'right',
@ -301,10 +302,12 @@ const BSExpireProductsList = () => {
        </span>
      ) : (
        (expiredList?.length > 0 || lowStockList?.length > 0) && (
-          <span style={{ position: 'relative', display: 'inline-block' }}  onClick={onClickExpiredIcon}>
+          <span
+            style={{ position: 'relative', display: 'inline-block' }}
+            onClick={onClickExpiredIcon}
+          >
            <AiFillAlert
              className="alert-badge stock-alert-animation"
-             
              style={{ fontSize: 23, cursor: 'pointer', color: '#ff4d4f' }}
            />
            {
@ -332,7 +335,7 @@ const BSExpireProductsList = () => {
          </span>
        )
      )}
-    
+
      <Modal
        title="Low Stock / Expire Alerts"
        open={expireModelOpen}
@ -341,6 +344,7 @@ const BSExpireProductsList = () => {
        footer={null} // You can enable this if you want default buttons
        width={700}
        centered
+        className="LowStockAlterModal"
      >
        <Messages
          messageType={message.type}
@ -377,6 +381,7 @@ const BSExpireProductsList = () => {
        </div>

        <Table
+        className='LowStockAlterModalTable'
          rowKey="InwardDtlId"
          columns={
            selectedSegment === 'expired' ? expiredColumns : lowStockColumns
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx
@ -38,7 +38,7 @@ import { capitalizeFirstLetter } from '../../../../utils/calculations.js';
 const BSNavBarDragItems = ({
  type,
  drawerOpen = false,
-  setDrawerOpen = () => { },
+  setDrawerOpen = () => {},
 }) => {
  const draggingComponent = useSelector(GlobaldraggingComponent);
  const GlobalisFavClickedCheck = useSelector(GlobalisFavClicked);
@ -73,27 +73,27 @@ const BSNavBarDragItems = ({
      BranchId: BranchId,
      ...(draggingComponent == 'sub-category'
        ? {
-          ProdCat: MapData?.[0]?.ProdCat,
-          ProductSubCatDtl: MapData.map((item, index) => ({
-            ProdSubCat: item?.ProdSubCat,
-            DisplayProdSubCatNo: index + 1,
-          })),
-        }
-        : draggingComponent == 'category'
-          ? {
-            ProductCatDtl: MapData.map((item, index) => ({
-              ProdCat: item?.ProdCat,
-              DisplayProdCatNo: index + 1,
+            ProdCat: MapData?.[0]?.ProdCat,
+            ProductSubCatDtl: MapData.map((item, index) => ({
+              ProdSubCat: item?.ProdSubCat,
+              DisplayProdSubCatNo: index + 1,
            })),
          }
+        : draggingComponent == 'category'
+          ? {
+              ProductCatDtl: MapData.map((item, index) => ({
+                ProdCat: item?.ProdCat,
+                DisplayProdCatNo: index + 1,
+              })),
+            }
          : {
-            ProdCat: MapData?.[0]?.ProdCat || null,
-            ProdSubCat: MapData?.[0]?.ProdSubCat || null,
-            ProductDtl: MapData.map((item, index) => ({
-              ProdId: item?.ProdId,
-              DisplayProductNo: index + 1,
-            })),
-          }),
+              ProdCat: MapData?.[0]?.ProdCat || null,
+              ProdSubCat: MapData?.[0]?.ProdSubCat || null,
+              ProductDtl: MapData.map((item, index) => ({
+                ProdId: item?.ProdId,
+                DisplayProductNo: index + 1,
+              })),
+            }),

      UpdatedBy: UserId,
    };
@ -190,7 +190,15 @@ const BSNavBarDragItems = ({
      {Isdragging && favopen && (
        <div className="AddFavList addfavlist-master">
          <div className="AddFavList-subContainer">
-            <div style={{ display: 'flex', alignItems: 'center', gap: '5px' }}>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                gap: '5px',
+                justifyContent: 'space-between',
+                width: '100%',
+              }}
+            >
              <div className="DragChooseBTNs">
                {PurProductdata.map((item) => (
                  <button
@ -280,46 +288,46 @@ const BSNavBarDragItems = ({
                        (!GlobalisFavClickedCheck &&
                          draggingComponent !== 'card' &&
                          draggingComponent !== 'sub-category'))) ||
-                      (!GlobalisFavClickedCheck &&
-                        draggingComponent !== 'card' &&
-                        draggingComponent == 'sub-category') ||
-                      (!GlobalisFavClickedCheck &&
-                        draggingComponent == 'card' &&
-                        draggingComponent !== 'sub-category')
+                    (!GlobalisFavClickedCheck &&
+                      draggingComponent !== 'card' &&
+                      draggingComponent == 'sub-category') ||
+                    (!GlobalisFavClickedCheck &&
+                      draggingComponent == 'card' &&
+                      draggingComponent !== 'sub-category')
                      ? MapData?.map((item, index) => (
-                        <Draggable
-                          key={index}
-                          draggableId={index.toString()}
-                          index={index}
-                        >
-                          {(provided, snapshot) => (
-                            <div
-                              className="AddFavItemList4"
-                              ref={provided.innerRef}
-                              {...provided.draggableProps}
-                              {...provided.dragHandleProps}
-                              style={{
-                                ...provided.draggableProps.style,
-                                margin: 0,
-                                padding: '8px 12px',
-                                background: snapshot.isDragging
-                                  ? '#e0f7fa'
-                                  : '#fff',
-                                border: '1px solid #ccc',
-                                borderRadius: 4,
-                              }}
-                            >
-                              <p>
-                                {draggingComponent == 'category'
-                                  ? item?.ProdCatName
-                                  : draggingComponent == 'sub-category'
-                                    ? item?.ProdSubCatName
-                                    : item?.ProdName}
-                              </p>
-                            </div>
-                          )}
-                        </Draggable>
-                      ))
+                          <Draggable
+                            key={index}
+                            draggableId={index.toString()}
+                            index={index}
+                          >
+                            {(provided, snapshot) => (
+                              <div
+                                className="AddFavItemList4"
+                                ref={provided.innerRef}
+                                {...provided.draggableProps}
+                                {...provided.dragHandleProps}
+                                style={{
+                                  ...provided.draggableProps.style,
+                                  margin: 0,
+                                  padding: '8px 12px',
+                                  background: snapshot.isDragging
+                                    ? '#e0f7fa'
+                                    : '#fff',
+                                  border: '1px solid #ccc',
+                                  borderRadius: 4,
+                                }}
+                              >
+                                <p>
+                                  {draggingComponent == 'category'
+                                    ? item?.ProdCatName
+                                    : draggingComponent == 'sub-category'
+                                      ? item?.ProdSubCatName
+                                      : item?.ProdName}
+                                </p>
+                              </div>
+                            )}
+                          </Draggable>
+                        ))
                      : 'No Data Found'}
                    {provided.placeholder}
                  </div>
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx
@ -285,7 +285,7 @@ const BSPrinterSetting = ({
                            onClick={openPrinter}
                          >
                            <button
-                              className={`printer-button ${showPrinter ? 'active' : ''}`}
+                              className={`printer-button ${showPrinter ? 'active' : ''}`} 
                            >
                              <LuPrinter
                                size={20}
--- a/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
@ -20,8 +20,8 @@ import { useDispatch } from 'react-redux';
 import { PutStockPrice } from '../../../../Features/StockPriceUpdate/StockPriceUpdateMaster';
 import PriceChange from '../../../../Images/PayOptImgs/PriceChange.svg';
 import { v4 as uuidv4 } from 'uuid';
-// src\Styles\BookingScreen\Template\BSLayout2\BSLayout2.scss
 import '../../../../Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss';
+import '../../../../Styles/OverAllStyle/OverAllStyle.scss';

 const ProductPriceChange = ({
  showButton = true,
--- a/src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
+++ b/src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
@ -318,8 +318,7 @@ const BSLayout1 = () => {
  };
  const handleInvoiceClose = () => {
    setListOfInvoices(false);
-  };
-  // BSLayout1Data?.BookingNavbar?.[1]?.some((item) => item?.OptionName === "AddCustomer")
+  }; 
  return (
    <Suspense fallback={<CardSkeleton />}>
      {' '}
--- a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
+++ b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
--- a/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx
+++ b/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx
@ -743,7 +743,7 @@ const CounterCategoryMappingForm = () => {
          </Form> */}

          {CounterDetail?.length > 0 && (
-            <div style={{ height: '400px', overflowY: 'scroll' }}>
+            <div style={{ height: '400px', overflowY: 'scroll',scrollbarWidth:"thin" }}>
              <Table
                dataSource={CounterDetail}
                columns={TableColumns}
--- a/src/Pages/DashBoard/TopSellingProductsChart.scss
+++ b/src/Pages/DashBoard/TopSellingProductsChart.scss
@ -3,7 +3,7 @@
    // background-color: #f3f4f6;
    // padding: 1.5rem;
    width: 100%;
-    font-family: 'Poppins', sans-serif !important;
+    font-family: "Poppins", sans-serif !important;
    scrollbar-width: thin;
    height: 88vh;
    overflow: auto;
@ -11,12 +11,10 @@
    background: #fff !important;
    // padding-right: 1rem;

-
    .header-title {
        font-size: 1.5rem;
        font-weight: 600;
        padding: 0.1rem 0;
-
    }

    .header-date-picker {
@ -59,7 +57,6 @@
        color: #1d4ed8;
    }

-
    .header-actions {
        display: flex;
        gap: 0.5rem;
@ -88,7 +85,6 @@
        // justify-content: space-between;
    }

-
    .metric-controls {
        display: flex;
        gap: 0.5rem;
@ -99,20 +95,19 @@
        align-items: center;
        border-radius: 6px;

-        >div:nth-child(1) {
+        > div:nth-child(1) {
            border-radius: 6px 0 0 6px;
        }

-        >div:nth-child(2) {
+        > div:nth-child(2) {
            border-radius: 0 6px 6px 0;
        }
    }

    .bar-pie-switch {
-
        .ant-switch-inner-checked,
        .ant-switch-inner-unchecked {
-            font-family: 'Poppins';
+            font-family: "Poppins";
            font-weight: 500;
        }

@ -126,7 +121,6 @@
            background-color: #52c41a !important;
            background: #52c41a !important;
        }
-
    }

    .btn-chart-type {
@ -196,7 +190,6 @@
        border-radius: 0.5rem;
        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
        padding: 1rem;
-
    }

    .stat-card1 {
@ -472,7 +465,6 @@
        align-items: center;
        outline: none !important;

-
        .chart-data-item {
            display: flex;
            align-items: center;
@ -497,8 +489,6 @@
            // >div:nth-child(2) {
            //     width: 5%;
            // }
-
-
        }
    }
 }
@ -525,11 +515,11 @@
 .chart-data {
    width: 60%;

-    @media (max-width:768px) {
+    @media (max-width: 768px) {
        width: 100%;
    }

-    @media (max-width:1000px) {
+    @media (max-width: 1000px) {
        width: 100%;
    }
 }
@ -548,7 +538,7 @@
    padding: 0 !important;
    margin: 0 !important;

-    >div:nth-child(1) {
+    > div:nth-child(1) {
        width: 25%;
    }

@ -558,7 +548,6 @@
        justify-content: space-between;
        align-items: center;
        gap: 10px;
-
    }

    .axis-label-wrapper {
@ -582,7 +571,7 @@
        margin-bottom: 4px;
    }

-    >div:nth-child(3) {
+    > div:nth-child(3) {
        width: 10%;
    }
 }
@ -629,7 +618,7 @@
        position: relative;

        &::after {
-            content: '';
+            content: "";
            position: absolute;
            bottom: -4px;
            left: 50%;
@ -750,17 +739,18 @@

    .pie-legend {
        flex: 1 1 100%;
-        max-width: 100%;
+        width: 100%;
+        justify-content: center;
    }
 }

-@media (max-width:990px) {
+@media (max-width: 990px) {
    .wrapaanaClass {
        justify-content: center !important;
    }
 }

-@media (max-width:932px) {
+@media (max-width: 932px) {
    .date-wrapper-class {
        width: 100%;
        justify-content: center !important;
@ -773,4 +763,4 @@
    .ant-select-arrow {
        top: 70%;
    }
-}
+}
--- a/src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss
+++ b/src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss
@ -228,16 +228,13 @@
    background-color: #e9e8e8 !important;
    border: none;
  }
-
-  //dhana
-  // height: clamp(30vh, 50vh, 95vh);
 }

-// writed by sree
 .ItemWiseReport-table1 {
  overflow: auto;
  height: clamp(40vh, 30vh, 95vh);
  width: 79vw !important;
+  scrollbar-width: thin;
 }

 .ItemWiseReport-table .ant-table-thead tr .ant-table-cell {
--- a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
+++ b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
@ -84,6 +84,15 @@
  .BsnavbarSearchMain {
    width: 25vw;
    position: relative;
+    .BarCodeScanMaster {
+      position: absolute;
+      right: 0;
+      padding: 0 !important;
+      top: 30%;
+      svg {
+        font-size: 20px !important;
+      }
+    }

    .searchDiv .ant-input {
      color: #fff !important;
--- a/src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss
+++ b/src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss
@ -296,7 +296,7 @@
 }

 .BSC1Payment-Tablediv .ant-table-wrapper .ant-table-thead > tr > th {
-  color: black !important;
+  color: rgb(255, 255, 255) !important;
  font-weight: 600 !important;
  font-size: 14px;
 }
@ -325,9 +325,7 @@
    box-shadow: unset !important;
  }

-  .ant-select:not(.ant-select-customize-input)
-    .ant-select-selector
-    .ant-select-selection-search-input {
+  .ant-select:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-search-input {
    bottom: 14px;
  }

--- a/src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss
+++ b/src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss
@ -373,7 +373,7 @@ body {
  @media (max-width: 768px) {
    display: none;
  }
-  
+
  div {
    gap: 4px;
    display: flex;
@ -469,3 +469,15 @@ body {
  font-size: 14px;
  background-color: rgb(240, 240, 240);
 }
+.SCTableInPageSales {
+  th {
+    font-weight: 500;
+    text-transform: uppercase;
+    font-size: 12px !important;
+    letter-spacing: 0.1px;
+  }
+  td {
+    font-weight: 500 !important;
+    font-family: "Poppins" !important;
+  }
+}
--- a/src/Styles/OverAllStyle/OverAllStyle.scss
+++ b/src/Styles/OverAllStyle/OverAllStyle.scss
@ -851,6 +851,9 @@
 }

 .price-change-table {
+  .ant-table-thead tr {
+    background-color: #2c88ee !important;
+  }
  .ant-form-item {
    margin-bottom: 0 !important;
  }
@ -1634,3 +1637,17 @@ table {
    }
  }
 }
+.LowStockAlterModal {
+  .ant-input-affix-wrapper {
+    width: 300px !important;
+  }
+  .ant-input {
+    padding: 5px 14px 6px 11px !important;
+  }
+}
+.LowStockAlterModalTable {
+  margin-top: 1rem;
+  .ant-table-thead tr {
+    background-color: #2c88ee !important;
+  }
+}
--- a/src/Styles/PrinterSetting/PrinterSetting.scss
+++ b/src/Styles/PrinterSetting/PrinterSetting.scss
@ -204,3 +204,8 @@
 .printer-settings-tabs {
  font-family: "Poppins";
 }
+.PrinterSettingTab {
+  .ant-tabs-tab-active {
+    background-color: #2c5282 !important;
+  }
+}
--- a/src/Styles/Reports/DateWiseReport/DateWiseReport.scss
+++ b/src/Styles/Reports/DateWiseReport/DateWiseReport.scss
@ -8,7 +8,8 @@
  flex-grow: 1;
  width: 100%;
  height: 40vh;
-  overflow: scroll;
+  overflow: auto;
+  scrollbar-width: thin;
 }

 .DateWiseReport-denomination {
--- a/src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss
+++ b/src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss
@ -228,16 +228,14 @@
    background-color: #e9e8e8 !important;
    border: none;
  }
-
-  //dhana
-  // height: clamp(30vh, 50vh, 95vh);
+ 
 }
-
-// writed by sree
+ 
 .ItemWiseReport-table1 {
  overflow: auto;
  height: clamp(40vh, 30vh, 95vh);
  width: 79vw !important;
+  scrollbar-width: thin;
 }

 .ItemWiseReport-table .ant-table-thead tr .ant-table-cell {