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

category image & currency , footer

This commit is contained in:
rahul shukla 2018-10-30 12:07:07 +05:30
parent bcabb00e9a
commit 6fea160abe
9 changed files with 72 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
View File

@ -119,7 +119,7 @@ class ReviewController extends Controller
{
$this->productReview->delete($id);
success()->flash('success', 'Product Review Successfully Deleted');
session()->flash('success', 'Product Review Successfully Deleted');
return redirect()->back();
}

5
packages/Webkul/Shop/src/Http/routes.php
View File

@ -228,6 +228,11 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
Route::get('reviews', 'Webkul\Customer\Http\Controllers\CustomerController@reviews')->defaults('_config', [
'view' => 'shop::customers.account.reviews.index'
])->name('customer.reviews.index');
//Customer review delete
Route::get('review/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [
'redirect' => 'customer.reviews.index'
])->name('customer.review.delete');
});
});
});

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

@ -1091,8 +1091,12 @@ section.slider-block {
}
@media all and (max-width: 720px) {
.header {
.currency-switcher {
display: none !important;
}
.header-bottom {
height: auto;
display: none;
@ -1237,11 +1241,30 @@ section.slider-block {
}
}
}
.currency {
display: none;
}
}
}
}
}
@media all and (max-width: 720px) {
.footer {
padding-left: 15px;
.footer-list-container {
padding-left: 0px !important;
}
.currency {
display: block !important;
}
}
}
//category page
.main {
.category-container {
@ -1348,7 +1371,6 @@ section.slider-block {
display: block;
.hero-image {
border: 1px solid green;
display:block;
visibility: visible;
width: auto;
@ -2816,6 +2838,11 @@ section.review {
border-top: 1px solid $border-color;
height: 46px;
.account-action {
margin-top: 12px;
margin-left: 15px;
}
.back-icon {
display: block;
}
@ -2834,15 +2861,11 @@ section.review {
margin-top: 2%;
table tbody tr {
<<<<<<< HEAD
height: 70px;
td {
display: block;
}
=======
margin-bottom: 20px;
>>>>>>> e2c036ced0d1382b03c6a963bb7965d1d40488e2
}
}
}
@ -2854,15 +2877,9 @@ section.review {
display: none;
}
<<<<<<< HEAD
.responsive-empty {
display: block;
}
=======
//Account content inside a table
.account-table-content {
color: $font-color;
>>>>>>> e2c036ced0d1382b03c6a963bb7965d1d40488e2
.responsive-table {
border: 1px solid $border-color;
@ -2884,7 +2901,6 @@ section.review {
}
}
<<<<<<< HEAD
.account-items-list.table {
display: none;
}
@ -2893,72 +2909,6 @@ section.review {
width: 100%;
}
}
=======
//address holder and address card
.address-holder {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
width: 100%;
}
.address-card {
width: 260px;
border: 1px solid #E8E8E8;
display: flex;
position: relative;
flex-direction: row;
justify-content: flex-start;
align-items: flex-start;
padding: 25px 1px 22px 15px;
margin-right: 15px;
margin-bottom: 15px;
.control-group {
width: 15px;
height: 15px;
margin-top: 10px;
}
.details {
font-weight: lighter;
margin-left: 15px;
span {
display: block;
margin: 8px;
}
.control-links {
width: 90%;
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
.btn {
height: 30px;
}
}
.default-address {
position: absolute;
top: -3px;
right: -3px;
}
}
}
.edit-form {
display: flex;
border: 1px solid $border-color;
flex-direction: column;
min-height: 345px;
padding: 25px;
>>>>>>> e2c036ced0d1382b03c6a963bb7965d1d40488e2
}
.sale-container {
@ -3085,7 +3035,7 @@ section.review {
padding: 8px 5px;
&:first-child {
width: 25%;
width: 35%;
}
&:last-child {

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

@ -22,6 +22,7 @@ return [
'subscribe-newsletter' => 'Subscribe Newsletter',
'subscribe' => 'Subscribe',
'locale' => 'Locale',
'currency' => 'Currency',
],
'search' => [
@ -94,6 +95,7 @@ return [
'account' => [
'dashboard' => 'Customer - Edit Profile',
'menu' => 'Menu',
'profile' => [
'index' => [

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

@ -8,8 +8,9 @@
<div class="account-layout">
<div class="account-head mb-15">
{{-- <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span> --}}
<div class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</div>
<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.create.title') }}</span>
<span></span>
</div>
<form method="post" action="{{ route('customer.address.create') }}" @submit.prevent="onSubmit">

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

@ -1,5 +1,5 @@
<div class="responsive-side-menu" id="responsive-side-menu" style="display: none">
Menu
{{ __('shop::app.customer.account.menu') }}
<i class="icon icon-arrow-down right" id="down-icon"></i>
</div>

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

@ -32,8 +32,14 @@
@endphp
<img class="media" src="{{ $image['small_image_url'] }}" />
{{-- {{ dd($item['url_key'])}} --}}
<div class="info mt-20">
<div class="product-name">{{$item->name}}</div>
<div class="product-name">
{{-- <a href="{{ url()->to('/').'/products/'.$item->product->url_key }}" title="{{ $item->product->name }}"> --}}
{{$item->name}}
{{-- </a> --}}
</div>
</div>
</div>

16
packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
View File

@ -67,6 +67,22 @@
</select>
</div>
</div>
<div class="currency">
<span class="list-heading">{{ __('shop::app.footer.currency') }}</span>
<div class="form-container">
<div class="control-group">
<select class="control locale-switcher" onchange="window.location.href = this.value">
@foreach (core()->getCurrentChannel()->currencies as $currency)
<option value="?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</div>
</div>

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

@ -19,16 +19,19 @@
<div class="category-block">
<div class="hero-image mb-35">
@if(is_null($category->image))
<img src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
@else
@if(!is_null($category->image))
<?php
$protocol = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
$src=$protocol. request()->getHttpHost().'/bagisto/public/storage/'.$category->image;
if(request()->getHttpHost() == 'localhost') {
$src=$protocol. request()->getHttpHost().'/bagisto/public/storage/'.$category->image;
}else {
$src=$protocol. request()->getHttpHost().'/storage/'.$category->image;
}
?>
<img class="logo" src="{{ $src }}" />
@endif
</div>