diff --git a/app/Models/Purchase/Bill.php b/app/Models/Purchase/Bill.php index 1fa14d2ce..46a018a31 100644 --- a/app/Models/Purchase/Bill.php +++ b/app/Models/Purchase/Bill.php @@ -117,6 +117,11 @@ class Bill extends Model return $query->where('status', '<>', 'paid'); } + public function scopeNumber($query, $number) + { + return $query->where('bill_number', '=', $number); + } + public function onCloning($src, $child = null) { $this->status = 'draft'; diff --git a/app/Models/Purchase/BillItem.php b/app/Models/Purchase/BillItem.php index d2f8da66a..76ae399e0 100644 --- a/app/Models/Purchase/BillItem.php +++ b/app/Models/Purchase/BillItem.php @@ -34,7 +34,7 @@ class BillItem extends Model public function item() { - return $this->belongsTo('App\Models\Common\Item'); + return $this->belongsTo('App\Models\Common\Item')->withDefault(['name' => trans('general.na')]); } public function taxes() diff --git a/app/Models/Purchase/BillItemTax.php b/app/Models/Purchase/BillItemTax.php index c13b1e405..06818f97c 100644 --- a/app/Models/Purchase/BillItemTax.php +++ b/app/Models/Purchase/BillItemTax.php @@ -4,11 +4,11 @@ namespace App\Models\Purchase; use App\Abstracts\Model; use App\Traits\Currencies; +use Znck\Eloquent\Traits\BelongsToThrough; class BillItemTax extends Model { - - use Currencies; + use Currencies, BelongsToThrough; protected $table = 'bill_item_taxes'; @@ -24,9 +24,14 @@ class BillItemTax extends Model return $this->belongsTo('App\Models\Purchase\Bill'); } + public function item() + { + return $this->belongsToThrough('App\Models\Common\Item', 'App\Models\Purchase\BillItem', 'bill_item_id'); + } + public function tax() { - return $this->belongsTo('App\Models\Setting\Tax'); + return $this->belongsTo('App\Models\Setting\Tax')->withDefault(['name' => trans('general.na')]); } /**