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

Issue #5728 fixed

This commit is contained in:
jitendra 2022-03-15 11:57:44 +05:30
parent 4a3543f91f
commit d424794aae
6 changed files with 24 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/mix-manifest.json
View File

@ -4,7 +4,7 @@
"/js/velocity.js": "/js/velocity.js?id=40b6f143d74b4fa65f6108878dd2f5cb",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=c885ccc9c49a00fcbb8b2ccbf833db52",
"/css/velocity.css": "/css/velocity.css?id=18e7f6a8bceb7b12915fe6eb01a70939",
"/css/velocity.css": "/css/velocity.css?id=86719deb4aa5107dbdb21b2539fb6245",
"/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",

3
packages/Webkul/Velocity/src/Resources/assets/sass/components/datagrid.scss vendored
View File

@ -247,8 +247,9 @@
padding: 8px 12px;
display: block;
cursor: default;
color: #a2a2a2;
color: rgba(0, 0, 0, 0.53);
font-size: 18px;
font-weight: 600;
border-bottom: 1px solid #C1C2C3;
}

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

@ -461,7 +461,7 @@
.product-detail {
#product-form {
.form-container {
.left {
div.left {
top: 0px;
position: relative;
margin-bottom: 20px;

7
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -283,17 +283,18 @@
}
}
.layouter,
#product-form {
.layouter {
height: 100%;
}
#product-form {
height: 100%;
.form-container {
height: 100%;
position: relative;
.left {
div.left {
top: 60px;
padding: 0px;
position: sticky;

101
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -24,7 +24,7 @@
}
@media only screen and (max-width: 600px) {
.rango-delete {
.rango-delete{
margin-top: 10px;
margin-left: -10px !important;
}
@ -38,10 +38,10 @@
<script type="text/x-template" id="cart-template">
<div class="container">
<section class="cart-details row no-margin col-12">
<h2 class="fw6 col-12">{{ __('shop::app.checkout.cart.title') }}</h2>
<h2 class="cart-details-header fw6 col-12">{{ __('shop::app.checkout.cart.title') }}</h2>
@if ($cart)
<div class="cart-details-header col-lg-7 col-md-12">
<div class="cart-details-header col-lg-6 col-md-12">
<div class="row cart-header col-12 no-padding">
<span class="col-8 fw6 fs16 pr0">
{{ __('velocity::app.checkout.items') }}
@ -82,7 +82,7 @@
}
@endphp
<div class="row col-12 destop-view">
<div class="row col-12">
<a
title="{{ $product->name }}"
class="product-image-container col-2"
@ -110,7 +110,7 @@
@foreach ($item->additional['attributes'] as $attribute)
<div class="row col-12 no-padding no-margin display-block">
<label class="no-margin">
{{ $attribute['attribute_name'] }} :
{{ $attribute['attribute_name'] }}:
</label>
<span>
{{ $attribute['option_label'] }}
@ -176,6 +176,8 @@
quantity="{{ $item->quantity }}"
quantity-text="{{ __('shop::app.products.quantity') }}">
</quantity-changer>
@else
<p class="fw6 fs16 no-padding text-center ml15">--</p>
@endif
</div>
@ -191,81 +193,6 @@
</div>
@endif
</div>
<div class="row col-12 mobile-view">
<a
title="{{ $product->name }}"
class="product-image-container col-2"
href="{{ route('shop.productOrCategory.index', $url_key) }}">
<img
src="{{ $productBaseImage['medium_image_url'] }}"
class="card-img-top"
alt="{{ $product->name }}">
</a>
<div class="col-10 pr0 pl0 item-title">
<a
href="{{ route('shop.productOrCategory.index', $url_key) }}"
title="{{ $product->name }}"
class="unset col-2 no-padding">
<span class="fs20 fw6 link-color">{{ $product->name }}</span>
</a>
@if (isset($item->additional['attributes']))
<div class="row col-8 no-padding no-margin">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
</div>
@endif
<div class="col-12 no-padding">
@include ('shop::products.price', ['product' => $product])
</div>
<div class="row col-12 remove-padding-margin actions">
<div class="product-quantity col-lg-4 col-4 no-padding">
@if ($item->product->getTypeInstance()->showQuantityBox() === true)
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}"
quantity-text="{{ __('shop::app.products.quantity') }}">
</quantity-changer>
@endif
</div>
<div class="col-lg-2 col-2 cursor-pointer mt-2">
@auth('customer')
@if ($showWishlist)
@if ($item->parent_id != 'null' || $item->parent_id != null)
<div class="alert-wishlist ml-2">
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->id),
'text' => ""
])
</div>
@else
<div class="alert-wishlist ml-2">
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->child->id),
'text' => ""
])
</div>
@endif
@endif
@endauth
</div>
<div class="col-lg-2 col-2 cursor-pointer ml-2 mt-2">
<a href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}" class="unset">
<i class="material-icons fs24">delete</i>
</a>
</div>
</div>
</div>
</div>
@endforeach
</div>
@ -277,12 +204,14 @@
{{ __('shop::app.checkout.cart.continue-shopping') }}
</a>
<button
type="submit"
class="theme-btn light unset">
@if ($item->product->getTypeInstance()->showQuantityBox() === true)
<button
type="submit"
class="theme-btn light unset">
{{ __('shop::app.checkout.cart.update-cart') }}
</button>
{{ __('shop::app.checkout.cart.update-cart') }}
</button>
@endif
</div>
{!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
@ -296,7 +225,7 @@
{!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
@if ($cart)
<div class="col-lg-4 col-md-12 offset-lg-1 row order-summary-container">
<div class="col-lg-4 col-md-12 offset-lg-2 row order-summary-container">
@include('shop::checkout.total.summary', ['cart' => $cart])
<coupon-component></coupon-component>