Merge branch 'master' of http://host.webmagistri.biz:3000/parisio/iao_team

app/Http/Livewire/Member.php

@@ -2006,10 +2006,10 @@ class Member extends Component
                                     $payed += $row->amount / $tot;
                                 }
                             }
-                            if ($payed < $price)
-                                $class = 'orange half';
                         }
                     }
+                    if ($payed < $price)
+                        $class = 'orange half';
                     //$class .= $extraC;
                 }
 

database/migrations/2025_03_07_173000_ass_fields_to_create_course_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('courses', function (Blueprint $table) {
-            $table->json('when')->nullable();
-            $table->json('prices')->nullable();
-            $table->enum('type', ['standard', 'custom']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('courses', function (Blueprint $table) {
-            $table->dropColumn('when');
-            $table->dropColumn('prices');
-            $table->dropColumn('type');
-        });
-    }
-};

resources/views/layouts/app.blade.php

@@ -313,7 +313,7 @@
                             <div class="accordion-body">
                                 <ul class="nav nav-pills flex-column align-items-center align-items-sm-start w-100" id="menu-contabilita" style="margin-top:0px;">
                                     <li class="nav-item" style="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('course_member') ? 'background-color: #c5d9e6;' : ''}}">
-                                        <a href="/{{env('MANAGE_COURSE', false) ? 'course_member_one' : 'course_member'}}" class="nav-link d-flex align-items-center linkMenu">
+                                        <a href="/course_member_one" class="nav-link d-flex align-items-center linkMenu">
                                             <span class="ms-3 d-md-inline">Iscritti</span>
                                         </a>
                                     </li>

resources/views/livewire/course.blade.php

@@ -114,13 +114,11 @@
                     <form action="">
 
                         <div class="row mb-3 ">
-                            @if(env('MANAGE_COURSE', false))
-                                <div class="col-12 mt-2">
-                                    <input type="radio" name="chkType" value="standard" wire:model="type">&nbsp;Standard
-                                    &nbsp;&nbsp;&nbsp;
-                                    <input type="radio" name="chkType" value="custom" wire:model="type">&nbsp;Personalizzato
-                                </div>
-                            @endif
+                            <div class="col-12 mt-2">
+                                <input type="radio" name="chkType" value="standard" wire:model="type">&nbsp;Standard
+                                &nbsp;&nbsp;&nbsp;
+                                <input type="radio" name="chkType" value="custom" wire:model="type">&nbsp;Personalizzato
+                            </div>
                             <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Nome</label>
@@ -130,28 +128,30 @@
                                     @enderror
                                 </div>
                             </div>
-                            <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">
-                                        <option value="">
-                                        @foreach($course_types as $c)
-                                            <option value="{{$c["id"]}}">{{$c["name"]}}</option>
-                                        @endforeach
-                                    </select>
+                            @if(false)
+                                <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">
+                                            <option value="">
+                                            @foreach($course_types as $c)
+                                                <option value="{{$c["id"]}}">{{$c["name"]}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
-                            <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">
-                                        <option value="">
-                                        @foreach($course_durations as $c)
-                                            <option value="{{$c["id"]}}">{{$c["name"]}}</option>
-                                        @endforeach
-                                    </select>
+                                <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">
+                                            <option value="">
+                                            @foreach($course_durations as $c)
+                                                <option value="{{$c["id"]}}">{{$c["name"]}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
+                            @endif
                             <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Frequenza</label>
@@ -186,42 +186,45 @@
                                     <input class="form-control" type="date" placeholder="Data fine" wire:model="date_to">
                                 </div>
                             </div>
-                            <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">
-                                    @error('price')
-                                        <div class="invalid-feedback">{{ $message }}</div>
-                                    @enderror
+                            @if(false)
+                                <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">
+                                        @error('price')
+                                            <div class="invalid-feedback">{{ $message }}</div>
+                                        @enderror
+                                    </div>
                                 </div>
-                            </div>
-                            <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">
-                                    @error('subscription_price')
-                                        <div class="invalid-feedback">{{ $message }}</div>
-                                    @enderror
+                                <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">
+                                        @error('subscription_price')
+                                            <div class="invalid-feedback">{{ $message }}</div>
+                                        @enderror
+                                    </div>
                                 </div>
-                            </div>
-                            <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" />
-                                    @error('causal_id')
-                                        <span style="argin-top: 0.25rem; font-size: 0.875em; color: var(--bs-form-invalid-color);">{{ $message }}</span>
-                                    @enderror
+                                <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" />
+                                        @error('causal_id')
+                                            <span style="argin-top: 0.25rem; font-size: 0.875em; color: var(--bs-form-invalid-color);">{{ $message }}</span>
+                                        @enderror
+                                    </div>
                                 </div>
-                            </div>
-                            <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" />
-                                    @error('sub_causal_id')
-                                        <span style="argin-top: 0.25rem; font-size: 0.875em; color: var(--bs-form-invalid-color);">{{ $message }}</span>
-                                    @enderror
+                                <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" />
+                                        @error('sub_causal_id')
+                                            <span style="argin-top: 0.25rem; font-size: 0.875em; color: var(--bs-form-invalid-color);">{{ $message }}</span>
+                                        @enderror
+                                    </div>
                                 </div>
-                            </div>
+                            @endif
+
                             <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">N° partecipanti</label>
@@ -243,6 +246,19 @@
                                     </select>
                                 </div>
                             </div>
+
+                            <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">
+                                        <option value="">
+                                        @foreach($categories as $category)
+                                            <option value="{{$category["id"]}}">{{str_repeat('  ', $category["indentation"])}}{{$category["name"]}}
+                                        @endforeach
+                                    </select>
+                                </div>
+                            </div>
+
                             <div class="col-6 mt-2">
                                 <div class="form--item">
                                     <label for="inputName" class="form-label">Anno</label>
@@ -257,17 +273,7 @@
                                 </div>
                             </div>
 
-                            <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">
-                                        <option value="">
-                                        @foreach($categories as $category)
-                                            <option value="{{$category["id"]}}">{{str_repeat('  ', $category["indentation"])}}{{$category["name"]}}
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
+                            
 
                             <div class="col">
                                 <div class="form--item">
@@ -276,117 +282,85 @@
                                 </div>
                             </div>
 
-                            @if(env('MANAGE_COURSE', false))
-
-                                <div class="row">
-                                    <div class="col-1">
-                                        <br><button class="btn--ui primary add--daye" wire:click.prevent="addPrice()"><i class="fa-solid fa-plus"></i></button>
-                                    </div>
-                                    <div class="col-6">
-                                        @foreach($prices as $idP => $p)
-                                            <div class="row mt-2">
-                                                <div class="col-6">
-                                                    <label for="abb" class="form-label">Abbonamento</label>
-                                                    <select class="form-control" wire:model="prices.{{$idP}}.course_subscription_id">
-                                                        @foreach($course_subscriptions as $s)
-                                                            <option value="{{$s["id"]}}">{{$s["name"]}}
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div class="col-5">
-                                                    <label for="price" class="form-label">Prezzo</label>
-                                                    <input class="form-control " type="text" onkeyup="onlyNumberAmount(this)" placeholder="€ 0,00" wire:model="prices.{{$idP}}.price">
-                                                </div>
-                                                <div class="col-1">
-                                                    @if($idP > 0)
-                                                        <br><button class="btn--ui primary add--daye" wire:click.prevent="delPrice({{$idP}})"><i class="fa-solid fa-minus"></i></button>
-                                                    @endif
-                                                </div>
-                                            </div>
-                                        @endforeach
-                                    </div>
+                            <div class="row">
+                                <div class="col-1">
+                                    <br><button class="btn--ui primary add--daye" wire:click.prevent="addPrice()"><i class="fa-solid fa-plus"></i></button>
                                 </div>
-
-                                @if($type == 'standard')
-
-                                    @foreach($when as $idW => $w)
-
-                                        <div class="col-12">
-                                            <div class="day durata--corso d-flex">
-                                                <label for="" class="form-label">Giorno</label>
-                                                <div class="durata--corso_days mb-3">
-                                                    <a class="{{in_array('lun', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'lun')">Lun</a>
-                                                    <a class="{{in_array('mar', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'mar')">Mar</a>
-                                                    <a class="{{in_array('mer', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'mer')">Mer</a>
-                                                    <a class="{{in_array('gio', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'gio')">Gio</a>
-                                                    <a class="{{in_array('ven', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'ven')">Ven</a>
-                                                    <a class="{{in_array('sab', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'sab')">Sab</a>
-                                                    <a class="{{in_array('dom', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'dom')">Dom</a>
-                                                </div>
-
-                                                <div class="durata--corso_select">
-                                                    <div class="from--h me-3">
-                                                        <label for="" class="form-label">Dalle</label>
-                                                        <select class="form-select" wire:model="when.{{$idW}}.from">
-                                                            <option value="">--Seleziona--
-                                                            @for($c=6;$c<=23;$c++)
-                                                                <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00
-                                                                <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30
-                                                            @endfor
-                                                        </select>
-                                                    </div>
-                                                    <div class="to--h">
-                                                        <label for="" class="form-label">Alle</label>
-                                                        <select class="form-select" wire:model="when.{{$idW}}.to">
-                                                            <option value="">--Seleziona--
-                                                            @for($c=6;$c<=23;$c++)
-                                                                <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00
-                                                                <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30
-                                                            @endfor
-                                                        </select>
-                                                    </div>
-                                                </div>
-
-                                                <button class="btn--ui primary remove--day position-absolute" wire:click.prevent="delRow({{$idW}})"><i class="fa-solid fa-minus"></i></button>
-                                                <button class="btn--ui primary add--day position-absolute" wire:click.prevent="addRow()"><i class="fa-solid fa-plus"></i></button>
+                                <div class="col-6">
+                                    @foreach($prices as $idP => $p)
+                                        <div class="row mt-2">
+                                            <div class="col-6">
+                                                <label for="abb" class="form-label">Abbonamento</label>
+                                                <select class="form-control" wire:model="prices.{{$idP}}.course_subscription_id">
+                                                    @foreach($course_subscriptions as $s)
+                                                        <option value="{{$s["id"]}}">{{$s["name"]}}
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-5">
+                                                <label for="price" class="form-label">Prezzo</label>
+                                                <input class="form-control " type="text" onkeyup="onlyNumberAmount(this)" placeholder="€ 0,00" wire:model="prices.{{$idP}}.price">
+                                            </div>
+                                            <div class="col-1">
+                                                @if($idP > 0)
+                                                    <br><button class="btn--ui primary add--daye" wire:click.prevent="delPrice({{$idP}})"><i class="fa-solid fa-minus"></i></button>
+                                                @endif
                                             </div>
                                         </div>
-
                                     @endforeach
-                                
-                                @endif
+                                </div>
+                            </div>
 
-                                <!--<div class="col-6">
-                                    <div class="form--item">
-                                        <label for="inputName" class="form-label">Durata</label>
-                                        <input class="form-control js-keyupTitle " type="text" id="duration" placeholder="Durata" wire:model="duration">
+                            @if($type == 'standard')
+
+                                @foreach($when as $idW => $w)
 
-                                    </div>
-                                </div>-->
-                                @if(false)
                                     <div class="col-12">
-                                        <div class="form--item">
-                                            <label for="inputName" class="form-label">Seleziona mesi</label>
-                                            @foreach($monthList as $idx => $y)
-                                                <div class="row">
-                                                    <div class="col-12">
-                                                        <b>{{$idx}}</b>
-                                                    </div>
-                                                    @foreach($y as $m)
-                                                        <div class="col-3">{{$m}}</div>
-                                                    @endforeach
+                                        <div class="day durata--corso d-flex">
+                                            <label for="" class="form-label">Giorno</label>
+                                            <div class="durata--corso_days mb-3">
+                                                <a class="{{in_array('lun', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'lun')">Lun</a>
+                                                <a class="{{in_array('mar', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'mar')">Mar</a>
+                                                <a class="{{in_array('mer', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'mer')">Mer</a>
+                                                <a class="{{in_array('gio', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'gio')">Gio</a>
+                                                <a class="{{in_array('ven', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'ven')">Ven</a>
+                                                <a class="{{in_array('sab', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'sab')">Sab</a>
+                                                <a class="{{in_array('dom', $when[$idW]["day"]) ? 'selected' : 'notSelected'}}" wire:click="setDay({{$idW}}, 'dom')">Dom</a>
+                                            </div>
+
+                                            <div class="durata--corso_select">
+                                                <div class="from--h me-3">
+                                                    <label for="" class="form-label">Dalle</label>
+                                                    <select class="form-select" wire:model="when.{{$idW}}.from">
+                                                        <option value="">--Seleziona--
+                                                        @for($c=6;$c<=23;$c++)
+                                                            <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00
+                                                            <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30
+                                                        @endfor
+                                                    </select>
                                                 </div>
-                                                <div class="row"><br></div>
-                                            @endforeach
+                                                <div class="to--h">
+                                                    <label for="" class="form-label">Alle</label>
+                                                    <select class="form-select" wire:model="when.{{$idW}}.to">
+                                                        <option value="">--Seleziona--
+                                                        @for($c=6;$c<=23;$c++)
+                                                            <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:00
+                                                            <option value="{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30">{{str_pad($c, 2, "0", STR_PAD_LEFT)}}:30
+                                                        @endfor
+                                                    </select>
+                                                </div>
+                                            </div>
+
+                                            <button class="btn--ui primary remove--day position-absolute" wire:click.prevent="delRow({{$idW}})"><i class="fa-solid fa-minus"></i></button>
+                                            <button class="btn--ui primary add--day position-absolute" wire:click.prevent="addRow()"><i class="fa-solid fa-plus"></i></button>
                                         </div>
                                     </div>
-                                @endif
+
+                                @endforeach
                             
                             @endif
-                            
-                        </div>
-
 
+                        </div>
 
                         <div class="form--item">
                             <button type="button" class="btn--ui lightGrey" onclick="annulla()">Annulla</button>