task trello

app/Http/Livewire/Member.php

@@ -838,6 +838,12 @@ class Member extends Component
 
         $this->emit('setErrorMsg', $zzz);
 
+        $existingMember = \App\Models\Member::where('fiscal_code', $this->fiscal_code)->first();
+        if ($existingMember) {
+            $this->addError('fiscal_code', 'Codice fiscale già esistente nel sistema.');
+            return;
+        }
+
         $this->validate($rules);
             //$this->emit('setErrors');
 

public/css/style.css

@@ -16623,3 +16623,53 @@ div.dt-container div.dt-length label {
 }
 
 /*# sourceMappingURL=style.css.map */
+/* Level Styling */
+.level-wrapper {
+    display: flex;
+    align-items: center;
+}
+
+.level-dot {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background-color: #000;
+    margin-right: 10px;
+}
+
+.level-indicator {
+    display: inline-flex;
+    align-items: center;
+}
+
+/* Level-specific styling */
+.record-level-0 {
+    font-weight: bold;
+}
+
+.record-level-1 {
+    background-color: rgba(248, 249, 250, 0.5);
+}
+
+.record-level-2 {
+    background-color: rgba(248, 249, 250, 0.8);
+}
+
+.record-level-3 {
+    background-color: rgba(236, 240, 241, 0.7);
+}
+
+.record-level-4 {
+    background-color: rgba(236, 240, 241, 0.9);
+}
+
+/* Level badges - alternative approach */
+.level-badge {
+    font-size: 0.65em;
+    padding: 2px 5px;
+    margin-right: 5px;
+    border-radius: 3px;
+    background-color: #e9ecef;
+    color: #495057;
+}

resources/views/livewire/bank.blade.php

@@ -129,13 +129,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/card.blade.php

@@ -191,13 +191,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/category.blade.php

@@ -16,14 +16,14 @@
                     <a href="#" wire:click="add()" style="color:white">AGGIUNGI</a>
                 </div>
             </div>
-            
+
         @endif
 
     </header>
 
 
-    
-    
+
+
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
@@ -37,7 +37,7 @@
                 <tbody id="checkall-target">
                     @foreach($records as $record)
                         <tr>
-                            <td>{{$record->name}}</td>
+                            <td style="font-weight: bold">{{$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"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
@@ -88,13 +88,13 @@
                         </div>
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/category_child.blade.php

@@ -1,9 +1,16 @@
 @foreach($records as $record)
-    <tr>
-        <td>{!! str_repeat("&nbsp;", $indentation * 5) !!} {{$record->name}}</td>
+    <tr class="record-level-{{$indentation}}">
+        <td>
+            <div class="level-wrapper level-{{$indentation}}">
+                @for ($i = 0; $i < $indentation; $i++)
+                    <span class="level-dot"></span>
+                @endfor
+                <span class="level-indicator">{{$record->name}}</span>
+            </div>
+        </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"  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>

resources/views/livewire/causal.blade.php

@@ -16,7 +16,7 @@
                     <a href="#" wire:click="add()" style="color:white">AGGIUNGI</a>
                 </div>
             </div>
-            
+
         @endif
 
     </header>
@@ -38,7 +38,7 @@
                 <tbody id="checkall-target" wire:sortable="reorder" wire:sortable.options="{ animation: 100 }" wire:sortable-group="reorderGroup">
                     @foreach($recordsIn as $record)
                         <tr wire:sortable.item="{{ $record->id }}" wire:sortable.triggers="reorder">
-                            <td>{{$record->name}}</td>
+                            <td style="font-weight: bold;">{{$record->name}}</td>
                             <td>{{$record->type == 'IN' ? 'Entrata' : 'Uscita'}}</td>
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
@@ -70,14 +70,22 @@
                 </thead>
                 <tbody id="checkall-target" wire:sortable="reorder" wire:sortable.options="{ animation: 100 }" wire:sortable-group="reorderGroup">
                     @foreach($recordsOut as $record)
-                        <tr wire:sortable.item="{{ $record->id }}" wire:sortable.triggers="reorder">
-                            <td>{{$record->name}}</td>
+                        <tr wire:sortable.item="{{ $record->id }}" wire:sortable.triggers="reorder" class="record-level-0">
+                            <td>
+                                <span class="level-indicator level-0">{{$record->name}}</span>
+                            </td>
                             <td>{{$record->type == 'IN' ? 'Entrata' : 'Uscita'}}</td>
-                            <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></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 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"  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 +93,6 @@
                             @include('livewire/causal_child',['records' => $record->childs, 'indentation' => 1])
                         @endif
                     @endforeach
-
                 </tbody>
             </table>
 
@@ -193,13 +200,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/causal_child.blade.php

@@ -1,17 +1,31 @@
 @foreach($records as $record)
-    <tr >
-        <td>{!! str_repeat("&nbsp;", $indentation * 5) !!} {{$record->name}}</td>
+    <tr class="record-level-{{$indentation}}">
+        <td>
+            <div class="level-wrapper level-{{$indentation}}">
+                @for ($i = 0; $i < $indentation; $i++)
+                    <span class="level-dot"></span>
+                @endfor
+                <span class="level-indicator">
+                    {{$record->name}}
+                </span>
+            </div>
+        </td>
         <td>{{$record->type == 'IN' ? 'Entrata' : 'Uscita'}}</td>
-        <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></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 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"  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>
     @if(count($record->childs))
-        @include('livewire/causal_child',['records' => $record->childs, 'indentation' => 2])
+        @include('livewire/causal_child',['records' => $record->childs, 'indentation' => $indentation + 1])
     @endif
-
 @endforeach

resources/views/livewire/city.blade.php

@@ -100,13 +100,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/course.blade.php

@@ -34,14 +34,14 @@
                         $selected = '';
                         if (!isset($_GET["year"]))
                         {
-                            try 
+                            try
                             {
                                 list($f, $t) = explode("-", $c);
                                 if ($f == date("Y") - 1)
                                     $selected = 'selected';
                             } catch (Exception $e) {
-                            
-                            }                                
+
+                            }
                         }
                         else
                         {
@@ -294,13 +294,13 @@
                         </div>
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" onclick="annulla()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" onclick="annulla()">Annulla</button>
                         </div>
 
                     </form>
@@ -372,7 +372,7 @@
             }
 
             $('#tablesaw-350').DataTable({
-                
+
                 thead: {
                 'th': {'background-color': 'blue'}
                 },

resources/views/livewire/course_duration.blade.php

@@ -96,13 +96,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/course_frequency.blade.php

@@ -83,13 +83,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/course_level.blade.php

@@ -83,13 +83,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>

resources/views/livewire/course_list.blade.php

@@ -22,14 +22,14 @@
                             @foreach($course_years as $c)
                                 @php
                                 $selected = '';
-                                try 
+                                try
                                 {
                                     list($f, $t) = explode("-", $c);
                                     if ($f == date("Y"))
                                         $selected = 'selected';
                                 } catch (Exception $e) {
-                                
-                                }                                
+
+                                }
                                 @endphp
                                 <option value="{{$c}}" {{$selected}}>{{$c}}
                             @endforeach
@@ -111,7 +111,7 @@
         </div>
         <div class="row g-3" style="margin-top:20px;">
             <div class="col-md-12" style="text-align:right">
-                <button class="btn--ui_outline light" onclick="reset()">CANCELLA</button>
+                <button class="btn--ui_outline light" onclick="reset()">RESET</button>
                 <button class="btn--ui" onclick="loadDataTable()">FILTRA</button>
             </div>
         </div>
@@ -184,7 +184,7 @@
     <style>
 
     .scrollTable {
-            
+
             padding: 15px;
             /*max-width: 800px !important;*/
             /*overflow-x: auto;
@@ -227,7 +227,7 @@
             padding-left:20px !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>
@@ -249,7 +249,7 @@
             padding-top:10px;
             top: -15px;
             left: 0px;
-            
+
         }
 
 
@@ -843,20 +843,20 @@
                                                 z = y + 4;
                                                 var c = output_table.column(z).data().toArray();
                                                 //console.log(c);
-                                                for (var i = 0; i < c.length; i++) 
+                                                for (var i = 0; i < c.length; i++)
                                                 {
                                                     var j = c[i].split("§");
-                                                    if (j[0] == '0' || j[0] == 'orange') 
+                                                    if (j[0] == '0' || j[0] == 'orange')
                                                     {
                                                         $('row:nth-child('+(i+3)+') [r^="' + letters[y] + '"]', sheet).attr('s', '10');
                                                         //sheet.table.body[i+1][z].fillColor = 'orange';
                                                     }
-                                                    if (j[0] == '1' || j[0] == 'green') 
+                                                    if (j[0] == '1' || j[0] == 'green')
                                                     {
                                                         $('row:nth-child('+(i+3)+') [r^="' + letters[y] + '"]', sheet).attr('s', '40');
                                                         //doc.content[1].table.body[i+1][z].fillColor = 'green';
                                                     }
-                                                    if (j[0] == 'yellow') 
+                                                    if (j[0] == 'yellow')
                                                     {
                                                         $('row:nth-child('+(i+3)+') [r^="' + letters[y] + '"]', sheet).attr('s', '20');
                                                         //doc.content[1].table.body[i+1][z].fillColor = 'blue';
@@ -864,7 +864,7 @@
                                                 }
                                             }
                                         },
-                                        
+
 
                                     },
                                     {
@@ -879,18 +879,18 @@
                                             for(z=4; z<=16; z++)
                                             {
                                                 var c = output_table.column(z).data().toArray();
-                                                for (var i = 0; i < c.length; i++) 
+                                                for (var i = 0; i < c.length; i++)
                                                 {
                                                     var j = c[i].split("§");
-                                                    if (j[0] == '0' || j[0] == 'orange') 
+                                                    if (j[0] == '0' || j[0] == 'orange')
                                                     {
                                                         doc.content[1].table.body[i+1][z].fillColor = 'orange';
                                                     }
-                                                    if (j[0] == '1' || j[0] == 'green') 
+                                                    if (j[0] == '1' || j[0] == 'green')
                                                     {
                                                         doc.content[1].table.body[i+1][z].fillColor = 'green';
                                                     }
-                                                    if (j[0] == 'yellow') 
+                                                    if (j[0] == 'yellow')
                                                     {
                                                         doc.content[1].table.body[i+1][z].fillColor = 'blue';
                                                     }
@@ -1073,12 +1073,12 @@
             setMaxHeight();
             $( window ).bind( "resize", setMaxWidth );
             $( window ).bind( "resize", setMaxHeight );
-            
+
 
             function setMaxWidth() {
                  $("#resume-table").width( Math.round( $(window ).width() - size ) ) ;
                  $(".justify-content-between").css({"width": Math.round( $(window ).width() - size) + "px;"}); //.width( Math.round( $(window ).width() - size ) ) ;
-                 
+
             }
             function setMaxHeight() {
                 console.log('height:' + $(window ).height() + 'px !important');

resources/views/livewire/course_member.blade.php

@@ -246,7 +246,7 @@
         </div>
         <div class="row g-3 mt-2">
             <div class="col-md-12" style="text-align:right">
-                <button class="btn--ui_outline light"  onclick="reset()">CANCELLA</button>
+                <button class="btn--ui_outline light"  onclick="reset()">RESET</button>
                 <button class="btn--ui" onclick="loadDataTable()">FILTRA</button>
             </div>
         </div>
@@ -272,7 +272,7 @@
                 </tr>
             </thead>
             <tbody id="checkall-target">
-                
+
             </tbody>
         </table>
 
@@ -430,74 +430,74 @@
             if (filterYear)
             {
                 $('.filterYear').val(filterYear).trigger('change');
-            }        
+            }
             var filterCourse = localStorage.getItem("filterCourseCourseMember");
             if (filterCourse)
             {
                 $('.filterCourse').val(filterCourse).trigger('change');
-            }        
+            }
             var filterLevel = localStorage.getItem("filterLevelCourseMember");
             if (filterLevel)
             {
                 $('.filterLevel').val(filterLevel).trigger('change');
-            }        
+            }
             var filterFrequency = localStorage.getItem("filterFrequencyCourseMember");
             if (filterFrequency)
             {
                 $('.filterFrequency').val(filterFrequency).trigger('change');
-            }        
+            }
             var filterDuration = localStorage.getItem("filterDurationCourseMember");
             if (filterDuration)
             {
                 $('.filterDuration').val(filterDuration).trigger('change');
-            }        
+            }
             var filterType = localStorage.getItem("filterTypeCourseMember");
             if (filterType)
             {
                 $('.filterType').val(filterType).trigger('change');
-            }        
+            }
 
             var filterDays = localStorage.getItem("filterDaysCourseMember");
             if (filterDays)
             {
                 $('.filterDays').val(filterDays).trigger('change');
-            }        
-            
+            }
+
             var filterHours = localStorage.getItem("filterHoursCourseMember");
             if (filterHours)
             {
                 $('.filterHours').val(filterHours).trigger('change');
-            }        
-            
+            }
+
             var filterStatus = localStorage.getItem("filterStatusCourseMember");
             if (filterStatus)
             {
                 $('.filterStatus').val(filterStatus).trigger('change');
-            }        
+            }
 
             var filterSubscription = localStorage.getItem("filterSubscriptionCourseMember");
             if (filterSubscription)
             {
                 $('.filterSubscription').val(filterSubscription).trigger('change');
-            }        
-            
+            }
+
             var filterCards = localStorage.getItem("filterCardsCourseMember");
             if (filterCards)
             {
                 $('.filterCards').val(filterCards).trigger('change');
-            }        
+            }
 
             var filterCertificateScadenza = localStorage.getItem("filterCertificateScadenzaCourseMember");
             if (filterCertificateScadenza)
             {
                 $('.filterCertificateScadenza').val(filterCertificateScadenza).trigger('change');
-            }        
-            
+            }
+
             var filterCertificateType = localStorage.getItem("filterCertificateTypeCourseMember");
             if (filterCertificateType)
             {
                 $('.filterCertificateType').val(filterCertificateType).trigger('change');
-            }        
+            }
 
             var fromYear = localStorage.getItem("fromYearCourseMember");
             if (fromYear)
@@ -520,7 +520,7 @@
             {
                 $('input[name="toToYear"]').val(toYearYear);
             }
-        @endif        
+        @endif
 
         function reset()
         {
@@ -604,7 +604,7 @@
 
             var filterSubscription = $('.filterSubscription').val();
             localStorage.setItem("filterSubscriptionCourseMember", filterSubscription);
-            
+
             var filterYear = $('.filterYear').val();
             localStorage.setItem("filterYearCourseMember", filterYear);
 

resources/views/livewire/course_subscription.blade.php

@@ -83,13 +83,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/course_type.blade.php

@@ -83,13 +83,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/discipline.blade.php

@@ -83,13 +83,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/member.blade.php

@@ -317,9 +317,11 @@
                                 </div>
                                 <div class="col-12">
                                     <select name="filterCategories" class="form-select filterCategories" multiple="multiple">
-                                        <option value="">Tutte
+                                        <option value="">Tutte</option>
                                         @foreach($categories as $category)
-                                            <option value="{{$category["id"]}}">{{$category["name"]}}
+                                            <option value="{{$category["id"]}}">
+                                                {!! str_repeat('&bull; ', $category["indentation"] ?? 0) !!}{{$category["name"]}}
+                                            </option>
                                         @endforeach
                                     </select>
                                 </div>
@@ -391,11 +393,11 @@
                             <tr>
                                 <!--<th scope="col">#</th>-->
 
-                                <th scope="col">Cognome</th>
+                                <th scope="col" style="text-align: center">Cognome</th>
                                 <th scope="col">Nome</th>
                                 <th scope="col">Telefono</th>
-                                <th scope="col">Età (anni)</th>
-                                <th scope="col">Anno di nascita</th>
+                                <th scope="col" style="text-align: center">Età</th>
+                                <th scope="col" style="text-align: center">Anno</th>
                                 <th scope="col">Stato</th>
                                 <th scope="col">Certificato</th>
                                 <th scope="col">...</th>
@@ -586,6 +588,9 @@
                                                         @if($this->error_fc)
                                                             <span style="color:red;font-size:12px">Dati mancanti</span>
                                                         @endif
+                                                        @error('fiscal_code')
+                                                        <div class="invalid-feedback">{{ $message }}</div>
+                                                    @enderror
                                                     </div>
 
                                                     <div class="col-xl-6">
@@ -871,13 +876,13 @@
                                                             </div>
 
                                                             <br>
+                                                            <button class="btn--ui lightGrey" wire:click.prevent="cancelCertificate()">Annulla</button>
                                                             @if($addCertificate)
                                                                 <button class="btn--ui primary" wire:click.prevent="storeCertificate()">Salva</button>
                                                             @endif
                                                             @if($updateCertificate)
                                                                 <button class="btn--ui primary" wire:click.prevent="updateCertificate()">Salva</button>
                                                             @endif
-                                                            <button class="btn--ui lightGrey" wire:click.prevent="cancelCertificate()">Annulla</button>
 
                                                         @endif
                                                     @else
@@ -991,13 +996,13 @@
                                             <br>
                                             <div class="row mt-2">
                                                 <div class="col-md-12">
+                                                    <button class="btn--ui lightGrey" wire:click.prevent="cancelCard()">Annulla</button>
                                                     @if($addCard)
                                                         <button class="btn--ui primary" wire:click.prevent="storeCard()">Salva</button>
                                                     @endif
                                                     @if($updateCard)
                                                         <button class="btn--ui primary" wire:click.prevent="updateCard()">Salva</button>
                                                     @endif
-                                                    <button class="btn--ui lightGrey" wire:click.prevent="cancelCard()">Annulla</button>
                                                 </div>
                                             </div>
 
@@ -1379,22 +1384,16 @@
                                             <br>
                                             <div class="row mt-2">
                                                 <div class="col-md-12">
-                                                @if($addCourse)
-                                                    @if(!$course_exist)
-
+                                                    <button class="btn--ui lightGrey" wire:click.prevent="cancelCourse()">Annulla</button>
+                                                    @if($addCourse)
+                                                        @if(!$course_exist)
                                                             <button class="btn--ui primary" wire:click.prevent="storeCourse()">Salva corso</button>
-
+                                                        @endif
                                                     @endif
-                                                @endif
-                                                @if($updateCourse)
-
+                                                    @if($updateCourse)
                                                         <button class="btn--ui primary" wire:click.prevent="updateCourse()">Salva corso</button>
-
-                                                @endif
-
-                                                    <button class="btn--ui lightGrey" wire:click.prevent="cancelCourse()">Annulla</button>
-                                                    </div>
-
+                                                    @endif
+                                                </div>
                                             </div>
 
                                         @endif
@@ -1497,12 +1496,15 @@
                                                             <h4>{{$member_card->card->name}}</h4>
                                                             <span class="title-detail">Scadenza: <span class="title-detail_date">{{$member_card->expire_date ? date("d/m/Y", strtotime($member_card->expire_date)) : ''}}</span></span></small>
                                                             @if($member_card->discipline_1)
+                                                            </br>
                                                                 <span class="title-detail">Disciplina : <b>{{$member_card->discipline_1->name}}</b></span>
                                                             @endif
                                                             @if($member_card->discipline_2)
+                                                            </br>
                                                                 <span class="title-detail">Disciplina : <b>{{$member_card->discipline_2->name}}</b></span>
                                                             @endif
                                                             @if($member_card->discipline_3)
+                                                            </br>
                                                                 <span class="title-detail">Disciplina : <b>{{$member_card->discipline_3->name}}</b></span>
                                                             @endif
                                                         </div>
@@ -2433,6 +2435,9 @@
                                         title: 'Utenti',
                                         exportOptions: {
                                             columns: ":not(':last')"
+                                        },
+                                        customize: function(doc) {
+                                            doc.styles.tableHeader.alignment = 'left';
                                         }
                                     },
                                     {

resources/views/livewire/nation.blade.php

@@ -143,13 +143,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/payment_method.blade.php

@@ -1,6 +1,6 @@
 <div class="col card--ui" id="card--dashboard">
 
-    
+
 
     @if(!$add && !$update)
 
@@ -164,13 +164,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/profile.blade.php

@@ -27,7 +27,7 @@
                                     @endif
                                 </div>
                             </div>
-                        
+
                             <div class="col-md-6">
                                 <div class="form--item">
                                     <label for="email" class="form-label"><b>Email</b></label>
@@ -46,12 +46,12 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="save()">Salva</button>
                             @else
                                 <button type="submit" class="btn--ui" wire:click.prevent="edit()">Modifica</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                         <br><br>
@@ -79,7 +79,7 @@
                                 </div>
                             </div>
                             <span style="color:red">{{$errorConfirm}}</span>
-                            
+
                         @endif
 
                         <div class="form--item" style="margin-top: 10px">

resources/views/livewire/province.blade.php

@@ -132,13 +132,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/receipt.blade.php

@@ -55,7 +55,7 @@
         </div>
         <div class="row g-3">
             <div class="col-md-12" style="text-align:right">
-                <button class="btn--ui_outline light" onclick="reset()">CANCELLA</button>
+                <button class="btn--ui_outline light" onclick="reset()">RESET</button>
                 <button class="btn--ui" onclick="loadDataTable()">FILTRA</button>
             </div>
         </div>

resources/views/livewire/records.blade.php

@@ -47,13 +47,22 @@
                 </div>
                 <div class="col-md-2">
                     <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>
+                        <button class="btn--ui lightGrey reset reset" style="margin-left:5px;color:#10172A;" onclick="reset()">RESET</button>
                     </div>
                 </div>
             </div>
-
-
+            <div style="float:left; margin-top:10px; margin-bottom:10px;">
+                <div class="dropdown">
+                  <button class="btn--ui_outline light dropdown-toggle" type="button" id="exportDropdown" data-bs-toggle="dropdown" aria-expanded="false"
+                  style="color:#10172A;">
+                    Esporta
+                  </button>
+                  <ul class="dropdown-menu" aria-labelledby="exportDropdown">
+                    <li><a class="dropdown-item" href="#" wire:click="export()">Excel</a></li>
+                    <li><a class="dropdown-item" href="#" id="print">Stampa</a></li>
+                  </ul>
+                </div>
+              </div>
     </section>
 
     <section id="resume-table"  class="scrollTable">
@@ -197,7 +206,7 @@
     </section>
 
 
-    
+
 
 
 </div>
@@ -213,10 +222,10 @@
         #btn-back-to-top {
             background-color: #0C6197;
             color: white;
-        position: fixed;
-        bottom: 20px;
-        right: 20px;
-        display: none;
+            position: fixed;
+            bottom: 20px;
+            right: 20px;
+            display: none;
         }
 
         #btn-back-to-bottom {
@@ -303,6 +312,10 @@
             text-overflow: ellipsis;
             white-space: nowrap;
         }
+        button#exportDropdown.btn--ui_outline.light {
+            font-weight: normal !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>
@@ -426,7 +439,7 @@
             function setMaxHeight() {
                  $("#resume-table").height( Math.round( $(window ).height() - 300 ) ) ;
             }
-        
+
             let mybuttonBottom = document.getElementById("btn-back-to-bottom");
             let mybutton = document.getElementById("btn-back-to-top");
 
@@ -440,9 +453,9 @@
                     scrollFunction();
                 };
                 /*if (element.scrollTop < lastScrollTop){
-                    // upscroll 
+                    // upscroll
                     return;
-                } 
+                }
                 lastScrollTop = element.scrollTop <= 0 ? 0 : element.scrollTop;
                     if (element.scrollTop + element.offsetHeight>= element.scrollHeight ){
                     console.log("End");
@@ -486,5 +499,17 @@
                 $('#resume-table').scrollTop($('#resume-table')[0].scrollHeight);
                 //window.scrollTo(0, document.body.scrollHeight);
             }
+
+            function reset()
+            {
+                $('.filterMember').val('');
+                $('.filterMember').trigger('change');
+                $('.filterCausals').val('');
+                $('.filterCausals').trigger('change');
+                var today = new Date().toISOString().split('T')[0];
+
+                window.livewire.find(document.querySelector('[wire\\:id]').getAttribute('wire:id')).set('fromDate', today);
+                window.livewire.find(document.querySelector('[wire\\:id]').getAttribute('wire:id')).set('toDate', today);
+            }
     </script>
 @endpush

resources/views/livewire/records_in.blade.php

@@ -138,7 +138,7 @@
                         <th scope="col">Commerciale</th>
                         <th scope="col">Causale</th>
                         <th scope="col">Pagamento</th>
-                        
+
                         <th scope="col">Stato</th>
                         <th scope="col">...</th>
                     </tr>
@@ -543,9 +543,9 @@
                                             @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
@@ -555,9 +555,9 @@
                                         @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
                                     @endif
                                 @else
@@ -914,7 +914,7 @@
 
         Livewire.on('load-select', () => {
 
-            
+
 
             $('.causalClass').each(function(i, obj) {
                 $(obj).select2({
@@ -966,7 +966,7 @@
                 //@this.set('filterCausals', data);
             });
 
-            
+
 
         });
 

resources/views/livewire/records_in_out.blade.php

@@ -30,15 +30,22 @@
 
         </form>
         @if(sizeof($columns) < 6)
-            <button class="btn--ui show" style="margin-left:5px;">aggiungi</button>
+            <button class="btn--ui show" id="addButton" style="margin-left:5px;">aggiungi</button>
         @endif
 
             <button class="btn--ui lightGrey reset reset" onClick="window.location.reload();" style="margin-left:5px;">reset</button>
-        @if($showData)
-        <div class="export--button ms-auto">
-            <button class="btn--ui lightGrey reset" wire:click="export()"><i class="fa-solid fa-download me-2"></i>esporta selezione</button>
-            <button class="btn--ui lightGrey reset exportYear"  style="margin-left:5px;">esporta anno fiscale</button>
-        </div>
+            @if($showData)
+            <div class="export--button ms-auto">
+                <div class="dropdown">
+                    <button class="btn--ui_outline lightGrey reset dropdown-toggle" type="button" id="exportDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+                        Esporta
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="exportDropdown">
+                        <li><a class="dropdown-item" href="#" id="exportSelection" wire:click="export()">Selezione</a></li>
+                        <li><a class="dropdown-item exportYear" href="#" id="exportYear">Anno Fiscale</a></li>
+                    </ul>
+                </div>
+            </div>
         @endif
 
 
@@ -103,9 +110,9 @@
                                     @else
                                         <tr data-node="treetable-{{$in["id"]}}" >
                                     @endif
-                                    
+
                                         <td style="padding-left:{{$in["level"] * 20}}px;">
-                                            
+
                                             {{$in["name"]}}
                                         </td>
                                         @foreach($columns as $column)
@@ -223,9 +230,9 @@
                                     @else
                                         <tr data-node="treetable-{{$out["id"] + 1000}}" >
                                     @endif
-                                    
+
                                         <td style="padding-left:{{$out["level"] * 20}}px;">
-                                            
+
                                             {{$out["name"]}}
                                         </td>
                                         @foreach($columns as $column)
@@ -357,7 +364,7 @@
     </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>
-    
+
     <script src="/assets/js/bootstrap-treefy.js"></script>
     <!--<script src="/assets/js/aCollapTable.js"></script>-->
 
@@ -439,7 +446,7 @@
             });
 
             $(".treetable-expander").trigger("click");
-            
+
             /*
             $('.collaptableIN').aCollapTable({
                 startCollapsed: true,
@@ -477,17 +484,19 @@
 
         load();
 
-        $(document).on("click", ".show", function () {
-            var m = $('#month').val();
-            var y = $('#year').val();
-            @this.show(m, y);            
+
+        $(document).on("click", "#addButton", function () {
+        var m = $('#month').val();
+        var y = $('#year').val();
+        @this.show(m, y);
         });
 
-        $(document).on("click", ".exportYear", function () {
+        $(document).on("click", "#exportYear", function () {
             var y = $('#year').val();
             @this.exportYear(y);
         });
 
+
     </script>
 
 @endpush

resources/views/livewire/records_out.blade.php

@@ -174,7 +174,7 @@
             -->
 
             <br><b class="totalDiv"></b>
-            
+
         </section>
 
     @else
@@ -573,7 +573,7 @@
                 }, 100);
             });
 
-            });
+        });
 
         Livewire.on('load-select', () => {
             /*$('.causalClass').select2({

resources/views/livewire/sponsor.blade.php

@@ -340,13 +340,13 @@
                                                 </div>
 
                                                 <div class="form--item">
-                                                    @if($addContract)
-                                                        <button type="submit" class="btn--ui" wire:click.prevent="storeContract()">Salva</button>
-                                                    @endif
-                                                    @if($updateContract)
-                                                        <button type="submit" class="btn--ui" wire:click.prevent="updateContract()">Salva</button>
-                                                    @endif
                                                     <button type="button" class="btn--ui lightGrey" wire:click="cancelContract()">Annulla</button>
+                                                @if($addContract)
+                                                    <button type="submit" class="btn--ui" wire:click.prevent="storeContract()">Salva</button>
+                                                @endif
+                                                @if($updateContract)
+                                                    <button type="submit" class="btn--ui" wire:click.prevent="updateContract()">Salva</button>
+                                                @endif
                                                 </div>
 
                                             </form>

resources/views/livewire/supplier.blade.php

@@ -244,13 +244,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
-                            @if($add)
-                                <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
-                            @endif
-                            @if($update)
-                                <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
-                            @endif
                             <button type="button" class="btn--ui lightGrey" onclick="annulla()">Annulla</button>
+                        @if($add)
+                            <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
+                        @endif
+                        @if($update)
+                            <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
+                        @endif
                         </div>
 
                     </form>
@@ -420,6 +420,9 @@
                                         title: 'Fornitori',
                                         exportOptions: {
                                             columns: ":not(':last')"
+                                        },
+                                        customize: function(doc) {
+                                            doc.styles.tableHeader.alignment = 'left';
                                         }
                                     },
                                     {

resources/views/livewire/user.blade.php

@@ -37,7 +37,7 @@
                             <td> <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->enabled ? 'active' : 'suspended'}}">{{$record->enabled ? 'attivo' : 'disattivo'}}</span></span></td>
                             <td>
                                 @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" 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>
@@ -119,13 +119,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>

resources/views/livewire/vat.blade.php

@@ -95,13 +95,13 @@
                         <!-- // inline input field -->
 
                         <div class="form--item">
+                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                             @if($add)
                                 <button type="submit" class="btn--ui" wire:click.prevent="store()">Salva</button>
                             @endif
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
                         </div>
 
                     </form>