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

Merge pull request #3823 from devansh-webkul/redirect_and_notification_issue 

Fixed "error!options are missing alert" on home page shouldn't be shown #3231
This commit is contained in:
Jitendra Singh 2020-08-21 18:22:22 +05:30 committed by GitHub
parent eebf444423 90fa8eb1d4
commit 6a7269b888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/src/Http/Controllers/CartController.php
View File

@ -87,7 +87,7 @@ class CartController extends Controller
}
}
} catch(\Exception $e) {
session()->flash('error', __($e->getMessage()));
session()->flash('warning', __($e->getMessage()));
$product = $this->productRepository->find($id);

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=f02a5786e854ee22a4bb",
"/js/velocity.js": "/js/velocity.js?id=8c4cd9ff0df9008aed99",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=72cf9eb7824c25e1dad8"
}

3
packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php
View File

@ -92,6 +92,9 @@ class CartController extends Controller
}
}
} catch(\Exception $exception) {
session()->flash('warning', __($exception->getMessage()));
$product = $this->productRepository->find($id);
Log::error('Velocity CartController: ' . $exception->getMessage(),

1
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue
View File

@ -65,7 +65,6 @@
window.location.reload();
}
} else {
window.showAlert(`alert-warning`, response.data.label ? response.data.label : this.__('shop.general.alert.warning'), response.data.message);
if (response.data.redirectionRoute) {
window.location.href = response.data.redirectionRoute;