From 25deedb3692dbd1f18afab9a0fb01784a2c5d923 Mon Sep 17 00:00:00 2001 From: Devansh Date: Fri, 29 Apr 2022 16:00:39 +0530 Subject: [PATCH 1/4] Removed Traces --- packages/Webkul/Velocity/package.json | 1 - packages/Webkul/Velocity/webpack.mix.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/Webkul/Velocity/package.json b/packages/Webkul/Velocity/package.json index 7588a87e5..6c78f035b 100644 --- a/packages/Webkul/Velocity/package.json +++ b/packages/Webkul/Velocity/package.json @@ -28,7 +28,6 @@ "@inotom/vue-go-top": "^1.3.0", "accounting": "^0.4.1", "bootstrap-sass": "^3.4.1", - "colors": "^1.4.0", "font-awesome": "^4.7.0", "lazysizes": "^5.2.2", "material-icons": "^1.10.6", diff --git a/packages/Webkul/Velocity/webpack.mix.js b/packages/Webkul/Velocity/webpack.mix.js index 587b3b851..54975f875 100644 --- a/packages/Webkul/Velocity/webpack.mix.js +++ b/packages/Webkul/Velocity/webpack.mix.js @@ -1,6 +1,5 @@ const path = require('path'); const mix = require('laravel-mix'); -const colors = require('colors'); require('laravel-mix-merge-manifest'); require('laravel-mix-clean'); @@ -17,7 +16,7 @@ const devPublicPath = path.join( ); const publicPath = mix.inProduction() ? prodPublicPath : devPublicPath; -console.log(colors.bold.blue(`Assets will be published in: ${publicPath}`)); +console.log(`Assets will be published in: ${publicPath}`); const assetsPath = path.join(__dirname, 'src', 'Resources', 'assets'); const jsPath = path.join(assetsPath, 'js'); From d635930778fc229a9823f1518a96c266e8b9f680 Mon Sep 17 00:00:00 2001 From: Devansh Date: Mon, 2 May 2022 12:21:40 +0530 Subject: [PATCH 2/4] Added Anchor Tag On Default theme --- .../views/checkout/cart/mini-cart.blade.php | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index 38cc5e0b7..55cd11207 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -1,7 +1,11 @@ -getCart(); ?> +@php + $cart = cart()->getCart(); +@endphp @if ($cart) - items; ?> + @php + $items = $cart->items; + @endphp
@@ -37,38 +41,40 @@
@foreach ($items as $item) -
@php $images = $item->product->getTypeInstance()->getBaseImage($item); @endphp - + + + +
{!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.before', ['item' => $item]) !!} -
{{ $item->name }}
+
+ + {{ $item->name }} + +
{!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.after', ['item' => $item]) !!} - {!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.before', ['item' => $item]) !!} @if (isset($item->additional['attributes']))
- @foreach ($item->additional['attributes'] as $attribute) {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
@endforeach -
@endif {!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.after', ['item' => $item]) !!} - {!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.before', ['item' => $item]) !!}
@@ -81,7 +87,6 @@ {!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.after', ['item' => $item]) !!} - {!! view_render_event('bagisto.shop.checkout.cart-mini.item.quantity.before', ['item' => $item]) !!}
Quantity : {{ $item->quantity }}
@@ -93,7 +98,6 @@
- @endforeach
@@ -116,9 +120,7 @@
- @else -
From b9e5df9a47954fa484c9b78616ddfc5be22ea50d Mon Sep 17 00:00:00 2001 From: Devansh Date: Mon, 2 May 2022 13:00:28 +0530 Subject: [PATCH 3/4] Delete Overlap Issue Fixed --- .../shop/customers/account/wishlist/wishlist.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php index 767c12423..b814b003f 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php @@ -11,7 +11,7 @@ @if (count($items)) -