refs #2611 Reconciliation edit added transaction list..

akaunting · Sep 5, 2022 · 2421bd9 · 2421bd9
1 parent ba762c0
commit 2421bd9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/app/Jobs/Banking/UpdateReconciliation.php b/app/Jobs/Banking/UpdateReconciliation.php
@@ -15,6 +15,7 @@ public function handle(): Reconciliation
             $reconcile = (int) $this->request->get('reconcile');
             $transactions = $this->request->get('transactions');
 
+            $this->model->transactions = $transactions;
             $this->model->reconciled = $reconcile;
             $this->model->save();
 

diff --git a/app/Models/Banking/Reconciliation.php b/app/Models/Banking/Reconciliation.php
@@ -28,6 +28,7 @@ class Reconciliation extends Model
     protected $casts = [
         'closing_balance' => 'double',
         'reconciled' => 'boolean',
+        'transactions' => 'array',
     ];
 
     /**

diff --git a/database/migrations/2022_08_29_000000_core_v307.php b/database/migrations/2022_08_29_000000_core_v307.php
@@ -18,10 +18,16 @@ public function up()
         if (! Type::hasType('double')) {
             Type::addType('double', FloatType::class);
         }
-
+
+        // Document Items
         Schema::table('document_items', function(Blueprint $table) {
             $table->double('quantity', 12, 2)->change();
         });
+
+        // Reconciliations
+        Schema::table('reconciliations', function (Blueprint $table) {
+            $table->text('transactions')->nullable()->after('closing_balance');
+        });
     }
 
     /**

diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
@@ -83,13 +83,22 @@
                                     @endif
 
                                     <td class="ltr:pl-6 rtl:pr-6 py-4 text-center text-sm font-medium">
-                                        @php $type = $item->isIncome() ? 'income' : 'expense'; @endphp
+                                        @php
+                                            $type = $item->isIncome() ? 'income' : 'expense';
+                                            $name = $type . '_' . $item->id;
+
+                                            $checked = $item->reconciled;
+
+                                            if (! $reconciliation->reconciled && array_key_exists($name, $reconciliation->transactions)) {
+                                                $checked = $reconciliation->transactions[$name];
+                                            }
+                                        @endphp
 
                                         <x-form.input.checkbox name="{{ $type . '_' . $item->id }}"
                                             label=""
                                             id="transaction-{{ $item->id . '-'. $type }}"
                                             :value="$item->amount_for_account"
-                                            :checked="$item->reconciled"
+                                            :checked="$checked"
                                             data-field="transactions"
                                             v-model="form.transactions.{{ $type . '_' . $item->id }}"
                                             class="text-purple focus:outline-none focus:ring-purple focus:border-purple"