merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into safari-issue

This commit is contained in:
devansh bawari 2021-07-26 14:58:32 +05:30
parent d5f6ad11cb e0d7a0e79f
commit 8f7b43ca8d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php
View File

@ -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);

2
packages/Webkul/Admin/src/Resources/views/sales/transactions/view.blade.php
View File

@ -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>