fix validate

maksa988 · Jan 15, 2019 · e3b9f61 · e3b9f61
1 parent 20d7d23
commit e3b9f61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Traits/CallerTrait.php b/src/Traits/CallerTrait.php
@@ -20,7 +20,7 @@ public function callSearchOrder(Request $request)
         if(is_null(config('freekassa.searchOrder')))
             throw new InvalidSearchOrder();
 
-        return App::call(config('freekassa.searchOrder'), [$request, $request->input('MERCHANT_ORDER_ID')]);
+        return App::call(config('freekassa.searchOrder'), [$request->input('MERCHANT_ORDER_ID')]);
     }
 
     /**
@@ -34,6 +34,6 @@ public function callPaidOrder(Request $request, $order)
         if(is_null(config('freekassa.paidOrder')))
             throw new InvalidPaidOrder();
 
-        return App::call(config('freekassa.paidOrder'), [$request, $order]);
+        return App::call(config('freekassa.paidOrder'), [$order]);
     }
 }
diff --git a/src/Traits/ValidateTrait.php b/src/Traits/ValidateTrait.php
@@ -49,8 +49,8 @@ public function validateSignature(Request $request)
      */
     public function validateOrderFromHandle(Request $request)
     {
-        return (! $this->AllowIP($request->ip())
-                    || ! $this->validate($request)
-                    || ! $this->validateSignature($request));
+        return ($this->AllowIP($request->ip())
+                    && $this->validate($request)
+                    && $this->validateSignature($request));
     }
 }