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

13
app/Jobs/Banking/CreateTransfer.php
View File

@@ -9,13 +9,14 @@ use App\Interfaces\Job\ShouldCreate;
use App\Jobs\Banking\CreateTransaction;
use App\Models\Banking\Account;
use App\Models\Banking\Transfer;
use App\Models\Setting\Category;
use App\Models\Banking\Transaction;
use App\Traits\Categories;
use App\Traits\Currencies;
use App\Traits\Transactions;
class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
{
use Currencies, Transactions;
use Categories, Currencies, Transactions;
public function handle(): Transfer
{
@@ -28,7 +29,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
$expense_transaction = $this->dispatch(new CreateTransaction([
'company_id' => $this->request['company_id'],
'type' => 'expense',
'type' => Transaction::EXPENSE_TRANSFER_TYPE,
'number' => $this->getNextTransactionNumber(),
'account_id' => $this->request->get('from_account_id'),
'paid_at' => $this->request->get('transferred_at'),
@@ -37,7 +38,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
'amount' => $this->request->get('amount'),
'contact_id' => 0,
'description' => $this->request->get('description'),
'category_id' => Category::transfer(), // Transfer Category ID
'category_id' => $this->getTransferCategoryId(),
'payment_method' => $this->request->get('payment_method'),
'reference' => $this->request->get('reference'),
'created_by' => $this->request->get('created_by'),
@@ -52,7 +53,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
$income_transaction = $this->dispatch(new CreateTransaction([
'company_id' => $this->request['company_id'],
'type' => 'income',
'type' => Transaction::INCOME_TRANSFER_TYPE,
'number' => $this->getNextTransactionNumber(),
'account_id' => $this->request->get('to_account_id'),
'paid_at' => $this->request->get('transferred_at'),
@@ -61,7 +62,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
'amount' => $amount,
'contact_id' => 0,
'description' => $this->request->get('description'),
'category_id' => Category::transfer(), // Transfer Category ID
'category_id' => $this->getTransferCategoryId(),
'payment_method' => $this->request->get('payment_method'),
'reference' => $this->request->get('reference'),
'created_by' => $this->request->get('created_by'),

3
app/Jobs/Banking/DeleteTransaction.php
View File

@@ -4,7 +4,6 @@ namespace App\Jobs\Banking;
use App\Abstracts\Job;
use App\Interfaces\Job\ShouldDelete;
use App\Models\Setting\Category;
class DeleteTransaction extends Job implements ShouldDelete
{
@@ -31,7 +30,7 @@ class DeleteTransaction extends Job implements ShouldDelete
throw new \Exception($message);
}
if ($this->model->category->id == Category::transfer()) {
if ($this->model->isTransferTransaction()) {
throw new \Exception('Unauthorized');
}
}

12
app/Jobs/Banking/UpdateTransfer.php
View File

@@ -7,12 +7,12 @@ use App\Interfaces\Job\ShouldUpdate;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Banking\Transfer;
use App\Models\Setting\Category;
use App\Traits\Categories;
use App\Traits\Currencies;
class UpdateTransfer extends Job implements ShouldUpdate
{
use Currencies;
use Categories, Currencies;
public function handle(): Transfer
{
@@ -41,7 +41,7 @@ class UpdateTransfer extends Job implements ShouldUpdate
$expense_transaction->update([
'company_id' => $this->request['company_id'],
'type' => 'expense',
'type' => Transaction::EXPENSE_TRANSFER_TYPE,
'account_id' => $this->request->get('from_account_id'),
'paid_at' => $this->request->get('transferred_at'),
'currency_code' => $expense_currency_code,
@@ -49,7 +49,7 @@ class UpdateTransfer extends Job implements ShouldUpdate
'amount' => $this->request->get('amount'),
'contact_id' => 0,
'description' => $this->request->get('description'),
'category_id' => Category::transfer(), // Transfer Category ID
'category_id' => $this->getTransferCategoryId(),
'payment_method' => $this->request->get('payment_method'),
'reference' => $this->request->get('reference'),
]);
@@ -63,7 +63,7 @@ class UpdateTransfer extends Job implements ShouldUpdate
$income_transaction->update([
'company_id' => $this->request['company_id'],
'type' => 'income',
'type' => Transaction::INCOME_TRANSFER_TYPE,
'account_id' => $this->request->get('to_account_id'),
'paid_at' => $this->request->get('transferred_at'),
'currency_code' => $income_currency_code,
@@ -71,7 +71,7 @@ class UpdateTransfer extends Job implements ShouldUpdate
'amount' => $amount,
'contact_id' => 0,
'description' => $this->request->get('description'),
'category_id' => Category::transfer(), // Transfer Category ID
'category_id' => $this->getTransferCategoryId(),
'payment_method' => $this->request->get('payment_method'),
'reference' => $this->request->get('reference'),
]);