Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5908 from turbo124/v5-develop

Browse Source 
Fixes for subscriptions
This commit is contained in:
David Bomba 2021-06-03 15:55:56 +10:00 committed by GitHub
commit d427812cc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class ImportJsonController extends BaseController
* ),
* )
*/
public function index(ImportJsonRequest $request)
public function import(ImportJsonRequest $request)
{
$import_file = $request->file('files');

2
app/Http/Livewire/BillingPortalPurchase.php
View File

@ -349,7 +349,7 @@ class BillingPortalPurchase extends Component
$is_eligible = $this->subscription->service()->isEligible($this->contact);
if (($is_eligible) || is_array($is_eligible) && $is_eligible['exception']['message'] != 'Success') {
if (is_bool($is_eligible) || is_array($is_eligible) && $is_eligible['exception']['message'] != 'Success') {
$this->steps['not_eligible'] = true;
$this->steps['not_eligible_message'] = $is_eligible['exception']['message'];
$this->steps['show_loading_bar'] = false;