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

replaced revenues/payments with transactions

Browse Source
This commit is contained in:
denisdulici
2019-11-27 12:08:36 +03:00
parent e4d0de0677
commit 3a15c1d615
28 changed files with 139 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Banking/Reconciliations.php
View File

@ -197,15 +197,15 @@ class Reconciliations extends Controller
// Opening Balance
$total = $account->opening_balance;
// Sum revenues
$revenues = $account->revenues()->whereDate('paid_at', '<', $started_at)->get();
foreach ($revenues as $item) {
// Sum income transactions
$transactions = $account->income_transacions()->whereDate('paid_at', '<', $started_at)->get();
foreach ($transactions as $item) {
$total += $item->amount;
}
// Subtract payments
$payments = $account->payments()->whereDate('paid_at', '<', $started_at)->get();
foreach ($payments as $item) {
// Subtract expense transactions
$transactions = $account->expense_transactions()->whereDate('paid_at', '<', $started_at)->get();
foreach ($transactions as $item) {
$total -= $item->amount;
}

12
app/Http/Controllers/Common/Search.php
View File

@ -68,16 +68,16 @@ class Search extends Controller
}
}/*
$revenues = Transaction::type('income')->usingSearchString($keyword)->get();
$income_transactions = Transaction::type('income')->usingSearchString($keyword)->get();
if ($revenues->count()) {
foreach ($revenues as $revenue) {
if ($income_transactions->count()) {
foreach ($income_transactions as $transaction) {
$results[] = (object)[
'id' => $revenue->id,
'name' => $revenue->contact_name,
'id' => $transaction->id,
'name' => $transaction->contact_name,
'type' => trans_choice('general.revenues', 1),
'color' => '#00c0ef',
'href' => url('incomes/revenues/' . $revenue->id),
'href' => url('incomes/revenues/' . $transaction->id),
];
}
}*/

4
app/Http/Controllers/Expenses/Bills.php
View File

@ -362,7 +362,7 @@ class Bills extends Controller
{
$paid = 0;
foreach ($bill->payments as $item) {
foreach ($bill->transactions as $item) {
$amount = $item->amount;
if ($bill->currency_code != $item->currency_code) {
@ -378,8 +378,6 @@ class Bills extends Controller
$bill->template_path = 'expenses.bills.bill';
//event(new BillPrinting($bill));
return $bill;
}
}

4
app/Http/Controllers/Incomes/Customers.php
View File

@ -51,7 +51,7 @@ class Customers extends Controller
$counts = [
'invoices' => 0,
'revenues' => 0,
'transactions' => 0,
];
// Handle invoices
@ -62,7 +62,7 @@ class Customers extends Controller
$today = Date::today()->toDateString();
foreach ($invoices as $item) {
// Already in revenues
// Already in transactions
if ($item->invoice_status_code == 'paid') {
continue;
}

2
app/Http/Controllers/Incomes/Invoices.php
View File

@ -430,7 +430,7 @@ class Invoices extends Controller
{
$paid = 0;
foreach ($invoice->payments as $item) {
foreach ($invoice->transactions as $item) {
$amount = $item->amount;
if ($invoice->currency_code != $item->currency_code) {

6
app/Http/Controllers/Modals/BillTransactions.php
View File

@ -109,14 +109,14 @@ class BillTransactions extends Controller
{
$paid = 0;
// Get Bill Payments
if (!$bill->payments->count()) {
// Get Bill Transactions
if (!$bill->transactions->count()) {
return $paid;
}
$currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
foreach ($bill->payments as $item) {
foreach ($bill->transactions as $item) {
$default_amount = (double) $item->amount;
if ($bill->currency_code == $item->currency_code) {

6
app/Http/Controllers/Modals/InvoiceTransactions.php
View File

@ -116,14 +116,14 @@ class InvoiceTransactions extends Controller
{
$paid = 0;
// Get Invoice Payments
if (!$invoice->payments->count()) {
// Get invoice transactions
if (!$invoice->transactions->count()) {
return $paid;
}
$_currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
foreach ($invoice->payments as $item) {
foreach ($invoice->transactions as $item) {
$default_amount = $item->amount;
if ($invoice->currency_code == $item->currency_code) {

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

@ -198,7 +198,7 @@ class Dashboard extends Controller
{
foreach ($items as $item) {
if ($type == 'partial') {
$item->amount = $item->payments()->paid();
$item->amount = $item->transactions()->paid();
}
$i = Date::parse($item->paid_at)->format($date_format);

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

@ -110,7 +110,7 @@ class Invoices extends Controller
{
$paid = 0;
foreach ($invoice->payments as $item) {
foreach ($invoice->transactions as $item) {
$amount = $item->amount;
if ($invoice->currency_code != $item->currency_code) {
@ -139,7 +139,7 @@ class Invoices extends Controller
$paid = 0;
foreach ($invoice->payments as $item) {
foreach ($invoice->transactions as $item) {
$amount = $item->amount;
if ($invoice->currency_code != $item->currency_code) {