From 15c4e0686b0d12772dd554ba9a6a08b2b7cd6dfa Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Wed, 25 Mar 2020 13:10:33 +0530 Subject: [PATCH] compare products in default theme --- .../Controllers/ForgotPasswordController.php | 1 - .../customers/account/compare/index.blade.php | 29 ++ .../guest/compare/compare-products.blade.php | 295 ++++++++++++++++++ .../views/guest/compare/index.blade.php | 14 +- .../views/layouts/header/index.blade.php | 20 ++ .../publishable/assets/css/velocity.css | 2 +- .../publishable/assets/js/velocity.js | 2 +- .../publishable/assets/mix-manifest.json | 4 +- .../Webkul/Velocity/src/Helpers/Helper.php | 2 + .../Velocity/src/Resources/assets/js/app.js | 6 +- .../Resources/assets/sass/components/app.scss | 1 - .../views/shop/checkout/cart/coupon.blade.php | 1 - .../account/partials/sidemenu.blade.php | 2 +- .../guest/compare/compare-products.blade.php | 5 + 14 files changed, 370 insertions(+), 14 deletions(-) create mode 100644 packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php diff --git a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php index 450e5f144..aff8673f8 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php @@ -69,7 +69,6 @@ class ForgotPasswordController extends Controller return redirect()->back(); } catch (\Exception $e) { - dd($e); report($e); session()->flash('error', trans($e->getMessage())); diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php new file mode 100644 index 000000000..8a0231299 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php @@ -0,0 +1,29 @@ +@extends('shop::layouts.master') + +@include('shop::guest.compare.compare-products') + +@section('page_title') + {{ __('velocity::app.customer.compare.compare_similar_items') }} +@endsection + +@section('content-wrapper') + +
+ @include('shop::customers.account.partials.sidemenu') + + + +
+ +@endsection diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php new file mode 100644 index 000000000..2364067f6 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -0,0 +1,295 @@ +@php + $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeRepository'); + $comparableAttributes = $attributeRepository->findByField('is_comparable', 1); +@endphp + +@push('css') + +@endpush + +@push('scripts') + + + +@endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/index.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/index.blade.php index 3aee5baca..78b233fee 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/index.blade.php @@ -1,3 +1,11 @@ - \ No newline at end of file +@extends('shop::layouts.master') + +@include('shop::guest.compare.compare-products') + +@section('page_title') + {{ __('velocity::app.customer.compare.compare_similar_items') }} +@endsection + +@section('content-wrapper') + +@endsection \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index a707597e5..15a990b94 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -42,6 +42,26 @@