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 #9911 from turbo124/v5-develop

Browse Source 
v5.10.24
This commit is contained in:
David Bomba 2024-08-15 10:39:09 +10:00 committed by GitHub
commit 9bdb3d77b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.10.23
5.10.24

4
app/Livewire/BillingPortalPurchase.php
View File

@ -349,7 +349,11 @@ class BillingPortalPurchase extends Component
}
if ((int)$this->price == 0) {
$this->steps['payment_required'] = false;
$this->steps['fetched_payment_methods'] = false;
$this->heading_text = ctrans('texts.payment_methods');
return $this;
} else {
// $this->steps['fetched_payment_methods'] = true;
}

6
app/Repositories/BaseRepository.php
View File

@ -58,7 +58,7 @@ class BaseRepository
$className = $this->getEventClass($entity, 'Archived');
if (class_exists($className)) {
event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event(new $className($entity, $entity->company, Ninja::eventVars(auth()->guard('api')->user() ? auth()->guard('api')->user()->id : null)));
}
}
@ -84,7 +84,7 @@ class BaseRepository
$className = $this->getEventClass($entity, 'Restored');
if (class_exists($className)) {
event(new $className($entity, $fromDeleted, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event(new $className($entity, $fromDeleted, $entity->company, Ninja::eventVars(auth()->guard('api')->user() ? auth()->guard('api')->user()->id : null)));
}
}
@ -105,7 +105,7 @@ class BaseRepository
$className = $this->getEventClass($entity, 'Deleted');
if (class_exists($className) && !($entity instanceof Company)) {
event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event(new $className($entity, $entity->company, Ninja::eventVars(auth()->guard('api')->user() ? auth()->guard('api')->user()->id : null)));
}
}

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.10.23'),
'app_tag' => env('APP_TAG', '5.10.23'),
'app_version' => env('APP_VERSION', '5.10.24'),
'app_tag' => env('APP_TAG', '5.10.24'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

4
vite.config.ts.react
View File

@ -13,8 +13,8 @@ export default defineConfig({
rollupOptions: {
output: {
// This will output a single bundle file
entryFileNames: 'bundle.js',
chunkFileNames: 'bundle.js'
entryFileNames: 'bundle.[hash].js',
chunkFileNames: 'bundle.[hash].js'
}
},
},