-
+
{{ __('admin::app.settings.channels.title') }}
@@ -15,7 +15,7 @@
-
+ {!! $datagrid->render() !!}
-
+
{{ __('admin::app.settings.countries.title') }}
@@ -15,7 +15,7 @@
-
+ {!! $datagrid->render() !!}
-
+
{{ __('admin::app.settings.currencies.title') }}
@@ -15,7 +15,7 @@
-
+ {!! $datagrid->render() !!}
-
+
{{ __('admin::app.settings.exchange_rates.title') }}
@@ -19,7 +19,7 @@
-
+ {!! $datagrid->render() !!}
-
+
{{ __('admin::app.settings.inventory_sources.title') }}
@@ -19,7 +19,7 @@
-
+ {!! $datagrid->render() !!}
-
+
{{ __('admin::app.settings.locales.title') }}
@@ -15,7 +15,7 @@
-
+ {!! $datagrid->render() !!}
+
+
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
new file mode 100644
index 000000000..5b2ce8c55
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
@@ -0,0 +1,21 @@
+@extends('admin::layouts.content')
+
+@section('content')
+
+
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php
index 1ad1d9cda..1088d3f8b 100644
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php
@@ -4,7 +4,7 @@
+
+
+
+
+
+
+ {{ __('admin::app.settings.sliders.title') }}
+
+ {!! $datagrid->render() !!}
+
+
-
+
{{ __('admin::app.users.roles.title') }}
@@ -15,7 +15,7 @@
-
+ {!! $datagrid->render() !!}
-
+
{{ __('admin::app.users.users.title') }}
diff --git a/packages/Webkul/Channel/src/Channel.php b/packages/Webkul/Channel/src/Channel.php
index d0b752193..04281bd74 100644
--- a/packages/Webkul/Channel/src/Channel.php
+++ b/packages/Webkul/Channel/src/Channel.php
@@ -19,6 +19,12 @@ class Channel
return $channel->code;
}
+ public function getCurrentChannel() {
+ //just retrieve only three columns id, name and code
+ $current_channel = collect(ChannelModel::select('id', 'name', 'code')->first());
+ return $current_channel;
+ }
+
public function getChannelModel() {
return ChannelModel::first();
}
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_03_114203_create_sliders_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_03_114203_create_sliders_table.php
new file mode 100644
index 000000000..2028f60f8
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_03_114203_create_sliders_table.php
@@ -0,0 +1,39 @@
+increments('id');
+ $table->string('title');
+ $table->string('path');
+ $table->string('content');
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::disableForeignKeyConstraints();
+ Schema::dropIfExists('sliders');
+ Schema::enableForeignKeyConstraints();
+ }
+}
diff --git a/packages/Webkul/Core/src/Eloquent/Repository.php b/packages/Webkul/Core/src/Eloquent/Repository.php
index b552c762d..080147f0c 100644
--- a/packages/Webkul/Core/src/Eloquent/Repository.php
+++ b/packages/Webkul/Core/src/Eloquent/Repository.php
@@ -1,4 +1,4 @@
-resetScope()->model->with($with)->get($columns);
}
-
+
/**
* @param int $perPage
* @param array $columns
@@ -158,7 +158,7 @@ abstract class Repository implements RepositoryInterface {
return $this->model = $model->newQuery();
}
-
+
/**
* @return $this
*/
diff --git a/packages/Webkul/Core/src/Models/Slider.php b/packages/Webkul/Core/src/Models/Slider.php
new file mode 100644
index 000000000..4903eb495
--- /dev/null
+++ b/packages/Webkul/Core/src/Models/Slider.php
@@ -0,0 +1,20 @@
+registerCoreFacade();
}
-
+
/**
* Register Bouncer as a singleton.
*
diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php
new file mode 100644
index 000000000..6c6bff0c0
--- /dev/null
+++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php
@@ -0,0 +1,42 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class SliderRepository extends Repository
+{
+ /**
+ * Specify Model class name
+ *
+ * @return mixed
+ */
+ function model()
+ {
+ return 'Webkul\Core\Models\Slider';
+ }
+
+ /**
+ * @param array $data
+ * @return mixed
+ */
+ public function create(array $data)
+ {
+ $image = request()->hasFile('image');
+
+ $image_name = uniqid(20).'.'.$image->getClientOriginalExtension();
+
+ $destinationPath = public_path('/vendor/webkul/shop/assets/images/slider');
+ $path = $image->move($destinationPath, $image_name);
+ $path= 'vendor/webkul/shop/assets/images/slider/'.$image_name;
+ $data['path'] = $path;
+ $this->model->create($data);
+ }
+
+}
\ No newline at end of file
diff --git a/packages/Webkul/Customer/src/Http/routes.php b/packages/Webkul/Customer/src/Http/routes.php
index 792e66916..65dd874ef 100644
--- a/packages/Webkul/Customer/src/Http/routes.php
+++ b/packages/Webkul/Customer/src/Http/routes.php
@@ -5,7 +5,7 @@ Route::group(['middleware' => ['web']], function () {
// Login Routes
Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [
- 'view' => 'shop::customers.login.index',
+ 'view' => 'shop::customers.session.index',
])->name('customer.session.index');
Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [
diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
index 69aa477fe..8fcf85e12 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
@@ -5,7 +5,8 @@ namespace Webkul\Shop\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Routing\Controller;
-
+use Webkul\Core\Repositories\SliderRepository as Sliders;
+use Webkul\Channel\Channel as Channel;
/**
* Admin user session controller
*
@@ -15,13 +16,22 @@ use Illuminate\Routing\Controller;
class HomeController extends controller
{
protected $_config;
+ protected $sliders;
+ protected $current_channel;
- public function __construct()
+ public function __construct(Sliders $s,Channel $c)
{
$this->_config = request('_config');
+ $this->sliders = $s;
+ $this->current_channel = $c;
}
- public function index(){
- return view($this->_config['view']);
+ public function index() {
+
+ $current_channel = $this->current_channel->getCurrentChannel();
+
+ $all_sliders = $this->sliders->findWhere(['channel_id'=>$current_channel['id']]);
+
+ return view($this->_config['view'])->with('data',$all_sliders);
}
}
diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php
new file mode 100644
index 000000000..22427acac
--- /dev/null
+++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php
@@ -0,0 +1,61 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+
+class SliderController extends controller
+{
+ protected $_config;
+ protected $slider;
+ protected $channels;
+
+ public function __construct(Slider $slider)
+ {
+ $this->slider = $slider;
+ $this->_config = request('_config');
+
+ }
+
+ /**
+ * Loads the index
+ * for the sliders
+ * settings.
+ */
+
+ public function index() {
+ return view($this->_config['view']);
+ }
+ /**
+ * Loads the form
+ * for creating
+ * slider.
+ */
+
+ public function create() {
+ $call = new Channel();
+ $channels = $call->getAllChannels();
+ return view($this->_config['view'])->with('channels',[$channels]);
+ }
+
+ /**
+ * Creates the new
+ * sider item
+ */
+ public function store() {
+ $this->slider->create(request()->all());
+ session()->flash('success', 'Slider created successfully.');
+ return redirect()->back();
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
index 016b0f664..cb72c0524 100644
--- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
@@ -21,6 +21,8 @@ class ShopServiceProvider extends ServiceProvider
{
include __DIR__ . '/../Http/routes.php';
+ $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'shop');
+
$this->publishes([
__DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/shop/assets'),
], 'public');
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg b/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg
index 042f15182..dc2f60ebd 100644
--- a/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg
+++ b/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg
@@ -1,13 +1,13 @@
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js
index 84547dd7b..8b1427874 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js
@@ -10,54 +10,18 @@ Vue.component("category-nav", require("./components/category-nav.vue"));
Vue.component("category-item", require("./components/category-item.vue"));
Vue.component("image-slider", require("./components/imageSlider.vue"));
-$(window).resize(function() {
- var w = $(document).width();
- var window = {};
- window.width = $(document).width();
- window.height = $(document).height();
- if (window.width < 785) {
- $(".header").css("margin-bottom", "0");
- $(".header-top").css("margin-bottom", "0");
- $("ul.search-container").css("display", "none");
- $(".header-bottom").css("display", "none");
- $("div.right-content").css("display", "none");
- $(".right-responsive").css("display", "inherit");
- } else if (window.width > 785) {
- $(".header").css("margin-bottom", "21px");
- $(".header-top").css("margin-bottom", "16px");
- $("ul.search-container").css("display", "inherit");
- $(".header-bottom").css("display", "block");
- $("div.right-content").css("display", "inherit");
- $(".right-responsive").css("display", "none");
- }
-});
-
-$(document).ready(function() {
- /* Responsiveness script goes here */
- var w = $(document).width();
- var window = {};
- window.width = $(document).width();
- window.height = $(document).height();
- if (window.width < 785) {
- $(".header").css("margin-bottom", "0");
- $(".header-top").css("margin-bottom", "0");
- $("ul.search-container").css("display", "none");
- $(".header-bottom").css("display", "none");
- $("div.right-content").css("display", "none");
- $(".right-responsive").css("display", "inherit");
- }
- /* Responsiveness script ends here */
+$(document).ready(function () {
const app = new Vue({
el: "#app",
- mounted: function() {
+ mounted: function () {
this.addServerErrors();
this.addFlashMessages();
},
methods: {
- onSubmit: function(e) {
+ onSubmit: function (e) {
this.$validator.validateAll().then(result => {
if (result) {
e.target.submit();
@@ -65,7 +29,7 @@ $(document).ready(function() {
});
},
- addServerErrors: function() {
+ addServerErrors: function () {
var scope = null;
for (var key in serverErrors) {
const field = this.$validator.fields.find({
@@ -83,14 +47,14 @@ $(document).ready(function() {
}
},
- addFlashMessages: function() {
+ addFlashMessages: function () {
const flashes = this.$refs.flashes;
- flashMessages.forEach(function(flash) {
+ flashMessages.forEach(function (flash) {
flashes.addFlash(flash);
}, this);
},
- responsiveHeader: function() {}
+ responsiveHeader: function () { }
}
});
});
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
index 6f6f22704..6bbcda3bd 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
@@ -8,7 +8,8 @@
:item="item">
- 
Offer Zone
+
+ Offer Zone
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue
index 1c7f4ede1..50ba3ef47 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue
@@ -2,7 +2,8 @@
-
+
@@ -26,7 +26,8 @@
data: function() {
return {
- isActive: false
+ isActive: false,
+ imageData: '',
}
},
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-upload.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-upload.vue
new file mode 100644
index 000000000..424daf17a
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-upload.vue
@@ -0,0 +1,73 @@
+
+
Offer Zone
+
+ Offer Zone
-
-
+
+
+@section('javascript')
+
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/store/slider/slider.blade.php b/packages/Webkul/Shop/src/Resources/views/store/slider/slider.blade.php
index 4648d941e..28489f1a9 100644
--- a/packages/Webkul/Shop/src/Resources/views/store/slider/slider.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/store/slider/slider.blade.php
@@ -1,3 +1,3 @@
diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
index c0296aa32..5b18d6e9b 100644
--- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\DB;
use Webkul\Ui\DataGrid\Helpers\Column;
use Webkul\Ui\DataGrid\Helpers\Pagination;
use Webkul\Ui\DataGrid\Helpers\Css;
-use Webkul\Ui\DataGrid\Helpers\MassAction;
+use URL;
class DataGrid
{
@@ -32,6 +32,13 @@ class DataGrid
*/
protected $aliased;
+ /**
+ * Pagination variable
+ * @var String
+ */
+
+ protected $perpage;
+
/**
* Table
*
@@ -96,6 +103,13 @@ class DataGrid
*/
protected $css;
+ /**
+ * Actions $action
+ * @var action
+ */
+
+ protected $actions;
+
/**
* URL parse $parsed
* @var parse
@@ -127,9 +141,9 @@ class DataGrid
// list($name, $select, $table, $join, $columns) = array_values($args);
$name = $select = $aliased = $table = false;
$join = $columns = $filterable = $searchable =
- $massoperations = $css = $operators = [];
+ $massoperations = $css = $operators = $actions = [];
extract($args);
- return $this->build($name, $select, $filterable, $searchable, $massoperations, $aliased, $table, $join, $columns, $css, $operators);
+ return $this->build($name, $select, $filterable, $searchable, $massoperations, $aliased, $perpage, $table, $join, $columns, $css, $operators,$actions);
}
//starts buikding the queries on the basis of selects, joins and filter with
@@ -142,11 +156,13 @@ class DataGrid
array $searchable = [],
array $massoperations = [],
bool $aliased = false,
+ $perpage = 0,
$table = null,
array $join = [],
array $columns = null,
array $css = [],
array $operators = [],
+ array $actions = [],
Pagination $pagination = null
) {
$this->request = Request::capture();
@@ -156,11 +172,13 @@ class DataGrid
$this->setSearchable($filterable);
$this->setMassOperations($massoperations);
$this->setAlias($aliased);
+ $this->setPerPage($perpage);
$this->setTable($table);
$this->setJoin($join);
$this->addColumns($columns, true);
$this->setCss($css);
$this->setOperators($operators);
+ $this->setActions($actions);
// $this->addPagination($pagination);
return $this;
}
@@ -185,7 +203,7 @@ class DataGrid
public function setSelect($select)
{
- $this->select = $select ?: false;
+ $this->select = $select ? : false;
return $this;
}
@@ -196,7 +214,7 @@ class DataGrid
public function setFilterable(array $filterable)
{
- $this->filterable = $filterable ?: [];
+ $this->filterable = $filterable ? : [];
return $this;
}
@@ -207,7 +225,7 @@ class DataGrid
public function setSearchable($searchable)
{
- $this->searchable = $searchable ?: [];
+ $this->searchable = $searchable ? : [];
return $this;
}
@@ -218,7 +236,7 @@ class DataGrid
public function setMassOperations($massops)
{
- $this->massoperations = $massops ?: [];
+ $this->massoperations = $massops ? : [];
return $this;
}
@@ -233,6 +251,21 @@ class DataGrid
public function setAlias(bool $aliased)
{
$this->aliased = $aliased ? : false;
+ return $this;
+ }
+
+ /**
+ * Set the default
+ * pagination for
+ * data grid.
+ *
+ * @return $this
+ */
+
+ public function setPerPage($perpage)
+ {
+ $this->perpage = $perpage ? : 5;
+ return $this;
}
/**
@@ -283,6 +316,17 @@ class DataGrid
// return $this;
// }
+ /**
+ * Section actions bag
+ * here.
+ * @return $this
+ */
+
+ public function setActions($actions = []) {
+ $this->actions = $actions ?: [];
+ return $this;
+ }
+
/**
* Add Columns.
*
@@ -385,55 +429,63 @@ class DataGrid
return $this;
}
- /**
- * Parse the URL
- * and get it ready
- * to be used.
- */
-
- // private function parse()
- // {
- // //parse the url here
- // if (isset($_SERVER['QUERY_STRING'])) {
- // $qr = $_SERVER['QUERY_STRING'];
- // parse_str($qr, $parsed);
- // foreach ($parsed as $k=>$v) {
- // parse_str($v, $parsed[$k]);
- // }
- // return $parsed;
- // } else {
- // return $parsed = [];
- // }
- // }
-
- private function parse()
- {
- $parsed = [];
- $unparsed = $_SERVER['QUERY_STRING'];
- if (isset($unparsed)) {
- parse_str($unparsed, $parsed);
- return $parsed;
- } else {
- return $parsed;
- }
- }
-
/**
* Used for selecting
* the columns got in
* make from controller.
* @return $this
*/
+
private function getSelect()
{
$select = [];
foreach ($this->columns as $column) {
- $select[] = $column->name;
+ $select[] = $column->name.' as '.$column->alias;
}
+
$this->query->select(...$select);
+
if ($this->select) {
$this->query->addselect($this->select);
}
+
+ // dd($this->query);
+ }
+
+ /**
+ * To find the alias
+ * of the column and
+ * by taking the column
+ * name.
+ * @return string
+ */
+
+ public function findAlias($column_alias) {
+ foreach($this->columns as $column) {
+ if($column->alias == $column_alias) {
+ return $column->name;
+ }
+ }
+ }
+
+ /**
+ * Parse the URL
+ * and get it ready
+ * to be used.
+ */
+
+ private function parse()
+ {
+ $parsed = [];
+ $unparsed = url()->full();
+ if (count(explode('?', $unparsed))>1) {
+ $to_be_parsed = explode('?', $unparsed)[1];
+ parse_str($to_be_parsed, $parsed);
+ unset($parsed['page']);
+ return $parsed;
+ } else {
+ return $parsed;
+ }
}
/**
@@ -452,6 +504,7 @@ class DataGrid
{
foreach ($this->columns as $column) {
if ($column->filter) { // if the filter bag in array exists then these will be applied.
+ dd($column);
if (count($column->filter['condition']) == count($column->filter['condition'], COUNT_RECURSIVE)) {
$this->query->{$column->filter['function']}(...$column->filter['condition']);
} else {
@@ -476,88 +529,22 @@ class DataGrid
}
/**
- * Used to get the filter
- * params from the Url
- * and processed manually
+ * Function runs when
+ * filters, sort, search
+ * any of it is applied
+ * @return $this->query
*/
- // private function getQueryWithFilters()
- // {
- // // the only use case remaining is making and testing the full validation and testing of
- // // aliased case with alias used in column names also.
- // if ($this->aliased) {
- // //n of joins can lead to n number of aliases for columns and neglect the as for columns
- // $parsed = $this->parse();
- // // dump($parsed);
- // foreach ($parsed as $key => $value) {
- // foreach ($value as $column => $filter) {
- // if (array_keys($filter)[0]=="like") {
- // $this->query->where(
- // str_replace('_', '.', $column), //replace the logic of making the column name and consider the case for _ in column name already
- // $this->operators[array_keys($filter)[0]],
- // '%'.array_values($filter)[0].'%'
- // );
- // } elseif (array_keys($filter)[0]=="sort") {
- // $this->query->orderBy(
- // str_replace('_', '.', $column), //replace the logic of making the column name and consider the case for _
- // array_values($filter)[0]
- // );
- // } elseif ($column == "search") {
- // $this->query->where(function ($query) use ($filter) {
- // foreach ($this->searchable as $search) {
- // $query->orWhere($search['column'], 'like', '%'.array_values($filter)[0].'%');
- // }
- // });
- // } else {
- // $this->query->where(
- // str_replace('_', '.', $column),
- // $this->operators[array_keys($filter)[0]],
- // array_values($filter)[0]
- // );
- // }
- // }
- // }
- // } else {
- // $parsed = $this->parse();
- // foreach ($parsed as $key => $value) {
- // foreach ($value as $column => $filter) {
- // if (array_keys($filter)[0]=="like") {
- // $this->query->where(
- // $column,
- // $this->operators[array_keys($filter)[0]],
- // '%'.array_values($filter)[0].'%'
- // );
- // } elseif ($column == "search") {
- // $this->query->where(function ($query) use ($filter) {
- // foreach ($this->searchable as $search) {
- // $query->orWhere($search['column'], 'like', '%'.array_values($filter)[0].'%');
- // }
- // });
- // } else {
- // $this->query->where(
- // $column,
- // $this->operators[array_keys($filter)[0]],
- // array_values($filter)[0]
- // );
- // }
- // }
- // }
- // }
- // }
private function getQueryWithFilters()
{
$parsed = $this->parse();
- if ($this->aliased) {
+ if ($this->aliased) { //aliasing is expected in this case or it will be changed to presence of join bag
foreach ($parsed as $key=>$value) {
if ($key=="sort") {
-
//resolve the case with the column helper class
- if (strpos($key, ' as ') !== false) {
- dd('This column cannot be sorted');
- } else {
- $column_name = str_replace('_', '.', $key);
- }
+ if(substr_count($key,'_') >= 1)
+ $column_name = $this->findAlias($key);
//case that don't need any resolving
$count_keys = count(array_keys($value));
@@ -567,26 +554,19 @@ class DataGrid
array_values($value)[0]
);
} else {
- dump('Sort on two columns cannot exist in backend');
+ throw new \Exception('Multiple Sort keys Found, Please Resolve the URL Manually.');
}
} elseif ($key=="search") {
- if (strpos($key, ' as ') !== false) {
- dd('This column cannot be searched');
- } else {
- $column_name = str_replace('_', '.', $key);
- }
+
+ $count_keys = count(array_keys($value));
+ if($count_keys==1)
$this->query->where(function ($query) use ($parsed) {
foreach ($this->searchable as $search) {
$query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
}
});
} else {
- if (strpos($key, ' as ') !== false) {
- dd('This column cannot be filtered');
- } else {
- $column_name = str_replace('_', '.', $key);
- }
-
+ $column_name = $this->findAlias($key);
if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
foreach ($value as $condition => $filter_value) {
$this->query->where(
@@ -607,7 +587,58 @@ class DataGrid
}
}
} else {
- dd('left to be run plainly');
+ //this is the case for the non aliasing.
+ foreach ($parsed as $key=>$value) {
+
+ if ($key=="sort") {
+
+ //case that don't need any resolving
+ $count_keys = count(array_keys($value));
+ if ($count_keys==1) {
+
+ $this->query->orderBy(
+ array_keys($value)[0],
+ array_values($value)[0]
+ );
+
+ } else {
+ throw new \Exception('Multiple Sort keys Found, Please Resolve the URL Manually.');
+ }
+ } elseif ($key=="search") {
+
+ $count_keys = count(array_keys($value));
+ if($count_keys==1)
+ $this->query->where(function ($query) use ($parsed) {
+ foreach ($this->searchable as $search) {
+ $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
+ }
+ });
+ else
+ throw new \Exception('Multiple Search keys Found, Please Resolve the URL Manually.');
+
+ } else {
+ // $column_name = $key;
+ $column_name = $this->findAlias($key);
+ if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
+ foreach ($value as $condition => $filter_value) {
+ $this->query->where(
+ $column_name,
+ $this->operators[$condition],
+ '%'.$filter_value.'%'
+ );
+ }
+ } else {
+ foreach ($value as $condition => $filter_value) {
+ $this->query->where(
+ $column_name,
+ $this->operators[$condition],
+ $filter_value
+ );
+ }
+ }
+ }
+ }
+
}
}
@@ -651,14 +682,13 @@ class DataGrid
foreach ($this->join as $join) {
$name = strtolower($join['join']);
//Allow joins i.e left or right
- if ($name=='leftjoin' || $name=='left join' || $name=='rightjoin' || $name=='right join') {
+ if ($name=='leftjoin' || $name=='rightjoin') {
//check if the aliasing on the primary table and primaryKey in join is also the same
$primary_key_alias = trim(explode('.', $join['primaryKey'])[0]);
if ($primary_key_alias == $table_alias) {
$join_table_alias = explode('as', $join['table']);
-
if (isset($join_table_alias)) {
$alias1 = trim($join_table_alias[1]); //important!!!!!
@@ -668,24 +698,8 @@ class DataGrid
$exploded_secondary = explode('.', $secondary_join_column);
$alias2 = trim($exploded_secondary[0]);
if ($alias1 == $alias2) {
-
- //check whether secondary table columns are properly aliased
+ $this->getQueryWithJoin();
$alias_proper_secondary = true;
- foreach ($this->columns as $column) {
- if ($x = explode('.', $column->name)[0]) {
- if (isset($x) && $x == $alias1) {
- //check if this secondary column is using independent column alias
- if (!strpos($column->name, 'as')) {
- $alias_proper_secondary = false;
- }
- }
- }
- }
- if ($alias_proper_secondary) {
- $this->getQueryWithJoin();
- } else {
- throw new \Exception('Due to a bug in laravel, you can\'t use secondary table columns without aliasing');
- }
} else {
throw new \Exception('Aliases of Join table and the secondary key columns do not match');
}
@@ -706,58 +720,37 @@ class DataGrid
}
//Check for column filter bags and resolve aliasing
- //run this if there are columns with filter bag
$this->getQueryWithColumnFilters();
- //Run this if there are filters or sort params or range params in the urls
- // if (isset($_SERVER['QUERY_STRING'])) {
- // $qr = $_SERVER['QUERY_STRING'];
- // $parsed;
- // parse_str($qr, $parsed);
- // }
- $parsed = $this->parse();
-
if (!empty($parsed)) {
$this->getQueryWithFilters();
- } else {
- $this->results = $this->query->get();
- return $this->results;
}
+
$this->results = $this->query->get();
+
+ $this->results = $this->query->paginate($this->perpage)->appends(request()->except('page'));
return $this->results;
+
} else {
+
$this->query = DB::table($this->table);
- if (!empty($this->select)) {
- $this->getSelect();
- }
+
+ $this->getSelect();
$this->getQueryWithColumnFilters();
- $parsed = $this->parse();
if (!empty($parsed)) {
$this->getQueryWithFilters();
- } else {
- $this->results = $this->query->get();
- return $this->results;
}
+
$this->results = $this->query->get();
+
+ $this->results = $this->query->paginate($this->perpage)->appends(request()->except('page'));
+
return $this->results;
}
}
- /**
- * Render mass
- * action instance
- * @return view
- */
-
- // private function renderMassAction(array $attributes)
- // {
-
- // //probably render some view when mass action is needed
- // //the rendered view will have the needed javascript also.
- // }
-
/**
* @return view
*/
@@ -772,6 +765,7 @@ class DataGrid
'filterable' =>$this->filterable,
'operators' => $this->operators,
'massoperations' => $this->massoperations,
+ 'actions' => $this->actions,
]);
}
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/DataGrid/Helpers/Column.php b/packages/Webkul/Ui/src/DataGrid/Helpers/Column.php
index 6bf15cbee..27d8e45f1 100644
--- a/packages/Webkul/Ui/src/DataGrid/Helpers/Column.php
+++ b/packages/Webkul/Ui/src/DataGrid/Helpers/Column.php
@@ -11,19 +11,9 @@ class Column extends AbstractFillable
private $request = null;
private $readableName = false;
+ private $aliasing = false;
private $value = false;
private $sortHtml = '%s';
- // private $sortHtml = '%s';
-
- // protected $name;
- // protected $type;
- // protected $label;
- // protected $filterable;
- // protected $sortable;
- // protected $attributes;
- // protected $wrapper;
- // protected $callback;
-
/**
* Without Array it will treat it like string
@@ -53,7 +43,14 @@ class Column extends AbstractFillable
'type',
'label',
'sortable',
+ 'searchable',
'filterable',
+ 'massoperations' => [
+ 'allowed' => 'array'
+ ],
+ 'actions' => [
+ 'allowed' => 'array'
+ ],
'filter' => [
'allowed' => 'array',
],
@@ -120,7 +117,6 @@ class Column extends AbstractFillable
$this->value = call_user_func($this->wrapper, $this->value, $obj);
}
}
-
private function sortingUrl()
{
$query = ['sort' => $this->correct(false)];
@@ -153,10 +149,12 @@ class Column extends AbstractFillable
public function render($obj)
{
- if (property_exists($obj, ($this->readableName = $this->correct()))) {
- $this->value = $obj->{$this->readableName};
+
+ if (property_exists($obj, ($this->aliasing = $this->alias))) {
+ $this->value = $obj->{$this->aliasing};
$this->wrap($obj);
}
return $this->value;
+
}
}
diff --git a/packages/Webkul/Ui/src/DataGrid/ProductGrid.php b/packages/Webkul/Ui/src/DataGrid/ProductGrid.php
new file mode 100644
index 000000000..c6136eb83
--- /dev/null
+++ b/packages/Webkul/Ui/src/DataGrid/ProductGrid.php
@@ -0,0 +1,727 @@
+ 'left',
+ * 'table' => 'posts',
+ * 'primaryKey' => 'user.id',
+ * 'condition' => '=',
+ * 'secondryKey' => 'posts.user_id',
+ * 'callback' => 'not supported yet'
+ * ]
+ */
+ protected $join;
+ /**
+ * Collection Object of Column $columns
+ *
+ * @var Collection
+ */
+ protected $columns;
+
+ /**
+ * array of columns
+ * to be filtered
+ * @var Array
+ */
+ protected $filterable;
+
+ /**
+ * array of columns
+ * to be searched
+ *
+ * @var Array
+ */
+ protected $searchable;
+
+ /**
+ * mass operations
+ *
+ * @var Array
+ */
+ protected $massoperations;
+
+ /**
+ * Pagination $pagination
+ *
+ * @var Pagination
+ */
+ protected $pagination;
+ /**
+ * Css $css
+ *
+ * @var Css
+ */
+ protected $css;
+
+ /**
+ * URL parse $parsed
+ * @var parse
+ */
+ protected $parsed;
+ /*
+ public function __construct(
+ $name = null ,
+ $table = null ,
+ array $join = [],
+ Collection $columns = null,
+ Pagination $pagination = null
+ ){
+ $this->make(
+ $name,
+ $table,
+ $join,
+ $columns,
+ $pagination
+ );
+ return $this;
+
+ Separates the bags in the array of make attributes
+ }
+ */
+
+ public function make($args)
+ {
+ // list($name, $select, $table, $join, $columns) = array_values($args);
+ $name = $select = $aliased = $table = false;
+ $join = $columns = $filterable = $searchable =
+ $massoperations = $css = $operators = [];
+ extract($args);
+ return $this->build($name, $select, $filterable, $searchable, $massoperations, $aliased, $perpage, $table, $join, $columns, $css, $operators);
+ }
+
+ //starts buikding the queries on the basis of selects, joins and filter with
+ //attributes for class names and styles.
+
+ public function build(
+ $name = null,
+ $select = false,
+ array $filterable = [],
+ array $searchable = [],
+ array $massoperations = [],
+ bool $aliased = false,
+ $perpage = 0,
+ $table = null,
+ array $join = [],
+ array $columns = null,
+ array $css = [],
+ array $operators = [],
+ Pagination $pagination = null
+ ) {
+ $this->request = Request::capture();
+ $this->setName($name);
+ $this->setSelect($select);
+ $this->setFilterable($filterable);
+ $this->setSearchable($filterable);
+ $this->setMassOperations($massoperations);
+ $this->setAlias($aliased);
+ $this->setPerPage($perpage);
+ $this->setTable($table);
+ $this->setJoin($join);
+ $this->addColumns($columns, true);
+ $this->setCss($css);
+ $this->setOperators($operators);
+ // $this->addPagination($pagination);
+ return $this;
+ }
+
+ /**
+ * Set Name.
+ *
+ * @return $this
+ */
+
+ public function setName(string $name)
+ {
+ $this->name = $name ?: 'Default' . time();
+ return $this;
+ }
+
+ /**
+ * Set Select.
+ *
+ * @return $this
+ */
+
+ public function setSelect($select)
+ {
+ $this->select = $select ? : false;
+ return $this;
+ }
+
+ /**
+ * Set Filterable
+ * @return $this
+ */
+
+ public function setFilterable(array $filterable)
+ {
+ $this->filterable = $filterable ? : [];
+ return $this;
+ }
+
+ /**
+ * Set Searchable columns
+ * @return $this
+ */
+
+ public function setSearchable($searchable)
+ {
+ $this->searchable = $searchable ? : [];
+ return $this;
+ }
+
+ /**
+ * Set mass operations
+ * @return $this
+ */
+
+ public function setMassOperations($massops)
+ {
+ $this->massoperations = $massops ? : [];
+ return $this;
+ }
+
+ /**
+ * Set alias parameter
+ * to know whether
+ * aliasing is true or not.
+ *
+ * @return $this.
+ */
+
+ public function setAlias(bool $aliased)
+ {
+ $this->aliased = $aliased ? : false;
+ return $this;
+ }
+
+ /**
+ * Set the default
+ * pagination for
+ * data grid.
+ *
+ * @return $this
+ */
+
+ public function setPerPage($perpage)
+ {
+ $this->perpage = $perpage ? : 5;
+ return $this;
+ }
+
+ /**
+ * Set table name in front
+ * of query scope.
+ *
+ * @return $this
+ */
+
+ public function setTable(string $table)
+ {
+ $this->table = $table ?: false;
+ return $this;
+ }
+
+ /**
+ * Set join bag if
+ * present.
+ *
+ * @return $this
+ */
+
+ public function setJoin(array $join)
+ {
+ $this->join = $join ?: [];
+ return $this;
+ }
+
+ /**
+ * Adds the custom css rules
+ * @retun $this
+ */
+
+ private function setCss($css = [])
+ {
+ $this->css = new Css($css);
+ return $this->css;
+ }
+
+ /**
+ * setFilterableColumns
+ * @return $this
+ */
+
+ // public function setFilterableColumns($filterable_columns = [])
+ // {
+ // $this->join = $filterable_columns ?: [];
+ // return $this;
+ // }
+
+ /**
+ * Add Columns.
+ *
+ * @return $this
+ */
+
+ public function addColumns($columns = [], $reCreate = false)
+ {
+ if ($reCreate) {
+ $this->columns = new Collection();
+ }
+ if ($columns) {
+ foreach ($columns as $column) {
+ $this->addColumn($column);
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Add Column.
+ *
+ * @return $this
+ */
+
+ public function addColumn($column = [])
+ {
+ if ($column instanceof Column) {
+ $this->columns->push($column);
+ } elseif (gettype($column) == 'array' && $column) {
+ $this->columns->push(new Column($column, $this->request));
+ } else {
+ throw new \Exception("DataGrid: Add Column argument is not valid!");
+ }
+ return $this;
+ }
+
+ /**
+ * Add ColumnMultiple.
+ * Currently is not
+ * of any use.
+ * @return $this
+ */
+
+ private function addColumnMultiple($column = [], $multiple = false)
+ {
+ if ($column instanceof Column) {
+ if ($multiple) {
+ if ($this->columns->offsetExists($column->getName())) {
+ $this->columns->offsetSet($column->getName(). time(), $column);
+ } else {
+ $this->columns->offsetSet($column->getName(), $column);
+ }
+ } else {
+ $this->columns->offsetSet($column->getName(), $column);
+ }
+ } elseif (gettype($column) == 'array' && $column) {
+ $columnObj = new Column($column);
+ if ($multiple) {
+ if ($this->columns->offsetExists($columnObj->getName())) {
+ $this->columns->offsetSet($columnObj->getName(). time(), $columnObj);
+ } else {
+ $this->columns->offsetSet($columnObj->getName(), $columnObj);
+ }
+ } else {
+ $this->columns->offsetSet($columnObj->getName(), $columnObj);
+ }
+ } else {
+ throw new \Exception("DataGrid: Add Column argument is not valid!");
+ }
+ return $this;
+ }
+
+ /**
+ * Adds expressional verbs to be used
+ * @return $this
+ */
+
+ public function setOperators(array $operators)
+ {
+ $this->operators = $operators ?: [];
+ return $this;
+ }
+
+ /**
+ * Add Pagination.
+ *
+ * @return $this
+ */
+
+ public function addPagination($pagination = [])
+ {
+ if ($pagination instanceof Pagination) {
+ $this->pagination = $pagination;
+ } elseif (gettype($pagination) == 'array' && $pagination) {
+ $this->pagination = new Pagination($pagination);
+ } else {
+ throw new \Exception("DataGrid: Pagination argument is not valid!");
+ }
+ return $this;
+ }
+
+ /**
+ * Used for selecting
+ * the columns got in
+ * make from controller.
+ * @return $this
+ */
+
+ private function getSelect()
+ {
+ $select = [];
+ foreach ($this->columns as $column) {
+ $select[] = $column->name;
+ }
+ $this->query->select(...$select);
+ if ($this->select) {
+ $this->query->addselect($this->select);
+ }
+ }
+
+ /**
+ * Parse the URL
+ * and get it ready
+ * to be used.
+ */
+
+ private function parse()
+ {
+ $parsed = [];
+ $unparsed = url()->full();
+ if (count(explode('?', $unparsed))>1) {
+ $to_be_parsed = explode('?', $unparsed)[1];
+ parse_str($to_be_parsed, $parsed);
+ unset($parsed['page']);
+ return $parsed;
+ } else {
+ return $parsed;
+ }
+ }
+
+ /**
+ * ->join('contacts', 'users.id', '=', 'contacts.user_id')
+ * @return $this->query
+ */
+
+ private function getQueryWithJoin()
+ {
+ foreach ($this->join as $join) {
+ $this->query->{$join['join']}($join['table'], $join['primaryKey'], $join['condition'], $join['secondaryKey']);
+ }
+ }
+
+ private function getQueryWithColumnFilters()
+ {
+ foreach ($this->columns as $column) {
+ if ($column->filter) { // if the filter bag in array exists then these will be applied.
+ dd($column);
+ if (count($column->filter['condition']) == count($column->filter['condition'], COUNT_RECURSIVE)) {
+ $this->query->{$column->filter['function']}(...$column->filter['condition']);
+ } else {
+ if (count($column->filter['condition']) == 3) {
+ $this->query->{$column->filter['function']}(
+ extract(
+ array_combine(
+ // ['key', 'condition', 'value'],
+ array_fill( //will work with all kind of where conditions
+ 0,
+ (count($column->filter['condition']) - 1),
+ 'array_fill_nikhil'.time()
+ ),
+ $column->filter['condition']
+ )
+ )
+ );
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Function runs when
+ * filters, sort, search
+ * any of it is applied
+ * @return $this->query
+ */
+
+ private function getQueryWithFilters()
+ {
+ $parsed = $this->parse();
+
+ if ($this->aliased) { //aliasing is expected in this case or it will be changed to presence of join bag
+ foreach ($parsed as $key=>$value) {
+ if ($key=="sort") {
+ //resolve the case with the column helper class
+ if(substr_count($key,'_') >= 1)
+ $column_name = str_replace_first('_', '.', $key);
+
+ //case that don't need any resolving
+ $count_keys = count(array_keys($value));
+ if ($count_keys==1) {
+ $this->query->orderBy(
+ str_replace('_', '.', array_keys($value)[0]),
+ array_values($value)[0]
+ );
+ } else {
+ throw new \Exception('Multiple Sort keys Found, Please Resolve the URL Manually.');
+ }
+ } elseif ($key=="search") {
+
+ $count_keys = count(array_keys($value));
+ if($count_keys==1)
+ $this->query->where(function ($query) use ($parsed) {
+ foreach ($this->searchable as $search) {
+ $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
+ }
+ });
+ } else {
+ $column_name = str_replace_first('_', '.', $key);
+
+ if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
+ foreach ($value as $condition => $filter_value) {
+ $this->query->where(
+ $column_name,
+ $this->operators[$condition],
+ '%'.$filter_value.'%'
+ );
+ }
+ } else {
+ foreach ($value as $condition => $filter_value) {
+ $this->query->where(
+ $column_name,
+ $this->operators[$condition],
+ $filter_value
+ );
+ }
+ }
+ }
+ }
+ } else {
+ //this is the case for the non aliasing.
+ foreach ($parsed as $key=>$value) {
+
+ if ($key=="sort") {
+
+ //case that don't need any resolving
+ $count_keys = count(array_keys($value));
+ if ($count_keys==1) {
+
+ $this->query->orderBy(
+ array_keys($value)[0],
+ array_values($value)[0]
+ );
+
+ } else {
+ throw new \Exception('Multiple Sort keys Found, Please Resolve the URL Manually.');
+ }
+ } elseif ($key=="search") {
+
+ $count_keys = count(array_keys($value));
+ if($count_keys==1)
+ $this->query->where(function ($query) use ($parsed) {
+ foreach ($this->searchable as $search) {
+ $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
+ }
+ });
+ else
+ throw new \Exception('Multiple Search keys Found, Please Resolve the URL Manually.');
+
+ } else {
+
+ $column_name = $key;
+
+ if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
+ foreach ($value as $condition => $filter_value) {
+ $this->query->where(
+ $column_name,
+ $this->operators[$condition],
+ '%'.$filter_value.'%'
+ );
+ }
+ } else {
+ foreach ($value as $condition => $filter_value) {
+ $this->query->where(
+ $column_name,
+ $this->operators[$condition],
+ $filter_value
+ );
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+ private function getDbQueryResults()
+ {
+ $parsed = $this->parse();
+
+ if ($this->aliased==true) {
+ //flags
+ $table_alias = false;
+ $join_table_alias = false;
+ $allowed_joins = false;
+ $other_joins = false;
+ $join_good = false;
+
+ //prepare query object
+ $this->query = DB::table($this->table);
+
+ //explode if alias is available
+ if (strpos('.', $this->table)) {
+ throw new \Exception("dot/s cannot be used in table names in mysql");
+ } else {
+ $exploded = explode('as', $this->table);
+ }
+
+ //check whether exploded string still has same table name
+ if ($exploded[0]==$this->table) {
+ $table_alias = false;
+ } else { // (isset($exploded))
+ $table_alias = true;
+ $table_name = trim($exploded[0]);
+ $table_alias = trim($exploded[1]);
+ }
+ //Run this if there are any selects priorly.
+ if (!empty($this->select)) {
+ $this->getSelect();
+ }
+
+ //Run this if there are joins
+ if (!empty($this->join)) {
+ foreach ($this->join as $join) {
+ $name = strtolower($join['join']);
+ //Allow joins i.e left or right
+ if ($name=='leftjoin' || $name=='rightjoin') {
+
+ //check if the aliasing on the primary table and primaryKey in join is also the same
+ $primary_key_alias = trim(explode('.', $join['primaryKey'])[0]);
+
+ if ($primary_key_alias == $table_alias) {
+ $join_table_alias = explode('as', $join['table']);
+ if (isset($join_table_alias)) {
+ $alias1 = trim($join_table_alias[1]); //important!!!!!
+
+ //check if the secondary table match column is not having '.' and has proper alias
+ $secondary_join_column = $join['secondaryKey'];
+ if (isset($secondary_join_column)) {
+ $exploded_secondary = explode('.', $secondary_join_column);
+ $alias2 = trim($exploded_secondary[0]);
+ if ($alias1 == $alias2) {
+ $this->getQueryWithJoin();
+ $alias_proper_secondary = true;
+ } else {
+ throw new \Exception('Aliases of Join table and the secondary key columns do not match');
+ }
+ } else {
+ throw new \Exception('Improper aliasing on secondary/join column for join');
+ }
+ } else {
+ throw new \Exception('Join/Secondary table alias is not found for join');
+ }
+ } else {
+ throw new \Exception('Primary key and primary table aliases do not match for join');
+ }
+ } else {
+ $other_joins = true;
+ throw new \Exception('Please check if there is some fault in your aliasing and do not use as in column names or you might have been using a join that is not allowed i.e cross, inner, etc use left and right join only');
+ }
+ }
+ }
+
+ //Check for column filter bags and resolve aliasing
+ $this->getQueryWithColumnFilters();
+ if (!empty($parsed)) {
+ $this->getQueryWithFilters();
+ }
+ // $this->results = $this->query->get();
+ // return $this->results;
+ $this->results = $this->query->get();
+ $this->results = $this->query->paginate($this->perpage)->appends(request()->except('page'));
+ return $this->results;
+
+ } else {
+
+ $this->query = DB::table($this->table);
+
+ $this->getSelect();
+ $this->getQueryWithColumnFilters();
+ if (!empty($parsed)) {
+ $this->getQueryWithFilters();
+ }
+ $this->results = $this->query->get();
+ $this->results = $this->query->paginate($this->perpage)->appends(request()->except('page'));
+ return $this->results;
+ }
+ }
+
+ /**
+ * @return view
+ */
+
+ public function render()
+ {
+ $this->getDbQueryResults();
+ return view('ui::datagrid.index', [
+ 'css' => $this->css,
+ 'results' => $this->results,
+ 'columns' => $this->columns,
+ 'filterable' =>$this->filterable,
+ 'operators' => $this->operators,
+ 'massoperations' => $this->massoperations,
+ ]);
+ }
+}
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Left.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Left.svg
new file mode 100644
index 000000000..b8dce0f2b
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Left.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right-Light.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right-Light.svg
new file mode 100644
index 000000000..7b38bfe7f
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right-Light.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right.svg
new file mode 100644
index 000000000..52fbccde3
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.png b/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.png
new file mode 100644
index 000000000..5070f117d
Binary files /dev/null and b/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.png differ
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-White-Cross.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-White-Cross.svg
new file mode 100644
index 000000000..77c8ff3cf
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-White-Cross.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/arrow-left-dark.svg b/packages/Webkul/Ui/src/Resources/assets/images/arrow-left-dark.svg
new file mode 100644
index 000000000..fcc05f15b
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/arrow-left-dark.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/arrow-right-light.svg b/packages/Webkul/Ui/src/Resources/assets/images/arrow-right-light.svg
new file mode 100644
index 000000000..7dd02995b
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/arrow-right-light.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/controls.svg b/packages/Webkul/Ui/src/Resources/assets/images/controls.svg
new file mode 100644
index 000000000..53127ff1c
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/controls.svg
@@ -0,0 +1,28 @@
+
+
+
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/offer-zone.svg b/packages/Webkul/Ui/src/Resources/assets/images/offer-zone.svg
deleted file mode 100644
index dc2f60ebd..000000000
--- a/packages/Webkul/Ui/src/Resources/assets/images/offer-zone.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/uvdesk-controls.svg b/packages/Webkul/Ui/src/Resources/assets/images/uvdesk-controls.svg
new file mode 100644
index 000000000..53127ff1c
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/uvdesk-controls.svg
@@ -0,0 +1,28 @@
+
+
+
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/app.js b/packages/Webkul/Ui/src/Resources/assets/js/app.js
index cb6960ea1..81bad1a0d 100644
--- a/packages/Webkul/Ui/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Ui/src/Resources/assets/js/app.js
@@ -6,6 +6,7 @@ Vue.component("tree-item", require("./components/tree-view/tree-item"));
Vue.component("tree-checkbox", require("./components/tree-view/tree-checkbox"));
Vue.component("tree-radio", require("./components/tree-view/tree-radio"));
Vue.component("modal", require("./components/modal"));
+Vue.component("image-upload", require("./components/image/image-upload"));
Vue.component("image-wrapper", require("./components/image/image-wrapper"));
Vue.component("image-item", require("./components/image/image-item"));
Vue.directive("slugify", require("./directives/slugify"));
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/accordian.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/accordian.vue
index c9f25c1f4..8eb6b9510 100644
--- a/packages/Webkul/Ui/src/Resources/assets/js/components/accordian.vue
+++ b/packages/Webkul/Ui/src/Resources/assets/js/components/accordian.vue
@@ -6,7 +6,7 @@
+
+
+
+
+
+
+
+
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 0a3e9cb1f..d305f96bf 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -222,7 +222,7 @@ h2 {
}
tbody td {
- padding: 12px 10px;
+ padding: 10px;
border-bottom: solid 1px #d3d3d3;
color: $font-color;
vertical-align: top;
@@ -236,7 +236,7 @@ h2 {
}
}
}
-
+
tbody tr:last-child td {
border-bottom: none;
}
@@ -635,8 +635,6 @@ h2 {
}
.grid-container {
- margin-top: 30px;
-
.filter-wrapper {
display: block;
box-sizing: border-box;
@@ -685,21 +683,21 @@ h2 {
.dropdown-filters {
display: inline-flex;
- .column-filter {
- margin-right: 5px;
+ // .column-filter {
+ // margin-right: 5px;
- .control {
- font-family: "montserrat", sans-serif;
- padding-left: 5px;
- height: 36px;
- width: 150px;
- border: 2px solid $control-border-color;
- border-radius: 3px;
- background-color: white;
- color: #8e8e8e;
- font-size: 14px;
- }
- }
+ // .control {
+ // font-family: "montserrat", sans-serif;
+ // padding-left: 5px;
+ // height: 36px;
+ // width: 150px;
+ // border: 2px solid $control-border-color;
+ // border-radius: 3px;
+ // background-color: white;
+ // color: #8e8e8e;
+ // font-size: 14px;
+ // }
+ // }
.more-filters {
margin-right: 5px;
@@ -854,7 +852,7 @@ h2 {
}
.table {
thead {
- .xyz {
+ .mass-action-wrapper {
display: flex;
flex-direction: row;
justify-content: flex-start;
@@ -874,15 +872,21 @@ h2 {
}
}
tr {
- th.sort-head {
+ th.grid_head {
+ cursor:pointer;
+
.sort-down-icon {
- margin-left: 8px;
+ margin-left: 5px;
+ margin-top: -3px;
vertical-align: middle;
cursor: pointer;
}
}
}
}
+ .pagination {
+ margin-top:20px;
+ }
}
}
@@ -951,7 +955,6 @@ h2 {
}
}
-
.label {
background: #E7E7E7;
@include border-radius(2px);
@@ -1025,4 +1028,4 @@ h2 {
background-image: none;
}
}
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
index 2e31efb2c..14b94bba6 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
@@ -34,7 +34,7 @@
}
.angle-left-icon {
- background-image: url("../images/Angle-Right.svg");
+ background-image: url("../images/Angle-Left.svg");
width: 17px;
height: 17px;
}
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php
index ce46c2461..868c5906e 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php
@@ -8,14 +8,13 @@
+ ![]()
+
+
+
+
+
+
+
-
-