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

akaunting 3.0 (the last dance)

Browse Source
This commit is contained in:
Burak Civan
2022-06-01 10:15:55 +03:00
parent cead09f6d4
commit d9c0764572
3812 changed files with 126831 additions and 102949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,11 +9,11 @@ use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Purchases\Vendors as Import;
use App\Jobs\Common\CreateContact;
use App\Jobs\Common\DeleteContact;
use App\Jobs\Common\DuplicateContact;
use App\Jobs\Common\UpdateContact;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Document\Document;
use App\Models\Setting\Currency;
use App\Traits\Contacts;
use App\Utilities\Date;
@ -21,6 +21,11 @@ class Vendors extends Controller
{
use Contacts;
/**
* @var string
*/
public $type = Contact::VENDOR_TYPE;
/**
* Display a listing of the resource.
*
@ -42,56 +47,7 @@ class Vendors extends Controller
*/
public function show(Contact $vendor)
{
$amounts = [
'paid' => 0,
'open' => 0,
'overdue' => 0,
];
$counts = [];
// Handle bills
$bills = Document::bill()->with('transactions')->where('contact_id', $vendor->id)->get();
$counts['bills'] = $bills->count();
$today = Date::today()->toDateString();
foreach ($bills as $item) {
// Already in transactions
if ($item->status == 'paid' || $item->status == 'cancelled') {
continue;
}
$transactions = 0;
foreach ($item->transactions as $transaction) {
$transactions += $transaction->getAmountConvertedToDefault();
}
// Check if it's open or overdue invoice
if ($item->due_at > $today) {
$amounts['open'] += $item->getAmountConvertedToDefault() - $transactions;
} else {
$amounts['overdue'] += $item->getAmountConvertedToDefault() - $transactions;
}
}
// Handle payments
$transactions = Transaction::with('account', 'category')->where('contact_id', $vendor->id)->expense()->get();
$counts['transactions'] = $transactions->count();
// Prepare data
$transactions->each(function ($item) use (&$amounts) {
$amounts['paid'] += $item->getAmountConvertedToDefault();
});
$limit = (int) request('limit', setting('default.list_limit', '25'));
$transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$bills = $this->paginate($bills->sortByDesc('issued_at'), $limit);
return view('purchases.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
return view('purchases.vendors.show', compact('vendor'));
}
/**
@ -101,9 +57,7 @@ class Vendors extends Controller
*/
public function create()
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('purchases.vendors.create', compact('currencies'));
return view('purchases.vendors.create');
}
/**
@ -143,7 +97,7 @@ class Vendors extends Controller
*/
public function duplicate(Contact $vendor)
{
$clone = $vendor->duplicate();
$clone = $this->dispatch(new DuplicateContact($vendor));
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.vendors', 1)]);
@ -185,9 +139,7 @@ class Vendors extends Controller
*/
public function edit(Contact $vendor)
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('purchases.vendors.edit', compact('vendor', 'currencies'));
return view('purchases.vendors.edit', compact('vendor'));
}
/**
@ -298,10 +250,10 @@ class Vendors extends Controller
return redirect()->route('bills.create')->withInput($data);
}
public function createPayment(Contact $vendor)
public function createExpense(Contact $vendor)
{
$data['contact'] = $vendor;
return redirect()->route('payments.create')->withInput($data);
return redirect()->route('transactions.create', ['type' => 'expense'])->withInput($data);
}
}