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

merge with master

This commit is contained in:
rahul shukla 2019-01-02 20:15:05 +05:30
parent 0bf6699746 c9f2fd218b
commit b430d4d4b5
11 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,13 +551,13 @@ class Cart {
$cart = $this->cart->find(session()->get('cart')->id);
}
if($cart != null) {
if($cart->items->count() == 0) {
$this->cart->delete($cart->id);
// if($cart != null) {
// if($cart->items->count() == 0) {
// $this->cart->delete($cart->id);
return false;
}
}
// return false;
// }
// }
return $cart && $cart->is_active ? $cart : null;
}

2
packages/Webkul/Core/src/Database/Migrations/2018_12_31_161114_alter_channels_table.php → packages/Webkul/Core/src/Database/Migrations/2018_12_31_161114_alter_channels_category_table.php
View File

@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AlterChannelsTable extends Migration
class AlterChannelsCategoryTable extends Migration
{
/**
* Run the migrations.

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

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,10 @@
{
<<<<<<< HEAD
"/js/shop.js": "/js/shop.js?id=0e3e1ea03fe1f7358aaa",
"/css/shop.css": "/css/shop.css?id=4bdb6dfb99c5788a9dc4"
}
=======
"/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089",
"/css/shop.css": "/css/shop.css?id=d5e0d64663045e5aa78b"
}
>>>>>>> c9f2fd218b27272ccdb7183bc26b482410dfea1b

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

@ -1774,8 +1774,6 @@ section.product-detail {
.description {
margin-bottom: 15px;
padding-bottom: 15px;
border-bottom: solid 1px rgba(162, 162, 162, 0.2);
ul {
padding-left: 40px;
@ -1783,6 +1781,11 @@ section.product-detail {
}
}
.quantity {
padding-top: 15px;
border-top: solid 1px rgba(162, 162, 162, 0.2);
}
.full-description {
ul {
padding-left: 40px;

4
packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php
View File

@ -4,7 +4,7 @@
{{ __('shop::app.customer.forgot-password.page_title') }}
@stop
@section('css')
@push('css')
<style>
.button-group {
margin-bottom: 25px;
@ -13,7 +13,7 @@
vertical-align: middle;
}
</style>
@stop
@endpush
@section('content-wrapper')

2
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -23,7 +23,7 @@
<meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
@show
@yield('css')
@stack('css')
{!! view_render_event('bagisto.shop.layout.head') !!}

2
packages/Webkul/Shop/src/Resources/views/products/index.blade.php
View File

@ -6,7 +6,7 @@
@section('seo')
<meta name="description" content="{{ $category->meta_description }}"/>
<meta name="description" content="{{ $category->meta_keywords }}"/>
<meta name="keywords" content="{{ $category->meta_keywords }}"/>
@stop
@section('content-wrapper')

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

@ -6,7 +6,7 @@
@section('seo')
<meta name="description" content="{{ trim($product->meta_description) != "" ? $product->meta_description : str_limit(strip_tags($product->description), 120, '') }}"/>
<meta name="description" content="{{ $product->meta_keywords }}"/>
<meta name="keywords" content="{{ $product->meta_keywords }}"/>
@stop
@section('content-wrapper')

10
packages/Webkul/Ui/src/Resources/assets/images/Icon-star.svg Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 51.1 (57501) - http://www.bohemiancoding.com/sketch -->
<title>Icon-star</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-star" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<polygon id="Star" fill="#0031F0" points="11.0839804 15.75 6.08780574 18.3766445 7.04199019 12.8133222 3 8.87335555 8.58589307 8.06167777 11.0839804 3 13.5820677 8.06167777 19.1679608 8.87335555 15.1259706 12.8133222 16.080155 18.3766445"></polygon>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 711 B

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

@ -298,3 +298,10 @@
width: 32px;
height: 32px;
}
.star-blue-icon {
width: 17px;
height: 17px;
background-image: url("../images/Icon-star.svg");
}