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

Bug fixes

This commit is contained in:
prashant-webkul 2018-10-12 13:52:21 +05:30
parent a631a07674
commit 0c47cbc282
15 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,6 +504,8 @@ class Cart {
if($cart = $this->getCart()) {
$this->cartItem->delete($itemId);
$this->collectTotals();
//delete the cart instance if no items are there
if($cart->items()->get()->count() == 0) {
$this->cart->delete($cart->id);

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

@ -416,9 +416,9 @@ section.slider-block {
margin-bottom: 8px;
}
.dropdown-footer button {
border-radius: 0px;
width: 130px;
.dropdown-footer .btn {
max-width: 170px;
text-align: center;
}
}
}

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

@ -32,13 +32,13 @@
<div class="item">
<div style="margin-right: 15px;">
<img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" />
<a href="{{ url()->to('/').'/products/'.$product->url_key }}"><img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" /></a>
</div>
<div class="item-details">
<div class="item-title">
{{ $product->name }}
<a href="{{ url()->to('/').'/products/'.$product->url_key }}">{{ $product->name }}</a>
</div>
<div class="price">

43
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -151,7 +151,7 @@
<div class="dropdown-footer">
<a href="{{ route('shop.checkout.cart.index') }}">View Shopping Cart</a>
<button class="btn btn-primary btn-lg"><a style="color: white;" href="{{ route('shop.checkout.onepage.index') }}">CHECKOUT</a></button>
<a class="btn btn-primary btn-lg" style="color: white;" href="{{ route('shop.checkout.onepage.index') }}">CHECKOUT</a>
</div>
</div>
</div>
@ -223,49 +223,14 @@
<ul class="resp-cart-dropdown-container">
<li class="cart-dropdown">
@if(isset($cart) && session()->has('cart'))
@php
$cart = session()->get('cart');
@endphp
<div class="dropdown-toggle">
<span class="icon cart-icon"></span>
</div>
<div class="dropdown-list" style="display: none; top: 50px; right: 0px">
<div class="dropdown-container">
<div class="dropdown-cart">
<div class="dropdown-header">
<p class="heading">Cart Subtotal - {{ $cart->sub_total }}</p>
</div>
<div class="dropdown-content">
@foreach($cart as $product)
<div class="item" >
<div class="item-image" >
<img src="{{$product['2']}}" />
</div>
<div class="item-details">
<div class="item-name">{{$product['0']}}</div>
<div class="item-price">{{$product['1']}}</div>
<div class="item-qty">Quantity - {{$product['3']}}</div>
</div>
</div>
@endforeach
</div>
<div class="dropdown-footer">
<a href="/">View Shopping Cart</a>
<button class="btn btn-primary btn-lg">CHECKOUT</button>
</div>
</div>
</div>
@if(isset($cart))
<div>
<a href="{{ route('shop.checkout.cart.index') }}"><span class="icon cart-icon"></span></a>
</div>
@else
<div class="dropdown-toggle">
<div style="display: inline-block; cursor: pointer;">
<span class="icon cart-icon"></span>
</div>
</div>
@endif
</li>
</ul>

5
packages/Webkul/Shop/src/Resources/views/products/view.blade.php
View File

@ -65,17 +65,12 @@
</accordian>
@include ('shop::products.view.attributes')
@include ('shop::products.view.reviews')
</div>
</form>
</div>
@include ('shop::products.view.up-sells')
</section>
@endsection

0
packages/Webkul/Tax/src/http/controllers/Controller.php → packages/Webkul/Tax/src/Http/Controllers/Controller.php
View File

0
packages/Webkul/Tax/src/http/controllers/TaxCategoryController.php → packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
View File

0
packages/Webkul/Tax/src/http/controllers/TaxController.php → packages/Webkul/Tax/src/Http/Controllers/TaxController.php
View File

0
packages/Webkul/Tax/src/http/controllers/TaxRateController.php → packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
View File

0
packages/Webkul/Tax/src/providers/TaxServiceProvider.php → packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
View File

0
packages/Webkul/Tax/src/repositories/TaxCategoriesRepository.php → packages/Webkul/Tax/src/Repositories/TaxCategoriesRepository.php
View File

0
packages/Webkul/Tax/src/repositories/TaxMapRepository.php → packages/Webkul/Tax/src/Repositories/TaxMapRepository.php
View File

0
packages/Webkul/Tax/src/repositories/TaxRatesRepository.php → packages/Webkul/Tax/src/Repositories/TaxRatesRepository.php
View File

1
packages/Webkul/Ui/src/Resources/assets/sass/icons.scss vendored
View File

@ -2,7 +2,6 @@
%menu-properties {
width: 48px;
height: 48px;
margin-bottom: 10px;
display: inline-block;
background-size: cover;
}

6
public/themes/default/assets/css/shop.css vendored
View File

@ -1029,9 +1029,9 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
margin-bottom: 8px;
}
.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer button {
border-radius: 0px;
width: 130px;
.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer .btn {
max-width: 170px;
text-align: center;
}
.header .header-top ul.right-responsive {