fix cancellazione movimento. closes #255

madbob · Feb 6, 2024 · f46db92 · f46db92
1 parent 54b7abb
commit f46db92
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/code/app/Console/Commands/FixDatabase.php b/code/app/Console/Commands/FixDatabase.php
@@ -9,8 +9,10 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Database\Schema\Blueprint;
 
 use App\Gas;
 use App\User;
@@ -64,5 +66,9 @@ public function handle()
             $mod->identifier = 'shipping';
             $mod->save();
         }
+
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->integer('payment_id')->nullable()->change();
+        });
     }
 }
diff --git a/code/app/Http/Controllers/MovementsController.php b/code/app/Http/Controllers/MovementsController.php
@@ -262,16 +262,14 @@ public function askDelete(Request $request, $id)
             'password_protected' => true,
             'text' => _i('Vuoi davvero eliminare il movimento<br>%s?', [$mov->printableName()]),
             'extra' => [
-                'close-modal' => '.movement-modal',
-
                 /*
                     Se sono nel contesto di un utente/fornitore/GAS ricarica il
                     pannello coi bilanci, se sono nel pannello di gestione delle
                     quote utente ricarica la riga del relativo utente
                 */
                 'reload-portion' => ['.balance-summary', '.holding-movement-' . $id],
 
-                'post-saved-function' => ['refreshFilter']
+                'post-saved-function' => ['closeAllModals', 'refreshFilter']
             ]
         ]);
     }

diff --git a/code/public/js/gasdotto.js b/code/public/js/gasdotto.js
diff --git a/code/public/js/gasdotto.js.map b/code/public/js/gasdotto.js.map
diff --git a/code/public/mix-manifest.json b/code/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/js/gasdotto.js": "/js/gasdotto.js?id=72fd34340876f5d4c490bb9278c26dab",
+    "/js/gasdotto.js": "/js/gasdotto.js?id=44f2a5b7346983558f45b7b334c7f030",
     "/css/gasdotto.css": "/css/gasdotto.css?id=f473d9704bc2c2380df5890184d297e1"
 }
diff --git a/code/resources/assets/js/callables.js b/code/resources/assets/js/callables.js
@@ -176,6 +176,11 @@ class Callables {
 
     /* post-saved-function ****************************************************/
 
+    static closeAllModals()
+    {
+        $('.modal.fade.show').modal('hide');
+    }
+
     static triggerPayment(form)
     {
     	/*