Merge branch 'krayin:2.1' into script/workflow

Author: sagarkumar-webkul

CHANGELOG.md

@@ -1,3 +1,9 @@
+## **v2.1.4 (16 of Sep 2025)** - *Release*
+
+* #2355[fixed] Improved database setup compatibility—now supports longer table prefixes during installation.
+
+* #2328[fixed] Enhanced IMAP integration to ensure all incoming emails are reliably received.
+  
 ## **v2.1.3 (02 of Sep 2025)** - *Release*
 
 * #2236[fixed] Save button now responsive when linking email to lead during lead creation.  

composer.lock

@@ -30,14 +30,16 @@ public function up()
     public function down()
     {
         Schema::table('activities', function (Blueprint $table) {
+            $tablePrefix = DB::getTablePrefix();
+
             // Disable foreign key checks temporarily.
             DB::statement('SET FOREIGN_KEY_CHECKS=0');
 
             // Drop the foreign key constraint using raw SQL.
-            DB::statement('ALTER TABLE activities DROP FOREIGN KEY activities_user_id_foreign');
+            DB::statement('ALTER TABLE '.$tablePrefix.'activities DROP FOREIGN KEY activities_user_id_foreign');
 
             // Drop the index.
-            DB::statement('ALTER TABLE activities DROP INDEX activities_user_id_foreign');
+            DB::statement('ALTER TABLE '.$tablePrefix.'activities DROP INDEX activities_user_id_foreign');
 
             // Change the column to be non-nullable.
             $table->unsignedInteger('user_id')->nullable(false)->change();

packages/Webkul/Activity/src/Database/Migrations/2025_01_17_151632_alter_activities_table.php

@@ -2197,7 +2197,10 @@
             'description' => 'Oops! The page you\'re looking for is on vacation. It seems we couldn\'t find what you were searching for.',
             'title'       => '404 Page Not Found',
         ],
-        '401' => 'Você não tem autorização para acessar esta página',
+        '401' => [
+            'description' => 'Ops! Parece que você não tem permissão para acessar esta página. Parece que estão faltando as credenciais necessárias.',
+            'title'       => '401 Não autorizado.',
+        ],
         '403' => [
             'description' => 'Oops! This page is off-limits. It appears you don\'t have the required permissions to view this content.',
             'title'       => '403 Forbidden',

packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

@@ -1,7 +1,8 @@
+import { expect, test } from '@playwright/test';
+import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { test, expect } from '@playwright/test';
 
 // Resolve file paths relative to this test file
 const __filename = fileURLToPath(import.meta.url);
@@ -17,24 +18,22 @@ const BASE_LANG = 'en';
 
 // Helper to extract just the keys from app.php
 function getNormalizedKeys(filePath: string): string[] {
-  const raw = fs.readFileSync(filePath, 'utf-8');
+  // PHP one-liner to output the array as JSON
+  const phpCode = `echo json_encode(include '${filePath}');`;
+  const json = execSync(`php -r "${phpCode.replace(/"/g, '\\"')}"`).toString();
+  const obj = JSON.parse(json);
 
-  const clean = raw
-    .replace(/<\?php\s*/g, '')
-    .replace(/return\s*\[/, '')
-    .replace(/\];/, '')
-    .trim();
+  function flattenKeys(obj: any, prefix = ''): string[] {
+    return Object.keys(obj).flatMap(key => {
+      const fullKey = prefix ? `${prefix}.${key}` : key;
+      if (typeof obj[key] === 'object' && obj[key] !== null) {
+        return flattenKeys(obj[key], fullKey);
+      }
+      return [fullKey];
+    });
+  }
 
-  return clean
-    .split('\n')
-    .map(line => line.trim())
-    .filter(line => line.includes('=>') && !line.startsWith('//'))
-    .map(line => {
-      // Extract the key before =>
-      const match = line.match(/^['"](.+?)['"]\s*=>/);
-      return match ? match[1] : null;
-    })
-    .filter(Boolean) as string[];
+  return flattenKeys(obj);
 }
 test('All language files must match number of keys and key names with English app.php', () => {
   const baseFile = path.join(LANG_DIR, BASE_LANG, 'app.php');

packages/Webkul/Admin/tests/e2e-pw/tests/lang/lang.spec.ts

@@ -16,7 +16,9 @@ public function up(): void
             $table->string('unique_id')->nullable();
         });
 
-        DB::statement("UPDATE attribute_values SET unique_id = CONCAT(entity_id, '|', attribute_id)");
+        $tablePrefix = DB::getTablePrefix();
+
+        DB::statement('UPDATE '.$tablePrefix."attribute_values SET unique_id = CONCAT(entity_id, '|', attribute_id)");
 
         Schema::table('attribute_values', function (Blueprint $table) {
             $table->unique('unique_id');

packages/Webkul/Attribute/src/Database/Migrations/2025_07_02_191710_alter_attribute_values_table.php

@@ -14,7 +14,7 @@ class Core
      *
      * @var string
      */
-    const KRAYIN_VERSION = '2.1.3';
+    const KRAYIN_VERSION = '2.1.4';
 
     /**
      * Create a new instance.

packages/Webkul/Core/src/Core.php

@@ -161,7 +161,7 @@ public function handle()
     }
 
     /**
-     *  Checking .env file and if not found then create .env file.
+     *  Checking .env file and if not found then create .env file
      *
      * @return ?array
      */
@@ -273,7 +273,23 @@ protected function askForDatabaseDetails()
             'DB_PREFIX' => text(
                 label: 'Please enter the database prefix',
                 default: env('DB_PREFIX', ''),
-                hint: 'or press enter to continue'
+                hint: 'or press enter to continue',
+                validate: function ($value) {
+                    $input = strlen($value);
+
+                    if ($input
+                        && ($input < 1
+                        || $input > 6)
+                    ) {
+                        return 'The database prefix must be between 1 and 6 characters.';
+                    }
+
+                    if (preg_match('/[^a-zA-Z0-9_]/', $value)) {
+                        return 'The database prefix may only contain letters, numbers, and underscores.';
+                    }
+
+                    return null;
+                }
             ),
 
             'DB_USERNAME' => text(