From 1a3bc44a88626635a76c71d63ed010108497f54b Mon Sep 17 00:00:00 2001
From: Jitendra Singh <jitendra@webkul.com>
Date: Thu, 6 Feb 2020 19:16:22 +0530
Subject: [PATCH] Issue #2339 fixed

---
 .../Velocity/src/DataGrids/ContentDataGrid.php       |  6 ++++--
 .../admin/content/content-type/category.blade.php    |  2 +-
 .../content/content-type/edit-product.blade.php      |  2 +-
 .../src/Resources/views/admin/content/edit.blade.php | 12 ++++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
index 66fe0ef38..793d4e24a 100644
--- a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
+++ b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
@@ -84,12 +84,14 @@ class ContentDataGrid extends DataGrid
             'searchable' => true,
             'filterable' => true,
             'wrapper' => function($value) {
-                if ($value->content_type == 'link')
+                if ($value->content_type == 'category')
+                    return 'Category Slug';
+                else if ($value->content_type == 'link')
                     return 'Link';
                 else if ($value->content_type == 'product')
                     return 'Product';
                 else if ($value->content_type == 'static')
-                return 'Static';
+                    return 'Static';
             }
         ]);
     }
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
index 49625506e..b6b09dfc7 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
@@ -12,7 +12,7 @@
         class="control"
         name="page_link"
         v-validate="'required|max:150'"
-        value="{{ isset($locale) ? (old($locale)['page_link'] ?: $content->translate($locale)['page_link']) : '' }}"
+        value="{{ isset($locale) ? (old($locale)['page_link'] ?? $content->translate($locale)['page_link']) : '' }}"
         data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
 
     <span class="control-error" v-if="errors.has('page_link')">
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
index a46597e09..ef7ba1096 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
@@ -6,7 +6,7 @@
 @push('scripts')
     <script type="text/x-template" id="catalog-product-template">
         <div>
-            <?php $catalogType =  old($locale)['catalog_type'] ?: $content->translate($locale)['catalog_type']; ?>
+            <?php $catalogType =  old($locale)['catalog_type'] ?? $content->translate($locale)['catalog_type']; ?>
 
             <div class="control-group" :class="[errors.has('{{$locale}}[catalog_type]') ? 'has-error' : '']">
                 <label for="catalog_type" class="required">
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
index d36f6e9a4..daf306c36 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
@@ -59,7 +59,7 @@
                                 {{ __('velocity::app.admin.contents.page.title') }}
                                 <span class="locale">[{{ $locale }}]</span>
                             </label>
-                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?: $content->translate($locale)['title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
+                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? $content->translate($locale)['title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
 
                             <span class="control-error" v-if="errors.has('{{$locale}}[title]')">@{{ errors.first('{!!$locale!!}[title]') }}</span>
                         </div>
@@ -68,7 +68,7 @@
                             <label for="position" class="required">
                                 {{ __('velocity::app.admin.contents.page.position') }}</span>
                             </label>
-                            <input type="text" v-validate="'required|numeric|max:2'" class="control" id="position" name="position" value="{{ old('position') ?: $content->position }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.position') }}&quot;"/>
+                            <input type="text" v-validate="'required|numeric|max:2'" class="control" id="position" name="position" value="{{ old('position') ?? $content->position }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.position') }}&quot;"/>
                             <span class="control-error" v-if="errors.has('position')">@{{ errors.first('position') }}</span>
                         </div>
 
@@ -132,7 +132,7 @@
                     id="custom_title"
                     v-validate="'max:100'"
                     name="{{$locale}}[custom_title]"
-                    value="{{ old($locale)['custom_title'] ?: $content->translate($locale)['custom_title'] }}"
+                    value="{{ old($locale)['custom_title'] ?? ($content->translate($locale)['custom_title'] ?? '') }}"
                     data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-title') }}&quot;" />
 
                 <span
@@ -154,7 +154,7 @@
                     id="custom_heading"
                     v-validate="'max:100'"
                     name="{{$locale}}[custom_heading]"
-                    value="{{ old($locale)['custom_heading'] ?: $content->translate($locale)['custom_title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-heading') }}&quot;" />
+                    value="{{ old($locale)['custom_heading'] ?? $content->translate($locale)['custom_title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-heading') }}&quot;" />
 
                 <span
                     class="control-error"
@@ -217,7 +217,7 @@
                         class="control"
                         name="{{$locale}}[page_link]"
                         v-validate="'required|max:150'"
-                        value="{{ old($locale)['page_link'] ?: $content->translate($locale)['page_link'] }}"
+                        value="{{ old($locale)['page_link'] ?? $content->translate($locale)['page_link'] }}"
                         data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
 
                     <span
@@ -264,7 +264,7 @@
                         v-validate="'required'"
                         name="{{$locale}}[description]"
                         data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.static-description') }}&quot;">
-                        {{ old($locale)['description'] ?: $content->translate($locale)['description'] }}
+                        {{ old($locale)['description'] ?? $content->translate($locale)['description'] }}
                     </textarea>
 
                     <span