Merge branch 'master' into dummy-skeleton

devansh-webkul · Sep 26, 2023 · 3996a59 · 3996a59
2 parents c6c1027 + 20cd1ce
commit 3996a59
Show file tree

Hide file tree

Showing 123 changed files with 1,996 additions and 2,018 deletions.
diff --git a/.rr.yaml b/.rr.yaml
diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php
@@ -90,6 +90,16 @@
         'name'  => 'admin::app.acl.create',
         'route' => 'admin.sales.refunds.create',
         'sort'  => 2,
+    ], [
+        'key'   => 'sales.transactions',
+        'name'  => 'admin::app.acl.transactions',
+        'route' => 'admin.sales.transactions.index',
+        'sort'  => 5,
+    ],[
+        'key'   => 'sales.transactions.view',
+        'name'  => 'admin::app.acl.view',
+        'route' => 'admin.sales.transactions.view',
+        'sort'  => 1,
     ],
 
     /*

diff --git a/packages/Webkul/Admin/src/DataGrids/Customers/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Customers/AddressDataGrid.php
@@ -164,23 +164,27 @@ public function prepareColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'icon'   => 'icon-edit',
-            'title'  => trans('admin::app.customers.addresses.datagrid.edit'),
-            'method' => 'GET',
-            'url'    => function ($row) {
-                return route('admin.customers.customers.addresses.edit', $row->address_id);
-            },
-        ]);
-
-        $this->addAction([
-            'icon'   => 'icon-delete',
-            'title'  => trans('admin::app.customers.addresses.datagrid.delete'),
-            'method' => 'POST',
-            'url'    => function ($row) {
-                return route('admin.customers.customers.addresses.delete', $row->address_id);
-            },
-        ]);
+        if (bouncer()->hasPermission('customers.addresses.edit')) {
+            $this->addAction([
+                'icon'   => 'icon-edit',
+                'title'  => trans('admin::app.customers.addresses.datagrid.edit'),
+                'method' => 'GET',
+                'url'    => function ($row) {
+                    return route('admin.customers.customers.addresses.edit', $row->address_id);
+                },
+            ]);
+        }
+
+        if (bouncer()->hasPermission('customers.addresses.delete')) {
+            $this->addAction([
+                'icon'   => 'icon-delete',
+                'title'  => trans('admin::app.customers.addresses.datagrid.delete'),
+                'method' => 'POST',
+                'url'    => function ($row) {
+                    return route('admin.customers.customers.addresses.delete', $row->address_id);
+                },
+            ]);
+        }
     }
 
     /**

diff --git a/packages/Webkul/Admin/src/DataGrids/Customers/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Customers/CustomerDataGrid.php
@@ -212,26 +212,30 @@ public function prepareActions()
      */
     public function prepareMassActions()
     {
-        $this->addMassAction([
-            'title'  => trans('admin::app.customers.customers.index.datagrid.delete'),
-            'method' => 'POST',
-            'url'    => route('admin.customers.customers.mass_delete'),
-        ]);
-
-        $this->addMassAction([
-            'title'   => trans('admin::app.customers.customers.index.datagrid.update-status'),
-            'method'  => 'POST',
-            'url'     => route('admin.customers.customers.mass_update'),
-            'options' => [
-                [
-                    'name' => trans('admin::app.customers.customers.index.datagrid.active'),
-                    'value' => 1,
+        if (bouncer()->hasPermission('customers.customers.mass-delete')) {
+            $this->addMassAction([
+                'title'  => trans('admin::app.customers.customers.index.datagrid.delete'),
+                'method' => 'POST',
+                'url'    => route('admin.customers.customers.mass_delete'),
+            ]);
+        }
+
+        if (bouncer()->hasPermission('customers.customers.mass-update')) {
+            $this->addMassAction([
+                'title'   => trans('admin::app.customers.customers.index.datagrid.update-status'),
+                'method'  => 'POST',
+                'url'     => route('admin.customers.customers.mass_update'),
+                'options' => [
+                    [
+                        'name' => trans('admin::app.customers.customers.index.datagrid.active'),
+                        'value' => 1,
+                    ],
+                    [
+                        'name' => trans('admin::app.customers.customers.index.datagrid.inactive'),
+                        'value' => 0,
+                    ],
                 ],
-                [
-                    'name' => trans('admin::app.customers.customers.index.datagrid.inactive'),
-                    'value' => 0,
-                ],
-            ],
-        ]);
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/Customers/ReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Customers/ReviewDataGrid.php
@@ -172,30 +172,34 @@ public function prepareActions()
      */
     public function prepareMassActions()
     {
-        $this->addMassAction([
-            'title'  => trans('admin::app.customers.reviews.index.datagrid.delete'),
-            'url'    => route('admin.customers.customers.review.mass_delete'),
-            'method' => 'POST',
-        ]);
+        if (bouncer()->hasPermission('customers.reviews.mass-delete')) {
+            $this->addMassAction([
+                'title'  => trans('admin::app.customers.reviews.index.datagrid.delete'),
+                'url'    => route('admin.customers.customers.review.mass_delete'),
+                'method' => 'POST',
+            ]);
+        }
 
-        $this->addMassAction([
-            'title'   => trans('admin::app.customers.reviews.index.datagrid.update-status'),
-            'method'  => 'POST',
-            'url'     => route('admin.customers.customers.review.mass_update'),
-            'options' => [
-                [
-                    'name' => trans('admin::app.customers.reviews.index.datagrid.pending'),
-                    'value' => 'pending',
-                ],
-                [
-                    'name' => trans('admin::app.customers.reviews.index.datagrid.approved'),
-                    'value' => 'approved',
+        if (bouncer()->hasPermission('customers.reviews.mass-update')) {
+            $this->addMassAction([
+                'title'   => trans('admin::app.customers.reviews.index.datagrid.update-status'),
+                'method'  => 'POST',
+                'url'     => route('admin.customers.customers.review.mass_update'),
+                'options' => [
+                    [
+                        'name' => trans('admin::app.customers.reviews.index.datagrid.pending'),
+                        'value' => 'pending',
+                    ],
+                    [
+                        'name' => trans('admin::app.customers.reviews.index.datagrid.approved'),
+                        'value' => 'approved',
+                    ],
+                    [
+                        'name' => trans('admin::app.customers.reviews.index.datagrid.disapproved'),
+                        'value' => 'disapproved',
+                    ],
                 ],
-                [
-                    'name' => trans('admin::app.customers.reviews.index.datagrid.disapproved'),
-                    'value' => 'disapproved',
-                ],
-            ],
-        ]);
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/Sales/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Sales/OrderDataGrid.php
@@ -192,13 +192,15 @@ public function prepareColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'icon'   => 'icon-view',
-            'title'  => trans('admin::app.sales.orders.index.datagrid.view'),
-            'method' => 'GET',
-            'url'    => function ($row) {
-                return route('admin.sales.orders.view', $row->id);
-            },
-        ]);
+        if (bouncer()->hasPermission('sales.orders.view')) {
+            $this->addAction([
+                'icon'   => 'icon-view',
+                'title'  => trans('admin::app.sales.orders.index.datagrid.view'),
+                'method' => 'GET',
+                'url'    => function ($row) {
+                    return route('admin.sales.orders.view', $row->id);
+                },
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/Sales/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Sales/OrderInvoicesDataGrid.php
@@ -109,13 +109,15 @@ public function prepareColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'icon'   => 'icon-view',
-            'title'  => trans('admin::app.sales.invoices.index.datagrid.view'),
-            'method' => 'GET',
-            'url'    => function ($row) {
-                return route('admin.sales.invoices.view', $row->id);
-            },
-        ]);
+        if (bouncer()->hasPermission('sales.invoices.view')) {
+            $this->addAction([
+                'icon'   => 'icon-view',
+                'title'  => trans('admin::app.sales.invoices.index.datagrid.view'),
+                'method' => 'GET',
+                'url'    => function ($row) {
+                    return route('admin.sales.invoices.view', $row->id);
+                },
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/Sales/OrderRefundDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Sales/OrderRefundDataGrid.php
@@ -100,13 +100,15 @@ public function prepareColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'icon'   => 'icon-view',
-            'title'  => trans('admin::app.sales.refunds.index.datagrid.view'),
-            'method' => 'GET',
-            'url'    => function ($row) {
-                return route('admin.sales.refunds.view', $row->id);
-            },
-        ]);
+        if (bouncer()->hasPermission('sales.refunds.view')) {
+            $this->addAction([
+                'icon'   => 'icon-view',
+                'title'  => trans('admin::app.sales.refunds.index.datagrid.view'),
+                'method' => 'GET',
+                'url'    => function ($row) {
+                    return route('admin.sales.refunds.view', $row->id);
+                },
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/Sales/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Sales/OrderShipmentsDataGrid.php
@@ -128,13 +128,15 @@ public function prepareColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'icon'   => 'icon-view',
-            'title'  => trans('admin::app.sales.shipments.index.datagrid.view'),
-            'method' => 'GET',
-            'url'    => function ($row) {
-                return route('admin.sales.shipments.view', $row->shipment_id);
-            },
-        ]);
+        if (bouncer()->hasPermission('sales.shipments.view')) {
+            $this->addAction([
+                'icon'   => 'icon-view',
+                'title'  => trans('admin::app.sales.shipments.index.datagrid.view'),
+                'method' => 'GET',
+                'url'    => function ($row) {
+                    return route('admin.sales.shipments.view', $row->shipment_id);
+                },
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/Sales/OrderTransactionsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Sales/OrderTransactionsDataGrid.php
@@ -113,13 +113,15 @@ public function prepareColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'icon'   => 'icon-view',
-            'title'  => trans('admin::app.sales.transactions.index.datagrid.view'),
-            'method' => 'GET',
-            'url'    => function ($row) {
-                return route('admin.sales.transactions.view', $row->id);
-            },
-        ]);
+        if (bouncer()->hasPermission('sales.shipments.view')) {
+            $this->addAction([
+                'icon'   => 'icon-view',
+                'title'  => trans('admin::app.sales.transactions.index.datagrid.view'),
+                'method' => 'GET',
+                'url'    => function ($row) {
+                    return route('admin.sales.transactions.view', $row->id);
+                },
+            ]);
+        }
     }
 }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Catalog/ProductController.php b/packages/Webkul/Admin/src/Http/Controllers/Catalog/ProductController.php
@@ -347,12 +347,14 @@ public function search()
         $results = [];
 
         request()->query->add([
-            'name'  => request('query'),
-            'sort'  => 'created_at',
-            'order' => 'desc',
+            'status'               => null,
+            'visible_individually' => null,
+            'name'                 => request('query'),
+            'sort'                 => 'created_at',
+            'order'                => 'desc',
         ]);
 
-        $products = $this->productRepository->getAll();
+        $products = $this->productRepository->searchFromDatabase();
 
         foreach ($products as $product) {
             $results[] = [

diff --git a/packages/Webkul/Admin/src/Http/Resources/AttributeResource.php b/packages/Webkul/Admin/src/Http/Resources/AttributeResource.php
@@ -18,7 +18,7 @@ public function toArray($request)
             'id'      => $this->id,
             'code'    => $this->code,
             'type'    => $this->type,
-            'name'    => $this->name ?? $this->admin_name,
+            'name'    => $this->admin_name,
             'options' => AttributeOptionResource::collection($this->options),
         ];
     }

diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js
@@ -15,12 +15,12 @@ import { createApp } from "vue/dist/vue.esm-bundler";
 import { configure, defineRule } from "vee-validate";
 import { localize } from "@vee-validate/i18n";
 import en from "@vee-validate/i18n/dist/locale/en.json";
-import AllRules from "@vee-validate/rules";
+import * as AllRules from '@vee-validate/rules';
 
 /**
  * Registration of all global validators.
  */
-Object.keys(AllRules).forEach((rule) => {
+Object.keys(AllRules).forEach(rule => {
     defineRule(rule, AllRules[rule]);
 });