Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.2' into 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@devansh-webkul
devansh-webkul committed Jan 31, 2025
2 parents bdbb192 + 6d946ac commit 297f480
Show file tree
Hide file tree
Showing 24 changed files with 314 additions and 224 deletions.
41 changes: 33 additions & 8 deletions packages/Webkul/Admin/src/DataGrids/Theme/ThemeDataGrid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@ public function prepareColumns()
{
$themes = config('themes.shop');

$this->addColumn([
'index' => 'id',
'label' => trans('admin::app.settings.themes.index.datagrid.id'),
'type' => 'integer',
'filterable' => true,
'sortable' => true,
]);

$this->addColumn([
'index' => 'channel_name',
'label' => trans('admin::app.settings.themes.index.datagrid.channel_name'),
Expand Down Expand Up @@ -174,4 +166,37 @@ public function prepareActions()
]);
}
}

/**
* Prepare mass actions.
*
* @return void
*/
public function prepareMassActions()
{
if (bouncer()->hasPermission('settings.themes.edit')) {
$this->addMassAction([
'title' => trans('admin::app.settings.themes.index.datagrid.change-status'),
'url' => route('admin.settings.themes.mass_update'),
'method' => 'POST',
'options' => [
[
'label' => trans('admin::app.settings.themes.index.datagrid.active'),
'value' => 1,
], [
'label' => trans('admin::app.settings.themes.index.datagrid.inactive'),
'value' => 0,
],
],
]);
}

if (bouncer()->hasPermission('settings.themes.delete')) {
$this->addMassAction([
'title' => trans('admin::app.settings.themes.index.datagrid.delete'),
'url' => route('admin.settings.themes.mass_delete'),
'method' => 'POST',
]);
}
}
}
28 changes: 28 additions & 0 deletions packages/Webkul/Admin/src/Http/Controllers/Settings/ThemeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use Illuminate\Support\Facades\Storage;
use Webkul\Admin\DataGrids\Theme\ThemeDataGrid;
use Webkul\Admin\Http\Controllers\Controller;
use Webkul\Admin\Http\Requests\MassDestroyRequest;
use Webkul\Admin\Http\Requests\MassUpdateRequest;
use Webkul\Theme\Repositories\ThemeCustomizationRepository;

class ThemeController extends Controller
Expand Down Expand Up @@ -140,4 +142,30 @@ public function destroy(int $id)
'message' => trans('admin::app.settings.themes.delete-success'),
], 200);
}

public function massUpdate(MassUpdateRequest $massUpdateRequest): JsonResponse
{
$selectedThemeIds = $massUpdateRequest->input('indices');

$this->themeCustomizationRepository->massUpdateStatus([
'status' => $massUpdateRequest->input('value'),
], $selectedThemeIds);

return new JsonResponse([
'message' => trans('admin::app.settings.themes.update-success'),
]);
}

public function massDestroy(MassDestroyRequest $massDestroyRequest): JsonResponse
{
$selectedThemeIds = $massDestroyRequest->input('indices');

foreach ($selectedThemeIds as $themeId) {
$this->themeCustomizationRepository->delete($themeId);
}

return new JsonResponse([
'message' => trans('admin::app.settings.themes.update-success'),
]);
}
}
14 changes: 7 additions & 7 deletions packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Webkul\Admin\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;
use Webkul\Core\Rules\Decimal;
use Webkul\Core\Rules\PostCode;
use Webkul\Core\Rules\PhoneNumber;
use Illuminate\Foundation\Http\FormRequest;
use Webkul\Core\Rules\PostCode;

class ConfigurationForm extends FormRequest
{
Expand Down Expand Up @@ -45,7 +45,7 @@ public function rules()
/**
* Transform validation rules into an array and map custom validation rules
*
* @param string|array $validation
* @param string|array $validation
* @return array
*/
protected function getValidationRules($validation)
Expand All @@ -54,10 +54,10 @@ protected function getValidationRules($validation)

return array_map(function ($rule) {
return match ($rule) {
'phone' => new PhoneNumber(),
'postcode' => new PostCode(),
'decimal' => new Decimal(),
default => $rule,
'phone' => new PhoneNumber,
'postcode' => new PostCode,
'decimal' => new Decimal,
default => $rule,
};
}, $validations);
}
Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'المواضيع',

'datagrid' => [
'active' => 'نشيط',
'channel_name' => 'اسم القناة',
'delete' => 'حذف',
'id' => 'المعرف',
'inactive' => 'غير نشط',
'name' => 'الاسم',
'sort-order' => 'ترتيب الفرز',
'status' => 'الحالة',
'theme' => 'موضوع',
'type' => 'النوع',
'view' => 'عرض',
'active' => 'نشيط',
'channel_name' => 'اسم القناة',
'change-status' => 'تغيير الحالة',
'delete' => 'حذف',
'id' => 'المعرف',
'inactive' => 'غير نشط',
'name' => 'الاسم',
'sort-order' => 'ترتيب الفرز',
'status' => 'الحالة',
'theme' => 'موضوع',
'type' => 'النوع',
'view' => 'عرض',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/bn/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'থিম',

'datagrid' => [
'active' => 'সক্রিয়',
'channel_name' => 'চ্যানেল নাম',
'delete' => 'মুছে ফেলুন',
'id' => 'আইডি',
'inactive' => 'নিষ্ক্রিয়',
'name' => 'নাম',
'sort-order' => 'ক্রম',
'status' => 'স্থিতি',
'theme' => 'থিম',
'type' => 'ধরণ',
'view' => 'দেখুন',
'active' => 'সক্রিয়',
'channel_name' => 'চ্যানেল নাম',
'change-status' => 'স্ট্যাটাস পরিবর্তন করুন',
'delete' => 'মুছে ফেলুন',
'id' => 'আইডি',
'inactive' => 'নিষ্ক্রিয়',
'name' => 'নাম',
'sort-order' => 'ক্রম',
'status' => 'স্থিতি',
'theme' => 'থিম',
'type' => 'ধরণ',
'view' => 'দেখুন',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/de/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'Themen',

'datagrid' => [
'active' => 'Aktiv',
'channel_name' => 'Kanalname',
'delete' => 'Löschen',
'id' => 'ID',
'inactive' => 'Inaktiv',
'name' => 'Name',
'sort-order' => 'Sortierreihenfolge',
'status' => 'Status',
'theme' => 'Thema',
'type' => 'Typ',
'view' => 'Ansehen',
'active' => 'Aktiv',
'channel_name' => 'Kanalname',
'change-status' => 'Status ändern',
'delete' => 'Löschen',
'id' => 'ID',
'inactive' => 'Inaktiv',
'name' => 'Name',
'sort-order' => 'Sortierreihenfolge',
'status' => 'Status',
'theme' => 'Thema',
'type' => 'Typ',
'view' => 'Ansehen',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'Themes',

'datagrid' => [
'active' => 'Active',
'channel_name' => 'Channel Name',
'delete' => 'Delete',
'id' => 'Id',
'inactive' => 'Inactive',
'name' => 'Name',
'sort-order' => 'Sort Order',
'status' => 'Status',
'theme' => 'Theme',
'type' => 'Type',
'view' => 'View',
'active' => 'Active',
'channel_name' => 'Channel Name',
'change-status' => 'Change status',
'delete' => 'Delete',
'id' => 'Id',
'inactive' => 'Inactive',
'name' => 'Name',
'sort-order' => 'Sort Order',
'status' => 'Status',
'theme' => 'Theme',
'type' => 'Type',
'view' => 'View',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'Temas',

'datagrid' => [
'active' => 'Activo',
'channel_name' => 'Nombre del Canal',
'delete' => 'Eliminar',
'id' => 'ID',
'inactive' => 'Inactivo',
'name' => 'Nombre',
'sort-order' => 'Orden de Clasificación',
'status' => 'Estado',
'theme' => 'Tema',
'type' => 'Tipo',
'view' => 'Ver',
'active' => 'Activo',
'channel_name' => 'Nombre del Canal',
'change-status' => 'Cambiar estado',
'delete' => 'Eliminar',
'id' => 'ID',
'inactive' => 'Inactivo',
'name' => 'Nombre',
'sort-order' => 'Orden de Clasificación',
'status' => 'Estado',
'theme' => 'Tema',
'type' => 'Tipo',
'view' => 'Ver',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'تم‌ها',

'datagrid' => [
'active' => 'فعال',
'channel_name' => 'نام کانال',
'delete' => 'حذف',
'id' => 'شناسه',
'inactive' => 'غیرفعال',
'name' => 'نام',
'sort-order' => 'ترتیب مرتب‌سازی',
'status' => 'وضعیت',
'theme' => 'موضوع',
'type' => 'نوع',
'view' => 'مشاهده',
'active' => 'فعال',
'channel_name' => 'نام کانال',
'change-status' => 'تغییر وضعیت',
'delete' => 'حذف',
'id' => 'شناسه',
'inactive' => 'غیرفعال',
'name' => 'نام',
'sort-order' => 'ترتیب مرتب‌سازی',
'status' => 'وضعیت',
'theme' => 'موضوع',
'type' => 'نوع',
'view' => 'مشاهده',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/fr/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'Thèmes',

'datagrid' => [
'active' => 'Actif',
'channel_name' => 'Nom du canal',
'delete' => 'Supprimer',
'id' => 'ID',
'inactive' => 'Inactif',
'name' => 'Nom',
'sort-order' => 'Ordre de tri',
'status' => 'Statut',
'theme' => 'Thème',
'type' => 'Type',
'view' => 'Voir',
'active' => 'Actif',
'channel_name' => 'Nom du canal',
'change-status' => 'Changer le statut',
'delete' => 'Supprimer',
'id' => 'ID',
'inactive' => 'Inactif',
'name' => 'Nom',
'sort-order' => 'Ordre de tri',
'status' => 'Statut',
'theme' => 'Thème',
'type' => 'Type',
'view' => 'Voir',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/he/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'ערכות עיצוב',

'datagrid' => [
'active' => 'פעיל',
'channel_name' => 'שם הערוץ',
'delete' => 'מחק',
'id' => 'מזהה',
'inactive' => 'לא פעיל',
'name' => 'שם',
'sort-order' => 'סדר מיון',
'status' => 'סטטוס',
'theme' => 'נושא',
'type' => 'סוג',
'view' => 'הצג',
'active' => 'פעיל',
'channel_name' => 'שם הערוץ',
'change-status' => 'שנה סטטוס',
'delete' => 'מחק',
'id' => 'מזהה',
'inactive' => 'לא פעיל',
'name' => 'שם',
'sort-order' => 'סדר מיון',
'status' => 'סטטוס',
'theme' => 'נושא',
'type' => 'סוג',
'view' => 'הצג',
],
],

Expand Down
23 changes: 12 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3086,17 +3086,18 @@
'title' => 'थीम्स',

'datagrid' => [
'active' => 'सक्रिय',
'channel_name' => 'चैनल नाम',
'delete' => 'हटाएँ',
'id' => 'आईडी',
'inactive' => 'निष्क्रिय',
'name' => 'नाम',
'sort-order' => 'क्रमबद्ध करें',
'status' => 'स्थिति',
'theme' => 'थीम',
'type' => 'प्रकार',
'view' => 'देखें',
'active' => 'सक्रिय',
'channel_name' => 'चैनल नाम',
'change-status' => 'स्थिति बदलें',
'delete' => 'हटाएँ',
'id' => 'आईडी',
'inactive' => 'निष्क्रिय',
'name' => 'नाम',
'sort-order' => 'क्रमबद्ध करें',
'status' => 'स्थिति',
'theme' => 'थीम',
'type' => 'प्रकार',
'view' => 'देखें',
],
],

Expand Down
Loading

0 comments on commit 297f480

Please sign in to comment.