abbonamenti - fix

app/Http/Livewire/Member.php

@@ -2001,7 +2001,7 @@ class Member extends Component
                 $mms = [];
                 $mms[] = date("n", strtotime($start));
                 for ($jj = 1; $jj < $r->months; $jj++) {
-                    if (date('Ymd', strtotime("+" . $jj . " months", strtotime($start))) < date("Ymd", strtotime($this->course_date_to))) {
+                    if (date('Ymd', strtotime("+" . $jj . " months", strtotime($start))) < date("Ymd", strtotime($this->subscription_date_to))) {
                         $mms[] = date('n', strtotime("+" . $jj . " months", strtotime($start)));
                     } else {
                         break;
@@ -2021,7 +2021,7 @@ class Member extends Component
 
                 $start = date('Y-m-d', strtotime("+" . $r->months . " months", strtotime($start)));
 
-                if ($start > $this->course_date_to || $r->months == 0) {
+                if ($start > $this->subscription_date_to || $r->months == 0) {
                     $go = false;
                     break;
                 }

app/Http/Livewire/Rate.php

@@ -72,7 +72,7 @@ class Rate extends Component
         if ($this->member_id > 0 && $this->member_course_id > 0)
         {
             $this->mc = \App\Models\MemberCourse::findOrFail($this->member_course_id);
-            $this->detail = $this->mc->member->first_name . " " . $this->mc->member->last_name;
+            $this->detail = $this->mc->course->getDetailsName() . "<br/>" .  $this->mc->member->first_name . " " . $this->mc->member->last_name;
 
             $this->price_list = [];
             $c = $this->mc->course;
@@ -101,7 +101,7 @@ class Rate extends Component
         if ($this->member_id > 0 && $this->member_subscription_id > 0)
         {
             $this->ms = \App\Models\MemberSubscription::findOrFail($this->member_subscription_id);
-            $this->detail = $this->ms->member->first_name . " " . $this->ms->member->last_name;
+            $this->detail = $this->ms->subscription->name . "<br/>" .  $this->ms->member->first_name . " " . $this->ms->member->last_name;
 
             $this->price_list = [];
             $s = $this->ms->subscription;

app/Http/Livewire/SubscriptionMember.php

@@ -39,7 +39,7 @@ class SubscriptionMember extends Component
     public function render()
     {
         $this->filter = '';
-        $members = \App\Models\MemberSubscription::with('member');
+        $members = \App\Models\MemberSubscription::with('member')->where('subscription_id', $this->subscription_id);
 
         if ($this->filterSubscription != "") {
             $ids = \App\Models\MemberSubscription::where('subscribed', $this->filterSubscription == 1 ? true : false)->pluck('id');

resources/views/layouts/app.blade.php

@@ -230,7 +230,7 @@
                 print "Comunicazioni Email";
             if (Request::is('subscriptions'))
                 print "Abbonamenti";
-            if (Request::is('subscription_member'))
+            if (Request::is('subscription_member', 'subscription_member/*'))
                 print "Abbonamenti";
             @endphp
             </h3>
@@ -345,7 +345,7 @@
                     </div>
                     <div class="accordion-item">
                         <h2 class="accordion-header linkMenu" id="headingThree">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member') || Request::is('course_list') || Request::is('course_member') ? 'true' : 'false'}}" aria-controls="collapseThree">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') ? 'true' : 'false'}}" aria-controls="collapseThree">
                                 <i class="fas fa-calendar"></i>
                                 <span>Corsi</span>
                             </button>
@@ -355,7 +355,7 @@
                         $iscritti_types[] = array('name' => 'Singoli', 'type' => 'standard');
                         $iscritti_types[] = array('name' => 'Personalizzati', 'type' => 'custom');   
                         @endphp
-                        <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member') || Request::is('course_list') || Request::is('course_member') || Request::is('rates') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
+                        <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('rates') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
                             <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 {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('course_member') ? "nav-item-active" : ""}}">
@@ -381,7 +381,7 @@
                                     </li>
                                     @endforeach
 
-                                    <li class="nav-item {{Request::is('subscription_member') ? "nav-item-active" : ""}}">
+                                    <li class="nav-item {{Request::is('subscription_member', 'subscription_member/*') ? "nav-item-active" : ""}}">
                                         <a href="/subscription_member" class="nav-link d-flex align-items-center linkMenu">
                                             <span class="ms-3 d-md-inline">Abbonamenti</span>
                                         </a>

resources/views/livewire/rate.blade.php

@@ -83,7 +83,7 @@
 
         <div class="row">
             <div class="col-6">
-                <h3 class="mt-4">{{$detail}}</h3><br>
+                <h3>{!!$detail!!}</h3>
             </div>
             <div class="col right table-actions" style="text-align: right">
                 <button id="btPay" style="display:none;" class="btn" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Crea entrata"><i class="fa-regular fa-file-text"></i></button>

resources/views/livewire/subscription_member.blade.php

@@ -380,7 +380,7 @@
                 serverSide: true,
                 processing: true,
                 ajax: {
-                    url: '/get_subscription_members?filterStatus=' + filterStatus + '&filterCards=' + filterCards + '&filterCertificateScadenza=' + filterCertificateScadenza + '&filterCertificateType=' + filterCertificateType + '&fromYear=' + fromYear + '&toYear=' + toYear + '&fromFromYear=' + fromFromYear + '&toToYear=' + toToYear,
+                    url: '/get_subscription_members?subscription_id=' + @this.subscription_id + '&filterStatus=' + filterStatus + '&filterCards=' + filterCards + '&filterCertificateScadenza=' + filterCertificateScadenza + '&filterCertificateType=' + filterCertificateType + '&fromYear=' + fromYear + '&toYear=' + toYear + '&fromFromYear=' + fromFromYear + '&toToYear=' + toToYear,
                 },
                 thead: {
                     'th': { 'background-color': 'blue' }

routes/web.php

@@ -1986,9 +1986,16 @@ Route::group(['middleware' => 'tenant'], function () {
     });
 
     Route::get('/get_subscription_members', function () {
+        $subscription_id = 0;
+        if (!isset($_GET['subscription_id']) || is_null($_GET['subscription_id']) || $_GET['subscription_id'] <= 0) {
+            return json_encode(array("data" => [], "recordsTotal" => 0, "recordsFiltered" => 0));
+        }
+        $subscription_id = $_GET['subscription_id'];
+
         $datas = \App\Models\MemberSubscription::select('member_subscriptions.*', 'subscriptions.name as course_name', 'members.first_name', 'members.last_name', 'members.birth_date')
             ->leftJoin('subscriptions', 'member_subscriptions.subscription_id', '=', 'subscriptions.id')
-            ->leftJoin('members', 'member_subscriptions.member_id', '=', 'members.id');
+            ->leftJoin('members', 'member_subscriptions.member_id', '=', 'members.id')
+            ->where('member_subscriptions.subscription_id', $subscription_id);
 
         if (isset($_GET["search"]["value"]) && trim($_GET["search"]["value"]) != "") {
             $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));