Merge pull request #1274 from jitendra-webkul/warehouse-managemet

Warehouse management

Author: benjpaddock

composer.json

@@ -65,6 +65,7 @@
             "Webkul\\Tag\\": "packages/Webkul/Tag/src",
             "Webkul\\UI\\": "packages/Webkul/UI/src",
             "Webkul\\User\\": "packages/Webkul/User/src",
+            "Webkul\\Warehouse\\": "packages/Webkul/Warehouse/src",
             "Webkul\\WebForm\\": "packages/Webkul/WebForm/src",
             "Webkul\\Workflow\\": "packages/Webkul/Workflow/src"
         }
@@ -88,4 +89,4 @@
             "@php artisan key:generate --ansi"
         ]
     }
-}
+}

config/app.php

@@ -239,6 +239,7 @@
         Webkul\Tag\Providers\TagServiceProvider::class,
         Webkul\UI\Providers\UIServiceProvider::class,
         Webkul\User\Providers\UserServiceProvider::class,
+        Webkul\Warehouse\Providers\WarehouseServiceProvider::class,
         Webkul\WebForm\Providers\WebFormServiceProvider::class,
         Webkul\Workflow\Providers\WorkflowServiceProvider::class,
     ],

config/concord.php

@@ -15,6 +15,7 @@
         \Webkul\Tag\Providers\ModuleServiceProvider::class,
         \Webkul\UI\Providers\ModuleServiceProvider::class,
         \Webkul\User\Providers\ModuleServiceProvider::class,
+        \Webkul\Warehouse\Providers\ModuleServiceProvider::class,
         \Webkul\WebForm\Providers\ModuleServiceProvider::class,
         \Webkul\Workflow\Providers\ModuleServiceProvider::class,
     ],

packages/Webkul/Activity/src/Providers/ActivityServiceProvider.php

@@ -3,7 +3,6 @@
 namespace Webkul\Activity\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Foundation\AliasLoader;
 use Illuminate\Routing\Router;
 
 class ActivityServiceProvider extends ServiceProvider
@@ -17,13 +16,4 @@ public function boot(Router $router)
     {
         $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
     }
-
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
 }

packages/Webkul/Admin/publishable/assets/css/admin.css

@@ -1,6 +1,6 @@
 {
     "/js/admin.js": "/js/admin.js?id=ded43dfc84d1a6b469709c56aeee570a",
-    "/css/admin.css": "/css/admin.css?id=16ecd198f0b86192d409eb3bac6fa3b8",
+    "/css/admin.css": "/css/admin.css?id=a6b855125755ab112c96e86c75888210",
     "/images/activities-active-icon.svg": "/images/activities-active-icon.svg?id=f7887e3fdcddf68567ceca8facc1e40e",
     "/images/activities-icon.svg": "/images/activities-icon.svg?id=0755224d86e0281d031f938b2aa1d610",
     "/images/attribute-icon.svg": "/images/attribute-icon.svg?id=8f9f3e0e90496263403fc26efef8614d",

packages/Webkul/Admin/publishable/assets/mix-manifest.json

@@ -2,27 +2,37 @@
 
 return [
     'leads'         => [
-        'name'       => 'Lead',
+        'name'       => 'admin::app.leads.title',
         'repository' => 'Webkul\Lead\Repositories\LeadRepository',
     ],
 
     'persons'       => [
-        'name'       => 'Person',
+        'name'       => 'admin::app.contacts.persons.title',
         'repository' => 'Webkul\Contact\Repositories\PersonRepository',
     ],
 
     'organizations' => [
-        'name'       => 'Organization',
+        'name'       => 'admin::app.contacts.organizations.title',
         'repository' => 'Webkul\Contact\Repositories\OrganizationRepository',
     ],
 
     'products'      => [
-        'name'       => 'Product',
+        'name'       => 'admin::app.products.title',
         'repository' => 'Webkul\Product\Repositories\ProductRepository',
     ],
 
     'quotes'      => [
-        'name'       => 'Quote',
+        'name'       => 'admin::app.quotes.title',
         'repository' => 'Webkul\Quote\Repositories\QuoteRepository',
     ],
+
+    'warehouses'      => [
+        'name'       => 'admin::app.settings.warehouses.title',
+        'repository' => 'Webkul\Warehouse\Repositories\WarehouseRepository',
+    ],
+
+    'locations'      => [
+        'name'       => 'admin::app.settings.locations.title',
+        'repository' => 'Webkul\Warehouse\Repositories\LocationRepository',
+    ],
 ];

packages/Webkul/Admin/src/Config/attribute_entity_types.php

@@ -40,5 +40,15 @@
     'persons' => [
         'name'         => 'Persons',
         'repository'   => 'Webkul\Contact\Repositories\PersonRepository',
-    ]
+    ],
+
+    'warehouses' => [
+        'name'         => 'Warehouses',
+        'repository'   => 'Webkul\Warehouse\Repositories\WarehouseRepository',
+    ],
+
+    'locations' => [
+        'name'         => 'Locations',
+        'repository'   => 'Webkul\Warehouse\Repositories\LocationRepository',
+    ],
 ];

packages/Webkul/Admin/src/Config/attribute_lookups.php

@@ -1,25 +1,43 @@
 <?php
 
 return [
+    /**
+     * Dashboard.
+     */
     [
         'key'        => 'dashboard',
         'name'       => 'admin::app.layouts.dashboard',
         'route'      => 'admin.dashboard.index',
         'sort'       => 1,
         'icon-class' => 'dashboard-icon',
-    ], [
+    ],
+
+    /**
+     * Leads.
+     */
+    [
         'key'        => 'leads',
         'name'       => 'admin::app.layouts.leads',
         'route'      => 'admin.leads.index',
         'sort'       => 2,
         'icon-class' => 'leads-icon',
-    ], [
+    ],
+
+    /**
+     * Quotes.
+     */
+    [
         'key'        => 'quotes',
         'name'       => 'admin::app.layouts.quotes',
         'route'      => 'admin.quotes.index',
         'sort'       => 3,
         'icon-class' => 'quotes-icon',
-    ], [
+    ],
+
+    /**
+     * Emails.
+     */
+    [
         'key'        => 'mail',
         'name'       => 'admin::app.layouts.mail.title',
         'route'      => 'admin.mail.index',
@@ -68,13 +86,30 @@
         'params'     => ['route' => 'trash'],
         'sort'       => 5,
         'icon-class' => '',
-    ], [
+    ],
+    // , [
+    //     'key'        => 'mail.setting',
+    //     'name'       => 'admin::app.layouts.mail.setting',
+    //     'route'      => 'admin.mail.index',
+    //     'params'     => ['route' => 'setting'],
+    //     'sort'       => 5,
+    // ]
+
+    /**
+     * Activities.
+     */
+    [
         'key'        => 'activities',
         'name'       => 'admin::app.layouts.activities',
         'route'      => 'admin.activities.index',
         'sort'       => 5,
         'icon-class' => 'activities-icon',
-    ], [
+    ],
+
+    /**
+     * Contacts.
+     */
+    [
         'key'        => 'contacts',
         'name'       => 'admin::app.layouts.contacts',
         'route'      => 'admin.contacts.persons.index',
@@ -92,13 +127,23 @@
         'route'      => 'admin.contacts.organizations.index',
         'sort'       => 2,
         'icon-class' => '',
-    ], [
+    ],
+
+    /**
+     * Products.
+     */
+    [
         'key'        => 'products',
         'name'       => 'admin::app.layouts.products',
         'route'      => 'admin.products.index',
         'sort'       => 7,
         'icon-class' => 'products-icon',
-    ], [
+    ],
+
+    /**
+     * Settings.
+     */
+    [
         'key'        => 'settings',
         'name'       => 'admin::app.layouts.settings',
         'route'      => 'admin.settings.index',
@@ -160,6 +205,27 @@
         'route'      => 'admin.settings.types.index',
         'sort'       => 3,
         'icon-class' => 'type-icon',
+    ], [
+        'key'        => 'settings.warehouse',
+        'name'       => 'admin::app.layouts.warehouse',
+        'info'       => 'admin::app.layouts.warehouses-info',
+        'route'      => 'admin.settings.pipelines.index',
+        'icon-class' => '',
+        'sort'       => 2,
+    ], [
+        'key'        => 'settings.warehouse.warehouses',
+        'name'       => 'admin::app.layouts.warehouses',
+        'info'       => 'admin::app.layouts.warehouses-info',
+        'route'      => 'admin.settings.warehouses.index',
+        'sort'       => 1,
+        'icon-class' => 'pipeline-icon',
+    ], [
+        'key'        => 'settings.warehouse.locations',
+        'name'       => 'admin::app.layouts.locations',
+        'info'       => 'admin::app.layouts.locations-info',
+        'route'      => 'admin.settings.locations.index',
+        'sort'       => 2,
+        'icon-class' => 'source-icon',
     ], [
         'key'        => 'settings.automation',
         'name'       => 'admin::app.layouts.automation',
@@ -202,7 +268,12 @@
         'route'      => 'admin.settings.tags.index',
         'sort'       => 1,
         'icon-class' => 'tag-icon',
-    ], [
+    ],
+
+    /**
+     * Configuration.
+     */
+    [
         'key'        => 'configuration',
         'name'       => 'admin::app.layouts.configuration',
         'route'      => 'admin.configuration.index',

packages/Webkul/Admin/src/Config/menu.php

@@ -266,7 +266,7 @@ public function prepareActions()
             'title'        => trans('ui::app.datagrid.delete'),
             'method'       => 'DELETE',
             'route'        => 'admin.activities.delete',
-            'confirm_text' => trans('ui::app.datagrid.massaction.delete'),
+            'confirm_text' => trans('ui::app.datagrid.mass-action.delete'),
             'icon'         => 'trash-icon',
         ]);
     }