diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index c597229a5..c5c9a4dc8 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -551,7 +551,11 @@ return [ 'save-btn-title' => 'Save Locale', 'general' => 'General', 'code' => 'Code', - 'name' => 'Name' + 'name' => 'Name', + 'create-success' => 'Locale created successfully.', + 'update-success' => 'Locale updated successfully.', + 'delete-success' => 'Locale deleted successfully.', + 'last-delete-error' => 'At least one Locale is required.', ], 'countries' => [ 'title' => 'Countries', @@ -569,7 +573,11 @@ return [ 'general' => 'General', 'code' => 'Code', 'name' => 'Name', - 'symbol' => 'Symbol' + 'symbol' => 'Symbol', + 'create-success' => 'Currency created successfully.', + 'update-success' => 'Currency updated successfully.', + 'delete-success' => 'Currency deleted successfully.', + 'last-delete-error' => 'At least one Currency is required.', ], 'exchange_rates' => [ 'title' => 'Exchange Rates', @@ -579,7 +587,11 @@ return [ 'general' => 'General', 'source_currency' => 'Source Currency', 'target_currency' => 'Target Currency', - 'rate' => 'Rate' + 'rate' => 'Rate', + 'create-success' => 'Exchange Rate created successfully.', + 'update-success' => 'Exchange Rate updated successfully.', + 'delete-success' => 'Exchange Rate deleted successfully.', + 'last-delete-error' => 'At least one Exchange Rate is required.', ], 'inventory_sources' => [ 'title' => 'Inventory Sources', @@ -605,7 +617,11 @@ return [ 'priority' => 'Priority', 'latitude' => 'Latitude', 'longitude' => 'Longitude', - 'status' => 'Status' + 'status' => 'Status', + 'create-success' => 'Inventory source created successfully.', + 'update-success' => 'Inventory source updated successfully.', + 'delete-success' => 'Inventory source deleted successfully.', + 'last-delete-error' => 'At least one Inventory source is required.', ], 'channels' => [ 'title' => 'Channels', @@ -629,7 +645,11 @@ return [ 'home_page_content' => 'Home Page Content', 'footer_content' => 'Footer Content', 'logo' => 'Logo', - 'favicon' => 'Favicon' + 'favicon' => 'Favicon', + 'create-success' => 'Channel created successfully.', + 'update-success' => 'Channel updated successfully.', + 'delete-success' => 'Channel deleted successfully.', + 'last-delete-error' => 'At least one Channel is required.', ], 'sliders' => [ diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index a49ff7c06..62fe2c6e0 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -87,7 +87,7 @@ class ChannelController extends Controller Event::fire('core.channel.create.after', $channel); - session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Channel'])); + session()->flash('success', trans('admin::app.settings.channels.create-success')); return redirect()->route($this->_config['redirect']); } @@ -133,7 +133,7 @@ class ChannelController extends Controller Event::fire('core.channel.update.after', $channel); - session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Channel'])); + session()->flash('success', trans('admin::app.settings.channels.update-success')); return redirect()->route($this->_config['redirect']); } @@ -149,7 +149,7 @@ class ChannelController extends Controller $channel = $this->channel->findOrFail($id); if ($channel->code == config('app.channel')) { - session()->flash('error', trans('admin::app.response.cannot-delete-default', ['name' => 'Channel'])); + session()->flash('error', trans('admin::app.settings.channels.last-delete-error')); } else { try { Event::fire('core.channel.delete.before', $id); @@ -158,7 +158,7 @@ class ChannelController extends Controller Event::fire('core.channel.delete.after', $id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Channel'])); + session()->flash('success', trans('admin::app.settings.channels.delete-success')); return response()->json(['message' => true], 200); } catch(\Exception $e) { diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index 497da79ee..c0346a6bf 100755 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -81,7 +81,7 @@ class CurrencyController extends Controller Event::fire('core.currency.create.after', $currency); - session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Currency'])); + session()->flash('success', trans('admin::app.settings.currencies.create-success')); return redirect()->route($this->_config['redirect']); } @@ -119,7 +119,7 @@ class CurrencyController extends Controller Event::fire('core.currency.update.after', $currency); - session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Currency'])); + session()->flash('success', trans('admin::app.settings.currencies.update-success')); return redirect()->route($this->_config['redirect']); } @@ -135,7 +135,7 @@ class CurrencyController extends Controller $currency = $this->currency->findOrFail($id); if ($this->currency->count() == 1) { - sesssion()->flash('warning', trans( 'admin::app.response.last-delete-error', ['name' => 'Currency'])); + session()->flash('warning', trans('admin::app.settings.currencies.last-delete-error')); } else { try { Event::fire('core.currency.delete.before', $id); @@ -144,7 +144,7 @@ class CurrencyController extends Controller Event::fire('core.currency.delete.after', $id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Currency'])); + session()->flash('success', trans('admin::app.settings.currencies.delete-success')); return response()->json(['message' => true], 200); } catch (\Exception $e) { diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index fe4bb1dbf..b10b1c315 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -94,7 +94,7 @@ class ExchangeRateController extends Controller Event::fire('core.exchange_rate.create.after', $exchangeRate); - session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Exchange rate'])); + session()->flash('success', trans('admin::app.settings.exchange_rates.create-success')); return redirect()->route($this->_config['redirect']); } @@ -134,7 +134,7 @@ class ExchangeRateController extends Controller Event::fire('core.exchange_rate.update.after', $exchangeRate); - session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Exchange rate'])); + session()->flash('success', trans('admin::app.settings.exchange_rates.update-success')); return redirect()->route($this->_config['redirect']); } @@ -149,15 +149,15 @@ class ExchangeRateController extends Controller { $exchangeRate = $this->exchangeRate->findOrFail($id); - if($this->exchangeRate->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Exchange rate'])); + if ($this->exchangeRate->count() == 1) { + session()->flash('error', trans('admin::app.settings.exchange_rates.last-delete-error')); } else { try { Event::fire('core.exchange_rate.delete.before', $id); $this->exchangeRate->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Exchange rate'])); + session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success')); Event::fire('core.exchange_rate.delete.after', $id); diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index 65bdadfb0..ff8f5f058 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -81,7 +81,7 @@ class LocaleController extends Controller Event::fire('core.locale.create.after', $locale); - session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Locale'])); + session()->flash('success', trans('admin::app.settings.locales.create-success')); return redirect()->route($this->_config['redirect']); } @@ -119,7 +119,7 @@ class LocaleController extends Controller Event::fire('core.locale.update.after', $locale); - session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Locale'])); + session()->flash('success', trans('admin::app.settings.locales.update-success')); return redirect()->route($this->_config['redirect']); } @@ -134,8 +134,8 @@ class LocaleController extends Controller { $locale = $this->locale->findOrFail($id); - if($this->locale->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Locale'])); + if ($this->locale->count() == 1) { + session()->flash('error', trans('admin::app.settings.locales.last-delete-error')); } else { try { Event::fire('core.locale.delete.before', $id); @@ -144,7 +144,7 @@ class LocaleController extends Controller Event::fire('core.locale.delete.after', $id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Locale'])); + session()->flash('success', trans('admin::app.settings.locales.delete-success')); return response()->json(['message' => true], 200); } catch(\Exception $e) { diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index 59c2c00a2..23480e11a 100755 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -92,7 +92,7 @@ class InventorySourceController extends Controller Event::fire('inventory.inventory_source.create.after', $inventorySource); - session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Inventory source'])); + session()->flash('success', trans('admin::app.settings.inventory_sources.create-success')); return redirect()->route($this->_config['redirect']); } @@ -142,7 +142,7 @@ class InventorySourceController extends Controller Event::fire('inventory.inventory_source.update.after', $inventorySource); - session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Inventory source'])); + session()->flash('success', trans('admin::app.settings.inventory_sources.update-success')); return redirect()->route($this->_config['redirect']); } @@ -157,8 +157,8 @@ class InventorySourceController extends Controller { $inventorySource = $this->inventorySource->findOrFail($id); - if($this->inventorySource->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Inventory source'])); + if ($this->inventorySource->count() == 1) { + session()->flash('error', trans('admin::app.settings.inventory_sources.last-delete-error')); } else { try { Event::fire('inventory.inventory_source.delete.before', $id); @@ -167,7 +167,7 @@ class InventorySourceController extends Controller Event::fire('inventory.inventory_source.delete.after', $id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Inventory source'])); + session()->flash('success', trans('admin::app.settings.inventory_sources.delete-success')); return response()->json(['message' => true], 200); } catch (\Exception $e) {