From 62876ea70302c90bf148f7930b35dcc156d2b525 Mon Sep 17 00:00:00 2001
From: Vivek Sharma <viveksh047@webkul.com>
Date: Sat, 8 Feb 2020 11:40:29 +0530
Subject: [PATCH] [Fixed: issue #2378 has been resolved.]

---
 .../admin/content/content-type/category.blade.php      | 10 +++++++---
 .../admin/content/content-type/edit-product.blade.php  |  2 +-
 .../src/Resources/views/admin/content/create.blade.php |  2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

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 279257cfe..844919326 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
@@ -6,13 +6,17 @@
         {{ __('velocity::app.admin.contents.content.category-slug') }}
     </label>
 
+    @php
+       $pageTarget = isset($locale) ? (old($locale)['page_link'] ?? (isset($content) ? $content->translate($locale)['page_link'] : '')) : '';
+    @endphp
+
     <input
         type="text"
         id="page_link"
         class="control"
-        name="page_link"
+        name="{{$locale}}[page_link]"
         v-validate="'required|max:150'"
-        value="{{ isset($locale) ? (old($locale)['page_link'] ?? $content->translate($locale)['page_link']) : '' }}"
+        value="{{ $pageTarget }}"
         data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
 
     <span class="control-error" v-if="errors.has('page_link')">
@@ -26,7 +30,7 @@
     </label>
 
     @php
-       $linkTarget = isset($locale) ? (old($locale)['link_target'] ?? $content->translate($locale)['link_target']) : '';
+       $linkTarget = isset($locale) ? (old($locale)['link_target'] ?? (isset($content) ? $content->translate($locale)['link_target'] : '')) : '';
     @endphp
 
     <select class="control" id="link_target" name="{{$locale}}[link_target]" value="">
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 ef7ba1096..993e39d8b 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'] ?? (isset($content) ? $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/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
index 39eb0ad02..53093f14d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
@@ -7,6 +7,8 @@
 @section('content')
     <div class="content">
 
+        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+
         <form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
 
             <div class="page-header">