shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed invoice/bill status tables

Browse Source
This commit is contained in:
denisdulici
2020-01-11 16:57:32 +03:00
parent b5519004a0
commit 08eb8e75fc
69 changed files with 250 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Portal/Dashboard.php
View File

@ -40,7 +40,7 @@ class Dashboard extends Controller
$unpaid = $paid = $overdue = $partial_paid = [];
foreach ($invoices as $invoice) {
switch ($invoice->invoice_status_code) {
switch ($invoice->status) {
case 'paid':
$paid[] = $invoice;
break;

9
app/Http/Controllers/Portal/Invoices.php
View File

@ -6,18 +6,18 @@ use App\Abstracts\Http\Controller;
use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Sale\Invoice;
use App\Models\Sale\InvoiceStatus;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Sales;
use App\Traits\Uploads;
use App\Utilities\Modules;
use Illuminate\Support\Facades\URL;
class Invoices extends Controller
{
use DateTime, Currencies, Uploads;
use DateTime, Currencies, Sales, Uploads;
/**
* Display a listing of the resource.
@ -32,10 +32,7 @@ class Invoices extends Controller
$categories = collect(Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'));
$statuses = collect(InvoiceStatus::get()->each(function ($item) {
$item->name = trans('invoices.status.' . $item->code);
return $item;
})->pluck('name', 'code'));
$statuses = $this->getInvoiceStatuses();
return view('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
}