From 2a0d461d9e8a83ac68e3166ed3a79f8a651db660 Mon Sep 17 00:00:00 2001
From: Aayush Bhatt <aayush.bhatt172@webkul.com>
Date: Thu, 6 Feb 2020 18:52:10 +0530
Subject: [PATCH] old() function implemented in admin package

---
 .../src/Resources/views/account/edit.blade.php     |  4 ++--
 .../views/catalog/attributes/edit.blade.php        |  2 +-
 .../views/catalog/families/edit.blade.php          |  2 +-
 .../views/customers/addresses/edit.blade.php       | 14 +++++++-------
 .../src/Resources/views/customers/edit.blade.php   |  8 ++++----
 .../views/customers/groups/edit.blade.php          |  6 +++---
 .../views/customers/reviews/edit.blade.php         |  2 +-
 .../views/customers/subscribers/edit.blade.php     |  2 +-
 .../views/promotions/cart-rules/edit.blade.php     | 10 +++++-----
 .../views/settings/currencies/edit.blade.php       |  8 ++++----
 .../views/settings/locales/edit.blade.php          |  4 ++--
 .../views/tax/tax-categories/edit.blade.php        |  4 ++--
 .../Resources/views/tax/tax-rates/edit.blade.php   | 12 ++++++------
 13 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php
index e6f40f89e..261d5d92d 100755
--- a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php
@@ -32,13 +32,13 @@
                         <div slot="body">
                             <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                                 <label for="name" class="required">{{ __('admin::app.account.name') }}</label>
-                                <input type="text" v-validate="'required'" class="control" id="name" name="name" value="{{ $user->name }}"  data-vv-as="&quot;{{ __('admin::app.account.name') }}&quot;"/>
+                                <input type="text" v-validate="'required'" class="control" id="name" name="name" value="{{ old('name') ?: $user->name }}"  data-vv-as="&quot;{{ __('admin::app.account.name') }}&quot;"/>
                                 <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
                                 <label for="email" class="required">{{ __('admin::app.account.email') }}</label>
-                                <input type="text" v-validate="'required|email'" class="control" id="email" name="email" value="{{ $user->email }}"  data-vv-as="&quot;{{ __('admin::app.account.email') }}&quot;"/>
+                                <input type="text" v-validate="'required|email'" class="control" id="email" name="email" value="{{ old('email') ?: $user->email }}"  data-vv-as="&quot;{{ __('admin::app.account.email') }}&quot;"/>
                                 <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
                             </div>
                         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
index fa1557a51..3829c67b6 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
@@ -38,7 +38,7 @@
 
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                                 <label for="code" class="required">{{ __('admin::app.catalog.attributes.code') }}</label>
-                                <input type="text" v-validate="'required'" class="control" id="code" name="code" value="{{ $attribute->code }}" disabled="disabled" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.code') }}&quot;" v-code/>
+                                <input type="text" v-validate="'required'" class="control" id="code" name="code" value="{{ old('code') ?: $attribute->code }}" disabled="disabled" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.code') }}&quot;" v-code/>
                                 <input type="hidden" name="code" value="{{ $attribute->code }}"/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
index a88e30f44..07ad15efc 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
@@ -38,7 +38,7 @@
                             {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.general.controls.before', ['attributeFamily' => $attributeFamily]) !!}
 
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
-                                <input type="text" v-validate="'required'" name="code" class="control" id="code" value="{{ $attributeFamily->code }}" disabled="disabled" data-vv-as="&quot;{{ __('admin::app.catalog.families.code') }}&quot;" v-code/>
+                                <input type="text" v-validate="'required'" name="code" class="control" id="code" value="{{ old('code') ?: $attributeFamily->code }}" disabled="disabled" data-vv-as="&quot;{{ __('admin::app.catalog.families.code') }}&quot;" v-code/>
                                 <input type="hidden" name="code" value="{{ $attributeFamily->code }}"/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
index a8090f866..b5b2c91af 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
@@ -28,7 +28,7 @@
 
                     <input type="hidden" name="_method" value="PUT">
 
-                    <input type="hidden" name="customer_id" value="{{ $address->customer_id }}">
+                    <input type="hidden" name="customer_id" value="{{ old('customer_id') ?: $address->customer_id }}">
 
                     <accordian :title="'{{ __('admin::app.customers.addresses.general') }}'" :active="true">
                         <div slot="body">
@@ -37,25 +37,25 @@
 
                             <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
                                 <label for="company_name">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
-                                <input type="text" class="control" name="company_name" value="{{ $address->company_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
+                                <input type="text" class="control" name="company_name" value="{{ old('company_name') ?: $address->company_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
                                 <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
                                 <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
-                                <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                                <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') ?:$address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
                                 <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                                 <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
-                                <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                                <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') ?: $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
                                 <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                                 <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
-                                <input type="text" class="control" name="vat_id" v-validate="" value="{{ $address->vat_id }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+                                <input type="text" class="control" name="vat_id" v-validate="" value="{{ old('vat_id') ?: $address->vat_id }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
                                 <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
                             </div>
 
@@ -75,7 +75,7 @@
 
                             <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                                 <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                                <input type="text" class="control" name="city" v-validate="'required'" value="{{ $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                                <input type="text" class="control" name="city" v-validate="'required'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                                 <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                             </div>
 
@@ -83,7 +83,7 @@
 
                             <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                                 <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                                <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+                                <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ old('postcode') ?: $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                                 <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
                             </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
index 33f26415c..cb26e7193 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -38,20 +38,20 @@
 
                             <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
                                 <label for="first_name" class="required"> {{ __('admin::app.customers.customers.first_name') }}</label>
-                                <input type="text"  class="control" name="first_name" v-validate="'required'" value="{{$customer->first_name}}"
+                                <input type="text"  class="control" name="first_name" v-validate="'required'" value="{{old('first_name') ?:$customer->first_name}}"
                                 data-vv-as="&quot;{{ __('shop::app.customer.signup-form.firstname') }}&quot;"/>
                                 <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                                 <label for="last_name" class="required"> {{ __('admin::app.customers.customers.last_name') }}</label>
-                                <input type="text"  class="control"  name="last_name"   v-validate="'required'" value="{{$customer->last_name}}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;">
+                                <input type="text"  class="control"  name="last_name"   v-validate="'required'" value="{{old('last_name') ?:$customer->last_name}}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;">
                                 <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
                                 <label for="email" class="required"> {{ __('admin::app.customers.customers.email') }}</label>
-                                <input type="email"  class="control"  name="email" v-validate="'required|email'" value="{{$customer->email}}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;">
+                                <input type="email"  class="control"  name="email" v-validate="'required|email'" value="{{old('email') ?:$customer->email}}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;">
                                 <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
                             </div>
 
@@ -77,7 +77,7 @@
 
                             <div class="control-group" :class="[errors.has('date_of_birth') ? 'has-error' : '']">
                                 <label for="dob">{{ __('admin::app.customers.customers.date_of_birth') }}</label>
-                                <input type="date" class="control" name="date_of_birth" value="{{ $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('admin::app.customers.customers.date_of_birth') }}&quot;">
+                                <input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?:$customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('admin::app.customers.customers.date_of_birth') }}&quot;">
                                 <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
                             </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
index 313c98fa2..e10fe10ac 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
@@ -12,7 +12,7 @@
                 <div class="page-title">
                     <h1>
                         <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-                        
+
                         {{ __('admin::app.customers.groups.edit-title') }}
                     </h1>
                 </div>
@@ -33,7 +33,7 @@
 
                     <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                         <label for="code" class="required">{{ __('admin::app.customers.groups.code') }}</label>
-                        <input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.customers.groups.code') }}&quot;" value="{{ $group->code }}" disabled="disabled"/>
+                        <input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.customers.groups.code') }}&quot;" value="{{ old('code') ?: $group->code }}" disabled="disabled"/>
                         <input type="hidden" name="code" value="{{ $group->code }}"/>
                         <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                     </div>
@@ -42,7 +42,7 @@
                         <label for="name" class="required">
                             {{ __('admin::app.customers.groups.name') }}
                         </label>
-                        <input type="text" class="control" name="name" v-validate="'required'" value="{{ $group->name }}" data-vv-as="&quot;{{ __('admin::app.customers.groups.name') }}&quot;">
+                        <input type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') ?: $group->name }}" data-vv-as="&quot;{{ __('admin::app.customers.groups.name') }}&quot;">
                         <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                     </div>
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
index 882e98368..2df525984 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
@@ -36,7 +36,7 @@
 
                             <div class="control-group">
                                 <label for="name" > {{ __('admin::app.customers.reviews.title') }}</label>
-                                <input type="text"  class="control" id="name" name="name" value="{{$review->title}}" disabled/>
+                                <input type="text"  class="control" id="name" name="name" value="{{old('name') ?: $review->title}}" disabled/>
                             </div>
 
                             <div class="control-group">
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php
index 16e1cfbc2..643d8c91a 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php
@@ -12,7 +12,7 @@
                 <div class="page-title">
                     <h1>
                         <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-                        
+
                         {{ __('admin::app.customers.subscribers.title-edit') }}
                     </h1>
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
index e9cdf1cf4..2ea23c5ce 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
@@ -57,7 +57,7 @@
                                 <div class="control-group">
                                     <label for="status">{{ __('admin::app.promotions.cart-rules.status') }}</label>
                                     <span class="checkbox">
-                                        <input type="checkbox" id="status" name="status" value="{{ $cartRule->status }}" {{ $cartRule->status ? 'checked' : '' }}>
+                                        <input type="checkbox" id="status" name="status" value="{{ old('status') ?: $cartRule->status }}" {{ $cartRule->status ? 'checked' : '' }}>
                                         <label class="checkbox-view" for="status"></label>
                                         {{ __('admin::app.promotions.cart-rules.is-active') }}
                                     </span>
@@ -243,7 +243,7 @@
 
                                 <div class="control-group">
                                     <label for="apply_to_shipping">{{ __('admin::app.promotions.cart-rules.apply-to-shipping') }}</label>
-                                    
+
                                     <?php $selectedOption = old('apply_to_shipping') ?: $cartRule->apply_to_shipping ?>
 
                                     <select class="control" id="apply_to_shipping" name="apply_to_shipping" :disabled="action_type == 'cart_fixed'">
@@ -403,7 +403,7 @@
 
                 <div class="control-group" :class="[errors.has('create-coupun-form.coupon_qty') ? 'has-error' : '']">
                     <label for="coupon_qty" class="required">{{ __('admin::app.promotions.cart-rules.coupon-qty') }}</label>
-                    
+
                     <input v-validate="'required|min_value:1'" class="control" id="coupon_qty" name="coupon_qty" v-model="coupon_format.coupon_qty" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.coupon-qty') }}&quot;"/>
 
                     <span class="control-error" v-if="errors.has('create-coupun-form.coupon_qty')">
@@ -515,11 +515,11 @@
 
                     attribute_type_indexes: {
                         'cart': 0,
-                        
+
                         'cart_item': 1,
 
                         'product': 2
-                    }, 
+                    },
 
                     condition_operators: {
                         'price': [{
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
index 39eb763eb..a41cb933a 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
@@ -36,20 +36,20 @@
 
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                                 <label for="code" class="required">{{ __('admin::app.settings.currencies.code') }}</label>
-                                <input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" value="{{ $currency->code }}" disabled="disabled"/>
-                                <input type="hidden" name="code" value="{{ $currency->code }}"/>
+                                <input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" value="{{ old('code') ?: $currency->code }}" disabled="disabled"/>
+                                <input type="hidden" name="code" value="{{ old('code') ?: $currency->code }}"/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                                 <label for="name" class="required">{{ __('admin::app.settings.currencies.name') }}</label>
-                                <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') ?: $currency->name }}"/>
+                                <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') ?: old('name') ?: $currency->name }}"/>
                                 <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                             </div>
 
                             <div class="control-group">
                                 <label for="symbol">{{ __('admin::app.settings.currencies.symbol') }}</label>
-                                <input class="control" id="symbol" name="symbol" value="{{ old('symbol') ?: $currency->symbol }}"/>
+                                <input class="control" id="symbol" name="symbol" value="{{ old('symbol') ?: old('symbol') ?: $currency->symbol }}"/>
                             </div>
                         </div>
                     </accordian>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
index 0f65515bb..f87b058b3 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
@@ -37,8 +37,8 @@
 
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                                 <label for="code" class="required">{{ __('admin::app.settings.locales.code') }}</label>
-                                <input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.settings.locales.code') }}&quot;" value="{{ $locale->code }}" disabled="disabled"/>
-                                <input type="hidden" name="code" value="{{ $locale->code }}"/>
+                                <input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.settings.locales.code') }}&quot;" value="{{ old('code') ?: $locale->code }}" disabled="disabled"/>
+                                <input type="hidden" name="code" value="{{ old('code') ?: $locale->code }}"/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
index 3720e270f..50d7df256 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
@@ -46,11 +46,11 @@
                     <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                         <label for="code" class="required">{{ __('admin::app.settings.tax-categories.code') }}</label>
 
-                        <input v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.code') }}&quot;" value="{{ $taxCategory->code }}"/>
+                        <input v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.code') }}&quot;" value="{{ old('code') ?: $taxCategory->code }}"/>
 
                     <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                         <label for="name" class="required">{{ __('admin::app.settings.tax-categories.name') }}</label>
-                        <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.name') }}&quot;" value="{{ $taxCategory->name }}"/>
+                        <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.name') }}&quot;" value="{{ old('name') ?: $taxCategory->name }}"/>
 
                     <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
                         <label for="description" class="required">{{ __('admin::app.settings.tax-categories.description') }}</label>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
index 51d6638f3..17055760b 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
@@ -31,8 +31,8 @@
 
                     <div class="control-group" :class="[errors.has('identifier') ? 'has-error' : '']">
                         <label for="identifier" class="required">{{ __('admin::app.configuration.tax-rates.identifier') }}</label>
-                        <input v-validate="'required'" class="control" id="identifier" name="identifier" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.identifier') }}&quot;" value="{{ $taxRate->identifier }}" disabled="disabled"/>
-                        <input type="hidden" name="identifier" value="{{ $taxRate->identifier }}"/>
+                        <input v-validate="'required'" class="control" id="identifier" name="identifier" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.identifier') }}&quot;" value="{{ old('identifier') ?: $taxRate->identifier }}" disabled="disabled"/>
+                        <input type="hidden" name="identifier" value="{{ value="{{ old('identifier') ?: $taxRate->identifier }}"/>
                         <span class="control-error" v-if="errors.has('identifier')">@{{ errors.first('identifier') }}</span>
                     </div>
 
@@ -43,26 +43,26 @@
 
                         <div class="control-group" :class="[errors.has('zip_from') ? 'has-error' : '']">
                             <label for="zip_from" class="required">{{ __('admin::app.configuration.tax-rates.zip_from') }}</label>
-                            <input v-validate="'required'" class="control" id="zip_from" name="zip_from" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_from') }}&quot;" value="{{ $taxRate->zip_from }}" />
+                            <input v-validate="'required'" class="control" id="zip_from" name="zip_from" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_from') }}&quot;" value="{{ old('zip_form') ?: $taxRate->zip_from }}" />
                             <span class="control-error" v-if="errors.has('zip_from')">@{{ errors.first('zip_from') }}</span>
                         </div>
 
                         <div class="control-group" :class="[errors.has('zip_to') ? 'has-error' : '']">
                             <label for="zip_to" class="required">{{ __('admin::app.configuration.tax-rates.zip_to') }}</label>
-                            <input v-validate="'required'" class="control" id="zip_to" name="zip_to" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_to') }}&quot;" value="{{ $taxRate->zip_to }}" />
+                            <input v-validate="'required'" class="control" id="zip_to" name="zip_to" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_to') }}&quot;" value="{{ old('zip_to') ?: $taxRate->zip_to }}" />
                             <span class="control-error" v-if="errors.has('zip_to')">@{{ errors.first('zip_to') }}</span>
                         </div>
                     @else
                         <div class="control-group" :class="[errors.has('zip_code') ? 'has-error' : '']">
                             <label for="zip_code" class="required">{{ __('admin::app.configuration.tax-rates.zip_code') }}</label>
-                            <input v-validate="'required'" class="control" id="zip_code" name="zip_code" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_code') }}&quot;" value="{{ $taxRate->zip_code }}" />
+                            <input v-validate="'required'" class="control" id="zip_code" name="zip_code" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_code') }}&quot;" value="{{ old('zip_code') ?: $taxRate->zip_code }}" />
                             <span class="control-error" v-if="errors.has('zip_code')">@{{ errors.first('zip_code') }}</span>
                         </div>
                     @endif
 
                     <div class="control-group" :class="[errors.has('tax_rate') ? 'has-error' : '']">
                         <label for="tax_rate" class="required">{{ __('admin::app.configuration.tax-rates.tax_rate') }}</label>
-                        <input v-validate="'required|min_value:0.0001'" class="control" id="tax_rate" name="tax_rate" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.tax_rate') }}&quot;" value="{{ $taxRate->tax_rate }}" />
+                        <input v-validate="'required|min_value:0.0001'" class="control" id="tax_rate" name="tax_rate" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.tax_rate') }}&quot;" value="{{ old('tax_rate') ?: $taxRate->tax_rate }}" />
                         <span class="control-error" v-if="errors.has('tax_rate')">@{{ errors.first('tax_rate') }}</span>
                     </div>