Merge pull request #7 from fruitcake/2.0

Merge upstream changes

Author: barryvdh

src/Message/AbstractResponse.php

@@ -12,6 +12,11 @@ abstract class AbstractResponse extends BaseAbstractResponse
      * @var string
      */
     protected $code;
+    
+    /**
+     * @var string
+     */
+    protected $message;
 
     /**
      * {@inheritdoc}
@@ -22,7 +27,7 @@ public function __construct(RequestInterface $request, $data)
 
         if (isset($this->data->error)) {
             $this->code = (string) $this->data->error->errorcode;
-            $this->data = (string) $this->data->error->errormessage;
+            $this->message = (string) $this->data->error->errormessage;
         }
     }
 
@@ -32,7 +37,7 @@ public function __construct(RequestInterface $request, $data)
     public function getMessage()
     {
         if (!$this->isSuccessful()) {
-            return $this->data;
+            return $this->message;
         }
 
         return null;

src/Message/PurchaseRequest.php

@@ -87,15 +87,9 @@ public function setShippingCountrycode($value)
      */
     protected function generateSignature()
     {
-        if ($this->getPaymentMethod() == 'klarna') {
-            return sha1(
-                $this->getTransactionId() . $this->getEntranceCode() . $this->getAmountInteger() .
-                $this->getShopId() . $this->getMerchantId() . $this->getMerchantKey()
-            );
-        }
         return sha1(
-            $this->getTransactionId() . $this->getEntranceCode() .
-            $this->getAmountInteger() . $this->getMerchantId() . $this->getMerchantKey()
+            $this->getTransactionId() . $this->getEntranceCode() . $this->getAmountInteger() .
+            $this->getShopId() . $this->getMerchantId() . $this->getMerchantKey()
         );
     }