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'));
}

13
app/Http/Controllers/Purchases/Bills.php
View File

@ -15,7 +15,6 @@ use App\Jobs\Purchase\UpdateBill;
use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Purchase\BillStatus;
use App\Models\Purchase\Bill;
use App\Models\Purchase\BillHistory;
use App\Models\Setting\Category;
@ -24,12 +23,13 @@ use App\Models\Setting\Tax;
use App\Traits\Contacts;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Purchases;
use App\Traits\Uploads;
use App\Utilities\Modules;
class Bills extends Controller
{
use Contacts, Currencies, DateTime, Uploads;
use Contacts, Currencies, DateTime, Purchases, Uploads;
/**
* Display a listing of the resource.
@ -44,10 +44,7 @@ class Bills extends Controller
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
$statuses = collect(BillStatus::get()->each(function ($item) {
$item->name = trans('bills.status.' . $item->code);
return $item;
})->pluck('name', 'code'));
$statuses = $this->getBillStatuses();
return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
}
@ -270,14 +267,14 @@ class Bills extends Controller
*/
public function markReceived(Bill $bill)
{
$bill->bill_status_code = 'received';
$bill->status = 'received';
$bill->save();
// Add bill history
BillHistory::create([
'company_id' => $bill->company_id,
'bill_id' => $bill->id,
'status_code' => 'received',
'status' => 'received',
'notify' => 0,
'description' => trans('bills.mark_received'),
]);

2
app/Http/Controllers/Purchases/Vendors.php
View File

@ -59,7 +59,7 @@ class Vendors extends Controller
foreach ($bills as $item) {
// Already in transactions
if ($item->bill_status_code == 'paid') {
if ($item->status == 'paid') {
continue;
}

2
app/Http/Controllers/Sales/Customers.php
View File

@ -60,7 +60,7 @@ class Customers extends Controller
foreach ($invoices as $item) {
// Already in transactions
if ($item->invoice_status_code == 'paid') {
if ($item->status == 'paid') {
continue;
}

6
app/Http/Controllers/Sales/Invoices.php
View File

@ -16,7 +16,6 @@ use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Sale\Invoice;
use App\Models\Sale\InvoiceStatus;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
@ -46,10 +45,7 @@ class Invoices extends Controller
$categories = 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('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
}