From 439092f574f39bf0835c3aee907905ee2b69ee52 Mon Sep 17 00:00:00 2001
From: AyoubKharbach <ayoubkharbach@AyoubKharbachs-MacBook-Pro.local>
Date: Wed, 29 Sep 2021 17:04:05 +0100
Subject: [PATCH 1/3] throw error message if the transaction doesnt exist

---
 resources/lang/ar.json             | 3 ++-
 src/Support/TransactionBuilder.php | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/lang/ar.json b/resources/lang/ar.json
index a5e4fc1..16de575 100644
--- a/resources/lang/ar.json
+++ b/resources/lang/ar.json
@@ -1,3 +1,4 @@
 {
-    "failed_message": "حدث خطأ في عملية الدفع يرجى المحاولة مرة أخرى."
+    "failed_message": "حدث خطأ في عملية الدفع يرجى المحاولة مرة أخرى.",
+    "invalid_checkout_id": "checkout_id غير صالح"
 }
\ No newline at end of file
diff --git a/src/Support/TransactionBuilder.php b/src/Support/TransactionBuilder.php
index 4a535bb..1365d67 100644
--- a/src/Support/TransactionBuilder.php
+++ b/src/Support/TransactionBuilder.php
@@ -3,7 +3,7 @@
 namespace Devinweb\LaravelHyperpay\Support;
 
 use Illuminate\Support\Arr;
-
+use Illuminate\Validation\ValidationException;
 class TransactionBuilder
 {
     /**
@@ -60,6 +60,10 @@ public function findByIdOrCheckoutId($id)
         $transaction_model = config('hyperpay.transaction_model');
         $transaction = app($transaction_model)->whereId($id)->orWhere('checkout_id', $id)->first();
 
+        if(! $transaction){
+            throw ValidationException::withMessages([__('invalid_checkout_id')]);
+        }
+
         return $transaction;
     }
 

From 18cf0cf5aac4736a76fe24431af9d3462fb1c8ee Mon Sep 17 00:00:00 2001
From: darbaoui imad <darbaoui@gmail.com>
Date: Wed, 6 Oct 2021 11:59:17 +0100
Subject: [PATCH 2/3] fix tests

---
 phpunit.xml.dist | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a92ca53..cd3de3b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,11 +10,8 @@
          stopOnFailure="false"
 >
     <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
+        <testsuite name="Package Test">
+            <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
     <php>

From 379337fe46c4ad8699f16c327cf6ce8e8bb987c3 Mon Sep 17 00:00:00 2001
From: darbaoui imad <darbaoui@users.noreply.github.com>
Date: Wed, 6 Oct 2021 11:03:31 +0000
Subject: [PATCH 3/3] Apply fixes from StyleCI

---
 src/Support/TransactionBuilder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Support/TransactionBuilder.php b/src/Support/TransactionBuilder.php
index 1365d67..4a17258 100644
--- a/src/Support/TransactionBuilder.php
+++ b/src/Support/TransactionBuilder.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
+
 class TransactionBuilder
 {
     /**
@@ -60,7 +61,7 @@ public function findByIdOrCheckoutId($id)
         $transaction_model = config('hyperpay.transaction_model');
         $transaction = app($transaction_model)->whereId($id)->orWhere('checkout_id', $id)->first();
 
-        if(! $transaction){
+        if (! $transaction) {
             throw ValidationException::withMessages([__('invalid_checkout_id')]);
         }