From 153844ca5662bdf3ce44ec83ba91d74d2ea1d729 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 6 Jul 2021 21:39:09 +0300 Subject: [PATCH] Show transfer page done development --- app/Http/Controllers/Banking/Transfers.php | 90 +++++++++- .../banking/transactions/show-third.blade.php | 167 ++++++++++++++++++ .../views/banking/transfers/index.blade.php | 4 +- .../banking/transfers/show-second.blade.php | 157 ++++++++++++++++ .../views/banking/transfers/show.blade.php | 157 ++++++++++++++++ routes/admin.php | 3 + tests/Feature/Banking/TransfersTest.php | 2 +- 7 files changed, 574 insertions(+), 6 deletions(-) create mode 100644 resources/views/banking/transactions/show-third.blade.php create mode 100644 resources/views/banking/transfers/show-second.blade.php create mode 100644 resources/views/banking/transfers/show.blade.php diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index 35a72318b..4da039192 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -37,9 +37,11 @@ class Transfers extends Controller * * @return Response */ - public function show() + public function show(Transfer $transfer) { - return redirect()->route('transfers.index'); + $this->itemData($transfer); + + return view('banking.transfers.show', compact('transfer')); } /** @@ -72,7 +74,7 @@ class Transfers extends Controller $response = $this->ajaxDispatch(new CreateTransfer($request)); if ($response['success']) { - $response['redirect'] = route('transfers.index'); + $response['redirect'] = route('transfers.show', $response['data']->id); $message = trans('messages.success.added', ['type' => trans_choice('general.transfers', 1)]); @@ -88,6 +90,24 @@ class Transfers extends Controller return response()->json($response); } + /** + * Duplicate the specified resource. + * + * @param Transfer $transfer + * + * @return Response + */ + public function duplicate(Transfer $transfer) + { + $clone = $transfer->duplicate(); + + $message = trans('messages.success.duplicated', ['type' => trans_choice('general.transfers', 1)]); + + flash($message)->success(); + + return redirect()->route('transfers.show', $clone->id); + } + /** * Import the specified resource. * @@ -159,7 +179,7 @@ class Transfers extends Controller $response = $this->ajaxDispatch(new UpdateTransfer($transfer, $request)); if ($response['success']) { - $response['redirect'] = route('transfers.index'); + $response['redirect'] = route('transfers.show', $transfer->id); $message = trans('messages.success.updated', ['type' => trans_choice('general.transfers', 1)]); @@ -210,4 +230,66 @@ class Transfers extends Controller { return $this->exportExcel(new Export, trans_choice('general.transfers', 2)); } + + /** + * Print the transfer. + * + * @param Transfer $transfer + * + * @return Response + */ + public function printRevenue(Transfer $transfer) + { + //event(new \App\Events\Banking\TransactionPrinting($transfer)); + + $view = view($transfer->template_path, compact('transfer')); + + return mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8'); + } + + /** + * Download the PDF file of transfer. + * + * @param Transfer $transfer + * + * @return Response + */ + public function pdfRevenue(Transfer $transfer) + { + //event(new \App\Events\Banking\TransactionPrinting($transfer)); + + $currency_style = true; + + $view = view($transfer->template_path, compact('transfer', 'currency_style'))->render(); + $html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8'); + + $pdf = app('dompdf.wrapper'); + $pdf->loadHTML($html); + + //$pdf->setPaper('A4', 'portrait'); + + $file_name = $this->getTransactionFileName($transfer); + + return $pdf->download($file_name); + } + + /** + * Display a datas of show. + * + * @return Response + */ + + public function itemData($transfer) { + $transfer['from_account_id'] = $transfer->expense_transaction->account_id; + $transfer['from_currency_code'] = $transfer->expense_transaction->currency_code; + $transfer['from_account_rate'] = $transfer->expense_transaction->currency_rate; + $transfer['to_account_id'] = $transfer->income_transaction->account_id; + $transfer['to_currency_code'] = $transfer->income_transaction->currency_code; + $transfer['to_account_rate'] = $transfer->income_transaction->currency_rate; + $transfer['description'] = $transfer->expense_transaction->description; + $transfer['amount'] = $transfer->expense_transaction->amount; + $transfer['payment_method'] = $transfer->expense_transaction->payment_method; + $transfer['reference'] = $transfer->expense_transaction->reference; + $transfer['transferred_at'] = Date::parse($transfer->expense_transaction->paid_at)->format('Y-m-d'); + } } diff --git a/resources/views/banking/transactions/show-third.blade.php b/resources/views/banking/transactions/show-third.blade.php new file mode 100644 index 000000000..cdc028086 --- /dev/null +++ b/resources/views/banking/transactions/show-third.blade.php @@ -0,0 +1,167 @@ +@extends('layouts.admin') + +@section('content') +
+
+ From Account +
+ {{ $transfer->expense_transaction->account->name }} +

+
+
+ To Account +
+ {{ $transfer->income_transaction->account->name }} +

+
+
+ Amount +
+ @money($transfer->amount, $transfer->from_currency_code, true) +

+
+
+ Date +
+ {{ $transfer->transferred_at }} +

+
+
+ +
+
+ + + + + + + +
+ + + + + + +
+

+ Sender Account +

+

{{ $transfer->expense_transaction->account->name }}

+

+ Account Number: {{ $transfer->from_account_id}} +

+

{{ $transfer->expense_transaction->account->bank_name }}

+

+ {{ $transfer->expense_transaction->account->bank_phone }} +

+

{{ $transfer->expense_transaction->account->bank_address }}

+
+ 		+ + + + + + +
+

+ Recipient Account +

+

{{ $transfer->income_transaction->account->name }}

+

+ Account Number: {{ $transfer->to_account_id }} +

+

{{ $transfer->income_transaction->account->bank_name }}

+

+ {{ $transfer->income_transaction->account->bank_phone }} +

+

{{ $transfer->income_transaction->account->bank_address }}

+
+
+ + + + +
+

+ TRANSFER DETAIL +

+
+ + + + + +
+ + + + + + + + + + + + + + + + + +
+ Date: + + {{ $transfer->transferred_at }} +
+ Payment Method: + + {{ $transfer->payment_method }} +
+ Reference: + + {{ $transfer->reference }} +
+ Description: + + {{ $transfer->description }} +
+ 		+ + + + +
+
+ Amount +
+

+ @money($transfer->amount, $transfer->from_currency_code, true) +

+
+
+
+
+ +
+
+
+ {!! Form::label('invoice_template', trans_choice('general.templates', 1), ['class' => 'form-control-label']) !!} + +
+ +
+
+
+
+ +@endsection + +@push('scripts_start') + +@endpush \ No newline at end of file diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index e8b5f17b9..2ee546e3b 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -52,7 +52,7 @@ @endphp {{ Form::bulkActionGroup($item->id, $item->expense_transaction->account->name) }} - @date($item->expense_transaction->paid_at) + @date($item->expense_transaction->paid_at) {{ $item->expense_transaction->account->name }} {{ $item->income_transaction->account->name }} @money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true) @@ -62,6 +62,8 @@
+ {{ trans('general.show') }} +
{{ trans('general.edit') }} @can('delete-banking-transfers')
diff --git a/resources/views/banking/transfers/show-second.blade.php b/resources/views/banking/transfers/show-second.blade.php new file mode 100644 index 000000000..f3e02ba4b --- /dev/null +++ b/resources/views/banking/transfers/show-second.blade.php @@ -0,0 +1,157 @@ +@extends('layouts.admin') + +@section('content') +
+
+ From Account +
+ {{ $transfer->expense_transaction->account->name }} +

+
+
+ To Account +
+ {{ $transfer->income_transaction->account->name }} +

+
+
+ Amount +
+ @money($transfer->amount, $transfer->from_currency_code, true) +

+
+
+ Date +
+ {{ $transfer->transferred_at }} +

+
+
+ +
+
+ + + + +
+

+ TRANSFER DETAIL +

+
+ + + + + +
+ + + + + + + + + + + + + + + + + +
+ Date: + + {{ $transfer->transferred_at }} +
+ Payment Method: + + {{ $transfer->payment_method }} +
+ Reference: + + {{ $transfer->reference }} +
+ Description: + + {{ $transfer->description }} +
+ 		+ + + + +
+
+ Amount +
+

+ @money($transfer->amount, $transfer->from_currency_code, true) +

+
+
+ + + + + + +
+

+ Sender Account +

+

{{ $transfer->expense_transaction->account->name }}

+

+ Account Number: {{ $transfer->from_account_id}} +

+

{{ $transfer->expense_transaction->account->bank_name }}

+

+ {{ $transfer->expense_transaction->account->bank_phone }} +

+

{{ $transfer->expense_transaction->account->bank_address }}

+
+ + + + + + +
+

+ Recipient Account +

+

{{ $transfer->income_transaction->account->name }}

+

+ Account Number: {{ $transfer->to_account_id }} +

+

{{ $transfer->income_transaction->account->bank_name }}

+

+ {{ $transfer->income_transaction->account->bank_phone }} +

+

{{ $transfer->income_transaction->account->bank_address }}

+
+
+
+ +
+
+
+ {!! Form::label('invoice_template', trans_choice('general.templates', 1), ['class' => 'form-control-label']) !!} + +
+ +
+
+
+
+ +@endsection + +@push('scripts_start') + +@endpush \ No newline at end of file diff --git a/resources/views/banking/transfers/show.blade.php b/resources/views/banking/transfers/show.blade.php new file mode 100644 index 000000000..93a6196cd --- /dev/null +++ b/resources/views/banking/transfers/show.blade.php @@ -0,0 +1,157 @@ +@extends('layouts.admin') + +@section('content') +
+
+ From Account +
+ {{ $transfer->expense_transaction->account->name }} +

+
+
+ To Account +
+ {{ $transfer->income_transaction->account->name }} +

+
+
+ Amount +
+ @money($transfer->amount, $transfer->from_currency_code, true) +

+
+
+ Date +
+ @date($transfer->transferred_at) +

+
+
+ +
+
+ + + + + + +
+

+ Sender Account +

+

{{ $transfer->expense_transaction->account->name }}

+

+ Account Number: {{ $transfer->from_account_id}} +

+

{{ $transfer->expense_transaction->account->bank_name }}

+

+ {{ $transfer->expense_transaction->account->bank_phone }} +

+

{{ $transfer->expense_transaction->account->bank_address }}

+
+ + + + + + +
+

+ Recipient Account +

+

{{ $transfer->income_transaction->account->name }}

+

+ Account Number: {{ $transfer->to_account_id }} +

+

{{ $transfer->income_transaction->account->bank_name }}

+

+ {{ $transfer->income_transaction->account->bank_phone }} +

+

{{ $transfer->income_transaction->account->bank_address }}

+
+ + + + +
+

+ TRANSFER DETAIL +

+
+ + + + + +
+ + + + + + + + + + + + + + + + + +
+ Date: + + @date($transfer->transferred_at) +
+ Payment Method: + + {{ $transfer->payment_method }} +
+ Reference: + + {{ $transfer->reference }} +
+ Description: + + {{ $transfer->description }} +
+ 		+ + + + +
+
+ Amount +
+

+ @money($transfer->amount, $transfer->from_currency_code, true) +

+
+
+
+
+ +
+
+
+ {!! Form::label('invoice_template', trans_choice('general.templates', 1), ['class' => 'form-control-label']) !!} + +
+ +
+
+
+
+ +@endsection + +@push('scripts_start') + +@endpush \ No newline at end of file diff --git a/routes/admin.php b/routes/admin.php index 287bef815..fa76b9325 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -143,6 +143,9 @@ Route::group(['prefix' => 'banking'], function () { Route::get('transactions/export', 'Banking\Transactions@export')->name('transactions.export'); Route::resource('transactions', 'Banking\Transactions'); + Route::get('transfers/{transfer}/print', 'Banking\Transfers@printTransfer')->name('transfers.print'); + Route::get('transfers/{transfer}/pdf', 'Banking\Transfers@pdfTransfer')->name('transfers.pdf'); + Route::get('transfers/{transfer}/duplicate', 'Banking\Transfers@duplicate')->name('transfers.duplicate'); Route::post('transfers/import', 'Banking\Transfers@import')->name('transfers.import'); Route::get('transfers/export', 'Banking\Transfers@export')->name('transfers.export'); Route::resource('transfers', 'Banking\Transfers', ['middleware' => ['date.format', 'money']]); diff --git a/tests/Feature/Banking/TransfersTest.php b/tests/Feature/Banking/TransfersTest.php index 719fe43d0..2276e7fa4 100644 --- a/tests/Feature/Banking/TransfersTest.php +++ b/tests/Feature/Banking/TransfersTest.php @@ -42,7 +42,7 @@ class TransfersTest extends FeatureTestCase $transfer = $this->dispatch(new CreateTransfer($this->getRequest())); $this->loginAs() - ->get(route('transfers.edit', $transfer->id)) + ->get(route('transfers.show', $transfer->id)) ->assertStatus(200) ->assertSee($transfer->description); }