From 259537a000310ee5b84249367be023d7e73c7140 Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Wed, 15 Jan 2020 16:45:55 +0530 Subject: [PATCH] updates --- .../src/Repositories/SliderRepository.php | 21 ++- .../src/Http/Controllers/CartController.php | 2 +- .../Resources/views/products/view.blade.php | 4 +- .../publishable/assets/css/velocity.css | 33 +++- .../publishable/assets/js/velocity.js | 8 +- .../2020_01_15_145637_add_product_policy.php | 32 ++++ .../2020_01_15_152121_add_banner_link.php | 32 ++++ .../Seeders/VelocityMetaDataSeeder.php | 4 +- .../Velocity/src/Helpers/AdminHelper.php | 8 + .../Webkul/Velocity/src/Helpers/Helper.php | 32 +++- .../src/Providers/EventServiceProvider.php | 5 + .../src/Providers/VelocityServiceProvider.php | 10 ++ .../assets/js/UI/components/carousel.vue | 1 - .../assets/sass/components/home.scss | 23 ++- .../assets/sass/components/product-view.scss | 5 + .../Velocity/src/Resources/lang/en/app.php | 2 + .../Resources/views/UI/particals.blade.php | 34 +++- .../views/admin/meta-info/meta-data.blade.php | 14 +- .../sliders/velocity-slider.blade.php | 9 ++ .../views/home/customer-reviews.blade.php | 82 ++++++++++ .../in-progress/customer-reviews.blade.php | 152 ------------------ .../home/in-progress/product-policy.blade.php | 46 ------ .../views/home/product-policy.blade.php | 5 + .../src/Resources/views/home/slider.blade.php | 8 +- .../views/products/add-to-cart.blade.php | 34 ++-- .../views/products/list/card.blade.php | 3 +- .../list/layered-navigation.blade.php | 4 - .../Resources/views/products/view.blade.php | 25 +-- .../views/products/view/reviews.blade.php | 2 +- .../Resources/views/search/search.blade.php | 78 ++++----- 30 files changed, 407 insertions(+), 311 deletions(-) create mode 100644 packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_145637_add_product_policy.php create mode 100644 packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_152121_add_banner_link.php create mode 100644 packages/Webkul/Velocity/src/Resources/views/admin/settings/sliders/velocity-slider.blade.php create mode 100644 packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/in-progress/customer-reviews.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-policy.blade.php create mode 100644 packages/Webkul/Velocity/src/Resources/views/home/product-policy.blade.php diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php index 308f3c568..dd94792a7 100755 --- a/packages/Webkul/Core/src/Repositories/SliderRepository.php +++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php @@ -2,10 +2,11 @@ namespace Webkul\Core\Repositories; -use Illuminate\Container\Container as App; -use Webkul\Core\Eloquent\Repository; -use Webkul\Core\Repositories\ChannelRepository; use Storage; +use Webkul\Core\Eloquent\Repository; +use Illuminate\Support\Facades\Event; +use Illuminate\Container\Container as App; +use Webkul\Core\Repositories\ChannelRepository; /** * Slider Repository @@ -54,6 +55,8 @@ class SliderRepository extends Repository */ public function save(array $data) { + Event::fire('core.settings.slider.create.before', $id); + $channelName = $this->channelRepository->find($data['channel_id'])->name; $dir = 'slider_images/' . $channelName; @@ -82,7 +85,11 @@ class SliderRepository extends Repository unset($data['image']); } - return $this->create($data); + $slider = $this->create($data); + + Event::fire('core.settings.slider.create.after', $slider); + + return true; } /** @@ -91,6 +98,8 @@ class SliderRepository extends Repository */ public function updateItem(array $data, $id) { + Event::fire('core.settings.slider.update.before', $id); + $channelName = $this->channelRepository->find($data['channel_id'])->name; $dir = 'slider_images/' . $channelName; @@ -119,7 +128,9 @@ class SliderRepository extends Repository unset($data['image']); } - $this->update($data, $id); + $slider = $this->update($data, $id); + + Event::fire('core.settings.slider.update.after', $slider); return true; } diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index ddd139e7e..0b8a0f439 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -61,7 +61,7 @@ class CartController extends Controller /** * Method to populate the cart page which will be populated before the checkout process. * - * @return \Illuminate\View\View + * @return \Illuminate\View\View */ public function index() { diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php index eefaacd02..c98b2b246 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php @@ -52,7 +52,7 @@ @else @endif - + {!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!} @@ -63,7 +63,7 @@ @include ('shop::products.view.grouped-products') @include ('shop::products.view.bundle-options') - + {!! view_render_event('bagisto.shop.products.view.description.before', ['product' => $product]) !!} diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 97158f86a..b7f62f72a 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -2618,8 +2618,10 @@ header #search-form > *:focus { /* product policy section */ .product-policy-container .card { border: none; - padding: 20px; + padding: 20px 10px; background: #FFFFFF; + -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); } .product-policy-container .card .col-sm-10 { @@ -2785,12 +2787,30 @@ header #search-form > *:focus { /* hot & popular categories */ /* Customer Reviews */ +.reviews-container .review-wrapper:nth-of-type(1) { + padding: 0 8px 0 0; +} + +.reviews-container .review-wrapper { + padding: 0 8px; +} + +.reviews-container .review-wrapper:nth-last-of-type(2) { + padding: 0 0 0 8px; +} + +.reviews-container .review-wrapper:nth-last-of-type(1) { + padding: 0 0 0 16px; +} + .reviews-container .card { border: none; height: 100%; padding: 20px; padding-left: 15px; padding-right: 15px; + -webkit-box-shadow: 0 4px 17px 0 rgba(0, 0, 0, 0.11); + box-shadow: 0 4px 17px 0 rgba(0, 0, 0, 0.11); } .reviews-container .card .customer-info > div { @@ -2809,9 +2829,9 @@ header #search-form > *:focus { .reviews-container .card .review-info { height: 100%; - padding: 20px 25px; - -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14); - box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14); + padding: 20px 15px; + -webkit-box-shadow: 0 4px 17px 0 rgba(0, 0, 0, 0.11); + box-shadow: 0 4px 17px 0 rgba(0, 0, 0, 0.11); } .reviews-container .card .review-info > div:not(:last-child) { @@ -4121,6 +4141,11 @@ button[disabled] { display: none; } +.product-detail .right .product-price span:nth-child(1), +.product-detail .right .product-price .special-price { + font-size: 24px; +} + .product-detail .thumb-list { left: 15px; z-index: 1000; diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index 3f377f010..f01086a6c 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -1069,7 +1069,7 @@ module.exports = Cancel; /***/ (function(module, exports, __webpack_require__) { __webpack_require__(12); -module.exports = __webpack_require__(72); +module.exports = __webpack_require__(69); /***/ }), @@ -35818,7 +35818,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // -// /* harmony default export */ __webpack_exports__["default"] = ({ props: ['id', 'addClass', 'slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled'], @@ -36761,10 +36760,7 @@ if (false) { } /***/ }), -/* 69 */, -/* 70 */, -/* 71 */, -/* 72 */ +/* 69 */ /***/ (function(module, exports) { // removed by extract-text-webpack-plugin diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_145637_add_product_policy.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_145637_add_product_policy.php new file mode 100644 index 000000000..5c7e977fd --- /dev/null +++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_145637_add_product_policy.php @@ -0,0 +1,32 @@ +text('product_policy')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('velocity_meta_data', function (Blueprint $table) { + $table->dropColumn('product_policy'); + }); + } +} diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_152121_add_banner_link.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_152121_add_banner_link.php new file mode 100644 index 000000000..0adade603 --- /dev/null +++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_15_152121_add_banner_link.php @@ -0,0 +1,32 @@ +text('slider_path')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('sliders', function (Blueprint $table) { + $table->dropColumn('slider_path'); + }); + } +} diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php index ab5b67390..a04cd1c38 100644 --- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php +++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php @@ -22,7 +22,9 @@ class VelocityMetaDataSeeder extends Seeder 'slider' => 1, - 'subscription_bar_content' => '' + 'subscription_bar_content' => '', + + 'product_policy' => '
Free Shippingon Order $20 or More
ProductReplace & Return Available
ProductExchange and EMI Available
', ]); } } diff --git a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php index d75f95290..89a12f799 100644 --- a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php +++ b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php @@ -54,4 +54,12 @@ class AdminHelper return $image; } + + public function storeSliderDetails($slider) + { + $slider->slider_path = request()->get('slider_path'); + $slider->save(); + + return true; + } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index fc2369d11..a4279a6cf 100644 --- a/packages/Webkul/Velocity/src/Helpers/Helper.php +++ b/packages/Webkul/Velocity/src/Helpers/Helper.php @@ -6,6 +6,7 @@ use DB; use Webkul\Product\Helpers\Review; use Webkul\Product\Models\Product as ProductModel; use Webkul\Velocity\Repositories\OrderBrandsRepository; +use Webkul\Product\Repositories\ProductReviewRepository; use Webkul\Velocity\Repositories\VelocityMetadataRepository; use Webkul\Attribute\Repositories\AttributeOptionRepository; use Webkul\Product\Repositories\ProductRepository as ProductRepository; @@ -40,6 +41,13 @@ class Helper extends Review */ protected $attributeOption; + /** + * ProductReviewRepository object + * + * @var object + */ + protected $productReviewRepository; + /** * VelocityMetadata object * @@ -48,16 +56,18 @@ class Helper extends Review protected $velocityMetadataRepository; public function __construct( - VelocityMetadataRepository $velocityMetadataRepository, - OrderBrandsRepository $orderBrandsRepository, - ProductRepository $productRepository, ProductModel $productModel, - AttributeOptionRepository $attributeOption + ProductRepository $productRepository, + AttributeOptionRepository $attributeOption, + OrderBrandsRepository $orderBrandsRepository, + ProductReviewRepository $productReviewRepository, + VelocityMetadataRepository $velocityMetadataRepository ) { $this->productModel = $productModel; $this->attributeOption = $attributeOption; $this->productRepository = $productRepository; $this->orderBrandsRepository = $orderBrandsRepository; + $this->productReviewRepository = $productReviewRepository; $this->velocityMetadataRepository = $velocityMetadataRepository; } @@ -125,10 +135,6 @@ class Helper extends Review } } - public function arrangeWithMaxBrandOrder($orderBrandData) - { - } - /** * Returns the count rating of the product * @@ -177,5 +183,15 @@ class Helper extends Review } catch (\Exception $exception) { } } + + public function getShopRecentReviews($reviewCount = 4) + { + $reviews = $this->productReviewRepository->getModel() + ->orderBy('id', 'desc') + ->where('status', 'approved') + ->take($reviewCount)->get(); + + return $reviews; + } } diff --git a/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php b/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php index 65b7ebe3d..11ac7014e 100644 --- a/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php @@ -34,6 +34,11 @@ class EventServiceProvider extends ServiceProvider 'catalog.category.update.after', ], 'Webkul\Velocity\Helpers\AdminHelper@storeCategoryIcon'); + Event::listen([ + 'core.settings.slider.create.after', + 'core.settings.slider.update.after', + ], 'Webkul\Velocity\Helpers\AdminHelper@storeSliderDetails'); + Event::listen('checkout.order.save.after', 'Webkul\Velocity\Helpers\Helper@topBrand'); } } diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php index b50280b32..e2e03a3b3 100644 --- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php @@ -63,6 +63,16 @@ class VelocityServiceProvider extends ServiceProvider } ); + Event::listen([ + 'bagisto.admin.settings.slider.edit.after', + 'bagisto.admin.settings.slider.create.after', + ], function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate( + 'velocity::admin.settings.sliders.velocity-slider' + ); + } + ); + $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'velocity'); $velocityHelper = app('Webkul\Velocity\Helpers\Helper'); diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue index 5ed6909fd..99d551e72 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue @@ -13,7 +13,6 @@ v-for="index in slidesCount" :name="`slide-${parseInt(index) - 1}`"> - diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss index 31c8db834..de1943b22 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss @@ -197,8 +197,9 @@ header #search-form > *:focus { .product-policy-container { .card { border: none; - padding: 20px; - background: #FFFFFF; + padding: 20px 10px; + background: $white-color; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); .col-sm-10 { line-height: 3.5rem; @@ -386,12 +387,26 @@ header #search-form > *:focus { /* Customer Reviews */ .reviews-container { + .review-wrapper:nth-of-type(1) { + padding: 0 8px 0 0; + } + .review-wrapper { + padding: 0 8px; + } + .review-wrapper:nth-last-of-type(2) { + padding: 0 0 0 8px; + } + .review-wrapper:nth-last-of-type(1) { + padding: 0 0 0 16px; + } + .card { border: none; height: 100%; padding: 20px; padding-left: 15px; padding-right: 15px; + box-shadow: 0 4px 17px 0 rgba(0,0,0,0.11); .customer-info { > div { @@ -411,8 +426,8 @@ header #search-form > *:focus { .review-info { height: 100%; - padding: 20px 25px; - box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14); + padding: 20px 15px; + box-shadow: 0 4px 17px 0 rgba(0,0,0,0.11); > div:not(:last-child) { margin-bottom: 15px; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss index 3246efa1c..3bdddd122 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss @@ -156,6 +156,11 @@ .sticker { display: none; } + + span:nth-child(1), + .special-price { + font-size: 24px; + } } } diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index caf3e58f3..baed10499 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -104,6 +104,8 @@ return [ 'advertisement-one' => 'Advertisement One Images', 'product-view-image' => 'Product View Image', 'footer' => 'Footer', + 'product-policy' => 'Product Policy', + 'slider-path' => 'Slider Path', ], 'category' => [ 'title' => 'Category Menu List', diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php index a20a20217..1fe2d4fb9 100644 --- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php @@ -100,7 +100,16 @@ @foreach ($categories as $category) - + + @endforeach @@ -109,11 +118,13 @@
+
+ +
+ + + +
+ @@ -186,7 +198,7 @@ width: "100%", image_advtab: true, valid_elements : '*[*]', - selector: 'textarea#home_page_content,textarea#footer_left_content,textarea#subscription_bar_content,textarea#footer_middle_content', + selector: 'textarea#home_page_content,textarea#footer_left_content,textarea#subscription_bar_content,textarea#footer_middle_content,textarea#product-policy', plugins: 'image imagetools media wordcount save fullscreen code', toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code', }); diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/settings/sliders/velocity-slider.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/settings/sliders/velocity-slider.blade.php new file mode 100644 index 000000000..38e8bedb4 --- /dev/null +++ b/packages/Webkul/Velocity/src/Resources/views/admin/settings/sliders/velocity-slider.blade.php @@ -0,0 +1,9 @@ +
+ + + +
\ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php new file mode 100644 index 000000000..22b876078 --- /dev/null +++ b/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php @@ -0,0 +1,82 @@ +@php + $reviews = app('Webkul\Velocity\Helpers\Helper')->getShopRecentReviews(4); + $reviewCount = count($reviews); +@endphp + +
+ @if ($reviewCount) + + +
+ @foreach ($reviews as $key => $review) +
+
+
+
+
+ + {{ strtoupper(substr( $review['name'], 0, 1 )) }} + +
+ +
+ + +
+ Reviewed- {{$review['title']}} +
+
+
+ +
+ +
+ +
+

{{ $review['comment'] }}

+
+
+
+
+ @endforeach +
+ @endif +
+ +@push('scripts') + + +@endpush \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/customer-reviews.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/customer-reviews.blade.php deleted file mode 100644 index de71367b6..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/customer-reviews.blade.php +++ /dev/null @@ -1,152 +0,0 @@ -@php - $reviews = [ - [ - 'name' => 'Shubham Mehrotra', - 'title' => 'Shubham Mehrotra', - 'rating' => 3, - 'comment' => 'I upgraded to the X from an iPhone 7, and this is a very big step forward for Apple. - I was sceptical of the removal of the home button, and the notch on top of the screen but that scepticism lasted just a number of days before I was convinced this is a setup.', - ], [ - 'name' => 'Shubham Mehrotra', - 'title' => 'Shubham Mehrotra', - 'rating' => 2, - 'comment' => 'Yes colgate total has been designed to be an every day toothpaste that you can use with braces, crowns and all other dental restorations.', - ], [ - 'name' => 'Shubham Mehrotra', - 'title' => 'Shubham Mehrotra', - 'rating' => 5, - 'comment' => 'There are the ultimate suckers. These giys are fake. They don’t ship your product they manage the shipping details. They don’t have a proper customer service numbers. ', - ], [ - 'name' => 'Shubham Mehrotra', - 'title' => 'Shubham Mehrotra', - 'rating' => 1, - 'comment' => 'I upgraded to the X from an iPhone 7, and this is a very big step forward for Apple. - I was sceptical of the removal of the home button, and the notch on top of the screen but that scepticism lasted just a number of days before I was convinced this is a setup.', - ], [ - 'name' => 'Shubham Mehrotra', - 'title' => 'Shubham Mehrotra', - 'rating' => 1, - 'comment' => 'I upgraded to the X from an iPhone 7, and this is a very big step forward for Apple. - I was sceptical of the removal of the home button, and the notch on top of the screen but that scepticism lasted just a number of days before I was convinced this is a setup.', - ], - ]; - - $reviewCount = count($reviews); -@endphp - - -@push('css') - -@endpush - -
- - - -
- - @foreach ($reviews as $key => $review) - -
-
-
-
- - {{ strtoupper(substr( $review['name'], 0, 1 )) }} - -
- -
- - -
- Reviewed- {{$review['title']}} -
-
-
- -
- - @php - $rating = 5 - $review['rating']; - @endphp - - @for ($i = 0; $i < $review['rating'] ; $i++) - - - - @endfor - - @for ($i = 0; $i < $rating; $i++) - - - - @endfor - -
- -
-

{{ $review['comment'] }}

-
-
-
- - @endforeach - - -
- -
- -@push('scripts') - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-policy.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-policy.blade.php deleted file mode 100644 index 377eb7a78..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-policy.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -
- -
- -
-
-
-
- -
-
- Free Shipping on Order $20 or More -
-
-
-
- -
-
-
-
- -
-
- Product Replace & Return Available -
-
-
-
- -
-
-
-
- -
-
- Product Exchange and EMI Available -
-
-
-
- -
- -
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/product-policy.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/product-policy.blade.php new file mode 100644 index 000000000..d5bab81b0 --- /dev/null +++ b/packages/Webkul/Velocity/src/Resources/views/home/product-policy.blade.php @@ -0,0 +1,5 @@ +
+
+ {!! $velocityMetaData->product_policy !!} +
+
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/slider.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/slider.blade.php index e4e5c49c6..c993e5613 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/slider.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/slider.blade.php @@ -8,9 +8,11 @@ @foreach ($sliderData as $index => $slider) - + + + @endforeach diff --git a/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php index 7c6dca49f..0ce9e2096 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php @@ -1,14 +1,7 @@ {!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!}
-
- - @csrf - - - + @if (isset($form) && !$form) -
+ @else +
+ + @csrf + + + + +
+ @endif
@if (! (isset($showWishlist) && !$showWishlist)) diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php index 08d9c87a9..e6aca1fed 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php @@ -67,8 +67,9 @@ class="product-image-container"> {{ $product->name }} diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php index 4d7a49ace..6fdcc8cbe 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php @@ -36,10 +36,6 @@ - @if ($showRecentlyViewed) - @include ('shop::products.list.recently-viewed') - @endif - {!! view_render_event('bagisto.shop.products.list.layered-nagigation.after') !!} diff --git a/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php index 023d3dbdc..b26260a5a 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php @@ -40,11 +40,7 @@ {!! view_render_event('bagisto.shop.products.view.before', ['product' => $product]) !!}
- @if ($showRecentlyViewed) -
- @else
- @endif
@@ -53,24 +49,12 @@ {{-- product-gallery --}} -
+
@include ('shop::products.view.gallery')
{{-- right-section --}} -
+
{{-- product-info-section --}}

{{ $product->name }}

@@ -95,6 +79,7 @@
@include ('shop::products.add-to-cart', [ + 'form' => false, 'product' => $product, 'showCartIcon' => false, ]) @@ -155,10 +140,6 @@ @endif @endforeach - - @if ($showRecentlyViewed) - @include ('shop::products.list.recently-viewed') - @endif
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php index 597c3d8b7..5235d2b38 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php @@ -37,7 +37,7 @@ :ratings="{{ $avgStarRating }}" > - {{ $avgRatings }} Ratings and {{ $total }} Reviews + {{ $avgRatings }} Ratings and {{ $total }} Reviews @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check()) diff --git a/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php index 3286e88d0..8e91d0e78 100644 --- a/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php @@ -7,43 +7,45 @@ @endsection @section('content-wrapper') -
- @if ($results && $results->count()) -
- @include ('shop::products.list.toolbar') -
- @endif - - @if (! $results) -

{{ __('shop::app.search.no-results') }}

- @else - @if ($results->isEmpty()) -

{{ __('shop::app.products.whoops') }}

- {{ __('shop::app.search.no-results') }} - @else - @if ($results->total() == 1) -

- {{ $results->total() }} {{ __('shop::app.search.found-result') }} -

- @else -

- {{ $results->total() }} {{ __('shop::app.search.found-results') }} -

- @endif - - @foreach ($results as $productFlat) - @if ($toolbarHelper->getCurrentMode() == 'grid') - @include('shop::products.list.card', ['product' => $productFlat->product]) - @else - @include('shop::products.list.card', [ - 'list' => true, - 'product' => $productFlat->product - ]) - @endif - @endforeach - - @include('ui::datagrid.pagination') +
+
+ @if ($results && $results->count()) +
+ @include ('shop::products.list.toolbar') +
@endif - @endif -
+ + @if (! $results) +

{{ __('shop::app.search.no-results') }}

+ @else + @if ($results->isEmpty()) +

{{ __('shop::app.products.whoops') }}

+ {{ __('shop::app.search.no-results') }} + @else + @if ($results->total() == 1) +

+ {{ $results->total() }} {{ __('shop::app.search.found-result') }} +

+ @else +

+ {{ $results->total() }} {{ __('shop::app.search.found-results') }} +

+ @endif + + @foreach ($results as $productFlat) + @if ($toolbarHelper->getCurrentMode() == 'grid') + @include('shop::products.list.card', ['product' => $productFlat->product]) + @else + @include('shop::products.list.card', [ + 'list' => true, + 'product' => $productFlat->product + ]) + @endif + @endforeach + + @include('ui::datagrid.pagination') + @endif + @endif +
+
@endsection \ No newline at end of file