Merge c65623a into 3acc355

hiqdev · Jan 10, 2019 · 8226219 · 8226219
2 parents 3acc355 + c65623a
commit 8226219
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -17,6 +17,28 @@ abstract class AbstractRequest extends \Omnipay\Common\Message\AbstractRequest
 {
     protected $zeroAmountAllowed = false;
 
+    /**
+     * Get the purse.
+     *
+     * @return integer invid
+     */
+    public function getInvId()
+    {
+        return $this->getParameter('invid');
+    }
+
+    /**
+     * Set the purse.
+     *
+     * @param integer $invid invid
+     *
+     * @return self
+     */
+    public function setInvId($value)
+    {
+        return $this->setParameter('invid', $value);
+    }
+
     /**
      * Get the purse.
      *

diff --git a/src/Message/CompletePurchaseResponse.php b/src/Message/CompletePurchaseResponse.php
@@ -50,9 +50,8 @@ public function generateSignature()
     public function getCustomFields()
     {
         $fields = array_filter([
-            'Shp_TransactionId' => $this->getTransactionId(),
-            'Shp_Client' => $this->getClient(),
             'Shp_Currency' => $this->getCurrency(),
+            'Shp_TransactionId' => $this->getTransactionId(),
         ]);
 
         ksort($fields);

diff --git a/src/Message/PurchaseRequest.php b/src/Message/PurchaseRequest.php
@@ -19,7 +19,7 @@ public function getData()
         );
 
         return [
-            'InvId' => '0',
+            'InvId' => $this->getInvId(),
             'MrchLogin' => $this->getPurse(),
             'OutSum' => $this->getAmount(),
             'Desc' => $this->getDescription(),
@@ -34,7 +34,7 @@ public function generateSignature()
         $params = [
             $this->getPurse(),
             $this->getAmount(),
-            '0',
+            $this->getInvId(),
             $this->getSecretKey()
         ];