Merge pull request #852 from enatega/ahmad

Fixed issues

Author: ufumerfarooq67

enatega-multivendor-admin/lib/hoc/RESTAURANT_GUARD.tsx

@@ -26,7 +26,7 @@ const RESTAURANT_GUARD = <T extends object>(
 
       // For STAFF => Check if VENDOR permission is given to STAFF
       if (user && user.userType === 'STAFF') {
-        const allowed = user?.permissions?.includes('Restaurants');
+        const allowed = user?.permissions?.includes('Restaurants') || user?.permissions?.includes('Stores');
 
         if (!allowed) {
           router.replace('/forbidden');

enatega-multivendor-admin/lib/ui/screen-components/protected/restaurant/dashboard/sub-header/index.tsx

@@ -22,9 +22,9 @@ export default function DashboardSubHeader({
           t('Week'),
           t('Month'),
           t('Year'),
-          t('Custom'),
+          'Custom',
         ]}
-        selectedTab={dateFilter?.dateKeyword ?? t('All')}
+        selectedTab={dateFilter?.dateKeyword ?? 'All'}
         setSelectedTab={(tab: string) =>
           handleDateFilter({ ...dateFilter, dateKeyword: tab })
         }

enatega-multivendor-admin/lib/ui/screen-components/protected/super-admin/commission-rate/view/main/index.tsx

@@ -64,15 +64,24 @@ export default function CommissionRateMain() {
   // Handlers
   const handleSave = async (restaurantId: string) => {
     const restaurant = restaurants.find((r) => r._id === restaurantId);
+    if (!restaurant?.commissionRate) {
+      return showToast({
+        type: 'error',
+        title: t('Commission Updated'),
+        message: `${t('Commission')} ${t('Update')} ${t('failed')}`,
+      });
+    }
     if (restaurant) {
       setLoadingRestaurant(restaurantId);
-      if(restaurant?.commissionRate>100){
+      if (restaurant?.commissionRate > 100) {
         setLoadingRestaurant(null);
         return showToast({
-          type:"error",
-          title:t('Commission Updated'),
-          message:t('As commission rate is a %age value so it cannot exceed a max value of 100')
-        })
+          type: 'error',
+          title: t('Commission Updated'),
+          message: t(
+            'As commission rate is a %age value so it cannot exceed a max value of 100'
+          ),
+        });
       }
       try {
         await updateCommissionMutation({

enatega-multivendor-admin/lib/ui/screen-components/protected/super-admin/order/header/table-header/index.tsx

@@ -78,7 +78,14 @@ const OrderSuperAdminTableHeader: React.FC<IOrderSuperAdminHeaderProps> = ({
         </div>
 
         <DateFilterCustomTab
-          options={['All', 'Today', 'Week', 'Month', 'Year', 'Custom']}
+          options={[
+            t('All'),
+            t('Today'),
+            t('Week'),
+            t('Month'),
+            t('Year'),
+            'Custom',
+          ]}
           selectedTab={dateFilter.dateKeyword}
           setSelectedTab={(tab: string) =>
             handleDateFilter({ ...dateFilter, dateKeyword: tab })

enatega-multivendor-admin/lib/ui/screen-components/protected/vendor/dashboard/sub-header/index.tsx

@@ -38,7 +38,14 @@ export default function DashboardSubHeader({
         </div>
       </div>
       <DateFilterCustomTab
-        options={['All', 'Today', 'Week', 'Month', 'Year', 'Custom']}
+        options={[
+          t('All'),
+          t('Today'),
+          t('Week'),
+          t('Month'),
+          t('Year'),
+          'Custom',
+        ]}
         selectedTab={dateFilter?.dateKeyword ?? ''}
         setSelectedTab={(tab: string) =>
           handleDateFilter({ ...dateFilter, dateKeyword: tab })

enatega-multivendor-admin/lib/ui/screens/admin/restaurant/dashboard/index.tsx

@@ -1,43 +1,43 @@
 'use client';
 
-// Contexts
-import { LayoutContext } from '@/lib/context/global/layout.context';
-
-// Components
+// Component
 import GrowthOverView from '@/lib/ui/screen-components/protected/restaurant/dashboard/growth-overview';
 import OrderStats from '@/lib/ui/screen-components/protected/restaurant/dashboard/order-stats';
 import RestaurantStatesTable from '@/lib/ui/screen-components/protected/restaurant/dashboard/restaurant-stats-table';
+import DashboardSubHeader from '@/lib/ui/screen-components/protected/restaurant/dashboard/sub-header';
 import DashboardDateFilter from '@/lib/ui/useable-components/date-filter';
 
-// Interfaces
 import { IDateFilter } from '@/lib/utils/interfaces';
-
-// Hooks
-import { useContext, useState } from 'react';
+import { useState } from 'react';
 
 export default function AdminRestaurantDashboard() {
-  // Contexts
-  const { isSuperAdminSidebarVisible } = useContext(LayoutContext);
-
-  // States
   const [dateFilter, setDateFilter] = useState<IDateFilter>({
+    dateKeyword: 'All',
     startDate: `${new Date().getFullYear()}-01-01`, // Current year, January 1st
-    endDate: `${new Date().getFullYear()}-${String(new Date().getMonth()).padStart(2, '0')}-${String(new Date(new Date().getFullYear(), new Date().getMonth(), 0).getDate()).padStart(2, '0')}`, // Last day of previous month
+    endDate: `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}-${String(new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).getDate()).padStart(2, '0')}`, // Last day of the current month
   });
 
+  const handleDateFilter = (dateFilter: IDateFilter) => {
+    setDateFilter({
+      ...dateFilter,
+      dateKeyword: dateFilter.dateKeyword ?? '',
+    });
+  };
+
   return (
-    <>
-      <div
-        className={`flex flex-col ${isSuperAdminSidebarVisible ? 'w-[99%]' : 'w-[100%]'}  overflow-x-hidden h-full p-3 `}
-      >
-        <DashboardDateFilter
-          dateFilter={dateFilter}
-          setDateFilter={setDateFilter}
-        />
-        <OrderStats dateFilter={dateFilter} />
-        <GrowthOverView />
-        <RestaurantStatesTable dateFilter={dateFilter} />
-      </div>
-    </>
+    <div className="screen-container">
+      <DashboardSubHeader
+        dateFilter={dateFilter}
+        handleDateFilter={handleDateFilter}
+      />
+      <DashboardDateFilter
+        dateFilter={dateFilter}
+        setDateFilter={setDateFilter}
+      />
+
+      <OrderStats dateFilter={dateFilter} />
+      <GrowthOverView />
+      <RestaurantStatesTable dateFilter={dateFilter} />
+    </div>
   );
 }

enatega-multivendor-admin/lib/ui/useable-components/custom-tab/index.tsx

@@ -25,11 +25,11 @@ const CustomTab = ({
             }`}
             onClick={() => setSelectedTab(option)}
           >
-            {t(option)}
+            {option}
           </div>
         ))}
       </div>
-      {selectedTab === 'Custom' && (
+      {selectedTab === t('Custom') || selectedTab === t('custom') && (
         <OrdersDashboardDateFilter
           dateFilter={
             dateFilter ?? {

enatega-multivendor-admin/lib/ui/useable-components/dashboard-sub-header/index.tsx

@@ -1,24 +1,28 @@
 import CustomInputSwitch from '@/lib/ui/useable-components/custom-input-switch';
 import CustomTab from '@/lib/ui/useable-components/custom-tab';
 import { IDashboardSubHeaderComponentsProps } from '@/lib/utils/interfaces';
+import { useTranslations } from 'use-intl';
 
 export default function DashboardSubHeader({
   isStoreView,
   handleViewChange,
   dateFilter,
   handleDateFilter,
 }: IDashboardSubHeaderComponentsProps) {
+  const t = useTranslations();
+
+  if (!isStoreView || !handleViewChange) return;
   return (
     <div className="flex flex-row items-center justify-between rounded-lg bg-white px-4 py-3 shadow-sm">
       <div className="flex items-center space-x-4">
         <h2 className="text-xl font-semibold text-gray-800">
-          Business Overview
+          {t('Business Overview')}
         </h2>
         <div className="flex items-center space-x-2">
           <span
             className={`font-inter text-sm font-medium leading-5 ${!isStoreView ? 'text-black' : 'text-[#71717A]'}`}
           >
-            Graph View
+            {t('Graph View')}
           </span>
           <CustomInputSwitch
             isActive={isStoreView}
@@ -27,7 +31,7 @@ export default function DashboardSubHeader({
           <span
             className={`font-inter text-sm font-medium leading-5 ${isStoreView ? 'text-black' : 'text-[#71717A]'}`}
           >
-            Store View
+            {t('Store View')}
           </span>
         </div>
       </div>

enatega-multivendor-admin/lib/ui/useable-components/date-filter-custom-tab/index.tsx

@@ -21,7 +21,7 @@ const DateFilterCustomTab = ({
           }`}
           onClick={() => setSelectedTab(option)}
         >
-          {t(option)}
+         {t(option)}
         </div>
       ))}
     </div>

enatega-multivendor-admin/lib/utils/constants/permissions.ts

@@ -1,7 +1,7 @@
 export const PERMISSIONS = [
   { label: 'Admin', code: 'Admin' },
   { label: 'Vendors', code: 'Vendors' },
-  { label: 'Stores', code: 'Restaurants' },
+  { label: 'Stores', code: 'Stores' },
   { label: 'Riders', code: 'Riders' },
   { label: 'Users', code: 'Users' },
   { label: 'Staff', code: 'Staff' },