[Updated: Duplicate queries removed.]
This commit is contained in:
parent
3033ec834f
commit
a489e1a926
|
|
@ -28,7 +28,7 @@ return [
|
||||||
],
|
],
|
||||||
|
|
||||||
'admin-api' => [
|
'admin-api' => [
|
||||||
'driver' => 'token',
|
'driver' => 'jwt',
|
||||||
'provider' => 'admins',
|
'provider' => 'admins',
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -162,24 +162,20 @@ class ExchangeRateController extends Controller
|
||||||
{
|
{
|
||||||
$exchangeRate = $this->exchangeRateRepository->findOrFail($id);
|
$exchangeRate = $this->exchangeRateRepository->findOrFail($id);
|
||||||
|
|
||||||
if ($this->exchangeRateRepository->count() == 1) {
|
try {
|
||||||
session()->flash('error', trans('admin::app.settings.exchange_rates.last-delete-error'));
|
Event::dispatch('core.exchange_rate.delete.before', $id);
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
Event::dispatch('core.exchange_rate.delete.before', $id);
|
|
||||||
|
|
||||||
$this->exchangeRateRepository->delete($id);
|
$this->exchangeRateRepository->delete($id);
|
||||||
|
|
||||||
session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success'));
|
session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success'));
|
||||||
|
|
||||||
Event::dispatch('core.exchange_rate.delete.after', $id);
|
Event::dispatch('core.exchange_rate.delete.after', $id);
|
||||||
|
|
||||||
return response()->json(['message' => true], 200);
|
return response()->json(['message' => true], 200);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
report($e);
|
report($e);
|
||||||
|
|
||||||
session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
|
session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return response()->json(['message' => false], 400);
|
return response()->json(['message' => false], 400);
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ class TaxRate extends Model implements TaxRateContract
|
||||||
'identifier',
|
'identifier',
|
||||||
'is_zip',
|
'is_zip',
|
||||||
'zip_code',
|
'zip_code',
|
||||||
'zip_code',
|
|
||||||
'zip_from',
|
'zip_from',
|
||||||
'zip_to',
|
'zip_to',
|
||||||
'state',
|
'state',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue