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

converted transfer check from category to type

Browse Source
This commit is contained in:
Denis Duliçi
2022-07-21 01:07:55 +03:00
parent 16c645b4a0
commit 5a7697f741
18 changed files with 221 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Imports/Banking/Transfers.php
View File

@@ -4,8 +4,9 @@ namespace App\Imports\Banking;
use App\Abstracts\Import;
use App\Jobs\Banking\CreateTransaction;
use App\Models\Banking\Transaction;
use App\Models\Banking\Transfer as Model;
use App\Models\Setting\Category;
use App\Traits\Categories;
use App\Traits\Currencies;
use App\Traits\Jobs;
use App\Traits\Transactions;
@@ -13,7 +14,7 @@ use App\Utilities\Date;
class Transfers extends Import
{
use Currencies, Jobs, Transactions;
use Categories, Currencies, Jobs, Transactions;
public function model(array $row)
{
@@ -31,7 +32,7 @@ class Transfers extends Import
$row['to_currency_code'] = $this->getToCurrencyCode($row);
$row['expense_transaction_id'] = $this->getExpenseTransactionId($row);
$row['income_transaction_id'] = $this->getIncomeTransactionId($row);
return $row;
}
@@ -55,7 +56,7 @@ class Transfers extends Import
$expense_transaction = $this->dispatch(new CreateTransaction([
'company_id' => $row['company_id'],
'number' => $this->getNextTransactionNumber(),
'type' => 'expense',
'type' => Transaction::EXPENSE_TRANSFER_TYPE,
'account_id' => $row['from_account_id'],
'paid_at' => $row['transferred_at'],
'currency_code' => $row['from_currency_code'],
@@ -63,7 +64,7 @@ class Transfers extends Import
'amount' => $row['amount'],
'contact_id' => 0,
'description' => $row['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'category_id' => $this->getTransferCategoryId(),
'payment_method' => $row['payment_method'],
'reference' => $row['reference'],
'created_by' => $row['created_by'],
@@ -90,7 +91,7 @@ class Transfers extends Import
$income_transaction = $this->dispatch(new CreateTransaction([
'company_id' => $row['company_id'],
'number' => $this->getNextTransactionNumber(),
'type' => 'income',
'type' => Transaction::INCOME_TRANSFER_TYPE,
'account_id' => $row['to_account_id'],
'paid_at' => $row['transferred_at'],
'currency_code' => $row['to_currency_code'],
@@ -98,7 +99,7 @@ class Transfers extends Import
'amount' => $amount,
'contact_id' => 0,
'description' => $row['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'category_id' => $this->getTransferCategoryId(),
'payment_method' => $row['payment_method'],
'reference' => $row['reference'],
'created_by' => $row['created_by'],