Skip to content

Commit

Permalink
Fixed Issue bagisto#8332
Browse files Browse the repository at this point in the history
  • Loading branch information
@amit-webkul
amit-webkul committed Sep 14, 2023
1 parent 1ae40e0 commit 1ad6efa
Show file tree
Hide file tree
Showing 21 changed files with 65 additions and 38 deletions.
24 changes: 12 additions & 12 deletions packages/Webkul/Admin/src/Http/Controllers/Settings/ChannelController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Webkul\Admin\Http\Controllers\Settings;

use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Event;
use Webkul\Admin\Http\Controllers\Controller;
use Webkul\Core\Repositories\ChannelRepository;
Expand Down Expand Up @@ -168,15 +167,18 @@ public function update($id)
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\JsonResponse
* @param int $id
* @return void
*/
public function destroy($id)
{
$channel = $this->channelRepository->findOrFail($id);

if ($channel->code == config('app.channel')) {
return response()->json(['message' => trans('admin::app.settings.channels.index.last-delete-error')], 400);
return response()->json([
'message' => trans('admin::app.settings.channels.index.last-delete-error'),
'statusCode' => 400,
]);
}

try {
Expand All @@ -187,18 +189,16 @@ public function destroy($id)
Event::dispatch('core.channel.delete.after', $id);

return response()->json([
'data' => [
'message' => trans('admin::app.settings.channels.delete-success')
]
], 200);
'message' => trans('admin::app.settings.channels.index.delete-success'),
'statusCode' => 200,
]);
} catch (\Exception $e) {
}

return response()->json([
'data' => [
'message' => trans('admin::app.settings.channels.delete-failed'),
]
], 500);
'message' => trans('admin::app.settings.channels.index.delete-failed'),
'statusCode' => 500,
]);
}

/**
Expand Down
5 changes: 2 additions & 3 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,7 @@
'checkbox' => 'خانة اختيار',
'is-required' => 'مطلوب',
'multiselect' => 'اختيار متعدد',
'name' 'image-placeholder' => 'صورة المنتج',
=> 'العنوان',
'name' => 'العنوان',
'no' => 'لا',
'radio' => 'زر الراديو',
'select' => 'اختيار',
Expand Down Expand Up @@ -2301,7 +2300,7 @@
'title' => 'القنوات',
'create-btn' => 'إنشاء قناة',
'delete-success' => 'تم حذف القناة بنجاح.',
'delete-failed' => 'فشل حذف :name',
'delete-failed' => 'فشل حذف قناة',
'last-delete-error' => 'فشل حذف آخر قناة.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/bn/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'চ্যানেল',
'create-btn' => 'চ্যানেল তৈরি করুন',
'delete-success' => 'চ্যানেল সফলভাবে মুছে ফেলা হয়েছে',
'delete-failed' => ':name মুছে ফেলা ব্যর্থ হয়েছে',
'delete-failed' => 'চ্যানেল মুছে ফেলা ব্যর্থ হয়েছে',
'last-delete-error' => 'সর্বশেষ চ্যানেল মুছে ফেলা ব্যর্থ হয়েছে।',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/de/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Kanäle',
'create-btn' => 'Kanal erstellen',
'delete-success' => 'Kanal erfolgreich gelöscht.',
'delete-failed' => ':name konnte nicht gelöscht werden',
'delete-failed' => 'Kanal konnte nicht gelöscht werden',
'last-delete-error' => 'Der letzte Kanal konnte nicht gelöscht werden.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Channels',
'create-btn' => 'Create Channel',
'delete-success' => 'Channel deleted successfully.',
'delete-failed' => ':name Delete Failed',
'delete-failed' => 'Channel Delete Failed',
'last-delete-error' => 'Last Channel deleted failed.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Canales',
'create-btn' => 'Crear Canal',
'delete-success' => 'Canal eliminado exitosamente.',
'delete-failed' => 'Error al eliminar :name',
'delete-failed' => 'Error al eliminar Canal',
'last-delete-error' => 'Error al eliminar el último Canal.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'کانال‌ها',
'create-btn' => 'ساخت کانال',
'delete-success' => 'کانال با موفقیت حذف شد.',
'delete-failed' => 'حذف :name ناموفق بود',
'delete-failed' => 'حذف کانال ناموفق بود',
'last-delete-error' => 'حذف آخرین کانال ناموفق بود.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/fr/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Chaînes',
'create-btn' => 'Créer une chaîne',
'delete-success' => 'Chaîne supprimée avec succès.',
'delete-failed' => ':name Échec de la suppression',
'delete-failed' => 'Chaîne Échec de la suppression',
'last-delete-error' => 'La dernière chaîne n\'a pas pu être supprimée.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/he/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'ערוצים',
'create-btn' => 'צור ערוץ',
'delete-success' => 'הערוץ נמחק בהצלחה.',
'delete-failed' => 'מחיקת :name נכשלה',
'delete-failed' => 'מחיקת ערוץ נכשלה',
'last-delete-error' => 'מחיקת הערוץ האחרון נכשלה.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'चैनल',
'create-btn' => 'चैनल बनाएं',
'delete-success' => 'चैनल को सफलतापूर्वक हटा दिया गया।',
'delete-failed' => ':name हटाने में विफल हुआ',
'delete-failed' => 'चैनल हटाने में विफल हुआ',
'last-delete-error' => 'अंतिम चैनल को हटाने में विफल हुआ।',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/it/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2301,7 +2301,7 @@
'title' => 'Canales',
'create-btn' => 'Crear Canal',
'delete-success' => 'Canal eliminado exitosamente.',
'delete-failed' => 'Error al eliminar :name',
'delete-failed' => 'Error al eliminar Canal',
'last-delete-error' => 'Error al eliminar el último Canal.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/ja/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'チャネル',
'create-btn' => 'チャネルを作成',
'delete-success' => 'チャネルが正常に削除されました。',
'delete-failed' => ':name の削除に失敗しました',
'delete-failed' => 'チャンネル の削除に失敗しました',
'last-delete-error' => '最後のチャネルの削除に失敗しました。',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/nl/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Kanalen',
'create-btn' => 'Kanaal Aanmaken',
'delete-success' => 'Kanaal succesvol verwijderd.',
'delete-failed' => ':name Verwijderen Mislukt',
'delete-failed' => 'Kanaal Verwijderen Mislukt',
'last-delete-error' => 'Laatste Kanaal Verwijderen Mislukt',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/pl/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Kanały',
'create-btn' => 'Utwórz Kanał',
'delete-success' => 'Kanał pomyślnie usunięty.',
'delete-failed' => 'Usunięcie :name nie powiodło się',
'delete-failed' => 'Usunięcie Kanał nie powiodło się',
'last-delete-error' => 'Ostatni kanał nie może zostać usunięty.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Canais',
'create-btn' => 'Criar Canal',
'delete-success' => 'Canal excluído com sucesso.',
'delete-failed' => ':name Exclusão Falhou',
'delete-failed' => 'Canal Exclusão Falhou',
'last-delete-error' => 'Falha na exclusão do último canal.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/ru/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Каналы',
'create-btn' => 'Создать канал',
'delete-success' => 'Канал успешно удален.',
'delete-failed' => ':name удаление не удалось',
'delete-failed' => 'Канал удаление не удалось',
'last-delete-error' => 'Последнее удаление канала не удалось.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/sin/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2301,7 +2301,7 @@
'title' => 'චැනල්ස්',
'create-btn' => 'චැනල් සාදන්න',
'delete-success' => 'චැනල් ඉවත් කරන විට සාර්ථකව ඉවත් කරන ලදි.',
'delete-failed' => ':name ඉවත් කළායි',
'delete-failed' => 'චැනලය ඉවත් කළායි',
'last-delete-error' => 'අගයේ අඩුම චැනල් ඉවත් කරන ලදි.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/tr/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2301,7 +2301,7 @@
'title' => 'Kanallar',
'create-btn' => 'Kanal Oluştur',
'delete-success' => 'Kanal başarıyla silindi.',
'delete-failed' => ':name Silme Başarısız',
'delete-failed' => 'Kanal Silme Başarısız',
'last-delete-error' => 'Son Kanal silinemedi.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/uk/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => 'Канали',
'create-btn' => 'Створити канал',
'delete-success' => 'Канал успішно видалено.',
'delete-failed' => ':name Видалення не вдалося',
'delete-failed' => 'Канал Видалення не вдалося',
'last-delete-error' => 'Не вдалося видалити останній канал.',

'datagrid' => [
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2300,7 +2300,7 @@
'title' => '渠道',
'create-btn' => '创建渠道',
'delete-success' => '渠道删除成功。',
'delete-failed' => ':name 删除失败',
'delete-failed' => '频道 删除失败',
'last-delete-error' => '最后一个渠道删除失败。',

'datagrid' => [
Expand Down
38 changes: 33 additions & 5 deletions packages/Webkul/Admin/src/Resources/views/components/datagrid/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,12 +580,20 @@
value: this.applied.massActions.value,
})
.then(response => {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
if (response.data.message) {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.message });
} else {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
}

this.get();
})
.catch((error) => {
this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.data.message });
if (response.data.message) {
this.$emitter.emit('add-flash', { type: 'error', message: response.data.message });
} else {
this.$emitter.emit('add-flash', { type: 'error', message: response.data.data.message });
}
});

break;
Expand All @@ -595,12 +603,20 @@
indices: this.applied.massActions.indices
})
.then(response => {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
if (response.data.message) {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.message });
} else {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
}

this.get();
})
.catch((error) => {
this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.data.message });
if (response.data.message) {
this.$emitter.emit('add-flash', { type: 'error', message: response.data.message });
} else {
this.$emitter.emit('add-flash', { type: 'error', message: response.data.data.message });
}
});

break;
Expand Down Expand Up @@ -699,7 +715,19 @@

this.$axios[method](action.url)
.then(response => {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
if (response.data.message) {
if (response.data.statusCode === 200) {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.message });
} else {
this.$emitter.emit('add-flash', { type: 'error', message: response.data.message });
}
} else {
if (response.data.statusCode === 200) {
this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
} else {
this.$emitter.emit('add-flash', { type: 'error', message: response.data.data.message });
}
}

this.get();
});
Expand Down

0 comments on commit 1ad6efa

Please sign in to comment.