Index: app/Http/Controllers/DashboardController.php =================================================================== --- app/Http/Controllers/DashboardController.php (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ app/Http/Controllers/DashboardController.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -16,9 +16,19 @@ public function index() { - // Existing revenue metrics - $currentRevenue = Payment::whereMonth('payment_date', now()->month) - ->whereYear('payment_date', now()->year) - ->where('payment_status', 'paid') + $currentMonth = now()->month; + $currentYear = now()->year; + $previousMonth = now()->subMonth()->month; + $previousYear = now()->subYear()->year; + + // Debug: Check if we have any payments + $totalPayments = Payment::where('payment_status', 'paid')->count(); + $allPayments = Payment::where('payment_status', 'paid')->get(); + $currentRevenue = Payment::where('payment_status', 'paid') + ->where(function($query) use ($currentMonth, $currentYear) { + $query->whereYear('payment_date', $currentYear) + ->whereMonth('payment_date', $currentMonth); + }) ->sum('amount'); + $previousRevenue = Payment::whereMonth('payment_date', now()->subMonth()->month) @@ -40,5 +50,4 @@ ]); - // Updated Reports - No Invoice model references // 1. Top Buyers - Calculate from orders and order_batches Index: app/Http/Controllers/GenericModelController.php =================================================================== --- app/Http/Controllers/GenericModelController.php (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ app/Http/Controllers/GenericModelController.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -7,4 +7,5 @@ use Illuminate\Support\Str; use Illuminate\Database\Eloquent\Relations\BelongsTo; + class GenericModelController extends Controller { @@ -27,7 +28,8 @@ public function index(Request $request, string $model) { - if ($model === 'orders') { - return app(OrderController::class)->index($request); - } + // Remove the orders redirect - orders are now handled by OrderController directly + // if ($model === 'orders') { + // return app(OrderController::class)->index($request); + // } $modelClass = $this->getModelClass($model); @@ -77,5 +79,5 @@ ]); } -// + public function store(Request $request, string $model) { @@ -112,19 +114,10 @@ $created = $modelClass::create($data); \Log::info('STORE - created record', ['id' => $created->id ?? null, 'model' => $model]); - // Return JSON so you can see success in the Network tab without redirect issues -// return response()->json([ -// 'status' => 'ok', -// 'created_id' => $created->id ?? null, -// 'data' => $data, -// ], 201); + return redirect()->route('generic.index', ['model' => $model]) ->with('success', Str::singular($model) . ' created successfully.'); } catch (\Throwable $e) { \Log::error('STORE - DB error: ' . $e->getMessage(), ['exception' => $e]); -// return response()->json([ -// 'status' => 'error', -// 'message' => $e->getMessage(), -// 'data' => $data, -// ], 500); + return redirect()->back() ->withErrors(['error' => 'Failed to create ' . $model . ': ' . $e->getMessage()]) @@ -165,18 +158,10 @@ $item->update($data); \Log::info('UPDATE - updated record', ['id' => $item->id]); -// return response()->json([ -// 'status' => 'ok', -// 'updated_id' => $item->id, -// 'data' => $data, -// ], 200); + return redirect()->route('generic.index', ['model' => $model]) ->with('success', Str::singular($model) . ' updated successfully.'); } catch (\Throwable $e) { \Log::error('UPDATE - DB error: ' . $e->getMessage(), ['exception' => $e]); -// return response()->json([ -// 'status' => 'error', -// 'message' => $e->getMessage(), -// 'data' => $data, -// ], 500); + return redirect()->back() ->withErrors(['error' => 'Failed to update ' . $model . ': ' . $e->getMessage()]) @@ -184,5 +169,4 @@ } } - public function destroy(string $model, string $id) Index: app/Http/Controllers/OrderController.php =================================================================== --- app/Http/Controllers/OrderController.php (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ app/Http/Controllers/OrderController.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -8,4 +8,5 @@ use App\Models\Transport; use App\Models\Batch; +use Barryvdh\DomPDF\Facade\Pdf; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -15,5 +16,5 @@ { /** - * Display a listing of the resource. + * Display a listing of orders - This is called from GenericModelController */ public function index(Request $request) @@ -21,5 +22,4 @@ $model = 'Order'; - // Get paginated orders with all necessary relationships $query = Order::with([ 'buyer', @@ -32,5 +32,4 @@ ]); - // Search functionality if ($request->has('search') && $request->search) { $search = $request->search; @@ -47,22 +46,17 @@ } - // Sorting $sortBy = $request->get('sort_by', 'date'); $sortDirection = $request->get('sort_direction', 'desc'); $query->orderBy($sortBy, $sortDirection); - // Pagination $perPage = $request->get('per_page', 10); $items = $query->paginate($perPage); - // Foreign key map for the frontend $fkMap = [ 'buyer_id' => 'clients', 'receiver_id' => 'clients', 'transport_id' => 'transports', - 'payment_id' => 'payments', ]; - // Related options for form dropdowns $relatedOptions = [ 'buyer_id' => Client::select('id', 'name')->get()->toArray(), @@ -71,23 +65,16 @@ ]; - // If the request is for the OrderPage (custom view) - if ($request->wantsJson() || $request->header('X-Inertia')) { - return Inertia::render('OrderPage', [ - 'model' => $model, - 'items' => $items, - 'filters' => [ - 'search' => $request->search, - 'sort_by' => $sortBy, - 'sort_direction' => $sortDirection, - 'per_page' => $perPage, - 'open_id' => $request->open_id, - ], - 'fkMap' => $fkMap, - 'relatedOptions' => $relatedOptions, - ]); - } - - // Fallback to generic model page - return Inertia::render('GenericModelPage', [ + // Get available batches for the create form + $availableBatches = Batch::with('product')->get()->map(function($batch) { + return [ + 'id' => $batch->id, + 'batch_code' => $batch->batch_code, + 'product_name' => $batch->product->name ?? 'N/A', + 'units_per_batch' => $batch->units_per_batch, + 'net_weight' => $batch->net_weight, + ]; + }); + + return Inertia::render('OrderPage', [ 'model' => $model, 'items' => $items, @@ -101,17 +88,10 @@ 'fkMap' => $fkMap, 'relatedOptions' => $relatedOptions, + 'availableBatches' => $availableBatches, ]); } /** - * Show the form for creating a new resource. - */ - public function create() - { - // - } - - /** - * Store a newly created resource in storage. + * Store a newly created order */ public function store(Request $request) @@ -124,6 +104,6 @@ $order = Order::create($validated); - // If batches are provided, attach them to the order - if ($request->has('batches')) { + // Add batches if provided + if ($request->has('batches') && is_array($request->batches)) { foreach ($request->batches as $batchData) { $order->batches()->attach($batchData['batch_id'], [ @@ -135,7 +115,28 @@ } + // Create payment if requested + if ($request->boolean('create_payment')) { + $totalAmount = 0; + if ($request->has('batches') && is_array($request->batches)) { + foreach ($request->batches as $batchData) { + $totalAmount += $batchData['quantity'] * $batchData['price_per_unit']; + } + } + + Payment::create([ + 'order_id' => $order->id, + 'amount' => $totalAmount, + 'currency' => $request->get('payment_currency', 'USD'), + 'due_date' => $request->get('payment_due_date', now()->addDays(30)), + 'exchange_rate' => $request->get('payment_exchange_rate', 1.0), + 'payment_date' => null, + 'payment_method' => $request->get('payment_method', 'bank_transfer'), + 'payment_status' => 'pending' + ]); + } + DB::commit(); - return redirect()->route('orders.index') + return redirect()->route('generic.index', ['model' => 'orders']) ->with('success', 'Order created successfully.'); @@ -147,35 +148,5 @@ /** - * Display the specified resource. - */ - public function show(Order $order) - { - $order->load([ - 'buyer', - 'receiver', - 'transport', - 'payment', - 'invoice', - 'packingList', - 'batches' => function($query) { - $query->with('product'); - } - ]); - - return Inertia::render('OrderShow', [ - 'order' => $order, - ]); - } - - /** - * Show the form for editing the specified resource. - */ - public function edit(Order $order) - { - // - } - - /** - * Update the specified resource in storage. + * Update an existing order */ public function update(Request $request, Order $order) @@ -202,5 +173,5 @@ DB::commit(); - return redirect()->route('orders.index') + return redirect()->route('generic.index', ['model' => 'orders']) ->with('success', 'Order updated successfully.'); @@ -212,5 +183,5 @@ /** - * Remove the specified resource from storage. + * Delete an order */ public function destroy(Order $order) @@ -219,13 +190,10 @@ DB::beginTransaction(); - // Delete related records first $order->batches()->detach(); - - // Delete the order $order->delete(); DB::commit(); - return redirect()->route('orders.index') + return redirect()->route('generic.index', ['model' => 'orders']) ->with('success', 'Order deleted successfully.'); @@ -237,138 +205,181 @@ /** - * Generate invoice for an order + * Generate and download invoice PDF for an order */ public function generateInvoice(Order $order) { try { - DB::beginTransaction(); - - // Check if invoice already exists - if ($order->invoice) { - return back()->with('error', 'Invoice already exists for this order.'); - } - - // Calculate total amount from batches - $totalAmount = $order->batches->sum(function($batch) { + // Load all necessary relationships + $order->load([ + 'buyer', + 'receiver', + 'transport', + 'payment', + 'batches.product' + ]); + + // Calculate totals + $subtotal = $order->batches->sum(function($batch) { return $batch->pivot->quantity * $batch->pivot->price_per_unit; }); - // Create payment record if it doesn't exist - if (!$order->payment) { - $payment = Payment::create([ - 'order_id' => $order->id, - 'amount' => $totalAmount, - 'currency' => 'USD', // Default currency - 'due_date' => now()->addDays(30), - 'exchange_rate' => 1.0, - 'payment_date' => null, - 'payment_method' => 'bank_transfer', - 'payment_status' => 'pending' - ]); - - // Update order with payment_id - $order->update(['payment_id' => $payment->id]); - } - - DB::commit(); - - return back()->with('success', 'Invoice generated successfully.'); - - } catch (\Exception $e) { - DB::rollBack(); - return back()->with('error', 'Failed to generate invoice: ' . $e->getMessage()); - } - } - - /** - * Generate packing list for an order + $taxRate = 18; // 18% tax - adjust as needed + $taxAmount = $subtotal * ($taxRate / 100); + $totalAmount = $subtotal + $taxAmount; + + // Generate invoice number + $invoiceNumber = 'INV-' . date('Y') . '-' . str_pad($order->id, 6, '0', STR_PAD_LEFT); + + // Prepare data for PDF + $data = [ + 'order' => $order, + 'invoiceNumber' => $invoiceNumber, + 'invoiceDate' => now()->format('Y-m-d'), + 'dueDate' => now()->addDays(30)->format('Y-m-d'), + 'subtotal' => number_format($subtotal, 2), + 'taxRate' => $taxRate, + 'taxAmount' => number_format($taxAmount, 2), + 'totalAmount' => number_format($totalAmount, 2), + 'currency' => $order->payment->currency ?? 'USD', + ]; + + // Generate PDF with proper headers for download + $pdf = Pdf::loadView('pdfs.invoice', $data) + ->setPaper('a4', 'portrait') + ->setOption('margin-top', 10) + ->setOption('margin-bottom', 10) + ->setOption('margin-left', 10) + ->setOption('margin-right', 10); + + // Use download method with proper filename + return $pdf->download("invoice-{$invoiceNumber}.pdf"); + + } catch (\Exception $e) { + // If there's an error, redirect back with error message + return redirect()->back()->with('error', 'Failed to generate invoice: ' . $e->getMessage()); + } + } + + /** + * Generate and download packing list PDF for an order */ public function generatePackingList(Order $order) { try { - DB::beginTransaction(); - - // Check if packing list already exists - if ($order->packingList) { - return back()->with('error', 'Packing list already exists for this order.'); - } - - DB::commit(); - - return back()->with('success', 'Packing list generated successfully.'); - - } catch (\Exception $e) { - DB::rollBack(); - return back()->with('error', 'Failed to generate packing list: ' . $e->getMessage()); - } - } - - /** - * Add batch to order - */ - public function addBatch(Request $request, Order $order) - { - $validated = $request->validate([ - 'batch_id' => 'required|exists:batches,id', - 'quantity' => 'required|integer|min:1', - 'price_per_unit' => 'required|numeric|min:0', - ]); - try { - $order->batches()->attach($validated['batch_id'], [ - 'quantity' => $validated['quantity'], - 'price_per_unit' => $validated['price_per_unit'], - 'total_price' => $validated['quantity'] * $validated['price_per_unit'] + // Load all necessary relationships + $order->load([ + 'buyer', + 'receiver', + 'transport', + 'batches.product' ]); - return back()->with('success', 'Batch added to order successfully.'); - - } catch (\Exception $e) { - return back()->with('error', 'Failed to add batch to order: ' . $e->getMessage()); - } - } - - /** - * Remove batch from order - */ - public function removeBatch(Order $order, Batch $batch) - { - try { - $order->batches()->detach($batch->id); - - return back()->with('success', 'Batch removed from order successfully.'); - - } catch (\Exception $e) { - return back()->with('error', 'Failed to remove batch from order: ' . $e->getMessage()); - } - } - - /** - * Get available batches for order - */ - public function getAvailableBatches(Order $order) - { - $availableBatches = Batch::whereDoesntHave('orders', function($query) use ($order) { - $query->where('order_id', $order->id); - })->with('product')->get(); - - return response()->json($availableBatches); - } - - /** - * Update order status - */ - public function updateStatus(Request $request, Order $order) - { - $validated = $request->validate([ - 'status' => 'required|in:pending,confirmed,processing,shipped,delivered,cancelled' - ]); - - try { - $order->update(['status' => $validated['status']]); - - return back()->with('success', 'Order status updated successfully.'); - - } catch (\Exception $e) { - return back()->with('error', 'Failed to update order status: ' . $e->getMessage()); + // Calculate total weight and units + $totalNetWeight = $order->batches->sum('net_weight'); + $totalGrossWeight = $order->batches->sum('gross_weight'); + $totalUnits = $order->batches->sum(function($batch) { + return $batch->pivot->quantity; + }); + $totalPackages = $order->batches->count(); + + // Generate packing list number + $packingListNumber = 'PL-' . date('Y') . '-' . str_pad($order->id, 6, '0', STR_PAD_LEFT); + + // Prepare data for PDF + $data = [ + 'order' => $order, + 'packingListNumber' => $packingListNumber, + 'packingDate' => now()->format('Y-m-d'), + 'totalNetWeight' => number_format($totalNetWeight, 2), + 'totalGrossWeight' => number_format($totalGrossWeight, 2), + 'totalUnits' => $totalUnits, + 'totalPackages' => $totalPackages, + ]; + + // Generate PDF + $pdf = Pdf::loadView('pdfs.packing-list', $data) + ->setPaper('a4', 'portrait') + ->setOption('margin-top', 10) + ->setOption('margin-bottom', 10) + ->setOption('margin-left', 10) + ->setOption('margin-right', 10); + + // Download PDF + return $pdf->download("packing-list-{$packingListNumber}.pdf"); + + } catch (\Exception $e) { + return redirect()->back()->with('error', 'Failed to generate packing list: ' . $e->getMessage()); + } + } + + /** + * Preview invoice in browser (optional) + */ + public function previewInvoice(Order $order) + { + try { + $order->load(['buyer', 'receiver', 'transport', 'payment', 'batches.product']); + + $subtotal = $order->batches->sum(function($batch) { + return $batch->pivot->quantity * $batch->pivot->price_per_unit; + }); + + $taxRate = 18; + $taxAmount = $subtotal * ($taxRate / 100); + $totalAmount = $subtotal + $taxAmount; + + $invoiceNumber = 'INV-' . date('Y') . '-' . str_pad($order->id, 6, '0', STR_PAD_LEFT); + + $data = [ + 'order' => $order, + 'invoiceNumber' => $invoiceNumber, + 'invoiceDate' => now()->format('Y-m-d'), + 'dueDate' => now()->addDays(30)->format('Y-m-d'), + 'subtotal' => number_format($subtotal, 2), + 'taxRate' => $taxRate, + 'taxAmount' => number_format($taxAmount, 2), + 'totalAmount' => number_format($totalAmount, 2), + 'currency' => $order->payment->currency ?? 'USD', + ]; + + $pdf = Pdf::loadView('pdfs.invoice', $data); + return $pdf->stream("invoice-{$invoiceNumber}.pdf"); + + } catch (\Exception $e) { + return redirect()->back()->with('error', 'Failed to preview invoice: ' . $e->getMessage()); + } + } + + /** + * Preview packing list in browser (optional) + */ + public function previewPackingList(Order $order) + { + try { + $order->load(['buyer', 'receiver', 'transport', 'batches.product']); + + $totalNetWeight = $order->batches->sum('net_weight'); + $totalGrossWeight = $order->batches->sum('gross_weight'); + $totalUnits = $order->batches->sum(function($batch) { + return $batch->pivot->quantity; + }); + + $packingListNumber = 'PL-' . date('Y') . '-' . str_pad($order->id, 6, '0', STR_PAD_LEFT); + + $data = [ + 'order' => $order, + 'packingListNumber' => $packingListNumber, + 'packingDate' => now()->format('Y-m-d'), + 'totalNetWeight' => number_format($totalNetWeight, 2), + 'totalGrossWeight' => number_format($totalGrossWeight, 2), + 'totalUnits' => $totalUnits, + 'totalPackages' => $order->batches->count(), + ]; + + $pdf = Pdf::loadView('pdfs.packing-list', $data); + return $pdf->stream("packing-list-{$packingListNumber}.pdf"); + + } catch (\Exception $e) { + return redirect()->back()->with('error', 'Failed to preview packing list: ' . $e->getMessage()); } } Index: app/Models/Order.php =================================================================== --- app/Models/Order.php (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ app/Models/Order.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -23,8 +23,7 @@ 'receiver_id', 'transport_id', - 'payment_id', + // Remove payment_id from here ]; - // Add this to ensure status is never null protected $attributes = [ 'status' => 'pending', @@ -45,5 +44,4 @@ 'receiver_id' => 'required|string|exists:clients,id', 'transport_id' => 'nullable|string|exists:transports,id', - 'payment_id' => 'nullable|string|exists:payments,id', ]; } @@ -59,7 +57,8 @@ } - public function payment(): BelongsTo + // Simple one-to-one relationship + public function payment(): HasOne { - return $this->belongsTo(Payment::class, 'payment_id'); + return $this->hasOne(Payment::class, 'order_id'); } Index: app/Models/Payment.php =================================================================== --- app/Models/Payment.php (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ app/Models/Payment.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -10,9 +10,10 @@ { use HasUuids; + protected $primaryKey = 'id'; public $incrementing = false; protected $keyType = 'string'; protected $fillable = [ - 'order_id', + 'order_id', // This is the only foreign key we need 'amount', 'currency', @@ -32,10 +33,12 @@ 'due_date' => 'required|date|after_or_equal:today', 'exchange_rate' => 'required|numeric|min:0.0001|max:9999.9999', - 'payment_date' => 'required|date|before_or_equal:today', + 'payment_date' => 'nullable|date|before_or_equal:today', 'payment_method' => 'required|string|in:bank_transfer,credit_card,cash,check,wire_transfer', 'payment_status' => 'required|string|in:pending,paid,failed,refunded,cancelled', ]; } - public function order(): BelongsTo { + + public function order(): BelongsTo + { return $this->belongsTo(Order::class, 'order_id'); } Index: composer.json =================================================================== --- composer.json (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ composer.json (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -8,8 +8,10 @@ "require": { "php": "^8.2", + "barryvdh/laravel-dompdf": "^3.1", "inertiajs/inertia-laravel": "^2.0", "laravel/framework": "^12.0", "laravel/sanctum": "^4.0", "laravel/tinker": "^2.10.1", + "symfony/polyfill-iconv": "^1.33", "tightenco/ziggy": "^2.0" }, Index: resources/js/Pages/OrderPage.vue =================================================================== --- resources/js/Pages/OrderPage.vue (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ resources/js/Pages/OrderPage.vue (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -19,10 +19,30 @@ const generateInvoice = (order: any) => { if (confirm('Generate invoice for this order?')) { + // Use window.location for direct download + window.location.href = `/orders/${order.id}/generate-invoice`; + } +}; + +const generatePackingList = (order: any) => { + if (confirm('Generate packing list for this order?')) { + window.location.href = `/orders/${order.id}/generate-packing-list`; + } +}; +const viewInvoice = (order: any) => { + window.open(`/orders/${order.id}/preview-invoice`, '_blank'); +}; + +const viewPackingList = (order: any) => { + window.open(`/orders/${order.id}/preview-packing-list`, '_blank'); +}; + +// Payment management +const createPayment = (order: any) => { + if (confirm('Create payment for this order?')) { router.post( - `/orders/${order.id}/generate-invoice`, + `/orders/${order.id}/create-payment`, {}, { onSuccess: () => { - // Refresh the page to show the new invoice router.reload(); }, @@ -32,29 +52,15 @@ }; -const generatePackingList = (order: any) => { - if (confirm('Generate packing list for this order?')) { - router.post( - `/orders/${order.id}/generate-packing-list`, - {}, - { - onSuccess: () => { - // Refresh the page to show the new packing list - router.reload(); - }, - }, - ); - } -}; - -const viewInvoice = (order: any) => { - if (order.invoice) { - router.get(`/invoices?open_id=${order.invoice.id}`); - } -}; - -const viewPackingList = (order: any) => { - if (order.packing_list) { - router.get(`/packing-lists?open_id=${order.packing_list.id}`); - } +const editPayment = (order: any) => { + // Check both payment relationships + const payment = order.payment || order.payments?.[0]; + if (payment) { + router.get(`/payments?open_id=${payment.id}`); + } +}; + +// Helper to get payment from order (checking both relationships) +const getOrderPayment = (order: any) => { + return order.payment || order.payments?.[0] || null; }; @@ -71,9 +77,45 @@ return 'default'; case 'delivered': - return 'success'; + return 'default'; case 'cancelled': return 'destructive'; default: return 'secondary'; + } +}; + +// Format payment status with colors +const getPaymentStatusBadgeVariant = (status: string) => { + switch (status) { + case 'paid': + return 'default'; + case 'pending': + return 'secondary'; + case 'failed': + return 'destructive'; + case 'refunded': + return 'outline'; + case 'cancelled': + return 'destructive'; + default: + return 'secondary'; + } +}; + +// Additional class mapping for visual styling +const getPaymentStatusBadgeClass = (status: string) => { + switch (status) { + case 'paid': + return 'bg-green-100 text-green-800 border-green-200'; + case 'pending': + return 'bg-yellow-100 text-yellow-800 border-yellow-200'; + case 'failed': + return 'bg-red-100 text-red-800 border-red-200'; + case 'refunded': + return 'bg-blue-100 text-blue-800 border-blue-200'; + case 'cancelled': + return 'bg-gray-100 text-gray-800 border-gray-200'; + default: + return ''; } }; @@ -267,26 +309,43 @@
-
- Payment Information -
-
+
+
+ Payment Information +
+
+ + +
+
+
Status: - {{ item.payment.payment_status }} + {{ getOrderPayment(item).payment_status }}
Amount: ${{ - item.payment.amount - }} + getOrderPayment(item).amount + }} {{ getOrderPayment(item).currency }}
@@ -294,5 +353,5 @@ {{ new Date( - item.payment.due_date, + getOrderPayment(item).due_date, ).toLocaleDateString() }} @@ -301,15 +360,23 @@ Payment Date: {{ - item.payment.payment_date + getOrderPayment(item).payment_date ? new Date( - item.payment.payment_date, - ).toLocaleDateString() + getOrderPayment(item).payment_date, + ).toLocaleDateString() : 'Not paid' }}
+
+ Payment Method: + {{ getOrderPayment(item).payment_method }} +
+
+ Exchange Rate: + {{ getOrderPayment(item).exchange_rate }} +
- No payment information available. + No payment information available. Click "Create Payment" to add payment details.
@@ -388,3 +455,54 @@ border-radius: 0.25rem; } + +/* Custom badge styles for better visual indication */ +:deep(.bg-green-100) { + background-color: #dcfce7; +} +:deep(.text-green-800) { + color: #166534; +} +:deep(.border-green-200) { + border-color: #bbf7d0; +} + +:deep(.bg-yellow-100) { + background-color: #fef9c3; +} +:deep(.text-yellow-800) { + color: #854d0e; +} +:deep(.border-yellow-200) { + border-color: #fef08a; +} + +:deep(.bg-red-100) { + background-color: #fee2e2; +} +:deep(.text-red-800) { + color: #991b1b; +} +:deep(.border-red-200) { + border-color: #fecaca; +} + +:deep(.bg-blue-100) { + background-color: #dbeafe; +} +:deep(.text-blue-800) { + color: #1e40af; +} +:deep(.border-blue-200) { + border-color: #bfdbfe; +} + +:deep(.bg-gray-100) { + background-color: #f3f4f6; +} +:deep(.text-gray-800) { + color: #374151; +} +:deep(.border-gray-200) { + border-color: #e5e7eb; +} Index: resources/views/pdfs/invoice.blade.php =================================================================== --- resources/views/pdfs/invoice.blade.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) +++ resources/views/pdfs/invoice.blade.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -0,0 +1,280 @@ + + + + + Invoice {{ $invoiceNumber }} + + + +
+
+
+
+

Your Company Name

+

123 Business Street

+

Skopje, North Macedonia

+

Email: info@company.com

+

Phone: +389 XX XXX XXX

+
+
+
+

INVOICE

+
+

Invoice #: {{ $invoiceNumber }}

+

Date: {{ $invoiceDate }}

+

Due Date: {{ $dueDate }}

+

Order ID: {{ $order->id }}

+
+
+
+
+ +
+
+
Bill To
+
+

{{ $order->buyer->name }}

+

{{ $order->buyer->address ?? 'N/A' }}

+

{{ $order->buyer->city ?? '' }}, {{ $order->buyer->country ?? '' }}

+

Email: {{ $order->buyer->email ?? 'N/A' }}

+

Phone: {{ $order->buyer->phone ?? 'N/A' }}

+
+
+
+
Ship To
+
+

{{ $order->receiver->name }}

+

{{ $order->receiver->address ?? 'N/A' }}

+

{{ $order->receiver->city ?? '' }}, {{ $order->receiver->country ?? '' }}

+

Email: {{ $order->receiver->email ?? 'N/A' }}

+

Phone: {{ $order->receiver->phone ?? 'N/A' }}

+
+
+
+ +
+
Order Details
+ + + + + + + + + + + + + @foreach($order->batches as $index => $batch) + + + + + + + + + @endforeach + +
#Batch CodeProductQuantityUnit PriceTotal
{{ $index + 1 }}{{ $batch->batch_code }}{{ $batch->product->name ?? 'N/A' }}{{ $batch->pivot->quantity }}{{ $currency }} {{ number_format($batch->pivot->price_per_unit, 2) }}{{ $currency }} {{ number_format($batch->pivot->total_price, 2) }}
+
+ +
+
+
Subtotal:
+
{{ $currency }} {{ $subtotal }}
+
+
+
Tax ({{ $taxRate }}%):
+
{{ $currency }} {{ $taxAmount }}
+
+
+
Total Amount:
+
{{ $currency }} {{ $totalAmount }}
+
+
+ +
+ @if($order->payment) +
Payment Information
+
+

Status: + + {{ strtoupper($order->payment->payment_status) }} + +

+

Payment Method: {{ ucwords(str_replace('_', ' ', $order->payment->payment_method)) }}

+

Due Date: {{ \Carbon\Carbon::parse($order->payment->due_date)->format('Y-m-d') }}

+ @if($order->payment->payment_date) +

Payment Date: {{ \Carbon\Carbon::parse($order->payment->payment_date)->format('Y-m-d') }}

+ @endif +
+ @endif + +
Payment Instructions
+

Please make payment to:

+

Bank Name: Your Bank Name

+

Account Number: XXXX-XXXX-XXXX

+

SWIFT/BIC: XXXXXXXX

+

Reference: {{ $invoiceNumber }}

+
+ +
+

Thank you for your business!

+

This is a computer-generated invoice. For any queries, please contact us at info@company.com

+
+ + Index: resources/views/pdfs/packing-list.blade.php =================================================================== --- resources/views/pdfs/packing-list.blade.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) +++ resources/views/pdfs/packing-list.blade.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -0,0 +1,332 @@ + + + + + Packing List {{ $packingListNumber }} + + + +
+
+
+
+

Your Company Name

+

123 Business Street

+

Skopje, North Macedonia

+

Email: info@company.com

+

Phone: +389 XX XXX XXX

+
+
+
+

PACKING LIST

+
+

Packing List #: {{ $packingListNumber }}

+

Date: {{ $packingDate }}

+

Order ID: {{ $order->id }}

+

Order Date: {{ $order->date->format('Y-m-d') }}

+
+
+
+
+ +
+
+
Shipper (From)
+
+

{{ $order->buyer->name }}

+

{{ $order->buyer->address ?? 'N/A' }}

+

{{ $order->buyer->city ?? '' }}, {{ $order->buyer->country ?? '' }}

+

Contact: {{ $order->buyer->phone ?? 'N/A' }}

+

Email: {{ $order->buyer->email ?? 'N/A' }}

+
+
+
+
Consignee (To)
+
+

{{ $order->receiver->name }}

+

{{ $order->receiver->address ?? 'N/A' }}

+

{{ $order->receiver->city ?? '' }}, {{ $order->receiver->country ?? '' }}

+

Contact: {{ $order->receiver->phone ?? 'N/A' }}

+

Email: {{ $order->receiver->email ?? 'N/A' }}

+
+
+
+ +@if($order->transport) +
+
Transport Information
+
+

Transport Company: {{ $order->transport->name }}

+ @if(isset($order->transport->vehicle_type)) +

Vehicle Type: {{ $order->transport->vehicle_type }}

+ @endif + @if(isset($order->transport->driver)) +

Driver: {{ $order->transport->driver }}

+ @endif + @if(isset($order->transport->contact)) +

Contact: {{ $order->transport->contact }}

+ @endif +
+
+@endif + +
+
Package Contents
+ + + + + + + + + + + + + @foreach($order->batches as $index => $batch) + + + + + + + + + @endforeach + + + + + + + + + +
Package #Batch CodeProduct DescriptionQuantityNet Weight (kg)Gross Weight (kg)
{{ $index + 1 }} + {{ $batch->batch_code }} +
+ Prod: {{ \Carbon\Carbon::parse($batch->production_date)->format('Y-m-d') }} + | Exp: {{ \Carbon\Carbon::parse($batch->expiration_date)->format('Y-m-d') }} +
+ 		+ {{ $batch->product->name ?? 'N/A' }} + @if(isset($batch->product->description)) +
{{ $batch->product->description }}
+ @endif + 		+ {{ $batch->pivot->quantity }} units + {{ number_format($batch->net_weight, 2) }}{{ number_format($batch->gross_weight, 2) }}
TOTALS:{{ $totalUnits }} units{{ $totalNetWeight }} kg{{ $totalGrossWeight }} kg
+
+ +
+
+
+
Total Packages
+
{{ $totalPackages }}
+
+
+
Total Units
+
{{ $totalUnits }}
+
+
+
Net Weight
+
{{ $totalNetWeight }} kg
+
+
+
Gross Weight
+
{{ $totalGrossWeight }} kg
+
+
+
+ +
+ ⚠ Handling Instructions: + +
+ +
+
+
+

Prepared By:

+

Signature

+

Date: {{ $packingDate }}

+
+
+

Received By:

+

Signature

+

Date: _______________

+
+
+
+ +
+

This packing list is for reference purposes only and does not serve as a commercial invoice.

+

For any discrepancies or questions, please contact us immediately at info@company.com

+
+ + Index: routes/web.php =================================================================== --- routes/web.php (revision 99b0ca3cb6693d65d404ff94fba81fdfca07f8ee) +++ routes/web.php (revision 715ed4b68b57bdef5a2503bfc72c78f785137c05) @@ -1,9 +1,9 @@ name('logout'); + // Users routes with admin middleware Route::prefix('users')->middleware('admin')->group(function () { Route::get('/', function (Request $request) { return app(GenericModelController::class)->index($request, 'users'); - })->name('generic.index'); + })->name('users.index'); Route::post('/', function (Request $request) { return app(GenericModelController::class)->store($request, 'users'); - })->name('generic.store'); + })->name('users.store'); Route::put('/{id}', function (Request $request, $id) { return app(GenericModelController::class)->update($request, 'users', $id); - })->name('generic.update'); + })->name('users.update'); Route::delete('/{id}', function (Request $request, $id) { return app(GenericModelController::class)->destroy('users', $id); - })->name('generic.destroy'); + })->name('users.destroy'); }); - Route::prefix('{model}') - ->group(function () { + // Order-specific routes (MUST come BEFORE generic routes) + Route::prefix('orders')->group(function () { + // Batch operations for select options (no order parameter) - MUST BE FIRST + Route::get('batches/select-options', [OrderController::class, 'getBatchesForSelect']) + ->name('orders.batches.select-options'); + + // CRUD operations for orders + Route::get('/', [OrderController::class, 'index'])->name('orders.index'); + Route::post('/', [OrderController::class, 'store'])->name('orders.store'); + + // Order-specific operations (with order parameter) + Route::post('{order}/create-payment', [OrderController::class, 'createPayment']) + ->name('orders.create-payment'); + + Route::post('{order}/add-batch', [OrderController::class, 'addBatch']) + ->name('orders.add-batch'); + + Route::delete('{order}/remove-batch/{batch}', [OrderController::class, 'removeBatch']) + ->name('orders.remove-batch'); + + Route::get('{order}/available-batches', [OrderController::class, 'getAvailableBatches']) + ->name('orders.available-batches'); + + // PDF generation routes + Route::get('{order}/generate-invoice', [OrderController::class, 'generateInvoice']) + ->name('orders.generate-invoice'); + + Route::get('{order}/generate-packing-list', [OrderController::class, 'generatePackingList']) + ->name('orders.generate-packing-list'); + + // Preview routes (GET) + Route::get('{order}/preview-invoice', [OrderController::class, 'previewInvoice']) + ->name('orders.preview-invoice'); + + Route::get('{order}/preview-packing-list', [OrderController::class, 'previewPackingList']) + ->name('orders.preview-packing-list'); + // Update and Delete (must come after specific routes to avoid conflicts) + Route::put('{order}', [OrderController::class, 'update'])->name('orders.update'); + Route::delete('{order}', [OrderController::class, 'destroy'])->name('orders.destroy'); + }); + + // Generic model routes (MUST come LAST as catch-all) + Route::prefix('{model}')->group(function () { Route::get('/', [GenericModelController::class, 'index'])->name('generic.index'); Route::post('/', [GenericModelController::class, 'store'])->name('generic.store');