From 31ca7cc5a2ae51c07d027583b10c487bed75c5f2 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 21 Jul 2021 19:23:22 +0530
Subject: [PATCH 1/2] Invoice ID Recognizable

---
 .../Admin/src/DataGrids/InvoicesTransactionsDatagrid.php      | 3 ++-
 .../src/Http/Controllers/Sales/TransactionController.php      | 4 ++--
 .../src/Resources/views/sales/transactions/view.blade.php     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php b/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
index 0bd830803..9c5482dd5 100644
--- a/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
@@ -17,7 +17,8 @@ class InvoicesTransactionsDatagrid extends DataGrid
         $queryBuilder = DB::table('order_transactions')
             ->leftJoin('invoices as inv', 'order_transactions.invoice_id', '=', 'inv.id')
             ->select('order_transactions.id as id', 'order_transactions.transaction_id as transaction_id', 'order_transactions.invoice_id as invoice_id', 'order_transactions.created_at as created_at')
-            ->where('order_transactions.invoice_id', request('id'));
+            ->where('order_transactions.invoice_id', request('id'))
+            ->orWhere('order_transactions.invoice_id', request('id'));
 
 
         $this->addFilter('id', 'order_transactions.id');
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php
index f0fe2c463..f458e709d 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php
@@ -100,7 +100,7 @@ class TransactionController extends Controller
             'amount'         => 'required|numeric'
         ]);
 
-        $invoice = $this->invoiceRepository->find($request->invoice_id);
+        $invoice = $this->invoiceRepository->where('increment_id', $request->invoice_id)->first();
 
         if ($invoice) {
 
@@ -121,7 +121,7 @@ class TransactionController extends Controller
             $transactionData['transaction_id'] = $transactionId;
             $transactionData['type']           = $request->payment_method;
             $transactionData['payment_method'] = $request->payment_method;
-            $transactionData['invoice_id']     = $request->invoice_id;
+            $transactionData['invoice_id']     = $invoice->id;
             $transactionData['order_id']       = $invoice->order_id;
             $transactionData['status']         = 'paid';
             $transactionData['data']           = json_encode($data);
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/transactions/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/transactions/view.blade.php
index f219d817e..966aeab71 100644
--- a/packages/Webkul/Admin/src/Resources/views/sales/transactions/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/transactions/view.blade.php
@@ -60,7 +60,7 @@
                                     </span>
 
                                     <span class="value">
-                                        <a href="{{ route('admin.sales.invoices.view', $transaction->order_id)}}">
+                                        <a href="{{ route('admin.sales.invoices.view', $transaction->invoice_id)}}">
                                             {{ $transaction->invoice_id }}
                                         </a>
                                     </span>

From 15d31d8f877b95ff15df357ec6cca84452d1bc66 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 21 Jul 2021 19:27:40 +0530
Subject: [PATCH 2/2] Reverted One File

---
 .../Admin/src/DataGrids/InvoicesTransactionsDatagrid.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php b/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
index 9c5482dd5..0bd830803 100644
--- a/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
@@ -17,8 +17,7 @@ class InvoicesTransactionsDatagrid extends DataGrid
         $queryBuilder = DB::table('order_transactions')
             ->leftJoin('invoices as inv', 'order_transactions.invoice_id', '=', 'inv.id')
             ->select('order_transactions.id as id', 'order_transactions.transaction_id as transaction_id', 'order_transactions.invoice_id as invoice_id', 'order_transactions.created_at as created_at')
-            ->where('order_transactions.invoice_id', request('id'))
-            ->orWhere('order_transactions.invoice_id', request('id'));
+            ->where('order_transactions.invoice_id', request('id'));
 
 
         $this->addFilter('id', 'order_transactions.id');