merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4537 from vivek-webkul/patch-44 

[Updated: Duplicate queries removed.]
This commit is contained in:
Jitendra Singh 2021-02-16 12:08:27 +05:30 committed by GitHub
parent f2ee7d41a0 a489e1a926
commit d8500e24d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/auth.php
View File

@ -28,7 +28,7 @@ return [
],
'admin-api' => [
'driver' => 'token',
'driver' => 'jwt',
'provider' => 'admins',
]
],

24
packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
View File

@ -162,24 +162,20 @@ class ExchangeRateController extends Controller
{
$exchangeRate = $this->exchangeRateRepository->findOrFail($id);
if ($this->exchangeRateRepository->count() == 1) {
session()->flash('error', trans('admin::app.settings.exchange_rates.last-delete-error'));
} else {
try {
Event::dispatch('core.exchange_rate.delete.before', $id);
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);
} catch (\Exception $e) {
report($e);
session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
}
return response()->json(['message' => true], 200);
} catch (\Exception $e) {
report($e);
session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
}
return response()->json(['message' => false], 400);

1
packages/Webkul/Tax/src/Models/TaxRate.php
View File

@ -20,7 +20,6 @@ class TaxRate extends Model implements TaxRateContract
'identifier',
'is_zip',
'zip_code',
'zip_code',
'zip_from',
'zip_to',
'state',