From 74ebff9940ddcccff6b23ca7d959d769b3183cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 6 Sep 2020 17:06:10 +0300 Subject: [PATCH] added requests --- app/Http/Controllers/Portal/Invoices.php | 39 ++----------------- app/Http/Controllers/Portal/Payments.php | 4 +- app/Http/Requests/Portal/InvoiceShow.php | 30 ++++++++++++++ app/Http/Requests/Portal/PaymentShow.php | 30 ++++++++++++++ .../views/sales/invoices/index.blade.php | 12 +++--- 5 files changed, 72 insertions(+), 43 deletions(-) create mode 100644 app/Http/Requests/Portal/InvoiceShow.php create mode 100644 app/Http/Requests/Portal/PaymentShow.php diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php index b3ea45aeb..dc10e2a0f 100644 --- a/app/Http/Controllers/Portal/Invoices.php +++ b/app/Http/Controllers/Portal/Invoices.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Portal; use App\Abstracts\Http\Controller; +use App\Http\Requests\Portal\InvoiceShow as Request; use App\Models\Sale\Invoice; use App\Models\Setting\Category; use App\Traits\Currencies; @@ -41,7 +42,7 @@ class Invoices extends Controller * * @return Response */ - public function show(Invoice $invoice) + public function show(Invoice $invoice, Request $request) { $payment_methods = Modules::getPaymentMethods(); @@ -57,7 +58,7 @@ class Invoices extends Controller * * @return Response */ - public function printInvoice(Invoice $invoice) + public function printInvoice(Invoice $invoice, Request $request) { $invoice = $this->prepareInvoice($invoice); @@ -71,7 +72,7 @@ class Invoices extends Controller * * @return Response */ - public function pdfInvoice(Invoice $invoice) + public function pdfInvoice(Invoice $invoice, Request $request) { $invoice = $this->prepareInvoice($invoice); @@ -92,22 +93,6 @@ class Invoices extends Controller protected function prepareInvoice(Invoice $invoice) { - $paid = 0; - - foreach ($invoice->transactions as $item) { - $amount = $item->amount; - - if ($invoice->currency_code != $item->currency_code) { - $item->default_currency_code = $invoice->currency_code; - - $amount = $item->getAmountConvertedFromDefault(); - } - - $paid += $amount; - } - - $invoice->paid = $paid; - $invoice->template_path = 'sales.invoices.print_' . setting('invoice.template' ,'default'); event(new \App\Events\Sale\InvoicePrinting($invoice)); @@ -121,22 +106,6 @@ class Invoices extends Controller redirect()->route('login'); } - $paid = 0; - - foreach ($invoice->transactions as $item) { - $amount = $item->amount; - - if ($invoice->currency_code != $item->currency_code) { - $item->default_currency_code = $invoice->currency_code; - - $amount = $item->getAmountConvertedFromDefault(); - } - - $paid += $amount; - } - - $invoice->paid = $paid; - $payment_methods = Modules::getPaymentMethods(); $payment_actions = []; diff --git a/app/Http/Controllers/Portal/Payments.php b/app/Http/Controllers/Portal/Payments.php index df42e1a55..5357a2e74 100644 --- a/app/Http/Controllers/Portal/Payments.php +++ b/app/Http/Controllers/Portal/Payments.php @@ -4,11 +4,11 @@ namespace App\Http\Controllers\Portal; use App\Abstracts\Http\Controller; use App\Models\Banking\Transaction; +use App\Http\Requests\Portal\PaymentShow as Request; use App\Utilities\Modules; class Payments extends Controller { - /** * Display a listing of the resource. * @@ -30,7 +30,7 @@ class Payments extends Controller * * @return Response */ - public function show(Transaction $payment) + public function show(Transaction $payment, Request $request) { $payment_methods = Modules::getPaymentMethods('all'); diff --git a/app/Http/Requests/Portal/InvoiceShow.php b/app/Http/Requests/Portal/InvoiceShow.php new file mode 100644 index 000000000..063821d83 --- /dev/null +++ b/app/Http/Requests/Portal/InvoiceShow.php @@ -0,0 +1,30 @@ +invoice->contact_id == user()->contact->id; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + // + ]; + } +} diff --git a/app/Http/Requests/Portal/PaymentShow.php b/app/Http/Requests/Portal/PaymentShow.php new file mode 100644 index 000000000..773207b9a --- /dev/null +++ b/app/Http/Requests/Portal/PaymentShow.php @@ -0,0 +1,30 @@ +payment->contact_id == user()->contact->id; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + // + ]; + } +} diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php index 7dbbca3c5..301240c1d 100644 --- a/resources/views/sales/invoices/index.blade.php +++ b/resources/views/sales/invoices/index.blade.php @@ -36,9 +36,9 @@ {{ Form::bulkActionAllGroup() }} - @sortablelink('invoice_number', trans_choice('general.numbers', 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) - @sortablelink('contact_name', trans_choice('general.customers', 1)) - @sortablelink('amount', trans('general.amount')) + @sortablelink('invoice_number', trans_choice('general.numbers', 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) + @sortablelink('contact_name', trans_choice('general.customers', 1)) + @sortablelink('amount', trans('general.amount')) @sortablelink('invoiced_at', trans('invoices.invoice_date')) @sortablelink('due_at', trans('invoices.due_date')) @sortablelink('status', trans_choice('general.statuses', 1)) @@ -51,9 +51,9 @@ @php $paid = $item->paid; @endphp {{ Form::bulkActionGroup($item->id, $item->invoice_number) }} - {{ $item->invoice_number }} - {{ $item->contact_name }} - @money($item->amount, $item->currency_code, true) + {{ $item->invoice_number }} + {{ $item->contact_name }} + @money($item->amount, $item->currency_code, true) @date($item->invoiced_at) @date($item->due_at)