Skip to content

Commit

Permalink
Fix fatal errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ajitbohra committed Jan 18, 2019
1 parent 09f0b12 commit 3d06632
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions app/Subscription.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ class Subscription extends Model
protected $table = 'trn_subscriptions';

protected $fillable = [
'member_id',
'invoice_id',
'plan_id',
'status',
'is_renewal',
'start_date',
'end_date',
'created_by',
'updated_by',
];
'member_id',
'invoice_id',
'plan_id',
'status',
'is_renewal',
'start_date',
'end_date',
'created_by',
'updated_by',
];

protected $dates = ['created_at', 'updated_at', 'start_date', 'end_date'];

Expand All @@ -40,7 +40,7 @@ class Subscription extends Model
public function scopeDashboardExpiring($query)
{
return $query
->with(['members' => function ($query) {
->with(['member' => function ($query) {
$query->where('status', '=', \constStatus::Active);
}])
->where('end_date', '<', Carbon::today()->addDays(7))
Expand All @@ -50,7 +50,7 @@ public function scopeDashboardExpiring($query)
public function scopeDashboardExpired($query)
{
return $query
->with(['members' => function ($query) {
->with(['member' => function ($query) {
$query->where('status', '=', \constStatus::Active);
}])
->where('status', '=', \constSubscription::Expired);
Expand Down
2 changes: 1 addition & 1 deletion resources/views/dashboard/_index/birthdays.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
src="{{ $profileImage }}"/></a></td>
<td><a href="{{ action('MembersController@show',['id' => $birthday->id]) }}">{{ $birthday->name }}</a></td>
<td>{{ $birthday->contact }}</td>
<td>{{ $birthday->DOB->toFormattedDateString() }}</td>
<td>{{ $birthday->DOB }}</td>
</tr>
@empty
<div class="tab-empty-panel font-size-24 color-grey-300">
Expand Down

1 comment on commit 3d06632

@sevv
Copy link

@sevv sevv commented on 3d06632 Apr 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ajitbohra can you please write some notes with the changes you've found? That way other developers like myself new to this project will have an understanding of what's going on. Thank you and cheers!

Please sign in to comment.