matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sub type -> name | Laravel 11 upgrade

Browse Source
This commit is contained in:
Julien Nahum
2024-06-15 12:10:41 +02:00
parent 39eeb35f8f
commit 5a579893dc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/BillingController.php
View File

@@ -68,7 +68,7 @@ class BillingController extends Controller
"id" => $subscription->id, "id" => $subscription->id,
"stripe_id" => $subscription->stripe_id, "stripe_id" => $subscription->stripe_id,
"name" => ucfirst($user->name), "name" => ucfirst($user->name),
"plan" => $subscription->name, "plan" => $subscription->type,
"status" => $subscription->stripe_status, "status" => $subscription->stripe_status,
"creation_date" => $subscription->created_at->format('Y-m-d') "creation_date" => $subscription->created_at->format('Y-m-d')
]; ];

6
app/Http/Controllers/Webhook/StripeController.php
View File

@@ -39,7 +39,7 @@ class StripeController extends WebhookController
return; return;
} }
$subscription->name = $subscription->name ?? $data['metadata']['name'] ?? $this->newSubscriptionName($payload); $subscription->type = $subscription->type ?? $data['metadata']['name'] ?? $this->newSubscriptionName($payload);
$firstItem = $data['items']['data'][0]; $firstItem = $data['items']['data'][0];
$isSinglePrice = count($data['items']['data']) === 1; $isSinglePrice = count($data['items']['data']) === 1;
@@ -47,8 +47,8 @@ class StripeController extends WebhookController
// Price... // Price...
$subscription->stripe_price = $isSinglePrice ? $firstItem['price']['id'] : null; $subscription->stripe_price = $isSinglePrice ? $firstItem['price']['id'] : null;
// Name... // Type - previously (Name)
$subscription->name = $this->getSubscriptionName($data['plan']['product']); $subscription->type = $this->getSubscriptionName($data['plan']['product']);
// Quantity... // Quantity...
$subscription->quantity = $isSinglePrice && isset($firstItem['quantity']) ? $firstItem['quantity'] : null; $subscription->quantity = $isSinglePrice && isset($firstItem['quantity']) ? $firstItem['quantity'] : null;