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

export button & review

This commit is contained in:
rahul shukla 2018-12-20 16:38:47 +05:30
parent 13258deb0c
commit ef72b4d629
19 changed files with 29835 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

661
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

29127
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

6
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=c70dacdf945a32e04b77",
"/css/admin.css": "/css/admin.css?id=201f91bc553baa11139f"
}
"/js/admin.js": "/js/admin.js",
"/css/admin.css": "/css/admin.css"
}

2
packages/Webkul/Admin/src/Config/menu.php
View File

@ -177,4 +177,4 @@ return [
'sort' => 2,
'icon-class' => '',
]
];
];

10
packages/Webkul/Admin/src/Http/routes.php
View File

@ -65,7 +65,7 @@ Route::group(['middleware' => ['web']], function () {
Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config',[
'view' => 'admin::customers.review.index'
'view' => 'admin::customers.reviews.index'
])->name('admin.customer.review.index');
// Configuration routes
@ -79,7 +79,7 @@ Route::group(['middleware' => ['web']], function () {
// Reviews Routes
Route::get('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@edit')->defaults('_config',[
'view' => 'admin::customers.review.edit'
'view' => 'admin::customers.reviews.edit'
])->name('admin.customer.review.edit');
Route::put('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@update')->defaults('_config', [
@ -102,11 +102,11 @@ Route::group(['middleware' => ['web']], function () {
// Customer Groups Routes
Route::get('groups', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@index')->defaults('_config',[
'view' => 'admin::customers.group.index'
'view' => 'admin::customers.groups.index'
])->name('admin.groups.index');
Route::get('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@create')->defaults('_config',[
'view' => 'admin::customers.group.create'
'view' => 'admin::customers.groups.create'
])->name('admin.groups.create');
Route::post('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@store')->defaults('_config',[
@ -114,7 +114,7 @@ Route::group(['middleware' => ['web']], function () {
])->name('admin.groups.store');
Route::get('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@edit')->defaults('_config',[
'view' => 'admin::customers.group.edit'
'view' => 'admin::customers.groups.edit'
])->name('admin.groups.edit');
Route::put('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@update')->defaults('_config',[

14
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -512,6 +512,20 @@ body {
height: 16px;
}
}
.export {
cursor: pointer;
.export-icon {
position: relative;
top: 10px;
}
span {
margin-left: 5px;
margin-right: 5px;
}
}
// customer oder css for admin end here

4
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -607,6 +607,8 @@ return [
'export' => [
'export' => 'Export',
'format' => 'Select Format',
'download' => 'Download'
'download' => 'Download',
'csv' => 'CSV',
'xls' => 'XLS'
]
];

0
packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php → packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php
View File

0
packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php → packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
View File

0
packages/Webkul/Admin/src/Resources/views/customers/group/index.blade.php → packages/Webkul/Admin/src/Resources/views/customers/groups/index.blade.php
View File

8
packages/Webkul/Admin/src/Resources/views/customers/index.blade.php
View File

@ -12,9 +12,9 @@
<h1>{{ __('admin::app.customers.customers.title') }}</h1>
</div>
<div class="page-action">
<div class="export" style="display: inline-flex; cursor: pointer; position: absolute; right: 13%">
<div class="export" @click="showModal('downloadDataGrid')">
<i class="export-icon"></i>
<span @click="showModal('downloadDataGrid')" style="margin-top: 8px; margin-left: 5px">
<span >
{{ __('admin::app.export.export') }}
</span>
</div>
@ -57,8 +57,8 @@
{{ __('admin::app.export.format') }}
</label>
<select name="format" class="control" v-validate="'required'">
<option value="xls">XLS</option>
<option value="csv">CSV</option>
<option value="xls">{{ __('admin::app.export.xls') }}</option>
<option value="csv">{{ __('admin::app.export.csv') }}</option>
</select>
</div>

0
packages/Webkul/Admin/src/Resources/views/customers/review/edit.blade.php → packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
View File

0
packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php → packages/Webkul/Admin/src/Resources/views/customers/reviews/index.blade.php
View File

4
packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
View File

@ -12,9 +12,9 @@
</div>
<div class="page-action">
<div class="export" style="display: flex; cursor: pointer">
<div class="export" @click="showModal('downloadDataGrid')">
<i class="export-icon"></i>
<span @click="showModal('downloadDataGrid')" style="margin-top: 8px;margin-right: 5px; margin-left: 5px">
<span>
{{ __('admin::app.export.export') }}
</span>
</div>

4
packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php
View File

@ -12,9 +12,9 @@
</div>
<div class="page-action">
<div class="export" style="display: flex; cursor: pointer">
<div class="export" @click="showModal('downloadDataGrid')">
<i class="export-icon"></i>
<span @click="showModal('downloadDataGrid')" style="margin-top: 8px;margin-right: 5px; margin-left: 5px">
<span>
{{ __('admin::app.export.export') }}
</span>
</div>

4
packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php
View File

@ -12,9 +12,9 @@
</div>
<div class="page-action">
<div class="export" style="display: flex; cursor: pointer">
<div class="export" @click="showModal('downloadDataGrid')">
<i class="export-icon"></i>
<span @click="showModal('downloadDataGrid')" style="margin-top: 8px;margin-right: 5px; margin-left: 5px">
<span>
{{ __('admin::app.export.export') }}
</span>
</div>

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

@ -78,7 +78,7 @@ class ReviewController extends Controller
{
$this->validate(request(), [
'comment' => 'required',
'rating' => 'numeric|min:1|max:5',
'rating' => 'required|numeric|min:1|max:5',
'title' => 'required',
]);

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

@ -45,11 +45,11 @@
<form method="POST" action="{{ route('shop.reviews.store', $product->id ) }}" @submit.prevent="onSubmit">
@csrf
<div class="heading mt-10">
<div class="heading mt-10 mb-25">
<span>{{ __('shop::app.reviews.write-review') }}</span>
</div>
<div class="control-group mt-25" :class="[errors.has('rating') ? 'has-error' : '']">
<div class="control-group" :class="[errors.has('rating') ? 'has-error' : '']">
<label for="title" class="required">
{{ __('admin::app.customers.reviews.rating') }}
</label>

12
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -773,7 +773,11 @@ class DataGrid
$this->getQueryWithFilters();
}
$this->results = $this->query->orderBy($this->select, 'desc')->paginate($this->perpage)->appends(request()->except('page'));
if ($pagination == 'true') {
$this->results = $this->query->orderBy($this->select, 'desc')->paginate($this->perpage)->appends(request()->except('page'));
} else {
$this->results = $this->query->orderBy($this->select, 'desc')->get();
}
return $this->results;
@ -789,7 +793,11 @@ class DataGrid
$this->getQueryWithFilters();
}
$this->results = $this->query->orderBy($this->select, 'desc')->paginate($this->perpage)->appends(request()->except('page'));
if ($pagination == 'true') {
$this->results = $this->query->orderBy($this->select, 'desc')->paginate($this->perpage)->appends(request()->except('page'));
} else {
$this->results = $this->query->orderBy($this->select, 'desc')->get();
}
return $this->results;
}