From f8ba2721a8fdafa464e45fcca93b0fe2d9c07e00 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Tue, 4 Dec 2018 11:42:22 +0300
Subject: [PATCH] close #665 Fixed: Reconciliation missing currency then it
 wrong calculate

---
 .../Controllers/Banking/Reconciliations.php   | 11 ++++---
 .../Banking/ReconciliationCalculate.php       | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 app/Http/Requests/Banking/ReconciliationCalculate.php

diff --git a/app/Http/Controllers/Banking/Reconciliations.php b/app/Http/Controllers/Banking/Reconciliations.php
index d19c68968..3def76d73 100644
--- a/app/Http/Controllers/Banking/Reconciliations.php
+++ b/app/Http/Controllers/Banking/Reconciliations.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Banking;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Banking\Reconciliation as Request;
+use App\Http\Requests\Banking\ReconciliationCalculate as CalculateRequest;
 use App\Models\Banking\Account;
 use App\Models\Banking\Reconciliation;
 use App\Models\Setting\Currency;
@@ -278,17 +279,17 @@ class Reconciliations extends Controller
         return $total;
     }
 
-    public function calculate()
+    public function calculate(CalculateRequest $request)
     {
-        $currency_code = request('currency_code');
-        $closing_balance = request('closing_balance');
+        $currency_code = $request['currency_code'];
+        $closing_balance = $request['closing_balance'];
 
         $json = new \stdClass();
 
         $cleared_amount = $difference = $income_total = $expense_total = 0;
 
-        if ($transactions = request('transactions')) {
-            $opening_balance = request('opening_balance');
+        if ($transactions = $request['transactions']) {
+            $opening_balance = $request['opening_balance'];
 
             foreach ($transactions as $key => $value) {
                 $model = explode('_', $key);
diff --git a/app/Http/Requests/Banking/ReconciliationCalculate.php b/app/Http/Requests/Banking/ReconciliationCalculate.php
new file mode 100644
index 000000000..a8a2f2d91
--- /dev/null
+++ b/app/Http/Requests/Banking/ReconciliationCalculate.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests\Banking;
+
+use App\Http\Requests\Request;
+
+class ReconciliationCalculate extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'currency_code' => 'required|string|currency',
+            'closing_balance' => 'required',
+            'transactions' => 'required',
+        ];
+    }
+}