Merge branch '2.1' of github.com:krayin/laravel-crm into issue#1813

Author: suraj-webkul

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

@@ -627,6 +627,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'تم إنشاء الوسم بنجاح.',
+                    'destroy-success' => 'تم حذف الوسم بنجاح.',
+                ],
             ],
 
             'create' => [

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

@@ -629,6 +629,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'Tag created successfully.',
+                    'destroy-success' => 'Tag deleted successfully.',
+                ],
             ],
 
             'create' => [

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

@@ -631,6 +631,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'Etiqueta creada con éxito.',
+                    'destroy-success' => 'Etiqueta eliminada con éxito.',
+                ],
             ],
 
             'create' => [

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

@@ -631,6 +631,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'برچسب با موفقیت ایجاد شد.',
+                    'destroy-success' => 'برچسب با موفقیت حذف شد.',
+                ],
             ],
 
             'create' => [

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

@@ -625,6 +625,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'Tag criada com sucesso.',
+                    'destroy-success' => 'Tag excluída com sucesso.',
+                ],
             ],
 
             'create' => [

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

@@ -631,6 +631,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'Etiket başarıyla oluşturuldu.',
+                    'destroy-success' => 'Etiket başarıyla silindi.',
+                ],
             ],
 
             'create' => [

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

@@ -628,6 +628,11 @@
                         ],
                     ],
                 ],
+
+                'tags' => [
+                    'create-success'  => 'Thẻ được tạo thành công.',
+                    'destroy-success' => 'Thẻ đã được xóa thành công.',
+                ],
             ],
 
             'create' => [

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

@@ -47,7 +47,10 @@ public function map(mixed $record): array
                 $index = $column->getIndex();
                 $value = $record->{$index};
 
-                if (in_array($index, ['emails', 'contact_numbers']) && is_string($value)) {
+                if (
+                    in_array($index, ['emails', 'contact_numbers'])
+                    && is_string($value)
+                ) {
                     return $this->extractValuesFromJson($value);
                 }
 
@@ -61,11 +64,13 @@ public function map(mixed $record): array
      */
     protected function extractValuesFromJson(string $json): string
     {
-        $decoded = json_decode($json, true);
+        $items = json_decode($json, true);
 
-        if (json_last_error() === JSON_ERROR_NONE
-            && is_array($decoded)) {
-            return collect($decoded)->pluck('value')->implode(', ');
+        if (
+            json_last_error() === JSON_ERROR_NONE
+            && is_array($items)
+        ) {
+            return collect($items)->map(fn ($item) => "{$item['value']} ({$item['label']})")->implode(', ');
         }
 
         return $json;