mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
commit
9bdb3d77b7
@ -1 +1 @@
|
||||
5.10.23
|
||||
5.10.24
|
@ -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;
|
||||
}
|
||||
|
@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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'
|
||||
}
|
||||
},
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user