Merge pull request #4599 from devansh-webkul/issue-4592

Fixed layout issues on front end #4592 and Datagrid issue #4596

packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php

@@ -2,8 +2,8 @@
 
 namespace Webkul\Shop\DataGrids;
 
-use Illuminate\Support\Facades\DB;
 use Webkul\Ui\DataGrid\DataGrid;
+use Illuminate\Support\Facades\DB;
 
 class OrderDataGrid extends DataGrid
 {
@@ -80,12 +80,13 @@ class OrderDataGrid extends DataGrid
         ]);
     }
 
-    public function prepareActions() {
+    public function prepareActions()
+    {
         $this->addAction([
             'type'   => 'View',
             'method' => 'GET',
             'route'  => 'customer.orders.view',
             'icon'   => 'icon eye-icon',
-        ]);
+        ], true);
     }
 }

packages/Webkul/Ui/src/DataGrid/DataGrid.php

@@ -298,13 +298,17 @@ abstract class DataGrid
     }
 
     /**
-     * Add action.
+     * Add action. Some datagrids are used in shops also. So extra
+     * parameters is their. If needs to give an access just pass true
+     * in second param.
      *
-     * @param array $action
+     * @param  array $action
+     *
+     * @param  bool  $specialPermission
      *
      * @return void
      */
-    public function addAction($action)
+    public function addAction($action, $specialPermission = false)
     {
         $currentRouteACL = $this->fetchCurrentRouteACL($action);
 
@@ -316,7 +320,7 @@ abstract class DataGrid
             $eventName = null;
         }
 
-        if (bouncer()->hasPermission($currentRouteACL['key'] ?? null)) {
+        if (bouncer()->hasPermission($currentRouteACL['key'] ?? null) || $specialPermission) {
             $this->fireEvent('action.before.' . $eventName);
 
             array_push($this->actions, $action);
@@ -327,13 +331,17 @@ abstract class DataGrid
     }
 
     /**
-     * Add mass action.
+     * Add mass action. Some datagrids are used in shops also. So extra
+     * parameters is their. If needs to give an access just pass true
+     * in second param.
      *
      * @param array $massAction
      *
+     * @param  bool  $specialPermission
+     *
      * @return void
      */
-    public function addMassAction($massAction)
+    public function addMassAction($massAction, $specialPermission = false)
     {
         $massAction['route'] = $this->getRouteNameFromUrl($massAction['action'], $massAction['method']);
 
@@ -347,7 +355,7 @@ abstract class DataGrid
             $eventName = null;
         }
 
-        if (bouncer()->hasPermission($currentRouteACL['key'] ?? null)) {
+        if (bouncer()->hasPermission($currentRouteACL['key'] ?? null) || $specialPermission) {
             $this->fireEvent('mass.action.before.' . $eventName);
 
             $this->massActions[] = $massAction;

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

@@ -1,5 +1,5 @@
 {
     "/js/velocity.js": "/js/velocity.js?id=a45dba1beb5c6f79193d",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
-    "/css/velocity.css": "/css/velocity.css?id=a0d4320e35797371f8f0"
+    "/css/velocity.css": "/css/velocity.css?id=2ee191136dd475471b01"
 }

packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss

@@ -220,6 +220,8 @@
             position: absolute;
             line-height: 13em;
             background: $border-dark;
+            display: flex;
+            align-items: center;
 
             &.right {
                 right: 0;

packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss

@@ -429,7 +429,6 @@
 
         img {
             width: 100%;
-            height: 100%;
         }
     }
 
@@ -448,7 +447,6 @@
             max-width: 200px;
             max-height: 200px;
             position: relative;
-            background: #f2f2f2;
 
             .quick-view-btn-container {
                 button {

packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php

@@ -72,6 +72,11 @@
         .main-content-wrapper {
             margin-bottom: 0px;
         }
+
+        .buynow {
+            height: 40px;
+            text-transform: uppercase;
+        }
     </style>
 @endpush
 

packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php

@@ -47,10 +47,7 @@
 @endpush
 
 @section('content-wrapper')
-    <div
-        style="padding-left: 50px !important;"
-        class="container category-page-wrapper"
-    >
+    <div class="container category-page-wrapper">
         <search-component></search-component>
     </div>
 @endsection