abbonamenti - fix

app/Models/Member.php

@@ -104,6 +104,11 @@ class Member extends Model
         return $this->hasMany(MemberCourse::class);
     }
 
+    public function subscriptions()
+    {
+        return $this->hasMany(MemberSubscription::class);
+    }
+
     public function certificates()
     {
         return $this->hasMany(MemberCertificate::class)->orderBy('expire_date', 'DESC');

resources/views/livewire/member.blade.php

@@ -169,6 +169,34 @@
                         </div>
                         <div class="resume--tab_info corsi">
                             <h2 class="title d-flex align-items-center mb-3 gap-4"><i class="fa-solid fa-chalkboard"></i>Corsi e Abbonamenti</h2>
+                            @foreach($currentMember->subscriptions as $member_subscription)
+                                @php
+                                    $course_year = date('Y', strtotime($member_subscription->date_from));
+                                    $current_year = date('Y');
+                                    $course_month = date('m', strtotime($member_subscription->date_from));
+                                    $current_month = date('m');
+                                @endphp
+                                @if (
+                                    ($course_year == (date('Y') + 1) && $course_month <=8) ||
+                                    ($course_year == date('Y') && $course_month >= 9)
+                                )
+                                    <div class="resume--info resume-corso d-flex align-items-center">
+                                        <div class="row">
+                                            <div class="row">
+                                                <strong>{{$member_subscription->subscription->name}}</strong>
+                                            </div>
+                                            <div class="row">
+                                                <span class="title-detail">
+                                                    @if($member_subscription->notes != '')
+                                                        <b>Note: </b>
+                                                        {{$member_subscription->notes}}
+                                                    @endif
+                                                </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endif
+                            @endforeach
                             @foreach($currentMember->courses as $member_course)
                                 @php
                                     $course_year = date('Y', strtotime($member_course->date_from));
@@ -1104,19 +1132,22 @@
                                                                     <td style="width:30%;" colspan="1">
                                                                         <b>{{$member_subscription->subscription->name}}</b><br>
                                                                     </td>
-                                                                    <td style="width:40%;">
+                                                                    <td style="width:30%;">
                                                                         @if($member_subscription->notes != '')
                                                                             <b>Note: </b>
                                                                             {{$member_subscription->notes}}
                                                                         @endif
                                                                     </td>
-                                                                    <td style="text-align:right;width:15%;">
+                                                                    <td style="width:20%;">
+                                                                        {{date('d/m/Y', strtotime($member_subscription->date_from))}} - {{date('d/m/Y', strtotime($member_subscription->date_to))}}
+                                                                    </td>
+                                                                    <td style="text-align:right;width:10%;">
                                                                         @php
                                                                             $status = $member_subscription->getStatus();
                                                                         @endphp
                                                                         <a href="/rates?member_id={{$member_subscription->member_id}}&member_subscription_id={{$member_subscription->id}}"><span class="badge tessera-badge {{$status == 0 ? 'due' : ($status == 1 ? 'active' : 'suspended')}}">{{$status == 0 ? 'Da pagare' : ($status == 1 ? 'Pagato' : 'Sospeso')}}</span></a>
                                                                     </td>
-                                                                    <td style="text-align:right;width:15%;">
+                                                                    <td style="text-align:right;width:10%;">
                                                                         <div class="row">
                                                                             <div class="col-4">
                                                                                 <button style="float:left;" type="button" class="btn" wire:click="editSubscription({{ $member_subscription->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>
@@ -1147,11 +1178,8 @@
                                                                     <td style="width:20%;" colspan="1">
                                                                         <b>{{$member_course->course->name}}</b><br>
                                                                     </td>
-                                                                    <td style="width:20%;">
-                                                                        {{$member_course->course->level->name ?? ""}}<br>
-                                                                    </td>
-                                                                    <td style="width:20%;">
-                                                                        {{$member_course->course->frequency->name ?? ""}}<br>
+                                                                    <td style="width:30%;">
+                                                                        {{$member_course->course->level->name ?? ""}} - {{$member_course->course->frequency->name ?? ""}}
                                                                     </td>
                                                                     <td style="width:20%">
                                                                         @php
@@ -1188,13 +1216,13 @@
                                                                             @endforeach
                                                                         @endif
                                                                     </td>
-                                                                    <td style="text-align:right;width:5%;">
+                                                                    <td style="text-align:right;@if($member_course->notes != '') width:10%; @else width:20%; @endif">
                                                                         @php
                                                                             $status = $member_course->getStatus();
                                                                         @endphp
                                                                         <a href="/rates?member_id={{$member_course->member_id}}&member_course_id={{$member_course->id}}"><span class="badge tessera-badge {{$status == 0 ? 'due' : ($status == 1 ? 'active' : 'suspended')}}">{{$status == 0 ? 'Da pagare' : ($status == 1 ? 'Pagato' : 'Sospeso')}}</span></a>
                                                                     </td>
-                                                                    <td style="text-align:right;width:15%;">
+                                                                    <td style="text-align:right;width:10%;">
                                                                         <div class="row">
                                                                             <div class="col-4">
                                                                                 <button style="float:left;" type="button" class="btn" wire:click="editCourse({{ $member_course->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>
@@ -1204,8 +1232,8 @@
                                                                             </div>
                                                                         </div>
                                                                     </td>
-                                                                    <td style="text-align:left;width:15%;padding-top:15px;">
-                                                                        @if($member_course->notes != '')
+                                                                    @if($member_course->notes != '')
+                                                                    <td style="text-align:left;width:10%;padding:0;padding-top:15px;">
                                                                             <button type="button" class="btn" wire:click="showHideCourse({{ $member_course->id }})">
                                                                                 @if(in_array($member_course->id, $showCourse))
                                                                                     <i class="fa-solid fa-chevron-circle-up"></i>
@@ -1213,8 +1241,8 @@
                                                                                     <i class="fa-solid fa-chevron-circle-down"></i>
                                                                                 @endif
                                                                             </button>&nbsp;
-                                                                        @endif
                                                                     </td>
+                                                                    @endif
                                                                 </tr>
                                                                 {{-- <tr>
                                                                     <td style="width:30%" colspan="2">
@@ -1651,6 +1679,23 @@
                                     </div>
                                     <div class="resume--tab_info gruppi corsi">
                                         <h2 class="mb-3"><i class="fa-solid fa-chalkboard"></i><span>Corsi e Abbonamenti</span></h2>
+                                        @foreach($member_subscriptions as $member_subscription)
+                                            <div class="resume--info resume-corso d-flex align-items-center">
+                                                <div class="row">
+                                                    <div class="row">
+                                                        <strong>{{$member_subscription->subscription->name}}</strong>
+                                                    </div>
+                                                    <div class="row">
+                                                        <span class="title-detail">
+                                                            @if($member_subscription->notes != '')
+                                                                <b>Note: </b>
+                                                                {{$member_subscription->notes}}
+                                                            @endif
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        @endforeach
                                         @foreach($member_courses as $member_course)
                                             @php
                                                 $course_year = date('Y', strtotime($member_course->date_from));