From e2eb832b18e4b58fdf635ce0e10eb70be7e522a8 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 6 Sep 2021 14:09:45 +0530
Subject: [PATCH 1/3] Removed Offset

---
 .../Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php
index 088b3a453..4ec02d013 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php
@@ -19,7 +19,7 @@
 @endsection
 
 @section('content-wrapper')
-    <div class="cms-page-container cart-details row offset-1">
+    <div class="cms-page-container cart-details row">
         {!! DbView::make($page)->field('html_content')->render() !!}
     </div>
 @endsection
\ No newline at end of file

From 7f503a6fea88587d2a22f49f3f6bc157f52e0bf0 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 6 Sep 2021 16:01:43 +0530
Subject: [PATCH 2/3] Multiple Custom Script Issue Fixed

---
 .../Webkul/Core/src/Repositories/CoreConfigRepository.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
index 7037935de..307f81f90 100755
--- a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
+++ b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
@@ -91,7 +91,9 @@ class CoreConfigRepository extends Repository
                     ]);
                 } else {
                     foreach ($coreConfigValue as $coreConfig) {
-                        Storage::delete($coreConfig['value']);
+                        if (request()->hasFile($fieldName)) {
+                            Storage::delete($coreConfig['value']);
+                        }
 
                         if (isset($value['delete'])) {
                             $this->model->destroy($coreConfig['id']);

From fe54e32f19468e7fbb43c4627c4632b2913abc81 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 6 Sep 2021 16:20:19 +0530
Subject: [PATCH 3/3] Exception Handled

---
 .../Webkul/Ui/src/DataGrid/Traits/ProvideCollection.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Ui/src/DataGrid/Traits/ProvideCollection.php b/packages/Webkul/Ui/src/DataGrid/Traits/ProvideCollection.php
index 482c21ceb..9a3b1d605 100644
--- a/packages/Webkul/Ui/src/DataGrid/Traits/ProvideCollection.php
+++ b/packages/Webkul/Ui/src/DataGrid/Traits/ProvideCollection.php
@@ -140,6 +140,10 @@ trait ProvideCollection
      */
     private function sortCollection($collection, $info)
     {
+        $availableOptions = ['asc', 'desc'];
+
+        $selectedSortOption = strtolower(array_values($info)[0]);
+
         $countKeys = count(array_keys($info));
 
         if ($countKeys > 1) {
@@ -150,7 +154,7 @@ trait ProvideCollection
 
         $collection->orderBy(
             $columnName[1],
-            array_values($info)[0]
+            in_array($selectedSortOption, $availableOptions) ? $selectedSortOption : 'asc'
         );
     }