Index: app/Http/Controllers/GenericModelController.php =================================================================== --- app/Http/Controllers/GenericModelController.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Http/Controllers/GenericModelController.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -6,4 +6,5 @@ use Inertia\Inertia; use Illuminate\Support\Str; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class GenericModelController extends Controller @@ -22,4 +23,10 @@ $modelInstance = new $modelClass(); $fillable = $modelInstance->getFillable(); + + // Eager load related models for foreign keys + $relationships = $this->getRelationships($modelInstance); + if (!empty($relationships)) { + $query->with($relationships); + } // Add search functionality @@ -50,6 +57,8 @@ 'sort_by' => $sortBy, 'sort_direction' => $sortDirection, - 'per_page' => $request->get('per_page', 10) - ] + 'per_page' => $request->get('per_page', 10), + 'open_id' => $request->get('open_id') // Pass the open_id to the frontend + ], + 'fkMap' => $this->getForeignKeyMap($modelInstance) ]); } @@ -125,3 +134,54 @@ return null; } + + /** + * Get relationships for eager loading based on foreign keys + */ + protected function getRelationships($modelInstance): array + { + $relationships = []; + $fillable = $modelInstance->getFillable(); + + foreach ($fillable as $field) { + if (Str::endsWith($field, '_id')) { + $relationName = Str::beforeLast($field, '_id'); + + // Check if the relationship method exists + if (method_exists($modelInstance, $relationName)) { + try { + $relation = $modelInstance->$relationName(); + if ($relation instanceof BelongsTo) { + $relationships[] = $relationName; + } + } catch (\Exception $e) { + // Skip if relationship doesn't exist or has issues + continue; + } + } + } + } + + return $relationships; + } + + /** + * Generate foreign key mapping for the frontend + */ + protected function getForeignKeyMap($modelInstance): array + { + $fkMap = []; + $fillable = $modelInstance->getFillable(); + + foreach ($fillable as $field) { + if (Str::endsWith($field, '_id')) { + $relationName = Str::beforeLast($field, '_id'); + + // Map to plural table name (following Laravel conventions) + $tableName = Str::plural($relationName); + $fkMap[$field] = $tableName; + } + } + + return $fkMap; + } } Index: app/Models/Batch.php =================================================================== --- app/Models/Batch.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Batch.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -27,4 +27,17 @@ ]; + public static function getValidationRules($id = null): array + { + return [ + 'product_id' => 'required|string|exists:products,id', + 'batch_code' => 'required|string|max:255|unique:batches,batch_code,' . $id, + 'production_date' => 'required|date|before_or_equal:today', + 'expiration_date' => 'required|date|after:production_date', + 'net_weight' => 'required|numeric|min:0|max:999999.99', + 'gross_weight' => 'required|numeric|min:0|max:999999.99|gte:net_weight', + 'units_per_batch' => 'required|integer|min:1|max:1000000', + ]; + } + public function product(): BelongsTo { Index: app/Models/Client.php =================================================================== --- app/Models/Client.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Client.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -17,5 +17,5 @@ protected $fillable = [ - 'client_name', + 'name', 'country', 'registration_number', @@ -30,12 +30,12 @@ { return [ - 'client_name' => 'required|string|max:255', + 'name' => 'required|string|max:255|unique:clients,name,' . $id, 'country' => 'required|string|max:255', - 'registration_number' => 'nullable|string|max:255', - 'tax_code' => 'nullable|string|max:255', + 'registration_number' => 'nullable|string|max:255|unique:clients,registration_number,' . $id, + 'tax_code' => 'nullable|string|max:255|unique:clients,tax_code,' . $id, 'contact_person' => 'nullable|string|max:255', - 'phone_number' => 'nullable|string|max:255', - 'billing_address' => 'nullable|string', - 'shipping_address' => 'nullable|string', + 'phone_number' => 'nullable|string|max:255|regex:/^[\+]?[0-9\s\-\(\)]+$/', + 'billing_address' => 'nullable|string|max:1000', + 'shipping_address' => 'nullable|string|max:1000', ]; } Index: app/Models/Invoice.php =================================================================== --- app/Models/Invoice.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Invoice.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -25,4 +25,14 @@ ]; + public static function getValidationRules($id = null): array + { + return [ + 'invoice_date' => 'required|date|before_or_equal:today', + 'status' => 'required|string|in:draft,sent,paid,overdue,cancelled', + 'total_amount' => 'required|numeric|min:0|max:9999999.99', + 'order_id' => 'required|string|exists:orders,id|unique:invoices,order_id,' . $id, + ]; + } + public function order(): BelongsTo { Index: app/Models/Order.php =================================================================== --- app/Models/Order.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Order.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -26,4 +26,16 @@ 'transport_id', ]; + + public static function getValidationRules($id = null): array + { + return [ + 'date' => 'required|date|before_or_equal:today', + 'status' => 'required|string|in:pending,confirmed,processing,shipped,delivered,cancelled', + 'estimated_delivery_date' => 'required|date|after_or_equal:date', + 'buyer_id' => 'required|string|exists:clients,id', + 'receiver_id' => 'required|string|exists:clients,id', + 'transport_id' => 'nullable|string|exists:transports,id', + ]; + } public function buyer(): BelongsTo Index: app/Models/PackingList.php =================================================================== --- app/Models/PackingList.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/PackingList.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -22,4 +22,13 @@ ]; + public static function getValidationRules($id = null): array + { + return [ + 'order_id' => 'required|string|exists:orders,id|unique:packing_lists,order_id,' . $id, + 'packing_list_date' => 'required|date|before_or_equal:today', + 'status' => 'required|string|in:draft,prepared,packed,shipped', + ]; + } + public function order(): BelongsTo { Index: app/Models/Payment.php =================================================================== --- app/Models/Payment.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Payment.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -23,4 +23,17 @@ 'payment_status' ]; + + public static function getValidationRules($id = null): array + { + return [ + 'amount' => 'required|numeric|min:0|max:9999999.99', + 'currency' => 'required|string|size:3|in:USD,EUR,MKD,GBP,JPY,CHF,CAD,AUD', + 'due_date' => 'required|date|after_or_equal:today', + 'exchange_rate' => 'nullable|numeric|min:0.0001|max:9999.9999', + '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 { return $this->belongsTo(Order::class, 'order_id'); Index: app/Models/Producer.php =================================================================== --- app/Models/Producer.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Producer.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -24,4 +24,15 @@ ]; + public static function getValidationRules($id = null): array + { + return [ + 'name' => 'required|string|max:255|unique:producers,name,' . $id, + 'address' => 'required|string|max:500', + 'country' => 'required|string|max:255', + 'phone_number' => 'nullable|string|max:255|regex:/^[\+]?[0-9\s\-\(\)]+$/', + 'email' => 'nullable|email|max:255|unique:producers,email,' . $id, + ]; + } + public function products(): HasMany { Index: app/Models/Product.php =================================================================== --- app/Models/Product.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Product.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -26,4 +26,16 @@ ]; + public static function getValidationRules($id = null): array + { + return [ + 'name' => 'required|string|max:255', + 'description' => 'required|string|max:1000', + 'hs_code' => 'nullable|string|max:20|regex:/^[0-9.]+$/', + 'price' => 'required|numeric|min:0|max:999999.99', + 'producer_id' => 'required|string|exists:producers,id', + 'unit_of_measure' => 'required|string|max:50|in:kg,g,lb,oz,piece,box,carton,pallet,liter,ml,gallon', + ]; + } + protected $casts = [ 'price' => 'float', Index: app/Models/Transport.php =================================================================== --- app/Models/Transport.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/Transport.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -15,5 +15,5 @@ protected $keyType = 'string'; protected $fillable = [ - 'carrier_name', + 'name', 'departure_point', 'arrival_point', @@ -24,4 +24,16 @@ ]; + public static function getValidationRules($id = null): array + { + return [ + 'name' => 'required|string|max:255', + 'departure_point' => 'required|string|max:255', + 'arrival_point' => 'required|string|max:255', + 'estimated_departure_date' => 'required|date|after_or_equal:today', + 'estimated_arrival_date' => 'required|date|after:estimated_departure_date', + 'incoterm' => 'required|string|in:EXW,FCA,CPT,CIP,DAP,DPU,DDP,FAS,FOB,CFR,CIF', + 'insurance_conditions' => 'nullable|string|max:1000', + ]; + } public function order(): HasMany { return $this->hasMany(Order::class, 'transport_id'); Index: app/Models/User.php =================================================================== --- app/Models/User.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ app/Models/User.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -22,4 +22,16 @@ 'is_admin', ]; + + public static function getValidationRules($id = null): array + { + $passwordRule = $id ? 'nullable' : 'required'; + + return [ + 'name' => 'required|string|max:255', + 'email' => 'required|email|max:255|unique:users,email,' . $id, + 'password' => $passwordRule . '|string|min:8|confirmed', + 'is_admin' => 'required|boolean', + ]; + } /** Index: database/factories/ClientFactory.php =================================================================== --- database/factories/ClientFactory.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ database/factories/ClientFactory.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -16,5 +16,5 @@ { return [ - 'client_name' => $this->faker->company(), + 'name' => $this->faker->company(), 'country' => $this->faker->country(), 'registration_number' => $this->faker->regexify('[A-Z]{2}[0-9]{8}'), Index: database/factories/TransportFactory.php =================================================================== --- database/factories/TransportFactory.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ database/factories/TransportFactory.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -19,5 +19,5 @@ return [ - 'carrier_name' => $this->faker->randomElement([ + 'name' => $this->faker->randomElement([ 'DHL Express', 'FedEx', 'UPS', 'Maersk', 'COSCO', 'MSC', 'Emirates SkyCargo', 'Lufthansa Cargo', 'Air France KLM Cargo' Index: database/migrations/2025_03_17_154849_create_transports_table.php =================================================================== --- database/migrations/2025_03_17_154849_create_transports_table.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ database/migrations/2025_03_17_154849_create_transports_table.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -14,5 +14,5 @@ Schema::create('transports', function (Blueprint $table) { $table->uuid('id')->primary(); - $table->string('carrier_name'); + $table->string('name'); $table->string('departure_point'); $table->string('arrival_point'); Index: database/migrations/2025_08_08_131914_create_clients_table.php =================================================================== --- database/migrations/2025_08_08_131914_create_clients_table.php (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ database/migrations/2025_08_08_131914_create_clients_table.php (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -10,5 +10,5 @@ Schema::create('clients', function (Blueprint $table) { $table->uuid('id')->primary(); - $table->string('client_name'); + $table->string('name'); $table->string('country')->nullable(); $table->string('registration_number')->nullable()->index(); Index: docker-compose.yml =================================================================== --- docker-compose.yml (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ docker-compose.yml (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -2,16 +2,16 @@ services: - pharma-export: - build: - context: . - dockerfile: Dockerfile - hostname: pharma-export - container_name: pharma-export - env_file: .env - restart: always - ports: - - 80:80 - depends_on: - - pharma-export-db +# pharma-export: +# build: +# context: . +# dockerfile: Dockerfile +# hostname: pharma-export +# container_name: pharma-export +# env_file: .env +# restart: always +# ports: +# - 80:80 +# depends_on: +# - pharma-export-db pharma-export-db: @@ -21,4 +21,6 @@ env_file: .env restart: always + ports: + - 5432:5432 volumes: - pharma-export-db:/var/lib/postgresql/data Index: resources/js/Layout/App.vue =================================================================== --- resources/js/Layout/App.vue (revision 752245b09588c6cfdca47775fd64b100543df43d) +++ resources/js/Layout/App.vue (revision 70133e4e1aaf27f2d1370b191bdf97cfb1956665) @@ -8,16 +8,24 @@ Package, Package2, + Pill, Search, ShoppingCart, - Users -} from 'lucide-vue-next' -import {computed} from 'vue' -import {route} from 'ziggy-js' -import type {FunctionalComponent, HTMLAttributes, VNodeProps} from 'vue' - -import useTheme from '@/composables/useTheme' -import {Badge} from '@/components/ui/badge' -import {Button} from '@/components/ui/button' -import {Card, CardContent, CardDescription, CardHeader, CardTitle} from '@/components/ui/card' + Truck, + Users, +} from 'lucide-vue-next'; +import { computed } from 'vue'; +import { route } from 'ziggy-js'; +import type { FunctionalComponent, HTMLAttributes, VNodeProps } from 'vue'; + +import useTheme from '@/composables/useTheme'; +import { Badge } from '@/components/ui/badge'; +import { Button } from '@/components/ui/button'; +import { + Card, + CardContent, + CardDescription, + CardHeader, + CardTitle, +} from '@/components/ui/card'; import { DropdownMenu, @@ -26,20 +34,20 @@ DropdownMenuLabel, DropdownMenuSeparator, - DropdownMenuTrigger -} from '@/components/ui/dropdown-menu' -import {Input} from '@/components/ui/input' -import {Toaster} from '@/components/ui/sonner' -import {Sheet, SheetContent, SheetTrigger} from '@/components/ui/sheet' -import {Link, useForm, router, usePage} from '@inertiajs/vue3' -import {Icon} from '@iconify/vue' + DropdownMenuTrigger, +} from '@/components/ui/dropdown-menu'; +import { Input } from '@/components/ui/input'; +import { Toaster } from '@/components/ui/sonner'; +import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet'; +import { Link, useForm, router, usePage } from '@inertiajs/vue3'; +import { Icon } from '@iconify/vue'; // Define a consistent interface for navigation items interface NavItem { - name: string - href: string - icon: FunctionalComponent - current: boolean - routeName: string // Add routeName to the interface - model?: string + name: string; + href: string; + icon: FunctionalComponent; + current: boolean; + routeName: string; // Add routeName to the interface + model?: string; } @@ -47,8 +55,8 @@ const form = useForm({}); const logout = () => { - router.post(route('logout'), {}, {preserveScroll: true}); + router.post(route('logout'), {}, { preserveScroll: true }); }; -const {setTheme} = useTheme() -const page = usePage() +const { setTheme } = useTheme(); +const page = usePage(); // Refactored navigation items as a computed property @@ -59,29 +67,37 @@ icon: Home, current: route().current('dashboard'), - routeName: 'Dashboard' + routeName: 'Dashboard', }, { name: 'Products', - href: route('generic.index', {model: 'products'}), + href: route('generic.index', { model: 'products' }), + icon: Pill, + current: route().current('generic.index', { model: 'products' }), + routeName: 'GenericModelPage', + model: 'product', + }, + { + name: 'Clients', + href: route('generic.index', { model: 'clients' }), + icon: Users, + current: route().current('generic.index', { model: 'clients' }), + routeName: 'GenericModelPage', + model: 'client', + }, + { + name: 'Orders', + href: route('generic.index', { model: 'orders' }), icon: Package, - current: route().current('generic.index', {model: 'products'}), - routeName: 'GenericModelPage', - model: 'product' - }, - { - name: 'Clients', - href: route('generic.index', {model: 'clients'}), - icon: Users, - current: route().current('generic.index', {model: 'clients'}), - routeName: 'GenericModelPage', - model: 'client' - }, - { - name: 'Orders', - href: route('generic.index', {model: 'orders'}), - icon: Users, - current: route().current('generic.index', {model: 'orders'}), - routeName: 'GenericModelPage', - model: 'order' + current: route().current('generic.index', { model: 'orders' }), + routeName: 'GenericModelPage', + model: 'order', + }, + { + name: 'Transports', + href: route('generic.index', { model: 'transports' }), + icon: Truck, + current: route().current('generic.index', { model: 'transports' }), + routeName: 'GenericModelPage', + model: 'transport', }, ]); @@ -89,37 +105,52 @@ // Helper to determine active link classes and remove duplication const getLinkClasses = (item: NavItem): string => { - const baseClasses = 'flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary'; + const baseClasses = + 'flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary'; // Check if both the route name and the 'model' parameter match - const isActive = item.routeName === page.component && item.model === route().params.model; + const isActive = + item.routeName === page.component && + item.model === route().params.model; return isActive ? `${baseClasses} bg-muted text-primary` - : `${baseClasses} text-muted-foreground` + : `${baseClasses} text-muted-foreground`; };