From 20247136a045c4788c60f8350659e21fb1669702 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 11 Mar 2019 18:39:42 +0530 Subject: [PATCH] disabled side menu toggle for admin, created configuration for product types --- README.md | 2 ++ config/product_types.php | 7 ++++ .../Admin/src/Resources/assets/sass/app.scss | 36 ++++++++++++++++++- .../views/catalog/products/create.blade.php | 8 ++--- .../views/layouts/nav-aside.blade.php | 25 ++++++------- .../views/layouts/nav-left.blade.php | 4 +-- .../Product/src/Config/product_types.php | 14 ++++++++ .../src/Providers/ProductServiceProvider.php | 24 +++++++++++++ .../Webkul/Ui/src/Resources/lang/en/app.php | 1 + .../Resources/views/datagrid/table.blade.php | 2 +- 10 files changed, 101 insertions(+), 22 deletions(-) create mode 100644 config/product_types.php create mode 100644 packages/Webkul/Product/src/Config/product_types.php diff --git a/README.md b/README.md index 342bd9d6f..5dd7cf88f 100755 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ to the ever demanding online world. Your business whether small or huge it suits **We are also having a forum for any type of your concern, feature request discussions. Please visit: [Bagisto Forums](https://forums.bagisto.com/)** +# Visit our live [Demo](https://demo.bagisto.com) + It packs in lots of demanding features that allows your business to scale in no time: * Multiple Channels, Locale, Currencies. diff --git a/config/product_types.php b/config/product_types.php new file mode 100644 index 000000000..86897f513 --- /dev/null +++ b/config/product_types.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index ae9d0ef91..928aae61d 100755 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -93,8 +93,42 @@ body { } } +.open-nav-aside { + display: none; + width: 100%; + height: 8%; + margin-top: 2%; + padding: 5px; + text-align: center; + border: 1px solid $border-color; + cursor: pointer; +} + +.close-nav-aside { + display: block; + width: 100%; + height: 8%; + margin-top: 3%; + padding: 10px; + text-align: center; + border: 1px solid $border-color; + cursor: pointer; +} + +.close-nav-aside:hover, .open-nav-aside:hover { + background: $brand-color; +} + +.open-nav-aside, .close-nav-aside { + .icon { + height: 28px; + width: 28px; + } +} + .navbar-left { - position: absolute; + display: block; + position: fixed; top: 60px; bottom: 0; width: 90px; diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php index 3eb371183..6ff023a32 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php @@ -27,7 +27,7 @@

- + {{ __('admin::app.catalog.products.add-title') }}

@@ -44,7 +44,6 @@ input('family') ?> input('sku') ?> - {!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.before') !!} @@ -55,8 +54,9 @@
@if ($familyId) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php index 2bad63d38..d704292e9 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php @@ -1,8 +1,5 @@
    - {{--
  • - -
    • --}} @if (request()->route()->getName() != 'admin.configuration.index') currentKey); ?> @@ -32,25 +29,25 @@ @endif
-
- -
+ {{--
+ +
--}}
-@push('scripts') +{{-- @push('scripts') -@endpush \ No newline at end of file +@endpush --}} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php index 1144941fe..dfc328ee3 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php @@ -11,7 +11,7 @@ @endforeach -
- +
+
\ No newline at end of file diff --git a/packages/Webkul/Product/src/Config/product_types.php b/packages/Webkul/Product/src/Config/product_types.php new file mode 100644 index 000000000..004edb0bd --- /dev/null +++ b/packages/Webkul/Product/src/Config/product_types.php @@ -0,0 +1,14 @@ + 'simple', + 'name' => 'Simple', + 'sort' => 1 + + ], [ + 'key' => 'configurable', + 'name' => 'Configurable', + 'sort' => 2 + ] +]; \ No newline at end of file diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php index 3f80a89cd..06ad2de3a 100755 --- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php +++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php @@ -21,6 +21,8 @@ class ProductServiceProvider extends ServiceProvider $this->app->register(EventServiceProvider::class); $this->app->register(ModuleServiceProvider::class); + + $this->composeView(); } /** @@ -30,6 +32,28 @@ class ProductServiceProvider extends ServiceProvider */ public function register() { + $this->registerConfig(); + } + public function registerConfig() { + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/product_types.php', 'product_types' + ); + } + + public function composeView() { + view()->composer(['admin::catalog.products.create'], function ($view) { + $items = array(); + + foreach (config('product_types') as $item) { + $item['children'] = []; + + array_push($items, $item); + } + + $types = core()->sortItems($items); + + $view->with('productTypes', $types); + }); } } \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/lang/en/app.php b/packages/Webkul/Ui/src/Resources/lang/en/app.php index a2ab994e2..a428950f7 100755 --- a/packages/Webkul/Ui/src/Resources/lang/en/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/en/app.php @@ -11,6 +11,7 @@ return [ 'edit' => 'Do you really want to edit this :resource?', ], + 'zero-index' => 'Index columns can have values greater than zero only', 'no-records' => 'No Records Found', 'filter-fields-missing' => 'Some of the required field is null, please check column, condition and value properly', 'click_on_action' => 'Do you really want to perform this action?', diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index a3d798a3e..f3dc2a75d 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -338,7 +338,7 @@ if (this.filterIndex == this.columnOrAlias && (this.numberValue == 0 || this.numberValue < 0)) { indexConditions = false; - alert('index columns can have values greater than zero only'); + alert('{{__('ui::app.datagrid.zero-index')}}'); } if(indexConditions)