diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 0888522b7..fdd40e854 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -301,6 +301,8 @@
 
 @push('scripts')
 
+<?php if ($field['type'] == 'country'): ?>
+
 <script type="text/x-template" id="country-template">
 
     <div>
@@ -404,6 +406,8 @@
     });
 </script>
 
+<?php endif; ?>
+
 <script type="text/x-template" id="depends-template">
 
     <div class="control-group"  :class="[errors.has(name) ? 'has-error' : '']" v-if="this.isVisible">
diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index b5f6e75fa..0505826ef 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -6,7 +6,6 @@ use Illuminate\Container\Container as App;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 use Webkul\Core\Eloquent\Repository;
-use Webkul\Core\Models\CoreConfig;
 use Webkul\Sales\Contracts\Order;
 use Webkul\Sales\Models\Order as OrderModel;
 
@@ -196,22 +195,20 @@ class OrderRepository extends Repository
      */
     public function generateIncrementId()
     {
-        $config = new CoreConfig();
-
         foreach ([  'Prefix' => 'prefix',
                     'Length' => 'length',
                     'Suffix' => 'suffix', ] as
                     $varSuffix => $confKey)
                 {
                     $var = "invoiceNumber{$varSuffix}";
-                    $$var = $config->where('code', '=', "sales.orderSettings.order_number.order_number_{$confKey}")->first() ?: false;
+                    $$var = core()->getConfigData('sales.orderSettings.order_number.order_number_'.$confKey) ?: false;
                 }
 
         $lastOrder = $this->model->orderBy('id', 'desc')->limit(1)->first();
         $lastId = $lastOrder ? $lastOrder->id : 0;
 
         if ($invoiceNumberLength && ($invoiceNumberPrefix || $invoiceNumberSuffix)) {
-            $invoiceNumber = ($invoiceNumberPrefix->value) . sprintf("%0{$invoiceNumberLength->value}d", 0) . ($lastId + 1) . ($invoiceNumberSuffix->value);
+            $invoiceNumber = ($invoiceNumberPrefix) . sprintf("%0{$invoiceNumberLength}d", 0) . ($lastId + 1) . ($invoiceNumberSuffix);
         } else {
             $invoiceNumber = $lastId + 1;
         }