diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
index 11b545ef7..0570987c3 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
@@ -45,6 +45,19 @@ class OrderInvoicesDataGrid extends DataGrid
             'filterable' => true,
         ]);
 
+        $this->addColumn([
+            'index'      => 'created_at',
+            'label'      => trans('admin::app.datagrid.invoice-date'),
+            'type'       => 'string',
+            'searchable' => true,
+            'sortable'   => true,
+            'filterable' => true,
+            'closure'    => true,
+            'wrapper'    => function ($value) {
+                return \Carbon\Carbon::parse($value->created_at)->format('d-m-Y');
+            }
+        ]);
+
         $this->addColumn([
             'index'      => 'base_grand_total',
             'label'      => trans('admin::app.datagrid.grand-total'),
@@ -55,12 +68,22 @@ class OrderInvoicesDataGrid extends DataGrid
         ]);
 
         $this->addColumn([
-            'index'      => 'created_at',
-            'label'      => trans('admin::app.datagrid.invoice-date'),
-            'type'       => 'datetime',
+            'index'      => 'state',
+            'label'      => trans('admin::app.datagrid.state'),
+            'type'       => 'string',
+            'closure'    => true,
             'searchable' => true,
             'sortable'   => true,
             'filterable' => true,
+            'wrapper' => function ($value) {
+                if ($value->state == 'paid') {
+                    return '<span class="badge badge-md badge-success">'. trans('admin::app.sales.orders.invoice-status-paid') .'</span>';
+                } elseif ($value->state == "pending") {
+                    return '<span class="badge badge-md badge-warning">'. trans('admin::app.sales.orders.invoice-status-pending') .'</span>';
+                } elseif ($value->state == "overdue") {
+                    return '<span class="badge badge-md badge-danger">'. trans('admin::app.sales.orders.invoice-status-overdue') . '</span>';
+                }
+            }
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
index 3931fc268..2d346bf2a 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
@@ -2,9 +2,12 @@
 
 namespace Webkul\Admin\Http\Controllers\Sales;
 
+use Illuminate\Http\Request;
+
 use Webkul\Admin\Http\Controllers\Controller;
 use Webkul\Sales\Repositories\OrderRepository;
 use Webkul\Sales\Repositories\InvoiceRepository;
+
 use PDF;
 
 class InvoiceController extends Controller
@@ -97,7 +100,7 @@ class InvoiceController extends Controller
         $data = request()->all();
 
         $haveProductToInvoice = false;
-        
+
         foreach ($data['invoice']['items'] as $itemId => $qty) {
             if ($qty) {
                 $haveProductToInvoice = true;
@@ -145,4 +148,29 @@ class InvoiceController extends Controller
 
         return $pdf->download('invoice-' . $invoice->created_at->format('d-m-Y') . '.pdf');
     }
+
+    /**
+     * Update the invoice state.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function updateState($id, Request $request)
+    {
+        $invoice = $this->invoiceRepository->findOrFail($id);
+        $task = $this->invoiceRepository->updateInvoiceState($invoice, $request->state);
+
+        if($request->state == 'paid'){
+            $order = $this->orderRepository->findOrFail($invoice->order->id);
+            $this->orderRepository->updateOrderStatus($order);
+        }
+
+        if ($task){
+            session()->flash('success', trans('admin::app.sales.orders.invoice-status-confirmed'));
+        } else {
+            session()->flash('success', trans('admin::app.sales.orders.invoice-status-error'));
+        }
+
+        return back();
+    }
 }
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index b4f9cce62..07ab2fc32 100755
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -211,6 +211,10 @@ Route::group(['middleware' => ['web']], function () {
                     'view' => 'admin::sales.invoices.print',
                 ])->name('admin.sales.invoices.print');
 
+                Route::post('/invoices/update/state/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\InvoiceController@updateState')->defaults('_config', [
+                    'redirect' => 'admin.sales.orders.view',
+                ])->name('admin.sales.invoices.update.state');
+
 
                 // Sales Shipments Routes
                 Route::get('/shipments', 'Webkul\Admin\Http\Controllers\Sales\ShipmentController@index')->defaults('_config', [
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index 881147964..192909b92 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -320,6 +320,14 @@ return array (
                     'invoice-btn-title' => 'Rechnung',
                     'info' => 'Informationen',
                     'invoices' => 'Rechnungen',
+                    'invoices-change-title' => 'Change invoice state',
+                    'invoices-change-state-desc' => 'Please select the new invoice state:',
+                    'invoice-status-paid'    => 'Paid',
+                    'invoice-status-pending' => 'Pending',
+                    'invoice-status-overdue' => 'Overdue',
+                    'invoice-status-update' => 'Save changes',
+                    'invoice-status-confirmed' => 'The invoice state has been changed.',
+                    'invoice-status-error' => 'Could not update the invoice state. ',
                     'shipments' => 'Sendungen',
                     'order-and-account' => 'Bestellung und Rechnung',
                     'order-info' => 'Bestellinformationen',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index ac7a8ad25..a739430f3 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -319,6 +319,14 @@ return [
             'invoice-btn-title' => 'Invoice',
             'info' => 'Information',
             'invoices' => 'Invoices',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'Shipments',
             'order-and-account' => 'Order and Account',
             'order-info' => 'Order Information',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index 6f88bc54e..410af2d47 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -318,6 +318,14 @@ return [
             'invoice-btn-title' => 'صورت حساب',
             'info' => 'اطلاعات',
             'invoices' => 'صورت حساب ها',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'حمل و نقل ها',
             'order-and-account' => 'سفارش و حساب',
             'order-info' => 'اطلاعات سفارش',
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index 580ab92d2..fca9749c8 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -318,6 +318,14 @@ return [
             'invoice-btn-title' => 'Fattura',
             'info' => 'Informazoni',
             'invoices' => 'Fatture',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'Spedizioni',
             'order-and-account' => 'Ordine e Account',
             'order-info' => 'informazioni Ordine',
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 3c67966f2..f7ca87ef7 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -318,6 +318,14 @@ return [
             'invoice-btn-title' => 'Factuur',
             'info' => 'Informatie',
             'invoices' => 'Facturen',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'Verzendingen',
             'order-and-account' => 'Order and Account',
             'order-info' => 'Order Information',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index a714a24b3..960202a88 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -317,6 +317,14 @@ return [
             'invoice-btn-title' => 'Faktura',
             'info' => 'Informacje',
             'invoices' => 'Faktury',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'Przesyłki',
             'order-and-account' => 'Zamówienie i konto',
             'order-info' => 'Informacje o zamówieniu',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index fb31ad0dc..4043e01f3 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -318,6 +318,14 @@ return [
             'invoice-btn-title' => 'Faturar',
             'info' => 'Informação',
             'invoices' => 'Faturas',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'Envios',
             'order-and-account' => 'Pedido e Conta',
             'order-info' => 'Informação do Pedido',
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index b9bd5afd2..f1c7b8103 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -316,6 +316,14 @@ return [
             'invoice-btn-title' => 'Fatura',
             'info' => 'Bilgi',
             'invoices' => 'Faturalar',
+            'invoices-change-title' => 'Change invoice state',
+            'invoices-change-state-desc' => 'Please select the new invoice state:',
+            'invoice-status-paid'    => 'Paid',
+            'invoice-status-pending' => 'Pending',
+            'invoice-status-overdue' => 'Overdue',
+            'invoice-status-update' => 'Save changes',
+            'invoice-status-confirmed' => 'The invoice state has been changed.',
+            'invoice-status-error' => 'Could not update the invoice state. ',
             'shipments' => 'Kargo',
             'order-and-account' => 'Sipariş ve Hesap',
             'order-info' => 'Sipariş Bilgisi',
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
index 42b871faf..ef1dd4412 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
@@ -13,10 +13,7 @@
 
             <div class="page-action">
                 <div class="export-import" @click="showModal('downloadDataGrid')">
-                    <i class="export-icon"></i>
-                    <span>
-                        {{ __('admin::app.export.export') }}
-                    </span>
+                    <i class="export-icon"></i> <span>{{ __('admin::app.export.export') }}</span>
                 </div>
             </div>
         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
index 0666ce986..06fb088b8 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
@@ -1,10 +1,10 @@
-@extends('admin::layouts.master')
+@extends('admin::layouts.content')
 
 @section('page_title')
     {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }}
 @stop
 
-@section('content-wrapper')
+@section('content')
 
     <?php $order = $invoice->order; ?>
 
@@ -15,11 +15,18 @@
                     {!! view_render_event('sales.invoice.title.before', ['order' => $order]) !!}
 
                     <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ route('admin.dashboard.index') }}';"></i>
-
                     {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }}
 
                     {!! view_render_event('sales.invoice.title.after', ['order' => $order]) !!}
                 </h1>
+
+                @if($invoice->state == 'paid')
+                        <small><span class="badge badge-md badge-success">{{ __('admin::app.sales.orders.invoice-status-paid') }}</span></small>
+                    @elseif($invoice->state == 'pending')
+                        <span class="badge badge-md badge-warning">{{ __('admin::app.sales.orders.invoice-status-pending') }}</span>
+                    @else
+                        <span class="badge badge-md badge-danger">{{ __('admin::app.sales.orders.invoice-status-overdue') }}</span>
+                @endif
             </div>
 
             <div class="page-action">
@@ -29,6 +36,10 @@
                     {{ __('admin::app.sales.invoices.print') }}
                 </a>
 
+                @if($invoice->state == "pending" || $invoice->state == "overdue")
+                    <a href="#" id="ChangeStatus" class="btn btn-lg btn-primary" @click="showModal('changeInvoiceState')">{{ __('admin::app.sales.orders.invoices-change-title') }}</a>
+                @endif
+
                 {!! view_render_event('sales.invoice.page_action.after', ['order' => $order]) !!}
             </div>
         </div>
@@ -37,7 +48,7 @@
             <div class="sale-container">
 
                 <accordian :title="'{{ __('admin::app.sales.orders.order-and-account') }}'" :active="true">
-                    <div slot="body">
+                    <div slot="body" style="display: flex; overflow:auto;">
 
                         <div class="sale-section">
                             <div class="secton-title">
@@ -46,10 +57,7 @@
 
                             <div class="section-content">
                                 <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.invoices.order-id') }}
-                                    </span>
-
+                                    <span class="title">{{ __('admin::app.sales.invoices.order-id') }}</span>
                                     <span class="value">
                                         <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
                                     </span>
@@ -58,69 +66,55 @@
                                 {!! view_render_event('sales.invoice.increment_id.after', ['order' => $order]) !!}
 
                                 <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.order-date') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ $order->created_at }}
-                                    </span>
+                                    <span class="title">{{ __('admin::app.sales.orders.order-date') }}</span>
+                                    <span class="value">{{ $order->created_at }}</span>
                                 </div>
 
                                 {!! view_render_event('sales.invoice.created_at.after', ['order' => $order]) !!}
 
                                 <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.order-status') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ $order->status_label }}
-                                    </span>
+                                    <span class="title">{{ __('admin::app.sales.orders.order-status') }}</span>
+                                    <span class="value">{{ $order->status_label }}</span>
                                 </div>
 
                                 {!! view_render_event('sales.invoice.status_label.after', ['order' => $order]) !!}
 
                                 <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.channel') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ $order->channel_name }}
-                                    </span>
+                                    <span class="title">{{ __('admin::app.sales.orders.channel') }}</span>
+                                    <span class="value">{{ $order->channel_name }}</span>
                                 </div>
 
                                 {!! view_render_event('sales.invoice.channel_name.after', ['order' => $order]) !!}
+
+                                <div class="row">
+                                    <span class="title">{{ __('admin::app.sales.orders.payment-method') }}</span>
+                                    <span class="value">{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}</span>
+                                </div>
+
+                                <div class="row">
+                                    <span class="title">{{ __('admin::app.sales.orders.shipping-method') }}</span>
+                                    <span class="value">{{ $order->shipping_title }}</span>
+                                </div>
+                                {!! view_render_event('sales.invoice.shipping-method.after', ['order' => $order]) !!}
                             </div>
                         </div>
 
-                        <div class="sale-section">
+                        <div class="sale-section" style="margin: 0 0 0 300px;">
                             <div class="secton-title">
                                 <span>{{ __('admin::app.sales.orders.account-info') }}</span>
                             </div>
 
                             <div class="section-content">
                                 <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.customer-name') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ $invoice->address->name }}
-                                    </span>
+                                    <span class="title">{{ __('admin::app.sales.orders.customer-name') }}</span>
+                                    <span class="value">{{ $invoice->address->name }}</span>
                                 </div>
 
                                 {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!}
 
                                 <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.email') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ $invoice->address->email }}
-                                    </span>
+                                    <span class="title">{{ __('admin::app.sales.orders.email') }}</span>
+                                    <span class="value">{{ $invoice->address->email }}</span>
                                 </div>
 
                                 {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!}
@@ -131,14 +125,14 @@
                 </accordian>
 
                 <accordian :title="'{{ __('admin::app.sales.orders.address') }}'" :active="true">
-                    <div slot="body">
+                    <div slot="body" style="display: flex; overflow:auto;">
 
                         <div class="sale-section">
-                            <div class="secton-title">
+                            <div class="secton-title" style="width: 380px;">
                                 <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
                             </div>
 
-                            <div class="section-content">
+                            <div class="section-content" style="width: 380px;">
                                 @include ('admin::sales.address', ['address' => $order->billing_address])
 
                                 {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!}
@@ -146,86 +140,18 @@
                         </div>
 
                         @if ($order->shipping_address)
-                            <div class="sale-section">
-                                <div class="secton-title">
+                            <div class="sale-section" style="margin: 0 0 0 300px;">
+                                <div class="secton-title" style="width: 400px;">
                                     <span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
                                 </div>
 
-                                <div class="section-content">
+                                <div class="section-content" style="width: 400px;">
                                     @include ('admin::sales.address', ['address' => $order->shipping_address])
 
                                     {!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!}
                                 </div>
                             </div>
                         @endif
-
-                    </div>
-                </accordian>
-
-                <accordian :title="'{{ __('admin::app.sales.orders.payment-and-shipping') }}'" :active="true">
-                    <div slot="body">
-
-                        <div class="sale-section">
-                            <div class="secton-title">
-                                <span>{{ __('admin::app.sales.orders.payment-info') }}</span>
-                            </div>
-
-                            <div class="section-content">
-                                <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.payment-method') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                                    </span>
-                                </div>
-
-                                <div class="row">
-                                    <span class="title">
-                                        {{ __('admin::app.sales.orders.currency') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ $order->order_currency_code }}
-                                    </span>
-                                </div>
-
-                                {!! view_render_event('sales.invoice.payment-method.after', ['order' => $order]) !!}
-                            </div>
-                        </div>
-
-                        @if ($order->shipping_address)
-                            <div class="sale-section">
-                                <div class="secton-title">
-                                    <span>{{ __('admin::app.sales.orders.shipping-info') }}</span>
-                                </div>
-
-                                <div class="section-content">
-                                    <div class="row">
-                                        <span class="title">
-                                            {{ __('admin::app.sales.orders.shipping-method') }}
-                                        </span>
-
-                                        <span class="value">
-                                            {{ $order->shipping_title }}
-                                        </span>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="title">
-                                            {{ __('admin::app.sales.orders.shipping-price') }}
-                                        </span>
-
-                                        <span class="value">
-                                            {{ core()->formatBasePrice($order->base_shipping_amount) }}
-                                        </span>
-                                    </div>
-
-                                    {!! view_render_event('sales.invoice.shipping-method.after', ['order' => $order]) !!}
-                                </div>
-                            </div>
-                        @endif
                     </div>
                 </accordian>
 
@@ -254,9 +180,7 @@
                                     @foreach ($invoice->items as $item)
                                         <tr>
                                             <td>{{ $item->getTypeInstance()->getOrderedItem($item)->sku }}</td>
-
-                                            <td>
-                                                {{ $item->name }}
+                                            <td>{{ $item->name }}
 
                                                 @if (isset($item->additional['attributes']))
                                                     <div class="item-options">
@@ -264,19 +188,14 @@
                                                         @foreach ($item->additional['attributes'] as $attribute)
                                                             <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
                                                         @endforeach
-
                                                     </div>
                                                 @endif
                                             </td>
 
                                             <td>{{ core()->formatBasePrice($item->base_price) }}</td>
-
                                             <td>{{ $item->qty }}</td>
-
                                             <td>{{ core()->formatBasePrice($item->base_total) }}</td>
-
                                             <td>{{ core()->formatBasePrice($item->base_tax_amount) }}</td>
-
                                             @if ($invoice->base_discount_amount > 0)
                                                 <td>{{ core()->formatBasePrice($item->base_discount_amount) }}</td>
                                             @endif
@@ -284,7 +203,6 @@
                                             <td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }}</td>
                                         </tr>
                                     @endforeach
-
                                 </tbody>
                             </table>
                         </div>
@@ -322,12 +240,61 @@
                                 <td>{{ core()->formatBasePrice($invoice->base_grand_total) }}</td>
                             </tr>
                         </table>
-
                     </div>
                 </accordian>
-
             </div>
         </div>
-
     </div>
-@stop
\ No newline at end of file
+ </div>
+
+ <modal id="changeInvoiceState" :is-open="modalIds.changeInvoiceState">
+     <h3 slot="header">{{ __('admin::app.sales.orders.invoices-change-title') }}</h3>
+        <div slot="body">
+            <option-wrapper></option-wrapper>
+        </div>
+</modal>
+@stop
+
+@push('scripts')
+    <script type="text/x-template" id="options-template">
+    <form method="POST" action="{{ route('admin.sales.invoices.update.state', $invoice->id) }}">
+        <div class="page-content">
+            <p>Please select the new invoice state:</p>
+
+            <div class="form-container">
+                @csrf()
+                <div>
+                    <input type="radio" name="state" id="paid" value="paid">
+                    <label for="paid">{{ __('admin::app.sales.orders.invoice-status-paid') }}</label>
+                </div>
+
+                <div>
+                    <input type="radio" name="state" id="pending" value="pending" @if($invoice->state == "pending") checked @endif>
+                    <label for="pending">{{ __('admin::app.sales.orders.invoice-status-pending') }}</label>
+                </div>
+
+                <div>
+                    <input type="radio" name="state" id="overdue" value="overdue" @if($invoice->state == "overdue") checked @endif>
+                    <label for="overdue">{{ __('admin::app.sales.orders.invoice-status-overdue') }}</label>
+                </div>
+            </div>
+
+            <br />
+
+            <button type="submit" class="btn btn-md btn-primary">{{ __('admin::app.sales.orders.invoice-status-update')}}</button>
+        </div>
+    </form>
+</script>
+
+<script>
+    Vue.component('option-wrapper', {
+        template: '#options-template',
+
+        methods: {
+            onSubmit: function(e) {
+                // e.target.submit();
+            }
+        }
+    });
+</script>
+@endpush
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index e7923525d..8bea97081 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -470,7 +470,15 @@
                                         <td>{{ $invoice->created_at }}</td>
                                         <td>#{{ $invoice->order->increment_id }}</td>
                                         <td>{{ $invoice->address->name }}</td>
-                                        <td>{{ $invoice->status_label }}</td>
+                                        <td>
+                                            @if($invoice->state == "paid")
+                                                {{ __('admin::app.sales.orders.invoice-status-paid') }}
+                                            @elseif($invoice->state == "overdue")
+                                                {{ __('admin::app.sales.orders.invoice-status-overdue') }}
+                                            @else
+                                                {{ __('admin::app.sales.orders.invoice-status-pending') }}
+                                            @endif
+                                        </td>
                                         <td>{{ core()->formatBasePrice($invoice->base_grand_total) }}</td>
                                         <td class="action">
                                             <a href="{{ route('admin.sales.invoices.view', $invoice->id) }}">
diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php
index 32df169f6..8f90a3b55 100755
--- a/packages/Webkul/Sales/src/Models/Order.php
+++ b/packages/Webkul/Sales/src/Models/Order.php
@@ -277,6 +277,12 @@ class Order extends Model implements OrderContract
             return false;
         }
 
+        foreach ($this->invoices as $item) {
+            if ($item->state == "pending" || $item->state == "overdue") {
+                return false;
+            }
+        }
+
         foreach ($this->items as $item) {
             if ($item->qty_to_refund > 0) {
                 return true;
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 8f4f605e6..70a3882ca 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -97,7 +97,7 @@ class InvoiceRepository extends Repository
             $invoice = $this->model->create([
                 'order_id'              => $order->id,
                 'total_qty'             => $totalQty,
-                'state'                 => 'paid',
+                'state'                 => 'pending',
                 'base_currency_code'    => $order->base_currency_code,
                 'channel_currency_code' => $order->channel_currency_code,
                 'order_currency_code'   => $order->order_currency_code,
@@ -106,7 +106,7 @@ class InvoiceRepository extends Repository
 
             foreach ($data['invoice']['items'] as $itemId => $qty) {
                 if (! $qty) {
-                    continue; 
+                    continue;
                 }
 
                 $orderItem = $this->orderItemRepository->find($itemId);
@@ -192,11 +192,8 @@ class InvoiceRepository extends Repository
             }
 
             $this->collectTotals($invoice);
-
             $this->orderRepository->collectTotals($order);
 
-            $this->orderRepository->updateOrderStatus($order);
-
             Event::dispatch('sales.invoice.save.after', $invoice);
         } catch (\Exception $e) {
             DB::rollBack();
@@ -256,4 +253,16 @@ class InvoiceRepository extends Repository
 
         return $invoice;
     }
+
+    /**
+     * @param \Webkul\Sales\Contracts\Invoice $invoice
+     * @return void
+     */
+    public function updateInvoiceState($invoice, $status)
+    {
+        $invoice->state = $status;
+        $invoice->save();
+
+        return true;
+    }
 }
\ No newline at end of file