Luca Parisio пре 1 година
родитељ
комит
ff3a85101a
37 измењених фајлова са 286 додато и 14511 уклоњено
  1. 7 7
      app/Http/Livewire/Member.php
  2. 5 0
      app/Http/Livewire/RecordIN.php
  3. 8 7
      resources/views/layouts/app.blade.php
  4. 6 6
      resources/views/livewire/bank.blade.php
  5. 7 7
      resources/views/livewire/card.blade.php
  6. 2 2
      resources/views/livewire/category.blade.php
  7. 1 1
      resources/views/livewire/category_child.blade.php
  8. 11 14
      resources/views/livewire/causal.blade.php
  9. 1 1
      resources/views/livewire/causal_child.blade.php
  10. 5 5
      resources/views/livewire/city.blade.php
  11. 26 20
      resources/views/livewire/course.blade.php
  12. 1 1
      resources/views/livewire/course_child.blade.php
  13. 5 5
      resources/views/livewire/course_duration.blade.php
  14. 5 5
      resources/views/livewire/course_frequency.blade.php
  15. 5 5
      resources/views/livewire/course_level.blade.php
  16. 17 12
      resources/views/livewire/course_list.blade.php
  17. 5 5
      resources/views/livewire/course_subscription.blade.php
  18. 5 5
      resources/views/livewire/course_type.blade.php
  19. 5 5
      resources/views/livewire/discipline.blade.php
  20. 20 19
      resources/views/livewire/member.blade.php
  21. 4 4
      resources/views/livewire/nation.blade.php
  22. 5 5
      resources/views/livewire/payment_method.blade.php
  23. 4 4
      resources/views/livewire/province.blade.php
  24. 6 6
      resources/views/livewire/receipt.blade.php
  25. 2 4
      resources/views/livewire/records.blade.php
  26. 30 24
      resources/views/livewire/records_in.blade.php
  27. 45 10
      resources/views/livewire/records_in_out.blade.php
  28. 0 281
      resources/views/livewire/records_in_out_old.blade.php
  29. 2 4
      resources/views/livewire/records_out.blade.php
  30. 3 3
      resources/views/livewire/reminders.blade.php
  31. 6 6
      resources/views/livewire/sponsor.blade.php
  32. 0 14006
      resources/views/livewire/style.css
  33. 0 0
      resources/views/livewire/style.css.map
  34. 5 5
      resources/views/livewire/supplier.blade.php
  35. 8 6
      resources/views/livewire/user.blade.php
  36. 5 5
      resources/views/livewire/vat.blade.php
  37. 14 6
      routes/web.php

+ 7 - 7
app/Http/Livewire/Member.php

@@ -270,7 +270,7 @@ class Member extends Component
         $levels_ids = [];
         if ($this->course_name != '')
         {
-            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->get();
+            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('enabled', true)->get();
             foreach($all as $a)
             {
                 $levels_ids[] = $a->course_level_id;
@@ -289,7 +289,7 @@ class Member extends Component
         $types_ids = [];
         if ($this->course_level_id != '')
         {
-            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('course_level_id', $this->course_level_id)->get();
+            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('enabled', true)->where('course_level_id', $this->course_level_id)->get();
             foreach($all as $a)
             {
                 $types_ids[] = $a->course_type_id;
@@ -306,7 +306,7 @@ class Member extends Component
         $frequencies_ids = [];
         if ($this->course_type_id != '')
         {
-            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->get();
+            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('enabled', true)->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->get();
             foreach($all as $a)
             {
                 $frequencies_ids[] = $a->course_frequency_id;
@@ -417,7 +417,7 @@ class Member extends Component
 
         $this->getCategories(\App\Models\Category::select('id', 'name')->where('parent_id', null)->get(), 0);
 
-        $this->courses = \App\Models\Course::select('id', 'name')->where('parent_id', null)->get();
+        $this->courses = \App\Models\Course::select('id', 'name')->where('enabled', null)->get();
 
         $this->course_subscriptions = \App\Models\CourseSubscription::select('*')->where('enabled', true)->get();
 
@@ -1397,14 +1397,14 @@ class Member extends Component
                 $this->course_type_id = $c->course_type_id;
                 $this->course_frequency_id = $c->course_frequency_id;
 
-                $all = \App\Models\Course::where('name', 'like', '%' . $c->name . "%")->get();
+                $all = \App\Models\Course::where('name', 'like', '%' . $c->name . "%")->where('enabled', true)->get();
                 foreach($all as $a)
                 {
                     $levels_ids[] = $a->course_level_id;
                 }
                 $this->course_levels = \App\Models\CourseLevel::select('*')->where('enabled', true)->whereIn('id', $levels_ids)->get();
 
-                $all = \App\Models\Course::where('name', 'like', '%' . $c->name . "%")->where('course_level_id', $this->course_level_id)->get();
+                $all = \App\Models\Course::where('name', 'like', '%' . $c->name . "%")->where('enabled', true)->where('course_level_id', $this->course_level_id)->get();
                 foreach($all as $a)
                 {
                     $types_ids[] = $a->course_type_id;
@@ -1412,7 +1412,7 @@ class Member extends Component
                 $this->course_types = \App\Models\CourseType::select('*')->where('enabled', true)->whereIn('id', $types_ids)->get();
 
                 $frequencies_ids = [];
-                $all = \App\Models\Course::where('name', 'like', '%' . $c->name . "%")->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->get();
+                $all = \App\Models\Course::where('name', 'like', '%' . $c->name . "%")->where('enabled', true)->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->get();
                 foreach($all as $a)
                 {
                     $frequencies_ids[] = $a->course_frequency_id;

+ 5 - 0
app/Http/Livewire/RecordIN.php

@@ -22,6 +22,7 @@ class RecordIN extends Component
 
     public $isDuplicate = false;
     public $multiP = false;
+    public $from, $to;
 
     public $multiMonthTo = 0;
     public $multiYearTo = 0;
@@ -173,7 +174,11 @@ class RecordIN extends Component
             if ($payment_method->money)
             {
                 $from = str_replace(".", "", str_replace(",", "", number_format($this->virtual, 2)));
+                $this->from = $this->virtual;
+                $from = $this->from;
                 $to = str_replace(".", "", str_replace(",", "", $this->currencyToDouble($this->amount)));
+                $this->to = $this->amount;
+                $to = $this->to;
                 $ret = $from >= $to;
             }
         }

+ 8 - 7
resources/views/layouts/app.blade.php

@@ -352,13 +352,12 @@
 
         <button id="open-filter" onclick="pcsh1()"></button>
         <button id="close-filter" onclick="pcsh2()"></button>
-        <!-- /sidebar menu -->
 
         {{ $slot }}
 
     </div>
 
-    </div>
+</div>
 
 <!-- notifiche -->
 <div class="user--profile_menu d-none">
@@ -399,17 +398,19 @@
             $(".yesterdayButton").removeClass("lightGrey");
             $(".todayButton").addClass("lightGrey");
         }
-        function hidePop(pop)
-        {
-            $(pop).popover('hide');
-        }
+        $(document).ready(function() {
+            $(document).on("click",`[data-bs-trigger='hover focus']`,function() {
+                $(".bs-popover-auto").css('display','none')
+                $(this).popover('hide');                
+            });
+        });
         function newexportaction(e, dt, button, config) {
             var self = this;
             var oldStart = dt.settings()[0]._iDisplayStart;
             dt.one('preXhr', function (e, s, data) {
                 // Just this once, load all data from the server...
                 data.start = 0;
-                data.length = 2147483647;
+                data.length = 10000;
                 dt.one('preDraw', function (e, settings) {
                     // Call the original action function
                     if (button[0].className.indexOf('buttons-copy') >= 0) {

+ 6 - 6
resources/views/livewire/bank.blade.php

@@ -56,8 +56,8 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
-                                <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="cestina"><i class="fa-regular fa-trash-can"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="cestina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
                     @endforeach
@@ -119,7 +119,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -184,21 +184,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Banche',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Banche',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Banche',
                                         exportOptions: {

+ 7 - 7
resources/views/livewire/card.blade.php

@@ -65,7 +65,7 @@
                             <td>{{$record->next_month_expire}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -172,15 +172,15 @@
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:0px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 <label class="form-check-label" for="enabled">Abilitato</label>
                             </div>
                         </div>
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:0px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="use_for_user_check">
-                                <label class="form-check-label" for="use_for_user_check">Utilizza per verifica utente tesserato</label>
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="use_for_user_check">
+                                <label class="form-check-label" for="use_for_user_check">Utilizza per utente tesserato</label>
                             </div>
                         </div>
 
@@ -242,21 +242,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Tessere',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Tessere',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Tessere',
                                         exportOptions: {

+ 2 - 2
resources/views/livewire/category.blade.php

@@ -37,7 +37,7 @@
                             <td>{{$record->name}}</td>
                             <td>
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -67,7 +67,7 @@
                     <form action="">
 
                         @if($parent != '')
-                            <h3>Aggiungi livello a {{$parent}}</h3>
+                            <h3>Aggiungi livello a {{$parent}}</h3><br>
                         @endif
 
                         <div class="row mb-3">

+ 1 - 1
resources/views/livewire/category_child.blade.php

@@ -3,7 +3,7 @@
         <td>{!! str_repeat("&nbsp;", $indentation * 5) !!} {{$record->name}}</td>
         <td>
             <button type="button" class="btn btn-outline-success btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
-            <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+            <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
             <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
         </td>
     </tr>

+ 11 - 14
resources/views/livewire/causal.blade.php

@@ -17,11 +17,8 @@
 
     </header>
 
-
     @if(!$add && !$update)
 
-
-
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
@@ -45,7 +42,7 @@
                             <td>
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="duplicate({{ $record->id }})">Duplica</button>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -78,7 +75,7 @@
                             <td>
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="duplicate({{ $record->id }})">Duplica</button>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -108,7 +105,7 @@
                     <form action="">
 
                         @if($parent != '')
-                            <h3>Aggiungi livello a {{$parent}}</h3>
+                            <h3>Aggiungi livello a {{$parent}}</h3><br>
                         @endif
 
                         <div class="row mb-3">
@@ -136,14 +133,14 @@
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:0px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 <label class="form-check-label" for="enabled">Abilitato</label>
                             </div>
                         </div>
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:28px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="money" wire:model="money">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="money" wire:model="money">
                                 <label class="form-check-label" for="money">Incrementa borsellino virtuale</label>
                             </div>
                         </div>
@@ -152,28 +149,28 @@
 
                          <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:28px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="no_receipt" wire:model="no_receipt">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="no_receipt" wire:model="no_receipt">
                                 <label class="form-check-label" for="no_receipt">Non generare ricevuta</label>
                             </div>
                         </div>
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:28px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="user_status" wire:model="user_status">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="user_status" wire:model="user_status">
                                 <label class="form-check-label" for="user_status">Impatta stato utente</label>
                             </div>
                         </div>
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:28px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="no_first" wire:model="no_first">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="no_first" wire:model="no_first">
                                 <label class="form-check-label" for="no_first">Escludi dalla prima nota</label>
                             </div>
                         </div>
 
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:28px !important;">
-                                <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="no_records" wire:model="no_records">
+                                <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="no_records" wire:model="no_records">
                                 <label class="form-check-label" for="no_records">Escludi da entrate/uscite gestionale</label>
                             </div>
                         </div>
@@ -181,9 +178,9 @@
                         <div class="form--item mb-3">
                             <div class="form-check form-check-inline" style="padding-left:28px !important;">
                                 @if($corrispettivo_causal_id == 0 || $corrispettivo_causal_id == $dataId)
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="corrispettivo_fiscale" wire:model="corrispettivo_fiscale">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="corrispettivo_fiscale" wire:model="corrispettivo_fiscale">
                                 @else
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="corrispettivo_fiscale" wire:model="corrispettivo_fiscale" disabled="disabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="corrispettivo_fiscale" wire:model="corrispettivo_fiscale" disabled="disabled">
                                 @endif
                                 <label class="form-check-label" for="corrispettivo_fiscale">Utilizza per corrispettivo fiscale</label>
                             </div>

+ 1 - 1
resources/views/livewire/causal_child.blade.php

@@ -6,7 +6,7 @@
         <td>
             <button type="button" class="btn btn-outline-success btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
             <button type="button" class="btn btn-outline-success btn-sm" wire:click="duplicate({{ $record->id }})">Duplica</button>
-            <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+            <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
             <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
         </td>
     </tr>

+ 5 - 5
resources/views/livewire/city.blade.php

@@ -39,7 +39,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -90,7 +90,7 @@
                                 <div class="form--item">
                                     <div class="form--item">
                                         <label for="enabled" class="form-label">Abilitato</label>
-                                        <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                        <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                     </div>
                                 </div>
                             </div>
@@ -151,21 +151,21 @@
                     topStart: {
                         buttons: [
                             {
-                                extend: 'excelHtml5',"action":newexportaction,
+                                extend: 'excelHtml5',
                                 title: 'Comuni',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'pdfHtml5',"action":newexportaction,
+                                extend: 'pdfHtml5',
                                 title: 'Comuni',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'print',"action":newexportaction,
+                                extend: 'print',
                                 text: 'Stampa',
                                 title: 'Comuni',
                                 exportOptions: {

+ 26 - 20
resources/views/livewire/course.blade.php

@@ -49,9 +49,9 @@
                             <td>{{formatPrice($record->price)}}</td>
                             <td>{{$record->getCount()}}</td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
-                                <button type="button" class="btn" wire:click="duplicate({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Duplica"><i class="fa-regular fa-copy"></i></button>
+                                <button type="button" class="btn" wire:click="duplicate({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Duplica"><i class="fa-regular fa-copy"></i></button>
                             </td>
                         </tr>
                     @endforeach
@@ -77,7 +77,7 @@
                     <form action="">
 
                         <div class="row mb-3">
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Nome</label>
                                     <input class="form-control js-keyupTitle @error('name') is-invalid @enderror" type="text" id="name" placeholder="Nome" wire:model="name">
@@ -86,7 +86,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Tipologia</label>
                                     <select class="form-select form-select-lg me-1 @error('course_type_id') is-invalid @enderror" wire:model="course_type_id">
@@ -97,7 +97,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Durata</label>
                                     <select class="form-select form-select-lg me-1 @error('course_duration_id') is-invalid @enderror" wire:model="course_duration_id">
@@ -108,7 +108,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Frequenza</label>
                                     <select class="form-select form-select-lg me-1 @error('course_frequency_id') is-invalid @enderror" wire:model="course_frequency_id">
@@ -119,7 +119,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Livello</label>
                                     <select class="form-select form-select-lg me-1 @error('course_level_id') is-invalid @enderror" wire:model="course_level_id">
@@ -130,19 +130,19 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-3">
+                            <div class="col-3 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Data inizio</label>
                                     <input class="form-control" type="date" placeholder="Data inizio" wire:model="date_from">
                                 </div>
                             </div>
-                            <div class="col-3">
+                            <div class="col-3 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Data fine</label>
                                     <input class="form-control" type="date" placeholder="Data fine" wire:model="date_to">
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Prezzo mensile</label>
                                     <input class="form-control js-keyupTitle @error('price') is-invalid @enderror" type="text" id="price" onkeyup="onlyNumberAmount(this)" placeholder="€ 0,00" wire:model="price">
@@ -151,7 +151,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Prezzo iscrizione</label>
                                     <input class="form-control js-keyupTitle @error('subscription_price') is-invalid @enderror" type="text" id="subscription_price" onkeyup="onlyNumberAmount(this)" placeholder="€ 0,00" wire:model="subscription_price">
@@ -160,7 +160,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Causale</label>
                                     <livewire:causals :type="$typeIN" :idx="0" :causal_id="$causal_id" :wire:key="0" />
@@ -169,7 +169,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Causale iscrizione</label>
                                     <livewire:causals :type="$typeIN" :idx="0" :causal_id="$sub_causal_id" :wire:key="0" :emit="$setSubscriptionCausal" />
@@ -178,7 +178,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">N° partecipanti</label>
                                     <input class="form-control js-keyupTitle @error('max_members') is-invalid @enderror" type="text" id="max_members" placeholder="Numero massimo partecipanti" wire:model="max_members">
@@ -187,7 +187,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Istruttore</label>
                                     <input class="form-control js-keyupTitle @error('instructor') is-invalid @enderror" type="text" id="instructor" placeholder="Istruttore" wire:model="instructor">
@@ -196,7 +196,7 @@
                                     @enderror
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Anno</label>
                                     <select class="form-control" wire:model="year">
@@ -210,7 +210,7 @@
                                 </div>
                             </div>
 
-                            <div class="col-6">
+                            <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Gruppo di appartenenza</label>
                                     <select class="form-select form-select-lg me-1 @error('category_id') is-invalid @enderror" wire:model="category_id">
@@ -221,6 +221,12 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="col">
+                                <div class="form--item">
+                                    <label for="enabled" class="form-label">Abilitato</label>
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
+                                </div>
+                            </div>
 
 
                             <!--<div class="col-6">
@@ -331,21 +337,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Corsi',
                                         exportOptions: {

+ 1 - 1
resources/views/livewire/course_child.blade.php

@@ -3,7 +3,7 @@
         <td>{!! str_repeat("&nbsp;", $indentation * 5) !!} {{$record->name}}</td>
         <td>
             <button type="button" class="btn btn-outline-success btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
-            <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+            <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
             <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
         </td>
     </tr>

+ 5 - 5
resources/views/livewire/course_duration.blade.php

@@ -36,7 +36,7 @@
                             <td>{{$record->duration}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -86,7 +86,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -151,21 +151,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Durata corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Durata corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Durata corsi',
                                         exportOptions: {

+ 5 - 5
resources/views/livewire/course_frequency.blade.php

@@ -34,7 +34,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -73,7 +73,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -138,21 +138,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Frequenza corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Frequenza corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Frequenza corsi',
                                         exportOptions: {

+ 5 - 5
resources/views/livewire/course_level.blade.php

@@ -34,7 +34,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -73,7 +73,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -138,21 +138,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Livello corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Livello corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Livello corsi',
                                         exportOptions: {

+ 17 - 12
resources/views/livewire/course_list.blade.php

@@ -403,7 +403,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 1, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_1_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 1, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -420,7 +420,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 2, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_2_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 2, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -437,7 +437,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 3, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_3_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 3, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -454,7 +454,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 4, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_4_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 4, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -471,7 +471,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 5, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_5_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 5, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -488,7 +488,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 6, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_6_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 6, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -505,7 +505,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 7, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_7_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 7, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -522,7 +522,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 8, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_8_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 8, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -539,7 +539,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 9, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_9_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 9, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -556,7 +556,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 10, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_10_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 10, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -573,7 +573,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 11, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_11_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 11, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -590,7 +590,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 12, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_12_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', 12, ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -720,6 +720,10 @@
         var selectedMemberCourseId = 0;
         function setPayMonth(course_id, month, member_id, id)
         {
+            if (selectedMemberId > 0 && selectedMemberId != member_id)
+            {
+                months = [];
+            }
             if (selectedMemberCourseId != id)
             {
                 $(".lnk_" + selectedMemberCourseId).addClass("orange").removeClass("blue").removeClass("selected");
@@ -727,6 +731,7 @@
             selectedCourseId = course_id;
             selectedMemberId = member_id;
             selectedMemberCourseId = id;
+            
             if(!months.includes(month))
             {
                 months.push(month);

+ 5 - 5
resources/views/livewire/course_subscription.blade.php

@@ -34,7 +34,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -73,7 +73,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -138,21 +138,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Iscritti corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Iscritti corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Iscritti corsi',
                                         exportOptions: {

+ 5 - 5
resources/views/livewire/course_type.blade.php

@@ -34,7 +34,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -73,7 +73,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -138,21 +138,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Tipologia corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Tipologia corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Tipologia corsi',
                                         exportOptions: {

+ 5 - 5
resources/views/livewire/discipline.blade.php

@@ -34,7 +34,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -73,7 +73,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -138,21 +138,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Discipline',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Discipline',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Discipline',
                                         exportOptions: {

+ 20 - 19
resources/views/livewire/member.blade.php

@@ -104,7 +104,7 @@
                             <span class="name">{{$currentMember->first_name}} {{$currentMember->last_name}}</span>
                             <span class="badge tessera-badge {{$currentStatus["status"] > 0 ? ($currentStatus["status"] == 2 ? 'active' : 'suspended') : 'due'}}">{{$currentStatus["status"] > 0 ? ($currentStatus["status"] == 2 ? 'Tesserato' : 'Sospeso') : 'Non tesserato'}}</span>
                         </div>
-                        <button class="btn--ui extraLightGrey" wire:click="edit({{ $currentMember->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                        <button class="btn--ui extraLightGrey" wire:click="edit({{ $currentMember->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
 
                     </header>
 
@@ -466,7 +466,7 @@
                                     </td>
 
                                     <td>
-                                        <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                        <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                         <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                                     </td>
                                 </tr>
@@ -847,7 +847,7 @@
                                                                             <td>{{$member_certificate->expire_date ? date("d/m/Y", strtotime($member_certificate->expire_date)) : ''}}</td>
                                                                             <td>{!!$member_certificate->filename != '' ? '<a href="/storage/app/public/' . $member_certificate->filename . '" target="_blank">Visualizza</a>' : ''!!}</td>
                                                                             <td>
-                                                                                <button type="button" class="btn" wire:click="editCertificate({{ $member_certificate->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                                                                <button type="button" class="btn" wire:click="editCertificate({{ $member_certificate->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                                                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="deleteCertificate({{ $member_certificate->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                                                                             </td>
                                                                         </tr>
@@ -925,7 +925,7 @@
                                                             <td>{{$member_card->number}}</td>
                                                             <td>{{$member_card->expire_date ? date("d/m/Y", strtotime($member_card->expire_date)) : ''}}</td>
                                                             <td>
-                                                                <button type="button" class="btn" wire:click="editCard({{ $member_card->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                                                <button type="button" class="btn" wire:click="editCard({{ $member_card->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="deleteCard({{ $member_card->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                                                             </td>
                                                         </tr>
@@ -1150,21 +1150,21 @@
                                                             <tr>
                                                                 <td colspan="5">
                                                                     <a class="{{$this->getSubscriptionStatus($member_course->subscribed)}}" wire:click="setCreateSubscription({{$member_course->subscribed}})" style="float:none; width:150px;">Iscrizione</a><br>
-                                                                    <a class="{{$this->getMonthStatus(9, $member_course->months)}}" wire:click="setPayMonth(9, '{{ $member_course->months }}')">Set</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(10, $member_course->months)}}" wire:click="setPayMonth(10, '{{ $member_course->months }}')">Ott</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(11, $member_course->months)}}" wire:click="setPayMonth(11, '{{ $member_course->months }}')">Nov</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(12, $member_course->months)}}" wire:click="setPayMonth(12, '{{ $member_course->months }}')">Dic</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(1, $member_course->months)}}" wire:click="setPayMonth(1, '{{ $member_course->months }}')">Gen</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(2, $member_course->months)}}" wire:click="setPayMonth(2, '{{ $member_course->months }}')">Feb</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(3, $member_course->months)}}" wire:click="setPayMonth(3, '{{ $member_course->months }}')">Mar</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(4, $member_course->months)}}" wire:click="setPayMonth(4, '{{ $member_course->months }}')">Apr</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(5, $member_course->months)}}" wire:click="setPayMonth(5, '{{ $member_course->months }}')">Mag</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(6, $member_course->months)}}" wire:click="setPayMonth(6, '{{ $member_course->months }}')">Giu</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(7, $member_course->months)}}" wire:click="setPayMonth(7, '{{ $member_course->months }}')">Lug</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(8, $member_course->months)}}" wire:click="setPayMonth(8, '{{ $member_course->months }}')">Ago</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(9, $member_course->months)}}" wire:click="setPayMonth(9, '{{ $member_course->months }}')" {{$this->getMonthStatus(9, $member_course->months) == 'blue' || $this->getMonthStatus(9, $member_course->months) == 'orange' || $this->getMonthStatus(9, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Set</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(10, $member_course->months)}}" wire:click="setPayMonth(10, '{{ $member_course->months }}')" {{$this->getMonthStatus(10, $member_course->months) == 'blue' || $this->getMonthStatus(10, $member_course->months) == 'orange' || $this->getMonthStatus(10, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Ott</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(11, $member_course->months)}}" wire:click="setPayMonth(11, '{{ $member_course->months }}')" {{$this->getMonthStatus(11, $member_course->months) == 'blue' || $this->getMonthStatus(11, $member_course->months) == 'orange' || $this->getMonthStatus(11, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Nov</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(12, $member_course->months)}}" wire:click="setPayMonth(12, '{{ $member_course->months }}')" {{$this->getMonthStatus(12, $member_course->months) == 'blue' || $this->getMonthStatus(12, $member_course->months) == 'orange' || $this->getMonthStatus(12, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Dic</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(1, $member_course->months)}}" wire:click="setPayMonth(1, '{{ $member_course->months }}')" {{$this->getMonthStatus(1, $member_course->months) == 'blue' || $this->getMonthStatus(1, $member_course->months) == 'orange' || $this->getMonthStatus(1, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Gen</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(2, $member_course->months)}}" wire:click="setPayMonth(2, '{{ $member_course->months }}')" {{$this->getMonthStatus(2, $member_course->months) == 'blue' || $this->getMonthStatus(2, $member_course->months) == 'orange' || $this->getMonthStatus(2, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Feb</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(3, $member_course->months)}}" wire:click="setPayMonth(3, '{{ $member_course->months }}')" {{$this->getMonthStatus(3, $member_course->months) == 'blue' || $this->getMonthStatus(3, $member_course->months) == 'orange' || $this->getMonthStatus(3, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Mar</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(4, $member_course->months)}}" wire:click="setPayMonth(4, '{{ $member_course->months }}')" {{$this->getMonthStatus(4, $member_course->months) == 'blue' || $this->getMonthStatus(4, $member_course->months) == 'orange' || $this->getMonthStatus(4, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Apr</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(5, $member_course->months)}}" wire:click="setPayMonth(5, '{{ $member_course->months }}')" {{$this->getMonthStatus(5, $member_course->months) == 'blue' || $this->getMonthStatus(5, $member_course->months) == 'orange' || $this->getMonthStatus(5, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Mag</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(6, $member_course->months)}}" wire:click="setPayMonth(6, '{{ $member_course->months }}')" {{$this->getMonthStatus(6, $member_course->months) == 'blue' || $this->getMonthStatus(6, $member_course->months) == 'orange' || $this->getMonthStatus(6, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Giu</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(7, $member_course->months)}}" wire:click="setPayMonth(7, '{{ $member_course->months }}')" {{$this->getMonthStatus(7, $member_course->months) == 'blue' || $this->getMonthStatus(7, $member_course->months) == 'orange' || $this->getMonthStatus(7, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Lug</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(8, $member_course->months)}}" wire:click="setPayMonth(8, '{{ $member_course->months }}')" {{$this->getMonthStatus(8, $member_course->months) == 'blue' || $this->getMonthStatus(8, $member_course->months) == 'orange' || $this->getMonthStatus(8, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Ago</a>&nbsp;
                                                                 </td>
                                                                 <td>
-                                                                    <button type="button" class="btn" wire:click="editCourse({{ $member_course->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;
+                                                                    <button type="button" class="btn" wire:click="editCourse({{ $member_course->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;
                                                                     <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="deleteCourse({{ $member_course->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                                                                 </td>
                                                             </tr>
@@ -2296,7 +2296,7 @@
                     {
                         data: "action",
                         render: function (data){
-                            var ret = '<button type="button" class="btn" onclick="editData(' + data + ')" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;';
+                            var ret = '<button type="button" class="btn" onclick="editData(' + data + ')" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;';
                             ret += '<button type="button" class="btn" onclick="deleteData(' + data + ')" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>';
                             return ret;
                         }
@@ -2320,7 +2320,8 @@
                                     extend: 'excelHtml5',"action":newexportaction,
                                         title: 'Utenti',
                                         exportOptions: {
-                                            columns: ":not(':last')"
+                                            columns: ":not(':last')",
+                                            page: 'all'
                                         }
                                     },
                                     {

+ 4 - 4
resources/views/livewire/nation.blade.php

@@ -61,7 +61,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -194,21 +194,21 @@
                     topStart: {
                         buttons: [
                             {
-                                extend: 'excelHtml5',"action":newexportaction,
+                                extend: 'excelHtml5',
                                 title: 'Nazioni',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'pdfHtml5',"action":newexportaction,
+                                extend: 'pdfHtml5',
                                 title: 'Nazioni',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'print',"action":newexportaction,
+                                extend: 'print',
                                 text: 'Stampa',
                                 title: 'Nazioni',
                                 exportOptions: {

+ 5 - 5
resources/views/livewire/payment_method.blade.php

@@ -55,7 +55,7 @@
                             </td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -139,7 +139,7 @@
                         <div class="form--item mb-3">
                             <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                         </div>
 
@@ -217,21 +217,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Metodi di pagamento',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Metodi di pagamento',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Metodi di pagamento',
                                         exportOptions: {

+ 4 - 4
resources/views/livewire/province.blade.php

@@ -40,7 +40,7 @@
                             <td>{{$record->name}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -183,21 +183,21 @@
                     topStart: {
                         buttons: [
                             {
-                                extend: 'excelHtml5',"action":newexportaction,
+                                extend: 'excelHtml5',
                                 title: 'Provincie',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'pdfHtml5',"action":newexportaction,
+                                extend: 'pdfHtml5',
                                 title: 'Provincie',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'print',"action":newexportaction,
+                                extend: 'print',
                                 text: 'Stampa',
                                 title: 'Provincie',
                                 exportOptions: {

+ 6 - 6
resources/views/livewire/receipt.blade.php

@@ -98,9 +98,9 @@
                             <td>{{date("d/m/Y", strtotime($record->date))}}</td>
                             <td>{{formatPrice($record->rows->sum('amount'))}}</td>
                             <td>
-                                <button type="button" class="btn u" onclick="document.location.href='/in?id={{$record->record_id}}'" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="visualizza ricevuta"><i class="fa-regular fa-eye"></i></button>
-                                <a target="_blank" class="btn  u" href="/receipt/{{$record->id}}" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="stampa ricevuta"><i class="fa-regular fa-file-lines"></i></a>
-                                <a target="_blank" class="btn u" onclick="sendMail({{$record->id}})"><i class="fa-regular fa-envelope" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="invia email"></i></a>
+                                <button type="button" class="btn u" onclick="document.location.href='/in?id={{$record->record_id}}'" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="visualizza ricevuta"><i class="fa-regular fa-eye"></i></button>
+                                <a target="_blank" class="btn  u" href="/receipt/{{$record->id}}" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="stampa ricevuta"><i class="fa-regular fa-file-lines"></i></a>
+                                <a target="_blank" class="btn u" onclick="sendMail({{$record->id}})"><i class="fa-regular fa-envelope" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="invia email"></i></a>
                             </td>
                         </tr>
                     @endforeach
@@ -317,9 +317,9 @@
                         data: "action",
                         render: function (data){
                             // Split class and text
-                            var ret = '<button type="button" class="btn u" onclick="document.location.href=' + "'" + '/in?id=' + data + "'" + '" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="visualizza ricevuta"><i class="fa-regular fa-eye"></i></button>';
-                            ret += '<a target="_blank" class="btn  u" href="/receipt/' + data + '" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="stampa ricevuta"><i class="fa-regular fa-file-lines"></i></a>';
-                            ret += '<a target="_blank" class="btn u" onclick="sendMail(' + data + ')"><i class="fa-regular fa-envelope" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="invia email"></i></a>';
+                            var ret = '<button type="button" class="btn u" onclick="document.location.href=' + "'" + '/in?id=' + data + "'" + '" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="visualizza ricevuta"><i class="fa-regular fa-eye"></i></button>';
+                            ret += '<a target="_blank" class="btn  u" href="/receipt/' + data + '" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="stampa ricevuta"><i class="fa-regular fa-file-lines"></i></a>';
+                            ret += '<a target="_blank" class="btn u" onclick="sendMail(' + data + ')"><i class="fa-regular fa-envelope" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="invia email"></i></a>';
                             return ret;
                         }
                     }

+ 2 - 4
resources/views/livewire/records.blade.php

@@ -31,7 +31,7 @@
                         @endforeach
                     </select>
                 </div>
-                <div class="col-md-2">
+                <div class="col-md-4">
                     Causale
                     <select name="search_causal_id[]" class="form-select filterCausals me-2" multiple="multiple" wire:model="filterCausals">
                         @foreach($causals as $causal)
@@ -46,9 +46,7 @@
                     <span class="date_span ms-2">al</span><input type="date" wire:model="toDate" class="form-control">
                 </div>
                 <div class="col-md-2">
-                </div>
-                <div class="col-md-2">
-                    <div class="prima--nota_buttons ms-auto " style="float:right; margin-top:30px;">
+                    <div class="prima--nota_buttons ms-auto " style="float:right; margin-top:25px;">
                         <button class="btn--ui_outline light reset" wire:click="export()" style="margin-left:5px;color:#10172A"><i class="fa-solid fa-download"></i></button>
                         <button class="btn--ui_outline light reset" style="margin-left:5px;color:#10172A;" id="print"><i class="fa-solid fa-print"></i></button>
                     </div>

+ 30 - 24
resources/views/livewire/records_in.blade.php

@@ -318,7 +318,7 @@
 
                                         <div class="col-md-6" >
 
-                                            <select name="payment_method_id" class="form-select paymentClass @error('payment_method_id') is-invalid @enderror" aria-label="Seleziona un metodo di pagamento" wire:model="payment_method_id" style="width:100%">
+                                            <select name="payment_method_id" class="form-select paymentClass @error('payment_method_id') is-invalid @enderror" aria-label="Seleziona un metodo di pagamento" wire:model="payment_method_id" style="width:100%"  {{$this->dataId > 0 && $deleted ? 'disabled' : ''}}>
                                                 <option value="">--Seleziona--
                                                 @foreach($payments as $payment)
                                                     <option value="{{$payment->id}}">{{$payment->name}}
@@ -542,39 +542,41 @@
 
                                 <div class="accountingEntry--btn d-flex align-items-center justify-content-between mt-5">
                                     <button class="btn--ui lightGrey"  type="submit" wire:click.prevent="cancel()">annulla</button>
-                                    @if($canSave)
-                                        @if($add)
+                                    @if(!$deleted)
+                                        @if($canSave)
+                                            @if($add)
 
-                                            @if($commercial)
+                                                @if($commercial)
 
-                                                @if($corrispettivo_fiscale)
-                                                    @if($corrispettivo_causal_id > 0)
-                                                        <button class="btn--ui primary"  type="submit" wire:click.prevent="storeCorrispettivo()">inserisci corrispettivo fiscale</button>
+                                                    @if($corrispettivo_fiscale)
+                                                        @if($corrispettivo_causal_id > 0)
+                                                            <button class="btn--ui primary"  type="submit" wire:click.prevent="storeCorrispettivo()">inserisci corrispettivo fiscale</button>
+                                                        @else
+                                                            Non hai configurato una causale per il corrispettivo fiscale
+                                                        @endif
                                                     @else
-                                                        Non hai configurato una causale per il corrispettivo fiscale
+                                                        <button class="btn--ui primary"  type="submit" wire:click.prevent="store(false)" onclick='window.location.href = "#top";'>inserisci</button>
                                                     @endif
+
                                                 @else
-                                                    <button class="btn--ui primary"  type="submit" wire:click.prevent="store(false)" onclick='window.location.href = "#top";'>inserisci</button>
+                                                    @if($this->member && !$commercial && !$this->member->isAdult() && $parent == '')
+                                                        <span style="color:red">Devi selezionare un genitore</span>
+                                                    @else
+                                                        <button class="btn--ui primary sendInvoice d-flex ms-auto" wire:click.prevent="store(true)" onclick='window.location.href = "#top";'><i class="ico--ui sendingBtn"></i><span>inserisci {{!$commercial ? 'genera ricevuta' : ''}}</span></button>
+                                                    @endif
                                                 @endif
 
-                                            @else
+                                            @endif
+                                            @if($update && !$corrispettivo_fiscale)
                                                 @if($this->member && !$commercial && !$this->member->isAdult() && $parent == '')
                                                     <span style="color:red">Devi selezionare un genitore</span>
                                                 @else
-                                                    <button class="btn--ui primary sendInvoice d-flex ms-auto" wire:click.prevent="store(true)" onclick='window.location.href = "#top";'><i class="ico--ui sendingBtn"></i><span>inserisci {{!$commercial ? 'genera ricevuta' : ''}}</span></button>
+                                                    <button class="btn--ui primary sendInvoice d-flex ms-auto" wire:click.prevent="update({{!$commercial}})"><i class="ico--ui sendingBtn"></i><span>inserisci {{!$commercial ? 'genera ricevuta' : ''}}</span></button>
                                                 @endif
                                             @endif
-
-                                        @endif
-                                        @if($update && !$corrispettivo_fiscale)
-                                            @if($this->member && !$commercial && !$this->member->isAdult() && $parent == '')
-                                                <span style="color:red">Devi selezionare un genitore</span>
-                                            @else
-                                                <button class="btn--ui primary sendInvoice d-flex ms-auto" wire:click.prevent="update({{!$commercial}})"><i class="ico--ui sendingBtn"></i><span>inserisci {{!$commercial ? 'genera ricevuta' : ''}}</span></button>
-                                            @endif
+                                        @else
+                                            <span style="color:red">Attenzione : non c'è credito sufficiente sul borsellino virtuale</span>
                                         @endif
-                                    @else
-                                        <span style="color:red">Attenzione : non c'è credito sufficiente sul borsellino virtuale</span>
                                     @endif
 
                                 </div>
@@ -707,7 +709,7 @@
                                     </div>
                                 </div>
 
-                                @if($update && !$isDuplicate)
+                                @if($update && !$isDuplicate && !$deleted)
                                     @if($currentReceip)
                                         @if($currentReceip->status == 99)
                                             <br><b style="float:right">Annullata</b>
@@ -1171,9 +1173,13 @@
                             var ret = '';
                             if (j[2] != 'x')
                             {
-                                ret = '<button type="button" class="btn" onclick="editData(' + j[0] + ')" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;';
+                                ret = '<button type="button" class="btn" onclick="editData(' + j[0] + ')" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;';
                                 ret += '<button type="button" class="btn" onclick="deleteData(' + j[0] + ')"  data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>';
-                                ret += '<button type="button" class="btn btn-outline-default btn-sm" onclick="duplicateData(' + j[0] + ')" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Duplica"><i class="fa-regular fa-copy"></i></button>';
+                                ret += '<button type="button" class="btn btn-outline-default btn-sm" onclick="duplicateData(' + j[0] + ')" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Duplica"><i class="fa-regular fa-copy"></i></button>';
+                            }
+                            else
+                            {
+                                ret = '<button type="button" class="btn" onclick="editData(' + j[0] + ')" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Visualizza"><i class="fa-regular fa-file"></i></button>&nbsp;';
                             }
                             return ret;
                         }

+ 45 - 10
resources/views/livewire/records_in_out.blade.php

@@ -98,17 +98,16 @@
 
                                     @foreach($rows_in as $in)
                                         @if($filterCausalsIn == null || (sizeof($filterCausalsIn) == 0 || in_array($in["id"], $filterCausalsIn) || in_array($in["parent_id"], $filterCausalsIn) || in_array($in["first_parent_id"], $filterCausalsIn)))
+                                            @if($filterCausalsIn != null && !in_array($in["first_parent_id"], $filterCausalsIn))
+                                                <tr>
+                                                    <td colspan="20">
+                                                        {{$in["first_parent_name"]}} - {{$in["parent_name"]}}
+                                                    </td>
+                                                </tr>
+                                            @endif
                                             <tr data-id="{{$in["id"]}}" data-parent="{{$filterCausalsIn == null || in_array($in["parent_id"], $filterCausalsIn) ? $in["parent_id"] : ''}}">
                                                 <td>
-                                                    {!!str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $in["level"])!!}
-
-                                                    @if($filterCausalsIn != null && !in_array($in["first_parent_id"], $filterCausalsIn))
-                                                        {{$in["first_parent_name"]}}
-                                                        {{$in["parent_name"]}}
-                                                    @endif
-                                                    @if($filterCausalsIn != null && !in_array($in["parent_id"], $filterCausalsIn))
-
-                                                    @endif
+                                                    <span class="spaces">{!!str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $in["level"])!!}</span>
                                                     {{$in["name"]}}
                                                 </td>
                                                 @foreach($columns as $column)
@@ -335,6 +334,14 @@
             text-overflow: ellipsis;
             white-space: nowrap;
         }
+        .paddingLeftSelect1
+        {
+            padding-left: 20px !important;
+        }
+        .paddingLeftSelect2
+        {
+            padding-left: 40px !important;
+        }
     </style>
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
@@ -348,17 +355,44 @@
             load();
         });
 
-
         function load()
         {
             $(document).ready(function(){
 
                 $('.filterCausalsIn').select2();
+                
+                $('.filterCausalsIn').on('select2:open', function (e) {
+                    setTimeout(() => { 
+                        $(".select2-results__option").each(function(){
+                            var txt = $(this).html();
+                            var count = (txt.match(/-/g) || []).length;
+                            if (count > 0)
+                            {
+                                $(this).addClass('paddingLeftSelect' + count); 
+                            }
+                        });
+                    }, 500);                    
+                });
+                /*
+                $('.filterCausalsIn').on('select2:selecting', function (e) {
+                    setTimeout(() => { 
+                        $(".select2-results__option").each(function(){
+                            var txt = $(this).html();
+                            var count = (txt.match(/-/g) || []).length;
+                            if (count > 0)
+                            {
+                                $(this).addClass('paddingLeftSelect' + count); 
+                            }
+                        });
+                    }, 500);                    
+                });*/
                 $('.filterCausalsIn').on('change', function (e) {
                     var data = $('.filterCausalsIn').select2("val");
                     setTimeout(function() {createCollapse();}, 1000);
                     @this.set('filterCausalsIn', data);
                 });
+                console.log("QUA");
+                
 
                 $('.filterCausalsOut').select2();
                 $('.filterCausalsOut').on('change', function (e) {
@@ -373,6 +407,7 @@
         function createCollapse()
         {
             $(".act-more").remove();
+            $(".spaces").remove();
 
             //$("#checkall-target > tr").removeAttr("data-level");
             //$("#checkall-target > tr").removeAttr("class");

+ 0 - 281
resources/views/livewire/records_in_out_old.blade.php

@@ -1,281 +0,0 @@
-<div class="col">
-    <div class="row h-100">
-
-
-        <div class="col card--ui" id="card--dashboard">
-
-
-            <header id="title--section" style="display:none !important"  class="d-flex align-items-center justify-content-between">
-                <div class="title--section_name d-flex align-items-center justify-content-between">
-                    <i class="ico--ui title_section utenti me-2"></i>
-                    <h2 class="primary">Gestionale</h2>
-                </div>
-
-
-
-            </header>
-
-            <section id="subheader" class="d-flex">
-                <form action="" class="d-flex">
-                   <select class="form-select form-select-lg me-1 months"  wire:model="month" style="width:150px !important;">
-                        <option value="1" {{$month == 1 ? 'selected' : ''}}>Gennaio</option>
-                        <option value="2" {{$month == 2 ? 'selected' : ''}}>Febbraio</option>
-                        <option value="3" {{$month == 3 ? 'selected' : ''}}>Marzo</option>
-                        <option value="4" {{$month == 4 ? 'selected' : ''}}>Aprile</option>
-                        <option value="5" {{$month == 5 ? 'selected' : ''}}>Maggio</option>
-                        <option value="6" {{$month == 6 ? 'selected' : ''}}>Giugno</option>
-                        <option value="7" {{$month == 7 ? 'selected' : ''}}>Luglio</option>
-                        <option value="8" {{$month == 8 ? 'selected' : ''}}>Agosto</option>
-                        <option value="9" {{$month == 9 ? 'selected' : ''}}>Settembre</option>
-                        <option value="10" {{$month == 10 ? 'selected' : ''}}>Ottobre</option>
-                        <option value="11" {{$month == 11 ? 'selected' : ''}}>Novembre</option>
-                        <option value="12" {{$month == 12 ? 'selected' : ''}}>Dicembre</option>
-                    </select>
-                </form>
-                <form action="" class="d-flex">
-                    <select class="form-select "  wire:model="year" style="width:100px !important;">
-                        @for($y=date("Y"); $y>date("Y") - 2; $y--)
-                            <option value="{{$y}}">{{$y}}</option>
-                        @endfor
-                    </select>
-                </form>
-
-                @if($total_in > 0 || $total_out > 0)
-                    <h4  style="width:100%;text-align:right">Totale mese entrate/uscite : <span class="tablesaw-cell-content primary" style="color:{{$total_in - $total_out > 0 ? 'green' : 'red'}}">{{formatPrice($total_in - $total_out)}}</span></h4>
-                @endif
-
-            </section>
-
-
-            <section id="resume-table">
-
-
-                <div class="compare--chart_wrapper d-none"></div>
-
-                <div class="row ">
-                    <div class="col-md-6">
-
-                        <h1>Entrate</h1>
-
-                        <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
-                            <thead>
-                                <tr>
-                                    <th scope="col">Data</th>
-                                    <th scope="col">Cliente</th>
-                                    <th scope="col">Causale</th>
-                                    <th scope="col"  style="text-align:right;">Importo</th>
-                                </tr>
-                            </thead>
-                            <tbody id="checkall-target">
-                                @foreach($records_in as $record)
-                                    <tr>
-                                        <td>{{date("d/m/Y", strtotime($record->date))}}</td>
-                                        <td>
-                                            @if($record->member)
-                                                {{$record->member->first_name}} {{$record->member->last_name}}
-                                            @endif
-                                        </td>
-                                        <td><a href="/in?id={{$record->record_id}}">{{$this->getCausal($record->causal_id)}}</a></td>
-                                        <td style="text-align:right;"><span class="tablesaw-cell-content primary">{{formatPrice($record->amount)}}</span></td>
-                                    </tr>
-                                @endforeach
-                                <tr>
-                                    <td></td>
-                                    <td></td>
-                                    <td><b>Totale</b></td>
-                                    <td style="text-align:right;"><span class="tablesaw-cell-content primary" style="color:green"><b>{{formatPrice($total_in)}}</b></span></td>
-                                </tr>
-                            </tbody>
-                            <tfoot>
-
-                            </tfoot>
-                        </table>
-                    </div>
-
-                    <div class="col-md-6">
-
-                        <h1>Uscite</h1>
-
-                        <table class="table tablesaw tablesaw-stack" id="tablesaw-350x">
-                            <thead>
-                                <tr>
-                                    <th scope="col">Data</th>
-                                    <th scope="col">Fornitore</th>
-                                    <th scope="col">Causale</th>
-                                    <th scope="col" style="text-align:right;">Importo</th>
-                                </tr>
-                            </thead>
-                            <tbody id="checkall-target">
-                                @foreach($records_out as $record)
-                                    <tr>
-                                        <td>{{date("d/m/Y", strtotime($record->date))}}</td>
-                                        <td>
-                                            @if($record->supplier)
-                                                {{$record->supplier->name}}
-                                            @endif
-                                        </td>
-                                        <td>{{$this->getCausal($record->causal_id)}}</td>
-                                        <td style="text-align:right;"><span class="tablesaw-cell-content primary">{{formatPrice($record->amount)}}</span></td>
-                                    </tr>
-                                @endforeach
-                                <tr>
-                                    <td></td>
-                                    <td></td>
-                                    <td><b>Totale</b></td>
-                                    <td style="text-align:right;"><span class="tablesaw-cell-content primary" style="color:red"><b>{{formatPrice($total_out)}}</b></span></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </section>
-
-        </div>
-    </div>
-</div>
-
-@push('scripts')
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-    <style>
-        .select2-container--default .select2-selection--single{
-            background-color: #E9F0F5;
-            border: 0.0625rem solid #DFE5EB;
-            font-size: 0.75rem;
-        }
-        .select2-selection
-        {
-            height: 38px !important;
-        }
-        .select2-selection__rendered
-        {
-            padding-top:3px;
-        }
-        .select2 {
-            width:100% !important;
-        }
-    </style>
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-@endpush
-
-@push('scripts')
-    <script>
-
-        $(".months").select2({
-            closeOnSelect : false,
-            placeholder : "Placeholder",
-            allowHtml: true,
-            allowClear: true,
-            tags: true // создает новые опции на лету
-		});
-        /*
-        function matchStart(params, data) {
-            params.term = params.term || '';
-            if (data.text.toUpperCase().indexOf(params.term.toUpperCase()) == 0) {
-                return data;
-            }
-            return false;
-        }
-
-        window.livewire.on('refresh', () => {
-            $('.causalClass').select2();
-            $('.memberClass').select2({
-                matcher: function(params, data) {
-                    return matchStart(params, data);
-                }
-            });
-            $('.paymentClass').select2({
-                matcher: function(params, data) {
-                    return matchStart(params, data);
-                }
-            });
-        });
-        Livewire.on('load-select', () => {
-
-
-
-
-            $('.causalClass').select2();
-            $('.causalClass').on('change', function (e) {
-                var data = $('.causalClass').select2("val");
-                @this.set('causal_id', data);
-            });
-            $('.memberClass').select2({
-                matcher: function(params, data) {
-                    return matchStart(params, data);
-                }
-            });
-            $('.memberClass').on('change', function (e) {
-                var data = $('.memberClass').select2("val");
-                @this.set('member_id', data);
-            });
-            $('.paymentClass').select2({
-                matcher: function(params, data) {
-                    return matchStart(params, data);
-                }
-            });
-            $('.paymentClass').on('change', function (e) {
-                var data = $('.paymentClass').select2("val");
-                @this.set('payment_method_id', data);
-            });
-
-            $('.filterMember').select2();
-            $('.filterMember').on('change', function (e) {
-                var data = $('.filterMember').select2("val");
-                @this.set('filterMember', data);
-            });
-            $('.filterPaymentMethod').select2();
-            $('.filterPaymentMethod').on('change', function (e) {
-                var data = $('.filterPaymentMethod').select2("val");
-                @this.set('filterPaymentMethod', data);
-            });
-            $('.filterCausals').select2();
-            $('.filterCausals').on('change', function (e) {
-                var data = $('.filterCausals').select2("val");
-                @this.set('filterCausals', data);
-            });
-
-        });
-
-        Livewire.on('hide-search', () => {
-            pcsh2();
-        });
-
-        window.livewire.on('saved', () => {
-            $('#userModal').modal('hide');
-        });
-        window.livewire.on('reloadMembers', () => {
-            $('.memberClass').select2("destroy");
-            $('.memberClass').select2({
-                matcher: function(params, data) {
-                    return matchStart(params, data);
-                }
-            });
-        });
-
-        $('.filterMember').select2();
-        $('.filterMember').on('change', function (e) {
-            var data = $('.filterMember').select2("val");
-            @this.set('filterMember', data);
-        });
-        $('.filterPaymentMethod').select2();
-        $('.filterPaymentMethod').on('change', function (e) {
-            var data = $('.filterPaymentMethod').select2("val");
-            @this.set('filterPaymentMethod', data);
-        });
-        $('.filterCausals').select2();
-        $('.filterCausals').on('change', function (e) {
-            var data = $('.filterCausals').select2("val");
-            @this.set('filterCausals', data);
-        });
-
-        function onlyNumberAmount(input) {
-            let v = input.value.replace(/\D+/g, '');
-            if (v.length > 14) v = v.slice(0, 14);
-            input.value = "€ " + v.replace(/(\d)(\d\d)$/, "$1,$2").replace(/(^\d{1,3}|\d{3})(?=(?:\d{3})+(?:,|$))/g, '$1.');
-        }
-        */
-
-    </script>
-
-@endpush

+ 2 - 4
resources/views/livewire/records_out.blade.php

@@ -125,7 +125,7 @@
                 <section id="resume-table">
                     <div class="compare--chart_wrapper d-none"></div>
 
-                    <table class="table tablesaw tablesaw-stack tableHead" id="tablesaw-350" width="100%">
+                    <table class="table tablesaw tablesaw-stack table--lista_entrate tableHead" id="tablesaw-350" width="100%">
                         <thead>
                             <tr>
                                 <!--<th scope="col"></th>-->
@@ -507,7 +507,6 @@
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
         table.tableHead thead {
-        /* Important */
             position: sticky;
             z-index: 100;
             top: 0;
@@ -763,7 +762,6 @@
 
             $('#tablesaw-350').DataTable({
                 //searching: false,
-                fixedHeader: true,
                 ajax: "/get_record_out?filterSupplier=" + filterSupplier + "&filterPaymentMethod=" + filterPaymentMethod + "&filterCausals=" + filterCausals + "&filterFrom=" + filterFrom + "&filterTo=" + filterTo,
                 columns: [
                     {
@@ -793,7 +791,7 @@
                             const j = data.split("|");
                             //$(".totalDiv").html('Totale&nbsp;:&nbsp;<b>' + j[1] + '</b>');
                             //$(".total").html('Totale&nbsp;:&nbsp;<b>' + j[1] + '</b>');
-                            var ret = '<button type="button" class="btn" onclick="editData(' + j[0] + ')" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;';
+                            var ret = '<button type="button" class="btn" onclick="editData(' + j[0] + ')" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;';
                             ret += '<button type="button" class="btn" onclick="deleteData(' + j[0] + ')" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>';
                             return ret;
                         }

+ 3 - 3
resources/views/livewire/reminders.blade.php

@@ -267,21 +267,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Scadenze',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Scadenze',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Scadenze',
                                         exportOptions: {

+ 6 - 6
resources/views/livewire/sponsor.blade.php

@@ -60,7 +60,7 @@
                             <td>{{$record->vat}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -227,7 +227,7 @@
                                                 <div class="form--item">
                                                     <div class="form--item">
                                                         <label for="enabled" class="form-label">Abilitato</label>
-                                                        <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                                        <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                                     </div>
                                                 </div>
                                             </div>
@@ -269,7 +269,7 @@
                                                         @endif
                                                     </td>
                                                     <td>
-                                                        <button type="button" class="btn" wire:click="editContract({{ $contract->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                                        <button type="button" class="btn" wire:click="editContract({{ $contract->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                                         <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="deleteContract({{ $contract->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                                                     </td>
                                                 </tr>
@@ -520,21 +520,21 @@
                     topStart: {
                         buttons: [
                             {
-                                extend: 'excelHtml5',"action":newexportaction,
+                                extend: 'excelHtml5',
                                 title: 'Sponsor',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'pdfHtml5',"action":newexportaction,
+                                extend: 'pdfHtml5',
                                 title: 'Sponsor',
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
                             },
                             {
-                                extend: 'print',"action":newexportaction,
+                                extend: 'print',
                                 text: 'Stampa',
                                 title: 'Sponsor',
                                 exportOptions: {

Разлика између датотеке није приказан због своје велике величине
+ 0 - 14006
resources/views/livewire/style.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
resources/views/livewire/style.css.map


+ 5 - 5
resources/views/livewire/supplier.blade.php

@@ -40,7 +40,7 @@
                             <td>{{$record->email}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -229,7 +229,7 @@
                                 <div class="form--item">
                                     <div class="form--item">
                                         <label for="enabled" class="form-label">Abilitato</label>
-                                        <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                        <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                     </div>
                                 </div>
                             </div>
@@ -396,21 +396,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Fornitori',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Fornitori',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Fornitori',
                                         exportOptions: {

+ 8 - 6
resources/views/livewire/user.blade.php

@@ -36,8 +36,10 @@
                             <td>{{$record->level == 0 ? 'Admin' : 'Worker'}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
-                                <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
+                                @if($record->email != 'admin@admin.com')
+                                    <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>                                
+                                    <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
+                                @endif
                             </td>
                         </tr>
                     @endforeach
@@ -107,7 +109,7 @@
                             <div class="col-md-6">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -172,21 +174,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Durata corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Durata corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Durata corsi',
                                         exportOptions: {

+ 5 - 5
resources/views/livewire/vat.blade.php

@@ -37,7 +37,7 @@
                             <td>{{$record->value}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
-                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover" onclick="hidePop(this)" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
+                                <button type="button" class="btn" wire:click="edit({{ $record->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
                                 <button type="button" class="btn" onclick="confirm('Sei sicuro?') || event.stopImmediatePropagation()" wire:click="delete({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Elimina"><i class="fa-regular fa-trash-can"></i></button>
                             </td>
                         </tr>
@@ -85,7 +85,7 @@
                             <div class="col">
                                 <div class="form--item">
                                     <label for="enabled" class="form-label">Abilitato</label>
-                                    <input class="form-check-input form-control" style="width:30px; height:30px;" type="checkbox" id="enabled" wire:model="enabled">
+                                    <input class="form-check-input form-control" style="width:22px; height:22px;" type="checkbox" id="enabled" wire:model="enabled">
                                 </div>
                             </div>
                         </div>
@@ -150,21 +150,21 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                    extend: 'excelHtml5',
                                         title: 'Iva',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'pdfHtml5',"action":newexportaction,
+                                        extend: 'pdfHtml5',
                                         title: 'Iva',
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         }
                                     },
                                     {
-                                        extend: 'print',"action":newexportaction,
+                                        extend: 'print',
                                         text: 'Stampa',
                                         title: 'Iva',
                                         exportOptions: {

+ 14 - 6
routes/web.php

@@ -73,6 +73,8 @@ Route::group(['middleware' => 'auth'],function(){
     Route::get('/records_in_out', \App\Http\Livewire\RecordINOUT::class);
     Route::get('/users', \App\Http\Livewire\User::class);
 
+});
+
     Route::get('/receipt/{id}', function($id){
         $receipt = \App\Models\Receipt::findOrFail($id);
         $pdf = PDF::loadView('receipt', array('receipt' => $receipt));
@@ -639,13 +641,13 @@ Route::group(['middleware' => 'auth'],function(){
         if ($_GET["filterFrequency"] != "null")
         {
             $frequencies = explode(",", $_GET["filterFrequency"]);
-            $course_ids = \App\Models\Course::whereIn('course_type_id', $frequencies)->pluck('id');
+            $course_ids = \App\Models\Course::whereIn('course_frequency_id', $frequencies)->pluck('id');
             $member_course = $member_course->whereIn('course_id', $course_ids);
         }
         if ($_GET["filterType"] != "null")
         {
             $types = explode(",", $_GET["filterType"]);
-            $course_ids = \App\Models\Course::whereIn('course_frequency_id', $types)->pluck('id');
+            $course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
             $member_course = $member_course->whereIn('course_id', $course_ids);
         }
         if ($_GET["filterDuration"] != "null")
@@ -732,7 +734,7 @@ Route::group(['middleware' => 'auth'],function(){
         {
             $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=green><small>" . (isset($totalIsc["Y"]) ? formatPrice($totalIsc["Y"]) : 0) . "</small></a><br>";
             $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=orange><small>" . (isset($totalIsc["N"]) ? formatPrice($totalIsc["N"]) : 0) . "</small></a><br>";
-            $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=yellow><small>02220</small></a><br>";
+            $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=yellow><small>0</small></a><br>";
         }
         $js .= "2§" . $str . "_";
         $str = "";
@@ -904,13 +906,13 @@ Route::group(['middleware' => 'auth'],function(){
         if ($_GET["filterFrequency"] != "null")
         {
             $frequencies = explode(",", $_GET["filterFrequency"]);
-            $course_ids = \App\Models\Course::whereIn('course_type_id', $frequencies)->pluck('id');
+            $course_ids = \App\Models\Course::whereIn('course_frequency_id', $frequencies)->pluck('id');
             $datas = $datas->whereIn('course_id', $course_ids);
         }
         if ($_GET["filterType"] != "null")
         {
             $types = explode(",", $_GET["filterType"]);
-            $course_ids = \App\Models\Course::whereIn('course_frequency_id', $types)->pluck('id');
+            $course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
             $datas = $datas->whereIn('course_id', $course_ids);
         }
         if ($_GET["filterDuration"] != "null")
@@ -1148,7 +1150,7 @@ Route::group(['middleware' => 'auth'],function(){
 
     });
 
-});
+
 
 function getColor($months, $m)
 {
@@ -1184,3 +1186,9 @@ Route::get('/updateData', function()
     // Call and Artisan command from within your application.
     Artisan::call('update:data');
 });
+
+Route::get('/seed', function()
+{
+    // Call and Artisan command from within your application.
+    Artisan::call('db:seed');
+});

Неке датотеке нису приказане због велике количине промена