Merge pull request #352 from bagisto/jitendra

Jitendra
2018-12-20 18:27:04 +05:30 · 2018-12-20 18:27:04 +05:30 · d723ca77ba
parent 2d28969518 8b18b78663
commit d723ca77ba
17 changed files with 103 additions and 25 deletions
--- a/packages/Webkul/Admin/publishable/assets/js/admin.js
+++ b/packages/Webkul/Admin/publishable/assets/js/admin.js
--- a/packages/Webkul/Admin/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Admin/publishable/assets/mix-manifest.json
@ -1,4 +1,4 @@
 {
-    "/js/admin.js": "/js/admin.js?id=b77265f25dc2a33a4bb3",
+    "/js/admin.js": "/js/admin.js?id=c70dacdf945a32e04b77",
    "/css/admin.css": "/css/admin.css?id=ccb086d72702e662082e"
-}
+}
--- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
+++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
@ -35,6 +35,8 @@ class AdminServiceProvider extends ServiceProvider

        $this->composeView();

+        $this->registerACL();
+
        $this->app->register(EventServiceProvider::class);

        $this->app->bind(
@ -87,17 +89,44 @@ class AdminServiceProvider extends ServiceProvider
        });

        view()->composer(['admin::users.roles.create', 'admin::users.roles.edit'], function ($view) {
-            $tree = Tree::create();
-
-            foreach(config('acl') as $item) {
-                $tree->add($item);
-            }
-
-            $tree->items = core()->sortItems($tree->items);
-
-            $view->with('acl', $tree);
+            $view->with('acl', $this->createACL());
        });
    }
+
+    /**
+     * Registers acl to entire application
+     *
+     * @return void
+     */
+    public function registerACL()
+    {
+        $this->app->singleton('acl', function () {
+            return $this->createACL();
+        });
+    }
+
+    /**
+     * Create acl tree
+     *
+     * @return mixed
+     */
+    public function createACL()
+    {
+        static $tree;
+
+        if($tree)
+            return $tree;
+
+        $tree = Tree::create();
+
+        foreach(config('acl') as $item) {
+            $tree->add($item, 'acl');
+        }
+
+        $tree->items = core()->sortItems($tree->items);
+
+        return $tree;
+    }
    
    /**
     * Register package config.
--- a/packages/Webkul/Core/src/Tree.php
+++ b/packages/Webkul/Core/src/Tree.php
@ -19,6 +19,13 @@ class Tree {
     */
 	public $items = [];

+    /**
+     * Contains acl roles
+     *
+     * @var array
+     */
+	public $roles = [];
+
    /**
     * Contains current item route
     *
@ -74,11 +81,14 @@ class Tree {
 			if (strpos($this->current, $item['url']) !== false) {
 				$this->currentKey = $item['key'];
 			}
+		} else if ($type == 'acl') {
+			$this->roles[$item['route']] = $item['key'];
 		}

 		$children = str_replace('.', '.children.', $item['key']);

 		core()->array_set($this->items, $children, $item);
+
 	}

 	/**
--- a/packages/Webkul/Shipping/src/Config/system.php
+++ b/packages/Webkul/Shipping/src/Config/system.php
@ -61,6 +61,26 @@ return [
                'type' => 'textarea',
                'channel_based' => true,
                'locale_based' => false
+            ], [
+                'name' => 'default_rate',
+                'title' => 'Rate',
+                'type' => 'text',
+                'channel_based' => true,
+                'locale_based' => false
+            ], [
+                'name' => 'type',
+                'title' => 'Type',
+                'type' => 'select',
+                'options' => [
+                    [
+                        'title' => 'Per Unit',
+                        'value' => 'Per Order'
+                    ], [
+                        'title' => 'Inactive',
+                        'value' => 'per_order'
+                    ]
+                ],
+                'validation' => 'required'
            ], [
                'name' => 'active',
                'title' => 'Status',
--- a/packages/Webkul/Shop/publishable/assets/css/shop.css
+++ b/packages/Webkul/Shop/publishable/assets/css/shop.css
--- a/packages/Webkul/Shop/publishable/assets/js/shop.js
+++ b/packages/Webkul/Shop/publishable/assets/js/shop.js
--- a/packages/Webkul/Shop/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Shop/publishable/assets/mix-manifest.json
@ -1,4 +1,4 @@
 {
-    "/js/shop.js": "/js/shop.js?id=c6ba9f43bd31f175a665",
-    "/css/shop.css": "/css/shop.css?id=44608a4ce1658811733f"
+    "/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089",
+    "/css/shop.css": "/css/shop.css?id=7c64b6577e4bcb5b03ee"
 }
--- a/packages/Webkul/Shop/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js
@ -17,6 +17,10 @@ $(document).ready(function () {
    const app = new Vue({
        el: "#app",

+        data: {
+            modalIds: {}
+        },
+
        mounted: function () {
            this.addServerErrors();
            this.addFlashMessages();
@ -79,7 +83,11 @@ $(document).ready(function () {
                }, this);
            },

-            responsiveHeader: function () { }
+            responsiveHeader: function () { },
+
+            showModal(id) {
+                this.$set(this.modalIds, id, true);
+            }
        }
    });
 });
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@ -334,6 +334,10 @@ input {
    justify-content: center;
 }

+.grid-container {
+    margin-top: 20px;
+}
+
 //main store front layouting
 .main-container-wrapper {
    max-width: 1300px;
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@ -101,6 +101,8 @@

    {!! view_render_event('bagisto.shop.layout.body.after') !!}

+    <div class="modal-overlay"></div>
+
 </body>

 </html>
--- a/packages/Webkul/Shop/webpack.mix.js
+++ b/packages/Webkul/Shop/webpack.mix.js
@ -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();
--- a/packages/Webkul/Ui/publishable/assets/css/ui.css
+++ b/packages/Webkul/Ui/publishable/assets/css/ui.css
--- a/packages/Webkul/Ui/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Ui/publishable/assets/mix-manifest.json
@ -1,4 +1,4 @@
 {
    "/js/ui.js": "/js/ui.js?id=1fdce572fb02cd8c7dad",
-    "/css/ui.css": "/css/ui.css?id=287b4588ed3ee39d4587"
+    "/css/ui.css": "/css/ui.css?id=8d57ae10a97f50169f1f"
 }
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@ -709,6 +709,11 @@ h2 {
    }
 }

+
+modal {
+    display: none;
+}
+
 .modal-open {
    overflow: hidden;
 }
--- a/packages/Webkul/Ui/webpack.mix.js
+++ b/packages/Webkul/Ui/webpack.mix.js
@ -1,8 +1,8 @@
 const { mix } = require("laravel-mix");
 require("laravel-mix-merge-manifest");

-// var publicPath = 'publishable/assets';
-var publicPath = "../../../public/vendor/webkul/ui/assets";
+var publicPath = 'publishable/assets';
+// var publicPath = "../../../public/vendor/webkul/ui/assets";

 mix.setPublicPath(publicPath).mergeManifest();
 mix.disableNotifications();
--- a/packages/Webkul/User/src/Http/Middleware/Bouncer.php
+++ b/packages/Webkul/User/src/Http/Middleware/Bouncer.php
@ -29,10 +29,10 @@ class Bouncer

    public function checkIfAuthorized($request)
    {
-        if(!$role = auth()->guard('admin')->user()->role)
+        if (!$role = auth()->guard('admin')->user()->role)
            abort(401, 'This action is unauthorized.');

-        if($role->permission_type == 'all'){
+        if ($role->permission_type == 'all') {
            return;
        } else {
            $acl = app('acl');