Ver Fonte

fix vari

ferrari há 3 semanas atrás
pai
commit
6286a65a40

+ 6 - 3
app/Http/Livewire/CourseMember.php

@@ -36,6 +36,8 @@ class CourseMember extends Component
     public $filterStatus = [];
     public $filterYear = "";
 
+    public $_env_FISCAL_YEAR_MONTH_TO = 8;
+
     /*public $chkCertificateNormal = 0;
     public $chkCertificateAgonistico = 0;
     public $chkCertificateScaduti = 0;*/
@@ -68,6 +70,7 @@ class CourseMember extends Component
         $this->course_years = \App\Models\Course::select('year')->where('year', '<>', '')->groupBy('year')->pluck('year');
         $this->courses = \App\Models\Course::orderBy('name')->groupBy('name')->pluck('name');
 
+        $this->_env_FISCAL_YEAR_MONTH_TO = env('FISCAL_YEAR_MONTH_TO', 8);
     }
 
     public function render()
@@ -288,9 +291,9 @@ class CourseMember extends Component
         $this->filterHours = [];
         $this->filterSubscription = "";
         $this->filterStatus = [];
-        $this->chkCertificateNormal = 0;
-        $this->chkCertificateAgonistico = 0;
-        $this->chkCertificateScaduti = 0;
+        // $this->chkCertificateNormal = 0;
+        // $this->chkCertificateAgonistico = 0;
+        // $this->chkCertificateScaduti = 0;
         $this->chkCertificateScadenza = 0;
         $this->chkCard = [];
 

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

@@ -283,7 +283,7 @@
                 },
                 eventClick: function(info) {
                     var eventDate = new Date(info.event.start);
-                    var datestring = eventDate.getFullYear() + "-" + pad(eventdate.getMonth() + 1+1, 2) + "-" + pad(eventDate.getDate(), 2) + " " + pad(eventDate.getHours(), 2) + ":" + pad(eventDate.getMinutes(), 2) + ":00";
+                    var datestring = eventDate.getFullYear() + "-" + pad(eventDate.getMonth() + 1+1, 2) + "-" + pad(eventDate.getDate(), 2) + " " + pad(eventDate.getHours(), 2) + ":" + pad(eventDate.getMinutes(), 2) + ":00";
                     var title = info.event.title;
                     $(".title").html(title);
                     if (title.includes("annullata"))

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

@@ -49,7 +49,7 @@
                             <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>
-                                @if (!in_array($record->name, ['PAGAMENTO CORSO', 'PAGAMENTO ISCRIZIONE', 'PAGAMENTO ABBONAMENTO']))
+                                @if (!in_array(strtoupper($record->name), ['PAGAMENTO CORSO', 'PAGAMENTO ISCRIZIONE', 'PAGAMENTO ABBONAMENTO', 'MOVIMENTO FINANZIARIO']))
                                     <button type="button" class="btn btn--ui btn-sm" wire:click="addLevel({{ $record->id }})">Aggiungi livello</button>
                                     <button type="button" class="btn btn--ui 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>

+ 28 - 15
resources/views/livewire/course_member.blade.php

@@ -33,6 +33,23 @@
     <div class="showFilter" style="display:none" wire:ignore.self>
         <hr size="1">
         <div class="row g-3">
+            <div class="col-md-3">
+                <div class="row">
+                    <div class="col-md-12" style="margin-bottom:10px;">
+                        <b>Stagione di riferimento</b>
+                    </div>
+                    <div class="col-12">
+                        <select class="form-select filterYear">
+                            <option value="">--Seleziona--
+                                @foreach($course_years as $c)
+                                    <option value="{{$c}}">{{$c}}
+                                @endforeach
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row g-3 mt-1">
             <div class="col-md-2">
                 <div class="row">
                     <div class="col-md-12" style="margin-bottom:10px;">
@@ -140,21 +157,6 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-3">
-                <div class="row">
-                    <div class="col-md-12" style="margin-bottom:10px;">
-                        <b>Anno</b>
-                    </div>
-                    <div class="col-12">
-                        <select class="form-select filterYear">
-                            <option value="">--Seleziona--
-                                @foreach($course_years as $c)
-                                    <option value="{{$c}}">{{$c}}
-                                @endforeach
-                        </select>
-                    </div>
-                </div>
-            </div>
             <div class="col-md-3">
                 <div class="row">
                     <div class="col-md-12" style="margin-bottom:10px;">
@@ -465,6 +467,17 @@
         var filterYear = localStorage.getItem("filterYearCourseMember");
         if (filterYear) {
             $('.filterYear').val(filterYear).trigger('change');
+        } else {
+            let date_for_filter = new Date();
+            let month_for_filter = date_for_filter.getMonth() + 1;
+            let year_for_filter = date_for_filter.getFullYear();
+            let _env_FISCAL_YEAR_MONTH_TO = {{$_env_FISCAL_YEAR_MONTH_TO}};
+            if (month_for_filter <= _env_FISCAL_YEAR_MONTH_TO) {
+                filterYear = `${year_for_filter - 1}-${year_for_filter}`;
+            } else {
+                filterYear = `${year_for_filter}-${year_for_filter + 1}`;
+            }
+            $('.filterYear').val(filterYear).trigger('change');
         }
         var filterCourse = localStorage.getItem("filterCourseCourseMember");
         if (filterCourse) {