-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Return url was showing the cart on succesfull order.
Now it correctly redirects to the thank you page
- Loading branch information
Andy Pieters
committed
Sep 6, 2016
0 parents
commit cbcde2a
Showing
56 changed files
with
3,354 additions
and
0 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
# $Id$ | ||
# | ||
# LANGUAGE translation of Drupal (general) | ||
# Copyright YEAR NAME <EMAIL@ADDRESS> | ||
# Generated from files: | ||
# paynl.inc.php: n/a | ||
# paynl_main/paynl_main.info: n/a | ||
# paynl_main/paynl_main.module: n/a | ||
# paynl_ideal/paynl_ideal.info: n/a | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: PROJECT VERSION\n" | ||
"POT-Creation-Date: 2014-12-29 16:18+0100\n" | ||
"PO-Revision-Date: 2015-01-14 15:23+0100\n" | ||
"Last-Translator: NAME <EMAIL@ADDRESS>\n" | ||
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=utf-8\n" | ||
"Content-Transfer-Encoding: 8bit\n" | ||
"Language: nl\n" | ||
"X-Generator: Poedit 1.7.1\n" | ||
|
||
#: paynl.inc.php:30 | ||
msgid "Choose your bank:" | ||
msgstr " Kies uw bank:" | ||
|
||
#: paynl.inc.php:256 | ||
msgid "Payment with !method succeeded for order !order_id" | ||
msgstr "Betaling via !method voor bestelling !order_id is gelukt" | ||
|
||
#: paynl.inc.php:278;291 | ||
msgid "Payment with !method in progress for order !order_id" | ||
msgstr "Betaling via !method voor bestelling !order_id is in behandeling" | ||
|
||
#: paynl.inc.php:299;312 | ||
msgid "Pament with !method cancelled for order !order_id" | ||
msgstr "Betaling via !method voor bestelling !order_id werd afgebroken" | ||
|
||
#: paynl.inc.php:354 | ||
msgid "Payment could not be checked. The order ID was not specified." | ||
msgstr "De betaling kon niet gecontroleerd worden. Het order ID is niet meegestuurd." | ||
|
||
#: paynl.inc.php:380 | ||
msgid "Could not process the payment. There was an error: !message" | ||
msgstr "De betaling kon niet gedaan worden. De bestelling gaf de volgende fout: !message" | ||
|
||
#: paynl.inc.php:396 | ||
msgid "Pay.nl IPN reported a succesful payment of !amount on order !order_id" | ||
msgstr "Pay.nl IPN geeft een voltooide betaling door van !amount op order id !order_id" | ||
|
||
#: paynl.inc.php:409 | ||
msgid "Pay.nl IPN reported processing the payment of !amount for order !order_id" | ||
msgstr "Pay.nl IPN geeft door bezig te zijn met een betaling door van !amount op order id !order_id" | ||
|
||
#: paynl.inc.php:419;423 | ||
msgid "The payment was cancelled. Please try again." | ||
msgstr "De betaling werd afgebroken. Probeer het s.v.p opnieuw." | ||
|
||
#: paynl.inc.php:241;269;291;312;329;340;353;375;418 | ||
#: paynl_main/paynl_main.info:0 | ||
msgid "Pay.nl" | ||
msgstr "Pay.nl" | ||
|
||
#: paynl.inc.php:241 | ||
msgid "IPN request not correct. Order with order id !order_id does not exist." | ||
msgstr "IPN verzoek niet correct; order met order_id !order_id bestaat niet." | ||
|
||
#: paynl.inc.php:269 | ||
msgid "Payment with !method for order !order_id sucessful" | ||
msgstr "Betaling via !method voor bestelling !order_id is gelukt" | ||
|
||
#: paynl.inc.php:329;340 | ||
msgid "Error retrieving order information from Pay.nl with order !order_id: !message" | ||
msgstr "Fout met het ophalen van ordergegevens bij pay.nl met order Id !order_id: !message" | ||
|
||
#: paynl.inc.php:353 | ||
msgid "No order ID specified." | ||
msgstr "Geen order ID meegestuurd." | ||
|
||
#: paynl.inc.php:375 | ||
msgid "Could not process the payment. The Pay.nl API gave this error: !message" | ||
msgstr "De betaling kon niet gedaan worden. De Pay.nl API gaf de volgende fout: !message" | ||
|
||
#: paynl.inc.php:418 | ||
msgid "The payment was cancelled." | ||
msgstr "De betaling werd afgebroken." | ||
|
||
#: paynl_main/paynl_main.module:21 | ||
msgid "The adjustment field can be used to associate a fee or discount with a payment method. Specify a value that is a flat amount or a percentage of the subtotal to be added or subtracted when a payment method is chosen at checkout. Examples: 3%, 1.00, -5.5%, -2" | ||
msgstr "Het Kosten veld kan worden gebruikt worden om een korting of extra kosten door te berekenen voor een betaalmethode. Vul een bedrag in centen of een percentage in dat van het subtotaal toegevoegd of afgetrokken moet worden wanneer een betaalmethode gekozen is. Voorbeelden: 3%, 100, -5.5%, -250" | ||
|
||
#: paynl_main/paynl_main.module:45 | ||
msgid "Pay.nl settings" | ||
msgstr "Pay.nl instellingen" | ||
|
||
#: paynl_main/paynl_main.module:50 | ||
msgid "You can find your API token here: <a href=\"https://admin.pay.nl/my_merchant\" target=\"_blank\">https://admin.pay.nl/my_merchant</a> (on the bottom)." | ||
msgstr "U kunt API token hier vinden: <a href=\"https://admin.pay.nl/my_merchant\" target=\"_blank\">https://admin.pay.nl/my_merchant</a> (aan de onderkant)." | ||
|
||
#: paynl_main/paynl_main.module:56 | ||
msgid "You can find your service id here: <a href=\"https://admin.pay.nl/programs/programs\" target=\"_blank\">https://admin.pay.nl/programs/programs</a>. The serviceId starts with <strong>SL-</strong> ." | ||
msgstr "U kunt uw service ID hier vinden: <a href=\"https://admin.pay.nl/programs/programs\" target=\"_blank\">https://admin.pay.nl/programs/programs</a>. de service ID begint met <strong>SL-</strong> ." | ||
|
||
#: paynl_main/paynl_main.module:68 | ||
msgid "Could not retrieve information from Pay.nl. Check to see if the API token and service ID has been set correctly." | ||
msgstr "Kon geen verbinding maken met Pay.nl. Controleer of u de API token en service ID juist heeft ingesteld." | ||
|
||
#: paynl_main/paynl_main.module:112;181 | ||
msgid "Payment method" | ||
msgstr "Betaalmethode" | ||
|
||
#: paynl_main/paynl_main.module:181 | ||
msgid "List position" | ||
msgstr "Lijstpositie" | ||
|
||
#: paynl_main/paynl_main.module:181 | ||
msgid "Adjustment (in cents)" | ||
msgstr "Extra kosten (in centen)" | ||
|
||
#: paynl_main/paynl_main.module:181 | ||
msgid "Operations" | ||
msgstr "Instellingen" | ||
|
||
#: paynl_main/paynl_main.module:266 | ||
msgid "Maximum amount (in cents)" | ||
msgstr "Maximum bedrag (in centen)" | ||
|
||
#: paynl_main/paynl_main.module:215 | ||
msgid "Receive a !adjustment discount when paying by !method." | ||
msgstr "Korting van !adjustment wanneer u met !method betaalt." | ||
|
||
#: paynl_main/paynl_main.module:218 | ||
msgid "There is a !adjustment fee when paying by !method." | ||
msgstr "Er wordt een extra !adjustment in rekening gebracht wanneer u met !method betaalt." | ||
|
||
#: paynl_main/paynl_main.module:260 | ||
msgid "@name fee" | ||
msgstr "Extra kosten @name" | ||
|
||
#: paynl_main/paynl_main.module:277 | ||
msgid "@name discount" | ||
msgstr "@name korting" | ||
|
||
#: paynl_main/paynl_main.info:0 | ||
msgid "paynl" | ||
msgstr "paynl" | ||
|
||
#: paynl_main/paynl_main.info:0 paynl_ideal/paynl_ideal.info:0 | ||
msgid "Ubercart - payment" | ||
msgstr "Ubercart - payment" | ||
|
||
#: paynl_ideal/paynl_ideal.info:0 | ||
msgid "iDEAL via Pay.nl" | ||
msgstr "iDEAL via Pay.nl" | ||
|
||
#: paynl_ideal/paynl_ideal.info:0 | ||
msgid "Betalingen via Pay.nl." | ||
msgstr "Betalingen via Pay.nl." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<?php | ||
/** | ||
* Generic autoloader for classes | ||
*/ | ||
class Pay_Autoload { | ||
|
||
public static function register(){ | ||
spl_autoload_register(array(__CLASS__, 'spl_autoload_register')); | ||
} | ||
|
||
public static function spl_autoload_register($class_name) { | ||
$dir = realpath(dirname(__FILE__)); | ||
$class_path = $dir . '/' . str_replace('_', '/', $class_name) . '.php'; | ||
|
||
if (file_exists($class_path)){ | ||
require_once $class_path; | ||
} | ||
} | ||
} | ||
|
||
Pay_Autoload::register(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
<?php | ||
|
||
class Pay_Api { | ||
|
||
const REQUEST_TYPE_POST = 1; | ||
const REQUEST_TYPE_GET = 0; | ||
|
||
protected $_apiUrl = 'http://rest-api.pay.nl'; | ||
protected $_version = 'v3'; | ||
protected $_controller = ''; | ||
protected $_action = ''; | ||
protected $_serviceId = ''; | ||
protected $_apiToken = ''; | ||
protected $_requestType = self::REQUEST_TYPE_GET; | ||
protected $_postData = array(); | ||
|
||
|
||
/** | ||
* Set the serviceid | ||
* The serviceid always starts with SL- and can be found on: https://admin.pay.nl/programs/programs | ||
* | ||
* @param string $serviceId | ||
*/ | ||
public function setServiceId($serviceId) { | ||
$this->_serviceId = $serviceId; | ||
} | ||
|
||
/** | ||
* Set the API token | ||
* The API token is used to identify your company. | ||
* The API token can be found on: https://admin.pay.nl/my_merchant on the bottom | ||
* | ||
* @param string $apiToken | ||
*/ | ||
public function setApiToken($apiToken) { | ||
$this->_apiToken = $apiToken; | ||
} | ||
|
||
protected function _getPostData() { | ||
|
||
return $this->_postData; | ||
} | ||
|
||
protected function _processResult($data) { | ||
return $data; | ||
} | ||
|
||
private function _getApiUrl() { | ||
if ($this->_version == '') { | ||
throw new Pay_Exception('version not set', 1); | ||
} | ||
if ($this->_controller == '') { | ||
throw new Pay_Exception('controller not set', 1); | ||
} | ||
if ($this->_action == '') { | ||
throw new Pay_Exception('action not set', 1); | ||
} | ||
|
||
return $this->_apiUrl . '/' . $this->_version . '/' . $this->_controller . '/' . $this->_action . '/json/'; | ||
} | ||
|
||
public function getPostData(){ | ||
return $this->_getPostData(); | ||
} | ||
public function doRequest() { | ||
if ($this->_getPostData()) { | ||
|
||
$url = $this->_getApiUrl(); | ||
$data = $this->_getPostData(); | ||
|
||
$strData = http_build_query($data, '', '&'); | ||
|
||
$apiUrl = $url; | ||
|
||
$ch = curl_init(); | ||
if ($this->_requestType == self::REQUEST_TYPE_GET) { | ||
$apiUrl .= '?' . $strData; | ||
} else { | ||
curl_setopt($ch, CURLOPT_POSTFIELDS, $strData); | ||
} | ||
|
||
|
||
curl_setopt($ch, CURLOPT_URL, $apiUrl); | ||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); | ||
|
||
$result = curl_exec($ch); | ||
|
||
|
||
if ($result == false) { | ||
$error = curl_error($ch); | ||
} | ||
curl_close($ch); | ||
|
||
$arrResult = json_decode($result, true); | ||
|
||
if ($this->validateResult($arrResult)) { | ||
return $this->_processResult($arrResult); | ||
} | ||
} | ||
} | ||
|
||
protected function validateResult($arrResult) { | ||
if ($arrResult['request']['result'] == 1) { | ||
return true; | ||
} else { | ||
if(isset($arrResult['request']['errorId']) && isset($arrResult['request']['errorMessage']) ){ | ||
throw new Pay_Api_Exception($arrResult['request']['errorId'] . ' - ' . $arrResult['request']['errorMessage']); | ||
} elseif(isset($arrResult['error'])){ | ||
throw new Pay_Api_Exception($arrResult['error']); | ||
} else { | ||
throw new Pay_Api_Exception('Unexpected api result'); | ||
} | ||
} | ||
} | ||
} |
4 changes: 4 additions & 0 deletions
4
sites/all/modules/paynl/includes/classes/Pay/Api/Exception.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?php | ||
class Pay_Api_Exception extends Pay_Exception{ | ||
|
||
} |
65 changes: 65 additions & 0 deletions
65
sites/all/modules/paynl/includes/classes/Pay/Api/Getservice.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
<?php | ||
|
||
class Pay_Api_Getservice extends Pay_Api { | ||
|
||
protected $_version = 'v3'; | ||
protected $_controller = 'transaction'; | ||
protected $_action = 'getService'; | ||
|
||
protected function _getPostData() { | ||
$data = parent::_getPostData(); | ||
|
||
// Checken of alle verplichte velden geset zijn | ||
if ($this->_apiToken == '') { | ||
throw new Pay_Exception('apiToken not set', 1); | ||
} else { | ||
$data['token'] = $this->_apiToken; | ||
} | ||
if (empty($this->_serviceId)) { | ||
throw new Pay_Exception('serviceId not set', 1); | ||
} else { | ||
$data['serviceId'] = $this->_serviceId; | ||
} | ||
return $data; | ||
} | ||
protected function _processResult($arrReturn) { | ||
if (!$arrReturn['request']['result']) { | ||
return $arrReturn; | ||
} | ||
|
||
$arrReturn['paymentOptions'] = array(); | ||
|
||
$countryOptionList = $arrReturn['countryOptionList']; | ||
unset($arrReturn['countryOptionList']); | ||
if (isset($countryOptionList) && is_array($countryOptionList)) { | ||
foreach ($countryOptionList AS $strCountrCode => $arrCountry) { | ||
foreach ($arrCountry['paymentOptionList'] AS $arrPaymentProfile) { | ||
|
||
if (!isset($arrReturn['paymentOptions'][$arrPaymentProfile['id']])) { | ||
$arrReturn['paymentOptions'][$arrPaymentProfile['id']] = array( | ||
'id' => $arrPaymentProfile['id'], | ||
'name' => $arrPaymentProfile['name'], | ||
'visibleName' => $arrPaymentProfile['name'], | ||
'img' => $arrPaymentProfile['img'], | ||
'path' => $arrPaymentProfile['path'], | ||
'paymentOptionSubList' => array(), | ||
'countries' => array(), | ||
); | ||
} | ||
|
||
if (!empty($arrPaymentProfile['paymentOptionSubList'])) { | ||
$arrReturn['paymentOptions'][$arrPaymentProfile['id']]['paymentOptionSubList'] = $arrPaymentProfile['paymentOptionSubList']; | ||
} | ||
|
||
|
||
$arrReturn['paymentOptions'][$arrPaymentProfile['id']]['countries'][$strCountrCode] = array( | ||
'id' => $strCountrCode, | ||
'name' => $arrCountry['visibleName'], | ||
); | ||
} | ||
} | ||
} | ||
return $arrReturn; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?php | ||
|
||
class Pay_Api_Info extends Pay_Api { | ||
|
||
protected $_version = 'v3'; | ||
protected $_controller = 'transaction'; | ||
protected $_action = 'info'; | ||
|
||
public function setTransactionId($transactionId){ | ||
$this->_postData['transactionId'] = $transactionId; | ||
} | ||
protected function _getPostData() { | ||
$data = parent::_getPostData(); | ||
if ($this->_apiToken == '') { | ||
throw new Pay_Exception('apiToken not set', 1); | ||
} else { | ||
$data['token'] = $this->_apiToken; | ||
} | ||
if(!isset($this->_postData['transactionId'])){ | ||
throw new Pay_Exception('transactionId is not set', 1); | ||
} | ||
return $data; | ||
} | ||
} |
Oops, something went wrong.