Merge branch 'master' into imap-work

krayin · Jan 16, 2025 · d4f2112 · d4f2112
2 parents 2049749 + 748a3eb
commit d4f2112
Show file tree

Hide file tree

Showing 252 changed files with 2,982 additions and 1,554 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## **v2.0.3 (6th of December 2024)** - *Release*
+## **v2.0.4 (19th of December 2024)** - *Release*
 
 Added support for Brazilian Portuguese (PT_BR) Language.
 

diff --git a/composer.lock b/composer.lock
diff --git a/packages/Webkul/Activity/src/Models/File.php b/packages/Webkul/Activity/src/Models/File.php
@@ -8,8 +8,20 @@
 
 class File extends Model implements FileContract
 {
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
     protected $table = 'activity_files';
 
+    /**
+     * The attributes that should be appended to the model.
+     *
+     * @var array
+     */
+    protected $appends = ['url'];
+
     /**
      * The attributes that are mass assignable.
      *

diff --git a/packages/Webkul/Admin/package.json b/packages/Webkul/Admin/package.json
@@ -18,6 +18,7 @@
         "@vee-validate/rules": "^4.9.1",
         "@vitejs/plugin-vue": "^4.2.3",
         "chartjs-chart-funnel": "^4.2.1",
+        "dompurify": "^3.1.7",
         "flatpickr": "^4.6.13",
         "mitt": "^3.0.1",
         "vee-validate": "^4.9.1",

diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php
@@ -151,11 +151,6 @@
         'name'  => 'admin::app.acl.delete',
         'route' => ['admin.contacts.persons.delete', 'admin.contacts.persons.mass_delete'],
         'sort'  => 4,
-    ], [
-        'key'   => 'contacts.persons.export',
-        'name'  => 'admin::app.acl.export',
-        'route' => 'ui.datagrid.export',
-        'sort'  => 4,
     ],  [
         'key'   => 'contacts.persons.view',
         'name'  => 'admin::app.acl.view',

diff --git a/packages/Webkul/Admin/src/DataGrids/Activity/ActivityDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Activity/ActivityDataGrid.php
@@ -131,9 +131,9 @@ public function prepareColumns(): void
                     return "<span class='text-gray-800 dark:text-gray-300'>N/A</span>";
                 }
 
-                $route = urldecode(route('admin.leads.index', ['pipeline_id' => $row->lead_pipeline_id, 'view_type' => 'table', 'id[eq]' => $row->lead_id]));
+                $route = urldecode(route('admin.leads.view', $row->lead_id));
 
-                return "<a class='text-brandColor hover:underline' href='".$route."'>".$row->lead_title.'</a>';
+                return "<a class='text-brandColor hover:underline' target='_blank' href='".$route."'>".$row->lead_title.'</a>';
             },
         ]);
 

diff --git a/packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php
@@ -251,7 +251,7 @@ public function prepareColumns(): void
 
         $this->addColumn([
             'index'           => 'expected_close_date',
-            'label'           => trans('admin::app.leads.index.datagrid.expected-close-date'),
+            'label'           => trans('admin::app.leads.index.datagrid.date-to'),
             'type'            => 'date',
             'searchable'      => false,
             'sortable'        => true,

diff --git a/packages/Webkul/Admin/src/DataGrids/Mail/EmailDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Mail/EmailDataGrid.php
@@ -65,7 +65,7 @@ public function prepareColumns(): void
 
         $this->addColumn([
             'index'      => 'attachments',
-            'label'      => '<span class="icon-attachment text-2xl"></span>',
+            'label'      => trans('admin::app.mail.index.datagrid.attachments'),
             'type'       => 'string',
             'searchable' => false,
             'filterable' => false,
@@ -91,9 +91,18 @@ public function prepareColumns(): void
             'filterable' => true,
         ]);
 
+        $this->addColumn([
+            'index'      => 'reply',
+            'label'      => trans('admin::app.mail.index.datagrid.content'),
+            'type'       => 'string',
+            'sortable'   => true,
+            'searchable' => true,
+            'filterable' => true,
+        ]);
+
         $this->addColumn([
             'index'              => 'tags',
-            'label'              => trans('admin::app.mail.index.datagrid.tag-name'),
+            'label'              => trans('admin::app.mail.index.datagrid.tags'),
             'type'               => 'string',
             'searchable'         => false,
             'sortable'           => true,
@@ -117,7 +126,7 @@ public function prepareColumns(): void
 
         $this->addColumn([
             'index'           => 'created_at',
-            'label'           => trans('admin::app.mail.index.datagrid.created-at'),
+            'label'           => trans('admin::app.mail.index.datagrid.date'),
             'type'            => 'date',
             'searchable'      => true,
             'filterable'      => true,

diff --git a/packages/Webkul/Admin/src/DataGrids/Settings/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Settings/AttributeDataGrid.php
@@ -64,12 +64,23 @@ public function prepareColumns(): void
         ]);
 
         $this->addColumn([
-            'index'      => 'entity_type',
-            'label'      => trans('admin::app.settings.attributes.index.datagrid.entity-type'),
-            'type'       => 'string',
-            'sortable'   => true,
-            'searchable' => false,
-            'filterable' => true,
+            'index'              => 'entity_type',
+            'label'              => trans('admin::app.settings.attributes.index.datagrid.entity-type'),
+            'type'               => 'string',
+            'sortable'           => true,
+            'searchable'         => false,
+            'filterable'         => true,
+            'filterable_type'    => 'dropdown',
+            'filterable_options' => app(AttributeRepository::class)
+                ->select('entity_type as label', 'entity_type as value')
+                ->distinct()
+                ->get()
+                ->map(function ($item) {
+                    $item->label = trans('admin::app.settings.attributes.index.datagrid.entity-types.'.$item->label);
+
+                    return $item;
+                })
+                ->toArray(),
             'closure'    => fn ($row) => ucfirst($row->entity_type),
         ]);
 
@@ -84,6 +95,11 @@ public function prepareColumns(): void
                 ->select('type as label', 'type as value')
                 ->distinct()
                 ->get()
+                ->map(function ($item) {
+                    $item->label = trans('admin::app.settings.attributes.index.datagrid.types.'.$item->label);
+
+                    return $item;
+                })
                 ->toArray(),
         ]);