Merge pull request #7 from paynl/feature/PLUG-325

Feature/plug 325

Author: woutse

Pay/Api/Start.php

@@ -7,6 +7,7 @@ class Pay_Api_Start extends Pay_Api {
     protected $_action = 'start';
     private $_amount;
     private $_currency;
+    private $_orderNumber;
     private $_paymentOptionId;
     private $_paymentOptionSubId;
     private $_finishUrl;
@@ -30,6 +31,9 @@ class Pay_Api_Start extends Pay_Api {
     public function setCurrency($currency){
         $this->_currency = $currency;
     }
+    public function orderNumber($orderNumber){
+        $this->_orderNumber = $orderNumber;
+    }
     public function setPromotorId($promotorId){
         $this->_promotorId = $promotorId;
     }
@@ -233,6 +237,11 @@ protected function _getPostData() {
         if (!empty($this->_currency)) {
             $data['transaction']['currency'] = $this->_currency;
         }
+        if (!empty($this->_orderNumber)) {
+            $data['transaction']['orderNumber'] = $this->_orderNumber;
+        }
+
+
 
 
 

Pay/Controller/Payment.php

@@ -59,12 +59,9 @@ public function startTransaction() {
 
             $apiStart->setFinishUrl($returnUrl);
             $apiStart->setExchangeUrl($exchangeUrl);
-
-
             $apiStart->setPaymentOptionId($this->_paymentOptionId);
 
-			$currency_amount = $this->currency->format($order_info['total'], $order_info['currency_code'], '', false);
-
+		        $currency_amount = $this->currency->format($order_info['total'], $order_info['currency_code'], '', false);
             $amount = round($currency_amount * 100);
             $apiStart->setAmount($amount);
 
@@ -75,10 +72,12 @@ public function startTransaction() {
                 $optionSub = $_POST['optionSubId'];
                 $apiStart->setPaymentOptionSubId($optionSub);
             }
+
+            $apiStart->orderNumber($order_info['order_id']);
             $apiStart->setDescription($order_info['order_id']);
             $apiStart->setExtra1($order_info['order_id']);
-            $apiStart->setObject('opencart1 3.4.6');
-
+            $phpVersion = substr(phpversion(), 0, 3);
+            $apiStart->setObject(substr('opencart1 3.4.7 | ' . VERSION . ' | ' . $phpVersion, 0, 64));
 
             // Klantdata verzamelen en meesturen
             $strAddress = $order_info['shipping_address_1'] . ' ' . $order_info['shipping_address_2'];

admin/controller/payment/paynl_klarnakp.php

@@ -4,7 +4,7 @@
 
 require_once $autoload;
 class ControllerPaymentPaynlKlarnakp extends Pay_Controller_Admin {
-  protected $_paymentOptionId = 2265;
+  protected $_paymentOptionId = 1717;
   protected $_paymentMethodName = 'paynl_klarnakp';
 
   protected $_defaultLabel = 'KlarnaKP';

admin/language/dutch/payment/paynl3.php

@@ -4,7 +4,7 @@
 $_['button_save'] = 'Opslaan';
 $_['button_cancel'] = 'Annuleren';
 
-$version = '3.4.6';
+$version = '3.4.7';
 $css = 'position: relative;top: -19px;display: inline;left: 10px;';
 $url = '<a href="https://www.pay.nl" target="_blank"><img src="https://static.pay.nl/generic/images/50x50/logo.png" alt="PAY." title="PAY."/></a>' .
     '<div style="' . $css . '">Version: ' . $version . '</div>';

admin/language/english/payment/paynl3.php

@@ -4,7 +4,7 @@
 $_['button_save'] = 'Save';
 $_['button_cancel'] = 'Cancel';
 
-$version = '3.4.6';
+$version = '3.4.7';
 $css = 'position: relative;top: -19px;display: inline;left: 10px;';
 $url = '<a href="https://www.pay.nl" target="_blank"><img src="https://static.pay.nl/generic/images/50x50/logo.png" alt="PAY." title="PAY."/></a>' .
     '<div style="' . $css . '">Version: ' . $version . '</div>';

catalog/controller/payment/paynl_klarnakp.php

@@ -4,7 +4,7 @@
 
 require_once $autoload;
 class ControllerPaymentPaynlKlarnakp extends Pay_Controller_Payment {
-  protected $_paymentOptionId = 2265;
+  protected $_paymentOptionId = 1717;
   protected $_paymentMethodName = 'paynl_klarnakp';
 
 }