Merge pull request #2483 from VikassWebkul214254/2.2

2.2

Author: VikassWebkul214254

CHANGELOG.md

@@ -2,8 +2,22 @@
 
 This changelog consists of the bug & security fixes and new features being included in the releases listed below.
 
-## **v2.2.0 (17th of March 2026)**
+## **v2.2.0 (17th of March 2026)** *Release*
 
 * **[Laravel 12 Upgrade]** Upgraded framework to Laravel 12
 
-* Update Testcases
+* #2480[enhancement] Codebase updates and refinements.
+
+* #2478[enhancement] Improved class instantiation handling.
+
+* #2472[enhancement] Upgrade to Laravel 12.
+
+* #2470[enhancement] Updated auto_commits.yml configuration.
+
+* #2469[enhancement] General enhancements and optimizations.
+
+* #2468[enhancement] Documentation updates (MD files).
+
+* #2450[fixed] Added ACL support for warehouses.
+
+* #2444[fixed] Improved global search functionality for organizations.

example.txt

@@ -32,10 +32,10 @@ public function __construct(Container $container)
         parent::__construct($container);
 
         $this->jsonErrorMessages = [
-            '404' => trans('admin::app.common.resource-not-found'),
-            '403' => trans('admin::app.common.forbidden-error'),
-            '401' => trans('admin::app.common.unauthenticated'),
-            '500' => trans('admin::app.common.internal-server-error'),
+            '404' => trans('admin::app.errors.404.title'),
+            '403' => trans('admin::app.errors.403.title'),
+            '401' => trans('admin::app.errors.401.title'),
+            '500' => trans('admin::app.errors.500.title'),
         ];
     }
 

packages/Webkul/Admin/src/Exceptions/Handler.php

@@ -27,7 +27,7 @@ public function handle($request, \Closure $next, $guard = 'user')
         if (! (bool) auth()->guard($guard)->user()->status) {
             auth()->guard($guard)->logout();
 
-            session()->flash('error', __('admin::app.errors.401'));
+            session()->flash('error', trans('admin::app.errors.401'));
 
             return redirect()->route('admin.session.create');
         }
@@ -39,7 +39,7 @@ public function handle($request, \Closure $next, $guard = 'user')
         if ($this->isPermissionsEmpty()) {
             auth()->guard($guard)->logout();
 
-            session()->flash('error', __('admin::app.errors.401'));
+            session()->flash('error', trans('admin::app.errors.401'));
 
             return redirect()->route('admin.session.create');
         }

packages/Webkul/Admin/src/Http/Middleware/Bouncer.php

@@ -58,7 +58,7 @@ public function rules()
     public function messages()
     {
         return [
-            'stages.*.name.unique_key' => __('admin::app.settings.pipelines.duplicate-name'),
+            'stages.*.name.unique_key' => trans('admin::app.settings.pipelines.duplicate-name'),
         ];
     }
 

packages/Webkul/Admin/src/Http/Requests/PipelineForm.php

@@ -388,7 +388,7 @@ class="secondary-button"
                             });
 
                             if (filteredStages.length > 1) {
-                                return '{!! __('admin::app.settings.pipelines.create.duplicate-name') !!}';
+                                return "{!! trans('admin::app.settings.pipelines.create.duplicate-name') !!}";
                             }
 
                             this.removeUniqueNameErrors();

packages/Webkul/Admin/src/Resources/views/settings/pipelines/create.blade.php

@@ -338,7 +338,7 @@ class="secondary-button"
                             });
 
                             if (filteredStages.length > 1) {
-                                return '{!! __('admin::app.settings.pipelines.create.duplicate-name') !!}';
+                                return "{!! trans('admin::app.settings.pipelines.create.duplicate-name') !!}";
                             }
 
                             this.removeUniqueNameErrors();

packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php

@@ -53,7 +53,7 @@ public function getActiveInactiveDropdownOptions(): array
         return [
             [
                 'value' => '',
-                'label' => __('admin::app.common.select-options'),
+                'label' => trans('admin::app.common.select-options'),
                 'disabled' => true,
                 'selected' => true,
             ],
@@ -79,18 +79,18 @@ public function getYesNoDropdownOptions(): array
         return [
             [
                 'value' => '',
-                'label' => __('admin::app.common.select-options'),
+                'label' => trans('admin::app.common.select-options'),
                 'disabled' => true,
                 'selected' => true,
             ],
             [
                 'value' => 0,
-                'label' => __('admin::app.common.no'),
+                'label' => trans('admin::app.common.no'),
                 'disabled' => false,
                 'selected' => false,
             ], [
                 'value' => 1,
-                'label' => __('admin::app.common.yes'),
+                'label' => trans('admin::app.common.yes'),
                 'disabled' => false,
                 'selected' => false,
             ],
@@ -115,7 +115,7 @@ public function getUserDropdownOptions(): array
 
         return [
             [
-                'label' => __('admin::app.common.select-users'),
+                'label' => trans('admin::app.common.select-users'),
                 'value' => '',
                 'disabled' => true,
                 'selected' => true,
@@ -142,7 +142,7 @@ public function getLeadSourcesOptions(): array
 
         return [
             [
-                'label' => __('admin::app.common.select-users'),
+                'label' => trans('admin::app.common.select-users'),
                 'value' => '',
                 'disabled' => true,
                 'selected' => true,
@@ -169,7 +169,7 @@ public function getOrganizationDropdownOptions(): array
 
         return [
             [
-                'label' => __('admin::app.common.select-organization'),
+                'label' => trans('admin::app.common.select-organization'),
                 'value' => '',
                 'disabled' => true,
                 'selected' => true,
@@ -273,7 +273,7 @@ public function getWarehouseDropdownOptions(): array
 
         return [
             [
-                'label' => __('admin::app.common.select-warehouse'),
+                'label' => trans('admin::app.common.select-warehouse'),
                 'value' => '',
                 'disabled' => true,
                 'selected' => true,

packages/Webkul/Admin/src/Traits/ProvideDropdownOptions.php

@@ -110,7 +110,7 @@ public function replacePlaceholders(mixed $entity, string $content): string
                     break;
 
                 case 'boolean':
-                    $value = $entity->{$attribute['id']} ? __('admin::app.common.yes') : __('admin::app.common.no');
+                    $value = $entity->{$attribute['id']} ? trans('admin::app.common.yes') : trans('admin::app.common.no');
 
                     break;
 

packages/Webkul/Automation/src/Helpers/Entity/AbstractEntity.php

@@ -15,14 +15,17 @@ class CanInstall
      */
     public function handle(Request $request, Closure $next): mixed
     {
-        if (Str::contains($request->getPathInfo(), '/install')) {
-            if ($this->isAlreadyInstalled() && ! $request->ajax()) {
-                return redirect()->route('admin.dashboard.index');
-            }
-        } else {
-            if (! $this->isAlreadyInstalled()) {
-                return redirect()->route('installer.index');
-            }
+        $isInstallRoute = Str::contains($request->getPathInfo(), '/install');
+        $isInstalled = $this->isAlreadyInstalled();
+
+        if ($isInstallRoute && $isInstalled) {
+            abort_if($request->ajax(), 403);
+
+            return redirect()->route('admin.dashboard.index');
+        }
+
+        if (! $isInstallRoute && ! $isInstalled) {
+            return redirect()->route('installer.index');
         }
 
         return $next($request);
@@ -33,18 +36,20 @@ public function handle(Request $request, Closure $next): mixed
      */
     public function isAlreadyInstalled(): bool
     {
-        if (file_exists(storage_path('installed'))) {
+        $installedPath = storage_path('installed');
+
+        if (file_exists($installedPath)) {
             return true;
         }
 
-        if (app(DatabaseManager::class)->isInstalled()) {
-            touch(storage_path('installed'));
+        if (! app(DatabaseManager::class)->isInstalled()) {
+            return false;
+        }
 
-            Event::dispatch('krayin.installed');
+        touch($installedPath);
 
-            return true;
-        }
+        Event::dispatch('krayin.installed');
 
-        return false;
+        return true;
     }
 }