|
|
@@ -818,7 +818,8 @@ class Member extends Component
|
|
|
$this->subscription_subscription_price = formatPrice($subscription->subscription_price);
|
|
|
|
|
|
// Controllo se l'utente ha già l'abbonamento
|
|
|
- $this->subscription_exist = \App\Models\MemberSubscription::where('subscription_id', $this->subscription_id)->where('member_id', $this->dataId)->count() > 0;
|
|
|
+ // $this->subscription_exist = \App\Models\MemberSubscription::where('subscription_id', $this->subscription_id)->where('member_id', $this->dataId)->count() > 0;
|
|
|
+ $this->subscription_exist = false;
|
|
|
|
|
|
$subscription_subscription_ids = [];
|
|
|
if ($subscription->prices != null) {
|
|
|
@@ -856,7 +857,7 @@ class Member extends Component
|
|
|
public function loadMemberCourses()
|
|
|
{
|
|
|
$this->member_courses = \App\Models\MemberCourse::where('member_id', $this->dataId)->get();
|
|
|
- $this->member_subscriptions = \App\Models\MemberSubscription::where('member_id', $this->dataId)->get();
|
|
|
+ $this->member_subscriptions = \App\Models\MemberSubscription::join('subscriptions', 'subscription_id', 'subscriptions.id')->where('member_id', $this->dataId)->orderBy('date_from', 'desc')->orderBy('date_to', 'desc')->orderBy('subscriptions.name', 'asc')->get();
|
|
|
}
|
|
|
|
|
|
public function loadMemberCategories()
|
