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

Warehouse refactorred

Author: benjpaddock

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=a6b855125755ab112c96e86c75888210",
+    "/css/admin.css": "/css/admin.css?id=64b4db95cdc3c7ea70cb6bd4754a7215",
     "/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

@@ -30,9 +30,4 @@
         '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

@@ -219,13 +219,6 @@
         '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',

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

@@ -31,7 +31,7 @@ public function __construct()
                             'key'      => 'all',
                         ],
                     ],
-                    collect(config('attribute_entity_types'))->except('locations')->map(function ($entityType, $key) {
+                    collect(config('attribute_entity_types'))->map(function ($entityType, $key) {
                         return [
                             'name'     => trans($entityType['name']),
                             'isActive' => false,

packages/Webkul/Admin/src/DataGrids/Setting/AttributeDataGrid.php

@@ -3,6 +3,7 @@
 namespace Webkul\Admin\Http\Controllers\Setting;
 
 use Illuminate\Support\Facades\Event;
+use Prettus\Repository\Criteria\RequestCriteria;
 use Webkul\Attribute\Http\Requests\AttributeForm;
 use Webkul\Admin\DataGrids\Setting\LocationDataGrid;
 use Webkul\Admin\Http\Controllers\Controller;
@@ -17,31 +18,20 @@ class LocationController extends Controller
      */
     public function __construct(protected LocationRepository $locationRepository)
     {
-        request()->request->add(['entity_type' => 'locations']);
     }
 
     /**
-     * Display a listing of the resource.
+     * Search location results
      *
-     * @return \Illuminate\View\View
+     * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function search()
     {
-        if (request()->ajax()) {
-            return app(LocationDataGrid::class)->toJson();
-        }
-
-        return view('admin::settings.locations.index');
-    }
+        $results = $this->locationRepository
+            ->pushCriteria(app(RequestCriteria::class))
+            ->all();
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function create()
-    {
-        return view('admin::settings.locations.create');
+        return response()->json($results);
     }
 
     /**
@@ -58,48 +48,9 @@ public function store(AttributeForm $request)
 
         Event::dispatch('settings.location.create.after', $location);
 
-        if (request()->ajax()) {
-            return response()->json([
-                'message' => trans('admin::app.locations.create-success'),
-            ]);
-        }
-
-        session()->flash('success', trans('admin::app.locations.create-success'));
-
-        return redirect()->route('admin.settings.locations.index');
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\View\View
-     */
-    public function edit($id)
-    {
-        $location = $this->locationRepository->findOrFail($id);
-
-        return view('admin::settings.locations.edit', compact('location'));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param \Webkul\Attribute\Http\Requests\AttributeForm $request
-     * @param int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(AttributeForm $request, $id)
-    {
-        Event::dispatch('settings.location.update.before', $id);
-
-        $location = $this->locationRepository->update(request()->all(), $id);
-
-        Event::dispatch('settings.location.update.after', $location);
-
-        session()->flash('success', trans('admin::app.locations.update-success'));
-
-        return redirect()->route('admin.settings.locations.index');
+        return response()->json([
+            'message' => trans('admin::app.locations.create-success'),
+        ]);
     }
 
     /**
@@ -128,18 +79,4 @@ public function destroy($id)
             ], 400);
         }
     }
-
-    /**
-     * Search location results
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function search()
-    {
-        $results = $this->locationRepository->findWhere([
-            ['name', 'like', '%' . urldecode(request()->input('query')) . '%']
-        ]);
-
-        return response()->json($results);
-    }
 }