From 6fea160abe7892aaa05b5f8d3bc89a40e4e0a0a6 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Tue, 30 Oct 2018 12:07:07 +0530 Subject: [PATCH] category image & currency , footer --- .../src/Http/Controllers/ReviewController.php | 2 +- packages/Webkul/Shop/src/Http/routes.php | 5 + .../Shop/src/Resources/assets/sass/app.scss | 110 +++++------------- .../Webkul/Shop/src/Resources/lang/en/app.php | 2 + .../account/address/create.blade.php | 5 +- .../account/partials/sidemenu.blade.php | 2 +- .../account/wishlist/wishlist.blade.php | 8 +- .../views/layouts/footer/footer.blade.php | 16 +++ .../Resources/views/products/index.blade.php | 11 +- 9 files changed, 72 insertions(+), 89 deletions(-) diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php index 7f9e5a96f..8a731ad10 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php @@ -119,7 +119,7 @@ class ReviewController extends Controller { $this->productReview->delete($id); - success()->flash('success', 'Product Review Successfully Deleted'); + session()->flash('success', 'Product Review Successfully Deleted'); return redirect()->back(); } diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index c0eaf2540..4b896280d 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -228,6 +228,11 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function Route::get('reviews', 'Webkul\Customer\Http\Controllers\CustomerController@reviews')->defaults('_config', [ 'view' => 'shop::customers.account.reviews.index' ])->name('customer.reviews.index'); + + //Customer review delete + Route::get('review/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [ + 'redirect' => 'customer.reviews.index' + ])->name('customer.review.delete'); }); }); }); diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 840b36082..8b56d9f3b 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -1091,8 +1091,12 @@ section.slider-block { } @media all and (max-width: 720px) { - .header { + + .currency-switcher { + display: none !important; + } + .header-bottom { height: auto; display: none; @@ -1237,11 +1241,30 @@ section.slider-block { } } } + + .currency { + display: none; + } } } } } +@media all and (max-width: 720px) { + .footer { + padding-left: 15px; + + .footer-list-container { + padding-left: 0px !important; + } + + .currency { + display: block !important; + } + } +} + + //category page .main { .category-container { @@ -1348,7 +1371,6 @@ section.slider-block { display: block; .hero-image { - border: 1px solid green; display:block; visibility: visible; width: auto; @@ -2816,6 +2838,11 @@ section.review { border-top: 1px solid $border-color; height: 46px; + .account-action { + margin-top: 12px; + margin-left: 15px; + } + .back-icon { display: block; } @@ -2834,15 +2861,11 @@ section.review { margin-top: 2%; table tbody tr { -<<<<<<< HEAD height: 70px; td { display: block; } -======= - margin-bottom: 20px; ->>>>>>> e2c036ced0d1382b03c6a963bb7965d1d40488e2 } } } @@ -2854,15 +2877,9 @@ section.review { display: none; } -<<<<<<< HEAD .responsive-empty { display: block; } -======= -//Account content inside a table -.account-table-content { - color: $font-color; ->>>>>>> e2c036ced0d1382b03c6a963bb7965d1d40488e2 .responsive-table { border: 1px solid $border-color; @@ -2884,7 +2901,6 @@ section.review { } } -<<<<<<< HEAD .account-items-list.table { display: none; } @@ -2893,72 +2909,6 @@ section.review { width: 100%; } } -======= -//address holder and address card -.address-holder { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; - flex-wrap: wrap; - width: 100%; -} - -.address-card { - width: 260px; - border: 1px solid #E8E8E8; - display: flex; - position: relative; - flex-direction: row; - justify-content: flex-start; - align-items: flex-start; - padding: 25px 1px 22px 15px; - margin-right: 15px; - margin-bottom: 15px; - - .control-group { - width: 15px; - height: 15px; - margin-top: 10px; - } - - .details { - font-weight: lighter; - margin-left: 15px; - - span { - display: block; - margin: 8px; - } - - .control-links { - width: 90%; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; - - .btn { - height: 30px; - } - } - - .default-address { - position: absolute; - top: -3px; - right: -3px; - } - } -} - -.edit-form { - display: flex; - border: 1px solid $border-color; - flex-direction: column; - min-height: 345px; - padding: 25px; ->>>>>>> e2c036ced0d1382b03c6a963bb7965d1d40488e2 } .sale-container { @@ -3085,7 +3035,7 @@ section.review { padding: 8px 5px; &:first-child { - width: 25%; + width: 35%; } &:last-child { diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index b5e6e0d8d..6867aa0e0 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -22,6 +22,7 @@ return [ 'subscribe-newsletter' => 'Subscribe Newsletter', 'subscribe' => 'Subscribe', 'locale' => 'Locale', + 'currency' => 'Currency', ], 'search' => [ @@ -94,6 +95,7 @@ return [ 'account' => [ 'dashboard' => 'Customer - Edit Profile', + 'menu' => 'Menu', 'profile' => [ 'index' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php index c14145fd7..cdcd612ed 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php @@ -8,8 +8,9 @@
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php index d2902b384..8cd785594 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php @@ -1,5 +1,5 @@ diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php index 0bcaffe0a..8c068ff71 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php @@ -32,8 +32,14 @@ @endphp + {{-- {{ dd($item['url_key'])}} --}} +
-
{{$item->name}}
+
+ {{-- --}} + {{$item->name}} + {{-- --}} +
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php index 9160d3027..d6e897da5 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php @@ -67,6 +67,22 @@ + +
+ {{ __('shop::app.footer.currency') }} +
+
+ +
+
+
+ diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index f5804f41c..0b04a24de 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -19,16 +19,19 @@
- @if(is_null($category->image)) - - @else + @if(!is_null($category->image)) getHttpHost().'/bagisto/public/storage/'.$category->image; + if(request()->getHttpHost() == 'localhost') { + $src=$protocol. request()->getHttpHost().'/bagisto/public/storage/'.$category->image; + }else { + $src=$protocol. request()->getHttpHost().'/storage/'.$category->image; + } ?> + @endif