some fixes and key map

src/SenangPayDriver.php

@@ -31,10 +31,17 @@ class SenangPayDriver implements PaymentGatewayDriver
      */
     protected $secret_key;
 
-    public function __construct(string $endpoint, string $merchant_id, string $secret_key){
+    /**
+     * @var array
+     */
+    protected $keyMap;
+
+    public function __construct(string $endpoint, string $merchant_id, string $secret_key, array $keyMap)
+    {
         $this->endpoint = rtrim($endpoint, '/');
         $this->merchant_id = $merchant_id;
         $this->secret_key = $secret_key;
+        $this->keyMap = $keyMap;
     }
 
     public function createPaymentURL(PayableEntity $payable, array $options = []): string
@@ -45,36 +52,44 @@ class SenangPayDriver implements PaymentGatewayDriver
 
         $detail = preg_replace('/[^A-Z0-9,\-_]/i', '_', $detail);
         $amount = sprintf('%0.2f', $amount);
-        $hash = md5($this->secret_key.$detail.$amount.$order_id);
+        $hash = md5($this->secret_key . $detail . $amount . $order_id);
 
-        return "$this->endpoint/payment/$this->merchant_id?".
+        return "$this->endpoint/payment/$this->merchant_id?" .
             http_build_query(compact('detail', 'order_id', 'amount', 'hash'));
     }
 
     public function verifyGatewayReturn(Request $request): bool
     {
-        $hash = $request->query->get('hash');
+        $hash = $request->query->get($this->keyMap['hash']);
         return $hash == $this->computeHash($request->request->all());
     }
 
     public function verifyGatewayCallback(Request $request, Response &$response = null): bool
     {
         $response = Res::make('OK');
-        $hash = $request->request->get('hash');
+        $hash = $request->request->get($this->keyMap['hash']);
         return $hash == $this->computeHash($request->request->all());
     }
 
-    public function getBillIdFromRequest(Request $request): ?string{
-        return $request->get('order_id');
+    public function getBillIdFromRequest(Request $request): ?string
+    {
+        return $request->get($this->keyMap['order_id']);
     }
 
     public function getBillStatus(Request $request): ?int
     {
-        return $request->request->get('status') == 1 ? Payment::SUCCESS : Payment::PENDING;
+        $status = $request->get($this->keyMap['status_id']);
+        if ($status == null) {
+            return null;
+        } else {
+            return $status == 1 ? Payment::SUCCESS : Payment::PENDING;
+        }
     }
 
-    public function computeHash($payload){
-        $payload['hash'] = '[HASH]';
-        return md5($this->secret_key.'?'.http_build_query($payload));
+    public function computeHash($payload)
+    {
+        $query = http_build_query($payload);
+        $query = preg_replace('/(^|&)hash=[^&]*($|&)/','$1hash=[HASH]$2', $query);
+        return md5($this->secret_key . '?' . $query);
     }
 }

src/SenangPayServiceProvider.php

@@ -24,6 +24,11 @@ class SenangPayServiceProvider extends ServiceProvider
                 'endpoint' => env('SENANGPAY_ENDPOINT', 'https://app.senangpay.my/'),
                 'merchant_id' => env('SENANGPAY_MERCHANT_ID'),
                 'secret_key' => env('SENANGPAY_SECRET_KEY'),
+                'key_map' => [
+                    'status_id' => 'status_id',
+                    'order_id' => 'order_id',
+                    'hash' => 'hash'
+                ],
             ],
             $config->get('payment.gateway.senangpay', [])
         ));