Estcard support improved (#1)

Estcard support improved
renekorss · Jul 27, 2016 · 265b008 · 265b008
1 parent f07929e
commit 265b008
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/Estcard.php b/src/Estcard.php
@@ -28,7 +28,7 @@ class Estcard extends Banklink
      *
      * @var string
      */
-    protected $requestUrl = 'https://pos.estcard.ee/test-pos/iPayServlet';
+    protected $requestUrl = 'https://pos.estcard.ee/ecom/iPayServlet';
 
     /**
      * Test request url.

diff --git a/src/Protocol/ECommerce.php b/src/Protocol/ECommerce.php
@@ -30,6 +30,13 @@ class ECommerce implements Protocol
      * @var string
      */
     const PAYMENT_RESPONSE_SUCCESS = '000';
+
+    /**
+     * Abort (user aborted payment) response code.
+     *
+     * @var string
+     */
+    const PAYMENT_RESPONSE_ABORT = '017';
 
     /**
      * File path or file contents of public key.
@@ -146,6 +153,11 @@ public function getPaymentRequest(
             'delivery' => 'S',
             'additionalinfo' => $message
         );
+
+        // If additionalinfo is sent it needs to be included in MAC calculation
+        // But how (what position, etc) is not specified by available specification, seems to be secret
+        // So just remove it but leave it otherwise in the code - maybe somebody figures it out
+        unset($data['additionalinfo']);
 
         // Generate signature
         $data['mac'] = $this->getSignature($data, $encoding);
@@ -252,8 +264,14 @@ protected function generateSignature(array $data, $encoding = 'UTF-8')
             );
 
             $data['receipt_no'] = ProtocolHelper::mbStrPad($data['receipt_no'], 6, "0", STR_PAD_LEFT, $encoding);
+            $data['msgdata'] = ProtocolHelper::mbStrPad(
+                $data['respcode'] === self::PAYMENT_RESPONSE_ABORT && strlen($data['msgdata']) == 0 ? ' ' : $data['msgdata'],
+                40,
+                " ",
+                STR_PAD_RIGHT,
+                $encoding
+            );
             $data['respcode'] = ProtocolHelper::mbStrPad($data['respcode'], 3, "0", STR_PAD_LEFT, $encoding);
-            $data['msgdata'] = ProtocolHelper::mbStrPad($data['msgdata'], 40, " ", STR_PAD_RIGHT, $encoding);
             $data['actiontext'] = ProtocolHelper::mbStrPad($data['actiontext'], 40, " ", STR_PAD_RIGHT, $encoding);
         }
 

diff --git a/tests/EstcardTest.php b/tests/EstcardTest.php
@@ -17,7 +17,7 @@ class EstcardTest extends \PHPUnit_Framework_TestCase
     protected $bankClass = "RKD\Banklink\Estcard";
     protected $protocolClass = "RKD\Banklink\Protocol\ECommerce";
 
-    protected $requestUrl = 'https://pos.estcard.ee/test-pos/iPayServlet';
+    protected $requestUrl = 'https://pos.estcard.ee/ecom/iPayServlet';
     protected $testRequestUrl = 'http://localhost:8080/banklink/ec';
 
     /**
@@ -53,7 +53,6 @@ public function setUp()
             'ecuno'          => $this->orderId,
             'eamount'        => $this->amount * 100,
             'cur'            => $this->currency,
-            'additionalinfo' => $this->message,
             'feedBackUrl'    => $this->customRequestUrl,
             'lang'           => 'et',
             'delivery'       => 'S',