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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-22 14:12:35 +03:00
commit ab0553bfb4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Notifications/Sale/Invoice.php
View File

@ -90,7 +90,7 @@ class Invoice extends Notification
public function getTagsReplacement() public function getTagsReplacement()
{ {
return [ return [
$this->invoice->invoice_number, $this->invoice->document_number,
money($this->invoice->amount, $this->invoice->currency_code, true), money($this->invoice->amount, $this->invoice->currency_code, true),
company_date($this->invoice->due_at), company_date($this->invoice->due_at),
URL::signedRoute('signed.invoices.show', [$this->invoice->id, 'company_id' => $this->invoice->company_id]), URL::signedRoute('signed.invoices.show', [$this->invoice->id, 'company_id' => $this->invoice->company_id]),

2
app/Widgets/TotalExpenses.php
View File

@ -18,7 +18,7 @@ class TotalExpenses extends Widget
{ {
$current = $open = $overdue = 0; $current = $open = $overdue = 0;
$this->applyFilters(Transaction::expense()->isNotTransfer())->each(function ($transaction) use (&$current) { $this->applyFilters(Transaction::expense()->isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current) {
$current += $transaction->getAmountConvertedToDefault(); $current += $transaction->getAmountConvertedToDefault();
}); });

2
app/Widgets/TotalIncome.php
View File

@ -18,7 +18,7 @@ class TotalIncome extends Widget
{ {
$current = $open = $overdue = 0; $current = $open = $overdue = 0;
$this->applyFilters(Transaction::income()->isNotTransfer())->each(function ($transaction) use (&$current) { $this->applyFilters(Transaction::income()->isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current) {
$current += $transaction->getAmountConvertedToDefault(); $current += $transaction->getAmountConvertedToDefault();
}); });

2
app/Widgets/TotalProfit.php
View File

@ -19,7 +19,7 @@ class TotalProfit extends Widget
$current_income = $open_invoice = $overdue_invoice = 0; $current_income = $open_invoice = $overdue_invoice = 0;
$current_expenses = $open_bill = $overdue_bill = 0; $current_expenses = $open_bill = $overdue_bill = 0;
$this->applyFilters(Transaction::isNotTransfer())->each(function ($transaction) use (&$current_income, &$current_expenses) { $this->applyFilters(Transaction::isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current_income, &$current_expenses) {
$amount = $transaction->getAmountConvertedToDefault(); $amount = $transaction->getAmountConvertedToDefault();
if ($transaction->type == 'income') { if ($transaction->type == 'income') {