All Kent Code Updated

app/Models/Container.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Container extends Model
+{
+    protected $fillable = [
+        'container_name',
+        'container_number',
+        'container_date',
+        'status',
+        'excel_file',
+    ];
+
+    protected $casts = [
+        'container_date' => 'date',
+    ];
+
+    public function rows()
+    {
+        return $this->hasMany(ContainerRow::class);
+    }
+
+    public function invoices()
+    {
+        return $this->hasMany(Invoice::class);
+    }
+}

app/Models/ContainerRow.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ContainerRow extends Model
+{
+    protected $fillable = [
+        'container_id',
+        'row_index',
+        'data',
+    ];
+
+    protected $casts = [
+        'data' => 'array',
+    ];
+
+    public function container()
+    {
+        return $this->belongsTo(Container::class);
+    }
+}

app/Models/Invoice.php

@@ -9,41 +9,29 @@ class Invoice extends Model
 {
     use HasFactory;
 
- protected $fillable = [
-    'order_id',
-    'customer_id',
-    'mark_no',
-
-    'invoice_number',
-    'invoice_date',
-    'due_date',
-
-    'payment_method',
-    'reference_no',
-    'status',
-
-    'final_amount', // without tax
-
-    'tax_type',     // gst / igst
-    'gst_percent',  // only used for gst UI input
-    'cgst_percent',
-    'sgst_percent',
-    'igst_percent',
-
-    'gst_amount',   // total tax amount
-    'final_amount_with_gst',
-
-    'customer_name',
-    'company_name',
-    'customer_email',
-    'customer_mobile',
-    'customer_address',
-    'pincode',
-
-    'pdf_path',
-    'notes',
-];
-
+    protected $fillable = [
+        'container_id',
+        'customer_id',
+        'mark_no',
+        'invoice_number',
+        'invoice_date',
+        'due_date',
+        'payment_method',
+        'reference_no',
+        'status',
+        'final_amount',
+        'gst_percent',
+        'gst_amount',
+        'final_amount_with_gst',
+        'customer_name',
+        'company_name',
+        'customer_email',
+        'customer_mobile',
+        'customer_address',
+        'pincode',
+        'pdf_path',
+        'notes',
+    ];
 
     /****************************
      * Relationships
@@ -54,9 +42,9 @@ class Invoice extends Model
         return $this->hasMany(InvoiceItem::class)->orderBy('id', 'ASC');
     }
 
-    public function order()
+    public function container()
     {
-        return $this->belongsTo(Order::class);
+        return $this->belongsTo(Container::class);
     }
 
     public function customer()
@@ -64,19 +52,28 @@ class Invoice extends Model
         return $this->belongsTo(User::class, 'customer_id');
     }
 
+    public function installments()
+    {
+        return $this->hasMany(InvoiceInstallment::class);
+    }
+
+    // ✅ SINGLE, correct relation
+    public function chargeGroups()
+    {
+        return $this->hasMany(\App\Models\InvoiceChargeGroup::class, 'invoice_id');
+    }
+
     /****************************
      * Helper Functions
      ****************************/
 
-    // Auto calculate GST fields (you can call this in controller before saving)
     public function calculateTotals()
     {
         $gst = ($this->final_amount * $this->gst_percent) / 100;
-        $this->gst_amount = $gst;
+        $this->gst_amount            = $gst;
         $this->final_amount_with_gst = $this->final_amount + $gst;
     }
 
-    // Check overdue status condition
     public function isOverdue()
     {
         return $this->status === 'pending' && now()->gt($this->due_date);
@@ -84,27 +81,31 @@ class Invoice extends Model
 
     public function getShipment()
     {
-        return $this->order?->shipments?->first();
+        return null;
     }
 
-    public function installments()
+    // ✅ Charge groups total accessor
+    public function getChargeGroupsTotalAttribute()
+    {
+        // relation already loaded असेल तर collection वरून sum होईल
+        return (float) $this->chargeGroups->sum('total_charge');
+    }
+
+    // ✅ Grand total accessor (items + GST + charge groups)
+    public function getGrandTotalWithChargesAttribute()
+    {
+        return (float) ($this->final_amount_with_gst ?? 0) + $this->charge_groups_total;
+    }
+
+    public function totalPaid()
 {
-    return $this->hasMany(InvoiceInstallment::class);
+    return $this->installments->sum('amount');
 }
 
-// App\Models\Invoice.php
-
-public function totalPaid()
-{
-    return $this->installments()->sum('amount');
-}
 
 public function remainingAmount()
 {
-    return max(
-        ($this->final_amount_with_gst ?? 0) - $this->totalPaid(),
-        0
-    );
+    return $this->grand_total_with_charges - $this->totalPaid();
 }
 
 

app/Models/InvoiceChargeGroup.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class InvoiceChargeGroup extends Model
+{
+    protected $fillable = [
+        'invoice_id',
+        'group_name',
+        'basis_type',
+        'basis_value',
+        'rate',
+        'total_charge',
+    ];
+
+    public function invoice()
+    {
+        return $this->belongsTo(Invoice::class);
+    }
+
+    public function items()
+    {
+        return $this->hasMany(InvoiceChargeGroupItem::class, 'group_id');
+    }
+}

app/Models/InvoiceChargeGroupItem.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class InvoiceChargeGroupItem extends Model
+{
+    protected $fillable = [
+        'group_id',
+        'invoice_item_id',
+    ];
+
+    public function group()
+    {
+        return $this->belongsTo(InvoiceChargeGroup::class, 'group_id');
+    }
+
+    public function item()
+    {
+        return $this->belongsTo(InvoiceItem::class, 'invoice_item_id');
+    }
+}

app/Models/InvoiceItem.php

@@ -37,4 +37,81 @@ class InvoiceItem extends Model
     {
         return $this->belongsTo(Invoice::class);
     }
+
+
+    public function chargeGroupItems()
+    {
+        return $this->hasMany(InvoiceChargeGroupItem::class, 'invoice_item_id');
+    }
+
+    // हे helper: पहिला group fetch करून त्यावरून rate/total काढणे
+    public function getChargeRateAttribute()
+    {
+        $pivot = $this->chargeGroupItems->first();
+        if (!$pivot || !$pivot->group) {
+            return 0;
+        }
+
+        $group = $pivot->group;
+
+        // basis नुसार या item चा basis value
+        $basis = 0;
+        switch ($group->basis_type) {
+            case 'ttl_qty':
+                $basis = $this->ttl_qty;
+                break;
+            case 'amount':
+                $basis = $this->ttl_amount;
+                break;
+            case 'ttl_cbm':
+                $basis = $this->ttl_cbm;
+                break;
+            case 'ttl_kg':
+                $basis = $this->ttl_kg;
+                break;
+        }
+
+        if ($basis <= 0 || ($group->basis_value ?? 0) <= 0) {
+            return 0;
+        }
+
+        // group चा rate field आधीच आहे, ते direct वापरू
+        return (float) $group->rate;
+    }
+
+    public function getChargeTotalAttribute()
+    {
+        $pivot = $this->chargeGroupItems->first();
+        if (!$pivot || !$pivot->group) {
+            return 0;
+        }
+
+        $group = $pivot->group;
+
+        $basis = 0;
+        switch ($group->basis_type) {
+            case 'ttl_qty':
+                $basis = $this->ttl_qty;
+                break;
+            case 'amount':
+                $basis = $this->ttl_amount;
+                break;
+            case 'ttl_cbm':
+                $basis = $this->ttl_cbm;
+                break;
+            case 'ttl_kg':
+                $basis = $this->ttl_kg;
+                break;
+        }
+
+        if ($basis <= 0 || ($group->basis_value ?? 0) <= 0) {
+            return 0;
+        }
+
+        // per unit rate
+        $rate = (float) $group->rate;
+        // item total = basis * rate
+        return $basis * $rate;
+    }
 }
+

app/Models/Order.php

@@ -58,10 +58,10 @@ class Order extends Model
         return $this->belongsToMany(\App\Models\Shipment::class, 'shipment_items', 'order_id', 'shipment_id');
     }
 
-        public function invoice()
-    {
-        return $this->hasOne(\App\Models\Invoice::class, 'order_id', 'id');
-    }
+    //     public function invoice()
+    // {
+    //     return $this->hasOne(\App\Models\Invoice::class, 'order_id', 'id');
+    // }
 
 
     const STATUS_LABELS = [