Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5321 from turbo124/v5-develop

Browse Source 
fixes for subscriptions
This commit is contained in:
David Bomba 2021-04-02 10:19:37 +11:00 committed by GitHub
commit f7cf6b521f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/OpenAPI/BillingSubscription.php
View File

@ -17,13 +17,11 @@
* @OA\Property(property="allow_cancellation", type="boolean", example="true", description="______"),
* @OA\Property(property="per_seat_enabled", type="boolean", example="true", description="______"),
* @OA\Property(property="currency_id", type="integer", example="1", description="______"),
* @OA\Property(property="min_seats_limit", type="integer", example="1", description="______"),
* @OA\Property(property="max_seats_limit", type="integer", example="100", description="______"),
* @OA\Property(property="trial_enabled", type="boolean", example="true", description="______"),
* @OA\Property(property="trial_duration", type="integer", example="2", description="______"),
* @OA\Property(property="allow_query_overrides", type="boolean", example="true", description="______"),
* @OA\Property(property="allow_plan_changes", type="boolean", example="true", description="______"),
* @OA\Property(property="plan_map", type="string", example="1", description="map describing the available upgrade/downgrade plans for this subscription"),
* @OA\Property(property="refund_period", type="integer", example="2", description="______"),
* @OA\Property(property="webhook_configuration", type="string", example="2", description="______"),
* @OA\Property(property="is_deleted", type="boolean", example="true", description="______"),

1
app/Http/Requests/Subscription/StoreSubscriptionRequest.php
View File

@ -51,7 +51,6 @@ class StoreSubscriptionRequest extends Request
'trial_duration' => ['sometimes'],
'allow_query_overrides' => ['sometimes'],
'allow_plan_changes' => ['sometimes'],
'plan_map' => ['sometimes'],
'refund_period' => ['sometimes'],
'webhook_configuration' => ['array'],
'name' => ['required', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)]

4
app/Models/Subscription.php
View File

@ -31,24 +31,22 @@ class Subscription extends BaseModel
'is_amount_discount',
'allow_cancellation',
'per_seat_enabled',
'min_seats_limit',
'max_seats_limit',
'trial_enabled',
'trial_duration',
'allow_query_overrides',
'allow_plan_changes',
'plan_map',
'refund_period',
'webhook_configuration',
'currency_id',
'group_id',
'price',
'name',
'currency_id',
];
protected $casts = [
'is_deleted' => 'boolean',
'plan_map' => 'object',
'webhook_configuration' => 'array',
'updated_at' => 'timestamp',
'created_at' => 'timestamp',

3
app/Transformers/SubscriptionTransformer.php
View File

@ -52,16 +52,15 @@ class SubscriptionTransformer extends EntityTransformer
'is_amount_discount' => (bool)$subscription->is_amount_discount,
'allow_cancellation' => (bool)$subscription->allow_cancellation,
'per_seat_enabled' => (bool)$subscription->per_seat_enabled,
'min_seats_limit' => (int)$subscription->min_seats_limit,
'max_seats_limit' => (int)$subscription->max_seats_limit,
'trial_enabled' => (bool)$subscription->trial_enabled,
'trial_duration' => (int)$subscription->trial_duration,
'allow_query_overrides' => (bool)$subscription->allow_query_overrides,
'allow_plan_changes' => (bool)$subscription->allow_plan_changes,
'plan_map' => (string)$subscription->plan_map,
'refund_period' => (int)$subscription->refund_period,
'webhook_configuration' => $subscription->webhook_configuration ?: [],
'purchase_page' => (string)route('client.subscription.purchase', $subscription->hashed_id),
'currency_id' => (string) $subscription->currency_id,
'is_deleted' => (bool)$subscription->is_deleted,
'created_at' => (int)$subscription->created_at,
'updated_at' => (int)$subscription->updated_at,