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

Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1

This commit is contained in:
merdan 2022-05-03 16:02:06 +05:00
parent 9c217c4064 472eb9cf46
commit 6faab067f6
10 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
View File

@ -1,7 +1,11 @@
<?php $cart = cart()->getCart(); ?>
@php
$cart = cart()->getCart();
@endphp
@if ($cart)
<?php $items = $cart->items; ?>
@php
$items = $cart->items;
@endphp
<div class="dropdown-toggle">
<a class="cart-link" href="{{ route('shop.checkout.cart.index') }}">
@ -37,38 +41,40 @@
<div class="dropdown-content">
@foreach ($items as $item)
<div class="item">
<div class="item-image" >
@php
$images = $item->product->getTypeInstance()->getBaseImage($item);
@endphp
<img src="{{ $images['small_image_url'] }}" alt=""/>
<a href="{{ route('shop.productOrCategory.index', $item->product->url_key) }}" title="{{ $item->name }}">
<img src="{{ $images['small_image_url'] }}" alt=""/>
</a>
</div>
<div class="item-details">
{!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.before', ['item' => $item]) !!}
<div class="item-name">{{ $item->name }}</div>
<div class="item-name">
<a href="{{ route('shop.productOrCategory.index', $item->product->url_key) }}" title="{{ $item->name }}">
{{ $item->name }}
</a>
</div>
{!! 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']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
</div>
@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]) !!}
<div class="item-price">
@ -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]) !!}
<div class="item-qty">Quantity : {{ $item->quantity }}</div>
@ -93,7 +98,6 @@
</div>
</div>
</div>
@endforeach
</div>
@ -116,9 +120,7 @@
</div>
</div>
</div>
@else
<div class="dropdown-toggle" style="pointer-events: none;">
<div style="display: inline-block; cursor: pointer;">
<span class="icon cart-icon"></span>

1
packages/Webkul/Velocity/package.json
View File

@ -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",

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/jquery-ez-plus.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -1,14 +1,14 @@
{
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=839a8f4f976c7cb12580c31185296bdb",
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
"/js/velocity.js": "/js/velocity.js?id=05aaa666dbbb42558079ce9c3789d879",
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
"/js/components.js": "/js/components.js?id=b00ac32ae4b282dd9757809af3045800",
"/css/velocity.css": "/css/velocity.css?id=117d313bc752c5808da32fa24cb52302",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
"/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd99376bd4ba7bd5b",
"/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c675df49d56fd5",
"/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b24952561263f1"
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8f",
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151",
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba",
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290",
"/js/components.js": "/js/components.js?id=13ebf112e40292178d23",
"/css/velocity.css": "/css/velocity.css?id=032f86ffd4b83791ec40",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a5837742276",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e2",
"/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd993",
"/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c6",
"/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b2"
}

1
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -75,7 +75,6 @@
#home-right-bar-container {
position: relative;
top: -48px;
}
.sticky-header {

8
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php
View File

@ -11,7 +11,7 @@
<span class="account-heading">{{ __('shop::app.customer.account.wishlist.title') }}</span>
@if (count($items))
<span class="account-action">
<span class="account-action d-inline-flex">
<form id="remove-all-wishlist" class="d-none" action="{{ route('customer.wishlist.removeall') }}" method="POST">
@method('DELETE')
@ -81,7 +81,7 @@
@push('scripts')
@if($isSharingEnabled)
<script type="text/x-template" id="share-component-template">
<script type="text/x-template" id="share-component-template">
<form method="POST">
@csrf
@ -122,7 +122,7 @@
type="text"
class="form-control"
v-model="wishlistSharedLink"
v-on:focus="$event.target.select()"
v-on:focus="$event.target.select()"
ref="sharedLink"
/>
@ -144,7 +144,7 @@
</div>
</form>
</script>
<script>
/**
* Show share wishlist modal.

3
packages/Webkul/Velocity/webpack.mix.js vendored
View File

@ -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');