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

Document add payment modal fixed..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-13 23:04:41 +03:00
parent 48e3ffd2bf
commit a35db4ac1e
5 changed files with 36 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,110 +0,0 @@
<?php
namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Banking\Transaction as Request;
use App\Jobs\Banking\CreateBankingDocumentTransaction;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Document\Document;
use App\Models\Setting\Currency;
use App\Utilities\Modules;
use App\Traits\Uploads;
class BillTransactions extends Controller
{
use Uploads;
/**
* Instantiate a new controller instance.
*/
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-purchases-bills')->only('create', 'store', 'duplicate', 'import');
$this->middleware('permission:read-purchases-bills')->only('index', 'show', 'edit', 'export');
$this->middleware('permission:update-purchases-bills')->only('update', 'enable', 'disable');
$this->middleware('permission:delete-purchases-bills')->only('destroy');
}
/**
* Show the form for creating a new resource.
*
* @param Document $bill
*
* @return Response
*/
public function create(Document $bill)
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', $bill->currency_code)->first();
$payment_methods = Modules::getPaymentMethods();
$paid = $bill->paid;
// Get Bill Totals
foreach ($bill->totals as $bill_total) {
$bill->{$bill_total->code} = $bill_total->amount;
}
$total = money($bill->total, $currency->code, true)->format();
$bill->grand_total = money($total, $currency->code)->getAmount();
if (!empty($paid)) {
$bill->grand_total = round($bill->total - $paid, $currency->precision);
}
$html = view('modals.bills.payment', compact('bill', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
return response()->json([
'success' => true,
'error' => false,
'message' => 'null',
'html' => $html,
'data' => [
'title' => trans('general.title.new', ['type' => trans_choice('general.payments', 1)]),
'buttons' => [
'cancel' => [
'text' => trans('general.cancel'),
'class' => 'btn-outline-secondary'
],
'confirm' => [
'text' => trans('general.save'),
'class' => 'btn-success'
]
]
]
]);
}
/**
* Store a newly created resource in storage.
*
* @param Document $bill
* @param Request $request
*
* @return Response
*/
public function store(Document $bill, Request $request)
{
$response = $this->ajaxDispatch(new CreateBankingDocumentTransaction($bill, $request));
if ($response['success']) {
$response['redirect'] = route('bills.show', $bill->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
} else {
$response['redirect'] = null;
}
return response()->json($response);
}
}

46
app/Http/Controllers/Modals/InvoiceTransactions.php → app/Http/Controllers/Modals/DocumentTransactions.php
View File

@ -12,7 +12,7 @@ use App\Models\Setting\Currency;
use App\Utilities\Modules;
use App\Traits\Uploads;
class InvoiceTransactions extends Controller
class DocumentTransactions extends Controller
{
use Uploads;
@ -22,45 +22,45 @@ class InvoiceTransactions extends Controller
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-sales-invoices')->only('create', 'store', 'duplicate', 'import');
$this->middleware('permission:read-sales-invoices')->only('index', 'show', 'edit', 'export');
$this->middleware('permission:update-sales-invoices')->only('update', 'enable', 'disable');
$this->middleware('permission:delete-sales-invoices')->only('destroy');
//$this->middleware('permission:create-sales-invoices')->only('create', 'store', 'duplicate', 'import');
//$this->middleware('permission:read-sales-invoices')->only('index', 'show', 'edit', 'export');
//$this->middleware('permission:update-sales-invoices')->only('update', 'enable', 'disable');
//$this->middleware('permission:delete-sales-invoices')->only('destroy');
}
/**
* Show the form for creating a new resource.
*
* @param Document $invoice
* @param Document $document
*
* @return Response
*/
public function create(Document $invoice)
public function create(Document $document)
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', $invoice->currency_code)->first();
$currency = Currency::where('code', $document->currency_code)->first();
$payment_methods = Modules::getPaymentMethods();
$paid = $invoice->paid;
$paid = $document->paid;
// Get Invoice Totals
foreach ($invoice->totals as $invoice_total) {
$invoice->{$invoice_total->code} = $invoice_total->amount;
// Get document Totals
foreach ($document->totals as $document_total) {
$document->{$document_total->code} = $document_total->amount;
}
$total = money($invoice->total, $currency->code, true)->format();
$total = money($document->total, $currency->code, true)->format();
$invoice->grand_total = money($total, $currency->code)->getAmount();
$document->grand_total = money($total, $currency->code)->getAmount();
if (!empty($paid)) {
$invoice->grand_total = round($invoice->total - $paid, $currency->precision);
$document->grand_total = round($document->total - $paid, $currency->precision);
}
$html = view('modals.invoices.payment', compact('invoice', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
$html = view('modals.documents.payment', compact('document', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
return response()->json([
'success' => true,
@ -91,17 +91,23 @@ class InvoiceTransactions extends Controller
/**
* Store a newly created resource in storage.
*
* @param Document $invoice
* @param Document $document
* @param Request $request
*
* @return Response
*/
public function store(Document $invoice, Request $request)
public function store(Document $document, Request $request)
{
$response = $this->ajaxDispatch(new CreateBankingDocumentTransaction($invoice, $request));
$response = $this->ajaxDispatch(new CreateBankingDocumentTransaction($document, $request));
if ($response['success']) {
$response['redirect'] = route('invoices.show', $invoice->id);
$route = config('type.' . $document->type . '.route.prefix');
if ($alias = config('type.' . $document->type . '.alias')) {
$route = $alias . '.' . $route;
}
$response['redirect'] = route($route . '.show', $document->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);

18
resources/views/modals/bills/payment.blade.php → resources/views/modals/documents/payment.blade.php
View File

@ -4,7 +4,7 @@
'@keydown' => 'form.errors.clear($event.target.name)',
'role' => 'form',
'class' => 'form-loading-button',
'route' => ['modals.bills.bill.transactions.store', $bill->id],
'route' => ['modals.documents.document.transactions.store', $document->id],
'novalidate' => true
]) !!}
<base-alert type="warning" v-if="typeof form.response !== 'undefined' && form.response.error" v-html="form.response.message"></base-alert>
@ -12,11 +12,11 @@
<div class="row">
{{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $bill->grand_total) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $document->grand_total) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'change' => 'onChangePaymentAccount']) }}
{{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'true'], $currencies[$bill->currency_code]) }}
{{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'true'], $currencies[$document->currency_code]) }}
{{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3']) }}
@ -24,12 +24,12 @@
{{ Form::textGroup('reference', trans('general.reference'), 'fa fa-file', []) }}
{!! Form::hidden('bill_id', $bill->id, ['id' => 'bill_id', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('category_id', $bill->category->id, ['id' => 'category_id', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('amount', $bill->grand_total, ['id' => 'amount', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_code', $bill->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', $bill->currency_rate, ['id' => 'currency_rate', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('document_id', $document->id, ['id' => 'document_id', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('category_id', $document->category->id, ['id' => 'category_id', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('amount', $document->grand_total, ['id' => 'amount', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_code', $document->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', $document->currency_rate, ['id' => 'currency_rate', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('type', 'expense') !!}
{!! Form::hidden('type', config('type.' . $document->type . '.transaction_type')) !!}
</div>
{!! Form::close() !!}

35
resources/views/modals/invoices/payment.blade.php
View File

@ -1,35 +0,0 @@
{!! Form::open([
'id' => 'form-transaction',
'@submit.prevent' => 'onSubmit',
'@keydown' => 'form.errors.clear($event.target.name)',
'role' => 'form',
'class' => 'form-loading-button',
'route' => ['modals.invoices.invoice.transactions.store', $invoice->id],
'novalidate' => true
]) !!}
<base-alert type="warning" v-if="typeof form.response !== 'undefined' && form.response.error" v-html="form.response.message"></base-alert>
<div class="row">
{{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $invoice->grand_total) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'change' => 'onChangePaymentAccount']) }}
{{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'true'], $currencies[$invoice->currency_code]) }}
{{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3']) }}
{{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('default.payment_method'), ['required' => 'requied']) }}
{{ Form::textGroup('reference', trans('general.reference'), 'fa fa-file', []) }}
{!! Form::hidden('invoice_id', $invoice->id, ['id' => 'invoice_id', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('category_id', $invoice->category->id, ['id' => 'category_id', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('amount', $invoice->grand_total, ['id' => 'amount', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_code', $invoice->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', $invoice->currency_rate, ['id' => 'currency_rate', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('type', 'income') !!}
</div>
{!! Form::close() !!}

3
routes/admin.php
View File

@ -232,7 +232,6 @@ Route::group(['as' => 'modals.', 'prefix' => 'modals'], function () {
Route::patch('invoice-templates', 'Modals\InvoiceTemplates@update')->name('invoice-templates.update');
Route::get('documents/item-columns/edit', 'Modals\DocumentItemColumns@edit')->name('documents.item-columns.edit');
Route::patch('documents/item-columns', 'Modals\DocumentItemColumns@update')->name('documents.item-columns.update');
Route::resource('invoices/{invoice}/transactions', 'Modals\InvoiceTransactions', ['names' => 'invoices.invoice.transactions', 'middleware' => ['date.format', 'money']]);
Route::resource('bills/{bill}/transactions', 'Modals\BillTransactions', ['names' => 'bills.bill.transactions', 'middleware' => ['date.format', 'money']]);
Route::resource('documents/{document}/transactions', 'Modals\DocumentTransactions', ['names' => 'documents.document.transactions', 'middleware' => ['date.format', 'money']]);
Route::resource('taxes', 'Modals\Taxes');
});