Merge branch 'krayin:2.1' into script/campaign

Author: sagarkumar-webkul

CHANGELOG.md

@@ -1,3 +1,95 @@
+## **v2.1.5 (19 of Sep 2025)** - *Release*
+
+* #2355[fixed] db_prefix support — installation and dashboard now function as expected
+
+## **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.  
+
+* #2211[fixed] Contact number validation works correctly when a custom checkbox attribute (like Gender) is added for Person.  
+
+* #2242[fixed] Translation string added in Attributes filter panel.  
+
+* #2271[fixed] At least one pipeline must be marked as "Is Default" to ensure proper lead management.  
+
+* #2269[fixed] Lookup attribute for Person entity works correctly with bulk-uploaded data via Data Transfer.  
+
+* #2170[fixed] Organization name now updates correctly in Person record after save in Contact → Person.  
+
+* #2245[fixed] Webhook sends parameter data to endpoint successfully.  
+
+* #2246[fixed] Webhook triggers correctly when nested JSON data is entered in JSON field.  
+
+* #2260[fixed] Duplicate pipeline names are no longer allowed.  
+
+* #2244[fixed] Header key updated to "Content-Type" in Webhook configuration.  
+
+* #2241[fixed] Non-admin users with dashboard access but without roles/users permission no longer get redirected to 401.  
+
+* #2238[fixed] User creation shortcut opens the create user page directly.  
+
+* #2234[fixed] Lead is created in the selected pipeline instead of always default pipeline.  
+
+* #2247[closed] Attribute type change and "Is Unique" option for custom attributes behave as intended.  
+
+* #1916[fixed] Overlay in Name and Organization fields on Person view page removed.  
+
+* #2322[fixed] Lost reason now visible in the activity log when opportunity is marked as "Lost".  
+
+* #2314[fixed] Currency displays consistently across Dashboard and throughout CRM.  
+
+* #2293[fixed] Contact name input is fully visible in Workflow Action UI.  
+
+* #2294[fixed] Salesperson name is fully visible in Workflow Action search dropdown.  
+
+* #2301[fixed] `closed_at` date format displays correctly in Lead activity timeline.  
+
+* #2300[fixed] Mega Search includes Configuration and Settings modules.  
+
+* #2303[fixed] Lead stage change via Kanban drag & drop prompts for required Won/Lost fields.  
+
+* #2304[fixed] Duplicate translation key for campaigns removed from Arabic language file (`ar/app.php`).  
+
+* #2307[fixed] Event cannot be deleted if associated with a campaign where event is required.  
+
+* #2312[fixed] Selected file is visible on Import Edit page.  
+
+* #2278[fixed] Groups associated with users cannot be deleted.  
+
+* #2291[fixed] Clear error message is shown when deleting a source.  
+
+* #2290[fixed] Filters for Source and Lead Type work correctly in Lead list view.  
+
+* #2295[fixed] In Leads, when marked as Won, `closed_at` saves the correct date.  
+
+* #2230[fixed] Leads graph no longer displays duplicate yearly data when selecting multi-year date range.  
+
+* #2282[fixed] Duplicate email template names are no longer allowed.  
+
+* #2256[fixed] Lead is not created from Webform submission when "Create Lead" option is disabled.  
+
+* #2283[fixed] Duplicate email template cannot be created via POST `/api/v1/settings/email-templates`.  
+
+* #2243[fixed] Leads Board View search placeholder updated to "Search by Title".  
+
+* #2146[fixed] "Filter by Tag" option added in Products filter panel.  
+
+* #2153[fixed] Dashboard restricts future date ranges to avoid empty/no data.  
+
+* #2158[fixed] Quote creation from lead negotiation stage redirects correctly within lead context.  
+
+* #2168[fixed] "Expired Quote" column in Quotes table displays date without unnecessary time.  
+
+* #2141[fixed] Group input field is no longer mandatory when creating a new user.  
+
+* #2275[fixed] Users cannot view or assign non-group users as Sales Owner in Persons, Leads, Organizations, and Quotes.  
+ 
 ## **v2.1.2 (16 of May 2025)** - *Release*
 
 * #2172[fixed] Cleaned up unnecessary label-value JSON from Email and Contact columns in export.

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

@@ -119,6 +119,8 @@ public function update(array $data, $id, $attribute = 'id')
      */
     public function getActivities($dateRange)
     {
+        $tablePrefix = \DB::getTablePrefix();
+
         return $this->select(
             'activities.id',
             'activities.created_at',
@@ -127,7 +129,7 @@ public function getActivities($dateRange)
             'activities.schedule_to as end',
             'users.name as user_name',
         )
-            ->addSelect(\DB::raw('IF(activities.is_done, "done", "") as class'))
+            ->addSelect(\DB::raw('IF('.$tablePrefix.'activities.is_done, "done", "") as class'))
             ->leftJoin('activity_participants', 'activities.id', '=', 'activity_participants.activity_id')
             ->leftJoin('users', 'activities.user_id', '=', 'users.id')
             ->whereIn('type', ['call', 'meeting', 'lunch'])

packages/Webkul/Activity/src/Repositories/ActivityRepository.php

@@ -27,9 +27,9 @@ public function prepareQueryBuilder(): Builder
                 'products.price',
                 'tags.name as tag_name',
             )
-            ->addSelect(DB::raw('SUM(product_inventories.in_stock) as total_in_stock'))
-            ->addSelect(DB::raw('SUM(product_inventories.allocated) as total_allocated'))
-            ->addSelect(DB::raw('SUM(product_inventories.in_stock - product_inventories.allocated) as total_on_hand'))
+            ->addSelect(DB::raw('SUM('.$tablePrefix.'product_inventories.in_stock) as total_in_stock'))
+            ->addSelect(DB::raw('SUM('.$tablePrefix.'product_inventories.allocated) as total_allocated'))
+            ->addSelect(DB::raw('SUM('.$tablePrefix.'product_inventories.in_stock - '.$tablePrefix.'product_inventories.allocated) as total_on_hand'))
             ->groupBy('products.id');
 
         if (request()->route('id')) {

packages/Webkul/Admin/src/DataGrids/Product/ProductDataGrid.php

@@ -360,7 +360,7 @@ public function getOverTimeStats($startDate, $endDate, $valueColumn, $dateColumn
             ->select(
                 DB::raw("$groupColumn AS date"),
                 DB::raw('COUNT(DISTINCT id) AS count'),
-                DB::raw("SUM($valueColumn) AS total")
+                DB::raw('SUM('.\DB::getTablePrefix()."$valueColumn) AS total")
             )
             ->whereIn('lead_pipeline_stage_id', $this->stageIds)
             ->whereBetween($dateColumn, [$startDate, $endDate])

packages/Webkul/Admin/src/Helpers/Reporting/Lead.php

@@ -68,7 +68,7 @@ public function download()
     }
 
     /**
-     * Display a listing of the resource.
+     * Search for configurations.
      */
     public function search(): JsonResponse
     {