diff --git a/VERSION.txt b/VERSION.txt index c52673985d32..ca3fdf6fc0c7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.10.23 \ No newline at end of file +5.10.24 \ No newline at end of file diff --git a/app/Livewire/BillingPortalPurchase.php b/app/Livewire/BillingPortalPurchase.php index 2acb2eee917d..96d7e8dcdd3e 100644 --- a/app/Livewire/BillingPortalPurchase.php +++ b/app/Livewire/BillingPortalPurchase.php @@ -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; } diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index 24248c58b08f..3e4ff6b4e557 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -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))); } } diff --git a/config/ninja.php b/config/ninja.php index c6fc98216433..9aba2900ae55 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -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), diff --git a/vite.config.ts.react b/vite.config.ts.react index b33ded98fa43..c682d25f73a0 100644 --- a/vite.config.ts.react +++ b/vite.config.ts.react @@ -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' } }, },