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

before merge

This commit is contained in:
prashant-webkul 2018-10-17 19:50:25 +05:30
parent 84bc6c0c60 997a55e26e
commit 8c7626b2b2
16 changed files with 144 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
View File

@ -142,4 +142,19 @@ class CustomerController extends Controller
return redirect()->route($this->_config['redirect']);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
$this->customer->delete($id);
session()->flash('success', 'Customer deleted successfully.');
return redirect()->back();
}
}

9
packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
View File

@ -31,11 +31,14 @@
<span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span>
</div>
<?php $channels = core()->getAllChannels() ?>
<div class="control-group" :class="[errors.has('channel_id') ? 'has-error' : '']">
<label for="channel_id">{{ __('admin::app.settings.sliders.channels') }}</label>
<select class="control" id="channel_id" name="channel_id" value="" v-validate="'required'">
@foreach($channels[0] as $channel)
<option value="{{ $channel->id }}">{{ __($channel->name) }}</option>
<select class="control" id="channel_id" name="channel_id" v-validate="'required'">
@foreach($channels as $channel)
<option value="{{ $channel->id }}" @if($channel->id == old('channel_id')) selected @endif>
{{ __($channel->name) }}
</option>
@endforeach
</select>
<span class="control-error" v-if="errors.has('channel_id')">@{{ errors.first('channel_id') }}</span>

52
packages/Webkul/Core/src/Repositories/SliderRepository.php
View File

@ -2,7 +2,10 @@
namespace Webkul\Core\Repositories;
use Illuminate\Container\Container as App;
use Webkul\Core\Eloquent\Repository;
use Webkul\Core\Repositories\ChannelRepository as Channel;
use Storage;
/**
* Slider Reposotory
@ -12,6 +15,18 @@ use Webkul\Core\Eloquent\Repository;
*/
class SliderRepository extends Repository
{
protected $channel;
public function __construct(
Channel $channel,
App $app
)
{
$this->channel = $channel;
parent::__construct($app);
}
/**
* Specify Model class name
*
@ -28,27 +43,52 @@ class SliderRepository extends Repository
*/
public function create(array $data)
{
$image = request()->file('image');
$image_name = uniqid(20).'.'.$image->getClientOriginalExtension();
$channelName = $this->channel->find($data['channel_id'])->name;
$destinationPath = public_path('/vendor/webkul/shop/assets/images/slider');
$dir = 'slider_images/' . $channelName;
$path = $image->move($destinationPath, $image_name);
$image = request()->file('image')->store($dir);
$path= 'vendor/webkul/shop/assets/images/slider/'.$image_name;
unset($data['image'], $data['_token']);
$data['path'] = $path;
$data['path'] = $image;
$this->model->create($data);
}
/**
* @param array $data
* @return mixed
*/
public function updateItem(array $data, $id)
{
$channelName = $this->channel->find($data['channel_id'])->name;
$dir = 'slider_images/' . $channelName;
$image = request()->file('image')->store($dir);
unset($data['image'], $data['_token']);
$data['path'] = $image;
$this->update($data, $id);
}
/**
* Delete a slider item and delete the image from the disk or where ever it is
*
* @return Boolean
*/
public function destroy($id) {
$sliderItem = $this->find($id);
$sliderItemImage = $sliderItem->path;
Storage::delete($sliderItemImage);
return $this->model->destroy($id);
}
}

4
packages/Webkul/Shop/src/Http/Controllers/SliderController.php
View File

@ -45,7 +45,7 @@ class SliderController extends controller
public function create() {
$channels = core()->getAllChannels();
return view($this->_config['view'])->with('channels',[$channels]);
return view($this->_config['view']);
}
/**
@ -79,7 +79,7 @@ class SliderController extends controller
* @return response
*/
public function update($id) {
if($this->slider->update(request()->all(), $id)) {
if($this->slider->updateItem(request()->all(), $id)) {
session()->flash('success', 'Slider Item Successfully Updated');
} else {
session()->flash('error', 'Slider Cannot Be Updated');

8
packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue
View File

@ -25,6 +25,11 @@ export default {
type: Array,
required: true,
default: () => [],
},
public_path: {
type: String,
required: true,
}
},
@ -53,8 +58,9 @@ export default {
setProps() {
var this_this = this;
this.slides.forEach(function(slider) {
this_this.images.push(slider.path);
this_this.images.push(this_this.public_path+'/storage/'+slider.path);
});
this.currentIndex = 0;

3
packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss vendored
View File

@ -1,8 +1,7 @@
@import url("https://fonts.googleapis.com/css?family=Montserrat:400,500");
//shop variables
$font-color: #242424;
$border-color: #E8E8E8;
$border-color1: #C7C7C7;
$border-color: #C7C7C7;
$brand-color: #0031F0;
$font-color-light: #A5A5A5;
$link-color: #2650EF;

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

@ -190,21 +190,12 @@ section.slider-block {
div.slider-control {
display: flex;
justify-content:space-between;
bottom: 48%;
bottom: 46%;
right: 0%;
width:100%;
.dark-left-icon {
margin-left: 15px;
}
.light-right-icon {
margin-right: 15px;
}
}
}
}
}
//header navigation
@ -263,11 +254,12 @@ section.slider-block {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
.search-icon {
.search-icon, .icon-search {
margin-top: 4px;
margin-left: 4px;
height: 24px;
width: 24px;
cursor: pointer;
}
}
}
@ -450,8 +442,8 @@ section.slider-block {
height: 48px;
margin-left: auto;
margin-right: auto;
border-top: 1px solid lightgrey;
border-bottom: 1px solid lightgrey;
border-top: 1px solid $border-color;
border-bottom: 1px solid $border-color;
display: block;
ul.nav {
@ -915,7 +907,7 @@ section.product-detail {
max-height: 120px;
&.active {
border-color: $border-color1;
border-color: $border-color;
}
img {

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

@ -13,7 +13,6 @@
<div class="account-layout">
<div class="account-head">
<span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
<span class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
@if(!$address->isEmpty())

2
packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
View File

@ -1,4 +1,4 @@
<div class="responsive-side-menu" id="responsive-side-menu">
<div class="responsive-side-menu" id="responsive-side-menu" style="display:none">
Menu
<i class="icon icon-arrow-down right" id="down-icon"></i>
</div>

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

@ -12,7 +12,7 @@
<div class="account-head">
<span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
{{-- <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span> --}}
<span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>

3
packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
View File

@ -8,7 +8,8 @@
<div class="account-layout">
<div class="account-head">
<span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
{{-- <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span> --}}
<span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
<span></span>
<div class="horizontal-rule"></div>

1
packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
View File

@ -12,7 +12,6 @@
<div class="account-head mb-15">
<span class="account-heading">{{ __('shop::app.wishlist.title') }}</span>
<span class="account-heading">{{ __('shop::app.wishlist.title') }}</span>
@if(count($items))
<div class="account-action">
<a href="" style="margin-right: 15px;">{{ __('shop::app.wishlist.deleteall') }}</a>

2
packages/Webkul/Shop/src/Resources/views/home/slider.blade.php
View File

@ -1,3 +1,3 @@
<section class="slider-block">
<image-slider :slides='@json($sliderData)'> </image-slider>
<image-slider :slides='@json($sliderData)' public_path="{{ url()->to('/') }}"></image-slider>
</section>

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

@ -75,24 +75,22 @@
@endsection
@push('scripts')
<script>
<script>
document.onreadystatechange = function () {
var state = document.readyState
var galleryTemplate = document.getElementById('product-gallery-template');
var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
document.onreadystatechange = function () {
var state = document.readyState
var galleryTemplate = document.getElementById('product-gallery-template');
var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
if(galleryTemplate){
if (state == 'interactive') {
galleryTemplate.style.display="none";
} else {
document.getElementById('loader').style.display="none";
addTOButton.style.display="flex";
if(galleryTemplate){
if (state == 'interactive') {
galleryTemplate.style.display="none";
} else {
document.getElementById('loader').style.display="none";
// addTOButton.style.display="flex";
}
}
}
}
</script>
</script>
@endpush

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

@ -15,16 +15,7 @@
background-image: URL("../images/icon-menu-close.svg");
width: 24px;
height: 24px;
<<<<<<< HEAD
margin-left: auto;
=======
}
.icon-menu-close-adj {
background-image: URL("../images/cross-icon-adj.svg");
width: 32px;
height: 32px;
>>>>>>> 0bd7d8353108a3306bfa60977477735224974f5d
}
.grid-view-icon {
@ -256,7 +247,7 @@
.horizontal-rule {
width: 100%;
height: 1px;
background: #E8E8E8;
background: #C7C7C7;
}
.account-head .account-heading {
@ -278,7 +269,7 @@
width: 100%;
height: 1px;
vertical-align: middle;
background: #E8E8E8;
background: #C7C7C7;
}
.account-item-card {
@ -490,7 +481,7 @@ body {
width: 100% !important;
}
.main .category-block .top-toolbar {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
}
.main .category-block .top-toolbar .page-info span:first-child {
display: none;
@ -532,13 +523,13 @@ body {
}
.layered-filter-wrapper .filter-title {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
color: #242424;
padding: 10px 0;
}
.layered-filter-wrapper .filter-attributes .filter-attributes-item {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
padding-bottom: 10px;
}
@ -890,7 +881,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
.header .header-top div.left-content ul.search-container li.search-group .search-field {
height: 38px;
border: 2px solid #E8E8E8;
border: 2px solid #C7C7C7;
border-radius: 3px;
border-right: none;
border-top-right-radius: 0px;
@ -905,16 +896,17 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
box-sizing: border-box;
height: 38px;
width: 38px;
border: 2px solid #E8E8E8;
border: 2px solid #C7C7C7;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper .search-icon {
.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper .search-icon, .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper .icon-search {
margin-top: 4px;
margin-left: 4px;
height: 24px;
width: 24px;
cursor: pointer;
}
.header .header-top div.right-content {
@ -935,7 +927,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
.header .header-top div.right-content ul.account-dropdown-container {
float: right;
border-right: 2px solid #E8E8E8;
border-right: 2px solid #C7C7C7;
}
.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown {
@ -1061,7 +1053,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
padding-top: 8px;
padding-bottom: 8px;
}
@ -1138,8 +1130,8 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
height: 48px;
margin-left: auto;
margin-right: auto;
border-top: 1px solid lightgrey;
border-bottom: 1px solid lightgrey;
border-top: 1px solid #C7C7C7;
border-bottom: 1px solid #C7C7C7;
display: block;
/* submenu positioning */
}
@ -1157,7 +1149,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
.header .header-bottom .nav ul {
margin: 0;
padding: 0;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
-webkit-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.4);
box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.4);
}
@ -1236,7 +1228,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
.header .header-bottom .nav ul {
position: absolute;
white-space: nowrap;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
background-color: white;
z-index: 1;
left: -99999em;
@ -1278,7 +1270,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
}
.header .search-responsive .search-content {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
height: 48px;
}
@ -1301,7 +1293,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
}
.header .search-responsive .search-content:first-child {
border-top: 1px solid #E8E8E8;
border-top: 1px solid #C7C7C7;
}
.header .responsive-nav {
@ -1345,13 +1337,13 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
display: none;
}
.responsive-nav .nav > li {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
}
.responsive-nav .nav li ul {
padding-left: 30px;
}
.responsive-nav .nav li:first-child {
border-top: 1px solid #E8E8E8;
border-top: 1px solid #C7C7C7;
}
.responsive-nav .nav > li:last-child {
float: none;
@ -1493,7 +1485,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
.main .top-toolbar .pager select {
background: #F2F2F2;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
border-radius: 3px;
color: #242424;
padding: 10px;
@ -1961,7 +1953,7 @@ section.cart .cart-content .right-side {
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
border-radius: 3px;
}
@ -2023,7 +2015,7 @@ section.cart .cart-content .right-side {
font-size: 16px;
text-align: center;
line-height: 38px;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
border-radius: 3px;
margin-right: 30px;
border-radius: 0px;
@ -2053,7 +2045,7 @@ section.cart .cart-content .right-side {
.order-summary .payble-amount {
margin-top: 17px;
border-top: 1px solid #E8E8E8;
border-top: 1px solid #C7C7C7;
padding-top: 12px;
}
@ -2093,7 +2085,7 @@ section.cart .cart-content .right-side {
justify-content: space-between;
width: 100%;
padding-bottom: 15px;
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
}
.checkout-process .col-main ul.checkout-steps li {
@ -2111,7 +2103,7 @@ section.cart .cart-content .right-side {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
display: inline-flex;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
background-repeat: no-repeat;
background-position: center;
}
@ -2172,7 +2164,7 @@ section.cart .cart-content .right-side {
}
.checkout-process .col-main .step-content .form-container {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
padding-top: 20px;
padding-bottom: 20px;
}
@ -2242,7 +2234,7 @@ section.cart .cart-content .right-side {
height: 48px;
width: 48px;
border-radius: 50%;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
vertical-align: middle;
display: inline-block;
text-align: center;
@ -2283,7 +2275,7 @@ section.cart .cart-content .right-side {
-webkit-box-flex: 1;
-ms-flex-positive: 1;
flex-grow: 1;
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
margin-left: 5px;
margin-right: 5px;
}
@ -2319,7 +2311,7 @@ section.cart .cart-content .right-side {
.attached-products-wrapper .horizontal-rule {
height: 1px;
background: #E8E8E8;
background: #C7C7C7;
width: 148px;
margin-bottom: 24px;
margin-left: auto;
@ -2425,7 +2417,7 @@ section.review .review-layouter .review-form .write-review .control-group {
section.review .review-layouter .review-form .write-review .control-group textarea {
margin-top: 5px;
border: 2px solid #E8E8E8;
border: 2px solid #C7C7C7;
border-radius: 3px;
width: 600px;
height: 120px;
@ -2495,7 +2487,7 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
display: -webkit-box;
display: -ms-flexbox;
display: flex;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
@ -2567,7 +2559,7 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
width: 25%;
height: 100%;
color: #A5A5A5;
@ -2591,7 +2583,7 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
text-align: center;
}
@ -2617,13 +2609,8 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
color: #0031F0;
}
<<<<<<< HEAD
.account-content .responsive-side-menu {
display: none;
=======
.account-content .account-side-menu li.active .icon {
display: inline-block;
>>>>>>> 0bd7d8353108a3306bfa60977477735224974f5d
}
.account-content .account-layout {
@ -2631,83 +2618,8 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
width: 100%;
}
<<<<<<< HEAD
.account-content .account-layout .back-icon {
display: none;
}
@media only screen and (max-width: 770px) {
.account-content {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
}
.account-content .account-side-menu {
display: none;
width: 100%;
border: none;
}
.account-content .account-side-menu li {
margin-left: 0%;
width: 100%;
}
.account-content .account-side-menu li a {
color: #242424;
}
.account-content .responsive-side-menu {
cursor: pointer;
padding-top: 13px;
display: block;
height: 46px;
border-bottom: 1px solid #E8E8E8;
border-top: 1px solid #E8E8E8;
}
.account-content .responsive-side-menu .right {
float: right;
}
.account-content .account-layout {
margin-left: 0%;
margin-top: 20px;
}
.account-content .account-layout .account-head {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
border-bottom: 1px solid #E8E8E8;
border-top: 1px solid #E8E8E8;
height: 46px;
}
.account-content .account-layout .account-head .back-icon {
display: block;
}
.account-content .account-layout .account-head span {
margin-top: 12px;
font-size: 18px;
}
.account-content .account-layout .account-head .horizontal-rule {
display: none;
}
.account-content .account-layout .account-table-content {
margin-top: 2%;
}
.account-content .account-layout .account-table-content table tbody tr {
display: grid;
margin-bottom: 20px;
}
.account-content .account-items-list, .account-content .edit-form {
margin-top: 20px;
}
.account-content .control-group .control {
width: 100%;
}
=======
.account-content .account-layout .account-head {
margin-bottom: 20px;
>>>>>>> 0bd7d8353108a3306bfa60977477735224974f5d
}
.account-table-content {
@ -2728,7 +2640,7 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
display: -webkit-box;
display: -ms-flexbox;
display: flex;
border: 1px solid #E8E8E8;
border: 1px solid #C7C7C7;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
@ -2745,7 +2657,7 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
font-size: 18px;
color: #8E8E8E;
padding: 15px 0;
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
}
.sale-container .sale-section .section-content {
@ -2819,5 +2731,5 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
}
.sale-container .totals .sale-summary tr.border td {
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #C7C7C7;
}

8
public/themes/default/assets/js/shop.js vendored
View File

@ -31404,6 +31404,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
default: function _default() {
return [];
}
},
public_path: {
type: String,
required: true
}
},
@ -31431,8 +31436,9 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
setProps: function setProps() {
var this_this = this;
this.slides.forEach(function (slider) {
this_this.images.push(slider.path);
this_this.images.push(this_this.public_path + '/storage/' + slider.path);
});
this.currentIndex = 0;