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

fixed issue #642, made changes in layout of checkout section, various display bugs had been fixed

This commit is contained in:
Prashant Singh 2019-03-05 16:28:55 +05:30
parent f7d8f726f7
commit 7ae4be56b8
21 changed files with 280 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/Webkul/Checkout/src/Cart.php
View File

@ -12,6 +12,7 @@ use Webkul\Tax\Repositories\TaxCategoryRepository;
use Webkul\Checkout\Models\CartPayment;
use Webkul\Customer\Repositories\WishlistRepository;
use Webkul\Customer\Repositories\CustomerAddressRepository;
use Webkul\Product\Helpers\Price;
/**
* Facades handler for all the methods to be implemented in Cart.
@ -83,6 +84,11 @@ class Cart {
*/
protected $suppressFlash;
/**
* Product price helper instance
*/
protected $price;
/**
* Create a new controller instance.
*
@ -103,7 +109,8 @@ class Cart {
ProductRepository $product,
TaxCategoryRepository $taxCategory,
WishlistRepository $wishlist,
CustomerAddressRepository $customerAddress
CustomerAddressRepository $customerAddress,
Price $price
)
{
$this->customer = $customer;
@ -122,6 +129,8 @@ class Cart {
$this->customerAddress = $customerAddress;
$this->price = $price;
$this->suppressFlash = false;
}
@ -281,7 +290,13 @@ class Cart {
$child = $childData = null;
$additional = [];
$price = ($product->type == 'configurable' ? $parentProduct->price : $product->price);
if ($product->type == 'configurable') {
$price = $this->price->getMinimalPrice($parentProduct);
} else {
$price = $this->price->getMinimalPrice($product);
}
$weight = ($product->type == 'configurable' ? $parentProduct->weight : $product->weight);
$parentData = [
@ -828,8 +843,14 @@ class Cart {
} else if ($item->product->name != $item->name) {
$item->update(['name' => $item->product->name]);
} else if ($item->child->product->price != $item->price) {
$price = (float) $item->custom_price ? $item->custom_price : $item->child->product->price;
} else if($this->price->getMinimalPrice($item->child->product) != $item->price) {
// $price = (float) $item->custom_price ? $item->custom_price : $item->child->product->price;
if((float)$item->custom_price) {
$price = $item->custom_price;
} else {
$price = $this->price->getMinimalPrice($item->child->product);
}
$item->update([
'price' => $price,
@ -846,8 +867,14 @@ class Cart {
} else if ($item->product->name != $item->name) {
$item->update(['name' => $item->product->name]);
} else if ($item->product->price != $item->price) {
$price = (float) $item->custom_price ? $item->custom_price : $item->product->price;
} else if ($this->price->getMinimalPrice($item->product) != $item->price) {
// $price = (float) $item->custom_price ? $item->custom_price : $item->product->price;
if((float)$item->custom_price) {
$price = $item->custom_price;
} else {
$price = $this->price->getMinimalPrice($item->child->product);
}
$item->update([
'price' => $price,

4
packages/Webkul/Customer/src/Http/Controllers/AddressController.php
View File

@ -121,10 +121,12 @@ class AddressController extends Controller
{
$this->validate(request(), [
'address1' => 'string|required',
'address2' => 'string',
'country' => 'string|required',
'state' => 'string|required',
'city' => 'string|required',
'postcode' => 'required'
'postcode' => 'required',
'phone' => 'required'
]);
$data = collect(request()->input())->except('_token')->toArray();

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=e019a3a0b0cbcc981fd8",
"/css/shop.css": "/css/shop.css?id=ccad56c3468960eef02d"
"/css/shop.css": "/css/shop.css?id=567b433deb8a570598ac"
}

144
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -179,6 +179,8 @@ input {
position: absolute;
opacity: 0;
cursor: pointer;
top: 0px;
left: 0px;
}
/* Create a custom radio button */
@ -293,6 +295,7 @@ input {
//horizontal rule
.horizontal-rule {
display: block;
width: 100%;
height: 1px;
background: $border-color;
@ -937,6 +940,7 @@ section.slider-block {
.dropdown-cart {
color: $font-color;
}
.dropdown-cart > .dropdown-header {
width: 100%;
}
@ -959,6 +963,7 @@ section.slider-block {
.dropdown-content {
padding-top: 8px;
padding-bottom: 10px;
width: 100%;
}
.dropdown-content .item {
@ -976,7 +981,7 @@ section.slider-block {
}
.dropdown-content .item-details {
max-height: 125px;
height: auto;
}
.item-details .item-name {
@ -2142,27 +2147,26 @@ section.cart {
}
.cart-item-list {
margin-top: 21px;
padding: 1px;
.item {
padding: 10px;
margin-bottom: 20px;
display: flex;
flex-direction: row;
border: 1px solid $border-color;
border-radius: 3px;
border-radius: 2px;
.item-image {
height: 160px;
width: 160px;
box-shadow: 1px 1px 1px $border-color;
margin-right: 15px;
img {
height: 160px;
width: 160px;
}
}
.item-details {
display: flex;
flex-direction: column;
justify-content: space-between;
justify-content: flex-start;
width: 100%;
.item-title {
@ -2355,6 +2359,24 @@ section.cart {
}
}
//cart pages responsive css end
.checkout-method-group {
.line-one {
display: inline-flex;
align-items: center;
.radio-container {
padding-left: 28px;
}
.method-label {
margin-top: 4px;
}
}
.line-two {
margin-left: 30px;
}
}
// checkout starts here
.checkout-process {
@ -2363,10 +2385,12 @@ section.cart {
width: 100%;
margin-top: 20px;
margin-bottom: 20px;
font-size: 16px;
color: $font-color;
.col-main {
width: 65%;
padding-right: 40px;
width: 70%;
margin-right: 5%;
ul.checkout-steps {
width: 100%;
@ -2438,12 +2462,15 @@ section.cart {
width: 100%;
display: inline-block;
h1 {
.checkout-step-heading {
font-size: 24px;
font-weight: bold;
float: left;
}
.btn {
float: right;
font-size: 14px;
}
}
@ -2454,14 +2481,17 @@ section.cart {
}
.shipping-methods {
h4 {
margin: 0;
font-size: 16px;
.ship-method-carrier {
margin-bottom: 15px;
font-weight: bold;
}
}
.payment-methods {
.radio {
font-weight: 600;
.radio-container {
padding-left: 28px;
}
.control-info {
@ -2469,30 +2499,30 @@ section.cart {
}
}
.address {
display: inline-block;
.address-summary {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
width: 100%;
.address-card {
width: 50%;
float: left;
div.billing-address {
margin-right: 25%;
}
.card-title span {
font-weight: 600;
div.billing-address, div.shipping-address {
.horizontal-rule {
width: 40px;
background: #242424;
}
}
.card-content {
margin-top: 15px;
color: $font-color;
line-height: 25px;
.label {
width: 10%;
}
.horizontal-rule {
margin: 12px 0;
display: block;
width: 25px;
background: $dark-background;
}
}
.address-card-list {
width: 85%;
}
}
@ -2548,36 +2578,11 @@ section.cart {
}
}
}
.address-holder {
.address-card {
width: 253px !important;
margin-right: 13px !important;
.details {
margin-left: 30px;
.checkmark {
left: -30px;
top: 12px;
}
.address-card-list {
list-style: none;
}
}
}
.address-card:nth-child(3n+0) {
margin-right: 0px !important;
}
}
// complete page end here
}
}
.col-right {
width: 35%;
width: 25%;
padding-left: 40px;
}
}
@ -3085,12 +3090,7 @@ section.review {
.address-card {
width: 260px;
border: 1px solid $border-color;
display: flex;
position: relative;
flex-direction: row;
justify-content: flex-start;
align-items: flex-start;
padding: 20px;
padding: 15px;
margin-right: 15px;
margin-bottom: 15px;
@ -3120,11 +3120,11 @@ section.review {
}
}
.default-address {
position: absolute;
top: 10px;
right: 10px;
}
// .default-address {
// position: absolute;
// top: 10px;
// right: 10px;
// }
}
}

6
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -414,10 +414,10 @@ return [
'shipping-address' => 'Shipping Address',
'use_for_shipping' => 'Ship to this address',
'continue' => 'Continue',
'shipping-method' => 'Shipping Method',
'payment-information' => 'Payment Information',
'shipping-method' => 'Select Shipping Method',
'payment-methods' => 'Select Payment Method',
'payment-method' => 'Payment Method',
'summary' => 'Summary of Order',
'summary' => 'Order Summary',
'price' => 'Price',
'quantity' => 'Quantity',
'billing-address' => 'Billing Address',

6
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -26,9 +26,9 @@
$productBaseImage = $productImageHelper->getProductBaseImage($item->product);
?>
<div class="item">
<div style="margin-right: 15px;">
<a href="{{ url()->to('/').'/products/'.$item->product->url_key }}"><img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" /></a>
<div class="item mt-5">
<div class="item-image" style="margin-right: 15px;">
<a href="{{ url()->to('/').'/products/'.$item->product->url_key }}"><img src="{{ $productBaseImage['medium_image_url'] }}" /></a>
</div>
<div class="item-details">

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

@ -22,16 +22,16 @@
<i class="icon arrow-down-icon"></i>
</div>
<div class="dropdown-list" style="display: none; top: 50px; right: 0px">
<div class="dropdown-list" style="display: none; top: 50px; right: 0px;">
<div class="dropdown-container">
<div class="dropdown-cart">
<div class="dropdown-header">
<div class="dropdown-header mt-5">
<p class="heading">
{{ __('shop::app.checkout.cart.cart-subtotal') }} -
{!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.before', ['cart' => $cart]) !!}
{{ core()->currency($cart->base_sub_total) }}
<b>{{ core()->currency($cart->base_sub_total) }}</b>
{!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.after', ['cart' => $cart]) !!}
</p>
@ -72,7 +72,7 @@
{!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.before', ['item' => $item]) !!}
<div class="item-price">{{ core()->currency($item->base_total) }}</div>
<div class="item-price"><b>{{ core()->currency($item->base_total) }}</b></div>
{!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.after', ['item' => $item]) !!}

6
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -367,7 +367,7 @@
mounted() {
this.templateRender = shippingHtml.render;
for (var i in shippingHtml.staticRenderFns) {
shippingTemplateRenderFns.unshift(shippingHtml.staticRenderFns[i]);
shippingTemplateRenderFns.push(shippingHtml.staticRenderFns[i]);
}
eventBus.$emit('after-checkout-shipping-section-added');
@ -384,6 +384,8 @@
methods: {
methodSelected () {
this.$emit('onShippingMethodSelected', this.selected_shipping_method)
eventBus.$emit('after-shipping-method-selected');
}
}
})
@ -441,7 +443,7 @@
this.templateRender = reviewHtml.render;
for (var i in reviewHtml.staticRenderFns) {
reviewTemplateRenderFns.unshift(reviewHtml.staticRenderFns[i]);
reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]);
}
},

87
packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
View File

@ -1,8 +1,8 @@
<form data-vv-scope="address-form">
<div class="form-container" v-if="!this.new_billing_address">
<div class="form-header mb-20">
<h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
<div class="form-header mb-30">
<span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.billing-address') }}</span>
<a class="btn btn-lg btn-primary" @click = newBillingAddress()>
{{ __('shop::app.checkout.onepage.new-address') }}
@ -10,20 +10,37 @@
</div>
<div class="address-holder">
<div class="address-card" v-for='(addresses, index) in this.allAddress'>
<div class="details">
<label class="radio-container">
<div class="checkout-address-content" style="display: flex; flex-direction: row; justify-content: space-between; width: 100%;">
<label class="radio-container" style="float: right; width: 10%;">
<input type="radio" v-validate="'required'" id="billing[address_id]" name="billing[address_id]" :value="addresses.id" v-model="address.billing.address_id" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;">
<span class="checkmark"></span>
</label>
<span class="bold"> @{{ allAddress.first_name }} @{{ allAddress.last_name }}</span>
@{{ addresses.name }}</br>
@{{ addresses.address1 }}, @{{ addresses.address2 }} </br>
@{{ addresses.city }}<br>
@{{ addresses.state }}<br>
@{{ addresses.country }}</br></br>
{{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
<ul class="address-card-list" style="float: right; width: 85%;">
<li class="mb-10">
<b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
</li>
<li class="mb-5">
@{{ addresses.address1 }}, <br v-if="addresses.address2.length > 0" /> @{{ addresses.address2 }}<i v-if="addresses.address2.length > 0">,</i>
</li>
<li class="mb-5">
@{{ addresses.city }},
</li>
<li class="mb-5">
@{{ addresses.state }},
</li>
<li class="mb-15">
@{{ addresses.country }}.
</li>
<li>
<b>{{ __('shop::app.customer.account.address.index.contact') }}</b> : @{{ addresses.phone }}
</li>
</ul>
</div>
</div>
<div class="control-group" :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
@ -32,7 +49,7 @@
</span>
</div>
</div>
<div class="control-group">
<div class="control-group mt-5">
<span class="checkbox">
<input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
<label class="checkbox-view" for="billing[use_for_shipping]"></label>
@ -210,32 +227,48 @@
</div>
<div class="form-container" v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
<div class="form-header">
<h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
<div class="form-header mb-30">
<span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.shipping-address') }}</span>
<a class="btn btn-lg btn-primary" @click=newShippingAddress()>
{{ __('shop::app.checkout.onepage.new-address') }}
</a>
</div>
<div class="address-holder">
<div class="address-card-1" v-for='(addresses, index) in this.allAddress'>
<div class="details">
<label class="radio-container">
<div class="address-card" v-for='(addresses, index) in this.allAddress'>
<div class="checkout-address-content" style="display: flex; flex-direction: row; justify-content: space-between; width: 100%;">
<label class="radio-container" style="float: right; width: 10%;">
<input v-validate="'required'" type="radio" id="shipping[address_id]" name="shipping[address_id]" v-model="address.shipping.address_id" :value="addresses.id"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;">
<span class="checkmark"></span>
</label>
<span class="bold"> @{{ allAddress.first_name }} @{{ allAddress.last_name }}</span>
@{{ addresses.name }}</br>
@{{ addresses.address1 }}, @{{ addresses.address2 }} </br>
@{{ addresses.city }}<br>
@{{ addresses.state }}<br>
@{{ addresses.country }}</br></br>
{{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
<ul class="address-card-list" style="float: right; width: 85%;">
<li class="mb-10">
<b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
</li>
<li class="mb-5">
@{{ addresses.address1 }}, <br v-if="addresses.address2.length > 0" /> @{{ addresses.address2 }}<i v-if="addresses.address2.length > 0">,</i>
</li>
<li class="mb-5">
@{{ addresses.city }},
</li>
<li class="mb-5">
@{{ addresses.state }},
</li>
<li class="mb-15">
@{{ addresses.country }}.
</li>
<li>
<b>{{ __('shop::app.customer.account.address.index.contact') }}</b> : @{{ addresses.phone }}
</li>
</ul>
</div>
</div>

28
packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php
View File

@ -1,7 +1,7 @@
<form data-vv-scope="payment-form">
<div class="form-container">
<div class="form-header">
<h1>{{ __('shop::app.checkout.onepage.payment-information') }}</h1>
<div class="form-header mb-30">
<span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.payment-methods') }}</span>
</div>
<div class="payment-methods">
@ -12,13 +12,25 @@
{!! view_render_event('bagisto.shop.checkout.payment-method.before', ['payment' => $payment]) !!}
<span class="radio">
<input v-validate="'required'" type="radio" id="{{ $payment['method'] }}" name="payment[method]" value="{{ $payment['method'] }}" v-model="payment.method" @change="methodSelected()" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;">
<label class="radio-view" for="{{ $payment['method'] }}"></label>
{{ $payment['method_title'] }}
</span>
<div class="checkout-method-group mb-25">
<div class="line-one">
<label class="radio-container">
<input v-validate="'required'" type="radio" id="{{ $payment['method'] }}" name="payment[method]" value="{{ $payment['method'] }}" v-model="payment.method" @change="methodSelected()" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;">
<span class="control-info">{{ $payment['description'] }}</span>
<span class="checkmark"></span>
{{-- <label class="radio-view" for="{{ $payment['method'] }}"></label> --}}
</label>
<span class="payment-method method-label">
<b>{{ $payment['method_title'] }}</b>
</span>
</div>
<div class="line-two mt-5">
<span class="method-summary">{{ $payment['description'] }}</span>
</div>
</div>
{!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!}

74
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -1,42 +1,61 @@
<div class="form-container">
<div class="form-header">
<h1>{{ __('shop::app.checkout.onepage.summary') }}</h1>
<div class="form-header mb-30">
<span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.summary') }}</span>
</div>
<div class="address">
<div class="address-summary">
@if ($billingAddress = $cart->billing_address)
<div class="address-card billing-address">
<div class="card-title">
<span>{{ __('shop::app.checkout.onepage.billing-address') }}</span>
<div class="billing-address">
<div class="card-title mb-20">
<b>{{ __('shop::app.checkout.onepage.billing-address') }}</b>
</div>
<div class="card-content">
{{ $billingAddress->name }}</br>
{{ $billingAddress->address1 }}, {{ $billingAddress->address2 ? $billingAddress->address2 . ',' : '' }} {{ $billingAddress->state }}</br>
{{ country()->name($billingAddress->country) }} {{ $billingAddress->postcode }}</br>
<ul>
<li class="mb-10">
{{ $billingAddress->name }}
</li>
<li class="mb-10">
{{ $billingAddress->address1 }}, <br/>{{ $billingAddress->address2 ? $billingAddress->address2 . ',' : '' }} {{ $billingAddress->state }}
</li>
<li class="mb-10">
{{ country()->name($billingAddress->country) }} {{ $billingAddress->postcode }}
</li>
<span class="horizontal-rule"></span>
<span class="horizontal-rule mb-15 mt-15"></span>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
<li class="mb-10">
{{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
</li>
</ul>
</div>
</div>
@endif
@if ($shippingAddress = $cart->shipping_address)
<div class="address-card shipping-address">
<div class="card-title">
<span>{{ __('shop::app.checkout.onepage.shipping-address') }}</span>
<div class="shipping-address">
<div class="card-title mb-20">
<b>{{ __('shop::app.checkout.onepage.shipping-address') }}</b>
</div>
<div class="card-content">
{{ $shippingAddress->name }}</br>
{{ $shippingAddress->address1 }}, {{ $shippingAddress->address2 ? $shippingAddress->address2 . ',' : '' }} , {{ $shippingAddress->state }}</br>
{{ country()->name($shippingAddress->country) }} {{ $shippingAddress->postcode }}</br>
<ul>
<li class="mb-10">
{{ $shippingAddress->name }}
</li>
<li class="mb-10">
{{ $shippingAddress->address1 }}, <br/>{{ $shippingAddress->address2 ? $shippingAddress->address2 . ',' : '' }} , {{ $shippingAddress->state }}
</li>
<li class="mb-10">
{{ country()->name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
</li>
<span class="horizontal-rule"></span>
<span class="horizontal-rule mb-15 mt-15"></span>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
<li class="mb-10">
{{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
</li>
</ul>
</div>
</div>
@endif
@ -45,7 +64,7 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<div class="cart-item-list">
<div class="cart-item-list mt-20">
@foreach ($cart->items as $item)
<?php
@ -54,9 +73,9 @@
$productBaseImage = $productImageHelper->getProductBaseImage($product);
?>
<div class="item">
<div style="margin-right: 15px;">
<img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" />
<div class="item mb-5">
<div class="item-image">
<img src="{{ $productBaseImage['medium_image_url'] }}" />
</div>
<div class="item-details">
@ -116,10 +135,9 @@
</div>
<div class="order-description">
<div class="pull-left" style="width: 50%;float: left;">
<div class="order-description mt-20">
<div class="pull-left" style="width: 60%; float: left;">
<div class="shipping">
<div class="decorator">
<i class="icon shipping-icon"></i>
@ -146,7 +164,7 @@
</div>
<div class="pull-right" style="width: 50%; float: left;">
<div class="pull-right" style="width: 40%; float: left;">
@include('shop::checkout.total.summary', ['cart' => $cart])

32
packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php
View File

@ -1,7 +1,7 @@
<form data-vv-scope="shipping-form">
<div class="form-container">
<div class="form-header">
<h1>{{ __('shop::app.checkout.onepage.shipping-method') }}</h1>
<div class="form-header mb-30">
<span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.shipping-method') }}</span>
</div>
<div class="shipping-methods">
@ -9,18 +9,26 @@
<div class="control-group" :class="[errors.has('shipping-form.shipping_method') ? 'has-error' : '']">
@foreach ($shippingRateGroups as $rateGroup)
{!! view_render_event('bagisto.shop.checkout.shipping-method.before', ['rateGroup' => $rateGroup]) !!}
<h4 for="">{{ $rateGroup['carrier_title'] }}</h4>
@foreach ($rateGroup['rates'] as $rate)
<span class="radio" >
<input v-validate="'required'" type="radio" id="{{ $rate->method }}" name="shipping_method" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;" value="{{ $rate->method }}" v-model="selected_shipping_method" @change="methodSelected()">
<label class="radio-view" for="{{ $rate->method }}"></label>
{{ $rate->method_title }}
<b>{{ core()->currency($rate->base_price) }}</b>
</span>
<div class="checkout-method-group mb-25">
<div class="line-one">
<label class="radio-container">
<input v-validate="'required'" type="radio" id="{{ $rate->method }}" name="shipping_method" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;" value="{{ $rate->method }}" v-model="selected_shipping_method" @change="methodSelected()">
<span class="checkmark"></span>
</label>
{{-- <label class="radio-view" for="{{ $rate->method }}"></label> --}}
<b class="ship-rate method-label">{{ core()->currency($rate->base_price) }}</b>
</div>
<div class="line-two mt-5">
<div class="method-summary">
<b>{{ $rate->method_title }}</b> - {{ $rate->method_description }}
</div>
</div>
</div>
@endforeach
{!! view_render_event('bagisto.shop.checkout.shipping-method.after', ['rateGroup' => $rateGroup]) !!}
@ -30,9 +38,7 @@
<span class="control-error" v-if="errors.has('shipping-form.shipping_method')">
@{{ errors.first('shipping-form.shipping_method') }}
</span>
</div>
</div>
</div>
</form>

2
packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
View File

@ -65,8 +65,6 @@
</li>
</ul>
<div class="control-links mt-20">
<span>
<a href="{{ route('customer.address.edit', $address->id) }}">

6
packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
View File

@ -27,8 +27,8 @@
{!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
<div class="account-table-content">
<table>
<div class="account-table-content" style="width: 50%;">
<table style="color: #5E5E5E;">
<tbody>
<tr>
<td>{{ __('shop::app.customer.account.profile.fname') }}</td>
@ -63,13 +63,11 @@
</td>
</tr>
@endif --}}
</tbody>
</table>
</div>
{!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
</div>
</div>
@endsection

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=0219a3829322d1811a09",
"/css/ui.css": "/css/ui.css?id=1b4c4dfa67b7cfac4822"
}
"/js/ui.js": "/js/ui.js?id=83b5b520995eba4ce1f3",
"/css/ui.css": "/css/ui.css?id=6e9dd13119891a48ec16"
}

4
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -463,8 +463,8 @@ h2 {
.control-info {
display: block;
font-style: italic;
color: #6f6f6f;
font-size: 16px;
color: #242424;
}
.control-error {

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

@ -55,7 +55,7 @@
}
}
.dropdown-header {
.grid-dropdown-header {
display: inline-flex;
justify-content: space-between;
align-items: center;

2
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -19,7 +19,7 @@
<div class="dropdown-filters">
<div class="dropdown-toggle">
<div class="dropdown-header">
<div class="grid-dropdown-header">
<span class="name">{{ __('ui::app.datagrid.filter') }}</span>
<i class="icon arrow-down-icon active"></i>
</div>