From bc6f2de1b456c2e0b04cff315858230247e8b988 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Sat, 23 Oct 2021 13:18:29 +0200 Subject: [PATCH] fixed transactions --- .../Http/Controllers/Sales/TransactionController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php index f458e709d..13823e415 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php @@ -123,17 +123,17 @@ class TransactionController extends Controller $transactionData['payment_method'] = $request->payment_method; $transactionData['invoice_id'] = $invoice->id; $transactionData['order_id'] = $invoice->order_id; + $transactionData['amount'] = $request->amount; $transactionData['status'] = 'paid'; $transactionData['data'] = json_encode($data); $this->orderTransactionRepository->create($transactionData); - if ($invoice->base_grand_total == $request->amount) { + $transactionTotal = $this->orderTransactionRepository->where('invoice_id', $invoice->id)->sum('amount'); + + if ($transactionTotal >= $invoice->base_grand_total) { $this->orderRepository->updateOrderStatus($order, 'processing'); $update = $this->invoiceRepository->updateState($invoice, "paid"); - } else { - $this->orderRepository->updateOrderStatus($order, 'pending'); - $update = $this->invoiceRepository->updateState($invoice, "pending"); } session()->flash('success', trans('admin::app.sales.transactions.response.transaction-saved')); @@ -187,4 +187,4 @@ class TransactionController extends Controller return $detailsData; } -} \ No newline at end of file +}