fixed reconciliation jobs

akaunting · Jun 17, 2021 · af685b6 · af685b6
1 parent 873d25c
commit af685b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/app/Jobs/Banking/CreateReconciliation.php b/app/Jobs/Banking/CreateReconciliation.php
@@ -31,17 +31,12 @@ public function __construct($request)
     public function handle()
     {
         \DB::transaction(function () {
-            $reconcile = $this->request->get('reconcile');
+            $reconcile = (int) $this->request->get('reconcile');
             $transactions = $this->request->get('transactions');
 
-            $this->reconciliation = Reconciliation::create([
-                'company_id' => $this->request['company_id'],
-                'account_id' => $this->request->get('account_id'),
-                'started_at' => $this->request->get('started_at'),
-                'ended_at' => $this->request->get('ended_at'),
-                'closing_balance' => $this->request->get('closing_balance'),
-                'reconciled' => $reconcile ? 1 : 0,
-            ]);
+            $this->request->merge(['reconciled' => $reconcile]);
+
+            $this->reconciliation = Reconciliation::create($this->request->all());
 
             if ($reconcile && $transactions) {
                 foreach ($transactions as $key => $value) {

diff --git a/app/Jobs/Banking/UpdateReconciliation.php b/app/Jobs/Banking/UpdateReconciliation.php
@@ -32,10 +32,10 @@ public function __construct($reconciliation, $request)
     public function handle()
     {
         \DB::transaction(function () {
-            $reconcile = $this->request->get('reconcile');
+            $reconcile = (int) $this->request->get('reconcile');
             $transactions = $this->request->get('transactions');
 
-            $this->reconciliation->reconciled = $reconcile ? 1 : 0;
+            $this->reconciliation->reconciled = $reconcile;
             $this->reconciliation->save();
 
             if ($transactions) {
@@ -47,7 +47,7 @@ public function handle()
                     $t = explode('_', $key);
 
                     $transaction = Transaction::find($t[1]);
-                    $transaction->reconciled = $reconcile ? 1 : 0;
+                    $transaction->reconciled = $reconcile;
                     $transaction->save();
                 }
             }