{
const payroll = row.original;
+
return (
diff --git a/resources/js/pages/admin/finance/payroll/partials/payroll-form-modal.tsx b/resources/js/pages/admin/finance/payroll/partials/payroll-form-modal.tsx
index 6a15f36..774c687 100644
--- a/resources/js/pages/admin/finance/payroll/partials/payroll-form-modal.tsx
+++ b/resources/js/pages/admin/finance/payroll/partials/payroll-form-modal.tsx
@@ -1,3 +1,9 @@
+import { useForm } from '@inertiajs/react';
+import { Loader, Plus, Trash2 } from 'lucide-react';
+import { X, Save } from 'lucide-react';
+import { useEffect } from 'react';
+import { NumericFormat } from 'react-number-format';
+import { toast } from 'sonner';
import { Button } from '@/components/ui/button';
import {
Dialog,
@@ -6,21 +12,14 @@ import {
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog"
-import { Field, FieldGroup } from "@/components/ui/field"
+import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from '@/components/ui/empty';
+import { FieldGroup } from "@/components/ui/field"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
-import { Switch } from '@/components/ui/switch';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
-import { Payroll } from '@/types';
-import { useForm } from '@inertiajs/react';
-import { useEffect } from 'react';
-import payrollRoutes from '@/routes/payroll';
-import { toast } from 'sonner';
-import { Loader, Plus, Trash2 } from 'lucide-react';
-import { NumericFormat } from 'react-number-format';
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
-import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from '@/components/ui/empty';
-import { X, Save } from 'lucide-react';
+import { SelectTrigger } from '@/components/ui/select';
+import payrollRoutes from '@/routes/payroll';
+import type { Payroll } from '@/types';
interface PayrollFormModalProps {
isOpen: boolean;
@@ -76,6 +75,7 @@ export function PayrollFormModal({ isOpen, onClose, payroll }: PayrollFormModalP
const onSubmit = (e: React.FormEvent) => {
e.preventDefault();
+
if (payroll) {
patch(payrollRoutes.update(payroll.id).url, {
onSuccess: (response: any) => {
diff --git a/resources/js/pages/admin/manage/order/create.tsx b/resources/js/pages/admin/manage/order/create.tsx
index 06b15d2..46e876e 100644
--- a/resources/js/pages/admin/manage/order/create.tsx
+++ b/resources/js/pages/admin/manage/order/create.tsx
@@ -1,19 +1,22 @@
-import { Head, Link, useForm, router } from '@inertiajs/react';
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Head, Link, router, useForm } from '@inertiajs/react';
+import { ArrowLeft, Check, ImagePlus, Loader, Minus, Plus, Save, Search, ShoppingCart, Tag, Trash2, X } from 'lucide-react';
+import React, { useMemo, useState } from 'react';
+import { NumericFormat } from 'react-number-format';
+import { toast } from 'sonner';
+import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import {
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from "@/components/ui/dialog";
+import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from '@/components/ui/empty';
import { Field, FieldError } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
-import * as orderRoutes from '@/routes/order';
-import React, { useMemo, useState } from 'react';
-import { toast } from 'sonner';
-import { Product, ProductPrice } from '@/types';
-import { OrderItem } from '@/types/order';
-import { Plus, Trash2, CalendarIcon, Minus, ShoppingCart, Search, ImagePlus, X, Tag, ArrowLeft, Check, Loader, Save } from 'lucide-react';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import { format } from 'date-fns';
-import { cn } from '@/lib/utils';
-import { Badge } from '@/components/ui/badge';
import { ScrollArea } from '@/components/ui/scroll-area';
import {
Select,
@@ -22,21 +25,15 @@ import {
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
-import {
- Dialog,
- DialogContent,
- DialogFooter,
- DialogHeader,
- DialogTitle,
-} from "@/components/ui/dialog";
-import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from '@/components/ui/empty';
import {
Sheet,
SheetContent,
- SheetTrigger,
- SheetClose,
+ SheetTrigger
} from "@/components/ui/sheet";
-import { NumericFormat } from 'react-number-format';
+import { cn } from '@/lib/utils';
+import * as orderRoutes from '@/routes/order';
+import type { Product } from '@/types';
+import type { OrderItem } from '@/types/order';
type CartItem = OrderItem & { id: number };
type EnumOption = { value: string, label: string };
@@ -60,6 +57,7 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
const categories = useMemo(() => {
const map = new Map();
products.forEach(p => p.categories?.forEach(c => map.set(c.id, c.name)));
+
return Array.from(map.entries()).map(([id, name]) => ({ id, name }));
}, [products]);
@@ -77,6 +75,7 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
const filteredProducts = products.filter(p => {
const matchesSearch = p.name.toLowerCase().includes(search.toLowerCase());
const matchesCategory = selectedCategory === 'all' || p.categories?.some(c => String(c.id) === selectedCategory);
+
return matchesSearch && matchesCategory;
});
@@ -130,7 +129,10 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
};
const updateCartQuantity = (itemId: number, qty: number) => {
- if (qty < 1) return;
+ if (qty < 1) {
+return;
+}
+
router.patch(orderRoutes.updateCartItem(itemId).url, {
qty
}, {
@@ -146,16 +148,20 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
const confirmQty = () => {
const val = parseInt(qtyInputValue);
+
if (!isNaN(val) && val >= 1 && qtyDialogIndex !== null) {
updateCartQuantity(qtyDialogIndex, val);
}
+
setQtyDialogIndex(null);
};
const onSubmit = (e: React.FormEvent) => {
e.preventDefault();
+
if (cartItems.length === 0) {
toast.error('Pilih minimal satu produk');
+
return;
}
@@ -187,6 +193,7 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
const PriceTypeLabel = ({ type }: { type: string }) => {
const option = priceTypes.find(opt => opt.value === type);
+
return option ? option.label : type;
};
@@ -526,7 +533,10 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
cartItem ? "text-foreground hover:text-primary cursor-pointer" : "text-muted-foreground/40 cursor-default"
)}
onClick={(e) => {
- if (!cartItem) return;
+ if (!cartItem) {
+return;
+}
+
openQtyDialog(cartItem, e);
}}
>
@@ -600,7 +610,11 @@ export default function OrderCreate({ products, cartItems, orderStatus, orderCha
{/* Quantity Input Dialog */}
-