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

Merge pull request #6026 from jitendra-webkul/master 

Cart ui issues fixed
This commit is contained in:
Jitendra Singh 2022-03-15 15:07:05 +05:30 committed by GitHub
parent 555414999c 00b19c79c8
commit 5246c7059c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 127 additions and 65 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/js/components.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

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

@ -1,10 +1,10 @@
{
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
"/js/velocity.js": "/js/velocity.js?id=40b6f143d74b4fa65f6108878dd2f5cb",
"/js/velocity.js": "/js/velocity.js?id=ac985a4662e87e724291df2a253941e3",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=c885ccc9c49a00fcbb8b2ccbf833db52",
"/css/velocity.css": "/css/velocity.css?id=86719deb4aa5107dbdb21b2539fb6245",
"/js/components.js": "/js/components.js?id=f68dd472b8f0ef2f0199f62f49ba9d91",
"/css/velocity.css": "/css/velocity.css?id=45bc25fe8f8b1199764ae43cad033da4",
"/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",

8
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/quantity-changer.vue
View File

@ -10,7 +10,9 @@
v-text="quantityText"
></label>
<button type="button" class="decrease" @click="decreaseQty()">-</button>
<button type="button" class="decrease" @click="decreaseQty()">
<i class="rango-minus"></i>
</button>
<input
ref="quantityChanger"
@ -23,7 +25,9 @@
@keyup="setQty($event)"
/>
<button type="button" class="increase" @click="increaseQty()">+</button>
<button type="button" class="increase" @click="increaseQty()">
<i class="rango-plus"></i>
</button>
<span class="control-error" v-if="errors.has(controlName)">{{
errors.first(controlName)

139
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -287,6 +287,10 @@
white-space: nowrap;
text-overflow: ellipsis;
}
.product-price {
height: 72px;
}
}
.sticker {
@ -394,50 +398,89 @@
.quantity {
@extend .btn-group;
width: 100%;
padding-bottom: 10px;
font-size: 16px !important;
label {
float: left;
padding: 5px 15px 10px 0;
}
button,
input {
@extend .btn;
button {
border: 1px solid #DCDCDC;
padding: 7px;
background: transparent;
text-align: center;
height: 35px;
border-radius: 2px;
vertical-align: top;
padding: 0 10px !important;
font-size: 24px !important;
font-weight: 600 !important;
color: $black-color !important;
background-color: $white-color;
border: 1px solid $border-common !important;
&.decrease {
border-right: 0;
}
&.increase {
border-left: 0;
}
&:hover,
&:active,
&:focus {
outline: none;
}
.rango-plus,
.rango-minus {
font-size: 20px;
vertical-align: middle;
}
}
input {
border: 1px solid #DCDCDC;
border-right: 0;
border-left: 0;
max-width: 50px;
cursor: default;
font-size: 16px !important;
text-align: center;
height: 38px;
margin-left: -5px;
margin-right: -5px;
vertical-align: top;
text-align: center;
font-size: 16px;
font-weight: 600;
}
button:hover {
background-color: #f5f5f5 !important;
}
button:active,
button:focus,
input:active,
input:focus {
outline: none !important;
box-shadow: none !important;
}
// button,
// input {
// @extend .btn;
// height: 35px;
// border-radius: 2px;
// vertical-align: top;
// padding: 0 10px !important;
// font-size: 24px !important;
// font-weight: 600 !important;
// color: $black-color !important;
// background-color: $white-color;
// border: 1px solid $border-common !important;
// }
// input {
// max-width: 50px;
// cursor: default;
// font-size: 16px !important;
// text-align: center;
// margin-left: -5px;
// margin-right: -5px;
// }
// button:hover {
// background-color: #f5f5f5 !important;
// }
// button:active,
// button:focus,
// input:active,
// input:focus {
// outline: none !important;
// box-shadow: none !important;
// }
}
.form-container {
@ -654,7 +697,7 @@
}
.cart-details {
padding: 40px 20px;
padding: 40px 0px;
h1 {
margin-bottom: 30px;
@ -684,6 +727,8 @@
.product-quantity {
.quantity {
display: inline-flex;
width: unset;
float: right;
label {
display: none !important;
@ -735,6 +780,37 @@
line-height: 20px;
}
}
.item-price {
margin-top: 12px !important;
font-size: 18px;
font-weight: 600;
}
.item-actions {
margin-top: 12px !important;
.d-inline-block {
float: left;
&:first-child {
margin-right: 30px;
}
.material-icons {
float: left;
margin-left: -2px;
margin-right: 5px;
}
}
}
}
.product-quantity {
.quantity {
position: relative;
top: -8px;
}
}
.misc {
@ -1516,8 +1592,6 @@
}
.product-price {
height: 72px;
.price-label {
margin-right: 6px;
}
@ -1861,7 +1935,6 @@
.quantity {
border-top: 0;
padding-bottom: 0;
&.has-error {
button {

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

@ -158,7 +158,6 @@
}
.product-price {
height: unset;
line-height: 38px;
.price-from {

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

@ -12,19 +12,8 @@
@push('css')
<style type="text/css">
.quantity {
width: unset;
float: right;
}
.alert-wishlist {
display: inline-block;
position: relative;
top: -2px;
}
@media only screen and (max-width: 600px) {
.rango-delete{
.rango-delete {
margin-top: 10px;
margin-left: -10px !important;
}
@ -108,7 +97,7 @@
@if (isset($item->additional['attributes']))
@foreach ($item->additional['attributes'] as $attribute)
<div class="row col-12 no-padding no-margin display-block">
<div class="row col-12 no-padding no-margin display-block item-attribute">
<label class="no-margin">
{{ $attribute['attribute_name'] }}:
</label>
@ -119,7 +108,7 @@
@endforeach
@endif
<div class="row col-12 no-padding no-margin">
<div class="row col-12 no-padding no-margin item-price">
<div class="product-price">
<span>{{ core()->currency($item->base_price) }}</span>
</div>
@ -131,18 +120,18 @@
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
@endphp
<div class="no-padding col-12 cursor-pointer fs16">
<div class="no-padding col-12 cursor-pointer fs16 item-actions">
@auth('customer')
@if ($showWishlist)
@if ($item->parent_id != 'null' || $item->parent_id != null)
<div class="alert-wishlist">
<div class="d-inline-block">
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->id),
'text' => "<span class='align-vertical-super'>$moveToWishlist</span>"
])
</div>
@else
<div class="alert-wishlist">
<div class="d-inline-block">
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->child->id),
'text' => "<span class='align-vertical-super'>$moveToWishlist</span>"
@ -154,11 +143,7 @@
<div class="d-inline-block">
<a
class="unset
@auth('customer')
ml10
@endauth
"
class="unset"
href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}"
@click="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">
@ -263,8 +248,9 @@
methods: {
removeLink(message) {
if (! confirm(message))
if (! confirm(message)) {
event.preventDefault();
}
}
}
})