Skip to content

Commit 034014c

Browse files
mckenzieartsmckenziearts
committed
feat: rename relation to on feature Model and refactor Models
1 parent a965161 commit 034014c

File tree

4 files changed

+70
-70
lines changed

4 files changed

+70
-70
lines changed

‎src/Models/Feature.php

+17-17
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
* @property Carbon|null $updated_at
3232
* @property Carbon|null $deleted_at
3333
* @property-read Plan $plan
34-
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravelcm\Subscriptions\Models\SubscriptionUsage[] $usage
34+
* @property-read \Illuminate\Database\Eloquent\Collection|SubscriptionUsage[] $usages
3535
*
36-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature byPlanId($planId)
37-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature ordered($direction = 'asc')
38-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereCreatedAt($value)
39-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereDeletedAt($value)
40-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereDescription($value)
41-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereId($value)
42-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereTitle($value)
43-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature wherePlanId($value)
44-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereResettableInterval($value)
45-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereResettablePeriod($value)
46-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereSlug($value)
47-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereSortOrder($value)
48-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereUpdatedAt($value)
49-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature whereValue($value)
36+
* @method static \Illuminate\Database\Eloquent\Builder|Feature byPlanId($planId)
37+
* @method static \Illuminate\Database\Eloquent\Builder|Feature ordered($direction = 'asc')
38+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereCreatedAt($value)
39+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereDeletedAt($value)
40+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereDescription($value)
41+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereId($value)
42+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereTitle($value)
43+
* @method static \Illuminate\Database\Eloquent\Builder|Feature wherePlanId($value)
44+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereResettableInterval($value)
45+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereResettablePeriod($value)
46+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereSlug($value)
47+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereSortOrder($value)
48+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereUpdatedAt($value)
49+
* @method static \Illuminate\Database\Eloquent\Builder|Feature whereValue($value)
5050
*/
5151
class Feature extends Model implements Sortable
5252
{
@@ -93,7 +93,7 @@ class Feature extends Model implements Sortable
9393

9494
public function getTable(): string
9595
{
96-
return config('laravel-subscriptions.tables.features');
96+
return config('laravel-subscriptions.tables.features', 'features');
9797
}
9898

9999
protected static function boot(): void
@@ -120,7 +120,7 @@ public function getSlugOptions(): SlugOptions
120120
->saveSlugsTo('slug');
121121
}
122122

123-
public function usage(): HasMany
123+
public function usages(): HasMany
124124
{
125125
return $this->hasMany(config('laravel-subscriptions.models.subscription_usage'));
126126
}

‎src/Models/Plan.php

+23-23
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,29 @@
4040
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravelcm\Subscriptions\Models\Feature[] $features
4141
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravelcm\Subscriptions\Models\Subscription[] $subscriptions
4242
*
43-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan ordered($direction = 'asc')
44-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereActiveSubscribersLimit($value)
45-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereCreatedAt($value)
46-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereCurrency($value)
47-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereDeletedAt($value)
48-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereDescription($value)
49-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereGraceInterval($value)
50-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereGracePeriod($value)
51-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereId($value)
52-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereInvoiceInterval($value)
53-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereInvoicePeriod($value)
54-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereIsActive($value)
55-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereName($value)
56-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan wherePrice($value)
57-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereProrateDay($value)
58-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereProrateExtendDue($value)
59-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereProratePeriod($value)
60-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereSignupFee($value)
61-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereSlug($value)
62-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereSortOrder($value)
63-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereTrialInterval($value)
64-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereTrialPeriod($value)
65-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Plan whereUpdatedAt($value)
43+
* @method static \Illuminate\Database\Eloquent\Builder|Plan ordered($direction = 'asc')
44+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereActiveSubscribersLimit($value)
45+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereCreatedAt($value)
46+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereCurrency($value)
47+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereDeletedAt($value)
48+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereDescription($value)
49+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereGraceInterval($value)
50+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereGracePeriod($value)
51+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereId($value)
52+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereInvoiceInterval($value)
53+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereInvoicePeriod($value)
54+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereIsActive($value)
55+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereName($value)
56+
* @method static \Illuminate\Database\Eloquent\Builder|Plan wherePrice($value)
57+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereProrateDay($value)
58+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereProrateExtendDue($value)
59+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereProratePeriod($value)
60+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereSignupFee($value)
61+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereSlug($value)
62+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereSortOrder($value)
63+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereTrialInterval($value)
64+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereTrialPeriod($value)
65+
* @method static \Illuminate\Database\Eloquent\Builder|Plan whereUpdatedAt($value)
6666
*/
6767
class Plan extends Model implements Sortable
6868
{

‎src/Models/Subscription.php

+21-21
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@
3737
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravelcm\Subscriptions\Models\SubscriptionUsage[] $usage
3838
* @property-read Model $subscriber
3939
*
40-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription byPlanId($planId)
41-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription findEndedPeriod()
42-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription findEndedTrial()
43-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription findEndingPeriod($dayRange = 3)
44-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription findEndingTrial($dayRange = 3)
45-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription ofSubscriber(\Illuminate\Database\Eloquent\Model $subscriber)
46-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereCanceledAt($value)
47-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereCancelsAt($value)
48-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereCreatedAt($value)
49-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereDeletedAt($value)
50-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereDescription($value)
51-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereEndsAt($value)
52-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereId($value)
53-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereTitle($value)
54-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription wherePlanId($value)
55-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereSlug($value)
56-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereStartsAt($value)
57-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereTrialEndsAt($value)
58-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereUpdatedAt($value)
59-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereSubscriberId($value)
60-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription whereSubscriberType($value)
40+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription byPlanId($planId)
41+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription findEndedPeriod()
42+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription findEndedTrial()
43+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription findEndingPeriod($dayRange = 3)
44+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription findEndingTrial($dayRange = 3)
45+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription ofSubscriber(\Illuminate\Database\Eloquent\Model $subscriber)
46+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereCanceledAt($value)
47+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereCancelsAt($value)
48+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereCreatedAt($value)
49+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereDeletedAt($value)
50+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereDescription($value)
51+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereEndsAt($value)
52+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereId($value)
53+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereTitle($value)
54+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription wherePlanId($value)
55+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereSlug($value)
56+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereStartsAt($value)
57+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereTrialEndsAt($value)
58+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereUpdatedAt($value)
59+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereSubscriberId($value)
60+
* @method static \Illuminate\Database\Eloquent\Builder|Subscription whereSubscriberType($value)
6161
*/
6262
class Subscription extends Model
6363
{

‎src/Models/SubscriptionUsage.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
* @property-read Feature $feature
2222
* @property-read Subscription $subscription
2323
*
24-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage byFeatureSlug($featureSlug)
25-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereCreatedAt($value)
26-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereDeletedAt($value)
27-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereFeatureId($value)
28-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereId($value)
29-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereSubscriptionId($value)
30-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereUpdatedAt($value)
31-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereUsed($value)
32-
* @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereValidUntil($value)
24+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage byFeatureSlug($featureSlug)
25+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereCreatedAt($value)
26+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereDeletedAt($value)
27+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereFeatureId($value)
28+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereId($value)
29+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereSubscriptionId($value)
30+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereUpdatedAt($value)
31+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereUsed($value)
32+
* @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage whereValidUntil($value)
3333
*/
3434
class SubscriptionUsage extends Model
3535
{

0 commit comments

Comments
 (0)