diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index dfe22dd84..2fef065d5 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -9,6 +9,7 @@ use App\Http\Requests\Expense\Bill as Request; use App\Http\Requests\Expense\BillAddItem as ItemRequest; use App\Imports\Expenses\Bills as Import; use App\Jobs\Expense\CreateBill; +use App\Jobs\Expense\DeleteBill; use App\Jobs\Expense\DuplicateBill; use App\Jobs\Expense\UpdateBill; use App\Models\Banking\Account; diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index de79c6fca..0cc520ce1 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -216,10 +216,10 @@ class Bill extends Model $paid = 0; $reconciled = $reconciled_amount = 0; - if ($this->payments->count()) { + if ($this->transactions->count()) { $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); - foreach ($this->payments as $item) { + foreach ($this->transactions as $item) { if ($this->currency_code == $item->currency_code) { $amount = (double) $item->amount; } else { diff --git a/app/Models/Expense/BillItem.php b/app/Models/Expense/BillItem.php index e42ba2b38..6a80c60c7 100644 --- a/app/Models/Expense/BillItem.php +++ b/app/Models/Expense/BillItem.php @@ -18,7 +18,7 @@ class BillItem extends Model * * @var array */ - protected $fillable = ['company_id', 'bill_id', 'item_id', 'name', 'price', 'total', 'tax']; + protected $fillable = ['company_id', 'bill_id', 'item_id', 'name', 'quantity', 'price', 'total', 'tax']; /** * Clonable relationships.