Fixed modal style issues, localization of routes issue and updated description string of version command

app/Console/Commands/BagistoVersion.php

@@ -18,7 +18,7 @@ class BagistoVersion extends Command
      *
      * @var string
      */
-    protected $description = 'Displays version of Bagisto installed';
+    protected $description = 'Displays current version of Bagisto installed';
 
     /**
      * Create a new command instance.

app/Providers/RouteServiceProvider.php

@@ -23,7 +23,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        // dd(Route::pattern('*', '[a-z]+'));
 
         parent::boot();
     }

packages/Webkul/Shop/src/Http/Middleware/Locale.php

@@ -53,4 +53,4 @@ class Locale
 
         return $next($request);
     }
-}
+}

packages/Webkul/Shop/src/Http/routes.php

@@ -1,7 +1,6 @@
 <?php
 
-Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function () {
+Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function () {
-
     //Store front home
     Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
         'view' => 'shop::home.index'
@@ -41,7 +40,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
     ])->name('shop.checkout.cart.index');
 
     //Cart Items Add
-    Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config',[
+    Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [
         'redirect' => 'shop.checkout.cart.index'
     ])->name('cart.add');
 
@@ -52,12 +51,12 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
     Route::get('checkout/cart/remove/{id}', 'Webkul\Shop\Http\Controllers\CartController@remove')->name('cart.remove');
 
     //Cart Update Before Checkout
-    Route::post('/checkout/cart', 'Webkul\Shop\Http\Controllers\CartController@updateBeforeCheckout')->defaults('_config',[
+    Route::post('/checkout/cart', 'Webkul\Shop\Http\Controllers\CartController@updateBeforeCheckout')->defaults('_config', [
         'redirect' => 'shop.checkout.cart.index'
     ])->name('shop.checkout.cart.update');
 
     //Cart Items Remove
-    Route::get('/checkout/cart/remove/{id}', 'Webkul\Shop\Http\Controllers\CartController@remove')->defaults('_config',[
+    Route::get('/checkout/cart/remove/{id}', 'Webkul\Shop\Http\Controllers\CartController@remove')->defaults('_config', [
         'redirect' => 'shop.checkout.cart.index'
     ])->name('shop.checkout.cart.remove');
 
@@ -187,7 +186,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
 
                 //Customer Profile Show
                 Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@index')->defaults('_config', [
-                'view' => 'shop::customers.account.profile.index'
+                    'view' => 'shop::customers.account.profile.index'
                 ])->name('customer.profile.index');
 
                 //Customer Profile Edit Form Show
@@ -267,7 +266,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
                     'redirect' => 'customer.reviews.index'
                 ])->name('customer.review.delete');
 
-                 //Customer all review delete
+                //Customer all review delete
                 Route::get('reviews/all-delete', 'Webkul\Shop\Http\Controllers\ReviewController@deleteAll')->defaults('_config', [
                     'redirect' => 'customer.reviews.index'
                 ])->name('customer.review.deleteall');

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

@@ -138,6 +138,16 @@ abstract class DataGrid
     {
         $parsedUrl = $this->parseUrl();
 
+        foreach ($parsedUrl as $key => $value) {
+            if ( $key == 'locale') {
+                if ( ! is_array($value)) {
+                    unset($parsedUrl[$key]);
+                }
+            } else if ( ! is_array($value)) {
+                unset($parsedUrl[$key]);
+            }
+        }
+
         if (count($parsedUrl)) {
             $filteredOrSortedCollection = $this->sortOrFilterCollection($this->collection = $this->queryBuilder, $parsedUrl);
 
@@ -329,4 +339,4 @@ abstract class DataGrid
 
         return $this->getCollection();
     }
-}
+}

packages/Webkul/Ui/src/Resources/assets/scss/app.scss

@@ -720,27 +720,27 @@ modal {
     left: 0px;
     position: fixed;
     background: #000;
-    opacity: 0.75;
+    opacity: 0.7;
 }
+
 .modal-open .modal-overlay {
     display: block;
 }
 
 .modal-container {
-    animation: fade-in-white 0.3s ease-in-out;
+    background: #ffffff;
-    z-index: 11;
+    top: 200px;
-    margin-left: -350px;
     width: 600px;
     max-width: 80%;
-    background: #ffffff;
+    left: auto;
-    position: fixed;
+    right: auto;
-    left: 50%;
+    position: absolute;
-    top: 100px;
+    z-index: 11;
-    margin-bottom: 100px;
     @include box-shadow(
         0px 15px 25px 0px rgba(0, 0, 0, 0.03),
         0px 20px 45px 5px rgba(0, 0, 0, 0.2)
     );
+    animation: fade-in-white 0.3s ease-in-out;
     animation: jelly 0.5s ease-in-out;
     @include border-radius(5px);
 
@@ -896,4 +896,4 @@ modal {
 
 .vue-swatches__trigger {
     border: 1px solid #d3d3d3;
-}
+}