formatting
This commit is contained in:
parent
598072e1de
commit
0f295d4979
@ -71,7 +71,7 @@ class Transactions extends Controller
|
|||||||
*/
|
*/
|
||||||
public function show(Transaction $transaction)
|
public function show(Transaction $transaction)
|
||||||
{
|
{
|
||||||
$title = ($transaction->type == 'income') ? trans_choice('general.receipts', 1) : trans('transactions.payment_made');
|
$title = $transaction->isIncome() ? trans_choice('general.receipts', 1) : trans('transactions.payment_made');
|
||||||
|
|
||||||
return view('banking.transactions.show', compact('transaction', 'title'));
|
return view('banking.transactions.show', compact('transaction', 'title'));
|
||||||
}
|
}
|
||||||
@ -331,30 +331,28 @@ class Transactions extends Controller
|
|||||||
{
|
{
|
||||||
$documents = collect([]);
|
$documents = collect([]);
|
||||||
|
|
||||||
if ($transaction->type == Transaction::INCOME_TYPE && $transaction->contact->exists) {
|
if ($transaction->isIncome() && $transaction->contact->exists) {
|
||||||
$builder = $transaction->contact
|
$builder = $transaction->contact->invoices();
|
||||||
->invoices();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($transaction->type == Transaction::INCOME_TYPE && ! $transaction->contact->exists) {
|
if ($transaction->isIncome() && ! $transaction->contact->exists) {
|
||||||
$builder = Document::invoice();
|
$builder = Document::invoice();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($transaction->type == Transaction::EXPENSE_TYPE && $transaction->contact->exists) {
|
if ($transaction->isExpense() && $transaction->contact->exists) {
|
||||||
$builder = $transaction->contact
|
$builder = $transaction->contact->bills();
|
||||||
->bills();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($transaction->type == Transaction::EXPENSE_TYPE && ! $transaction->contact->exists) {
|
if ($transaction->isExpense() && ! $transaction->contact->exists) {
|
||||||
$builder = Document::bill();
|
$builder = Document::bill();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($builder)) {
|
if (isset($builder)) {
|
||||||
$documents = $builder->notPaid()
|
$documents = $builder->notPaid()
|
||||||
->where('currency_code', $transaction->currency_code)
|
->where('currency_code', $transaction->currency_code)
|
||||||
->with(['media', 'totals', 'transactions'])
|
->with(['media', 'totals', 'transactions'])
|
||||||
->get()
|
->get()
|
||||||
->toJson();
|
->toJson();
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user