Merge pull request #11 from DrH97/dev-dr

Minor fixes
DrH97 · Jan 9, 2022 · aa3b7da · aa3b7da
2 parents 0589a70 + d08c0ba
commit aa3b7da
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Total Downloads](https://poser.pugx.org/DrH97/laravel-tanda/downloads)](https://packagist.org/packages/drh/laravel-tanda)
 [![License](https://poser.pugx.org/DrH97/laravel-tanda/license)](https://github.com/DrH97/laravel-tanda/blob/master/LICENSE.md)
 
-This is a <i>Laravel 8</i> package that interfaces with [Tanda](https://www.tanda.africa/) Payments Api.
+This is a <i>Laravel</i> package that interfaces with [Tanda](https://www.tanda.africa/) Payments Api.
 The API enables you to initiate mobile payments, disburse payments to mobile and bank, purchase airtime & bundles* and to pay for utility bills.
 
 Check out their [api documentation](https://www.tanda.africa/api).

diff --git a/src/Library/Core.php b/src/Library/Core.php
@@ -2,7 +2,10 @@
 
 namespace DrH\Tanda\Library;
 
+use DrH\Tanda\Events\TandaRequestFailedEvent;
+use DrH\Tanda\Events\TandaRequestSuccessEvent;
 use DrH\Tanda\Exceptions\TandaException;
+use DrH\Tanda\Models\TandaRequest;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
@@ -159,4 +162,20 @@ private function getReferenceParameters(): array
             ]
         ];
     }
+
+    /**
+     * @param TandaRequest $request
+     * @return void
+     */
+    protected function fireTandaEvent(TandaRequest $request): void
+    {
+        if ($request->status == 000001) {
+            return;
+        }
+        if ($request->status == 000000) {
+            event(new TandaRequestSuccessEvent($request));
+        } else {
+            event(new TandaRequestFailedEvent($request));
+        }
+    }
 }
diff --git a/src/Library/Utility.php b/src/Library/Utility.php
@@ -2,8 +2,6 @@
 
 namespace DrH\Tanda\Library;
 
-use DrH\Tanda\Events\TandaRequestFailedEvent;
-use DrH\Tanda\Events\TandaRequestSuccessEvent;
 use DrH\Tanda\Exceptions\TandaException;
 use DrH\Tanda\Models\TandaRequest;
 use GuzzleHttp\Exception\GuzzleException;
@@ -195,30 +193,11 @@ private function saveRequest(array $response, int $relationId = null): TandaRequ
         }
     }
 
-    /**
-     * @param TandaRequest $request
-     * @return void
-     */
-    private function fireTandaEvent(TandaRequest $request): void
-    {
-//        TODO: Check on proper status codes
-        if ($request->status == 000001) {
-            return;
-        }
-        if ($request->status == 000000) {
-            event(new TandaRequestSuccessEvent($request));
-        } else {
-            event(new TandaRequestFailedEvent($request));
-        }
-    }
-
     /**
      * @throws TandaException
      */
     private function validate(string $validationType, int $amount): void
     {
-        $min = 0;
-        $max = 0;
 
         switch ($validationType) {
             case "AIRTIME":