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

conflict

This commit is contained in:
rahul shukla 2018-10-29 11:44:12 +05:30
parent fe0e9a51bf
commit 35fdb45353
11 changed files with 114 additions and 170 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>

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

@ -93,14 +93,16 @@ class ReviewController extends Controller
}
/**
* Delete the review of the current product
* Remove the specified resource from storage.
*
* @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();
}

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

@ -1751,13 +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 {
<<<<<<< HEAD
display: none;
=======
display: -webkit-box;
display: -ms-flexbox;
display: flex;
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
@ -2186,7 +2180,6 @@ section.cart .cart-content .right-side {
}
}
<<<<<<< HEAD
@media only screen and (max-width: 386px) {
section.cart .cart-content .left-side .misc-controls div button {
width: 100%;
@ -2204,8 +2197,6 @@ section.cart .cart-content .right-side {
}
}
=======
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
.checkout-process {
display: -webkit-box;
display: -ms-flexbox;
@ -2436,7 +2427,6 @@ section.cart .cart-content .right-side {
}
}
<<<<<<< HEAD
@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;
@ -2456,8 +2446,6 @@ section.cart .cart-content .right-side {
}
}
=======
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
.attached-products-wrapper {
margin-bottom: 80px;
}
@ -2665,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 {
@ -2685,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;
}
@ -2708,11 +2698,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
-ms-flex-direction: column;
flex-direction: column;
}
<<<<<<< HEAD
section.review .review-layouter .product-info .product-image, section.review .review-layouter .product-info .product-name, section.review .review-layouter .product-info .product-price {
=======
section.review .review-layouter .product-info .product-image {
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
max-width: 280px;
margin-left: auto;
margin-right: auto;
@ -2740,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%;
@ -2913,7 +2887,6 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
display: none;
}
<<<<<<< HEAD
.account-table-content {
color: #242424;
margin-top: 1.4%;
@ -2941,8 +2914,6 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
padding: 25px;
}
=======
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
@media only screen and (max-width: 770px) {
.account-content {
-webkit-box-orient: vertical;
@ -2965,11 +2936,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
.account-content .responsive-side-menu {
cursor: pointer;
padding-top: 13px;
<<<<<<< HEAD
display: block !important;
=======
display: block;
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
height: 46px;
border-bottom: 1px solid #C7C7C7;
border-top: 1px solid #C7C7C7;
@ -3006,7 +2973,6 @@ 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 {
<<<<<<< HEAD
margin-bottom: 20px;
}
.account-content .account-layout .account-table-content table tbody tr td {
@ -3019,49 +2985,11 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
.account-content .account-items-list.table {
display: none;
}
=======
display: grid;
margin-bottom: 20px;
}
.account-content .account-items-list, .account-content .edit-form {
margin-top: 20px;
}
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
.account-content .control-group .control {
width: 100%;
}
}
<<<<<<< HEAD
=======
.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;
}
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
.sale-container {
color: #5E5E5E;
}
@ -3204,7 +3132,6 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
}
.cp-spinner {
<<<<<<< HEAD
margin-left: 19%;
margin-top: 13%;
position: absolute;
@ -3222,9 +3149,4 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
.cp-spinner {
margin-top: 50%;
}
=======
margin-left: 46%;
margin-top: 35%;
margin-bottom: 35%;
>>>>>>> 8d741a05ccba81e54055601f614b1be55f5f7ad7
}

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/src/Http/Controllers/ReviewController.php
View File

@ -95,9 +95,7 @@ class ReviewController extends Controller
]);
$data=$request->all();
$customer_id = auth()->guard('customer')->user()->id;
$data['status'] = 'pending';
$data['product_id'] = $id;
$data['customer_id'] = $customer_id;

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

@ -181,7 +181,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
])->name('customer.orders.view');
/* Reviews route */
Route::get('reviews', 'Webkul\Customer\Http\Controllers\CustomerController@reviews')->defaults('_config', [
Route::get('reviews', 'Webkul\Shop\Http\Controllers\ReviewController@reviews')->defaults('_config', [
'view' => 'shop::customers.account.reviews.index'
])->name('customer.reviews.index');
});

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

@ -1785,7 +1785,6 @@ section.cart {
}
}
.cart-item-list {
margin-top: 21px;
padding: 1px;
@ -2438,6 +2437,7 @@ section.review {
.star-name {
margin-right: 5px;
width: 35px;
}
.rate-number {
@ -2445,7 +2445,7 @@ section.review {
}
.percentage {
width: 15%;
width: 50px;
margin-right: 10px;
span {
@ -2456,8 +2456,9 @@ section.review {
.line-bar {
height: 4px;
width: 65%;
width: calc(100% - 100px);
margin-right: 5px;
margin-left: 5px;
background: #D8D8D8;
.line-value {
@ -2472,22 +2473,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{
@ -2526,12 +2511,7 @@ section.review {
.right-side {
width: 100%;
.rater .line-bar {
width: 100%;
}
.rater .percentage {
width: 10%;
margin-right: 0px;
}
}
@ -2541,37 +2521,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
@ -2706,6 +2655,10 @@ section.review {
display: none;
}
}
.responsive-table, .responsive-empty {
display: none;
}
}
}
@ -2798,11 +2751,10 @@ section.review {
margin-top: 2%;
table tbody tr {
margin-bottom: 20px;
height: 70px;
td {
display: block;
padding-top: 5px;
}
}
}
@ -2810,6 +2762,33 @@ section.review {
.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 {

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>

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>

4
packages/Webkul/Shop/webpack.mix.js vendored
View File

@ -1,8 +1,8 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/themes/default/assets";
// var publicPath = 'publishable/assets';
var publicPath = "../../../public/themes/default/assets";
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();