conflict-updated

src/Features/BookingScreen/BookingData/BookingData.js

@@ -18,6 +18,15 @@ export const getNotification = createAsyncThunk(
     );
   }
 );
+export const getStockDetailsByVariantName = createAsyncThunk(
+  'BookingData/getStockDetailsByVariantName',
+  async (data) => {
+    return await axiosRetailInstanceData.post(
+      `/productVariantListByname`,
+      data
+    );
+  }
+);
 
 export const getLayoutCategories = createAsyncThunk(
   'BookingData/getLayoutCategories',
@@ -1449,8 +1458,7 @@ export const CustomerOrderList = createAsyncThunk(
       return await axiosRetailInstanceData.get(
         `/LastBuyProductList?compId=${CompId}&branchId=${BranchId}&appId=${AppId}&mobileNo=${MobileNo}&fromDate=${FromDate}&toDate=${ToDate}`
       );
-    }
+    } else if (
-    else if (
       AppId != null &&
       AppId != undefined &&
       CompId != null &&

src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx

@@ -3789,40 +3789,7 @@ const BSBilling4Payment = () => {
                       </div>
                     </TooltipWrapper>
                   )}
-                  {/* Customer Orders */}
+
-                  {GetCustId && (
-                    <Tooltip title="Customer Orders" isMobile={isMobile}>
-                      {' '}
-                      <div
-                        className="BSBillingNav-icon-table-icon"
-                        onClick={() => {
-                          if (
-                            CheckBookingStatus !== 'Close' &&
-                            !addnewAccess &&
-                            !(OrderCardDetail?.length > 0)
-                          ) {
-                            setCustomerPreviesOrders(true);
-                          }
-                        }}
-                        style={{
-                          cursor: OrderCardDetail?.length > 0 && 'not-allowed',
-                          color:
-                            OrderCardDetail?.length > 0 ||
-                              (OrderCardDetail?.length > 0 &&
-                                GetCustId?.CustMobile === undefined)
-                              ? 'gray'
-                              : 'rgb(18, 146, 238)',
-                          fontSize: '25px',
-                          display: 'flex',
-                          alignItems: 'center',
-                          height: '2.46rem',
-                          width: '1.5rem',
-                        }}
-                      >
-                        <FaCartPlus />
-                      </div>
-                    </Tooltip>
-                  )}
                   {OtherServicesglobal && OrderCardDetail.length >= 1 && (
                     <TooltipWrapper title="Vehicle Number" isMobile={isMobile}>
                       {' '}
@@ -3859,6 +3826,41 @@ const BSBilling4Payment = () => {
                   {/* </React.Fragment> */}
                 </div>
               )}
+              
+              {/* Customer Orders */}
+              {GetCustId && (
+                <Tooltip title="Customer Orders" isMobile={isMobile}>
+                  {' '}
+                  <div
+                    className="BSBillingNav-icon-table-icon"
+                    onClick={() => {
+                      if (
+                        CheckBookingStatus !== 'Close' &&
+                        !addnewAccess &&
+                        !(OrderCardDetail?.length > 0)
+                      ) {
+                        setCustomerPreviesOrders(true);
+                      }
+                    }}
+                    style={{
+                      cursor: OrderCardDetail?.length > 0 && 'not-allowed',
+                      color:
+                        OrderCardDetail?.length > 0 ||
+                          (OrderCardDetail?.length > 0 &&
+                            GetCustId?.CustMobile === undefined)
+                          ? 'gray'
+                          : 'rgb(18, 146, 238)',
+                      fontSize: '25px',
+                      display: 'flex',
+                      alignItems: 'center',
+                      height: '2.46rem',
+                      width: '1.5rem',
+                    }}
+                  >
+                    <FaCartPlus />
+                  </div>
+                </Tooltip>
+              )}
               {tabledata?.length > 0 && (
                 <div style={{ width: '2rem' }}>
                   {tableOptions

src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx

@@ -815,6 +815,7 @@ function BSReprint({ setOpenModel = () => { } }) {
         <a style={{ color: 'black' }}>{(page - 1) * 10 + index + 1}</a>
       ),
     },
+
     {
       title: 'Bill No',
       dataIndex: 'BillNo',
@@ -1420,7 +1421,7 @@ function BSReprint({ setOpenModel = () => { } }) {
               CreatedDate={orderDetail?.CreatedDate}
               PaymentStatus={reprintData?.[0]?.OrderPaymentDtl}
               Preference={SettingDataSelector}
-
+              printDatas={printDatas}
             />
           </div>
         ))}
@@ -1553,7 +1554,7 @@ function BSReprint({ setOpenModel = () => { } }) {
                         label: option.ConfigName,
                       }))}
                       label={
-                        <label class="required">Reprint reason Type</label>
+                        <label className="required">Reprint reason Type</label>
                       }
                       className="field-DropDown-Emp"
                       onChangeFunction={(e) => reprintReasonDropDownChange(e)}
@@ -1748,6 +1749,7 @@ function BSReprint({ setOpenModel = () => { } }) {
                         CreatedDate={orderDetail?.CreatedDate}
                         PaymentStatus={reprintData?.[0]?.OrderPaymentDtl}
                         Preference={SettingDataSelector}
+                        printDatas={printDatas}
                       />
                     </div>
                   ))}
@@ -1809,6 +1811,7 @@ function BSReprint({ setOpenModel = () => { } }) {
               CreatedDate={orderDetail?.CreatedDate}
               PaymentStatus={reprintData?.[0]?.OrderPaymentDtl}
               Preference={SettingDataSelector}
+              printDatas={printDatas}
             />
           </div>
         ))}