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

Merge pull request #6443 from turbo124/v5-develop

Browse Source 
minor fixes
This commit is contained in:
David Bomba 2021-08-11 09:16:51 +10:00 committed by GitHub
commit 59c6951227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SubscriptionController.php
View File

@ -354,6 +354,8 @@ class SubscriptionController extends BaseController
event(new SubscriptionWasUpdated($subscription, $subscription->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
nlog($subscription->id);
return $this->itemResponse($subscription);
}

23
app/Services/Subscription/SubscriptionService.php
View File

@ -777,7 +777,15 @@ class SubscriptionService
*/
public function products()
{
return Product::whereIn('id', $this->transformKeys(explode(",", $this->subscription->product_ids)))->get();
if(!$this->subscription->product_ids)
return collect();
$keys = $this->transformKeys(explode(",", $this->subscription->product_ids));
if(is_array($keys))
return Product::whereIn('id', $keys)->get();
else
return Product::where('id', $keys)->get();
}
/**
@ -788,7 +796,18 @@ class SubscriptionService
*/
public function recurring_products()
{
return Product::whereIn('id', $this->transformKeys(explode(",", $this->subscription->recurring_product_ids)))->get();
if(!$this->subscription->recurring_product_ids)
return collect();
$keys = $this->transformKeys(explode(",", $this->subscription->recurring_product_ids));
if(is_array($keys)){
return Product::whereIn('id', $keys)->get();
}
else{
return Product::where('id', $keys)->get();
}
}
/**