akaunting 3.0 (the last dance)
This commit is contained in:
@@ -7,7 +7,6 @@ use App\Jobs\Banking\CreateTransaction;
|
||||
use App\Jobs\Document\CreateDocumentHistory;
|
||||
use App\Events\Document\PaidAmountCalculated;
|
||||
use App\Interfaces\Job\ShouldCreate;
|
||||
use App\Models\Banking\Account;
|
||||
use App\Models\Banking\Transaction;
|
||||
use App\Models\Document\Document;
|
||||
use App\Traits\Currencies;
|
||||
@@ -71,20 +70,6 @@ class CreateBankingDocumentTransaction extends Job implements ShouldCreate
|
||||
$this->request['category_id'] = isset($this->request['category_id']) ? $this->request['category_id'] : $this->model->category_id;
|
||||
$this->request['payment_method'] = isset($this->request['payment_method']) ? $this->request['payment_method'] : setting('default.payment_method');
|
||||
$this->request['notify'] = isset($this->request['notify']) ? $this->request['notify'] : 0;
|
||||
|
||||
if ($this->request['mark_paid'] && ($this->request['account_id'] == setting('default.account'))) {
|
||||
$account = Account::find((int) $this->request['account_id']);
|
||||
|
||||
$code = $account->currency_code;
|
||||
$rate = config('money.' . $account->currency_code . '.rate');
|
||||
|
||||
if ($account->currency_code != $this->model->currency_code) {
|
||||
$this->request['currency_code'] = $code;
|
||||
$this->request['currency_rate'] = $rate;
|
||||
|
||||
$this->request['amount'] = $this->convertBetween($this->request['amount'], $this->model->currency_code, $this->model->currency_rate, $code, $rate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected function checkAmount(): bool
|
||||
|
||||
@@ -11,10 +11,11 @@ use App\Models\Banking\Account;
|
||||
use App\Models\Banking\Transfer;
|
||||
use App\Models\Setting\Category;
|
||||
use App\Traits\Currencies;
|
||||
use App\Traits\Transactions;
|
||||
|
||||
class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
|
||||
{
|
||||
use Currencies;
|
||||
use Currencies, Transactions;
|
||||
|
||||
public function handle(): Transfer
|
||||
{
|
||||
@@ -28,6 +29,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
|
||||
$expense_transaction = $this->dispatch(new CreateTransaction([
|
||||
'company_id' => $this->request['company_id'],
|
||||
'type' => 'expense',
|
||||
'number' => $this->getNextTransactionNumber(),
|
||||
'account_id' => $this->request->get('from_account_id'),
|
||||
'paid_at' => $this->request->get('transferred_at'),
|
||||
'currency_code' => $expense_currency_code,
|
||||
@@ -51,6 +53,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
|
||||
$income_transaction = $this->dispatch(new CreateTransaction([
|
||||
'company_id' => $this->request['company_id'],
|
||||
'type' => 'income',
|
||||
'number' => $this->getNextTransactionNumber(),
|
||||
'account_id' => $this->request->get('to_account_id'),
|
||||
'paid_at' => $this->request->get('transferred_at'),
|
||||
'currency_code' => $income_currency_code,
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs\Banking;
|
||||
|
||||
use App\Abstracts\Job;
|
||||
use App\Events\Document\PaidAmountCalculated;
|
||||
use App\Jobs\Document\CreateDocumentHistory;
|
||||
use App\Models\Banking\Transaction;
|
||||
use App\Models\Document\Document;
|
||||
use App\Traits\Currencies;
|
||||
|
||||
class MatchBankingDocumentTransaction extends Job
|
||||
{
|
||||
use Currencies;
|
||||
|
||||
protected $transaction;
|
||||
|
||||
public function __construct(Document $model, Transaction $transaction)
|
||||
{
|
||||
$this->model = $model;
|
||||
|
||||
$this->transaction = $transaction;
|
||||
}
|
||||
|
||||
public function handle(): Transaction
|
||||
{
|
||||
$this->checkAmount();
|
||||
|
||||
\DB::transaction(function () {
|
||||
$this->transaction = $this->dispatch(new UpdateTransaction($this->transaction, ['document_id' => $this->model->id]));
|
||||
|
||||
$this->model->save();
|
||||
|
||||
$this->createHistory();
|
||||
});
|
||||
|
||||
return $this->transaction;
|
||||
}
|
||||
|
||||
protected function checkAmount(): bool
|
||||
{
|
||||
$code = $this->transaction->currency_code;
|
||||
$rate = $this->transaction->currency_rate;
|
||||
|
||||
$precision = config('money.' . $code . '.precision');
|
||||
|
||||
$amount = $this->transaction->amount = round($this->transaction->amount, $precision);
|
||||
|
||||
if ($this->model->currency_code != $code) {
|
||||
$converted_amount = $this->convertBetween($amount, $code, $rate, $this->model->currency_code, $this->model->currency_rate);
|
||||
|
||||
$amount = round($converted_amount, $precision);
|
||||
}
|
||||
|
||||
$this->model->paid_amount = $this->model->paid;
|
||||
event(new PaidAmountCalculated($this->model));
|
||||
|
||||
$total_amount = round($this->model->amount - $this->model->paid_amount, $precision);
|
||||
|
||||
unset($this->model->reconciled);
|
||||
unset($this->model->paid_amount);
|
||||
|
||||
$compare = bccomp($amount, $total_amount, $precision);
|
||||
|
||||
if ($compare === 1) {
|
||||
$error_amount = $total_amount;
|
||||
|
||||
if ($this->model->currency_code != $code) {
|
||||
$converted_amount = $this->convertBetween($total_amount, $this->model->currency_code, $this->model->currency_rate, $code, $rate);
|
||||
|
||||
$error_amount = round($converted_amount, $precision);
|
||||
}
|
||||
|
||||
$message = trans('messages.error.over_match', ['type' => ucfirst($this->model->type), 'amount' => money($error_amount, $code, true)]);
|
||||
|
||||
throw new \Exception($message);
|
||||
} else {
|
||||
$this->model->status = ($compare === 0) ? 'paid' : 'partial';
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
protected function createHistory(): void
|
||||
{
|
||||
$history_desc = money((double) $this->transaction->amount, (string) $this->transaction->currency_code, true)->format() . ' ' . trans_choice('general.payments', 1);
|
||||
|
||||
$this->dispatch(new CreateDocumentHistory($this->model, 0, $history_desc));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs\Banking;
|
||||
|
||||
use App\Abstracts\Job;
|
||||
use App\Events\Banking\TransactionSent;
|
||||
use App\Models\Banking\Transaction;
|
||||
use App\Notifications\Banking\Transaction as Notification;
|
||||
|
||||
class SendTransactionAsCustomMail extends Job
|
||||
{
|
||||
public function __construct($request, $template_alias)
|
||||
{
|
||||
$this->request = $request;
|
||||
$this->template_alias = $template_alias;
|
||||
}
|
||||
|
||||
public function handle(): void
|
||||
{
|
||||
$transaction = Transaction::find($this->request->get('transaction_id'));
|
||||
|
||||
$custom_mail = $this->request->only(['to', 'subject', 'body']);
|
||||
|
||||
if ($this->request->has('user_email')) {
|
||||
$custom_mail['cc'] = user()->email;
|
||||
}
|
||||
|
||||
// Notify the contact
|
||||
$transaction->contact->notify(new Notification($transaction, $this->template_alias, true, $custom_mail));
|
||||
|
||||
event(new TransactionSent($transaction));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs\Banking;
|
||||
|
||||
use App\Abstracts\Job;
|
||||
use App\Interfaces\Job\ShouldUpdate;
|
||||
use App\Models\Document\Document;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class SplitTransaction extends Job implements ShouldUpdate
|
||||
{
|
||||
public function handle(): array
|
||||
{
|
||||
$this->checkAmount();
|
||||
|
||||
\DB::transaction(function () {
|
||||
foreach ($this->request->items as $item) {
|
||||
$transaction = $this->model->duplicate();
|
||||
$transaction->split_id = $this->model->id;
|
||||
$transaction->amount = $item['amount'];
|
||||
$transaction->save();
|
||||
|
||||
$item['split'] = $transaction;
|
||||
|
||||
// Match only if document_id is given
|
||||
if (empty($item['document_id'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$document = Document::find($item['document_id']);
|
||||
|
||||
if (empty($document)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this->dispatch(new MatchBankingDocumentTransaction($document, $transaction));
|
||||
}
|
||||
|
||||
$this->model->type = config('type.transaction.' . $this->model->type . '.split_type');
|
||||
$this->model->save();
|
||||
});
|
||||
|
||||
return $this->request->items;
|
||||
}
|
||||
|
||||
protected function checkAmount(): bool
|
||||
{
|
||||
$total_amount = 0;
|
||||
|
||||
foreach ($this->request->items as $item) {
|
||||
$total_amount += $item['amount'];
|
||||
}
|
||||
|
||||
$precision = config('money.' . $this->model->currency_code . '.precision');
|
||||
|
||||
$compare = bccomp($total_amount, $this->model->amount, $precision);
|
||||
|
||||
if ($compare !== 0) {
|
||||
$error_amount = $this->model->amount;
|
||||
|
||||
$message = trans('messages.error.same_amount', ['transaction' => ucfirst(trans_choice('general.' . Str::plural($this->model->type), 1)), 'amount' => money($error_amount, $this->model->currency_code, true)]);
|
||||
|
||||
throw new \Exception($message);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs\Banking;
|
||||
|
||||
use App\Abstracts\Job;
|
||||
use App\Jobs\Banking\CreateTransaction;
|
||||
use App\Jobs\Document\CreateDocumentHistory;
|
||||
use App\Events\Document\PaidAmountCalculated;
|
||||
use App\Interfaces\Job\ShouldUpdate;
|
||||
use App\Models\Banking\Transaction;
|
||||
use App\Models\Document\Document;
|
||||
use App\Traits\Currencies;
|
||||
use App\Utilities\Date;
|
||||
|
||||
class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
|
||||
{
|
||||
use Currencies;
|
||||
|
||||
public function __construct(Document $model, Transaction $transaction, $request)
|
||||
{
|
||||
$this->model = $model;
|
||||
$this->transaction = $transaction;
|
||||
|
||||
parent::__construct($request);
|
||||
}
|
||||
|
||||
public function handle(): Transaction
|
||||
{
|
||||
$this->prepareRequest();
|
||||
|
||||
$this->checkAmount();
|
||||
|
||||
\DB::transaction(function () {
|
||||
$this->transaction = $this->dispatch(new CreateTransaction($this->request));
|
||||
|
||||
// Upload attachment
|
||||
if ($this->request->file('attachment')) {
|
||||
$media = $this->getMedia($this->request->file('attachment'), 'transactions');
|
||||
|
||||
$this->transaction->attachMedia($media, 'attachment');
|
||||
}
|
||||
|
||||
$this->model->save();
|
||||
|
||||
$this->createHistory();
|
||||
});
|
||||
|
||||
return $this->transaction;
|
||||
}
|
||||
|
||||
protected function prepareRequest(): void
|
||||
{
|
||||
if (!isset($this->request['amount'])) {
|
||||
$this->model->paid_amount = $this->model->paid;
|
||||
event(new PaidAmountCalculated($this->model));
|
||||
|
||||
$this->request['amount'] = $this->model->amount - $this->model->paid_amount;
|
||||
}
|
||||
|
||||
$currency_code = !empty($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code;
|
||||
|
||||
$this->request['company_id'] = $this->model->company_id;
|
||||
$this->request['currency_code'] = isset($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code;
|
||||
$this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->format('Y-m-d');
|
||||
$this->request['currency_rate'] = config('money.' . $currency_code . '.rate');
|
||||
$this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account');
|
||||
$this->request['document_id'] = isset($this->request['document_id']) ? $this->request['document_id'] : $this->model->id;
|
||||
$this->request['contact_id'] = isset($this->request['contact_id']) ? $this->request['contact_id'] : $this->model->contact_id;
|
||||
$this->request['category_id'] = isset($this->request['category_id']) ? $this->request['category_id'] : $this->model->category_id;
|
||||
$this->request['payment_method'] = isset($this->request['payment_method']) ? $this->request['payment_method'] : setting('default.payment_method');
|
||||
$this->request['notify'] = isset($this->request['notify']) ? $this->request['notify'] : 0;
|
||||
}
|
||||
|
||||
protected function checkAmount(): bool
|
||||
{
|
||||
$code = $this->request['currency_code'];
|
||||
$rate = $this->request['currency_rate'];
|
||||
|
||||
$precision = config('money.' . $code . '.precision');
|
||||
|
||||
$amount = $this->request['amount'] = round($this->request['amount'], $precision);
|
||||
|
||||
if ($this->model->currency_code != $code) {
|
||||
$converted_amount = $this->convertBetween($amount, $code, $rate, $this->model->currency_code, $this->model->currency_rate);
|
||||
|
||||
$amount = round($converted_amount, $precision);
|
||||
}
|
||||
|
||||
$this->model->paid_amount = $this->model->paid;
|
||||
event(new PaidAmountCalculated($this->model));
|
||||
|
||||
$total_amount = round($this->model->amount - $this->model->paid_amount, $precision);
|
||||
|
||||
unset($this->model->reconciled);
|
||||
unset($this->model->paid_amount);
|
||||
|
||||
$compare = bccomp($amount, $total_amount, $precision);
|
||||
|
||||
if ($compare === 1) {
|
||||
$error_amount = $total_amount;
|
||||
|
||||
if ($this->model->currency_code != $code) {
|
||||
$converted_amount = $this->convertBetween($total_amount, $this->model->currency_code, $this->model->currency_rate, $code, $rate);
|
||||
|
||||
$error_amount = round($converted_amount, $precision);
|
||||
}
|
||||
|
||||
$message = trans('messages.error.over_payment', ['amount' => money($error_amount, $code, true)]);
|
||||
|
||||
throw new \Exception($message);
|
||||
} else {
|
||||
$this->model->status = ($compare === 0) ? 'paid' : 'partial';
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
protected function createHistory(): void
|
||||
{
|
||||
$history_desc = money((double) $this->transaction->amount, (string) $this->transaction->currency_code, true)->format() . ' ' . trans_choice('general.payments', 1);
|
||||
|
||||
$this->dispatch(new CreateDocumentHistory($this->model, 0, $history_desc));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user