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-15 17:19:28 +05:30
parent 2613f9b93f
commit 8784fffe92
16 changed files with 229 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1657,62 +1657,52 @@ section.review {
.review-layouter {
display: flex;
flex-flow: row;
margin-top: 20px;
flex-direction: row;
.product-info {
.image {
border:1px solid red;
.product-image {
img {
display: block;
height: 280px;
width: 280px;
}
}
.heading {
.product-name {
margin-top: 20px;
span {
font-size: 24px;
}
}
.price {
.product-price {
margin-top: 10px;
.pro-price {
font-size: 24px;
color: $disc-price;
}
.pro-price-not {
margin-left: 10px;
color: $disc-price-pro;
}
.offer {
margin-left: 10px;
}
}
}
.review-info {
.review-form {
margin-left: 20px;
width: 49%;
.heading {
margin-top: 10px;
span {
}
.btn.btn-primary.right {
float: right;
margin-top: -10px;

106
packages/Webkul/Shop/src/Resources/assets/sass/components.scss vendored
View File

@ -1,3 +1,58 @@
.product-card {
.product-image {
max-height: 350px;
max-width: 280px;
margin-bottom: 10px;
background: #F2F2F2;
img {
display: block;
width: 100%;
}
}
.product-name {
margin-bottom: 14px;
width: 100%;
color: $font-color;
a {
color: $font-color;
}
}
.product-description {
display: none;
}
.product-ratings {
width: 100%;
.icon {
width: 16px;
height: 16px;
}
}
.cart-wish-wrap {
display: inline-flex;
justify-content: flex-start;
align-items: center;
height: 40px;
.addtocart {
margin-right: 10px;
text-transform: uppercase;
}
.add-to-wishlist {
margin-top: 5px;
}
}
}
// product card, requires no changes for responsiveness.
.product-grid-4 {
display: grid;
@ -43,55 +98,6 @@
}
}
.product-card {
.product-image {
max-height: 350px;
max-width: 280px;
margin-bottom: 10px;
background: #F2F2F2;
img {
display: block;
width: 100%;
}
}
.product-name {
margin-bottom: 14px;
width: 100%;
color: $font-color;
a {
color: $font-color;
}
}
.product-description {
display: none;
}
.product-ratings {
width: 100%;
.icon {
width: 16px;
height: 16px;
}
}
.cart-fav-seg {
display: inline-flex;
align-items: center;
.addtocart {
margin-right: 10px;
text-transform: uppercase;
white-space: nowrap;
}
}
}
//wishlist icon hover properties
.add-to-wishlist {
@ -140,7 +146,7 @@
text-align: left;
}
.account-edit {
.account-action {
font-size: 17px;
margin-top: 1%;
color: $brand-color;

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

@ -11,6 +11,13 @@ return [
]
],
'reviews' => [
'add-review-page-title' => 'Add Review',
'write-review' => 'Write a review',
'review-title' => 'Give Your Review a Title',
'empty' => 'You Haven\'t Reviewed Any Product Yet'
],
'customer' => [
'signup-text' => [
'account_exists' => 'Already have an account',
@ -139,7 +146,11 @@ return [
'wishlist' => [
'title' => 'Wishlist',
'deleteall' => 'Delete All',
'moveall' => 'Move All Products To Cart'
'moveall' => 'Move All Products To Cart',
'move-to-cart' => 'Move To Cart',
'empty' => 'You Have No Items In Your Wishlist',
'add' => 'Item Successfully Added To Wishlist',
'remove' => 'Item Successfully Removed From Wishlist'
],
'checkout' => [

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

@ -16,7 +16,7 @@
<span class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
@if(!$address->isEmpty())
<span class="account-edit">
<span class="account-action">
<a href="{{ route('customer.address.edit') }}">
{{ __('shop::app.customer.account.address.index.edit') }}
</a>

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

@ -7,7 +7,7 @@
@include('shop::customers.account.partials.sidemenu')
<div class="account-layout">
<div class="account-head mb-10">
<div class="account-head mb-15">
<div class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</div>
</div>
<form method="post" action="{{ route('customer.address.create') }}" @submit.prevent="onSubmit">

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

@ -8,7 +8,7 @@
<div class="account-layout">
<div class="account-head mb-10">
<div class="account-head mb-15">
<div class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</div>
</div>

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

@ -14,7 +14,7 @@
<span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
<span class="account-edit">
<span class="account-action">
<a href="{{ route('customer.profile.edit') }}">{{ __('shop::app.customer.account.profile.index.edit') }}</a>
</span>

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

@ -6,59 +6,41 @@
@include('shop::customers.account.partials.sidemenu')
<div class="account-layout">
<div class="account-head">
<span class="account-heading">Reviews</span>
<div class="horizontal-rule"></div>
</div>
<div class="account-items-list">
{{-- <div class="account-item-card mt-15 mb-15">
<div class="media-info">
@php
$image = $productImageHelper->getProductBaseImage($item);
@endphp
<img class="media" src="{{ $image['small_image_url'] }}" />
@if(count($reviews))
@foreach($reviews as $review)
<div class="account-item-card mt-15 mb-15">
<div class="media-info">
<?php $image = $productImageHelper->getGalleryImages($review->product); ?>
<img class="media" src="{{ $image[0]['small_image_url'] }}" />
<div class="info mt-20">
<div class="product-name">{{$item->name}}</div>
</div>
</div>
<div class="info mt-20">
<div class="product-name">{{$review->product->name}}</div>
<div class="operations">
<a class="mb-50" href="{{ route('customer.wishlist.remove', $item->id) }}"><span class="icon trash-icon"></span></a>
<div>
@for($i=0 ; $i < $review->rating ; $i++)
<span class="icon star-icon"></span>
@endfor
</div>
<button class="btn btn-primary btn-md">Move To Cart</button>
</div>
</div> --}}
@foreach($reviews as $review)
<div class="account-item-card mt-15 mb-15">
<div class="media-info">
<?php $image = $productImageHelper->getGalleryImages($review->product); ?>
<img class="media" src="{{ $image[0]['small_image_url'] }}" />
<div class="info mt-20">
<div class="product-name">{{$review->product->name}}</div>
<div>
@for($i=0 ; $i < $review->rating ; $i++)
<span class="icon star-icon"></span>
@endfor
</div>
<div>
{{ $review->comment }}
<div>
{{ $review->comment }}
</div>
</div>
</div>
</div>
<div class="operations">
<div class="horizontal-rule mb-10 mt-10"></div>
@endforeach
@else
<div class="empty">
{{ __('customer::app.reviews.empty') }}
</div>
</div>
<div class="horizontal-rule mb-10 mt-10"></div>
@endforeach
@endif
</div>
</div>
</div>

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

@ -9,11 +9,11 @@
<div class="account-layout">
<div class="account-head">
<div class="account-head mb-15">
<span class="account-heading">{{ __('shop::app.wishlist.title') }}</span>
@if(count($items))
<div class="account-edit">
<div class="account-action">
<a href="" style="margin-right: 15px;">{{ __('shop::app.wishlist.deleteall') }}</a>
<a href="">{{ __('shop::app.wishlist.moveall') }}</a>
</div>
@ -40,7 +40,7 @@
<div class="operations">
<a class="mb-50" href="{{ route('customer.wishlist.remove', $item->id) }}"><span class="icon trash-icon"></span></a>
<button class="btn btn-primary btn-md">Move To Cart</button>
<button class="btn btn-primary btn-md">{{ __('shop::app.wishlist.move-to-cart') }}</button>
</div>
</div>
<div class="horizontal-rule mb-10 mt-10"></div>

18
packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
View File

@ -34,14 +34,16 @@
@if($product->type == "configurable")
<a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</a>
@else
<form action="{{route('cart.add', $product->id)}}" method="POST">
@csrf
<input type="hidden" name="product" value="{{ $product->id }}">
<input type="hidden" name="quantity" value="1">
<input type="hidden" value="false" name="is_configurable">
<button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
</form>
@include('shop::products.wishlist')
<div class="cart-wish-wrap">
<form action="{{route('cart.add', $product->id)}}" method="POST">
@csrf
<input type="hidden" name="product" value="{{ $product->id }}">
<input type="hidden" name="quantity" value="1">
<input type="hidden" value="false" name="is_configurable">
<button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
</form>
@include('shop::products.wishlist')
</div>
@endif
@endif
</div>

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

@ -1,26 +1,25 @@
@extends('shop::layouts.master')
@section('page_title')
{{ __('shop::app.reviews.add-review-page-title') }} - {{ $product->name }}
@endsection
@section('content-wrapper')
<section class="review">
<div class="category-breadcrumbs">
{{-- <div class="category-breadcrumbs">
<span class="breadcrumb">Home</span> > <span class="breadcrumb">Men</span> > <span class="breadcrumb">Slit Open Jeans</span>
</div>
<div class="review-layouter">
</div> --}}
<div class="review-layouter mb-20">
<div class="product-info">
<div class="image">
<div class="product-image">
<img src="{{ bagisto_asset('images/jeans_big.jpg') }}" />
</div>
<div class="heading">
<div class="product-name">
<span>{{ $product->name }}</span>
</div>
<div class="price">
<div class="product-price">
@inject ('priceHelper', 'Webkul\Product\Product\Price')
@ -34,37 +33,37 @@
@endif
@endif
<span class="pro-price-not">
{{-- <span class="pro-price-not">
<strike> $45.00 </strike>
</span>
<span class="offer"> 10% Off </span>
<span class="offer"> 10% Off </span> --}}
</div>
</div>
<div class="review-info">
<div class="review-form">
<form method="POST" action="{{ route('shop.reviews.store', $product->id ) }}">
@csrf
<div class="heading">
<span> Write a review </span>
<span>{{ __('shop::app.reviews.write-review') }}</span>
</div>
<div class="rating">
<span> {{ __('admin::app.customers.reviews.rating') }} </span>
</div>
<div class="stars">
<label class="star star-5" for="star-5" onclick="calculateRating(id)" id="1"></label>
<label class="star star-4" for="star-4" onclick="calculateRating(id)" id="2"></label>
<label class="star star-3" for="star-3" onclick="calculateRating(id)" id="3"></label>
<label class="star star-2" for="star-2" onclick="calculateRating(id)" id="4"></label>
<label class="star star-1" for="star-1" onclick="calculateRating(id)" id="5"></label>
<input type="name" name="title" class="form-control" placeholder="title">
<input type="name" name="title" class="form-control" placeholder="{{ __('shop::app.reviews.review-title') }}">
<input type="hidden" id="rating" name="rating">

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

@ -70,4 +70,10 @@
</div>
</div>
@else
@if(!is_null($customer))
<a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary">
{{ __('shop::app.products.write-review-btn') }}
</a>
@endif
@endif

2
packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="alert" v-bind:class="flash.type">
<span class="icon white-cross-sm-icon" @click="remove"></span>
<p>{{ flash.message }}</p>
<p>{{ flash.message }}</p>
</div>
</template>

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

@ -1,5 +1,6 @@
$font-color: #3a3a3a;
$brand-color: #0041FF;
$info-color: #204d74;
$danger-color: #FC6868;
$success-color: #4CAF50;
$warning-color: #FFC107;

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

@ -513,6 +513,10 @@ h2 {
background: $danger-color;
}
&.alert-info {
background: $info-color;
}
&.alert-success {
background: $success-color;
}

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

@ -97,6 +97,63 @@
height: 32px;
}
.product-card .product-image {
max-height: 350px;
max-width: 280px;
margin-bottom: 10px;
background: #F2F2F2;
}
.product-card .product-image img {
display: block;
width: 100%;
}
.product-card .product-name {
margin-bottom: 14px;
width: 100%;
color: #242424;
}
.product-card .product-name a {
color: #242424;
}
.product-card .product-description {
display: none;
}
.product-card .product-ratings {
width: 100%;
}
.product-card .product-ratings .icon {
width: 16px;
height: 16px;
}
.product-card .cart-wish-wrap {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
display: inline-flex;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
height: 40px;
}
.product-card .cart-wish-wrap .addtocart {
margin-right: 10px;
text-transform: uppercase;
}
.product-card .cart-wish-wrap .add-to-wishlist {
margin-top: 5px;
}
.product-grid-4 {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
@ -139,56 +196,6 @@
}
}
.product-card .product-image {
max-height: 350px;
max-width: 280px;
margin-bottom: 10px;
background: #F2F2F2;
}
.product-card .product-image img {
display: block;
width: 100%;
}
.product-card .product-name {
margin-bottom: 14px;
width: 100%;
color: #242424;
}
.product-card .product-name a {
color: #242424;
}
.product-card .product-description {
display: none;
}
.product-card .product-ratings {
width: 100%;
}
.product-card .product-ratings .icon {
width: 16px;
height: 16px;
}
.product-card .cart-fav-seg {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
display: inline-flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
.product-card .cart-fav-seg .addtocart {
margin-right: 10px;
text-transform: uppercase;
white-space: nowrap;
}
.add-to-wishlist .wishlist-icon:hover {
background-image: url("../images/wishadd.svg");
}
@ -227,7 +234,7 @@
text-align: left;
}
.account-head .account-edit {
.account-head .account-action {
font-size: 17px;
margin-top: 1%;
color: #0031F0;
@ -2332,94 +2339,90 @@ section.review .review-layouter {
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-flow: row;
flex-flow: row;
margin-top: 20px;
-ms-flex-direction: row;
flex-direction: row;
}
section.review .review-layouter .product-info .image {
border: 1px solid red;
}
section.review .review-layouter .product-info .image img {
section.review .review-layouter .product-info .product-image img {
display: block;
height: 280px;
width: 280px;
}
section.review .review-layouter .product-info .heading {
section.review .review-layouter .product-info .product-name {
margin-top: 20px;
}
section.review .review-layouter .product-info .heading span {
section.review .review-layouter .product-info .product-name span {
font-size: 24px;
}
section.review .review-layouter .product-info .price {
section.review .review-layouter .product-info .product-price {
margin-top: 10px;
}
section.review .review-layouter .product-info .price .pro-price {
section.review .review-layouter .product-info .product-price .pro-price {
font-size: 24px;
color: #FF6472;
}
section.review .review-layouter .product-info .price .pro-price-not {
section.review .review-layouter .product-info .product-price .pro-price-not {
margin-left: 10px;
color: #A5A5A5;
}
section.review .review-layouter .product-info .price .offer {
section.review .review-layouter .product-info .product-price .offer {
margin-left: 10px;
}
section.review .review-layouter .review-info {
section.review .review-layouter .review-form {
margin-left: 20px;
width: 49%;
}
section.review .review-layouter .review-info .heading {
section.review .review-layouter .review-form .heading {
margin-top: 10px;
}
section.review .review-layouter .review-info .heading .btn.btn-primary.right {
section.review .review-layouter .review-form .heading .btn.btn-primary.right {
float: right;
margin-top: -10px;
}
section.review .review-layouter .review-info .rating {
section.review .review-layouter .review-form .rating {
margin-top: 25px;
color: #A5A5A5;
}
section.review .review-layouter .review-info .rating span {
section.review .review-layouter .review-form .rating span {
display: inline;
}
section.review .review-layouter .review-info .stars {
section.review .review-layouter .review-form .stars {
width: 270px;
display: inline-block;
}
section.review .review-layouter .review-info .stars label.star {
section.review .review-layouter .review-form .stars label.star {
font-size: 36px;
color: #d4d4d4;
-webkit-transition: all .2s;
transition: all .2s;
}
section.review .review-layouter .review-info .stars label.star:before {
section.review .review-layouter .review-form .stars label.star:before {
content: '\2605';
}
section.review .review-layouter .review-info .write-review {
section.review .review-layouter .review-form .write-review {
margin-top: 25px;
}
section.review .review-layouter .review-info .write-review .control-group {
section.review .review-layouter .review-form .write-review .control-group {
margin-bottom: 0px;
}
section.review .review-layouter .review-info .write-review .control-group textarea {
section.review .review-layouter .review-form .write-review .control-group textarea {
margin-top: 5px;
border: 2px solid #E8E8E8;
border-radius: 3px;
@ -2427,11 +2430,11 @@ section.review .review-layouter .review-info .write-review .control-group textar
height: 120px;
}
section.review .review-layouter .review-info .submit-button {
section.review .review-layouter .review-form .submit-button {
margin-top: 10px;
}
section.review .review-layouter .review-info .submit-button button {
section.review .review-layouter .review-form .submit-button button {
background: #0031F0;
font-size: 14px;
color: #F2F2F2;
@ -2441,7 +2444,7 @@ section.review .review-layouter .review-info .submit-button button {
border: none;
}
section.review .review-layouter .review-info .review-detail {
section.review .review-layouter .review-form .review-detail {
height: 150px;
border: 1px solid firebrick;
margin-top: 30px;
@ -2454,18 +2457,18 @@ section.review .review-layouter .review-info .review-detail {
flex-direction: row;
}
section.review .review-layouter .review-info .review-detail .rating-review {
section.review .review-layouter .review-form .review-detail .rating-review {
margin-top: 40px;
margin-left: 20px;
width: 48%;
}
section.review .review-layouter .review-info .review-detail .rating-review .avg-rating-count span {
section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span {
font-size: 34px;
text-align: center;
}
section.review .review-layouter .review-info .review-detail .rating-calculate .progress-only {
section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only {
width: 20px;
border: 1px solid blue;
}