identificativo dei movimenti incluso in export csv e sempre visualizz…

…ato in fase di creazione/modifica. closes #278
madbob · May 24, 2024 · b97289a · b97289a
1 parent 0253f1f
commit b97289a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 30 deletions.
diff --git a/code/app/Http/Controllers/MovementsController.php b/code/app/Http/Controllers/MovementsController.php
@@ -94,19 +94,20 @@ private function exportMain($format, $movements)
 		$filename = sanitizeFilename(_i('Esportazione movimenti GAS %s.%s', [date('d/m/Y'), $format]));
 
 		if ($format == 'csv') {
-			$headers = [_i('Data Registrazione'), _i('Data Movimento'), _i('Tipo'), _i('Pagamento'), _i('Pagante'), _i('Pagato'), _i('Valore'), _i('Note')];
+			$headers = [_i('Data Registrazione'), _i('Data Movimento'), _i('Tipo'), _i('Pagamento'), _i('Identificativo'), _i('Pagante'), _i('Pagato'), _i('Valore'), _i('Note')];
 
 			return output_csv($filename, $headers, $movements, function($mov) {
-				$row = [];
-				$row[] = $mov->registration_date;
-				$row[] = $mov->date;
-				$row[] = $mov->printableType();
-				$row[] = $mov->printablePayment();
-				$row[] = $mov->sender ? $mov->sender->printableName() : '';
-				$row[] = $mov->target ? $mov->target->printableName() : '';
-				$row[] = printablePrice($mov->amount);
-				$row[] = $mov->notes;
-				return $row;
+                $row = [];
+                $row[] = $mov->registration_date;
+                $row[] = $mov->date;
+                $row[] = $mov->printableType();
+                $row[] = $mov->printablePayment();
+                $row[] = $mov->identifier;
+                $row[] = $mov->sender ? $mov->sender->printableName() : '';
+                $row[] = $mov->target ? $mov->target->printableName() : '';
+                $row[] = printablePrice($mov->amount);
+                $row[] = $mov->notes;
+                return $row;
 			});
 		}
 		else if ($format == 'pdf') {

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=8cecf642fcbb1fa75121ccab0939d838",
+    "/js/gasdotto.js": "/js/gasdotto.js?id=984c70fc3722a1d3deb0b60b236b2662",
     "/css/gasdotto.css": "/css/gasdotto.css?id=9f62fdf8e27345aa16d289be04885ed2"
 }
diff --git a/code/resources/assets/js/movements.js b/code/resources/assets/js/movements.js
@@ -32,17 +32,6 @@ class Movements {
 
     static initModals(container)
     {
-        $('input[name=method]', container).change(function() {
-            if ($(this).prop('checked') == false) {
-                return;
-            }
-
-            var method_string = 'when-method-' + $(this).val();
-            $(this).closest('.movement-modal').find('[class*="when-method-"]').each(function() {
-                $(this).toggleClass('hidden', ($(this).hasClass(method_string) == false));
-            });
-        });
-
         $('input[name=amount]', container).change(function() {
             var status = $(this).closest('.movement-modal').find('.sender-credit-status');
             if (status.length) {

diff --git a/code/resources/views/movement/modal.blade.php b/code/resources/views/movement/modal.blade.php
@@ -81,11 +81,7 @@
         @endif
 
         <x-larastrap::datepicker name="date" :label="_i('Data')" defaults_now="true" />
-
-        <div class="when-method-bank when-method-satispay {{ in_array($obj->method, ['bank', 'satispay']) ? ' hidden' : '' }}">
-            <x-larastrap::text name="identifier" :label="_i('Identificativo')" />
-        </div>
-
+        <x-larastrap::text name="identifier" :label="_i('Identificativo')" />
         <x-larastrap::textarea name="notes" :label="_i('Note')" />
     </x-larastrap::iform>
 </x-larastrap::modal>