Luca Parisio 1 éve
szülő
commit
bd81c3621a

+ 2 - 0
app/Http/Livewire/Member.php

@@ -892,6 +892,7 @@ class Member extends Component
                 'phone3' => $this->phone3,
                 'email' => strtolower($this->email),
                 'image' => $name,
+                'to_complete' => false,
                 'enabled' => $this->enabled
             ]);
             session()->flash('success, Tesserato creato');
@@ -1122,6 +1123,7 @@ class Member extends Component
                 'phone2' => $this->phone2,
                 'phone3' => $this->phone3,
                 'email' => strtolower($this->email),
+                'to_complete' => false,
                 'enabled' => $this->enabled
             ]);
             updateMemberData($this->dataId);

+ 1 - 1
app/helpers.php

@@ -240,4 +240,4 @@ function getMonthList()
         }
     }
     return $months;
-}
+}

+ 31 - 9
resources/views/livewire/course_list.blade.php

@@ -113,7 +113,7 @@
         </div>
     </div>
 
-    <section id="resume-table" >
+    <section id="resume-table" class="scrollTableXXX">
         <div class="compare--chart_wrapper d-none"></div>
 
 
@@ -167,6 +167,17 @@
 @push('scripts')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
+
+    .scrollTable {
+            margin: 20px auto;
+            padding: 15px;
+            /*max-width: 800px !important;*/
+            overflow-x: auto;
+            overflow-y: hidden;
+            white-space: nowrap;
+            border: 1px solid #ddd;
+        }
+
         .select2-container--default .select2-selection--single{
             background-color: #E9F0F5;
             border: 0.0625rem solid #DFE5EB;
@@ -365,32 +376,32 @@
             if (filterYear)
             {
                 $('.filterYear').val(filterYear).trigger('change');
-            }        
+            }
             var filterCourse = localStorage.getItem("filterCourseCourseList");
             if (filterCourse)
             {
                 $('.filterCourse').val(filterCourse).trigger('change');
-            }        
+            }
             var filterLevel = localStorage.getItem("filterLevelCourseList");
             if (filterLevel)
             {
                 $('.filterLevel').val(filterLevel).trigger('change');
-            }        
+            }
             var filterFrequency = localStorage.getItem("filterFrequencyCourseList");
             if (filterFrequency)
             {
                 $('.filterFrequency').val(filterFrequency).trigger('change');
-            }        
+            }
             var filterDuration = localStorage.getItem("filterDurationCourseList");
             if (filterDuration)
             {
                 $('.filterDuration').val(filterDuration).trigger('change');
-            }        
+            }
             var filterType = localStorage.getItem("filterTypeCourseList");
             if (filterType)
             {
                 $('.filterType').val(filterType).trigger('change');
-            }        
+            }
         @endif
 
         function reset()
@@ -423,7 +434,7 @@
 
             var filterLevel = $('.filterLevel').val();
             localStorage.setItem("filterLevelCourseList", filterLevel);
-            
+
             var filterDuration = $('.filterDuration').val();
             localStorage.setItem("filterDurationCourseList", filterDuration);
 
@@ -830,7 +841,7 @@
             selectedCourseId = course_id;
             selectedMemberId = member_id;
             selectedMemberCourseId = id;
-            
+
             if(!months.includes(month))
             {
                 months.push(month);
@@ -882,6 +893,17 @@
             @this.newPayment(selectedCourseId, months.toString(), selectedMemberId, selectedMemberCourseId, subscription);
         }
 
+        $( document ).ready( function(){
+            /*
+            setMaxWidth();
+            $( window ).bind( "resize", setMaxWidth ); //Remove this if it's not needed. It will react when window changes size.
+
+            function setMaxWidth() {
+                 $("#resume-table").width( Math.round( $(window ).width() - 400 ) ) ;
+            }
+            */
+        });
+
     </script>
 @endpush
 

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

@@ -1435,7 +1435,7 @@
                                     </ul>
 
                                     <div class="resume--tab_info credito">
-                                        <h2 class="mb-3">Credito residuo</h2>
+                                        <h2 class="mb-3">Borsellino MAD</h2>
                                         <span class="value">{{formatPrice($money)}}</span>
                                     </div>
 
@@ -2510,7 +2510,7 @@
                     $("span").find("[aria-controls='select2-" + myArray[0] + "-container']").css('border', 'solid 3px #dc3545');
             }
             console.log(errors);
-            
+
             //window.location.href = "#top";
             //$("span").find(`[aria-controls='select2-birth_nation_id-container']`).css('border', 'solid 3px red');
         });

+ 3 - 12
resources/views/livewire/records_in_out.blade.php

@@ -17,18 +17,9 @@
 
             <select class="form-select form-select-lg me-1 " id="month" style="width:150px !important;">
                 <option value="x" {{$month == "x" ? 'selected' : ""}}>Anno completo</option>
-                <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>
+                @foreach(getMonthList() as $mid => $mname)
+                    <option value="{{$mid}}" {{$month == $mid ? 'selected' : ""}}>{{$mname}}</option>
+                @endforeach
             </select>
 
             <select class="form-select " style="width:100px !important;" id="year">

+ 11 - 1
resources/views/livewire/supplier.blade.php

@@ -250,7 +250,7 @@
                             @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>
+                            <button type="button" class="btn--ui lightGrey" onclick="annulla()">Annulla</button>
                         </div>
 
                     </form>
@@ -294,6 +294,16 @@
         var nation_id = 0;
         var province_id = 0;
 
+        function annulla()
+        {
+            window.onbeforeunload = null;
+            document.location.href = '/suppliers';
+        }
+
+        window.onbeforeunload = function(){
+            return 'Cambiando pagina le eventuali modifiche andranno perse';
+        };
+
         Livewire.on('load-select', () => {
 
             $('.nationClass').select2({