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

Merge pull request #103 from bagisto/rahul 

Rahul
This commit is contained in:
JItendra Singh 2018-10-30 12:23:32 +05:30 committed by GitHub
parent c17961f1bc 2517dfbf03
commit e42feb0fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 514 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/views/customers/review/edit.blade.php
View File

@ -50,10 +50,10 @@
<label for="name" class="required">{{ __('admin::app.customers.reviews.status') }}</label>
<select class="control" name="status">
<option value="pending" {{ $review->status == "pending" ? 'selected' : ''}}>
pending
Pending
</option>
<option value="approved" {{ $review->status == "approved" ? 'selected' : '' }}>
approved
Approved
</option>
</select>
</div>

1
packages/Webkul/Category/src/Repositories/CategoryRepository.php
View File

@ -7,6 +7,7 @@ use Webkul\Category\Models\Category;
use Illuminate\Container\Container as App;
use Webkul\Category\Models\CategoryTranslation;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\Facades\Storage;
/**
* Category Reposotory

8
packages/Webkul/Product/src/Http/Controllers/ReviewController.php
View File

@ -95,12 +95,14 @@ class ReviewController extends Controller
/**
* Delete the review of the current product
*
* @return response
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id) {
public function destroy($id)
{
$this->productReview->delete($id);
session()->flash('success', 'Product Review Successfully Deleted');
session()->flash('success', 'Review Successfully Deleted');
return redirect()->back();
}

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

@ -1751,9 +1751,7 @@ section.product-detail div.layouter form div.product-image-group div .product-he
}
section.product-detail div.layouter form div.product-image-group .add-to-buttons {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
display: none;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
@ -2182,6 +2180,23 @@ section.cart .cart-content .right-side {
}
}
@media only screen and (max-width: 386px) {
section.cart .cart-content .left-side .misc-controls div button {
width: 100%;
}
section.cart .cart-content .left-side .misc-controls div a {
margin-top: 10px;
width: 100%;
text-align: center;
}
section.cart .cart-content .left-side .box, section.cart .cart-content .left-side .remove {
margin-right: 15px !important;
}
section.cart .cart-content .right-side {
top: -130px;
}
}
.checkout-process {
display: -webkit-box;
display: -ms-flexbox;
@ -2412,6 +2427,25 @@ section.cart .cart-content .right-side {
}
}
@media only screen and (max-width: 480px) {
.checkout-process .col-main .step-content .address, .checkout-process .col-main .step-content .order-description {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
}
.checkout-process .col-main .step-content .address .billing-address, .checkout-process .col-main .step-content .address .pull-left, .checkout-process .col-main .step-content .order-description .billing-address, .checkout-process .col-main .step-content .order-description .pull-left {
width: 100% !important;
}
.checkout-process .col-main .step-content .address .shipping-address, .checkout-process .col-main .step-content .address .pull-right, .checkout-process .col-main .step-content .order-description .shipping-address, .checkout-process .col-main .step-content .order-description .pull-right {
width: 100% !important;
margin-top: 20px;
}
}
.attached-products-wrapper {
margin-bottom: 80px;
}
@ -2619,6 +2653,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater {
section.review .review-layouter .ratings-reviews .right-side .rater .star-name {
margin-right: 5px;
width: 35px;
}
section.review .review-layouter .ratings-reviews .right-side .rater .rate-number {
@ -2639,6 +2674,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar {
height: 4px;
width: 65%;
margin-right: 5px;
margin-left: 5px;
background: #D8D8D8;
}
@ -2662,7 +2698,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
-ms-flex-direction: column;
flex-direction: column;
}
section.review .review-layouter .product-info .product-image {
section.review .review-layouter .product-info .product-image, section.review .review-layouter .product-info .product-name, section.review .review-layouter .product-info .product-price {
max-width: 280px;
margin-left: auto;
margin-right: auto;
@ -2690,26 +2726,14 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
width: 100%;
}
section.review .review-layouter .review-form .ratings-reviews .right-side .rater .line-bar {
width: 100%;
width: calc(100% - 100px);
}
section.review .review-layouter .review-form .ratings-reviews .right-side .rater .percentage {
width: 10%;
width: 50px;
margin-right: 0px;
}
}
@media only screen and (max-width: 450px) {
section.review .review-layouter .review-form .ratings-reviews .right-side .rater .line-bar {
width: 90%;
}
}
@media only screen and (max-width: 412px) {
section.review .review-layouter .review-form .ratings-reviews .right-side .rater .line-bar {
width: 75%;
}
}
.auth-content {
padding-top: 15%;
padding-bottom: 15%;
@ -2863,6 +2887,33 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
display: none;
}
.account-table-content {
color: #242424;
margin-top: 1.4%;
}
.account-table-content table tbody tr {
height: 45px;
}
.account-table-content table tbody tr td {
width: 250px;
text-transform: capitalize;
}
.edit-form {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
border: 1px solid #C7C7C7;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
min-height: 345px;
padding: 25px;
}
@media only screen and (max-width: 770px) {
.account-content {
-webkit-box-orient: vertical;
@ -2885,7 +2936,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
.account-content .responsive-side-menu {
cursor: pointer;
padding-top: 13px;
display: block;
display: block !important;
height: 46px;
border-bottom: 1px solid #C7C7C7;
border-top: 1px solid #C7C7C7;
@ -2922,44 +2973,23 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
margin-top: 2%;
}
.account-content .account-layout .account-table-content table tbody tr {
display: grid;
margin-bottom: 20px;
}
.account-content .account-layout .account-table-content table tbody tr td {
display: block;
padding-top: 5px;
}
.account-content .account-items-list, .account-content .edit-form {
margin-top: 20px;
}
.account-content .account-items-list.table {
display: none;
}
.account-content .control-group .control {
width: 100%;
}
}
.account-table-content {
color: #242424;
margin-top: 1.4%;
}
.account-table-content table tbody tr {
height: 45px;
}
.account-table-content table tbody tr td {
width: 250px;
text-transform: capitalize;
}
.edit-form {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
border: 1px solid #C7C7C7;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
min-height: 345px;
padding: 25px;
}
.sale-container {
color: #5E5E5E;
}
@ -3102,7 +3132,21 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
}
.cp-spinner {
margin-left: 46%;
margin-top: 35%;
margin-bottom: 35%;
margin-left: 19%;
margin-top: 13%;
position: absolute;
margin-bottom: 20%;
}
@media only screen and (max-width: 720px) {
.cp-spinner {
margin-left: 42.5%;
margin-top: 30%;
}
}
@media only screen and (max-width: 480px) {
.cp-spinner {
margin-top: 50%;
}
}

6
packages/Webkul/Shop/publishable/assets/js/shop.js 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",
"/css/shop.css": "/css/shop.css"
}
}

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

@ -231,6 +231,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');
});
});
});

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

@ -1121,8 +1121,12 @@ section.slider-block {
}
@media all and (max-width: 720px) {
.header {
.currency-switcher {
display: none !important;
}
.header-bottom {
height: auto;
display: none;
@ -1267,11 +1271,29 @@ 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;
}
}
}
.footer-bottom {
margin-top: -16px;
width: 100%;
@ -1391,7 +1413,6 @@ section.slider-block {
display: block;
.hero-image {
border: 1px solid green;
display:block;
visibility: visible;
width: auto;
@ -1638,11 +1659,12 @@ section.product-detail {
}
.add-to-buttons {
display: flex;
display: none;
flex-direction: row;
margin-top: 10px;
justify-content: space-between;
.addtocart {
border-radius: 0px;
width: 49%;
@ -1747,6 +1769,7 @@ section.product-detail {
margin-right: 0px;
max-width: none;
width: auto;
height: auto;
.loader {
margin-left: 47%;
@ -1910,7 +1933,6 @@ section.cart {
}
}
.cart-item-list {
margin-top: 21px;
padding: 1px;
@ -2075,6 +2097,34 @@ section.cart {
}
}
}
@media only screen and (max-width: 386px){
section.cart {
.cart-content {
.left-side {
.misc-controls div {
button {
width: 100%;
}
a {
margin-top: 10px;
width: 100%;
text-align: center;
}
}
.box, .remove{
margin-right: 15px !important;
}
}
.right-side {
top: -130px;
}
}
}
}
//cart pages responsive css end
// checkout starts here
@ -2314,6 +2364,28 @@ section.cart {
}
}
}
@media only screen and (max-width: 480px) {
.checkout-process {
.col-main {
.step-content {
.address, .order-description {
display: flex;
flex-direction: column;
.billing-address, .pull-left {
width: 100% !important;
}
.shipping-address, .pull-right {
width: 100% !important;
margin-top: 20px;
}
}
}
}
}
}
// checkout responsive end here
.attached-products-wrapper {
@ -2513,6 +2585,7 @@ section.review {
.star-name {
margin-right: 5px;
width: 35px;
}
.rate-number {
@ -2520,7 +2593,7 @@ section.review {
}
.percentage {
width: 15%;
width: 50px;
margin-right: 10px;
span {
@ -2531,8 +2604,9 @@ section.review {
.line-bar {
height: 4px;
width: 65%;
width: calc(100% - 100px);
margin-right: 5px;
margin-left: 5px;
background: #D8D8D8;
.line-value {
@ -2547,22 +2621,6 @@ section.review {
// review page end here
// review responsive css start here
@media only screen and (max-width: 1150px) {
section.review {
.review-layouter {
.review-form {
.ratings-reviews {
.right-side {
.rater .line-bar {
width: 60%;
}
}
}
}
}
}
}
@media only screen and (max-width: 770px) {
section.review {
.category-breadcrumbs{
@ -2572,10 +2630,12 @@ section.review {
.review-layouter {
flex-direction: column;
.product-info .product-image {
max-width: 280px;
margin-left: auto;
margin-right: auto;
.product-info {
.product-image, .product-name, .product-price {
max-width: 280px;
margin-left: auto;
margin-right: auto;
}
}
.review-form {
@ -2599,12 +2659,7 @@ section.review {
.right-side {
width: 100%;
.rater .line-bar {
width: 100%;
}
.rater .percentage {
width: 10%;
margin-right: 0px;
}
}
@ -2614,37 +2669,6 @@ section.review {
}
}
@media only screen and (max-width: 450px) {
section.review {
.review-layouter {
.review-form {
.ratings-reviews {
.right-side {
.rater .line-bar {
width: 90%;
}
}
}
}
}
}
}
@media only screen and (max-width: 412px) {
section.review {
.review-layouter {
.review-form {
.ratings-reviews {
.right-side {
.rater .line-bar {
width: 75%;
}
}
}
}
}
}
}
//review responsive css end here
@ -2779,82 +2803,9 @@ section.review {
display: none;
}
}
}
}
//customer account page responsive layout
@media only screen and (max-width: 770px) {
.account-content {
flex-direction: column;
.account-side-menu {
.responsive-table, .responsive-empty {
display: none;
width:100%;
border: none;
li {
margin-left: 0%;
width: 100%;
a {
color : $font-color;
}
}
}
.responsive-side-menu {
cursor: pointer;
padding-top:13px;
display: block;
height: 46px;
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
.right {
float: right;
}
}
.account-layout {
margin-left: 0%;
margin-top: 20px;
.account-head {
display: flex;
justify-content: space-between;
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
height: 46px;
.back-icon {
display: block;
}
span {
margin-top: 12px;
font-size: 18px;
}
.horizontal-rule {
display: none;
}
}
.account-table-content {
margin-top: 2%;
table tbody tr {
margin-bottom: 20px;
}
}
}
.account-items-list , .edit-form {
margin-top: 20px;
}
.control-group .control {
width: 100%;
}
}
}
@ -2862,6 +2813,7 @@ section.review {
//Account content inside a table
.account-table-content {
color: $font-color;
margin-top: 1.4%;
table {
tbody {
@ -2887,7 +2839,7 @@ section.review {
width: 100%;
}
.address-card {
.address-card-1 {
width: 260px;
border: 1px solid #E8E8E8;
display: flex;
@ -2943,6 +2895,125 @@ section.review {
padding: 25px;
}
//customer account page responsive layout
@media only screen and (max-width: 770px) {
.account-content {
flex-direction: column;
.account-side-menu {
display: none;
width:100%;
border: none;
li {
margin-left: 0%;
width: 100%;
a {
color : $font-color;
}
}
}
.responsive-side-menu {
cursor: pointer;
padding-top:13px;
display: block !important;
height: 46px;
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
.right {
float: right;
}
}
.account-layout {
margin-left: 0%;
margin-top: 20px;
.account-head {
display: flex;
justify-content: space-between;
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
height: 46px;
.account-action {
margin-top: 12px;
margin-left: 15px;
}
.back-icon {
display: block;
}
span {
margin-top: 12px;
font-size: 18px;
}
.horizontal-rule {
display: none;
}
}
.account-table-content {
margin-top: 2%;
table tbody tr {
height: 70px;
td {
display: block;
}
}
}
}
.account-items-list , .edit-form {
margin-top: 20px;
.table {
display: none;
}
.responsive-empty {
display: block;
}
.responsive-table {
border: 1px solid $border-color;
margin-top: 5px;
width: 100%;
display: block;
tbody td {
padding: 8px 5px;
&:first-child {
width: 25%;
}
&:last-child {
padding-left: 10px;
}
}
}
}
.account-items-list.table {
display: none;
}
.control-group .control {
width: 100%;
}
}
}
.sale-container {
color: #5E5E5E;
@ -3067,7 +3138,7 @@ section.review {
padding: 8px 5px;
&:first-child {
width: 25%;
width: 35%;
}
&:last-child {
@ -3104,7 +3175,22 @@ section.review {
// css for loader
.cp-spinner {
margin-left: 46%;
margin-top: 35%;
margin-bottom: 35%;
}
margin-left: 19%;
margin-top: 13%;
position: absolute;
margin-bottom: 20%;
}
@media only screen and (max-width: 720px) {
.cp-spinner {
margin-left: 42.5%;
margin-top: 30%;
}
}
@media only screen and (max-width: 480px) {
.cp-spinner {
margin-top: 50%;
}
}

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' => [
@ -96,6 +97,7 @@ return [
'account' => [
'dashboard' => 'Customer - Edit Profile',
'menu' => 'Menu',
'profile' => [
'index' => [

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

@ -34,7 +34,7 @@
@else
<div class="address-holder">
@foreach($addresses as $address)
<div class="address-card">
<div class="address-card-1">
{{-- <div class="control-group">
<label class="radio-container">
<input class="control" type="radio" name="radio">

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">

43
packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
View File

@ -64,6 +64,49 @@
</table>
</div>
@foreach($orders as $order)
<table class="responsive-table">
<tbody>
<tr>
<td>
{{ __('shop::app.customer.account.order.index.order_id') }}
</td>
<td>
<a href="{{ route('customer.orders.view', $order->id) }}">
#{{ $order->id }}
</a>
</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.index.date') }}
</td>
<td>{{ core()->formatDate($order->created_at, 'd M Y') }}</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.index.total') }}
</td>
<td>
{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.index.status') }}
</td>
<td>
<span class="order-status {{ $order->status }}">{{ $order->status_label }}</span>
</td>
</tr>
</tbody>
</table>
@endforeach
@if (!$orders->count())
<div class="responsive-empty">{{ __('admin::app.common.no-result-found') }}</div>
@endif
</div>
</div>

80
packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
View File

@ -230,6 +230,8 @@
</div>
</tab>
{{-- {{ dd($order->invoices) }} --}}
@if ($order->invoices->count())
<tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
@ -272,6 +274,59 @@
</table>
</div>
@foreach ($invoice->items as $item)
<table class="responsive-table">
<tbody>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.SKU') }}
</td>
<td>{{ $item->child ? $item->child->sku : $item->sku }}</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.product-name') }}
</td>
<td>{{ $item->name }}</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.price') }}
</td>
<td>
{{ core()->formatPrice($item->price, $order->order_currency_code) }}
</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.qty') }}
</td>
<td>{{ $item->qty }}</td>
</tr>
<tr>
<td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
<td>
{{ core()->formatPrice($item->total, $order->order_currency_code) }}
</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.tax-amount') }}
</td>
<td>{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.grand-total') }}
</td>
<td>
{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
</td>
</tr>
</tbody>
</table>
@endforeach
<div class="totals">
<table class="sale-summary">
<tr>
@ -345,6 +400,31 @@
</table>
</div>
@foreach ($shipment->items as $item)
<table class="responsive-table">
<tbody>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.SKU') }}
</td>
<td>{{ $item->sku }}</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.product-name') }}
</td>
<td>{{ $item->name }}</td>
</tr>
<tr>
<td>
{{ __('shop::app.customer.account.order.view.qty') }}
</td>
<td> {{ $item->qty }} </td>
</tr>
</tbody>
</table>
@endforeach
</div>
</div>

14
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
<div class="responsive-side-menu" id="responsive-side-menu" style="display: none">
{{ __('shop::app.customer.account.menu') }}
<i class="icon icon-arrow-down right" id="down-icon"></i>
</div>
@ -22,18 +22,16 @@
var downIcon = document.getElementById("down-icon");
var accountSideMenu = document.getElementsByClassName("account-side-menu");
console.log(accountSideMenu);
sideMenuTitle.addEventListener("click", function(){
if(downIcon.className == 'icon icon-arrow-down right'){
for(let i=0 ; i < accountSideMenu.length ; i++){
if(downIcon.className == 'icon icon-arrow-down right') {
for(let i=0 ; i < accountSideMenu.length ; i++) {
accountSideMenu[i].style.display="block";
}
downIcon.classList.remove("icon","icon-arrow-down","right");
downIcon.classList.add("icon","icon-arrow-up","right");
}else{
for(let i=0 ; i < accountSideMenu.length ; i++){
}else {
for(let i=0 ; i < accountSideMenu.length ; i++) {
accountSideMenu[i].style.display="none";
}

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

@ -51,7 +51,7 @@
</div>
<div class="operations">
<a class="mb-50" href="{{ route('customer.review.delete', $review->id) }}"><span class="icon trash-icon"></span></a>
</div>
</div>
<div class="horizontal-rule mb-10 mt-10"></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>

2
packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
View File

@ -1,3 +1,3 @@
{{-- <a href="{{ route('shop.product.buynow', $product->id)}}" class="btn btn-lg btn-primary buynow" style="text-align: center;" id="buynow-changer">
{{ __('shop::app.products.buy-now') }}
</a> --}}
</a> --}}

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>

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

@ -72,7 +72,7 @@
<input type="hidden" id="rating" name="rating" v-validate="'required'">
{{-- <div class="control-error" v-if="errors.has('rating')">@{{ errors.first('rating') }}</div> --}}
<div class="control-error" v-if="errors.has('rating')">@{{ errors.first('rating') }}</div>
</div>

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

@ -87,11 +87,9 @@
var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
if(galleryTemplate){
if (state == 'interactive') {
galleryTemplate.style.display="none";
} else {
if (state != 'interactive') {
document.getElementById('loader').style.display="none";
// addTOButton.style.display="flex";
addTOButton.style.display="flex";
}
}
}

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

@ -1513,7 +1513,10 @@ h2 {
display: inline-block;
-webkit-box-sizing: border-box;
box-sizing: border-box;
<<<<<<< HEAD
=======
position: relative;
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
}
.cp-round:before {

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js",
"/css/ui.css": "/css/ui.css"
}
}

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

@ -881,7 +881,6 @@ h2 {
height: 48px;
display: inline-block;
box-sizing: border-box;
position: relative;
}
.cp-round:before {