query key purchase order

Reviewed-on: #18

package.json

@@ -30,6 +30,7 @@
     "@fullcalendar/list": "6.1.15",
     "@fullcalendar/react": "6.1.15",
     "@fullcalendar/timegrid": "6.1.15",
+    "@hello-pangea/dnd": "^18.0.1",
     "@hookform/resolvers": "3.9.1",
     "@iconify/react": "^6.0.1",
     "@mui/lab": "6.0.0-beta.19",
@@ -52,19 +53,23 @@
     "apexcharts": "3.49.0",
     "axios": "^1.11.0",
     "bootstrap-icons": "1.11.3",
+    "chart.js": "^4.5.1",
+    "chartjs-plugin-datalabels": "^2.2.0",
     "classnames": "2.5.1",
     "cmdk": "1.0.4",
     "date-fns": "4.1.0",
     "emoji-mart": "5.6.0",
+    "exceljs": "^4.4.0",
     "fs-extra": "11.2.0",
     "html2canvas": "^1.4.1",
     "input-otp": "1.4.1",
     "jspdf": "^3.0.1",
+    "jspdf-autotable": "^5.0.2",
     "keen-slider": "6.8.6",
     "lucide-react": "^0.544.0",
     "mapbox-gl": "3.9.0",
     "negotiator": "1.0.0",
-    "next": "15.1.2",
+    "next": "^15.1.9",
     "react": "18.3.1",
     "react-apexcharts": "1.4.1",
     "react-colorful": "5.6.1",
@@ -80,7 +85,8 @@
     "react-use": "17.6.0",
     "recharts": "2.15.0",
     "use-debounce": "^10.0.5",
-    "valibot": "0.42.1"
+    "valibot": "0.42.1",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@iconify/json": "2.2.286",

src/app/[lang]/(dashboard)/(private)/apps/marketing/discount/add/page.tsx

@@ -0,0 +1,38 @@
+import DiscountAddHeader from '@/views/apps/marketing/discount/add/DiscountAddHeader'
+import DiscountInformation from '@/views/apps/marketing/discount/add/DiscountAddInformation'
+import DiscountOutlets from '@/views/apps/marketing/discount/add/DiscountAddOutlets'
+import DiscountRules from '@/views/apps/marketing/discount/add/DiscountAddRule'
+import DiscountSettings from '@/views/apps/marketing/discount/add/DiscountAddSetting'
+import Grid from '@mui/material/Grid2'
+
+const DiscountsAddPage = () => {
+  return (
+    <Grid container spacing={6}>
+      <Grid size={{ xs: 12 }}>
+        <DiscountAddHeader />
+      </Grid>
+      <Grid size={{ xs: 12, md: 8 }}>
+        <Grid container spacing={6}>
+          <Grid size={{ xs: 12 }}>
+            <DiscountInformation />
+          </Grid>
+          <Grid size={{ xs: 12 }}>
+            <DiscountRules />
+          </Grid>
+        </Grid>
+      </Grid>
+      <Grid size={{ xs: 12, md: 4 }}>
+        <Grid container spacing={6}>
+          <Grid size={{ xs: 12 }}>
+            <DiscountSettings />
+          </Grid>
+          <Grid size={{ xs: 12 }}>
+            <DiscountOutlets />
+          </Grid>
+        </Grid>
+      </Grid>
+    </Grid>
+  )
+}
+
+export default DiscountsAddPage

src/app/[lang]/(dashboard)/(private)/apps/marketing/discount/page.tsx

@@ -0,0 +1,7 @@
+import DiscountList from '@/views/apps/marketing/discount'
+
+const DiscountPage = () => {
+  return <DiscountList />
+}
+
+export default DiscountPage

src/app/[lang]/(dashboard)/(private)/dashboards/daily-report/page.tsx

@@ -8,24 +8,63 @@ import {
   useCategoryAnalytics
 } from '@/services/queries/analytics'
 import { useOutletById } from '@/services/queries/outlets'
+import { generateExcel } from '@/utils/excelGenerator'
+import { generatePDF } from '@/utils/pdfGenerator'
 import { formatCurrency, formatDate, formatDateDDMMYYYY, formatDatetime } from '@/utils/transform'
 import ReportGeneratorComponent from '@/views/dashboards/daily-report/report-generator'
 import ReportHeader from '@/views/dashboards/daily-report/report-header'
 import React, { useEffect, useRef, useState } from 'react'
 
+// Dummy HPP values — ganti dengan data real nantinya
+const DUMMY_STD_HPP = 30 // % — ganti dengan data real nantinya
+const DUMMY_REAL_HPP = 0 // % — ganti dengan kalkulasi real nantinya
+
+const getHppStatus = (stdHpp: number, realHpp: number): 'Sehat' | 'Tidak Sehat' =>
+  realHpp <= stdHpp ? 'Sehat' : 'Tidak Sehat'
+
+const StatusBadge = ({ status }: { status: 'Sehat' | 'Tidak Sehat' }) => (
+  <span
+    className={`inline-block px-3 py-1 rounded-full text-base font-bold ${
+      status === 'Sehat' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800'
+    }`}
+  >
+    {status}
+  </span>
+)
+
 const DailyPOSReport = () => {
   const reportRef = useRef<HTMLDivElement | null>(null)
 
+  const [isGeneratingExcel, setIsGeneratingExcel] = useState(false)
+
   const [now, setNow] = useState(new Date())
   const [selectedDate, setSelectedDate] = useState(new Date())
   const [dateRange, setDateRange] = useState({
     startDate: new Date(),
     endDate: new Date()
   })
-  const [filterType, setFilterType] = useState<'single' | 'range'>('single') // 'single' or 'range'
+  const [filterType, setFilterType] = useState<'single' | 'range'>('single')
   const [isGeneratingPDF, setIsGeneratingPDF] = useState(false)
 
-  // Use selectedDate for single date filter, or dateRange for range filter
+  // PDF Font Size Configuration
+  const PDF_FONT_SIZES = {
+    heading: 18,
+    subheading: 16,
+    tableContent: 12,
+    tableHeader: 12,
+    tableFooter: 12,
+    grandTotal: 14,
+    footer: 11
+  }
+
+  // PDF Spacing Configuration
+  const PDF_SPACING = {
+    cellPadding: 5,
+    cellPaddingLarge: 6,
+    sectionGap: 20,
+    headerGap: 15
+  }
+
   const getDateParams = () => {
     if (filterType === 'single') {
       return {
@@ -42,8 +81,15 @@ const DailyPOSReport = () => {
 
   const dateParams = getDateParams()
 
+  const today = new Date()
+  const sevenDaysAgo = new Date()
+  sevenDaysAgo.setDate(today.getDate() - 7)
+
   const { data: outlet } = useOutletById()
-  const { data: sales } = useSalesAnalytics(dateParams)
+  const { data: profitLoss7Days } = useProfitLossAnalytics({
+    date_from: formatDateDDMMYYYY(sevenDaysAgo),
+    date_to: formatDateDDMMYYYY(today)
+  })
   const { data: profitLoss } = useProfitLossAnalytics(dateParams)
   const { data: products } = useProductSalesAnalytics(dateParams)
   const { data: paymentAnalytics } = usePaymentAnalytics(dateParams)
@@ -66,12 +112,10 @@ const DailyPOSReport = () => {
     setNow(new Date())
   }, [])
 
-  // Format date for input field (YYYY-MM-DD)
   const formatDateForInput = (date: Date) => {
     return date.toISOString().split('T')[0]
   }
 
-  // Get display text for the report period
   const getReportPeriodText = () => {
     if (filterType === 'single') {
       return `${formatDateDDMMYYYY(selectedDate)} - ${formatDateDDMMYYYY(selectedDate)}`
@@ -80,187 +124,58 @@ const DailyPOSReport = () => {
     }
   }
 
-  // Get report title based on filter type
   const getReportTitle = () => {
-    if (filterType === 'single') {
+    return 'Laporan Transaksi'
-      return 'Laporan Transaksi'
-    } else {
-      const daysDiff = Math.ceil((dateRange.endDate.getTime() - dateRange.startDate.getTime()) / (1000 * 3600 * 24)) + 1
-      //   return `Laporan Transaksi ${daysDiff} Hari`
-      return `Laporan Transaksi`
-    }
   }
 
   const handleGeneratePDF = async () => {
-    const reportElement = reportRef.current
-
-    if (!reportElement) {
-      alert('Report element tidak ditemukan')
-      return
-    }
-
-    // Set loading state
     setIsGeneratingPDF(true)
-
     try {
-      // Import jsPDF dan html2canvas
+      await generatePDF({
-      const jsPDF = (await import('jspdf')).default
+        reportRef,
-      const html2canvas = (await import('html2canvas')).default
+        outlet,
-
+        profitLoss,
-      // Pastikan element terlihat penuh
+        products,
-      const originalOverflow = reportElement.style.overflow
+        paymentAnalytics,
-      reportElement.style.overflow = 'visible'
+        category,
-
+        productSummary,
-      // Wait untuk memastikan rendering selesai
+        categorySummary,
-      await new Promise(resolve => setTimeout(resolve, 300))
+        filterType,
-
+        selectedDate,
-      console.log('Starting PDF generation...')
+        dateRange,
-
+        now
-      // Update loading message
-      console.log('Capturing content...')
-
-      // Capture canvas dengan setting yang optimal
-      const canvas = await html2canvas(reportElement, {
-        scale: 1.5,
-        useCORS: true,
-        allowTaint: true,
-        backgroundColor: '#ffffff',
-        logging: false,
-        removeContainer: true,
-        imageTimeout: 0,
-        height: reportElement.scrollHeight,
-        width: reportElement.scrollWidth,
-        scrollX: 0,
-        scrollY: 0,
-        // Pastikan capture semua content
-        windowWidth: Math.max(reportElement.scrollWidth, window.innerWidth),
-        windowHeight: Math.max(reportElement.scrollHeight, window.innerHeight)
       })
-
-      console.log('Canvas captured:', canvas.width, 'x', canvas.height)
-      console.log('Generating PDF pages...')
-
-      // Restore overflow
-      reportElement.style.overflow = originalOverflow
-
-      // Create PDF
-      const pdf = new jsPDF({
-        orientation: 'portrait',
-        unit: 'mm',
-        format: 'a4',
-        compress: true
-      })
-
-      // A4 dimensions
-      const pdfWidth = 210
-      const pdfHeight = 297
-      const margin = 5 // Small margin to prevent cutoff
-
-      // Calculate scaling
-      const availableWidth = pdfWidth - 2 * margin
-      const availableHeight = pdfHeight - 2 * margin
-
-      const imgWidth = availableWidth
-      const imgHeight = (canvas.height * availableWidth) / canvas.width
-
-      console.log('PDF dimensions - Canvas:', canvas.width, 'x', canvas.height)
-      console.log('PDF dimensions - Image:', imgWidth, 'x', imgHeight)
-      console.log('Available height per page:', availableHeight)
-
-      // Split content across pages
-      let yPosition = margin
-      let sourceY = 0
-      let pageCount = 1
-      let remainingHeight = imgHeight
-
-      while (remainingHeight > 0) {
-        console.log(`Processing page ${pageCount}, remaining height: ${remainingHeight}`)
-
-        if (pageCount > 1) {
-          pdf.addPage()
-          yPosition = margin
-        }
-
-        // Calculate how much content fits on this page
-        const heightForThisPage = Math.min(remainingHeight, availableHeight)
-
-        // Calculate source dimensions for cropping
-        const sourceHeight = (heightForThisPage * canvas.height) / imgHeight
-
-        // Create temporary canvas for this page portion
-        const tempCanvas = document.createElement('canvas')
-        const tempCtx = tempCanvas.getContext('2d')
-
-        if (!tempCtx) {
-          throw new Error('Unable to get 2D context from canvas')
-        }
-
-        tempCanvas.width = canvas.width
-        tempCanvas.height = sourceHeight
-
-        // Draw the portion we need
-        tempCtx.drawImage(
-          canvas,
-          0,
-          sourceY,
-          canvas.width,
-          sourceHeight, // Source rectangle
-          0,
-          0,
-          canvas.width,
-          sourceHeight // Destination rectangle
-        )
-
-        // Convert to image data
-        const pageImageData = tempCanvas.toDataURL('image/jpeg', 0.9)
-
-        // Add to PDF
-        pdf.addImage(pageImageData, 'JPEG', margin, yPosition, imgWidth, heightForThisPage)
-
-        // Update for next page
-        sourceY += sourceHeight
-        remainingHeight -= heightForThisPage
-        pageCount++
-
-        // Safety check to prevent infinite loop
-        if (pageCount > 20) {
-          console.warn('Too many pages, breaking loop')
-          break
-        }
-      }
-
-      console.log(`Generated ${pageCount - 1} pages`)
-      console.log('Finalizing PDF...')
-
-      // Add metadata
-      pdf.setProperties({
-        title: getReportTitle(),
-        subject: 'Transaction Report',
-        author: 'Apskel POS System',
-        creator: 'Apskel'
-      })
-
-      // Generate filename
-      const fileName =
-        filterType === 'single'
-          ? `laporan-transaksi-${formatDateForInput(selectedDate)}.pdf`
-          : `laporan-transaksi-${formatDateForInput(dateRange.startDate)}-to-${formatDateForInput(dateRange.endDate)}.pdf`
-
-      console.log('Saving PDF:', fileName)
-
-      // Save PDF
-      pdf.save(fileName)
-
-      console.log('PDF generated successfully!')
     } catch (error) {
       console.error('Error generating PDF:', error)
       alert(`Terjadi kesalahan saat membuat PDF: ${error}`)
     } finally {
-      // Reset loading state
       setIsGeneratingPDF(false)
     }
   }
 
+  const handleGenerateExcel = async () => {
+    setIsGeneratingExcel(true)
+    try {
+      await generateExcel({
+        outlet,
+        profitLoss,
+        products,
+        paymentAnalytics,
+        category,
+        productSummary,
+        categorySummary,
+        filterType,
+        selectedDate,
+        dateRange
+      })
+    } catch (error) {
+      console.error('Error generating Excel:', error)
+      alert(`Terjadi kesalahan saat membuat Excel: ${error}`)
+    } finally {
+      setIsGeneratingExcel(false)
+    }
+  }
+
   const LoadingOverlay = ({ isVisible, message = 'Generating PDF...' }: { isVisible: boolean; message?: string }) => {
     if (!isVisible) return null
 
@@ -268,15 +183,9 @@ const DailyPOSReport = () => {
       <div className='fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50 backdrop-blur-sm'>
         <div className='bg-white rounded-lg shadow-xl p-8 max-w-sm w-full mx-4'>
           <div className='text-center'>
-            {/* Animated Spinner */}
             <div className='inline-block animate-spin rounded-full h-12 w-12 border-4 border-gray-200 border-t-purple-600 mb-4'></div>
-
-            {/* Loading Message */}
             <h3 className='text-lg font-semibold text-gray-800 mb-2'>{message}</h3>
-
             <p className='text-sm text-gray-600'>Mohon tunggu, proses ini mungkin membutuhkan beberapa detik...</p>
-
-            {/* Progress Steps */}
             <div className='mt-6 space-y-2'>
               <div className='flex items-center text-xs text-gray-500'>
                 <div className='w-2 h-2 bg-green-500 rounded-full mr-2 flex-shrink-0'></div>
@@ -297,12 +206,25 @@ const DailyPOSReport = () => {
     )
   }
 
+  // Group products by category
+  const groupedProducts =
+    products?.data?.reduce(
+      (acc, item) => {
+        const categoryName = item.category_name || 'Tidak Berkategori'
+        if (!acc[categoryName]) {
+          acc[categoryName] = []
+        }
+        acc[categoryName].push(item)
+        return acc
+      },
+      {} as Record<string, any[]>
+    ) || {}
+
   return (
     <div className='min-h-screen'>
       <LoadingOverlay isVisible={isGeneratingPDF} message='Membuat PDF Laporan...' />
-      {/* Control Panel */}
+
       <ReportGeneratorComponent
-        // Props wajib
         reportTitle='Laporan Penjualan'
         filterType={filterType}
         selectedDate={selectedDate}
@@ -311,76 +233,78 @@ const DailyPOSReport = () => {
         onSingleDateChange={setSelectedDate}
         onDateRangeChange={setDateRange}
         onGeneratePDF={handleGeneratePDF}
-        // Props opsional
+        onGenerateExcel={handleGenerateExcel}
-        // isGenerating={isGenerating}
+        isGeneratingExcel={isGeneratingExcel}
-        // customQuickActions={customQuickActions}
-        // labels={customLabels}
       />
 
-      {/* Report Template */}
       <div ref={reportRef} className='max-w-4xl mx-auto bg-white min-h-[297mm]' style={{ width: '210mm' }}>
-        {/* Header */}
+        {/* Wrap header in a section for easy capture */}
-        <ReportHeader
+        <div className='report-header-section'>
-          outlet={outlet}
+          <ReportHeader
-          reportTitle={getReportTitle()}
+            outlet={outlet}
-          reportSubtitle='Laporan Bulanan'
+            reportTitle={getReportTitle()}
-          brandName='Apskel'
+            reportSubtitle='Laporan Bulanan'
-          brandColor='#36175e'
+            brandName='Apskel'
-          periode={getReportPeriodText()}
+            brandColor='#36175e'
-        />
+            periode={getReportPeriodText()}
+          />
+        </div>
 
         {/* Performance Summary */}
         <div className='p-8'>
-          <h3 className='text-xl font-bold mb-6' style={{ color: '#36175e' }}>
+          <h3 className='text-3xl font-bold mb-8' style={{ color: '#36175e' }}>
             Ringkasan
           </h3>
 
-          <div className='space-y-4'>
+          <div className='space-y-5'>
-            <div className='flex justify-between items-center py-2 border-b border-gray-200'>
+            <div className='flex justify-between items-center py-3 border-b border-gray-200'>
-              <span className='text-gray-700'>Total Penjualan</span>
+              <span className='text-xl text-gray-700'>Total Penjualan</span>
-              <span className='font-semibold text-gray-800'>
+              <span className='text-xl font-semibold text-gray-800'>
                 {formatCurrency(profitLoss?.summary.total_revenue ?? 0)}
               </span>
             </div>
-            <div className='flex justify-between items-center py-2 border-b border-gray-200'>
+            <div className='flex justify-between items-center py-3 border-b border-gray-200'>
-              <span className='text-gray-700'>Total Diskon</span>
+              <span className='text-xl text-gray-700'>Total Diskon</span>
-              <span className='font-semibold text-gray-800'>
+              <span className='text-xl font-semibold text-gray-800'>
                 {formatCurrency(profitLoss?.summary.total_discount ?? 0)}
               </span>
             </div>
-            <div className='flex justify-between items-center py-2 border-b border-gray-200'>
+            <div className='flex justify-between items-center py-3 border-b border-gray-200'>
-              <span className='text-gray-700'>Total Pajak</span>
+              <span className='text-xl text-gray-700'>Total Pajak</span>
-              <span className='font-semibold text-gray-800'>{formatCurrency(profitLoss?.summary.total_tax ?? 0)}</span>
+              <span className='text-xl font-semibold text-gray-800'>
+                {formatCurrency(profitLoss?.summary.total_tax ?? 0)}
+              </span>
             </div>
-            <div className='flex justify-between items-center py-2 border-b border-gray-200'>
+            <div className='flex justify-between items-center py-3 border-b border-gray-200'>
-              <span className='text-gray-700 font-bold'>Total</span>
+              <span className='text-xl text-gray-700'>Service Charge</span>
-              <span className='font-bold text-gray-800'>{formatCurrency(profitLoss?.summary.total_revenue ?? 0)}</span>
+              <span className='text-xl font-semibold text-gray-800'>{formatCurrency(0)}</span>
+            </div>
+            <div className='flex justify-between items-center py-3 border-b-2 border-gray-300'>
+              <span className='text-xl text-gray-700 font-bold'>Total</span>
+              <span className='text-xl font-bold text-gray-800'>
+                {formatCurrency(profitLoss?.summary.total_revenue ?? 0)}
+              </span>
             </div>
           </div>
         </div>
 
+        {/* Invoice */}
         <div className='px-8 pb-8'>
-          <h3 className='text-xl font-bold mb-6' style={{ color: '#36175e' }}>
+          <h3 className='text-3xl font-bold mb-8' style={{ color: '#36175e' }}>
             Invoice
           </h3>
 
-          <div className='space-y-4'>
+          <div className='space-y-5'>
-            <div className='flex justify-between items-center py-2 border-b border-gray-200'>
+            <div className='flex justify-between items-center py-3 border-b border-gray-200'>
-              <span className='text-gray-700'>Total Invoice</span>
+              <span className='text-xl text-gray-700'>Total Invoice</span>
-              <span className='font-semibold text-gray-800'>{profitLoss?.summary.total_orders ?? 0}</span>
+              <span className='text-xl font-semibold text-gray-800'>{profitLoss?.summary.total_orders ?? 0}</span>
-            </div>
-            <div className='flex justify-between items-center py-2 border-b border-gray-200'>
-              <span className='text-gray-700'>Rata-rata Tagihan Per Invoice </span>
-              <span className='font-semibold text-gray-800'>
-                {formatCurrency(profitLoss?.summary.average_profit ?? 0)}
-              </span>
             </div>
           </div>
         </div>
 
         {/* Payment Method Summary */}
         <div className='px-8 pb-8'>
-          <h3 className='text-xl font-bold mb-6' style={{ color: '#36175e' }}>
+          <h3 className='text-3xl font-bold mb-8' style={{ color: '#36175e' }}>
             Ringkasan Metode Pembayaran
           </h3>
 
@@ -388,20 +312,20 @@ const DailyPOSReport = () => {
             <table className='w-full'>
               <thead>
                 <tr className='text-gray-800 border-b-2 border-gray-300'>
-                  <th className='text-left p-3 font-semibold'>Metode Pembayaran</th>
+                  <th className='text-left text-xl p-4 font-semibold'>Metode Pembayaran</th>
-                  <th className='text-center p-3 font-semibold'>Tipe</th>
+                  <th className='text-center text-xl p-4 font-semibold'>Tipe</th>
-                  <th className='text-center p-3 font-semibold'>Jumlah Order</th>
+                  <th className='text-center text-xl p-4 font-semibold'>Jumlah Order</th>
-                  <th className='text-right p-3 font-semibold'>Total Amount</th>
+                  <th className='text-right text-xl p-4 font-semibold'>Total Amount</th>
-                  <th className='text-center p-3 font-semibold'>Persentase</th>
+                  <th className='text-center text-xl p-4 font-semibold'>Persentase</th>
                 </tr>
               </thead>
               <tbody>
                 {paymentAnalytics?.data?.map((payment, index) => (
                   <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
-                    <td className='p-3 font-medium text-gray-800'>{payment.payment_method_name}</td>
+                    <td className='p-4 text-xl font-medium text-gray-800'>{payment.payment_method_name}</td>
-                    <td className='p-3 text-center'>
+                    <td className='p-4 text-center'>
                       <span
-                        className={`px-2 py-1 rounded-full text-xs font-medium ${
+                        className={`px-3 py-1 rounded-full text-lg font-medium ${
                           payment.payment_method_type === 'cash'
                             ? 'bg-green-100 text-green-800'
                             : 'bg-blue-100 text-blue-800'
@@ -410,11 +334,11 @@ const DailyPOSReport = () => {
                         {payment.payment_method_type.toUpperCase()}
                       </span>
                     </td>
-                    <td className='p-3 text-center text-gray-700'>{payment.order_count}</td>
+                    <td className='p-4 text-xl text-center text-gray-700'>{payment.order_count}</td>
-                    <td className='p-3 text-right font-semibold text-gray-800'>
+                    <td className='p-4 text-xl text-right font-semibold text-gray-800'>
                       {formatCurrency(payment.total_amount)}
                     </td>
-                    <td className='p-3 text-center font-medium' style={{ color: '#36175e' }}>
+                    <td className='p-4 text-xl text-center font-medium' style={{ color: '#36175e' }}>
                       {(payment.percentage ?? 0).toFixed(1)}%
                     </td>
                   </tr>
@@ -422,22 +346,22 @@ const DailyPOSReport = () => {
               </tbody>
               <tfoot>
                 <tr className='text-gray-800 border-t-2 border-gray-300'>
-                  <td className='p-3 font-bold'>TOTAL</td>
+                  <td className='p-4 text-xl font-bold'>TOTAL</td>
-                  <td className='p-3'></td>
+                  <td className='p-4'></td>
-                  <td className='p-3 text-center font-bold'>{paymentAnalytics?.summary.total_orders ?? 0}</td>
+                  <td className='p-4 text-xl text-center font-bold'>{paymentAnalytics?.summary.total_orders ?? 0}</td>
-                  <td className='p-3 text-right font-bold'>
+                  <td className='p-4 text-xl text-right font-bold'>
                     {formatCurrency(paymentAnalytics?.summary.total_amount ?? 0)}
                   </td>
-                  <td className='p-3 text-center font-bold'></td>
+                  <td className='p-4 text-center font-bold'></td>
                 </tr>
               </tfoot>
             </table>
           </div>
         </div>
 
-        {/* Category Summary */}
+        {/* Category Summary — +3 kolom baru */}
         <div className='px-8 pb-8'>
-          <h3 className='text-xl font-bold mb-6' style={{ color: '#36175e' }}>
+          <h3 className='text-3xl font-bold mb-8' style={{ color: '#36175e' }}>
             Ringkasan Kategori
           </h3>
 
@@ -445,190 +369,195 @@ const DailyPOSReport = () => {
             <table className='w-full'>
               <thead>
                 <tr className='text-gray-800 border-b-2 border-gray-300'>
-                  <th className='text-left p-3 font-semibold'>Nama</th>
+                  <th className='text-left text-xl p-4 font-semibold'>Nama</th>
-                  <th className='text-center p-3 font-semibold'>Total Produk</th>
+                  <th className='text-center text-xl p-4 font-semibold'>Qty</th>
-                  <th className='text-center p-3 font-semibold'>Qty</th>
+                  <th className='text-right text-xl p-4 font-semibold'>Pendapatan</th>
-                  <th className='text-right p-3 font-semibold'>Pendapatan</th>
+                  <th className='text-center text-xl p-4 font-semibold'>% Std HPP</th>
+                  <th className='text-center text-xl p-4 font-semibold'>% Real HPP</th>
+                  <th className='text-center text-xl p-4 font-semibold'>Status</th>
                 </tr>
               </thead>
               <tbody>
-                {category?.data?.map((c, index) => (
+                {category?.data?.map((c, index) => {
-                  <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
+                  const stdHpp = DUMMY_STD_HPP
-                    <td className='p-3 font-medium text-gray-800'>{c.category_name}</td>
+                  const realHpp = DUMMY_REAL_HPP
-                    <td className='p-3 text-center text-gray-700'>{c.product_count}</td>
+                  const status = getHppStatus(stdHpp, realHpp)
-                    <td className='p-3 text-center text-gray-700'>{c.total_quantity}</td>
+                  return (
-                    <td className='p-3 text-right font-semibold' style={{ color: '#36175e' }}>
+                    <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
-                      {formatCurrency(c.total_revenue)}
+                      <td className='p-4 text-xl font-medium text-gray-800'>{c.category_name}</td>
-                    </td>
+                      <td className='p-4 text-xl text-center text-gray-700'>{c.total_quantity}</td>
-                  </tr>
+                      <td className='p-4 text-xl text-right font-semibold' style={{ color: '#36175e' }}>
-                )) || []}
+                        {formatCurrency(c.total_revenue)}
+                      </td>
+                      <td className='p-4 text-xl text-center text-gray-700'>{stdHpp}%</td>
+                      <td className='p-4 text-xl text-center text-gray-700'>{realHpp}%</td>
+                      <td className='p-4 text-center'>
+                        <StatusBadge status={status} />
+                      </td>
+                    </tr>
+                  )
+                }) || []}
               </tbody>
               <tfoot>
                 <tr className='text-gray-800 border-t-2 border-gray-300'>
-                  <td className='p-3 font-bold'>TOTAL</td>
+                  <td className='p-4 text-xl font-bold'>TOTAL</td>
-                  <td className='p-3 text-center font-bold'>{categorySummary?.productCount ?? 0}</td>
+                  <td className='p-4 text-xl text-center font-bold'>{categorySummary?.totalQuantity ?? 0}</td>
-                  <td className='p-3 text-center font-bold'>{categorySummary?.totalQuantity ?? 0}</td>
+                  <td className='p-4 text-xl text-right font-bold'>
-                  <td className='p-3 text-right font-bold'>{formatCurrency(categorySummary?.totalRevenue ?? 0)}</td>
+                    {formatCurrency(categorySummary?.totalRevenue ?? 0)}
+                  </td>
+                  <td className='p-4'></td>
+                  <td className='p-4'></td>
+                  <td className='p-4'></td>
                 </tr>
               </tfoot>
             </table>
           </div>
         </div>
 
-        {/* Transaction Summary */}
+        {/* Product Summary — +3 kolom baru */}
         <div className='px-8 pb-8'>
-          <h3 className='text-xl font-bold mb-6' style={{ color: '#36175e' }}>
+          <h3 className='text-3xl font-bold mb-8' style={{ color: '#36175e' }}>
-            Ringkasan Item
+            Ringkasan Item Per Kategori
           </h3>
 
-          <div className='bg-gray-50 rounded-lg border border-gray-200 overflow-visible'>
+          <div className='space-y-12'>
-            <div className='overflow-x-auto'>
+            {Object.keys(groupedProducts)
-              <table className='w-full table-fixed' style={{ minWidth: '100%' }}>
+              .sort((a, b) => {
-                <colgroup>
+                const productsA = groupedProducts[a]
-                  <col style={{ width: '40%' }} />
+                const productsB = groupedProducts[b]
-                  <col style={{ width: '15%' }} />
+                const orderA = productsA[0]?.category_order ?? 999
-                  <col style={{ width: '15%' }} />
+                const orderB = productsB[0]?.category_order ?? 999
-                  <col style={{ width: '15%' }} />
+                return orderA - orderB
-                  <col style={{ width: '15%' }} />
+              })
-                </colgroup>
+              .map((categoryName, catIndex) => {
-                <thead>
+                const categoryProducts = groupedProducts[categoryName].sort((a, b) => {
-                  <tr className='text-gray-800 border-b-2 border-gray-300'>
+                  const skuA = a.product_sku || ''
-                    <th className='text-left p-3 font-semibold border-r border-gray-300'>Produk</th>
+                  const skuB = b.product_sku || ''
-                    <th className='text-center p-3 font-semibold border-r border-gray-300'>Qty</th>
+                  return skuA.localeCompare(skuB)
-                    <th className='text-center p-3 font-semibold border-r border-gray-300'>Order</th>
+                })
-                    <th className='text-right p-3 font-semibold border-r border-gray-300'>Pendapatan</th>
+                const categoryTotalQty = categoryProducts.reduce((sum, item) => sum + (item.quantity_sold || 0), 0)
-                    <th className='text-right p-3 font-semibold'>Rata Rata</th>
+                const categoryTotalRevenue = categoryProducts.reduce((sum, item) => sum + (item.revenue || 0), 0)
-                  </tr>
-                </thead>
-                <tbody>
-                  {(() => {
-                    // Group products by category
-                    const groupedProducts =
-                      products?.data?.reduce(
-                        (acc, item) => {
-                          const categoryName = item.category_name || 'Tidak Berkategori'
-                          if (!acc[categoryName]) {
-                            acc[categoryName] = []
-                          }
-                          acc[categoryName].push(item)
-                          return acc
-                        },
-                        {} as Record<string, any[]>
-                      ) || {}
 
-                    const rows: JSX.Element[] = []
+                return (
-                    let globalIndex = 0
+                  <div key={categoryName} style={{ display: 'block', marginBottom: '70px' }}>
+                    <h4
+                      className='text-2xl font-bold mb-0 px-4 py-4 bg-gray-100 rounded-t-lg'
+                      style={{ color: '#36175e' }}
+                    >
+                      {categoryName.toUpperCase()}
+                    </h4>
 
-                    // Sort categories alphabetically
+                    <div className='bg-gray-50 rounded-b-lg border-l-2 border-r-2 border-b-2 border-gray-300'>
-                    Object.keys(groupedProducts)
+                      <table
-                      .sort()
+                        className='w-full'
-                      .forEach(categoryName => {
+                        style={{ borderCollapse: 'collapse', tableLayout: 'fixed', width: '100%' }}
-                        const categoryProducts = groupedProducts[categoryName]
+                      >
-
+                        <colgroup>
-                        // Category header row
+                          <col style={{ width: '28%' }} />
-                        rows.push(
+                          <col style={{ width: '10%' }} />
-                          <tr
+                          <col style={{ width: '22%' }} />
-                            key={`category-${categoryName}`}
+                          <col style={{ width: '13%' }} />
-                            className='bg-gray-100 border-b border-gray-300'
+                          <col style={{ width: '13%' }} />
-                            style={{ pageBreakInside: 'avoid' }}
+                          <col style={{ width: '14%' }} />
-                          >
+                        </colgroup>
-                            <td
+                        <thead>
-                              className='p-3 font-bold text-gray-900 border-r border-gray-300'
+                          <tr className='text-gray-800 border-b-2 border-gray-300 bg-gray-100'>
-                              style={{ color: '#36175e' }}
+                            <th className='text-left text-xl p-5 font-semibold border-r border-gray-300'>Produk</th>
-                            >
+                            <th className='text-center text-xl p-5 font-semibold border-r border-gray-300'>Qty</th>
-                              {categoryName.toUpperCase()}
+                            <th className='text-right text-xl p-5 font-semibold border-r border-gray-300'>
-                            </td>
+                              Pendapatan
-                            <td className='p-3 border-r border-gray-300'></td>
+                            </th>
-                            <td className='p-3 border-r border-gray-300'></td>
+                            <th className='text-center text-xl p-5 font-semibold border-r border-gray-300'>
-                            <td className='p-3 border-r border-gray-300'></td>
+                              % Std HPP
-                            <td className='p-3'></td>
+                            </th>
+                            <th className='text-center text-xl p-5 font-semibold border-r border-gray-300'>
+                              % Real HPP
+                            </th>
+                            <th className='text-center text-xl p-5 font-semibold'>Status</th>
                           </tr>
-                        )
+                        </thead>
-
+                        <tbody>
-                        // Product rows for this category
+                          {categoryProducts.map((item, index) => {
-                        categoryProducts.forEach((item, index) => {
+                            const stdHpp = DUMMY_STD_HPP
-                          globalIndex++
+                            const realHpp = DUMMY_REAL_HPP
-                          rows.push(
+                            const status = getHppStatus(stdHpp, realHpp)
-                            <tr
+                            return (
-                              key={`product-${item.product_name}-${index}`}
+                              <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
-                              className={`${globalIndex % 2 === 0 ? 'bg-white' : 'bg-gray-50'} border-b border-gray-200`}
+                                <td className='p-5 text-xl font-medium text-gray-800 border-r border-gray-200'>
-                              style={{ pageBreakInside: 'avoid' }}
+                                  {item.product_name}
-                            >
+                                </td>
-                              <td
+                                <td className='p-5 text-xl text-center text-gray-700 border-r border-gray-200'>
-                                className='p-3 pl-6 font-medium text-gray-800 border-r border-gray-200'
+                                  {item.quantity_sold}
-                                style={{ wordWrap: 'break-word' }}
+                                </td>
-                              >
+                                <td className='p-5 text-xl text-right font-semibold text-gray-800 border-r border-gray-200'>
-                                {item.product_name}
+                                  {formatCurrency(item.revenue)}
-                              </td>
+                                </td>
-                              <td className='p-3 text-center text-gray-700 border-r border-gray-200'>
+                                <td className='p-5 text-xl text-center text-gray-700 border-r border-gray-200'>
-                                {item.quantity_sold}
+                                  {stdHpp}%
-                              </td>
+                                </td>
-                              <td className='p-3 text-center text-gray-700 border-r border-gray-200'>
+                                <td className='p-5 text-xl text-center text-gray-700 border-r border-gray-200'>
-                                {item.order_count ?? 0}
+                                  {realHpp}%
-                              </td>
+                                </td>
-                              <td className='p-3 text-right font-semibold text-gray-800 border-r border-gray-200'>
+                                <td className='p-5 text-center'>
-                                {formatCurrency(item.revenue)}
+                                  <StatusBadge status={status} />
-                              </td>
+                                </td>
-                              <td className='p-3 text-right font-medium text-gray-800'>
+                              </tr>
-                                {formatCurrency(item.average_price)}
+                            )
-                              </td>
+                          })}
-                            </tr>
+                        </tbody>
-                          )
+                        <tfoot>
-                        })
+                          <tr className='bg-gray-200 border-t-2 border-gray-400'>
-
+                            <td className='p-5 text-xl font-bold text-gray-800 border-r border-gray-400'>
-                        // Category subtotal row
-                        const categoryTotalQty = categoryProducts.reduce(
-                          (sum, item) => sum + (item.quantity_sold || 0),
-                          0
-                        )
-                        const categoryTotalOrders = categoryProducts.reduce(
-                          (sum, item) => sum + (item.order_count || 0),
-                          0
-                        )
-                        const categoryTotalRevenue = categoryProducts.reduce(
-                          (sum, item) => sum + (item.revenue || 0),
-                          0
-                        )
-
-                        rows.push(
-                          <tr
-                            key={`subtotal-${categoryName}`}
-                            className='bg-gray-200 border-b-2 border-gray-400'
-                            style={{ pageBreakInside: 'avoid' }}
-                          >
-                            <td className='p-3 pl-6 font-semibold text-gray-800 border-r border-gray-400'>
                               Subtotal {categoryName}
                             </td>
-                            <td className='p-3 text-center font-semibold text-gray-800 border-r border-gray-400'>
+                            <td className='p-5 text-xl text-center font-bold text-gray-800 border-r border-gray-400'>
                               {categoryTotalQty}
                             </td>
-                            <td className='p-3 text-center font-semibold text-gray-800 border-r border-gray-400'>
+                            <td className='p-5 text-xl text-right font-bold text-gray-800 border-r border-gray-400'>
-                              {categoryTotalOrders}
-                            </td>
-                            <td className='p-3 text-right font-semibold text-gray-800 border-r border-gray-400'>
                               {formatCurrency(categoryTotalRevenue)}
                             </td>
-                            <td className='p-3'></td>
+                            <td className='p-5 border-r border-gray-400'></td>
+                            <td className='p-5 border-r border-gray-400'></td>
+                            <td className='p-5'></td>
                           </tr>
-                        )
+                        </tfoot>
-                      })
+                      </table>
+                    </div>
+                  </div>
+                )
+              })}
 
-                    return rows
+            {/* Grand Total */}
-                  })()}
+            <div className='bg-purple-50 rounded-lg border-2 border-purple-300 mt-6'>
-                </tbody>
+              <table className='w-full' style={{ borderCollapse: 'collapse', tableLayout: 'fixed' }}>
+                <colgroup>
+                  <col style={{ width: '28%' }} />
+                  <col style={{ width: '10%' }} />
+                  <col style={{ width: '22%' }} />
+                  <col style={{ width: '13%' }} />
+                  <col style={{ width: '13%' }} />
+                  <col style={{ width: '14%' }} />
+                </colgroup>
                 <tfoot>
-                  <tr className='text-gray-800 border-t-2 border-gray-300' style={{ pageBreakInside: 'avoid' }}>
+                  <tr className='text-gray-800'>
-                    <td className='p-3 font-bold border-r border-gray-300'>TOTAL KESELURUHAN</td>
+                    <td className='p-5 text-2xl font-bold border-r-2 border-purple-300' style={{ color: '#36175e' }}>
-                    <td className='p-3 text-center font-bold border-r border-gray-300'>
+                      TOTAL KESELURUHAN
+                    </td>
+                    <td
+                      className='p-5 text-2xl text-center font-bold border-r-2 border-purple-300'
+                      style={{ color: '#36175e' }}
+                    >
                       {productSummary.totalQuantitySold ?? 0}
                     </td>
-                    <td className='p-3 text-center font-bold border-r border-gray-300'>
+                    <td
-                      {productSummary.totalOrders ?? 0}
+                      className='p-5 text-2xl text-right font-bold border-r-2 border-purple-300'
-                    </td>
+                      style={{ color: '#36175e' }}
-                    <td className='p-3 text-right font-bold border-r border-gray-300'>
+                    >
                       {formatCurrency(productSummary.totalRevenue ?? 0)}
                     </td>
-                    <td className='p-3'></td>
+                    <td className='p-5 border-r-2 border-purple-300'></td>
+                    <td className='p-5 border-r-2 border-purple-300'></td>
+                    <td className='p-5'></td>
                   </tr>
                 </tfoot>
               </table>
@@ -638,7 +567,7 @@ const DailyPOSReport = () => {
 
         {/* Footer */}
         <div className='px-8 py-6 border-t-2 border-gray-200 mt-8'>
-          <div className='flex justify-between items-center text-sm text-gray-600'>
+          <div className='flex justify-between items-center text-base text-gray-600'>
             <p>© 2025 Apskel - Sistem POS Terpadu</p>
             <p></p>
             <p>Dicetak pada: {now.toLocaleDateString('id-ID')}</p>

src/app/[lang]/(dashboard)/(private)/dashboards/overview/page.tsx

@@ -4,7 +4,12 @@ import { TextField, Typography, useTheme } from '@mui/material'
 import { useState } from 'react'
 import Loading from '../../../../../../components/layout/shared/Loading'
 import { useDashboardAnalytics } from '../../../../../../services/queries/analytics'
-import { formatDateDDMMYYYY, formatForInputDate, formatShortCurrency } from '../../../../../../utils/transform'
+import {
+  formatCurrency,
+  formatDateDDMMYYYY,
+  formatForInputDate,
+  formatShortCurrency
+} from '../../../../../../utils/transform'
 import OrdersReport from '../../../../../../views/dashboards/orders/OrdersReport'
 import PaymentMethodReport from '../../../../../../views/dashboards/payment-methods/PaymentMethodReport'
 import ProductSales from '../../../../../../views/dashboards/products/ProductSales'
@@ -115,14 +120,14 @@ const DashboardOverview = () => {
               <MetricCard
                 iconClass='tabler-cash'
                 title='Total Sales'
-                value={formatShortCurrency(salesData.overview.total_sales)}
+                value={formatCurrency(salesData.overview.total_sales)}
                 bgColor='bg-green-500'
                 isCurrency={true}
               />
               <MetricCard
                 iconClass='tabler-trending-up'
                 title='Average Order Value'
-                value={formatShortCurrency(salesData.overview.average_order_value)}
+                value={formatCurrency(salesData.overview.average_order_value)}
                 bgColor='bg-purple-500'
                 isCurrency={true}
               />

src/app/[lang]/(dashboard)/(private)/dashboards/profit-loss/page.tsx

@@ -162,21 +162,21 @@ const DashboardProfitloss = () => {
               <MetricCard
                 iconClass='tabler-currency-dollar'
                 title='Total Revenue'
-                value={formatShortCurrency(profitData.summary.total_revenue)}
+                value={formatCurrency(profitData.summary.total_revenue)}
                 bgColor='bg-green-500'
                 isCurrency={true}
               />
               <MetricCard
                 iconClass='tabler-receipt'
                 title='Total Cost'
-                value={formatShortCurrency(profitData.summary.total_cost)}
+                value={formatCurrency(profitData.summary.total_cost)}
                 bgColor='bg-red-500'
                 isCurrency={true}
               />
               <MetricCard
                 iconClass='tabler-trending-up'
                 title='Gross Profit'
-                value={formatShortCurrency(profitData.summary.gross_profit)}
+                value={formatCurrency(profitData.summary.gross_profit)}
                 subtitle={`Margin: ${formatPercentage(profitData.summary.gross_profit_margin)}`}
                 bgColor='bg-blue-500'
                 isNegative={profitData.summary.gross_profit < 0}
@@ -186,7 +186,7 @@ const DashboardProfitloss = () => {
                 iconClass='tabler-percentage'
                 title='Profitability Ratio'
                 value={formatPercentage(profitData.summary.profitability_ratio)}
-                subtitle={`Avg Profit: ${formatShortCurrency(profitData.summary.average_profit)}`}
+                subtitle={`Avg Profit: ${formatCurrency(profitData.summary.average_profit)}`}
                 bgColor='bg-purple-500'
               />
             </div>
@@ -199,7 +199,7 @@ const DashboardProfitloss = () => {
                   <h3 className='text-lg font-semibold text-gray-900'>Net Profit</h3>
                 </div>
                 <p className='text-3xl font-bold text-green-600 mb-2'>
-                  Rp {formatShortCurrency(profitData.summary.net_profit)}
+                  {formatCurrency(profitData.summary.net_profit)}
                 </p>
                 <p className='text-sm text-gray-600'>
                   Margin: {formatPercentage(profitData.summary.net_profit_margin)}

src/components/layout/vertical/VerticalMenu.tsx

@@ -173,6 +173,7 @@ const VerticalMenu = ({ dictionary, scrollMenu }: Props) => {
             </MenuItem> */}
             {/* <MenuItem href={`/${locale}/apps/marketing/voucher`}>{dictionary['navigation'].voucher}</MenuItem> */}
             <MenuItem href={`/${locale}/apps/marketing/tier`}>{dictionary['navigation'].tiers_text}</MenuItem>
+            {/* <MenuItem href={`/${locale}/apps/marketing/discount`}>{dictionary['navigation'].discount}</MenuItem> */}
           </SubMenu>
           <SubMenu label={dictionary['navigation'].inventory} icon={<i className='tabler-salad' />}>
             <SubMenu label={dictionary['navigation'].products}>

src/data/dictionaries/en.json

@@ -137,6 +137,7 @@
     "voucher": "Voucher",
     "tiers_text": "Tiers",
     "games": "Games",
-    "game_prizes": "Game Prizes"
+    "game_prizes": "Game Prizes",
+    "discount": "Discount"
   }
 }

src/data/dictionaries/id.json

@@ -137,6 +137,7 @@
         "voucher": "Vocher",
         "tiers_text": "Tiers",
         "games": "Permainan",
-        "game_prizes": "Hadiah Permainan"
+        "game_prizes": "Hadiah Permainan",
+        "Discount": "Diskon"
     }
 }

src/redux-store/index.ts

@@ -10,6 +10,7 @@ import productRecipeReducer from '@/redux-store/slices/productRecipe'
 import organizationReducer from '@/redux-store/slices/organization'
 import userReducer from '@/redux-store/slices/user'
 import vendorReducer from '@/redux-store/slices/vendor'
+import discountReducer from '@/redux-store/slices/discount'
 
 export const store = configureStore({
   reducer: {
@@ -21,7 +22,8 @@ export const store = configureStore({
     productRecipeReducer,
     organizationReducer,
     userReducer,
-    vendorReducer
+    vendorReducer,
+    discountReducer
   },
   middleware: getDefaultMiddleware => getDefaultMiddleware({ serializableCheck: false })
 })

src/redux-store/slices/discount.ts

@@ -0,0 +1,193 @@
+// redux-store/slices/discount.ts
+
+import { CategoryRuleType, CreateDiscountPayload, ProductRuleType } from '@/types/services/discount'
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+// Temporary interfaces for rules before discount is created
+interface TempProductRule {
+  product_id: string
+  product_name?: string
+  rule_type: ProductRuleType
+  quantity: number
+  free_quantity: number
+}
+
+interface TempCategoryRule {
+  category_id: string
+  category_name?: string
+  rule_type: CategoryRuleType
+}
+
+interface DiscountState {
+  discountRequest: CreateDiscountPayload
+  selectedOutlets: string[]
+  productRules: TempProductRule[]
+  categoryRules: TempCategoryRule[]
+}
+
+const initialState: DiscountState = {
+  discountRequest: {
+    campaign_id: '',
+    code: '',
+    name: '',
+    type: 'percentage',
+    value: 0,
+    min_purchase_amount: 0,
+    min_purchase_qty: 0,
+    start_date: '',
+    end_date: '',
+    usage_limit_per_customer: undefined,
+    usage_limit_total: undefined,
+    customer_type: 'all',
+    is_stackable: false,
+    priority: 10
+  },
+  selectedOutlets: [],
+  productRules: [],
+  categoryRules: []
+}
+
+const discountSlice = createSlice({
+  name: 'discount',
+  initialState,
+  reducers: {
+    // Set entire discount object
+    setDiscount: (state, action: PayloadAction<CreateDiscountPayload>) => {
+      state.discountRequest = action.payload
+    },
+
+    // Set individual field
+    setDiscountField: (state, action: PayloadAction<{ field: keyof CreateDiscountPayload; value: any }>) => {
+      const { field, value } = action.payload
+      state.discountRequest[field] = value as never
+    },
+
+    // Reset discount to initial state
+    resetDiscount: state => {
+      state.discountRequest = initialState.discountRequest
+      state.selectedOutlets = []
+      state.productRules = []
+      state.categoryRules = []
+    },
+
+    // Outlet management
+    setDiscountOutlets: (state, action: PayloadAction<string[]>) => {
+      state.selectedOutlets = action.payload
+    },
+
+    addDiscountOutlet: (state, action: PayloadAction<string>) => {
+      if (!state.selectedOutlets.includes(action.payload)) {
+        state.selectedOutlets.push(action.payload)
+      }
+    },
+
+    removeDiscountOutlet: (state, action: PayloadAction<string>) => {
+      state.selectedOutlets = state.selectedOutlets.filter(id => id !== action.payload)
+    },
+
+    // Product rules management
+    setProductRules: (state, action: PayloadAction<TempProductRule[]>) => {
+      state.productRules = action.payload
+    },
+
+    addProductRule: (state, action: PayloadAction<TempProductRule>) => {
+      state.productRules.push(action.payload)
+    },
+
+    updateProductRule: (state, action: PayloadAction<{ index: number; rule: TempProductRule }>) => {
+      const { index, rule } = action.payload
+      if (index >= 0 && index < state.productRules.length) {
+        state.productRules[index] = rule
+      }
+    },
+
+    removeProductRule: (state, action: PayloadAction<number>) => {
+      state.productRules = state.productRules.filter((_, index) => index !== action.payload)
+    },
+
+    clearProductRules: state => {
+      state.productRules = []
+    },
+
+    // Category rules management
+    setCategoryRules: (state, action: PayloadAction<TempCategoryRule[]>) => {
+      state.categoryRules = action.payload
+    },
+
+    addCategoryRule: (state, action: PayloadAction<TempCategoryRule>) => {
+      state.categoryRules.push(action.payload)
+    },
+
+    updateCategoryRule: (state, action: PayloadAction<{ index: number; rule: TempCategoryRule }>) => {
+      const { index, rule } = action.payload
+      if (index >= 0 && index < state.categoryRules.length) {
+        state.categoryRules[index] = rule
+      }
+    },
+
+    removeCategoryRule: (state, action: PayloadAction<number>) => {
+      state.categoryRules = state.categoryRules.filter((_, index) => index !== action.payload)
+    },
+
+    clearCategoryRules: state => {
+      state.categoryRules = []
+    },
+
+    // Bulk operations
+    clearAllRules: state => {
+      state.productRules = []
+      state.categoryRules = []
+    },
+
+    // Set multiple fields at once
+    setDiscountFields: (state, action: PayloadAction<Partial<CreateDiscountPayload>>) => {
+      state.discountRequest = { ...state.discountRequest, ...action.payload }
+    }
+  }
+})
+
+export const {
+  setDiscount,
+  setDiscountField,
+  resetDiscount,
+  setDiscountOutlets,
+  addDiscountOutlet,
+  removeDiscountOutlet,
+  setProductRules,
+  addProductRule,
+  updateProductRule,
+  removeProductRule,
+  clearProductRules,
+  setCategoryRules,
+  addCategoryRule,
+  updateCategoryRule,
+  removeCategoryRule,
+  clearCategoryRules,
+  clearAllRules,
+  setDiscountFields
+} = discountSlice.actions
+
+export default discountSlice.reducer
+
+// Selectors (optional but recommended)
+export const selectDiscountRequest = (state: { discountReducer: DiscountState }) =>
+  state.discountReducer.discountRequest
+
+export const selectSelectedOutlets = (state: { discountReducer: DiscountState }) =>
+  state.discountReducer.selectedOutlets
+
+export const selectProductRules = (state: { discountReducer: DiscountState }) => state.discountReducer.productRules
+
+export const selectCategoryRules = (state: { discountReducer: DiscountState }) => state.discountReducer.categoryRules
+
+export const selectIsDiscountValid = (state: { discountReducer: DiscountState }) => {
+  const { discountRequest } = state.discountReducer
+  return (
+    discountRequest.campaign_id !== '' &&
+    discountRequest.code !== '' &&
+    discountRequest.name !== '' &&
+    discountRequest.start_date !== '' &&
+    discountRequest.end_date !== '' &&
+    (discountRequest.type === 'free_product' || discountRequest.value > 0)
+  )
+}

src/services/mutations/discount.ts

@@ -0,0 +1,287 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { api } from '../api'
+import { toast } from 'react-toastify'
+import {
+  CreateDiscountPayload,
+  UpdateDiscountPayload,
+  AddOutletsPayload,
+  ReplaceOutletsPayload,
+  AddProductRulePayload,
+  UpdateProductRulePayload,
+  AddCategoryRulePayload,
+  UpdateCategoryRulePayload,
+  Discount,
+  DiscountOutlet,
+  ProductRule,
+  CategoryRule
+} from '@/types/services/discount'
+
+export const useDiscountsMutation = () => {
+  const queryClient = useQueryClient()
+
+  const createDiscount = useMutation({
+    mutationFn: async (payload: CreateDiscountPayload) => {
+      const response = await api.post('/discounts', payload)
+      return response.data
+    },
+    onSuccess: () => {
+      toast.success('Discount created successfully!')
+      queryClient.invalidateQueries({ queryKey: ['discounts'] })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Create failed')
+    }
+  })
+
+  const updateDiscount = useMutation({
+    mutationFn: async ({ id, payload }: { id: string; payload: UpdateDiscountPayload }) => {
+      const response = await api.put(`/discounts/${id}`, payload)
+      return response.data
+    },
+    onSuccess: () => {
+      toast.success('Discount updated successfully!')
+      queryClient.invalidateQueries({ queryKey: ['discounts'] })
+      queryClient.invalidateQueries({ queryKey: ['discount'] })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Update failed')
+    }
+  })
+
+  const toggleDiscountStatus = useMutation({
+    mutationFn: async ({ id, isActive }: { id: string; isActive: boolean }) => {
+      const response = await api.patch(`/discounts/${id}/toggle-status`, { is_active: isActive })
+      return response.data
+    },
+    onSuccess: () => {
+      toast.success('Discount status updated!')
+      queryClient.invalidateQueries({ queryKey: ['discounts'] })
+      queryClient.invalidateQueries({ queryKey: ['discount'] })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Status update failed')
+    }
+  })
+
+  const deleteDiscount = useMutation({
+    mutationFn: async (id: string) => {
+      const response = await api.delete(`/discounts/${id}`)
+      return response.data
+    },
+    onSuccess: () => {
+      toast.success('Discount deleted successfully!')
+      queryClient.invalidateQueries({ queryKey: ['discounts'] })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Delete failed')
+    }
+  })
+
+  const validateDiscount = useMutation({
+    mutationFn: async ({
+      code,
+      purchaseAmount,
+      customerId
+    }: {
+      code: string
+      purchaseAmount: number
+      customerId?: string
+    }) => {
+      const response = await api.post('/discounts/validate', {
+        code,
+        purchase_amount: purchaseAmount,
+        customer_id: customerId
+      })
+      return response.data
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.message || 'Validation failed')
+    }
+  })
+
+  return {
+    createDiscount,
+    updateDiscount,
+    toggleDiscountStatus,
+    deleteDiscount,
+    validateDiscount
+  }
+}
+
+export const useDiscountOutletsMutation = () => {
+  const queryClient = useQueryClient()
+
+  const addOutlets = useMutation({
+    mutationFn: async ({ discountId, payload }: { discountId: string; payload: AddOutletsPayload }) => {
+      const response = await api.post(`/discounts/${discountId}/outlets`, payload)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Outlets added successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'outlets']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Add outlets failed')
+    }
+  })
+
+  const replaceOutlets = useMutation({
+    mutationFn: async ({ discountId, payload }: { discountId: string; payload: ReplaceOutletsPayload }) => {
+      const response = await api.put(`/discounts/${discountId}/outlets`, payload)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Outlets replaced successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'outlets']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Replace outlets failed')
+    }
+  })
+
+  const removeOutlet = useMutation({
+    mutationFn: async ({ discountId, outletId }: { discountId: string; outletId: string }) => {
+      const response = await api.delete(`/discounts/${discountId}/outlets/${outletId}`)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Outlet removed successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'outlets']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Remove outlet failed')
+    }
+  })
+
+  return { addOutlets, replaceOutlets, removeOutlet }
+}
+
+export const useProductRulesMutation = () => {
+  const queryClient = useQueryClient()
+
+  const addProductRule = useMutation({
+    mutationFn: async ({ discountId, payload }: { discountId: string; payload: AddProductRulePayload }) => {
+      const response = await api.post(`/discounts/${discountId}/products`, payload)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Product rule added successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'product-rules']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Add product rule failed')
+    }
+  })
+
+  const updateProductRule = useMutation({
+    mutationFn: async ({
+      discountId,
+      productRuleId,
+      payload
+    }: {
+      discountId: string
+      productRuleId: string
+      payload: UpdateProductRulePayload
+    }) => {
+      const response = await api.put(`/discounts/${discountId}/products/${productRuleId}`, payload)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Product rule updated successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'product-rules']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Update product rule failed')
+    }
+  })
+
+  const deleteProductRule = useMutation({
+    mutationFn: async ({ discountId, productRuleId }: { discountId: string; productRuleId: string }) => {
+      const response = await api.delete(`/discounts/${discountId}/products/${productRuleId}`)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Product rule deleted successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'product-rules']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Delete product rule failed')
+    }
+  })
+
+  return { addProductRule, updateProductRule, deleteProductRule }
+}
+
+export const useCategoryRulesMutation = () => {
+  const queryClient = useQueryClient()
+
+  const addCategoryRule = useMutation({
+    mutationFn: async ({ discountId, payload }: { discountId: string; payload: AddCategoryRulePayload }) => {
+      const response = await api.post(`/discounts/${discountId}/categories`, payload)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Category rule added successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'category-rules']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Add category rule failed')
+    }
+  })
+
+  const updateCategoryRule = useMutation({
+    mutationFn: async ({
+      discountId,
+      categoryRuleId,
+      payload
+    }: {
+      discountId: string
+      categoryRuleId: string
+      payload: UpdateCategoryRulePayload
+    }) => {
+      const response = await api.put(`/discounts/${discountId}/categories/${categoryRuleId}`, payload)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Category rule updated successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'category-rules']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Update category rule failed')
+    }
+  })
+
+  const deleteCategoryRule = useMutation({
+    mutationFn: async ({ discountId, categoryRuleId }: { discountId: string; categoryRuleId: string }) => {
+      const response = await api.delete(`/discounts/${discountId}/categories/${categoryRuleId}`)
+      return response.data
+    },
+    onSuccess: (_, variables) => {
+      toast.success('Category rule deleted successfully!')
+      queryClient.invalidateQueries({
+        queryKey: ['discount', variables.discountId, 'category-rules']
+      })
+    },
+    onError: (error: any) => {
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Delete category rule failed')
+    }
+  })
+
+  return { addCategoryRule, updateCategoryRule, deleteCategoryRule }
+}

src/services/mutations/purchaseOrder.ts

@@ -13,7 +13,7 @@ export const usePurchaseOrdersMutation = () => {
     },
     onSuccess: () => {
       toast.success('Purchase Order created successfully!')
-      queryClient.invalidateQueries({ queryKey: ['purchase-orders'] })
+      queryClient.invalidateQueries({ queryKey: ['purchase-orders', 'ingredients'] })
     },
     onError: (error: any) => {
       toast.error(error.response?.data?.errors?.[0]?.cause || 'Create failed')
@@ -22,15 +22,15 @@ export const usePurchaseOrdersMutation = () => {
 
   const sendPaymentPurchaseOrder = useMutation({
     mutationFn: async ({ id, payload }: { id: string; payload: SendPaymentPurchaseOrderRequest }) => {
-      const response = await api.put(`/purchase-orders/${id}`, payload)
+      const response = await api.put(`/purchase-orders/${id}/status/received`, payload)
       return response.data
     },
     onSuccess: () => {
-      toast.success('Purchase Order created successfully!')
+      toast.success('Send Payment Order successfully!')
       queryClient.invalidateQueries({ queryKey: ['purchase-orders'] })
     },
     onError: (error: any) => {
-      toast.error(error.response?.data?.errors?.[0]?.cause || 'Create failed')
+      toast.error(error.response?.data?.errors?.[0]?.cause || 'Send Payment Order failed')
     }
   })
 

src/services/queries/categories.ts

@@ -9,7 +9,7 @@ interface CategoriesQueryParams {
 }
 
 export function useCategories(params: CategoriesQueryParams = {}) {
-  const { page = 1, limit = 10, search = '', ...filters } = params
+  const { page = 1, limit = 50, search = '', ...filters } = params
 
   return useQuery<Categories>({
     queryKey: ['categories', { page, limit, search, ...filters }],
@@ -30,7 +30,9 @@ export function useCategories(params: CategoriesQueryParams = {}) {
       })
 
       const res = await api.get(`/categories?${queryParams.toString()}`)
-      return res.data.data
+      const data = res.data.data
+
+      return data
     }
   })
 }

src/services/queries/discount.ts

@@ -0,0 +1,116 @@
+import { useQuery } from '@tanstack/react-query'
+import { api } from '../api'
+import {
+  CategoryRule,
+  Discount,
+  DiscountOutlet,
+  DiscountsResponse,
+  FetchDiscountsParams,
+  ProductRule
+} from '@/types/services/discount'
+
+export function useDiscounts(params: FetchDiscountsParams = {}) {
+  const { page = 1, limit = 10, search = '', ...filters } = params
+
+  return useQuery<DiscountsResponse>({
+    queryKey: ['discounts', { page, limit, search, ...filters }],
+    queryFn: async () => {
+      const queryParams = new URLSearchParams()
+
+      queryParams.append('page', page.toString())
+      queryParams.append('limit', limit.toString())
+
+      if (search) {
+        queryParams.append('search', search)
+      }
+
+      Object.entries(filters).forEach(([key, value]) => {
+        if (value !== undefined && value !== null && value !== '') {
+          queryParams.append(key, value.toString())
+        }
+      })
+
+      const res = await api.get(`/discounts?${queryParams.toString()}`)
+      console.log(res.data.data)
+      return res.data.data
+    }
+  })
+}
+
+export function useAllDiscounts() {
+  return useQuery<Discount[]>({
+    queryKey: ['discounts', 'all'],
+    queryFn: async () => {
+      const res = await api.get('/discounts?page=1&limit=100')
+      return res.data.discounts
+    }
+  })
+}
+
+export function useDiscountsByCampaign(campaignId: string) {
+  return useQuery<Discount[]>({
+    queryKey: ['discounts', 'campaign', campaignId],
+    queryFn: async () => {
+      const res = await api.get(`/discounts?campaign_id=${campaignId}&limit=100`)
+      return res.data.discounts
+    },
+    enabled: !!campaignId
+  })
+}
+
+export function useDiscountById(id: string) {
+  return useQuery<Discount>({
+    queryKey: ['discount', id],
+    queryFn: async () => {
+      const res = await api.get(`/discounts/${id}`)
+      return res.data
+    },
+    enabled: !!id,
+    staleTime: 5 * 60 * 1000
+  })
+}
+
+export function useDiscountByCode(code: string) {
+  return useQuery<Discount>({
+    queryKey: ['discount', 'code', code],
+    queryFn: async () => {
+      const res = await api.get(`/discounts/code/${code}`)
+      return res.data
+    },
+    enabled: !!code,
+    staleTime: 5 * 60 * 1000
+  })
+}
+
+export function useDiscountOutlets(discountId: string) {
+  return useQuery<DiscountOutlet[]>({
+    queryKey: ['discount', discountId, 'outlets'],
+    queryFn: async () => {
+      const res = await api.get(`/discounts/${discountId}/outlets`)
+      return res.data
+    },
+    enabled: !!discountId
+  })
+}
+
+export function useProductRules(discountId: string) {
+  return useQuery<ProductRule[]>({
+    queryKey: ['discount', discountId, 'product-rules'],
+    queryFn: async () => {
+      const res = await api.get(`/discounts/${discountId}/products`)
+      return res.data
+    },
+    enabled: !!discountId
+  })
+}
+
+export function useCategoryRules(discountId: string) {
+  return useQuery<CategoryRule[]>({
+    queryKey: ['discount', discountId, 'category-rules'],
+    queryFn: async () => {
+      const res = await api.get(`/discounts/${discountId}/categories`)
+      return res.data
+    },
+    enabled: !!discountId
+  })
+}

src/services/queries/orders.ts

@@ -6,6 +6,8 @@ interface OrdersQueryParams {
   page?: number
   limit?: number
   search?: string
+  date_from?: string
+  date_to?: string
 }
 
 export function useOrders(params: OrdersQueryParams = {}) {

src/types/services/analytic.ts

@@ -31,8 +31,10 @@ export interface SalesReport {
 export interface ProductData {
   product_id: string
   product_name: string
+  product_sku: string
   category_id: string
   category_name: string
+  category_order: number
   quantity_sold: number
   revenue: number
   average_price: number

src/types/services/category.ts

@@ -1,25 +1,26 @@
 export interface Category {
-  id: string;
+  id: string
-  organization_id: string;
+  organization_id: string
-  name: string;
+  name: string
-  description: string | null;
+  description: string | null
-  business_type: string;
+  business_type: string
-  metadata: Record<string, any>;
+  order: number
-  created_at: string;
+  metadata: Record<string, any>
-  updated_at: string;
+  created_at: string
+  updated_at: string
 }
 
 export interface Categories {
-  categories: Category[];
+  categories: Category[]
-  total_count: number;
+  total_count: number
-  page: number;
+  page: number
-  limit: number;
+  limit: number
-  total_pages: number;
+  total_pages: number
 }
 
-
 export interface CategoryRequest {
-  name: string;
+  name: string
-  description: string | null;
+  description: string | null
-  business_type: string;
+  business_type: string
+  order: number
 }

src/types/services/discount.ts

@@ -0,0 +1,215 @@
+/**
+ * Discount type enum
+ */
+export type DiscountType = 'percentage' | 'fixed_amout' | 'free_product'
+
+/**
+ * Customer type enum
+ */
+export type CustomerType = 'all' | 'member' | 'vip'
+
+/**
+ * Product rule type enum
+ */
+export type ProductRuleType = 'required' | 'free' | 'excluded'
+
+/**
+ * Category rule type enum
+ */
+export type CategoryRuleType = 'included' | 'excluded'
+
+/**
+ * Discount interface
+ */
+export interface Discount {
+  id: string
+  campaign_id: string
+  code: string
+  name: string
+  type: DiscountType
+  value: number
+  min_purchase_qty: number
+  min_purchase_amount: number
+  start_date: string
+  end_date: string
+  usage_limit_per_customer: number | null
+  usage_limit_total: number | null
+  usage_count: number
+  customer_type: CustomerType
+  is_stackable: boolean
+  is_active: boolean
+  priority: number
+  created_at: string
+  updated_at: string
+}
+
+/**
+ * Discount Outlet interface
+ */
+export interface DiscountOutlet {
+  id: string
+  discount_id: string
+  outlet_id: string
+  created_at: string
+}
+
+/**
+ * Product Rule interface
+ */
+export interface ProductRule {
+  id: string
+  discount_id: string
+  product_id: string
+  rule_type: ProductRuleType
+  quantity: number
+  free_quantity: number
+  created_at: string
+}
+
+/**
+ * Category Rule interface
+ */
+export interface CategoryRule {
+  id: string
+  discount_id: string
+  category_id: string
+  rule_type: CategoryRuleType
+  created_at: string
+}
+
+/**
+ * Pagination metadata
+ */
+export interface Pagination {
+  page: number
+  limit: number
+  total_count: number
+  total_pages: number
+}
+
+/**
+ * Discounts response with pagination
+ */
+export interface DiscountsResponse {
+  discounts: Discount[]
+  pagination: Pagination
+}
+
+/**
+ * Fetch discounts parameters
+ */
+export interface FetchDiscountsParams {
+  page?: number
+  limit?: number
+  sort?: string
+  order?: 'asc' | 'desc'
+  search?: string
+  campaign_id?: string
+  type?: DiscountType
+  customer_type?: CustomerType
+  is_active?: boolean
+}
+
+/**
+ * Create discount payload
+ */
+export interface CreateDiscountPayload {
+  campaign_id: string
+  code: string
+  name: string
+  type: DiscountType
+  value: number
+  min_purchase_amount?: number
+  min_purchase_qty?: number
+  start_date: string
+  end_date: string
+  usage_limit_per_customer?: number
+  usage_limit_total?: number
+  customer_type: CustomerType
+  is_stackable: boolean
+  priority: number
+}
+
+/**
+ * Update discount payload
+ */
+export interface UpdateDiscountPayload {
+  campaign_id?: string
+  code?: string
+  name?: string
+  type?: DiscountType
+  value?: number
+  min_purchase_amount?: number
+  min_purchase_qty?: number
+  start_date?: string
+  end_date?: string
+  usage_limit_per_customer?: number
+  usage_limit_total?: number
+  customer_type?: CustomerType
+  is_stackable?: boolean
+  is_active?: boolean
+  priority?: number
+}
+
+/**
+ * Add outlets payload
+ */
+export interface AddOutletsPayload {
+  outlet_ids: string[]
+}
+
+/**
+ * Replace outlets payload
+ */
+export interface ReplaceOutletsPayload {
+  outlet_ids: string[]
+}
+
+/**
+ * Add product rule payload
+ */
+export interface AddProductRulePayload {
+  product_id: string
+  rule_type: ProductRuleType
+  quantity?: number
+  free_quantity?: number
+}
+
+/**
+ * Update product rule payload
+ */
+export interface UpdateProductRulePayload {
+  rule_type: ProductRuleType
+  quantity?: number
+  free_quantity?: number
+}
+
+/**
+ * Add category rule payload
+ */
+export interface AddCategoryRulePayload {
+  category_id: string
+  rule_type: CategoryRuleType
+}
+
+/**
+ * Update category rule payload
+ */
+export interface UpdateCategoryRulePayload {
+  rule_type: CategoryRuleType
+}
+
+/**
+ * Discount State for Redux
+ */
+export interface DiscountState {
+  discounts: Discount[]
+  allDiscounts: Discount[]
+  discountsPagination: Pagination | null
+  selectedDiscount: Discount | null
+  discountOutlets: DiscountOutlet[]
+  productRules: ProductRule[]
+  categoryRules: CategoryRule[]
+  loading: boolean
+  error: string | null
+}

src/utils/excelGenerator.ts

@@ -0,0 +1,527 @@
+// excelGenerator.ts
+import { formatCurrency, formatDateDDMMYYYY } from '@/utils/transform'
+import type ExcelJS from 'exceljs'
+
+interface ExcelGeneratorParams {
+  outlet: any
+  profitLoss: any
+  products: any
+  paymentAnalytics: any
+  category: any
+  productSummary: {
+    totalQuantitySold: number
+    totalRevenue: number
+    totalOrders: number
+  }
+  categorySummary: {
+    totalRevenue: number
+    orderCount: number
+    productCount: number
+    totalQuantity: number
+  }
+  filterType: 'single' | 'range'
+  selectedDate: Date
+  dateRange: { startDate: Date; endDate: Date }
+}
+
+const formatDateForInput = (date: Date) => {
+  return date.toISOString().split('T')[0]
+}
+
+const getReportPeriodText = (params: ExcelGeneratorParams) => {
+  if (params.filterType === 'single') {
+    return `${formatDateDDMMYYYY(params.selectedDate)} - ${formatDateDDMMYYYY(params.selectedDate)}`
+  }
+  return `${formatDateDDMMYYYY(params.dateRange.startDate)} - ${formatDateDDMMYYYY(params.dateRange.endDate)}`
+}
+
+// ========== EXCEL STYLES ==========
+const headerStyle: Partial<ExcelJS.Style> = {
+  font: { bold: true, size: 12, color: { argb: 'FFFFFFFF' } },
+  fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF36175E' } } as ExcelJS.FillPattern,
+  alignment: { vertical: 'middle', horizontal: 'center' },
+  border: {
+    top: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+    left: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+    bottom: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+    right: { style: 'thin', color: { argb: 'FFD1D5DB' } }
+  }
+}
+
+const titleStyle: Partial<ExcelJS.Style> = {
+  font: { bold: true, size: 18 },
+  alignment: { vertical: 'middle', horizontal: 'left' }
+}
+
+const subtitleStyle: Partial<ExcelJS.Style> = {
+  font: { size: 11, color: { argb: 'FF6B7280' } },
+  alignment: { vertical: 'middle', horizontal: 'left' }
+}
+
+const labelStyle: Partial<ExcelJS.Style> = {
+  font: { bold: true, size: 11 },
+  alignment: { vertical: 'middle', horizontal: 'left' }
+}
+
+const totalRowStyle: Partial<ExcelJS.Style> = {
+  font: { bold: true, size: 11 },
+  fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFF3F4F6' } } as ExcelJS.FillPattern,
+  border: {
+    top: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+    left: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+    bottom: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+    right: { style: 'thin', color: { argb: 'FFD1D5DB' } }
+  }
+}
+
+const dataStyle: Partial<ExcelJS.Style> = {
+  border: {
+    top: { style: 'thin', color: { argb: 'FFF3F4F6' } },
+    left: { style: 'thin', color: { argb: 'FFF3F4F6' } },
+    bottom: { style: 'thin', color: { argb: 'FFF3F4F6' } },
+    right: { style: 'thin', color: { argb: 'FFF3F4F6' } }
+  }
+}
+
+const dataStyleAlt: Partial<ExcelJS.Style> = {
+  ...dataStyle,
+  fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFFAFAFA' } } as ExcelJS.FillPattern
+}
+
+const currencyFormat = '#,##0'
+const percentageFormat = '0.0"%"'
+
+// ========== HELPER: STATUS STYLE ==========
+// Sehat  → teks hijau gelap, background hijau muda
+// Tidak Sehat → teks merah gelap, background merah muda
+const getStatusStyle = (status: 'Sehat' | 'Tidak Sehat', isAlt: boolean): Partial<ExcelJS.Style> => {
+  const baseStyle = isAlt ? dataStyleAlt : dataStyle
+  if (status === 'Sehat') {
+    return {
+      ...baseStyle,
+      font: { bold: true, size: 11, color: { argb: 'FF166534' } }, // green-800
+      fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFDCFCE7' } } as ExcelJS.FillPattern, // green-100
+      alignment: { horizontal: 'center', vertical: 'middle' },
+      border: dataStyle.border
+    }
+  }
+  return {
+    ...baseStyle,
+    font: { bold: true, size: 11, color: { argb: 'FF991B1B' } }, // red-800
+    fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFFEE2E2' } } as ExcelJS.FillPattern, // red-100
+    alignment: { horizontal: 'center', vertical: 'middle' },
+    border: dataStyle.border
+  }
+}
+
+// Dummy HPP values — ganti dengan data real nantinya
+const DUMMY_STD_HPP = 30 // 30% — ganti dengan data real nantinya
+const DUMMY_REAL_HPP = 0 // 0% — ganti dengan kalkulasi real nantinya
+const getDummyStatus = (stdHpp: number, realHpp: number): 'Sehat' | 'Tidak Sehat' =>
+  realHpp <= stdHpp ? 'Sehat' : 'Tidak Sehat'
+
+export const generateExcel = async (params: ExcelGeneratorParams) => {
+  const {
+    outlet,
+    profitLoss,
+    products,
+    paymentAnalytics,
+    category,
+    productSummary,
+    categorySummary,
+    filterType,
+    selectedDate,
+    dateRange
+  } = params
+
+  const ExcelJS = await import('exceljs')
+  const workbook = new ExcelJS.Workbook()
+
+  workbook.creator = outlet?.name || 'POS System'
+  workbook.created = new Date()
+
+  // ============ SHEET 1: RINGKASAN ============
+  const ws1 = workbook.addWorksheet('Ringkasan', {
+    views: [{ showGridLines: false }]
+  })
+
+  ws1.mergeCells('A1:B1')
+  const titleCell = ws1.getCell('A1')
+  titleCell.value = 'LAPORAN TRANSAKSI'
+  titleCell.style = {
+    font: { bold: true, size: 20, color: { argb: 'FF1F2937' } },
+    alignment: { vertical: 'middle', horizontal: 'left' }
+  }
+  ws1.getRow(1).height = 30
+
+  ws1.getCell('A2').value = outlet?.name || ''
+  ws1.getCell('A2').style = { ...subtitleStyle, font: { size: 12, color: { argb: 'FF4B5563' } } }
+  ws1.getCell('A3').value = outlet?.address || ''
+  ws1.getCell('A3').style = subtitleStyle
+  ws1.getCell('A4').value = outlet?.phone || ''
+  ws1.getCell('A4').style = subtitleStyle
+
+  ws1.getCell('A5').value = 'Periode:'
+  ws1.getCell('B5').value = getReportPeriodText(params)
+  ws1.getCell('A5').style = labelStyle
+  ws1.getCell('B5').style = { font: { size: 11 } }
+
+  ws1.getCell('A7').value = 'RINGKASAN'
+  ws1.getCell('A7').style = {
+    font: { bold: true, size: 14, color: { argb: 'FF36175E' } },
+    alignment: { vertical: 'middle', horizontal: 'left' }
+  }
+
+  ws1.getCell('A8').value = 'Keterangan'
+  ws1.getCell('B8').value = 'Jumlah (IDR)'
+  ws1.getCell('A8').style = headerStyle
+  ws1.getCell('B8').style = headerStyle
+  ws1.getRow(8).height = 25
+
+  const summaryData = [
+    ['Total Penjualan', profitLoss?.summary.total_revenue || 0],
+    ['Total Diskon', profitLoss?.summary.total_discount || 0],
+    ['Total Pajak', profitLoss?.summary.total_tax || 0],
+    ['PB1', 0],
+    ['Service Charge', profitLoss?.summary.service_charge || 0]
+  ]
+
+  summaryData.forEach((row, idx) => {
+    const rowNum = idx + 9
+    ws1.getCell(`A${rowNum}`).value = row[0]
+    ws1.getCell(`B${rowNum}`).value = row[1]
+    const isAlt = idx % 2 === 1
+    const baseStyle = isAlt ? dataStyleAlt : dataStyle
+    ws1.getCell(`A${rowNum}`).style = { ...baseStyle, alignment: { horizontal: 'left' } }
+    ws1.getCell(`B${rowNum}`).style = { ...baseStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+    ws1.getRow(rowNum).height = 22
+  })
+
+  const totalRow = 9 + summaryData.length
+  ws1.getCell(`A${totalRow}`).value = 'Total'
+  ws1.getCell(`B${totalRow}`).value = profitLoss?.summary.total_revenue || 0
+  ws1.getCell(`A${totalRow}`).style = { ...totalRowStyle, alignment: { horizontal: 'left' } }
+  ws1.getCell(`B${totalRow}`).style = { ...totalRowStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+  ws1.getRow(totalRow).height = 25
+
+  const invoiceRow = totalRow + 2
+  ws1.getCell(`A${invoiceRow}`).value = 'INVOICE'
+  ws1.getCell(`A${invoiceRow}`).style = {
+    font: { bold: true, size: 14, color: { argb: 'FF36175E' } },
+    alignment: { vertical: 'middle', horizontal: 'left' }
+  }
+
+  ws1.getCell(`A${invoiceRow + 1}`).value = 'Total Invoice'
+  ws1.getCell(`B${invoiceRow + 1}`).value = profitLoss?.summary.total_orders || 0
+  ws1.getCell(`A${invoiceRow + 1}`).style = { ...dataStyle, font: { bold: true } }
+  ws1.getCell(`B${invoiceRow + 1}`).style = { ...dataStyle, alignment: { horizontal: 'right' }, font: { bold: true } }
+
+  ws1.getColumn(1).width = 28
+  ws1.getColumn(2).width = 22
+
+  // ============ SHEET 2: METODE PEMBAYARAN ============
+  const ws2 = workbook.addWorksheet('Metode Pembayaran', {
+    views: [{ showGridLines: false }]
+  })
+
+  ws2.mergeCells('A1:D1')
+  const paymentTitle = ws2.getCell('A1')
+  paymentTitle.value = 'RINGKASAN METODE PEMBAYARAN'
+  paymentTitle.style = titleStyle
+  ws2.getRow(1).height = 30
+
+  const paymentHeaders = ['Metode', 'Jumlah Order', 'Total Amount (IDR)', 'Persentase']
+  paymentHeaders.forEach((header, idx) => {
+    const cell = ws2.getCell(3, idx + 1)
+    cell.value = header
+    cell.style = headerStyle
+  })
+  ws2.getRow(3).height = 25
+
+  let paymentRow = 4
+  paymentAnalytics?.data?.forEach((payment: any, idx: number) => {
+    const isAlt = idx % 2 === 1
+    const baseStyle = isAlt ? dataStyleAlt : dataStyle
+
+    ws2.getCell(paymentRow, 1).value = payment.payment_method_name
+    ws2.getCell(paymentRow, 2).value = payment.order_count
+    ws2.getCell(paymentRow, 3).value = payment.total_amount
+    ws2.getCell(paymentRow, 4).value = (payment.percentage || 0) / 100
+
+    ws2.getCell(paymentRow, 1).style = { ...baseStyle, alignment: { horizontal: 'left' } }
+    ws2.getCell(paymentRow, 2).style = { ...baseStyle, alignment: { horizontal: 'center' } }
+    ws2.getCell(paymentRow, 3).style = { ...baseStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+    ws2.getCell(paymentRow, 4).style = { ...baseStyle, alignment: { horizontal: 'center' }, numFmt: percentageFormat }
+
+    ws2.getRow(paymentRow).height = 22
+    paymentRow++
+  })
+
+  ws2.getCell(paymentRow, 1).value = 'TOTAL'
+  ws2.getCell(paymentRow, 2).value = paymentAnalytics?.summary.total_orders || 0
+  ws2.getCell(paymentRow, 3).value = paymentAnalytics?.summary.total_amount || 0
+  ws2.getCell(paymentRow, 4).value = ''
+  ws2.getCell(paymentRow, 1).style = { ...totalRowStyle, alignment: { horizontal: 'left' } }
+  ws2.getCell(paymentRow, 2).style = { ...totalRowStyle, alignment: { horizontal: 'center' } }
+  ws2.getCell(paymentRow, 3).style = { ...totalRowStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+  ws2.getCell(paymentRow, 4).style = totalRowStyle
+  ws2.getRow(paymentRow).height = 25
+
+  ws2.getColumn(1).width = 28
+  ws2.getColumn(2).width = 16
+  ws2.getColumn(3).width = 22
+  ws2.getColumn(4).width = 16
+
+  // ============ SHEET 3: KATEGORI ============
+  // + 3 kolom baru: % Standard HPP | % Realisasi HPP | Status
+  const ws3 = workbook.addWorksheet('Kategori', {
+    views: [{ showGridLines: false }]
+  })
+
+  ws3.mergeCells('A1:F1')
+  const categoryTitle = ws3.getCell('A1')
+  categoryTitle.value = 'RINGKASAN KATEGORI'
+  categoryTitle.style = titleStyle
+  ws3.getRow(1).height = 30
+
+  const categoryHeaders = ['Nama', 'Qty', 'Pendapatan (IDR)', '% Standard HPP', '% Realisasi HPP', 'Status']
+  categoryHeaders.forEach((header, idx) => {
+    const cell = ws3.getCell(3, idx + 1)
+    cell.value = header
+    cell.style = headerStyle
+  })
+  ws3.getRow(3).height = 25
+
+  let categoryRow = 4
+  category?.data?.forEach((cat: any, idx: number) => {
+    const isAlt = idx % 2 === 1
+    const baseStyle = isAlt ? dataStyleAlt : dataStyle
+    const stdHpp = DUMMY_STD_HPP
+    const realHpp = DUMMY_REAL_HPP
+    const status = getDummyStatus(stdHpp, realHpp)
+
+    ws3.getCell(categoryRow, 1).value = cat.category_name
+    ws3.getCell(categoryRow, 2).value = cat.total_quantity
+    ws3.getCell(categoryRow, 3).value = cat.total_revenue
+    ws3.getCell(categoryRow, 4).value = stdHpp // akan diformat sebagai persentase
+    ws3.getCell(categoryRow, 5).value = realHpp
+    ws3.getCell(categoryRow, 6).value = status
+
+    ws3.getCell(categoryRow, 1).style = { ...baseStyle, alignment: { horizontal: 'left' } }
+    ws3.getCell(categoryRow, 2).style = { ...baseStyle, alignment: { horizontal: 'center' } }
+    ws3.getCell(categoryRow, 3).style = { ...baseStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+    ws3.getCell(categoryRow, 4).style = { ...baseStyle, alignment: { horizontal: 'center' }, numFmt: '0.0"%"' }
+    ws3.getCell(categoryRow, 5).style = { ...baseStyle, alignment: { horizontal: 'center' }, numFmt: '0.0"%"' }
+    ws3.getCell(categoryRow, 6).style = getStatusStyle(status, isAlt)
+
+    ws3.getRow(categoryRow).height = 22
+    categoryRow++
+  })
+
+  // Total row (3 kolom baru dikosongkan)
+  ws3.getCell(categoryRow, 1).value = 'TOTAL'
+  ws3.getCell(categoryRow, 2).value = categorySummary.totalQuantity
+  ws3.getCell(categoryRow, 3).value = categorySummary.totalRevenue
+  ws3.getCell(categoryRow, 4).value = ''
+  ws3.getCell(categoryRow, 5).value = ''
+  ws3.getCell(categoryRow, 6).value = ''
+
+  ws3.getCell(categoryRow, 1).style = { ...totalRowStyle, alignment: { horizontal: 'left' } }
+  ws3.getCell(categoryRow, 2).style = { ...totalRowStyle, alignment: { horizontal: 'center' } }
+  ws3.getCell(categoryRow, 3).style = { ...totalRowStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+  ws3.getCell(categoryRow, 4).style = totalRowStyle
+  ws3.getCell(categoryRow, 5).style = totalRowStyle
+  ws3.getCell(categoryRow, 6).style = totalRowStyle
+  ws3.getRow(categoryRow).height = 25
+
+  ws3.getColumn(1).width = 35
+  ws3.getColumn(2).width = 12
+  ws3.getColumn(3).width = 22
+  ws3.getColumn(4).width = 18 // % Standard HPP
+  ws3.getColumn(5).width = 18 // % Realisasi HPP
+  ws3.getColumn(6).width = 16 // Status
+
+  // ============ SHEET 4: DETAIL PRODUK ============
+  // + 3 kolom baru: % Standard HPP | % Realisasi HPP | Status
+  const ws4 = workbook.addWorksheet('Detail Produk', {
+    views: [{ showGridLines: false }]
+  })
+
+  ws4.mergeCells('A1:F1')
+  const productTitle = ws4.getCell('A1')
+  productTitle.value = 'RINGKASAN ITEM PER KATEGORI'
+  productTitle.style = titleStyle
+  ws4.getRow(1).height = 30
+
+  const groupedProducts =
+    products?.data?.reduce(
+      (acc: any, item: any) => {
+        const categoryName = item.category_name || 'Tidak Berkategori'
+        if (!acc[categoryName]) acc[categoryName] = []
+        acc[categoryName].push(item)
+        return acc
+      },
+      {} as Record<string, any[]>
+    ) || {}
+
+  let currentRow = 3
+
+  Object.keys(groupedProducts)
+    .sort((a, b) => {
+      const orderA = groupedProducts[a][0]?.category_order ?? 999
+      const orderB = groupedProducts[b][0]?.category_order ?? 999
+      return orderA - orderB
+    })
+    .forEach((categoryName, index) => {
+      // Category header — span 6 kolom
+      ws4.mergeCells(`A${currentRow}:F${currentRow}`)
+      const catHeader = ws4.getCell(`A${currentRow}`)
+      catHeader.value = `${index + 1}. ${categoryName.toUpperCase()}`
+      catHeader.style = {
+        font: { bold: true, size: 13, color: { argb: 'FF36175E' } },
+        fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFF9FAFB' } } as ExcelJS.FillPattern,
+        alignment: { vertical: 'middle', horizontal: 'left' },
+        border: {
+          top: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+          left: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+          bottom: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+          right: { style: 'thin', color: { argb: 'FFD1D5DB' } }
+        }
+      }
+      ws4.getRow(currentRow).height = 28
+      currentRow++
+
+      // Column headers — 6 kolom
+      const prodHeaders = ['Produk', 'Qty', 'Pendapatan (IDR)', '% Standard HPP', '% Realisasi HPP', 'Status']
+      prodHeaders.forEach((header, idx) => {
+        const cell = ws4.getCell(currentRow, idx + 1)
+        cell.value = header
+        cell.style = {
+          font: { bold: true, size: 11, color: { argb: 'FFFFFFFF' } },
+          fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF36175E' } } as ExcelJS.FillPattern,
+          alignment: { vertical: 'middle', horizontal: 'center' },
+          border: {
+            top: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+            left: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+            bottom: { style: 'thin', color: { argb: 'FFD1D5DB' } },
+            right: { style: 'thin', color: { argb: 'FFD1D5DB' } }
+          }
+        }
+      })
+      ws4.getRow(currentRow).height = 24
+      currentRow++
+
+      const categoryProducts = groupedProducts[categoryName].sort((a: any, b: any) =>
+        (a.product_sku || '').localeCompare(b.product_sku || '')
+      )
+
+      categoryProducts.forEach((product: any, idx: number) => {
+        const isAlt = idx % 2 === 1
+        const baseStyle = isAlt ? dataStyleAlt : dataStyle
+        const stdHpp = DUMMY_STD_HPP
+        const realHpp = DUMMY_REAL_HPP
+        const status = getDummyStatus(stdHpp, realHpp)
+
+        ws4.getCell(currentRow, 1).value = product.product_name
+        ws4.getCell(currentRow, 2).value = product.quantity_sold
+        ws4.getCell(currentRow, 3).value = product.revenue
+        ws4.getCell(currentRow, 4).value = stdHpp
+        ws4.getCell(currentRow, 5).value = realHpp
+        ws4.getCell(currentRow, 6).value = status
+
+        ws4.getCell(currentRow, 1).style = { ...baseStyle, alignment: { horizontal: 'left' } }
+        ws4.getCell(currentRow, 2).style = { ...baseStyle, alignment: { horizontal: 'center' } }
+        ws4.getCell(currentRow, 3).style = { ...baseStyle, alignment: { horizontal: 'right' }, numFmt: currencyFormat }
+        ws4.getCell(currentRow, 4).style = { ...baseStyle, alignment: { horizontal: 'center' }, numFmt: '0.0"%"' }
+        ws4.getCell(currentRow, 5).style = { ...baseStyle, alignment: { horizontal: 'center' }, numFmt: '0.0"%"' }
+        ws4.getCell(currentRow, 6).style = getStatusStyle(status, isAlt)
+
+        ws4.getRow(currentRow).height = 20
+        currentRow++
+      })
+
+      // Subtotal — 3 kolom baru dikosongkan
+      const subQty = categoryProducts.reduce((sum: number, p: any) => sum + p.quantity_sold, 0)
+      const subRevenue = categoryProducts.reduce((sum: number, p: any) => sum + p.revenue, 0)
+
+      const subtotalFill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFF3F4F6' } } as ExcelJS.FillPattern
+      ws4.getCell(currentRow, 1).value = `Subtotal ${categoryName}`
+      ws4.getCell(currentRow, 2).value = subQty
+      ws4.getCell(currentRow, 3).value = subRevenue
+      ws4.getCell(currentRow, 4).value = ''
+      ws4.getCell(currentRow, 5).value = ''
+      ws4.getCell(currentRow, 6).value = ''
+
+      ws4.getCell(currentRow, 1).style = { ...totalRowStyle, alignment: { horizontal: 'left' }, fill: subtotalFill }
+      ws4.getCell(currentRow, 2).style = { ...totalRowStyle, alignment: { horizontal: 'center' }, fill: subtotalFill }
+      ws4.getCell(currentRow, 3).style = {
+        ...totalRowStyle,
+        alignment: { horizontal: 'right' },
+        numFmt: currencyFormat,
+        fill: subtotalFill
+      }
+      ws4.getCell(currentRow, 4).style = { ...totalRowStyle, fill: subtotalFill }
+      ws4.getCell(currentRow, 5).style = { ...totalRowStyle, fill: subtotalFill }
+      ws4.getCell(currentRow, 6).style = { ...totalRowStyle, fill: subtotalFill }
+
+      ws4.getRow(currentRow).height = 24
+      currentRow += 3
+    })
+
+  // Grand Total
+  const grandFill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF36175E' } } as ExcelJS.FillPattern
+  const grandFont = { bold: true, size: 13, color: { argb: 'FFFFFFFF' } }
+
+  ws4.getCell(currentRow, 1).value = 'TOTAL KESELURUHAN'
+  ws4.getCell(currentRow, 2).value = productSummary.totalQuantitySold
+  ws4.getCell(currentRow, 3).value = productSummary.totalRevenue
+  ws4.getCell(currentRow, 4).value = ''
+  ws4.getCell(currentRow, 5).value = ''
+  ws4.getCell(currentRow, 6).value = ''
+
+  ws4.getCell(currentRow, 1).style = {
+    ...totalRowStyle,
+    alignment: { horizontal: 'left' },
+    font: grandFont,
+    fill: grandFill
+  }
+  ws4.getCell(currentRow, 2).style = {
+    ...totalRowStyle,
+    alignment: { horizontal: 'center' },
+    font: grandFont,
+    fill: grandFill
+  }
+  ws4.getCell(currentRow, 3).style = {
+    ...totalRowStyle,
+    alignment: { horizontal: 'right' },
+    numFmt: currencyFormat,
+    font: grandFont,
+    fill: grandFill
+  }
+  ws4.getCell(currentRow, 4).style = { ...totalRowStyle, font: grandFont, fill: grandFill }
+  ws4.getCell(currentRow, 5).style = { ...totalRowStyle, font: grandFont, fill: grandFill }
+  ws4.getCell(currentRow, 6).style = { ...totalRowStyle, font: grandFont, fill: grandFill }
+  ws4.getRow(currentRow).height = 28
+
+  ws4.getColumn(1).width = 45
+  ws4.getColumn(2).width = 12
+  ws4.getColumn(3).width = 22
+  ws4.getColumn(4).width = 18 // % Standard HPP
+  ws4.getColumn(5).width = 18 // % Realisasi HPP
+  ws4.getColumn(6).width = 16 // Status
+
+  // ============ GENERATE & DOWNLOAD FILE ============
+  const fileName =
+    filterType === 'single'
+      ? `laporan-transaksi-${formatDateForInput(selectedDate)}.xlsx`
+      : `laporan-transaksi-${formatDateForInput(dateRange.startDate)}-to-${formatDateForInput(dateRange.endDate)}.xlsx`
+
+  const buffer = await workbook.xlsx.writeBuffer()
+  const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+  const url = window.URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = fileName
+  a.click()
+  window.URL.revokeObjectURL(url)
+}

src/utils/pdfGenerator.ts

@@ -0,0 +1,535 @@
+// pdfGenerator.ts
+import { formatCurrency } from '@/utils/transform'
+
+// PDF Configuration
+const PDF_FONT_SIZES = {
+  heading: 18,
+  subheading: 16,
+  tableContent: 12,
+  tableHeader: 12,
+  tableFooter: 12,
+  grandTotal: 14,
+  footer: 11
+}
+
+const PDF_SPACING = {
+  cellPadding: 5,
+  cellPaddingLarge: 6,
+  sectionGap: 20,
+  headerGap: 15
+}
+
+interface PDFGeneratorParams {
+  reportRef: React.RefObject<HTMLDivElement>
+  outlet: any
+  profitLoss: any
+  products: any
+  paymentAnalytics: any
+  category: any
+  productSummary: {
+    totalQuantitySold: number
+    totalRevenue: number
+    totalOrders: number
+  }
+  categorySummary: {
+    totalRevenue: number
+    orderCount: number
+    productCount: number
+    totalQuantity: number
+  }
+  filterType: 'single' | 'range'
+  selectedDate: Date
+  dateRange: { startDate: Date; endDate: Date }
+  now: Date
+}
+
+const formatDateForInput = (date: Date) => {
+  return date.toISOString().split('T')[0]
+}
+
+// Helper: tentukan warna status
+const getStatusColor = (status: string): [number, number, number] => {
+  return status === 'Sehat' ? [22, 163, 74] : [220, 38, 38] // green-600 / red-600
+}
+
+export const generatePDF = async (params: PDFGeneratorParams) => {
+  const {
+    reportRef,
+    outlet,
+    profitLoss,
+    products,
+    paymentAnalytics,
+    category,
+    productSummary,
+    categorySummary,
+    filterType,
+    selectedDate,
+    dateRange,
+    now
+  } = params
+
+  const reportElement = reportRef.current
+  if (!reportElement) {
+    throw new Error('Report element tidak ditemukan')
+  }
+
+  // Dynamic imports
+  const jsPDF = (await import('jspdf')).default
+  const html2canvas = (await import('html2canvas')).default
+  const autoTable = (await import('jspdf-autotable')).default
+
+  const pdf = new jsPDF({
+    orientation: 'portrait',
+    unit: 'mm',
+    format: 'a4',
+    compress: true
+  })
+
+  // Capture header section
+  const headerElement = reportElement.querySelector('.report-header-section') as HTMLElement
+  if (headerElement) {
+    const headerCanvas = await html2canvas(headerElement, {
+      scale: 2,
+      useCORS: true,
+      backgroundColor: '#ffffff',
+      logging: false,
+      windowWidth: 794
+    })
+
+    const headerImgWidth = 190
+    const headerImgHeight = (headerCanvas.height * headerImgWidth) / headerCanvas.width
+    const headerImgData = headerCanvas.toDataURL('image/jpeg', 0.95)
+
+    pdf.addImage(headerImgData, 'JPEG', 10, 10, headerImgWidth, headerImgHeight)
+  }
+
+  let currentY = 80
+
+  // ========== RINGKASAN SECTION ==========
+  pdf.setFontSize(PDF_FONT_SIZES.heading)
+  pdf.setTextColor(54, 23, 94)
+  pdf.setFont('helvetica', 'bold')
+  pdf.text('Ringkasan', 14, currentY)
+  currentY += 15
+
+  autoTable(pdf, {
+    startY: currentY,
+    head: [],
+    body: [
+      ['Total Penjualan', formatCurrency(profitLoss?.summary.total_revenue ?? 0)],
+      ['Total Diskon', formatCurrency(profitLoss?.summary.total_discount ?? 0)],
+      ['Total Pajak', formatCurrency(profitLoss?.summary.total_tax ?? 0)],
+      ['Service Charge', formatCurrency(profitLoss?.summary.service_charge ?? 0)],
+      ['Total', formatCurrency(profitLoss?.summary.total_revenue ?? 0)]
+    ],
+    theme: 'grid',
+    styles: {
+      fontSize: PDF_FONT_SIZES.subheading,
+      cellPadding: PDF_SPACING.cellPadding,
+      lineColor: [0, 0, 0]
+    },
+    columnStyles: {
+      0: { fontStyle: 'normal', textColor: [60, 60, 60] },
+      1: { halign: 'right', fontStyle: 'bold', textColor: [60, 60, 60] }
+    },
+    margin: { left: 14, right: 14 }
+  })
+
+  currentY = (pdf as any).lastAutoTable.finalY + 20
+
+  // ========== INVOICE SECTION ==========
+  pdf.setFontSize(PDF_FONT_SIZES.heading)
+  pdf.text('Invoice', 14, currentY)
+  currentY += 15
+
+  autoTable(pdf, {
+    startY: currentY,
+    head: [],
+    body: [['Total Invoice', String(profitLoss?.summary.total_orders ?? 0)]],
+    theme: 'grid',
+    styles: {
+      lineColor: [0, 0, 0],
+      fontSize: PDF_FONT_SIZES.subheading,
+      cellPadding: PDF_SPACING.cellPadding
+    },
+    columnStyles: {
+      0: { fontStyle: 'normal', textColor: [60, 60, 60] },
+      1: { halign: 'right', fontStyle: 'bold', textColor: [60, 60, 60] }
+    },
+    margin: { left: 14, right: 14 }
+  })
+
+  pdf.addPage()
+  currentY = 20
+
+  // ========== PAYMENT METHOD SECTION ==========
+  pdf.setFontSize(PDF_FONT_SIZES.heading)
+  pdf.text('Ringkasan Metode Pembayaran', 14, currentY)
+  currentY += 15
+
+  const paymentBody =
+    paymentAnalytics?.data?.map((payment: any) => [
+      payment.payment_method_name,
+      String(payment.order_count),
+      formatCurrency(payment.total_amount),
+      `${(payment.percentage ?? 0).toFixed(1)}%`
+    ]) || []
+
+  autoTable(pdf, {
+    startY: currentY,
+    head: [['Metode', 'Jumlah', 'Total', 'Persentase']],
+    body: paymentBody,
+    foot: [
+      [
+        'TOTAL',
+        String(paymentAnalytics?.summary.total_orders ?? 0),
+        formatCurrency(paymentAnalytics?.summary.total_amount ?? 0),
+        ''
+      ]
+    ],
+    theme: 'grid',
+    styles: {
+      fontSize: PDF_FONT_SIZES.tableContent,
+      cellPadding: PDF_SPACING.cellPadding,
+      lineColor: [0, 0, 0],
+      lineWidth: 0.1
+    },
+    headStyles: {
+      fillColor: [54, 23, 94],
+      textColor: 255,
+      fontStyle: 'bold',
+      fontSize: PDF_FONT_SIZES.tableHeader,
+      lineColor: [0, 0, 0],
+      lineWidth: 0.1
+    },
+    footStyles: {
+      fillColor: [220, 220, 220],
+      textColor: [60, 60, 60],
+      fontStyle: 'bold',
+      fontSize: PDF_FONT_SIZES.tableFooter,
+      lineColor: [0, 0, 0],
+      lineWidth: 0.1,
+      halign: 'center'
+    },
+    columnStyles: {
+      1: { halign: 'center' },
+      2: { halign: 'right' },
+      3: { halign: 'right' }
+    },
+    didParseCell: (data: any) => {
+      if (data.section === 'foot') {
+        if (data.column.index === 0) {
+          data.cell.styles.halign = 'left'
+        } else if (data.column.index === 1) {
+          data.cell.styles.halign = 'center'
+        } else if (data.column.index === 2) {
+          data.cell.styles.halign = 'right'
+        }
+      }
+    },
+    margin: { left: 14, right: 14 }
+  })
+
+  currentY = (pdf as any).lastAutoTable.finalY + 20
+
+  // ========== CATEGORY SECTION ==========
+  // Kolom baru: % Standard HPP, % Realisasi HPP, Status — diisi dummy visual untuk saat ini
+  pdf.setFontSize(PDF_FONT_SIZES.heading)
+  pdf.text('Ringkasan Kategori', 14, currentY)
+  currentY += 15
+
+  const DUMMY_STD_HPP = 30 // % (nilai dummy — ganti dengan data real nantinya)
+
+  const categoryBody =
+    category?.data?.map((c: any) => {
+      const stdHpp = DUMMY_STD_HPP
+      const realisasiHpp = 0 // dummy — ganti dengan kalkulasi real
+      const status = realisasiHpp <= stdHpp ? 'Sehat' : 'Tidak Sehat'
+      return [
+        c.category_name,
+        String(c.total_quantity),
+        formatCurrency(c.total_revenue),
+        `${stdHpp}%`,
+        `${realisasiHpp}%`,
+        '' // dikosongkan — status digambar manual via didDrawCell agar tidak double
+      ]
+    }) || []
+
+  // Simpan status per baris untuk dipakai di didDrawCell
+  const categoryStatuses: string[] =
+    category?.data?.map(() => {
+      const realisasiHpp = 0
+      return realisasiHpp <= DUMMY_STD_HPP ? 'Sehat' : 'Tidak Sehat'
+    }) || []
+
+  autoTable(pdf, {
+    startY: currentY,
+    head: [['Nama', 'Qty', 'Pendapatan', '% Std HPP', '% Real HPP', 'Status']],
+    body: categoryBody,
+    foot: [
+      [
+        'TOTAL',
+        String(categorySummary?.totalQuantity ?? 0),
+        formatCurrency(categorySummary?.totalRevenue ?? 0),
+        '',
+        '',
+        ''
+      ]
+    ],
+    theme: 'grid',
+    showFoot: 'lastPage',
+    tableWidth: 'auto',
+    styles: {
+      fontSize: 9,
+      cellPadding: PDF_SPACING.cellPadding,
+      lineColor: [0, 0, 0],
+      lineWidth: 0.1
+    },
+    headStyles: {
+      fillColor: [54, 23, 94],
+      textColor: 255,
+      fontStyle: 'bold',
+      fontSize: 9,
+      lineColor: [0, 0, 0],
+      lineWidth: 0.1
+    },
+    footStyles: {
+      fillColor: [220, 220, 220],
+      textColor: [60, 60, 60],
+      fontStyle: 'bold',
+      fontSize: 9,
+      lineColor: [0, 0, 0],
+      lineWidth: 0.1
+    },
+    columnStyles: {
+      1: { halign: 'center' },
+      2: { halign: 'right' },
+      3: { halign: 'center' },
+      4: { halign: 'center' },
+      5: { halign: 'center' }
+    },
+    didParseCell: (data: any) => {
+      // Footer alignment
+      if (data.section === 'foot') {
+        if (data.column.index === 0) data.cell.styles.halign = 'left'
+        else if (data.column.index === 1) data.cell.styles.halign = 'center'
+        else if (data.column.index === 2) data.cell.styles.halign = 'right'
+      }
+      // Paksa teks status tidak dirender oleh autoTable (set textColor = white)
+      if (data.section === 'body' && data.column.index === 5) {
+        data.cell.styles.textColor = [255, 255, 255]
+      }
+    },
+    didDrawCell: (data: any) => {
+      if (data.section === 'body' && data.column.index === 5) {
+        const status = categoryStatuses[data.row.index] || 'Sehat'
+        const color = getStatusColor(status)
+        pdf.setTextColor(...color)
+        pdf.setFontSize(9)
+        pdf.setFont('helvetica', 'bold')
+        pdf.text(status, data.cell.x + data.cell.width / 2, data.cell.y + data.cell.height / 2 + 1, { align: 'center' })
+        pdf.setTextColor(0, 0, 0)
+        pdf.setFont('helvetica', 'normal')
+      }
+    },
+    margin: { left: 14, right: 14 }
+  })
+
+  currentY = (pdf as any).lastAutoTable.finalY + 20
+
+  // ========== PRODUCT DETAILS BY CATEGORY ==========
+  const groupedProducts =
+    products?.data?.reduce(
+      (acc: any, item: any) => {
+        const categoryName = item.category_name || 'Tidak Berkategori'
+        if (!acc[categoryName]) {
+          acc[categoryName] = []
+        }
+        acc[categoryName].push(item)
+        return acc
+      },
+      {} as Record<string, any[]>
+    ) || {}
+
+  pdf.addPage()
+  currentY = 20
+
+  pdf.setFontSize(PDF_FONT_SIZES.heading)
+  pdf.text('Ringkasan Item Per Kategori', 14, currentY)
+  currentY += 10
+
+  Object.keys(groupedProducts)
+    .sort((a, b) => {
+      const productsA = groupedProducts[a]
+      const productsB = groupedProducts[b]
+      const orderA = productsA[0]?.category_order ?? 999
+      const orderB = productsB[0]?.category_order ?? 999
+      return orderA - orderB
+    })
+    .forEach((categoryName, index) => {
+      const categoryProducts = groupedProducts[categoryName].sort((a: any, b: any) => {
+        const skuA = a.product_sku || ''
+        const skuB = b.product_sku || ''
+        return skuA.localeCompare(skuB)
+      })
+
+      const categoryTotalQty = categoryProducts.reduce((sum: number, item: any) => sum + (item.quantity_sold || 0), 0)
+      const categoryTotalRevenue = categoryProducts.reduce((sum: number, item: any) => sum + (item.revenue || 0), 0)
+
+      // Kolom baru: % Standard HPP, % Realisasi HPP, Status — dummy visual
+      const productBody = categoryProducts.map((item: any) => {
+        const stdHpp = 0 // dummy — ganti dengan data real
+        const realisasiHpp = 0 // dummy — ganti dengan kalkulasi real
+        return [
+          item.product_name,
+          String(item.quantity_sold),
+          formatCurrency(item.revenue),
+          `${stdHpp}%`,
+          `${realisasiHpp}%`,
+          '' // dikosongkan — status digambar manual via didDrawCell agar tidak double
+        ]
+      })
+
+      // Status per baris produk
+      const productStatuses: string[] = categoryProducts.map(() => (0 <= 0 ? 'Sehat' : 'Tidak Sehat'))
+
+      const estimatedHeight = (productBody.length + 3) * 12
+      if (currentY + estimatedHeight > 270) {
+        pdf.addPage()
+        currentY = 20
+      }
+
+      pdf.setFontSize(PDF_FONT_SIZES.subheading)
+      pdf.setFont('helvetica', 'bold')
+      pdf.setTextColor(54, 23, 94)
+      pdf.text(`${index + 1}. ${categoryName.toUpperCase()}`, 16, currentY)
+      currentY += 15
+
+      autoTable(pdf, {
+        startY: currentY,
+        head: [['Produk', 'Qty', 'Pendapatan', '% Std HPP', '% Real HPP', 'Status']],
+        body: productBody,
+        foot: [
+          [`Subtotal ${categoryName}`, String(categoryTotalQty), formatCurrency(categoryTotalRevenue), '', '', '']
+        ],
+        showFoot: 'lastPage',
+        theme: 'grid',
+        styles: {
+          fontSize: 9,
+          cellPadding: PDF_SPACING.cellPadding,
+          lineColor: [0, 0, 0],
+          lineWidth: 0.1
+        },
+        headStyles: {
+          fillColor: [54, 23, 94],
+          textColor: 255,
+          fontStyle: 'bold',
+          fontSize: 9,
+          lineColor: [0, 0, 0],
+          lineWidth: 0.1
+        },
+        footStyles: {
+          fillColor: [200, 200, 200],
+          textColor: [60, 60, 60],
+          fontStyle: 'bold',
+          fontSize: 9,
+          lineColor: [0, 0, 0],
+          lineWidth: 0.1
+        },
+        columnStyles: {
+          0: { cellWidth: 44 },
+          1: { halign: 'center', cellWidth: 20 },
+          2: { halign: 'right', cellWidth: 50 },
+          3: { halign: 'center', cellWidth: 22 },
+          4: { halign: 'center', cellWidth: 22 },
+          5: { halign: 'center', cellWidth: 22 }
+        },
+        didParseCell: (data: any) => {
+          if (data.section === 'foot') {
+            if (data.column.index === 0) data.cell.styles.halign = 'left'
+            else if (data.column.index === 1) data.cell.styles.halign = 'center'
+            else if (data.column.index === 2) data.cell.styles.halign = 'right'
+          }
+          // Paksa teks status tidak dirender oleh autoTable (set textColor = white)
+          if (data.section === 'body' && data.column.index === 5) {
+            data.cell.styles.textColor = [255, 255, 255]
+          }
+        },
+        didDrawCell: (data: any) => {
+          // Warna teks Status (kolom index 5) — ambil dari array, bukan cell.text agar tidak double
+          if (data.section === 'body' && data.column.index === 5) {
+            const status = productStatuses[data.row.index] || 'Sehat'
+            const color = getStatusColor(status)
+            pdf.setTextColor(...color)
+            pdf.setFontSize(9)
+            pdf.setFont('helvetica', 'bold')
+            pdf.text(status, data.cell.x + data.cell.width / 2, data.cell.y + data.cell.height / 2 + 1, {
+              align: 'center'
+            })
+            pdf.setTextColor(0, 0, 0)
+            pdf.setFont('helvetica', 'normal')
+          }
+        },
+        margin: { left: 14, right: 14 }
+      })
+
+      currentY = (pdf as any).lastAutoTable.finalY + 15
+    })
+
+  // ========== GRAND TOTAL ==========
+  if (currentY > 250) {
+    pdf.addPage()
+    currentY = 20
+  }
+
+  autoTable(pdf, {
+    startY: currentY,
+    head: [],
+    body: [
+      [
+        'TOTAL KESELURUHAN',
+        String(productSummary.totalQuantitySold),
+        formatCurrency(productSummary.totalRevenue),
+        '',
+        '',
+        ''
+      ]
+    ],
+    theme: 'grid',
+    styles: {
+      fontSize: PDF_FONT_SIZES.grandTotal,
+      cellPadding: 6,
+      fontStyle: 'bold',
+      textColor: [54, 23, 94],
+      lineColor: [0, 0, 0],
+      lineWidth: 0.2
+    },
+    columnStyles: {
+      0: { cellWidth: 44 },
+      1: { halign: 'center', cellWidth: 20 },
+      2: { halign: 'right', cellWidth: 50 },
+      3: { cellWidth: 22 },
+      4: { cellWidth: 22 },
+      5: { cellWidth: 22 }
+    },
+    margin: { left: 14, right: 14 }
+  })
+
+  // ========== FOOTER ==========
+  const pageCount = pdf.getNumberOfPages()
+  for (let i = 1; i <= pageCount; i++) {
+    pdf.setPage(i)
+    pdf.setFontSize(11)
+    pdf.setTextColor(120, 120, 120)
+    pdf.text('© 2025 Apskel - Sistem POS Terpadu', 14, 287)
+    pdf.text(`Dicetak pada: ${now.toLocaleDateString('id-ID')}`, 190, 287, { align: 'right' })
+  }
+
+  // ========== SAVE PDF ==========
+  const fileName =
+    filterType === 'single'
+      ? `laporan-transaksi-${formatDateForInput(selectedDate)}.pdf`
+      : `laporan-transaksi-${formatDateForInput(dateRange.startDate)}-to-${formatDateForInput(dateRange.endDate)}.pdf`
+
+  pdf.save(fileName)
+}

src/views/apps/ecommerce/orders/list/OrderListTable.tsx

@@ -13,8 +13,10 @@ import Checkbox from '@mui/material/Checkbox'
 import Chip from '@mui/material/Chip'
 import MenuItem from '@mui/material/MenuItem'
 import TablePagination from '@mui/material/TablePagination'
+import TextField from '@mui/material/TextField'
 import type { TextFieldProps } from '@mui/material/TextField'
 import Typography from '@mui/material/Typography'
+import { Box, CircularProgress, useTheme } from '@mui/material'
 
 // Third-party Imports
 import type { RankingInfo } from '@tanstack/match-sorter-utils'
@@ -40,11 +42,10 @@ import { getLocalizedUrl } from '@/utils/i18n'
 
 // Style Imports
 import tableStyles from '@core/styles/table.module.css'
-import { Box, CircularProgress } from '@mui/material'
 import Loading from '../../../../../components/layout/shared/Loading'
 import { useOrders } from '../../../../../services/queries/orders'
 import { Order } from '../../../../../types/services/order'
-import { formatCurrency } from '../../../../../utils/transform'
+import { formatCurrency, formatDateDDMMYYYY, formatForInputDate } from '../../../../../utils/transform'
 
 declare module '@tanstack/table-core' {
   interface FilterFns {
@@ -105,15 +106,28 @@ const DebouncedInput = ({
 const columnHelper = createColumnHelper<ECommerceOrderTypeWithAction>()
 
 const OrderListTable = () => {
+  const theme = useTheme()
+
   // States
   const [rowSelection, setRowSelection] = useState({})
   const [currentPage, setCurrentPage] = useState(1)
   const [pageSize, setPageSize] = useState(10)
   const [search, setSearch] = useState('')
 
+  // Set default date range to current month
+  const today = new Date()
+  const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1)
+
+  const [filter, setFilter] = useState({
+    date_from: formatForInputDate(firstDayOfMonth),
+    date_to: formatForInputDate(today)
+  })
+
   const { data, isLoading, error, isFetching } = useOrders({
     page: currentPage,
     limit: pageSize,
+    date_from: formatDateDDMMYYYY(new Date(filter.date_from)),
+    date_to: formatDateDDMMYYYY(new Date(filter.date_to)),
     search
   })
 
@@ -163,7 +177,7 @@ const OrderListTable = () => {
         cell: ({ row }) => (
           <Typography
             component={Link}
-            href={getLocalizedUrl(`/apps/ecommerce/orders/details/${row.original.order_number}`, locale as Locale)}
+            href={getLocalizedUrl(`/apps/inventory/orders/${row.original.id}/details`, locale as Locale)}
             color='primary.main'
           >{`#${row.original.order_number}`}</Typography>
         )
@@ -203,6 +217,10 @@ const OrderListTable = () => {
         header: 'Discount',
         cell: ({ row }) => <Typography>{formatCurrency(row.original.discount_amount)}</Typography>
       }),
+      columnHelper.accessor('created_at', {
+        header: 'Created At',
+        cell: ({ row }) => <Typography>{formatDateDDMMYYYY(new Date(row.original.created_at))}</Typography>
+      }),
       columnHelper.accessor('action', {
         header: 'Action',
         cell: ({ row }) => (
@@ -214,10 +232,7 @@ const OrderListTable = () => {
                 {
                   text: 'View',
                   icon: 'tabler-eye',
-                  href: getLocalizedUrl(
+                  href: getLocalizedUrl(`/apps/inventory/orders/${row.original.id}/details`, locale as Locale),
-                    `/apps/ecommerce/orders/${row.original.id}/details`,
-                    locale as Locale
-                  ),
                   linkProps: { className: 'flex items-center gap-2 is-full plb-2 pli-4' }
                 },
                 {
@@ -248,49 +263,104 @@ const OrderListTable = () => {
     state: {
       rowSelection,
       pagination: {
-        pageIndex: currentPage, // <= penting!
+        pageIndex: currentPage,
         pageSize
       }
     },
-    enableRowSelection: true, //enable row selection for all rows
+    enableRowSelection: true,
     onRowSelectionChange: setRowSelection,
     getCoreRowModel: getCoreRowModel(),
-    // Disable client-side pagination since we're handling it server-side
     manualPagination: true,
     pageCount: Math.ceil(totalCount / pageSize)
   })
 
   return (
     <Card>
-      <CardContent className='flex justify-between max-sm:flex-col sm:items-center gap-4'>
+      <CardContent className='flex flex-col gap-4'>
-        <DebouncedInput
+        {/* Date Range Filter */}
-          value={search}
+        <div className='flex items-center gap-4 max-sm:flex-col'>
-          onChange={value => setSearch(value as string)}
+          <Typography variant='body2' className='min-w-fit'>
-          placeholder='Search Order'
+            Filter by Date:
-          className='sm:is-auto'
+          </Typography>
-        />
+          <TextField
-        <div className='flex items-center max-sm:flex-col gap-4 max-sm:is-full is-auto'>
+            type='date'
-          <CustomTextField
+            value={filter.date_from}
-            select
+            onChange={e => {
-            value={pageSize}
+              setFilter({
-            onChange={handlePageSizeChange}
+                ...filter,
-            className='is-[70px] max-sm:is-full'
+                date_from: e.target.value
-          >
+              })
-            <MenuItem value='10'>10</MenuItem>
+              setCurrentPage(1)
-            <MenuItem value='25'>25</MenuItem>
+            }}
-            <MenuItem value='50'>50</MenuItem>
+            size='small'
-            <MenuItem value='100'>100</MenuItem>
+            sx={{
-          </CustomTextField>
+              '& .MuiOutlinedInput-root': {
-          <Button
+                '&.Mui-focused fieldset': {
-            variant='tonal'
+                  borderColor: 'primary.main'
-            color='secondary'
+                },
-            startIcon={<i className='tabler-upload' />}
+                '& fieldset': {
-            className='max-sm:is-full is-auto'
+                  borderColor: theme.palette.mode === 'dark' ? 'rgba(231, 227, 252, 0.22)' : theme.palette.divider
-          >
+                }
-            Export
+              }
-          </Button>
+            }}
+          />
+          <Typography>-</Typography>
+          <TextField
+            type='date'
+            value={filter.date_to}
+            onChange={e => {
+              setFilter({
+                ...filter,
+                date_to: e.target.value
+              })
+              setCurrentPage(1)
+            }}
+            size='small'
+            sx={{
+              '& .MuiOutlinedInput-root': {
+                '&.Mui-focused fieldset': {
+                  borderColor: 'primary.main'
+                },
+                '& fieldset': {
+                  borderColor: theme.palette.mode === 'dark' ? 'rgba(231, 227, 252, 0.22)' : theme.palette.divider
+                }
+              }
+            }}
+          />
+        </div>
+
+        {/* Search and Actions */}
+        <div className='flex justify-between max-sm:flex-col sm:items-center gap-4'>
+          <DebouncedInput
+            value={search}
+            onChange={value => setSearch(value as string)}
+            placeholder='Search Order'
+            className='sm:is-auto'
+          />
+          <div className='flex items-center max-sm:flex-col gap-4 max-sm:is-full is-auto'>
+            <CustomTextField
+              select
+              value={pageSize}
+              onChange={handlePageSizeChange}
+              className='is-[70px] max-sm:is-full'
+            >
+              <MenuItem value='10'>10</MenuItem>
+              <MenuItem value='25'>25</MenuItem>
+              <MenuItem value='50'>50</MenuItem>
+              <MenuItem value='100'>100</MenuItem>
+            </CustomTextField>
+            <Button
+              variant='tonal'
+              color='secondary'
+              startIcon={<i className='tabler-upload' />}
+              className='max-sm:is-full is-auto'
+            >
+              Export
+            </Button>
+          </div>
         </div>
       </CardContent>
+
       <div className='overflow-x-auto'>
         {isLoading ? (
           <Loading />

src/views/apps/ecommerce/products/category/AddCategoryDrawer.tsx

@@ -33,7 +33,8 @@ const AddCategoryDrawer = (props: Props) => {
   const [formData, setFormData] = useState<CategoryRequest>({
     name: '',
     description: '',
-    business_type: ''
+    business_type: '',
+    order: 0
   })
 
   // Handle Form Submit
@@ -54,13 +55,21 @@ const AddCategoryDrawer = (props: Props) => {
     })
   }
 
+  const handleOrderChange = (e: any) => {
+    setFormData({
+      ...formData,
+      order: parseInt(e.target.value) || 0
+    })
+  }
+
   // Handle Form Reset
   const handleReset = () => {
     handleClose()
     setFormData({
       name: '',
       description: '',
-      business_type: ''
+      business_type: '',
+      order: 0
     })
   }
 
@@ -99,6 +108,15 @@ const AddCategoryDrawer = (props: Props) => {
           >
             <MenuItem value='restaurant'>Restaurant</MenuItem>
           </CustomTextField>
+          <CustomTextField
+            fullWidth
+            label='Order'
+            name='order'
+            type='number'
+            value={formData.order}
+            onChange={handleOrderChange}
+            placeholder='0'
+          />
           <CustomTextField
             fullWidth
             label='Description'

src/views/apps/ecommerce/products/category/EditCategoryDrawer.tsx

@@ -34,7 +34,8 @@ const EditCategoryDrawer = (props: Props) => {
   const [formData, setFormData] = useState<CategoryRequest>({
     name: '',
     description: '',
-    business_type: ''
+    business_type: '',
+    order: 0
   })
 
   useEffect(() => {
@@ -42,7 +43,8 @@ const EditCategoryDrawer = (props: Props) => {
       setFormData({
         name: data.name,
         description: data.description,
-        business_type: data.business_type
+        business_type: data.business_type,
+        order: data.order
       })
     }
   }, [data])
@@ -51,11 +53,14 @@ const EditCategoryDrawer = (props: Props) => {
   const handleFormSubmit = (e: any) => {
     e.preventDefault()
 
-    updateCategory({ id: data.id, payload: formData }, {
+    updateCategory(
-      onSuccess: () => {
+      { id: data.id, payload: formData },
-        handleReset()
+      {
+        onSuccess: () => {
+          handleReset()
+        }
       }
-    })
+    )
   }
 
   const handleInputChange = (e: any) => {
@@ -65,13 +70,21 @@ const EditCategoryDrawer = (props: Props) => {
     })
   }
 
+  const handleOrderChange = (e: any) => {
+    setFormData({
+      ...formData,
+      order: parseInt(e.target.value) || 0
+    })
+  }
+
   // Handle Form Reset
   const handleReset = () => {
     handleClose()
     setFormData({
       name: '',
       description: '',
-      business_type: ''
+      business_type: '',
+      order: 0
     })
   }
 
@@ -110,6 +123,15 @@ const EditCategoryDrawer = (props: Props) => {
           >
             <MenuItem value='restaurant'>Restaurant</MenuItem>
           </CustomTextField>
+          <CustomTextField
+            fullWidth
+            label='Order'
+            name='order'
+            type='number'
+            value={formData.order}
+            onChange={handleOrderChange}
+            placeholder='0'
+          />
           <CustomTextField
             fullWidth
             label='Description'

src/views/apps/ecommerce/products/category/ProductCategoryTable.tsx

@@ -12,6 +12,7 @@ import MenuItem from '@mui/material/MenuItem'
 import TablePagination from '@mui/material/TablePagination'
 import type { TextFieldProps } from '@mui/material/TextField'
 import Typography from '@mui/material/Typography'
+import { Box, CircularProgress } from '@mui/material'
 
 // Third-party Imports
 import type { RankingInfo } from '@tanstack/match-sorter-utils'
@@ -19,24 +20,26 @@ import { rankItem } from '@tanstack/match-sorter-utils'
 import type { ColumnDef, FilterFn } from '@tanstack/react-table'
 import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table'
 import classnames from 'classnames'
+import { DragDropContext, Droppable, Draggable, DropResult } from '@hello-pangea/dnd'
 
 // Component Imports
 import TablePaginationComponent from '@components/TablePaginationComponent'
 import CustomTextField from '@core/components/mui/TextField'
 import OptionMenu from '@core/components/option-menu'
 import AddCategoryDrawer from './AddCategoryDrawer'
-
+import EditCategoryDrawer from './EditCategoryDrawer'
-// Style Imports
-import tableStyles from '@core/styles/table.module.css'
-import { Box, CircularProgress } from '@mui/material'
 import ConfirmDeleteDialog from '../../../../../components/dialogs/confirm-delete'
 import Loading from '../../../../../components/layout/shared/Loading'
+
+// Services Imports
 import { useCategoriesMutation } from '../../../../../services/mutations/categories'
 import { useCategories } from '../../../../../services/queries/categories'
 import { Category } from '../../../../../types/services/category'
-import EditCategoryDrawer from './EditCategoryDrawer'
 import { formatDate } from '../../../../../utils/transform'
 
+// Style Imports
+import tableStyles from '@core/styles/table.module.css'
+
 declare module '@tanstack/table-core' {
   interface FilterFns {
     fuzzy: FilterFn<unknown>
@@ -51,15 +54,8 @@ type CategoryWithActionsType = Category & {
 }
 
 const fuzzyFilter: FilterFn<any> = (row, columnId, value, addMeta) => {
-  // Rank the item
   const itemRank = rankItem(row.getValue(columnId), value)
-
+  addMeta({ itemRank })
-  // Store the itemRank info
-  addMeta({
-    itemRank
-  })
-
-  // Return if the item should be filtered in/out
   return itemRank.passed
 }
 
@@ -73,7 +69,6 @@ const DebouncedInput = ({
   onChange: (value: string | number) => void
   debounce?: number
 } & Omit<TextFieldProps, 'onChange'>) => {
-  // States
   const [value, setValue] = useState(initialValue)
 
   useEffect(() => {
@@ -86,47 +81,51 @@ const DebouncedInput = ({
     }, debounce)
 
     return () => clearTimeout(timeout)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value])
 
   return <CustomTextField {...props} value={value} onChange={e => setValue(e.target.value)} />
 }
 
-// Column Definitions
 const columnHelper = createColumnHelper<CategoryWithActionsType>()
 
 const ProductCategoryTable = () => {
-  // States
   const [addCategoryOpen, setAddCategoryOpen] = useState(false)
   const [editCategoryOpen, setEditCategoryOpen] = useState(false)
   const [rowSelection, setRowSelection] = useState({})
   const [currentPage, setCurrentPage] = useState(1)
-  const [pageSize, setPageSize] = useState(10)
+  const [pageSize, setPageSize] = useState(50)
   const [categoryId, setCategoryId] = useState('')
   const [openConfirm, setOpenConfirm] = useState(false)
   const [currentCategory, setCurrentCategory] = useState<Category>()
   const [search, setSearch] = useState('')
+  const [localCategories, setLocalCategories] = useState<Category[]>([])
 
-  // Fetch products with pagination and search
   const { data, isLoading, error, isFetching } = useCategories({
     page: currentPage,
     limit: pageSize
   })
 
   const { mutate: deleteCategory, isPending: isDeleting } = useCategoriesMutation().deleteCategory
+  const { mutate: updateCategory } = useCategoriesMutation().updateCategory
 
   const categories = data?.categories ?? []
   const totalCount = data?.total_count ?? 0
 
+  // Update local categories when data changes
+  useEffect(() => {
+    if (categories.length > 0) {
+      setLocalCategories(categories)
+    }
+  }, [categories])
+
   const handlePageChange = useCallback((event: unknown, newPage: number) => {
     setCurrentPage(newPage)
   }, [])
 
-  // Handle page size change
   const handlePageSizeChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
-    const newPageSize = parseInt(event.target.value, 10)
+    const newPageSize = parseInt(event.target.value, 50)
     setPageSize(newPageSize)
-    setCurrentPage(1) // Reset to first page
+    setCurrentPage(1)
   }, [])
 
   const handleDelete = () => {
@@ -135,8 +134,56 @@ const ProductCategoryTable = () => {
     })
   }
 
+  const handleDragEnd = (result: DropResult) => {
+    if (!result.destination) return
+
+    const items = Array.from(localCategories)
+    const [reorderedItem] = items.splice(result.source.index, 1)
+    items.splice(result.destination.index, 0, reorderedItem)
+
+    setLocalCategories(items)
+
+    // Update order for all affected items
+    items.forEach((item, index) => {
+      const newOrder = index + 1 // Order dimulai dari 1
+
+      // Only update if order changed
+      if (item.order !== newOrder) {
+        const updateData = {
+          name: item.name,
+          description: item.description,
+          business_type: item.business_type,
+          order: newOrder
+        }
+
+        updateCategory(
+          { id: item.id, payload: updateData },
+          {
+            onSuccess: () => {
+              console.log(`Category ${item.name} order updated to ${newOrder}`)
+            },
+            onError: error => {
+              console.error(`Failed to update category ${item.name}:`, error)
+            }
+          }
+        )
+      }
+    })
+  }
+
   const columns = useMemo<ColumnDef<CategoryWithActionsType, any>[]>(
     () => [
+      {
+        id: 'drag',
+        header: '',
+        cell: () => (
+          <div className='cursor-move flex items-center justify-center'>
+            <i className='tabler-grip-vertical text-textSecondary text-xl' />
+          </div>
+        ),
+        size: 50,
+        enableSorting: false
+      },
       {
         id: 'select',
         header: ({ table }) => (
@@ -163,7 +210,6 @@ const ProductCategoryTable = () => {
         header: 'Name',
         cell: ({ row }) => (
           <div className='flex items-center gap-3'>
-            {/* <img src={row.original.image} width={38} height={38} className='rounded bg-actionHover' /> */}
             <div className='flex flex-col items-start'>
               <Typography className='font-medium' color='text.primary'>
                 {row.original.name}
@@ -173,7 +219,7 @@ const ProductCategoryTable = () => {
         )
       }),
       columnHelper.accessor('description', {
-        header: 'Decription',
+        header: 'Description',
         cell: ({ row }) => <Typography>{row.original.description || '-'}</Typography>
       }),
       columnHelper.accessor('business_type', {
@@ -219,12 +265,11 @@ const ProductCategoryTable = () => {
         enableSorting: false
       })
     ],
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     [data]
   )
 
   const table = useReactTable({
-    data: categories as Category[],
+    data: localCategories as Category[],
     columns,
     filterFns: {
       fuzzy: fuzzyFilter
@@ -232,14 +277,13 @@ const ProductCategoryTable = () => {
     state: {
       rowSelection,
       pagination: {
-        pageIndex: currentPage, // <= penting!
+        pageIndex: currentPage,
         pageSize
       }
     },
-    enableRowSelection: true, //enable row selection for all rows
+    enableRowSelection: true,
     onRowSelectionChange: setRowSelection,
     getCoreRowModel: getCoreRowModel(),
-    // Disable client-side pagination since we're handling it server-side
     manualPagination: true,
     pageCount: Math.ceil(totalCount / pageSize)
   })
@@ -261,9 +305,9 @@ const ProductCategoryTable = () => {
               onChange={handlePageSizeChange}
               className='flex-auto max-sm:is-full sm:is-[70px]'
             >
-              <MenuItem value='10'>10</MenuItem>
+              <MenuItem value='50'>50</MenuItem>
-              <MenuItem value='15'>15</MenuItem>
+              <MenuItem value='75'>75</MenuItem>
-              <MenuItem value='25'>25</MenuItem>
+              <MenuItem value='100'>100</MenuItem>
             </CustomTextField>
             <Button
               variant='contained'
@@ -275,18 +319,18 @@ const ProductCategoryTable = () => {
             </Button>
           </div>
         </div>
-        <div className='overflow-x-auto'>
+        <div className='overflow-x-auto relative'>
           {isLoading ? (
             <Loading />
           ) : (
-            <table className={tableStyles.table}>
+            <DragDropContext onDragEnd={handleDragEnd}>
-              <thead>
+              <table className={tableStyles.table}>
-                {table.getHeaderGroups().map(headerGroup => (
+                <thead>
-                  <tr key={headerGroup.id}>
+                  {table.getHeaderGroups().map(headerGroup => (
-                    {headerGroup.headers.map(header => (
+                    <tr key={headerGroup.id}>
-                      <th key={header.id}>
+                      {headerGroup.headers.map(header => (
-                        {header.isPlaceholder ? null : (
+                        <th key={header.id}>
-                          <>
+                          {header.isPlaceholder ? null : (
                             <div
                               className={classnames({
                                 'flex items-center': header.column.getIsSorted(),
@@ -300,38 +344,58 @@ const ProductCategoryTable = () => {
                                 desc: <i className='tabler-chevron-down text-xl' />
                               }[header.column.getIsSorted() as 'asc' | 'desc'] ?? null}
                             </div>
-                          </>
+                          )}
-                        )}
+                        </th>
-                      </th>
+                      ))}
-                    ))}
+                    </tr>
-                  </tr>
+                  ))}
-                ))}
+                </thead>
-              </thead>
+                <Droppable droppableId='category-table'>
-              {table.getFilteredRowModel().rows.length === 0 ? (
+                  {provided => (
-                <tbody>
+                    <tbody {...provided.droppableProps} ref={provided.innerRef}>
-                  <tr>
+                      {table.getFilteredRowModel().rows.length === 0 ? (
-                    <td colSpan={table.getVisibleFlatColumns().length} className='text-center'>
+                        <tr>
-                      No data available
+                          <td colSpan={table.getVisibleFlatColumns().length} className='text-center'>
-                    </td>
+                            No data available
-                  </tr>
+                          </td>
-                </tbody>
-              ) : (
-                <tbody>
-                  {table
-                    .getRowModel()
-                    .rows.slice(0, table.getState().pagination.pageSize)
-                    .map(row => {
-                      return (
-                        <tr key={row.id} className={classnames({ selected: row.getIsSelected() })}>
-                          {row.getVisibleCells().map(cell => (
-                            <td key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</td>
-                          ))}
                         </tr>
-                      )
+                      ) : (
-                    })}
+                        table
-                </tbody>
+                          .getRowModel()
-              )}
+                          .rows.slice(0, table.getState().pagination.pageSize)
-            </table>
+                          .map((row, index) => {
+                            const categoryId = row.original.id
+                            return (
+                              <Draggable key={categoryId} draggableId={categoryId} index={index}>
+                                {(provided, snapshot) => (
+                                  <tr
+                                    ref={provided.innerRef}
+                                    {...provided.draggableProps}
+                                    className={classnames({
+                                      selected: row.getIsSelected()
+                                    })}
+                                    style={{
+                                      ...provided.draggableProps.style,
+                                      backgroundColor: snapshot.isDragging ? '#f3f4f6' : 'transparent'
+                                    }}
+                                  >
+                                    {row.getVisibleCells().map((cell, cellIndex) => (
+                                      <td key={cell.id} {...(cellIndex === 0 ? provided.dragHandleProps : {})}>
+                                        {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                                      </td>
+                                    ))}
+                                  </tr>
+                                )}
+                              </Draggable>
+                            )
+                          })
+                      )}
+                      {provided.placeholder}
+                    </tbody>
+                  )}
+                </Droppable>
+              </table>
+            </DragDropContext>
           )}
 
           {isFetching && !isLoading && (
@@ -365,7 +429,7 @@ const ProductCategoryTable = () => {
           page={currentPage}
           onPageChange={handlePageChange}
           onRowsPerPageChange={handlePageSizeChange}
-          rowsPerPageOptions={[10, 25, 50]}
+          rowsPerPageOptions={[50, 75, 100]}
           disabled={isLoading}
         />
       </Card>

src/views/apps/marketing/discount/add/Dialog/CategoryRuleDialog.tsx

@@ -0,0 +1,171 @@
+'use client'
+
+import { useState, useEffect } from 'react'
+import Button from '@mui/material/Button'
+import Divider from '@mui/material/Divider'
+import Drawer from '@mui/material/Drawer'
+import IconButton from '@mui/material/IconButton'
+import Typography from '@mui/material/Typography'
+import Radio from '@mui/material/Radio'
+import RadioGroup from '@mui/material/RadioGroup'
+import FormControlLabel from '@mui/material/FormControlLabel'
+import MenuItem from '@mui/material/MenuItem'
+import CustomTextField from '@core/components/mui/TextField'
+import { useCategories } from '@/services/queries/categories'
+import { CategoryRuleType } from '@/types/services/discount'
+
+interface CategoryRule {
+  category_id: string
+  category_name?: string
+  rule_type: CategoryRuleType
+}
+
+type Props = {
+  open: boolean
+  onClose: () => void
+  onConfirm: (rule: CategoryRule) => void
+}
+
+const CategoryRuleDialog = (props: Props) => {
+  const { open, onClose, onConfirm } = props
+
+  const [selectedCategory, setSelectedCategory] = useState('')
+  const [ruleType, setRuleType] = useState<CategoryRuleType>('included')
+  const [searchQuery, setSearchQuery] = useState('')
+
+  const { data: categoriesData } = useCategories({ page: 1, limit: 100 })
+  const categories = categoriesData?.categories ?? []
+
+  useEffect(() => {
+    if (open) {
+      setSelectedCategory('')
+      setRuleType('included')
+      setSearchQuery('')
+    }
+  }, [open])
+
+  const filteredCategories = categories.filter(category =>
+    category.name.toLowerCase().includes(searchQuery.toLowerCase())
+  )
+
+  const handleConfirm = () => {
+    if (!selectedCategory) return
+
+    const category = categories.find(c => c.id === selectedCategory)
+
+    onConfirm({
+      category_id: selectedCategory,
+      category_name: category?.name,
+      rule_type: ruleType
+    })
+
+    handleReset()
+  }
+
+  const handleReset = () => {
+    setSelectedCategory('')
+    setRuleType('included')
+    setSearchQuery('')
+    onClose()
+  }
+
+  return (
+    <Drawer
+      open={open}
+      anchor='right'
+      variant='temporary'
+      onClose={handleReset}
+      ModalProps={{ keepMounted: true }}
+      sx={{ '& .MuiDrawer-paper': { width: { xs: 300, sm: 500 } } }}
+    >
+      <div className='flex items-center justify-between pli-6 plb-5'>
+        <Typography variant='h5'>Add Category Rule</Typography>
+        <IconButton size='small' onClick={handleReset}>
+          <i className='tabler-x text-textSecondary text-2xl' />
+        </IconButton>
+      </div>
+      <Divider />
+      <div className='p-6'>
+        <div className='flex flex-col gap-5'>
+          {/* Category Search & Select */}
+          <div>
+            <Typography variant='body2' className='mbe-2'>
+              Select Category *
+            </Typography>
+            <CustomTextField
+              fullWidth
+              placeholder='Search category...'
+              value={searchQuery}
+              onChange={e => setSearchQuery(e.target.value)}
+              className='mbe-2'
+            />
+            <div className='max-h-48 overflow-y-auto border rounded'>
+              {filteredCategories.length === 0 ? (
+                <div className='text-center py-4'>
+                  <Typography variant='body2' color='text.secondary'>
+                    No categories found
+                  </Typography>
+                </div>
+              ) : (
+                <RadioGroup value={selectedCategory} onChange={e => setSelectedCategory(e.target.value)}>
+                  {filteredCategories.map(category => (
+                    <div
+                      key={category.id}
+                      className='flex items-center p-3 hover:bg-actionHover cursor-pointer border-b last:border-b-0'
+                      onClick={() => setSelectedCategory(category.id)}
+                    >
+                      <FormControlLabel
+                        value={category.id}
+                        control={<Radio />}
+                        label={
+                          <div>
+                            <Typography variant='body1'>{category.name}</Typography>
+                            {category.description && (
+                              <Typography variant='body2' color='text.secondary'>
+                                {category.description}
+                              </Typography>
+                            )}
+                          </div>
+                        }
+                        sx={{ margin: 0, width: '100%' }}
+                      />
+                    </div>
+                  ))}
+                </RadioGroup>
+              )}
+            </div>
+          </div>
+
+          {/* Rule Type */}
+          <CustomTextField
+            select
+            fullWidth
+            label='Rule Type *'
+            value={ruleType}
+            onChange={e => setRuleType(e.target.value as CategoryRuleType)}
+          >
+            <MenuItem value='included'>Included (Apply discount)</MenuItem>
+            <MenuItem value='excluded'>Excluded (No discount)</MenuItem>
+          </CustomTextField>
+
+          <Typography variant='caption' color='text.secondary' className='-mbs-4'>
+            {ruleType === 'included' && 'Only products in this category can get discount'}
+            {ruleType === 'excluded' && 'Products in this category will not get discount'}
+          </Typography>
+
+          {/* Action Buttons */}
+          <div className='flex items-center gap-4'>
+            <Button variant='contained' onClick={handleConfirm} disabled={!selectedCategory}>
+              Add Rule
+            </Button>
+            <Button variant='tonal' color='error' onClick={handleReset}>
+              Cancel
+            </Button>
+          </div>
+        </div>
+      </div>
+    </Drawer>
+  )
+}
+
+export default CategoryRuleDialog

src/views/apps/marketing/discount/add/Dialog/OutletSelectionDrawer.tsx

@@ -0,0 +1,144 @@
+'use client'
+
+import CustomTextField from '@/@core/components/mui/TextField'
+import { useOutlets } from '@/services/queries/outlets'
+import { Button, Checkbox, Divider, Drawer, FormControlLabel, IconButton, Typography } from '@mui/material'
+import { useEffect, useState } from 'react'
+
+type Props = {
+  open: boolean
+  onClose: () => void
+  selectedOutlets: string[]
+  onConfirm: (outletIds: string[]) => void
+}
+
+const OutletSelectionDialog = (props: Props) => {
+  const { open, onClose, selectedOutlets, onConfirm } = props
+
+  const [selected, setSelected] = useState<string[]>(selectedOutlets)
+  const [searchQuery, setSearchQuery] = useState('')
+
+  const { data: outletsData } = useOutlets({ page: 1, limit: 100 })
+  const outlets = outletsData?.outlets ?? []
+
+  useEffect(() => {
+    if (open) {
+      setSelected(selectedOutlets)
+      setSearchQuery('')
+    }
+  }, [open, selectedOutlets])
+
+  const filteredOutlets = outlets.filter(outlet => outlet.name.toLowerCase().includes(searchQuery.toLowerCase()))
+
+  const handleToggle = (outletId: string) => {
+    if (selected.includes(outletId)) {
+      setSelected(selected.filter(id => id !== outletId))
+    } else {
+      setSelected([...selected, outletId])
+    }
+  }
+
+  const handleSelectAll = () => {
+    if (selected.length === filteredOutlets.length) {
+      setSelected([])
+    } else {
+      setSelected(filteredOutlets.map(o => o.id))
+    }
+  }
+
+  const handleConfirm = () => {
+    onConfirm(selected)
+    onClose()
+  }
+
+  const handleReset = () => {
+    setSelected(selectedOutlets)
+    setSearchQuery('')
+    onClose()
+  }
+
+  return (
+    <Drawer
+      open={open}
+      anchor='right'
+      variant='temporary'
+      onClose={handleReset}
+      ModalProps={{ keepMounted: true }}
+      sx={{ '& .MuiDrawer-paper': { width: { xs: 300, sm: 500 } } }}
+    >
+      <div className='flex items-center justify-between pli-6 plb-5'>
+        <Typography variant='h5'>Select Outlets</Typography>
+        <IconButton size='small' onClick={handleReset}>
+          <i className='tabler-x text-textSecondary text-2xl' />
+        </IconButton>
+      </div>
+      <Divider />
+      <div className='p-6'>
+        {/* Search */}
+        <CustomTextField
+          fullWidth
+          placeholder='Search outlets...'
+          value={searchQuery}
+          onChange={e => setSearchQuery(e.target.value)}
+          className='mbe-4'
+        />
+
+        {/* Select All */}
+        <div className='flex items-center justify-between mbe-4'>
+          <Button variant='text' size='small' onClick={handleSelectAll}>
+            {selected.length === filteredOutlets.length ? 'Deselect All' : 'Select All'}
+          </Button>
+          <Typography variant='body2' color='text.secondary'>
+            {selected.length} selected
+          </Typography>
+        </div>
+
+        {/* Outlet List */}
+        <div className='max-h-[400px] overflow-y-auto border rounded'>
+          {filteredOutlets.length === 0 ? (
+            <div className='text-center py-8'>
+              <Typography variant='body2' color='text.secondary'>
+                No outlets found
+              </Typography>
+            </div>
+          ) : (
+            filteredOutlets.map(outlet => (
+              <div
+                key={outlet.id}
+                className='flex items-center p-3 hover:bg-actionHover cursor-pointer border-b last:border-b-0'
+                onClick={() => handleToggle(outlet.id)}
+              >
+                <FormControlLabel
+                  control={<Checkbox checked={selected.includes(outlet.id)} />}
+                  label={
+                    <div>
+                      <Typography variant='body1'>{outlet.name}</Typography>
+                      {outlet.address && (
+                        <Typography variant='body2' color='text.secondary'>
+                          {outlet.address}
+                        </Typography>
+                      )}
+                    </div>
+                  }
+                  sx={{ margin: 0, width: '100%' }}
+                />
+              </div>
+            ))
+          )}
+        </div>
+
+        {/* Action Buttons */}
+        <div className='flex items-center gap-4 mbs-6'>
+          <Button variant='contained' onClick={handleConfirm}>
+            Confirm ({selected.length})
+          </Button>
+          <Button variant='tonal' color='error' onClick={handleReset}>
+            Cancel
+          </Button>
+        </div>
+      </div>
+    </Drawer>
+  )
+}
+
+export default OutletSelectionDialog

src/views/apps/marketing/discount/add/Dialog/ProductRuleDialog.tsx

@@ -0,0 +1,204 @@
+'use client'
+
+import { useState, useEffect } from 'react'
+import Button from '@mui/material/Button'
+import Divider from '@mui/material/Divider'
+import Drawer from '@mui/material/Drawer'
+import IconButton from '@mui/material/IconButton'
+import Typography from '@mui/material/Typography'
+import Radio from '@mui/material/Radio'
+import RadioGroup from '@mui/material/RadioGroup'
+import FormControlLabel from '@mui/material/FormControlLabel'
+import MenuItem from '@mui/material/MenuItem'
+import CustomTextField from '@core/components/mui/TextField'
+import { useProducts } from '@/services/queries/products'
+import { ProductRuleType } from '@/types/services/discount'
+
+interface ProductRule {
+  product_id: string
+  product_name?: string
+  rule_type: ProductRuleType
+  quantity: number
+  free_quantity: number
+}
+
+type Props = {
+  open: boolean
+  onClose: () => void
+  onConfirm: (rule: ProductRule) => void
+}
+
+const ProductRuleDialog = (props: Props) => {
+  const { open, onClose, onConfirm } = props
+
+  const [selectedProduct, setSelectedProduct] = useState('')
+  const [ruleType, setRuleType] = useState<ProductRuleType>('required')
+  const [quantity, setQuantity] = useState(1)
+  const [freeQuantity, setFreeQuantity] = useState(0)
+  const [searchQuery, setSearchQuery] = useState('')
+
+  const { data: productsData } = useProducts({ page: 1, limit: 100 })
+  const products = productsData?.products ?? []
+
+  useEffect(() => {
+    if (open) {
+      setSelectedProduct('')
+      setRuleType('required')
+      setQuantity(1)
+      setFreeQuantity(0)
+      setSearchQuery('')
+    }
+  }, [open])
+
+  const filteredProducts = products.filter(product => product.name.toLowerCase().includes(searchQuery.toLowerCase()))
+
+  const handleConfirm = () => {
+    if (!selectedProduct) return
+
+    const product = products.find(p => p.id === selectedProduct)
+
+    onConfirm({
+      product_id: selectedProduct,
+      product_name: product?.name,
+      rule_type: ruleType,
+      quantity,
+      free_quantity: ruleType === 'free' ? freeQuantity : 0
+    })
+
+    handleReset()
+  }
+
+  const handleReset = () => {
+    setSelectedProduct('')
+    setRuleType('required')
+    setQuantity(1)
+    setFreeQuantity(0)
+    setSearchQuery('')
+    onClose()
+  }
+
+  return (
+    <Drawer
+      open={open}
+      anchor='right'
+      variant='temporary'
+      onClose={handleReset}
+      ModalProps={{ keepMounted: true }}
+      sx={{ '& .MuiDrawer-paper': { width: { xs: 300, sm: 500 } } }}
+    >
+      <div className='flex items-center justify-between pli-6 plb-5'>
+        <Typography variant='h5'>Add Product Rule</Typography>
+        <IconButton size='small' onClick={handleReset}>
+          <i className='tabler-x text-textSecondary text-2xl' />
+        </IconButton>
+      </div>
+      <Divider />
+      <div className='p-6'>
+        <div className='flex flex-col gap-5'>
+          {/* Product Search & Select */}
+          <div>
+            <Typography variant='body2' className='mbe-2'>
+              Select Product *
+            </Typography>
+            <CustomTextField
+              fullWidth
+              placeholder='Search product...'
+              value={searchQuery}
+              onChange={e => setSearchQuery(e.target.value)}
+              className='mbe-2'
+            />
+            <div className='max-h-48 overflow-y-auto border rounded'>
+              {filteredProducts.length === 0 ? (
+                <div className='text-center py-4'>
+                  <Typography variant='body2' color='text.secondary'>
+                    No products found
+                  </Typography>
+                </div>
+              ) : (
+                <RadioGroup value={selectedProduct} onChange={e => setSelectedProduct(e.target.value)}>
+                  {filteredProducts.map(product => (
+                    <div
+                      key={product.id}
+                      className='flex items-center p-3 hover:bg-actionHover cursor-pointer border-b last:border-b-0'
+                      onClick={() => setSelectedProduct(product.id)}
+                    >
+                      <FormControlLabel
+                        value={product.id}
+                        control={<Radio />}
+                        label={
+                          <div>
+                            <Typography variant='body1'>{product.name}</Typography>
+                            <Typography variant='body2' color='text.secondary'>
+                              SKU: {product.sku}
+                            </Typography>
+                          </div>
+                        }
+                        sx={{ margin: 0, width: '100%' }}
+                      />
+                    </div>
+                  ))}
+                </RadioGroup>
+              )}
+            </div>
+          </div>
+
+          {/* Rule Type */}
+          <CustomTextField
+            select
+            fullWidth
+            label='Rule Type *'
+            value={ruleType}
+            onChange={e => setRuleType(e.target.value as ProductRuleType)}
+          >
+            <MenuItem value='required'>Required (Must buy)</MenuItem>
+            <MenuItem value='free'>Free (Get free)</MenuItem>
+            <MenuItem value='excluded'>Excluded (No discount)</MenuItem>
+          </CustomTextField>
+
+          <Typography variant='caption' color='text.secondary' className='-mbs-4'>
+            {ruleType === 'required' && 'Product must be in cart to get discount'}
+            {ruleType === 'free' && 'Product will be given for free when conditions met'}
+            {ruleType === 'excluded' && 'Product will not get discount'}
+          </Typography>
+
+          {/* Quantity */}
+          {ruleType !== 'excluded' && (
+            <CustomTextField
+              fullWidth
+              type='number'
+              label={`${ruleType === 'required' ? 'Minimum ' : ''}Quantity`}
+              value={quantity}
+              onChange={e => setQuantity(Number(e.target.value))}
+              inputProps={{ min: 1 }}
+            />
+          )}
+
+          {/* Free Quantity */}
+          {ruleType === 'free' && (
+            <CustomTextField
+              fullWidth
+              type='number'
+              label='Free Quantity'
+              value={freeQuantity}
+              onChange={e => setFreeQuantity(Number(e.target.value))}
+              inputProps={{ min: 0 }}
+              helperText={`Buy ${quantity}, get ${freeQuantity} free`}
+            />
+          )}
+
+          {/* Action Buttons */}
+          <div className='flex items-center gap-4'>
+            <Button variant='contained' onClick={handleConfirm} disabled={!selectedProduct}>
+              Add Rule
+            </Button>
+            <Button variant='tonal' color='error' onClick={handleReset}>
+              Cancel
+            </Button>
+          </div>
+        </div>
+      </div>
+    </Drawer>
+  )
+}
+
+export default ProductRuleDialog

src/views/apps/marketing/discount/add/DiscountAddHeader.tsx

@@ -0,0 +1,88 @@
+'use client'
+
+import { useParams, useRouter } from 'next/navigation'
+import Button from '@mui/material/Button'
+import Typography from '@mui/material/Typography'
+import { CircularProgress } from '@mui/material'
+import { useDispatch, useSelector } from 'react-redux'
+import { RootState } from '@/redux-store'
+import { getLocalizedUrl } from '@/utils/i18n'
+import type { Locale } from '@configs/i18n'
+import { useDiscountsMutation } from '@/services/mutations/discount'
+import { resetDiscount } from '@/redux-store/slices/discount'
+
+const DiscountAddHeader = () => {
+  const dispatch = useDispatch()
+  const params = useParams()
+  const router = useRouter()
+  const { lang: locale } = params
+
+  const { createDiscount, updateDiscount } = useDiscountsMutation()
+  const { discountRequest } = useSelector((state: RootState) => state.discountReducer)
+
+  const isEdit = !!params?.id
+  const isCreating = createDiscount.isPending
+  const isUpdating = updateDiscount.isPending
+
+  const handleSubmit = () => {
+    const payload = {
+      ...discountRequest,
+      value: Number(discountRequest.value),
+      min_purchase_amount: Number(discountRequest.min_purchase_amount) || 0,
+      min_purchase_qty: Number(discountRequest.min_purchase_qty) || 0,
+      usage_limit_per_customer: discountRequest.usage_limit_per_customer
+        ? Number(discountRequest.usage_limit_per_customer)
+        : undefined,
+      usage_limit_total: discountRequest.usage_limit_total ? Number(discountRequest.usage_limit_total) : undefined,
+      priority: Number(discountRequest.priority),
+      start_date: discountRequest.start_date ? new Date(discountRequest.start_date + 'T00:00:00').toISOString() : '',
+      end_date: discountRequest.end_date ? new Date(discountRequest.end_date + 'T23:59:59').toISOString() : ''
+    }
+
+    if (isEdit) {
+      updateDiscount.mutate(
+        { id: params?.id as string, payload },
+        {
+          onSuccess: () => {
+            dispatch(resetDiscount())
+            router.push(getLocalizedUrl('/apps/marketing/discount', locale as Locale))
+          }
+        }
+      )
+    } else {
+      createDiscount.mutate(payload, {
+        onSuccess: () => {
+          dispatch(resetDiscount())
+          router.push(getLocalizedUrl('/apps/marketing/discount', locale as Locale))
+        }
+      })
+    }
+  }
+
+  const handleDiscard = () => {
+    dispatch(resetDiscount())
+    router.push(getLocalizedUrl('/apps/marketing/discount', locale as Locale))
+  }
+
+  return (
+    <div className='flex flex-wrap sm:items-center justify-between max-sm:flex-col gap-6'>
+      <div>
+        <Typography variant='h4' className='mbe-1'>
+          {isEdit ? 'Edit Discount' : 'Add a new discount'}
+        </Typography>
+        <Typography>Create promotional discounts for your store</Typography>
+      </div>
+      <div className='flex flex-wrap max-sm:flex-col gap-4'>
+        <Button variant='tonal' color='secondary' onClick={handleDiscard} disabled={isCreating || isUpdating}>
+          Discard
+        </Button>
+        <Button variant='contained' disabled={isCreating || isUpdating} onClick={handleSubmit}>
+          {isEdit ? 'Update Discount' : 'Publish Discount'}
+          {(isCreating || isUpdating) && <CircularProgress color='inherit' size={16} className='ml-2' />}
+        </Button>
+      </div>
+    </div>
+  )
+}
+
+export default DiscountAddHeader

src/views/apps/marketing/discount/add/DiscountAddInformation.tsx

@@ -0,0 +1,183 @@
+'use client'
+
+import { useEffect } from 'react'
+import { useParams } from 'next/navigation'
+import Grid from '@mui/material/Grid2'
+import Card from '@mui/material/Card'
+import CardHeader from '@mui/material/CardHeader'
+import CardContent from '@mui/material/CardContent'
+import MenuItem from '@mui/material/MenuItem'
+import { useDispatch, useSelector } from 'react-redux'
+import { RootState } from '@/redux-store'
+import CustomTextField from '@core/components/mui/TextField'
+import Loading from '@/components/layout/shared/Loading'
+import { useDiscountById } from '@/services/queries/discount'
+import { useCampaigns } from '@/services/queries/campaign'
+import { resetDiscount, setDiscount, setDiscountField } from '@/redux-store/slices/discount'
+
+const DiscountInformation = () => {
+  const dispatch = useDispatch()
+  const params = useParams()
+
+  const { data: discount, isLoading } = useDiscountById(params?.id as string)
+  const { data: campaignsData } = useCampaigns({ page: 1, limit: 100 })
+
+  const { discountRequest } = useSelector((state: RootState) => state.discountReducer)
+
+  const isEdit = !!params?.id
+  const campaigns = campaignsData?.campaigns ?? []
+
+  useEffect(() => {
+    if (params?.id) {
+      if (discount) {
+        dispatch(
+          setDiscount({
+            campaign_id: discount.campaign_id,
+            code: discount.code,
+            name: discount.name,
+            type: discount.type,
+            value: discount.value,
+            min_purchase_amount: discount.min_purchase_amount,
+            min_purchase_qty: discount.min_purchase_qty,
+            start_date: new Date(discount.start_date).toISOString().split('T')[0],
+            end_date: new Date(discount.end_date).toISOString().split('T')[0],
+            usage_limit_per_customer: discount.usage_limit_per_customer ?? 0,
+            usage_limit_total: discount.usage_limit_total ?? 0,
+            customer_type: discount.customer_type,
+            is_stackable: discount.is_stackable,
+            priority: discount.priority
+          })
+        )
+      }
+    } else {
+      dispatch(resetDiscount())
+    }
+  }, [params?.id, discount, dispatch])
+
+  const handleInputChange = (field: any, value: any) => {
+    dispatch(setDiscountField({ field, value }))
+  }
+
+  if (isLoading) return <Loading />
+
+  return (
+    <Card>
+      <CardHeader title='Discount Information' />
+      <CardContent>
+        <Grid container spacing={6} className='mbe-6'>
+          <Grid size={{ xs: 12 }}>
+            <CustomTextField
+              select
+              fullWidth
+              label='Campaign'
+              value={discountRequest.campaign_id || ''}
+              onChange={e => handleInputChange('campaign_id', e.target.value)}
+            >
+              <MenuItem value=''>Select Campaign</MenuItem>
+              {campaigns.map(campaign => (
+                <MenuItem key={campaign.id} value={campaign.id}>
+                  {campaign.name}
+                </MenuItem>
+              ))}
+            </CustomTextField>
+          </Grid>
+
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              fullWidth
+              label='Discount Code'
+              placeholder='FLASH50'
+              value={discountRequest.code || ''}
+              onChange={e => handleInputChange('code', e.target.value.toUpperCase())}
+              helperText='Only uppercase letters and numbers'
+            />
+          </Grid>
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              fullWidth
+              label='Discount Name'
+              placeholder='Flash Sale 50%'
+              value={discountRequest.name || ''}
+              onChange={e => handleInputChange('name', e.target.value)}
+            />
+          </Grid>
+
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              select
+              fullWidth
+              label='Discount Type'
+              value={discountRequest.type || 'percentage'}
+              onChange={e => handleInputChange('type', e.target.value)}
+            >
+              <MenuItem value='percentage'>Percentage (%)</MenuItem>
+              <MenuItem value='fixed_amount'>Fixed Amount (Rp)</MenuItem>
+              <MenuItem value='free_product'>Free Product</MenuItem>
+            </CustomTextField>
+          </Grid>
+
+          {discountRequest.type !== 'free_product' && (
+            <Grid size={{ xs: 12, sm: 6 }}>
+              <CustomTextField
+                fullWidth
+                type='number'
+                label={`Discount Value ${discountRequest.type === 'percentage' ? '(%)' : '(Rp)'}`}
+                placeholder={discountRequest.type === 'percentage' ? '50' : '50000'}
+                value={discountRequest.value || ''}
+                onChange={e => handleInputChange('value', e.target.value)}
+              />
+            </Grid>
+          )}
+
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              fullWidth
+              type='number'
+              label='Minimum Purchase Amount (Rp)'
+              placeholder='100000'
+              value={discountRequest.min_purchase_amount || ''}
+              onChange={e => handleInputChange('min_purchase_amount', e.target.value)}
+              helperText='Leave 0 if no minimum'
+            />
+          </Grid>
+
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              fullWidth
+              type='number'
+              label='Minimum Purchase Quantity'
+              placeholder='1'
+              value={discountRequest.min_purchase_qty || ''}
+              onChange={e => handleInputChange('min_purchase_qty', e.target.value)}
+              helperText='Leave 0 if no minimum'
+            />
+          </Grid>
+
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              fullWidth
+              type='date'
+              label='Start Date'
+              value={discountRequest.start_date || ''}
+              onChange={e => handleInputChange('start_date', e.target.value)}
+              InputLabelProps={{ shrink: true }}
+            />
+          </Grid>
+
+          <Grid size={{ xs: 12, sm: 6 }}>
+            <CustomTextField
+              fullWidth
+              type='date'
+              label='End Date'
+              value={discountRequest.end_date || ''}
+              onChange={e => handleInputChange('end_date', e.target.value)}
+              InputLabelProps={{ shrink: true }}
+            />
+          </Grid>
+        </Grid>
+      </CardContent>
+    </Card>
+  )
+}
+
+export default DiscountInformation

src/views/apps/marketing/discount/add/DiscountAddOutlets.tsx

@@ -0,0 +1,72 @@
+'use client'
+
+import { useState } from 'react'
+import Card from '@mui/material/Card'
+import CardHeader from '@mui/material/CardHeader'
+import CardContent from '@mui/material/CardContent'
+import Button from '@mui/material/Button'
+import Chip from '@mui/material/Chip'
+import IconButton from '@mui/material/IconButton'
+import Typography from '@mui/material/Typography'
+import { useDispatch, useSelector } from 'react-redux'
+import { RootState } from '@/redux-store'
+import { setDiscountOutlets } from '@/redux-store/slices/discount'
+import OutletSelectionDialog from './Dialog/OutletSelectionDrawer'
+
+const DiscountOutlets = () => {
+  const dispatch = useDispatch()
+  const [openDialog, setOpenDialog] = useState(false)
+  const { selectedOutlets } = useSelector((state: RootState) => state.discountReducer)
+
+  const handleConfirm = (outletIds: string[]) => {
+    dispatch(setDiscountOutlets(outletIds))
+    setOpenDialog(false)
+  }
+
+  const handleRemove = (outletId: string) => {
+    dispatch(setDiscountOutlets(selectedOutlets.filter(id => id !== outletId)))
+  }
+
+  return (
+    <>
+      <Card>
+        <CardHeader
+          title='Applicable Outlets'
+          action={
+            <Button variant='tonal' size='small' onClick={() => setOpenDialog(true)}>
+              Select Outlets
+            </Button>
+          }
+        />
+        <CardContent>
+          {selectedOutlets.length === 0 ? (
+            <Typography variant='body2' color='text.secondary' className='text-center py-4'>
+              No outlets selected. Click "Select Outlets" to add.
+            </Typography>
+          ) : (
+            <div className='flex flex-wrap gap-2'>
+              {selectedOutlets.map(outletId => (
+                <Chip
+                  key={outletId}
+                  label={`Outlet ${outletId}`}
+                  onDelete={() => handleRemove(outletId)}
+                  color='primary'
+                  variant='tonal'
+                />
+              ))}
+            </div>
+          )}
+        </CardContent>
+      </Card>
+
+      <OutletSelectionDialog
+        open={openDialog}
+        onClose={() => setOpenDialog(false)}
+        selectedOutlets={selectedOutlets}
+        onConfirm={handleConfirm}
+      />
+    </>
+  )
+}
+
+export default DiscountOutlets

src/views/apps/marketing/discount/add/DiscountAddRule.tsx

@@ -0,0 +1,147 @@
+'use client'
+
+import { useState } from 'react'
+import Card from '@mui/material/Card'
+import CardHeader from '@mui/material/CardHeader'
+import CardContent from '@mui/material/CardContent'
+import Button from '@mui/material/Button'
+import Typography from '@mui/material/Typography'
+import IconButton from '@mui/material/IconButton'
+import Chip from '@mui/material/Chip'
+import Divider from '@mui/material/Divider'
+import { useDispatch, useSelector } from 'react-redux'
+import { RootState } from '@/redux-store'
+import { removeCategoryRule, removeProductRule, setCategoryRules, setProductRules } from '@/redux-store/slices/discount'
+import CategoryRuleDialog from './Dialog/CategoryRuleDialog'
+import ProductRuleDialog from './Dialog/ProductRuleDialog'
+
+const DiscountRules = () => {
+  const dispatch = useDispatch()
+  const [openProductDialog, setOpenProductDialog] = useState(false)
+  const [openCategoryDialog, setOpenCategoryDialog] = useState(false)
+
+  const { productRules, categoryRules } = useSelector((state: RootState) => state.discountReducer)
+
+  const handleAddProductRule = (rule: any) => {
+    dispatch(setProductRules([...productRules, rule]))
+    setOpenProductDialog(false)
+  }
+
+  const handleAddCategoryRule = (rule: any) => {
+    dispatch(setCategoryRules([...categoryRules, rule]))
+    setOpenCategoryDialog(false)
+  }
+
+  return (
+    <>
+      <Card>
+        <CardHeader title='Discount Rules' />
+        <CardContent>
+          {/* Product Rules */}
+          <div className='mbe-6'>
+            <div className='flex justify-between items-center mbe-4'>
+              <Typography variant='h6'>Product Rules</Typography>
+              <Button
+                variant='tonal'
+                size='small'
+                startIcon={<i className='tabler-plus' />}
+                onClick={() => setOpenProductDialog(true)}
+              >
+                Add Product
+              </Button>
+            </div>
+
+            {productRules.length === 0 ? (
+              <Typography
+                variant='body2'
+                color='text.secondary'
+                className='text-center py-4 border border-dashed rounded'
+              >
+                No product rules. Click "Add Product" to create rules.
+              </Typography>
+            ) : (
+              <div className='flex flex-col gap-3'>
+                {productRules.map((rule, index) => (
+                  <div key={index} className='flex justify-between items-center p-3 border rounded'>
+                    <div>
+                      <Typography variant='body1' className='font-medium'>
+                        {rule.product_name || `Product ${rule.product_id}`}
+                      </Typography>
+                      <div className='flex gap-2 mbs-2'>
+                        <Chip label={rule.rule_type} size='small' variant='tonal' />
+                        <Chip label={`Qty: ${rule.quantity}`} size='small' variant='outlined' />
+                        {rule.rule_type === 'free' && (
+                          <Chip label={`Free: ${rule.free_quantity}`} size='small' variant='outlined' color='success' />
+                        )}
+                      </div>
+                    </div>
+                    <IconButton size='small' color='error' onClick={() => dispatch(removeProductRule(index))}>
+                      <i className='tabler-trash' />
+                    </IconButton>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+
+          <Divider className='mbe-6' />
+
+          {/* Category Rules */}
+          <div>
+            <div className='flex justify-between items-center mbe-4'>
+              <Typography variant='h6'>Category Rules</Typography>
+              <Button
+                variant='tonal'
+                size='small'
+                startIcon={<i className='tabler-plus' />}
+                onClick={() => setOpenCategoryDialog(true)}
+              >
+                Add Category
+              </Button>
+            </div>
+
+            {categoryRules.length === 0 ? (
+              <Typography
+                variant='body2'
+                color='text.secondary'
+                className='text-center py-4 border border-dashed rounded'
+              >
+                No category rules. Click "Add Category" to create rules.
+              </Typography>
+            ) : (
+              <div className='flex flex-col gap-3'>
+                {categoryRules.map((rule, index) => (
+                  <div key={index} className='flex justify-between items-center p-3 border rounded'>
+                    <div>
+                      <Typography variant='body1' className='font-medium'>
+                        {rule.category_name || `Category ${rule.category_id}`}
+                      </Typography>
+                      <Chip label={rule.rule_type} size='small' variant='tonal' className='mbs-2' />
+                    </div>
+                    <IconButton size='small' color='error' onClick={() => dispatch(removeCategoryRule(index))}>
+                      <i className='tabler-trash' />
+                    </IconButton>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+        </CardContent>
+      </Card>
+
+      <ProductRuleDialog
+        open={openProductDialog}
+        onClose={() => setOpenProductDialog(false)}
+        onConfirm={handleAddProductRule}
+      />
+
+      <CategoryRuleDialog
+        open={openCategoryDialog}
+        onClose={() => setOpenCategoryDialog(false)}
+        onConfirm={handleAddCategoryRule}
+      />
+    </>
+  )
+}
+
+export default DiscountRules

src/views/apps/marketing/discount/add/DiscountAddSetting.tsx

@@ -0,0 +1,87 @@
+'use client'
+
+import Card from '@mui/material/Card'
+import CardHeader from '@mui/material/CardHeader'
+import CardContent from '@mui/material/CardContent'
+import MenuItem from '@mui/material/MenuItem'
+import FormControlLabel from '@mui/material/FormControlLabel'
+import Switch from '@mui/material/Switch'
+import Divider from '@mui/material/Divider'
+import { useDispatch, useSelector } from 'react-redux'
+import { RootState } from '@/redux-store'
+import CustomTextField from '@core/components/mui/TextField'
+import { setDiscountField } from '@/redux-store/slices/discount'
+
+const DiscountSettings = () => {
+  const dispatch = useDispatch()
+  const { discountRequest } = useSelector((state: RootState) => state.discountReducer)
+
+  const handleInputChange = (field: any, value: any) => {
+    dispatch(setDiscountField({ field, value }))
+  }
+
+  return (
+    <Card>
+      <CardHeader title='Settings' />
+      <CardContent className='flex flex-col gap-4'>
+        <CustomTextField
+          fullWidth
+          type='number'
+          label='Usage Limit Per Customer'
+          placeholder='5'
+          value={discountRequest.usage_limit_per_customer || ''}
+          onChange={e =>
+            handleInputChange('usage_limit_per_customer', e.target.value ? Number(e.target.value) : undefined)
+          }
+          helperText='Leave empty for unlimited'
+        />
+
+        <CustomTextField
+          fullWidth
+          type='number'
+          label='Total Usage Limit'
+          placeholder='100'
+          value={discountRequest.usage_limit_total || ''}
+          onChange={e => handleInputChange('usage_limit_total', e.target.value ? Number(e.target.value) : undefined)}
+          helperText='Leave empty for unlimited'
+        />
+
+        <CustomTextField
+          select
+          fullWidth
+          label='Customer Type'
+          value={discountRequest.customer_type || 'all'}
+          onChange={e => handleInputChange('customer_type', e.target.value)}
+        >
+          <MenuItem value='all'>All Customers</MenuItem>
+          <MenuItem value='member'>Member Only</MenuItem>
+          <MenuItem value='vip'>VIP Only</MenuItem>
+        </CustomTextField>
+
+        <CustomTextField
+          fullWidth
+          type='number'
+          label='Priority'
+          placeholder='10'
+          value={discountRequest.priority || 10}
+          onChange={e => handleInputChange('priority', e.target.value)}
+          helperText='Higher number = higher priority (1-100)'
+        />
+
+        <Divider />
+
+        <FormControlLabel
+          control={
+            <Switch
+              checked={discountRequest.is_stackable || false}
+              onChange={e => handleInputChange('is_stackable', e.target.checked)}
+            />
+          }
+          label='Can be combined with other discounts (Stackable)'
+        />
+      </CardContent>
+    </Card>
+  )
+}
+
+export default DiscountSettings

src/views/apps/marketing/discount/index.tsx

@@ -0,0 +1,17 @@
+// MUI Imports
+import Grid from '@mui/material/Grid2'
+import DiscountListTable from './list'
+
+// Type Imports
+
+const DiscountList = () => {
+  return (
+    <Grid container spacing={6}>
+      <Grid size={{ xs: 12 }}>
+        <DiscountListTable />
+      </Grid>
+    </Grid>
+  )
+}
+
+export default DiscountList

src/views/apps/marketing/discount/list/index.tsx

@@ -0,0 +1,508 @@
+'use client'
+
+// React Imports
+import { useCallback, useEffect, useMemo, useState } from 'react'
+
+// Next Imports
+import Link from 'next/link'
+import { useParams } from 'next/navigation'
+
+// MUI Imports
+import Button from '@mui/material/Button'
+import Card from '@mui/material/Card'
+import CardHeader from '@mui/material/CardHeader'
+import Checkbox from '@mui/material/Checkbox'
+import Chip from '@mui/material/Chip'
+import Divider from '@mui/material/Divider'
+import IconButton from '@mui/material/IconButton'
+import MenuItem from '@mui/material/MenuItem'
+import TablePagination from '@mui/material/TablePagination'
+import type { TextFieldProps } from '@mui/material/TextField'
+import Typography from '@mui/material/Typography'
+import { Box, CircularProgress } from '@mui/material'
+
+// Third-party Imports
+import type { RankingInfo } from '@tanstack/match-sorter-utils'
+import { rankItem } from '@tanstack/match-sorter-utils'
+import type { ColumnDef, FilterFn } from '@tanstack/react-table'
+import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table'
+import classnames from 'classnames'
+
+// Type Imports
+import type { Locale } from '@configs/i18n'
+
+// Component Imports
+import TablePaginationComponent from '@components/TablePaginationComponent'
+import CustomTextField from '@core/components/mui/TextField'
+import OptionMenu from '@core/components/option-menu'
+import Loading from '@/components/layout/shared/Loading'
+import ConfirmDeleteDialog from '@/components/dialogs/confirm-delete'
+
+// Service Imports
+
+// Util Imports
+import { getLocalizedUrl } from '@/utils/i18n'
+import { formatCurrency } from '@/utils/transform'
+
+// Style Imports
+import tableStyles from '@core/styles/table.module.css'
+import { Discount, FetchDiscountsParams } from '@/types/services/discount'
+import { useDiscounts } from '@/services/queries/discount'
+import { useDiscountsMutation } from '@/services/mutations/discount'
+
+declare module '@tanstack/table-core' {
+  interface FilterFns {
+    fuzzy: FilterFn<unknown>
+  }
+  interface FilterMeta {
+    itemRank: RankingInfo
+  }
+}
+
+type DiscountWithActionsType = Discount & {
+  actions?: string
+}
+
+const fuzzyFilter: FilterFn<any> = (row, columnId, value, addMeta) => {
+  const itemRank = rankItem(row.getValue(columnId), value)
+  addMeta({ itemRank })
+  return itemRank.passed
+}
+
+const DebouncedInput = ({
+  value: initialValue,
+  onChange,
+  debounce = 500,
+  ...props
+}: {
+  value: string | number
+  onChange: (value: string | number) => void
+  debounce?: number
+} & Omit<TextFieldProps, 'onChange'>) => {
+  const [value, setValue] = useState(initialValue)
+
+  useEffect(() => {
+    setValue(initialValue)
+  }, [initialValue])
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      onChange(value)
+    }, debounce)
+
+    return () => clearTimeout(timeout)
+  }, [value])
+
+  return <CustomTextField {...props} value={value} onChange={e => setValue(e.target.value)} />
+}
+
+// Column Definitions
+const columnHelper = createColumnHelper<DiscountWithActionsType>()
+
+const DiscountListTable = () => {
+  const [rowSelection, setRowSelection] = useState({})
+  const [currentPage, setCurrentPage] = useState(1)
+  const [pageSize, setPageSize] = useState(10)
+  const [openConfirm, setOpenConfirm] = useState(false)
+  const [discountId, setDiscountId] = useState('')
+  const [search, setSearch] = useState('')
+
+  const [filter, setFilter] = useState<FetchDiscountsParams>({
+    type: undefined,
+    customer_type: undefined,
+    is_active: undefined,
+    campaign_id: undefined
+  })
+
+  // Hooks
+  const { lang: locale } = useParams()
+
+  // Fetch discounts with pagination and search
+  const { data, isLoading, error, isFetching } = useDiscounts({
+    page: currentPage,
+    limit: pageSize,
+    search: search,
+    ...filter
+  })
+
+  const { deleteDiscount, toggleDiscountStatus } = useDiscountsMutation()
+
+  const discounts = data?.discounts ?? []
+  const totalCount = data?.pagination.total_count ?? 0
+
+  const handlePageChange = useCallback((event: unknown, newPage: number) => {
+    setCurrentPage(newPage)
+  }, [])
+
+  const handlePageSizeChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
+    const newPageSize = parseInt(event.target.value, 10)
+    setPageSize(newPageSize)
+    setCurrentPage(1)
+  }, [])
+
+  const handleDelete = () => {
+    deleteDiscount.mutate(discountId, {
+      onSuccess: () => setOpenConfirm(false)
+    })
+  }
+
+  const handleToggleStatus = (id: string, currentStatus: boolean) => {
+    toggleDiscountStatus.mutate({ id, isActive: !currentStatus })
+  }
+
+  const getDiscountTypeColor = (type: string) => {
+    switch (type) {
+      case 'percentage':
+        return 'primary'
+      case 'fixed_amount':
+        return 'success'
+      case 'free_product':
+        return 'info'
+      default:
+        return 'default'
+    }
+  }
+
+  const getCustomerTypeColor = (type: string) => {
+    switch (type) {
+      case 'all':
+        return 'default'
+      case 'member':
+        return 'warning'
+      case 'vip':
+        return 'error'
+      default:
+        return 'default'
+    }
+  }
+
+  const formatDiscountValue = (discount: Discount) => {
+    if (discount.type === 'percentage') {
+      return `${discount.value}%`
+    } else if (discount.type === 'fixed_amount') {
+      return formatCurrency(discount.value)
+    } else {
+      return 'Free Product'
+    }
+  }
+
+  const columns = useMemo<ColumnDef<DiscountWithActionsType, any>[]>(
+    () => [
+      {
+        id: 'select',
+        header: ({ table }) => (
+          <Checkbox
+            {...{
+              checked: table.getIsAllRowsSelected(),
+              indeterminate: table.getIsSomeRowsSelected(),
+              onChange: table.getToggleAllRowsSelectedHandler()
+            }}
+          />
+        ),
+        cell: ({ row }) => (
+          <Checkbox
+            {...{
+              checked: row.getIsSelected(),
+              disabled: !row.getCanSelect(),
+              indeterminate: row.getIsSomeSelected(),
+              onChange: row.getToggleSelectedHandler()
+            }}
+          />
+        )
+      },
+      columnHelper.accessor('code', {
+        header: 'Discount Code',
+        cell: ({ row }) => (
+          <div className='flex flex-col'>
+            <Typography className='font-medium' color='text.primary'>
+              {row.original.code}
+            </Typography>
+            <Typography variant='body2' color='text.secondary'>
+              {row.original.name}
+            </Typography>
+          </div>
+        )
+      }),
+      columnHelper.accessor('type', {
+        header: 'Type',
+        cell: ({ row }) => (
+          <Chip
+            label={row.original.type.replace('_', ' ').toUpperCase()}
+            variant='tonal'
+            color={getDiscountTypeColor(row.original.type)}
+            size='small'
+          />
+        )
+      }),
+      columnHelper.accessor('value', {
+        header: 'Value',
+        cell: ({ row }) => <Typography className='font-medium'>{formatDiscountValue(row.original)}</Typography>
+      }),
+      columnHelper.accessor('customer_type', {
+        header: 'Customer Type',
+        cell: ({ row }) => (
+          <Chip
+            label={row.original.customer_type.toUpperCase()}
+            variant='tonal'
+            color={getCustomerTypeColor(row.original.customer_type)}
+            size='small'
+          />
+        )
+      }),
+      columnHelper.accessor('min_purchase_amount', {
+        header: 'Min Purchase',
+        cell: ({ row }) => (
+          <Typography>
+            {row.original.min_purchase_amount ? formatCurrency(row.original.min_purchase_amount) : '-'}
+          </Typography>
+        )
+      }),
+      columnHelper.accessor('usage_count', {
+        header: 'Usage',
+        cell: ({ row }) => (
+          <div className='flex flex-col'>
+            <Typography variant='body2'>
+              {row.original.usage_count} / {row.original.usage_limit_total || '∞'}
+            </Typography>
+          </div>
+        )
+      }),
+      columnHelper.accessor('start_date', {
+        header: 'Period',
+        cell: ({ row }) => (
+          <div className='flex flex-col'>
+            <Typography variant='body2'>{new Date(row.original.start_date).toLocaleDateString()}</Typography>
+            <Typography variant='body2' color='text.secondary'>
+              to {new Date(row.original.end_date).toLocaleDateString()}
+            </Typography>
+          </div>
+        )
+      }),
+      columnHelper.accessor('is_active', {
+        header: 'Status',
+        cell: ({ row }) => (
+          <div className='flex items-center gap-2'>
+            <Chip
+              label={row.original.is_active ? 'Active' : 'Inactive'}
+              variant='tonal'
+              color={row.original.is_active ? 'success' : 'error'}
+              size='small'
+            />
+          </div>
+        )
+      }),
+      columnHelper.accessor('actions', {
+        header: 'Actions',
+        cell: ({ row }) => (
+          <div className='flex items-center'>
+            <IconButton
+              LinkComponent={Link}
+              href={getLocalizedUrl(`/apps/marketing/discount/${row.original.id}/detail`, locale as Locale)}
+            >
+              <i className='tabler-eye text-textSecondary' />
+            </IconButton>
+            <IconButton
+              LinkComponent={Link}
+              href={getLocalizedUrl(`/apps/marketing/discount/${row.original.id}/edit`, locale as Locale)}
+            >
+              <i className='tabler-edit text-textSecondary' />
+            </IconButton>
+            <OptionMenu
+              iconButtonProps={{ size: 'medium' }}
+              iconClassName='text-textSecondary'
+              options={[
+                {
+                  text: row.original.is_active ? 'Deactivate' : 'Activate',
+                  icon: row.original.is_active ? 'tabler-toggle-left' : 'tabler-toggle-right',
+                  menuItemProps: {
+                    onClick: () => handleToggleStatus(row.original.id, row.original.is_active)
+                  }
+                },
+                {
+                  text: 'Delete',
+                  icon: 'tabler-trash',
+                  menuItemProps: {
+                    onClick: () => {
+                      setOpenConfirm(true)
+                      setDiscountId(row.original.id)
+                    }
+                  }
+                },
+                { text: 'Duplicate', icon: 'tabler-copy' }
+              ]}
+            />
+          </div>
+        ),
+        enableSorting: false
+      })
+    ],
+    [locale]
+  )
+
+  const table = useReactTable({
+    data: discounts as Discount[],
+    columns,
+    filterFns: {
+      fuzzy: fuzzyFilter
+    },
+    state: {
+      rowSelection,
+      pagination: {
+        pageIndex: currentPage,
+        pageSize
+      }
+    },
+    enableRowSelection: true,
+    onRowSelectionChange: setRowSelection,
+    getCoreRowModel: getCoreRowModel(),
+    manualPagination: true,
+    pageCount: Math.ceil(totalCount / pageSize)
+  })
+
+  return (
+    <>
+      <Card>
+        <CardHeader title='Filters' />
+        <Divider />
+        <div className='flex flex-wrap justify-between gap-4 p-6'>
+          <DebouncedInput
+            value={search}
+            onChange={value => setSearch(value as string)}
+            placeholder='Search Discount Code or Name'
+            className='max-sm:is-full'
+          />
+          <div className='flex flex-wrap items-center max-sm:flex-col gap-4 max-sm:is-full is-auto'>
+            <CustomTextField
+              select
+              value={pageSize}
+              onChange={handlePageSizeChange}
+              className='flex-auto is-[70px] max-sm:is-full'
+            >
+              <MenuItem value='10'>10</MenuItem>
+              <MenuItem value='25'>25</MenuItem>
+              <MenuItem value='50'>50</MenuItem>
+            </CustomTextField>
+            <Button
+              color='secondary'
+              variant='tonal'
+              className='max-sm:is-full is-auto'
+              startIcon={<i className='tabler-upload' />}
+            >
+              Export
+            </Button>
+            <Button
+              variant='contained'
+              component={Link}
+              className='max-sm:is-full is-auto'
+              href={getLocalizedUrl('/apps/marketing/discount/add', locale as Locale)}
+              startIcon={<i className='tabler-plus' />}
+            >
+              Add Discount
+            </Button>
+          </div>
+        </div>
+        <div className='overflow-x-auto relative'>
+          {isLoading ? (
+            <Loading />
+          ) : (
+            <table className={tableStyles.table}>
+              <thead>
+                {table.getHeaderGroups().map(headerGroup => (
+                  <tr key={headerGroup.id}>
+                    {headerGroup.headers.map(header => (
+                      <th key={header.id}>
+                        {header.isPlaceholder ? null : (
+                          <div
+                            className={classnames({
+                              'flex items-center': header.column.getIsSorted(),
+                              'cursor-pointer select-none': header.column.getCanSort()
+                            })}
+                            onClick={header.column.getToggleSortingHandler()}
+                          >
+                            {flexRender(header.column.columnDef.header, header.getContext())}
+                            {{
+                              asc: <i className='tabler-chevron-up text-xl' />,
+                              desc: <i className='tabler-chevron-down text-xl' />
+                            }[header.column.getIsSorted() as 'asc' | 'desc'] ?? null}
+                          </div>
+                        )}
+                      </th>
+                    ))}
+                  </tr>
+                ))}
+              </thead>
+              {table.getFilteredRowModel().rows.length === 0 ? (
+                <tbody>
+                  <tr>
+                    <td colSpan={table.getVisibleFlatColumns().length} className='text-center'>
+                      No data available
+                    </td>
+                  </tr>
+                </tbody>
+              ) : (
+                <tbody>
+                  {table
+                    .getRowModel()
+                    .rows.slice(0, table.getState().pagination.pageSize)
+                    .map(row => {
+                      return (
+                        <tr key={row.id} className={classnames({ selected: row.getIsSelected() })}>
+                          {row.getVisibleCells().map(cell => (
+                            <td key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</td>
+                          ))}
+                        </tr>
+                      )
+                    })}
+                </tbody>
+              )}
+            </table>
+          )}
+
+          {isFetching && !isLoading && (
+            <Box
+              position='absolute'
+              top={0}
+              left={0}
+              right={0}
+              bottom={0}
+              display='flex'
+              alignItems='center'
+              justifyContent='center'
+              bgcolor='rgba(255,255,255,0.7)'
+              zIndex={1}
+            >
+              <CircularProgress size={24} />
+            </Box>
+          )}
+        </div>
+
+        <TablePagination
+          component={() => (
+            <TablePaginationComponent
+              pageIndex={currentPage}
+              pageSize={pageSize}
+              totalCount={totalCount}
+              onPageChange={handlePageChange}
+            />
+          )}
+          count={totalCount}
+          rowsPerPage={pageSize}
+          page={currentPage}
+          onPageChange={handlePageChange}
+          onRowsPerPageChange={handlePageSizeChange}
+          rowsPerPageOptions={[10, 25, 50]}
+          disabled={isLoading}
+        />
+      </Card>
+
+      <ConfirmDeleteDialog
+        open={openConfirm}
+        onClose={() => setOpenConfirm(false)}
+        onConfirm={handleDelete}
+        isLoading={deleteDiscount.isPending}
+      />
+    </>
+  )
+}
+
+export default DiscountListTable

src/views/apps/purchase/purchase-form/PurchaseAddForm.tsx

@@ -407,7 +407,7 @@ const PurchaseAddForm: React.FC = () => {
           description: item.description || undefined,
           quantity: item.quantity,
           unit_id: item.unit!.value,
-          amount: item.amount
+          amount: item.total
         })),
       attachment_file_ids: formData.attachment_file_ids.length > 0 ? formData.attachment_file_ids : undefined
     }

src/views/dashboards/crm/DistributedBarChartOrder.tsx

@@ -11,7 +11,7 @@ import classnames from 'classnames'
 import CustomAvatar, { CustomAvatarProps } from '../../../@core/components/mui/Avatar'
 import { ThemeColor } from '../../../@core/types'
 import { Skeleton, Typography } from '@mui/material'
-import { formatShortCurrency } from '../../../utils/transform'
+import { formatCurrency, formatShortCurrency } from '../../../utils/transform'
 
 type Props = {
   title: string
@@ -46,7 +46,7 @@ const DistributedBarChartOrder = ({
               {title}
             </Typography>
             <Typography color='text.primary' variant='h4'>
-              {isCurrency ? 'Rp ' + formatShortCurrency(value) : formatShortCurrency(value)}
+              {isCurrency ? formatCurrency(value) : formatShortCurrency(value)}
             </Typography>
           </div>
           <CustomAvatar variant='rounded' skin={avatarSkin} size={52} color={avatarColor}>

src/views/dashboards/daily-report/report-generator.tsx

@@ -59,6 +59,7 @@ interface ReportGeneratorProps {
   onSingleDateChange: (date: Date) => void
   onDateRangeChange: (dateRange: DateRange) => void
   onGeneratePDF: () => void
+  onGenerateExcel: () => void
 
   // Optional props dengan default values
   maxWidth?: string
@@ -66,8 +67,10 @@ interface ReportGeneratorProps {
   customQuickActions?: CustomQuickActions | null
   periodFormat?: string
   downloadButtonText?: string
+  downloadExcelButtonText?: string
   cardShadow?: string
   primaryColor?: string
+  excelButtonColor?: string
 
   // Optional helper functions
   formatDateForInput?: ((date: Date) => string) | null
@@ -80,6 +83,7 @@ interface ReportGeneratorProps {
 
   // Loading state
   isGenerating?: boolean
+  isGeneratingExcel?: boolean
 
   // Custom labels
   labels?: Labels
@@ -110,6 +114,22 @@ const PurpleButton = styled(Button)(({ theme }) => ({
   }
 }))
 
+const GreenButton = styled(Button)(({ theme }) => ({
+  backgroundColor: '#16a34a',
+  color: 'white',
+  textTransform: 'none',
+  fontWeight: 500,
+  padding: '8px 24px',
+  '&:hover': {
+    backgroundColor: '#15803d',
+    opacity: 0.9
+  },
+  '&:disabled': {
+    backgroundColor: theme.palette.mode === 'dark' ? '#444' : '#ccc',
+    color: theme.palette.mode === 'dark' ? '#888' : '#666'
+  }
+}))
+
 const QuickActionButton = styled(Button)(({ theme }) => ({
   backgroundColor: theme.palette.mode === 'dark' ? 'rgba(231, 227, 252, 0.08)' : '#f8f7fa',
   color: theme.palette.mode === 'dark' ? theme.palette.text.secondary : '#6f6b7d',
@@ -140,6 +160,7 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
   onSingleDateChange,
   onDateRangeChange,
   onGeneratePDF,
+  onGenerateExcel,
 
   // Optional props dengan default values
   maxWidth = '1024px',
@@ -147,8 +168,10 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
   customQuickActions = null,
   periodFormat = 'id-ID',
   downloadButtonText = 'Download PDF',
+  downloadExcelButtonText = 'Download Excel',
   cardShadow,
   primaryColor = '#36175e',
+  excelButtonColor = '#16a34a',
 
   // Optional helper functions
   formatDateForInput = null,
@@ -161,6 +184,7 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
 
   // Loading state
   isGenerating = false,
+  isGeneratingExcel = false,
 
   // Custom labels
   labels = {
@@ -175,7 +199,7 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
     last7DaysLabel: '7 Hari Terakhir',
     last30DaysLabel: '30 Hari Terakhir',
     periodLabel: 'Periode:',
-    exportHelpText: 'Klik tombol download untuk mengeksport laporan ke PDF'
+    exportHelpText: 'Klik tombol download untuk mengeksport laporan ke PDF atau Excel'
   }
 }) => {
   const theme = useTheme()
@@ -271,14 +295,24 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
           </Typography>
         }
         action={
-          <PurpleButton
+          <Box sx={{ display: 'flex', gap: 1, flexWrap: 'wrap' }}>
-            onClick={onGeneratePDF}
+            <PurpleButton
-            variant='contained'
+              onClick={onGeneratePDF}
-            disabled={isGenerating}
+              variant='contained'
-            sx={{ backgroundColor: primaryColor }}
+              disabled={isGenerating}
-          >
+              sx={{ backgroundColor: primaryColor }}
-            {isGenerating ? 'Generating...' : downloadButtonText}
+            >
-          </PurpleButton>
+              {isGenerating ? 'Generating...' : downloadButtonText}
+            </PurpleButton>
+            <GreenButton
+              onClick={onGenerateExcel}
+              variant='contained'
+              disabled={isGeneratingExcel}
+              sx={{ backgroundColor: excelButtonColor }}
+            >
+              {isGeneratingExcel ? 'Generating...' : downloadExcelButtonText}
+            </GreenButton>
+          </Box>
         }
         sx={{ pb: 2 }}
       />
@@ -505,7 +539,7 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
               mt: 1
             }}
           >
-            {labels.exportHelpText || 'Klik tombol download untuk mengeksport laporan ke PDF'}
+            {labels.exportHelpText || 'Klik tombol download untuk mengeksport laporan ke PDF atau Excel'}
           </Typography>
         </InfoBox>
 

src/views/dashboards/daily-report/report-header.tsx

@@ -38,8 +38,8 @@ const ReportHeader: FC<ReportHeaderProps> = ({
       <Box sx={{ p: theme.spacing(8, 8, 6) }}>
         <Box sx={{ textAlign: 'center' }}>
           <Typography
-            variant='h4'
+            variant='h1'
-            component='h3'
+            component='h1'
             sx={{
               fontWeight: 700,
               color: '#222222'
@@ -49,7 +49,7 @@ const ReportHeader: FC<ReportHeaderProps> = ({
           </Typography>
           {periode && (
             <Typography
-              variant='body2'
+              variant='h5'
               sx={{
                 color: '#222222',
                 mt: 2