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

Merge pull request #5752 from turbo124/v5-develop

Browse Source 
Fixes for refresh route - firstload/mini_loader
This commit is contained in:
David Bomba 2021-05-19 20:43:03 +10:00 committed by GitHub
commit f188fada5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/BaseController.php
View File

@ -189,10 +189,7 @@ class BaseController extends Controller
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->getCompany()->is_large) $this->manager->parseIncludes($this->first_load);
$this->manager->parseIncludes($this->mini_load);
else
$this->manager->parseIncludes($this->first_load);
$this->serializer = request()->input('serializer') ?: EntityTransformer::API_SERIALIZER_ARRAY; $this->serializer = request()->input('serializer') ?: EntityTransformer::API_SERIALIZER_ARRAY;

2
app/PaymentDrivers/Stripe/ImportCustomers.php
View File

@ -8,7 +8,7 @@
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com) * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://opensource.org/licenses/AAL * @license https://opensource.org/licenses/AAL
*/ */
namespace App\PaymentDrivers\Stripe; namespace App\PaymentDrivers\Stripe;

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

@ -238,6 +238,8 @@ class SubscriptionService
*/ */
private function calculateProRataRefund($invoice) :float private function calculateProRataRefund($invoice) :float
{ {
if(!$this->invoice->date)
return 0;
$start_date = Carbon::parse($invoice->date); $start_date = Carbon::parse($invoice->date);