From c586afa053f22c245023ca7eb1e802e199bfd312 Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Thu, 26 Jul 2018 11:57:41 +0200 Subject: [PATCH 1/6] Bugfix 18.06.26: fixed following bugs: - spaces in front or after payment credentials, caused the transaction to fail. - Secured invoice was not disabled after customer was denied by insurance provider. - Error mail was sent when automatic finalize failed because Reservation was already finalized. --- version/113/frontend/heidelpay.hook181.php | 172 ++++++++---------- version/114/frontend/heidelpay.hook181.php | 37 ++-- .../heidelpay_standard.class.php | 16 +- .../helper/HeidelpayBasketHelper.php | 16 +- 4 files changed, 112 insertions(+), 129 deletions(-) diff --git a/version/113/frontend/heidelpay.hook181.php b/version/113/frontend/heidelpay.hook181.php index 4072237..c713376 100644 --- a/version/113/frontend/heidelpay.hook181.php +++ b/version/113/frontend/heidelpay.hook181.php @@ -7,9 +7,8 @@ */ - require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/vendor/autoload.php'; -require_once __DIR__.'/xmlQuery.php'; +require_once __DIR__ . '/xmlQuery.php'; use Heidelpay\XmlQuery; @@ -19,138 +18,111 @@ $oBestellung = Shop::DB()->query( - "SELECT tbestellung.kBestellung, tzahlungsart.cModulId + "SELECT tbestellung.kBestellung, tzahlungsart.cModulId FROM tbestellung LEFT JOIN tzahlungsart ON tbestellung.kZahlungsart = tzahlungsart.kZahlungsart WHERE tbestellung.kBestellung = '" . (int)$args_arr['oBestellung']->kBestellung . "' LIMIT 1", 1 - ); - - $_query_live_url = 'https://heidelpay.hpcgw.net/TransactionCore/xml'; - $_query_sandbox_url = 'https://test-heidelpay.hpcgw.net/TransactionCore/xml'; - - if ($oPlugin->oPluginEinstellungAssoc_arr [$oBestellung->cModulId. '_transmode'] == 'LIVE'){ - - $url = $_query_live_url; - - }else{ - - $url = $_query_sandbox_url; - }; - - - -// if Versand oder Teilversand - Status s. defines_inc.php +); -$payMethod = explode("_", $oBestellung->cModulId); +$_query_live_url = 'https://heidelpay.hpcgw.net/TransactionCore/xml'; +$_query_sandbox_url = 'https://test-heidelpay.hpcgw.net/TransactionCore/xml'; -if(($args_arr['status'] === 4 OR $args_arr['status'] === 5 ) AND $payMethod['2'] === 'heidelpaygesicherterechnungplugin' ){ +if ($oPlugin->oPluginEinstellungAssoc_arr [$oBestellung->cModulId . '_transmode'] == 'LIVE') { + $url = $_query_live_url; +} else { -preg_match('/[0-9]{4}\.[0-9]{4}\.[0-9]{4}/', $args_arr['oBestellung']->cKommentar, $result); + $url = $_query_sandbox_url; +}; -if(!empty($result[0])){ +// if Versand oder Teilversand - Status s. defines_inc.php - - $xml_params = array( - "type" => "STANDARD", - "methods" => array("IV"), - "types" => array("PA"), - "identification" => $result, - "procRes" => "ACK", - "transType" => "PAYMENT" +$payMethod = explode("_", $oBestellung->cModulId); - ); +if (($args_arr['status'] === 4 OR $args_arr['status'] === 5) AND $payMethod['2'] === 'heidelpaygesicherterechnungplugin') { + preg_match('/[0-9]{4}\.[0-9]{4}\.[0-9]{4}/', $args_arr['oBestellung']->cKommentar, $result); - $xml_params_fin = array( - "type" => "LINKED_TRANSACTIONS", - "methods" => array("IV"), - "types" => array("FI"), - "identification" => $result, - "procRes" => "ACK", - "transType" => "PAYMENT" + if (!empty($result[0])) { - ); + $xml_params = array( + "type" => "STANDARD", + "methods" => array("IV"), + "types" => array("PA"), + "identification" => $result, + "procRes" => "ACK", + "transType" => "PAYMENT" + ); - + $xml_params_fin = array( + "type" => "LINKED_TRANSACTIONS", + "methods" => array("IV"), + "types" => array("FI"), + "identification" => $result, + "procRes" => "ACK", + "transType" => "PAYMENT" - - - $sandboxMode = 1; - - $xmlQueryClass = new XmlQuery(); + ); + $sandboxMode = 1; - $config = array( - "sandbox" => $sandboxMode, - "security_sender" => $oPlugin->oPluginEinstellungAssoc_arr ['sender'], - "user_login" => $oPlugin->oPluginEinstellungAssoc_arr ['user'], - "user_password" => $oPlugin->oPluginEinstellungAssoc_arr ['pass'] - ); + $xmlQueryClass = new XmlQuery(); - $resLinkedTxn = $xmlQueryClass->doRequest(array('load' => urlencode($xmlQueryClass->getXMLRequest($config, $xml_params_fin))), $url); - + $config = array( + "sandbox" => $sandboxMode, + "security_sender" => $oPlugin->oPluginEinstellungAssoc_arr ['sender'], + "user_login" => $oPlugin->oPluginEinstellungAssoc_arr ['user'], + "user_password" => $oPlugin->oPluginEinstellungAssoc_arr ['pass'] + ); + $resLinkedTxn = $xmlQueryClass->doRequest(array('load' => urlencode($xmlQueryClass->getXMLRequest($config, $xml_params_fin))), $url); + $resLinkedTxnXMLObject = new SimpleXMLElement($resLinkedTxn); - $resLinkedTxnXMLObject = new SimpleXMLElement($resLinkedTxn); + $resLinkedTxnCount = (string)$resLinkedTxnXMLObject->Result['count']; + //check if FI already exists, if so stop executing + foreach ($resLinkedTxnXMLObject->Result->Transaction as $key => $val) { - - $resLinkedTxnCount = (string)$resLinkedTxnXMLObject->Result['count']; - - //check if FI already exists, if so stop executing - foreach ($resLinkedTxnXMLObject->Result->Transaction as $key => $val) { - - if((string)$val->Payment['code'] == 'IV.FI'){ - return; - } - }; - - - //if PA and other transactions (not FI) exist, do finalize - if($resLinkedTxnCount >= 1){ + if ((string)$val->Payment['code'] == 'IV.FI') { + return; + } + } + //if PA and other transactions (not FI) exist, do finalize + if ($resLinkedTxnCount >= 1) { + $res = $xmlQueryClass->doRequest(array('load' => urlencode($xmlQueryClass->getXMLRequest($config, $xml_params))), $url); - + $resXMLObject = new SimpleXMLElement($res); - $res = $xmlQueryClass->doRequest(array('load' => urlencode($xmlQueryClass->getXMLRequest($config, $xml_params))),$url); + $resUniquieId = (string)$resXMLObject->Result->Transaction->Identification->UniqueID; - $resXMLObject = new SimpleXMLElement($res); + $paymentObject = new Heidelpay\PhpPaymentApi\PaymentMethods\InvoiceB2CSecuredPaymentMethod(); - $resUniquieId = (string)$resXMLObject->Result->Transaction->Identification->UniqueID; + $paymentObject->getRequest()->authentification( + $oPlugin->oPluginEinstellungAssoc_arr ['sender'], + $oPlugin->oPluginEinstellungAssoc_arr ['user'], + $oPlugin->oPluginEinstellungAssoc_arr ['pass'], + (string)$resXMLObject->Result->Transaction['channel'], + $sandboxMode); - $paymentObject = new Heidelpay\PhpPaymentApi\PaymentMethods\InvoiceB2CSecuredPaymentMethod(); + $paymentObject->getRequest()->basketData( + $args_arr['oBestellung']->kBestellung, + $args_arr['oBestellung']->fGesamtsumme, + (string)$resXMLObject->Result->Transaction->Payment->Presentation->Currency, + $args_arr['oBestellung']->cSession); + $paymentObject->finalize($resUniquieId); - $paymentObject->getRequest()->authentification( - $oPlugin->oPluginEinstellungAssoc_arr ['sender'], - $oPlugin->oPluginEinstellungAssoc_arr ['user'], - $oPlugin->oPluginEinstellungAssoc_arr ['pass'], - (string)$resXMLObject->Result->Transaction['channel'], - $sandboxMode); + if ($paymentObject->getResponse()->isError()) { + $errorCode = $paymentObject->getResponse()->getError(); + mail($oPlugin->oPluginEinstellungAssoc_arr ['reportErrorMail'], 'heidelpay: Order ID ' . $args_arr['oBestellung']->kBestellung . ' report shipment failed', - $paymentObject->getRequest()->basketData( - $args_arr['oBestellung']->kBestellung, - $args_arr['oBestellung']->fGesamtsumme, - (string)$resXMLObject->Result->Transaction->Payment->Presentation->Currency, - $args_arr['oBestellung']->cSession); - $paymentObject->finalize($resUniquieId); - - if ($paymentObject->getResponse()->isError()) { - $errorCode = $paymentObject->getResponse()->getError(); - mail($oPlugin->oPluginEinstellungAssoc_arr ['reportErrorMail'],'heidelpay: Order ID '.$args_arr['oBestellung']->kBestellung.' report shipment failed', - - 'Report shipment for order'.$args_arr['oBestellung']->kBestellung.' in Shop '.Shop::getURL().' failed. - Error messsage: '.print_r($errorCode['message'],1)); + 'Report shipment for order' . $args_arr['oBestellung']->kBestellung . ' in Shop ' . Shop::getURL() . ' failed. + Error messsage: ' . print_r($errorCode['message'], 1)); + } } - - - - } } - -} diff --git a/version/114/frontend/heidelpay.hook181.php b/version/114/frontend/heidelpay.hook181.php index 729d581..c98e0c1 100644 --- a/version/114/frontend/heidelpay.hook181.php +++ b/version/114/frontend/heidelpay.hook181.php @@ -60,9 +60,9 @@ $config = array( 'sandbox' => $sandboxMode, - 'security_sender' => $oPlugin->oPluginEinstellungAssoc_arr ['sender'], - 'user_login' => $oPlugin->oPluginEinstellungAssoc_arr ['user'], - 'user_password' => $oPlugin->oPluginEinstellungAssoc_arr ['pass'] + 'security_sender' => trim($oPlugin->oPluginEinstellungAssoc_arr ['sender']), + 'user_login' => trim($oPlugin->oPluginEinstellungAssoc_arr ['user']), + 'user_password' => trim($oPlugin->oPluginEinstellungAssoc_arr ['pass']) ); $finalizedOrder = Shop::DB()->select('xplugin_heidelpay_standard_finalize', 'cshort_id', $result[0]); @@ -81,10 +81,10 @@ $paymentObject = new Heidelpay\PhpPaymentApi\PaymentMethods\InvoiceB2CSecuredPaymentMethod(); $paymentObject->getRequest()->authentification( - $oPlugin->oPluginEinstellungAssoc_arr ['sender'], - $oPlugin->oPluginEinstellungAssoc_arr ['user'], - $oPlugin->oPluginEinstellungAssoc_arr ['pass'], - (string)$resXMLObject->Result->Transaction['channel'], + trim($oPlugin->oPluginEinstellungAssoc_arr ['sender']), + trim($oPlugin->oPluginEinstellungAssoc_arr ['user']), + trim($oPlugin->oPluginEinstellungAssoc_arr ['pass']), + trim((string)$resXMLObject->Result->Transaction['channel']), $sandboxMode ); @@ -96,21 +96,28 @@ ); $paymentObject->finalize($resUniquieId); - if ($paymentObject->getResponse()->isError()) { - $errorCode = $paymentObject->getResponse()->getError(); + if ($paymentObject->getResponse()->isError() + && $paymentObject->getResponse()->getError()['code'] !== '700.400.800' + ) { + $error = $paymentObject->getResponse()->getError(); mail( $oPlugin->oPluginEinstellungAssoc_arr ['reportErrorMail'], 'heidelpay: Order ID ' . $args_arr['oBestellung']->kBestellung . ' report shipment failed', - 'Report shipment for order' . $args_arr['oBestellung']->kBestellung . ' in Shop ' . + 'Report shipment for order ' . $args_arr['oBestellung']->kBestellung . ' in Shop ' . Shop::getURL() . ' failed. - Error messsage: ' . print_r($errorCode['message'], 1) + Error messsage: ' . print_r($error['message'], 1) ); } else { - Shop::DB()->insert('xplugin_heidelpay_standard_finalize', (object)[ - 'cshort_id' => $result[0], - 'kBestellung' => $bestellNr - ]); + saveFinalize($result[0], $bestellNr); } } } } + +function saveFinalize($shortId, $bestellNr) +{ + Shop::DB()->insert('xplugin_heidelpay_standard_finalize', (object)[ + 'cshort_id' => $shortId, + 'kBestellung' => $bestellNr + ]); +} diff --git a/version/114/paymentmethod/heidelpay_standard.class.php b/version/114/paymentmethod/heidelpay_standard.class.php index 141b143..78d1dd2 100644 --- a/version/114/paymentmethod/heidelpay_standard.class.php +++ b/version/114/paymentmethod/heidelpay_standard.class.php @@ -138,10 +138,10 @@ protected function prepareRequest(Bestellung $order, $currentPaymentMethod) $notifyURL = $this->getNotificationURL($hash); $this->paymentObject->getRequest()->authentification( - $oPlugin->oPluginEinstellungAssoc_arr ['sender'], - $oPlugin->oPluginEinstellungAssoc_arr ['user'], - $oPlugin->oPluginEinstellungAssoc_arr ['pass'], - $oPlugin->oPluginEinstellungAssoc_arr [$currentPaymentMethod . '_channel'], + trim($oPlugin->oPluginEinstellungAssoc_arr ['sender']), + trim($oPlugin->oPluginEinstellungAssoc_arr ['user']), + trim($oPlugin->oPluginEinstellungAssoc_arr ['pass']), + trim($oPlugin->oPluginEinstellungAssoc_arr [$currentPaymentMethod . '_channel']), $this->isSandboxMode($oPlugin, $currentPaymentMethod) ); @@ -345,7 +345,6 @@ public function getBasketData($order, $oPlugin) $orderId = baueBestellnummer(); } $_SESSION['hp_temp_orderId'] = $orderId; - Jtllog::writeLog('orderID'.$orderId); $amount = $order->fGesamtsummeKundenwaehrung; // In Kunden Währung if (empty($amount)) { @@ -744,15 +743,14 @@ public function checkHash($args, $heidelpayResponse) /** * Sets payment information as comment in database. Default is to write no payInfo * - * @param $post response form payment - * @param $orderId + * @param $post array response form payment + * @param $orderId String */ protected function setPayInfo($post, $orderId) { /*if(!empty($post['IDENTIFICATION_SHORTID'])) { $this->setShortId($post['IDENTIFICATION_SHORTID'], $orderId); }*/ - return false; } /** @@ -773,7 +771,7 @@ public function getErrorReturnURL($order) public function disableInvoiceSecured($response) { $payCode = explode('.', $response ['PAYMENT_CODE']); - if($payCode === 'IV') { + if($payCode[0] === 'IV') { if (array_key_exists('CRITERION_INSURANCE-RESERVATION', $response) && $response['CRITERION_INSURANCE-RESERVATION'] === 'DENIED') { return '&disableInvoice=true'; diff --git a/version/114/paymentmethod/helper/HeidelpayBasketHelper.php b/version/114/paymentmethod/helper/HeidelpayBasketHelper.php index bfa4141..db7a86f 100644 --- a/version/114/paymentmethod/helper/HeidelpayBasketHelper.php +++ b/version/114/paymentmethod/helper/HeidelpayBasketHelper.php @@ -35,11 +35,17 @@ class HeidelpayBasketHelper */ public static function sendBasketFromOrder( Bestellung $order, $oPluginSettings , bool $isSandbox) { - $authentication = new Authentication( - $oPluginSettings ['user'], - $oPluginSettings ['pass'], - $oPluginSettings ['sender'] - ); + try { + $authentication = new Authentication( + trim($oPluginSettings ['user']), + trim($oPluginSettings ['pass']), + trim($oPluginSettings ['sender']) + ); + } catch (\Exception $exception) { + Jtllog::writeLog('heidelpay error: basked could not be added. Message: ' + . $exception->getMessage(), JTLLOG_LEVEL_ERROR, false); + return new Response(); + } $basket = new Basket(); $request = new Request($authentication, $basket); From e9f25e80a85726f9c29b390cab629366d65848f5 Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Fri, 27 Jul 2018 13:37:10 +0200 Subject: [PATCH 2/6] Bugfix 18.06.26: fixed following bugs: - function getCurrentVersion used to set the SHOPMODULE.VERSION can cause an exception and therefore is replaced by direct call of the attribute "nVersion" of the Plugin-Object. --- version/114/paymentmethod/heidelpay_standard.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/114/paymentmethod/heidelpay_standard.class.php b/version/114/paymentmethod/heidelpay_standard.class.php index 78d1dd2..8393c60 100644 --- a/version/114/paymentmethod/heidelpay_standard.class.php +++ b/version/114/paymentmethod/heidelpay_standard.class.php @@ -153,7 +153,7 @@ protected function prepareRequest(Bestellung $order, $currentPaymentMethod) $this->paymentObject->getRequest()->getCriterion()->set('PAYMETHOD', $currentPaymentMethod); $this->paymentObject->getRequest()->getCriterion()->set('PUSH_URL', Shop::getURL().'/'.urlencode('push-gw')); $this->paymentObject->getRequest()->getCriterion()->set('SHOP.TYPE', 'JTL '.Shop::getVersion()); - $this->paymentObject->getRequest()->getCriterion()->set('SHOPMODULE.VERSION', 'heidelpay gateway '.$oPlugin->getCurrentVersion()); + $this->paymentObject->getRequest()->getCriterion()->set('SHOPMODULE.VERSION', 'heidelpay gateway '.$oPlugin->nVersion); } /** From 5e0af2bd73f97b9c8fe959f1a21a37de4851d6dd Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Fri, 3 Aug 2018 13:10:29 +0200 Subject: [PATCH 3/6] Bugfix 18.06.26: get the correct installation path automatically for includes. Use shop functionality to get the correct language ISO for iFrame --- CHANGELOG.md | 22 +++++++++++++---- version/114/frontend/heidelpay.hook140.php | 2 +- version/114/frontend/heidelpay.hook181.php | 7 +++--- version/114/frontend/pushgw.php | 2 +- version/114/frontend/xmlQuery.php | 3 +-- .../114/paymentmethod/heidelpay_cc.class.php | 2 +- .../114/paymentmethod/heidelpay_dc.class.php | 2 +- .../114/paymentmethod/heidelpay_dd.class.php | 2 +- .../paymentmethod/heidelpay_ddpg.class.php | 2 +- .../114/paymentmethod/heidelpay_eps.class.php | 2 +- .../114/paymentmethod/heidelpay_gp.class.php | 2 +- .../114/paymentmethod/heidelpay_idl.class.php | 2 +- .../114/paymentmethod/heidelpay_iv.class.php | 2 +- .../paymentmethod/heidelpay_ivpg.class.php | 2 +- .../114/paymentmethod/heidelpay_p24.class.php | 2 +- .../114/paymentmethod/heidelpay_pfc.class.php | 2 +- .../114/paymentmethod/heidelpay_pfe.class.php | 2 +- .../114/paymentmethod/heidelpay_pp.class.php | 2 +- .../114/paymentmethod/heidelpay_sa.class.php | 2 +- .../heidelpay_standard.class.php | 24 +++++++++++++++---- .../114/paymentmethod/heidelpay_su.class.php | 2 +- .../114/paymentmethod/heidelpay_va.class.php | 2 +- .../helper/HeidelpayBasketHelper.php | 2 +- .../helper/PushNotificationHandler.php | 6 ++--- 24 files changed, 63 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86d10be..5896bdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,21 +2,35 @@ ##114 -###18.06.26 +### 18.08.01 +#### Fixed +- spaces in front or after payment credentials, caused the transaction to fail. +- Secured invoice was not disabled after customer was denied by insurance provider. +- Error mail was sent when automatic finalize failed because Reservation was already +finalized. +- function getCurrentVersion used to set the SHOPMODULE.VERSION can +cause an exception + +#### Changed +- iFrame language can now be different from "EN" and "DE" and therefore also allows +other languages for the iFrame. +- allow installation in directory name other than "heidelpay_standard" + +### 18.06.26 -###Added +#### Added - basket for secured invoice and secured direct debit to increase the acceptance rate of the insurance provider. - info about the used shop and plugin version are in the payment request. - support for asynchronously incoming payments via push notification. - send uniqueId to WAWI for an easier way to map the payment transactions. -###Changed +#### Changed - secured invoice is no longer available for the time of the actual session after user was denied by insurance provider. That behaviour should avoid repetitive payment requests which will fail. - "sofortueberweisung" was renamed "Sofort". (Reconfiguration necessary) - Heidelberger Payment GmbH was renamed heidelpay GmbH. -###Fixed +####Fixed - added Switch for secured direct debit to choose between booking modes authorize and debit(default). ## v113 diff --git a/version/114/frontend/heidelpay.hook140.php b/version/114/frontend/heidelpay.hook140.php index d37810f..5555acf 100644 --- a/version/114/frontend/heidelpay.hook140.php +++ b/version/114/frontend/heidelpay.hook140.php @@ -12,7 +12,7 @@ * * */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/vendor/autoload.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/vendor/autoload.php'; use \Heidelpay\MessageCodeMapper\MessageCodeMapper; diff --git a/version/114/frontend/heidelpay.hook181.php b/version/114/frontend/heidelpay.hook181.php index c98e0c1..de7e0d6 100644 --- a/version/114/frontend/heidelpay.hook181.php +++ b/version/114/frontend/heidelpay.hook181.php @@ -10,8 +10,7 @@ * @category JTL */ - -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/vendor/autoload.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/vendor/autoload.php'; require_once __DIR__ . '/xmlQuery.php'; use Heidelpay\XmlQuery; @@ -19,7 +18,6 @@ #ini_set('display_errors', 1); #ini_set('display_startup_errors', 1); #error_reporting(E_ALL); - $bestellNr = (int)$args_arr['oBestellung']->kBestellung; $query = "SELECT tbestellung.kBestellung, tzahlungsart.cModulId FROM tbestellung @@ -66,9 +64,10 @@ ); $finalizedOrder = Shop::DB()->select('xplugin_heidelpay_standard_finalize', 'cshort_id', $result[0]); - //if finalize wasn't found in the database, do finalize if ($finalizedOrder === null) { + + $res = $xmlQueryClass->doRequest( array( 'load' => urlencode($xmlQueryClass->getXMLRequest($config, $xml_params)) diff --git a/version/114/frontend/pushgw.php b/version/114/frontend/pushgw.php index 8a6c65b..b77145d 100644 --- a/version/114/frontend/pushgw.php +++ b/version/114/frontend/pushgw.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' . $oPlugin->nVersion . '/paymentmethod/helper/PushNotificationHandler.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' . $oPlugin->nVersion . '/paymentmethod/helper/PushNotificationHandler.php'; $xml = file_get_contents("php://input"); $pushHandler = new PushNotificationHandler($xml); diff --git a/version/114/frontend/xmlQuery.php b/version/114/frontend/xmlQuery.php index d2474f2..73db822 100644 --- a/version/114/frontend/xmlQuery.php +++ b/version/114/frontend/xmlQuery.php @@ -2,7 +2,7 @@ namespace Heidelpay; -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/vendor/autoload.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/vendor/autoload.php'; require_once __DIR__.'/arrayFilter.php'; use \SimpleXMLElement; @@ -15,7 +15,6 @@ class XmlQuery{ public function getXMLRequest($config, $xml_params) { - $arrFilClass = new ArrayFilter(); // filter empty key/value pairs to prevent problems while creating the XML $xml_params = $arrFilClass->array_filter_recursive($xml_params); diff --git a/version/114/paymentmethod/heidelpay_cc.class.php b/version/114/paymentmethod/heidelpay_cc.class.php index 94b6277..b7bbf53 100644 --- a/version/114/paymentmethod/heidelpay_cc.class.php +++ b/version/114/paymentmethod/heidelpay_cc.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\CreditCardPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_dc.class.php b/version/114/paymentmethod/heidelpay_dc.class.php index e486f7e..592a6f0 100644 --- a/version/114/paymentmethod/heidelpay_dc.class.php +++ b/version/114/paymentmethod/heidelpay_dc.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\DebitCardPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_dd.class.php b/version/114/paymentmethod/heidelpay_dd.class.php index 72e89ac..0575681 100644 --- a/version/114/paymentmethod/heidelpay_dd.class.php +++ b/version/114/paymentmethod/heidelpay_dd.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\DirectDebitPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_ddpg.class.php b/version/114/paymentmethod/heidelpay_ddpg.class.php index 5c71574..cf24cf9 100644 --- a/version/114/paymentmethod/heidelpay_ddpg.class.php +++ b/version/114/paymentmethod/heidelpay_ddpg.class.php @@ -10,7 +10,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_dd.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_dd.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\DirectDebitB2CSecuredPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_eps.class.php b/version/114/paymentmethod/heidelpay_eps.class.php index 563c5d4..e7fb291 100644 --- a/version/114/paymentmethod/heidelpay_eps.class.php +++ b/version/114/paymentmethod/heidelpay_eps.class.php @@ -10,7 +10,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\EPSPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_gp.class.php b/version/114/paymentmethod/heidelpay_gp.class.php index c7178d1..b33845a 100644 --- a/version/114/paymentmethod/heidelpay_gp.class.php +++ b/version/114/paymentmethod/heidelpay_gp.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\GiropayPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_idl.class.php b/version/114/paymentmethod/heidelpay_idl.class.php index 5e77e4b..e9a4820 100644 --- a/version/114/paymentmethod/heidelpay_idl.class.php +++ b/version/114/paymentmethod/heidelpay_idl.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\IDealPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_iv.class.php b/version/114/paymentmethod/heidelpay_iv.class.php index 90a6dbc..7542bf5 100644 --- a/version/114/paymentmethod/heidelpay_iv.class.php +++ b/version/114/paymentmethod/heidelpay_iv.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\InvoicePaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_ivpg.class.php b/version/114/paymentmethod/heidelpay_ivpg.class.php index b877006..4b1b83a 100644 --- a/version/114/paymentmethod/heidelpay_ivpg.class.php +++ b/version/114/paymentmethod/heidelpay_ivpg.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_iv.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_iv.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\InvoiceB2CSecuredPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_p24.class.php b/version/114/paymentmethod/heidelpay_p24.class.php index ce845d7..b8bcaeb 100644 --- a/version/114/paymentmethod/heidelpay_p24.class.php +++ b/version/114/paymentmethod/heidelpay_p24.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\Przelewy24PaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_pfc.class.php b/version/114/paymentmethod/heidelpay_pfc.class.php index ce95b00..8d24654 100644 --- a/version/114/paymentmethod/heidelpay_pfc.class.php +++ b/version/114/paymentmethod/heidelpay_pfc.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\PostFinanceCardPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_pfe.class.php b/version/114/paymentmethod/heidelpay_pfe.class.php index abc76cd..2d99d6b 100644 --- a/version/114/paymentmethod/heidelpay_pfe.class.php +++ b/version/114/paymentmethod/heidelpay_pfe.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\PostFinanceEFinancePaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_pp.class.php b/version/114/paymentmethod/heidelpay_pp.class.php index 0911ac1..2764a70 100644 --- a/version/114/paymentmethod/heidelpay_pp.class.php +++ b/version/114/paymentmethod/heidelpay_pp.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\PrepaymentPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_sa.class.php b/version/114/paymentmethod/heidelpay_sa.class.php index 07f7cbe..e71b93a 100644 --- a/version/114/paymentmethod/heidelpay_sa.class.php +++ b/version/114/paymentmethod/heidelpay_sa.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\SantanderInvoicePaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_standard.class.php b/version/114/paymentmethod/heidelpay_standard.class.php index 8393c60..8fa4278 100644 --- a/version/114/paymentmethod/heidelpay_standard.class.php +++ b/version/114/paymentmethod/heidelpay_standard.class.php @@ -11,7 +11,7 @@ * @category JTL */ include_once PFAD_ROOT . PFAD_INCLUDES_MODULES . 'ServerPaymentMethod.class.php'; -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard'.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis .DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; require_once PFAD_ROOT . PFAD_CLASSES . "class.JTL-Shop.Jtllog.php"; require_once __DIR__ . DIRECTORY_SEPARATOR .'helper'.DIRECTORY_SEPARATOR .'HeidelpayBasketHelper.php'; require_once __DIR__ . DIRECTORY_SEPARATOR .'helper'.DIRECTORY_SEPARATOR .'HeidelpayTemplateHelper.php'; @@ -108,6 +108,23 @@ public function preparePaymentProcess($order) } + /** + * Load the localized Notifications + * @param $language + */ + public function includeNotifications($language) + { + $languageFile = PFAD_ROOT . PFAD_PLUGIN . $this->oPlugin->cVerzeichnis . '/version/' . + $this->oPlugin->nVersion . '/paymentmethod/lang/' . $language . '/notifications.php'; + + if (file_exists($languageFile)) { + include_once $languageFile; + } else { + include_once PFAD_ROOT . PFAD_PLUGIN . $this->oPlugin->cVerzeichnis . '/version/' . + $this->oPlugin->nVersion . '/paymentmethod/lang/en/notifications.php'; + } + } + /** * Check whether order has same address for billing and shipping and * whether it ist b2c. @@ -365,7 +382,7 @@ public function getBasketData($order, $oPlugin) */ public function getLanguageCode() { - $language = $_SESSION ['cISOSprache'] == 'ger' ? 'DE' : 'EN'; + $language = strtoupper(StringHandler::convertISO2ISO639($_SESSION['cISOSprache'])); return $language; } @@ -599,8 +616,7 @@ public function handleNotification($order, $paymentHash, $args) // load language file $language = strtolower($this->getLanguageCode()); - include_once PFAD_ROOT . PFAD_PLUGIN . $this->oPlugin->cVerzeichnis . '/version/' . - $this->oPlugin->nVersion . '/paymentmethod/lang/' . $language . '/notifications.php'; + $this->includeNotifications($language); $heidelpayResponse = new Heidelpay\PhpPaymentApi\Response($args); $this->checkHash($args, $heidelpayResponse); diff --git a/version/114/paymentmethod/heidelpay_su.class.php b/version/114/paymentmethod/heidelpay_su.class.php index db65e64..b41f1f4 100644 --- a/version/114/paymentmethod/heidelpay_su.class.php +++ b/version/114/paymentmethod/heidelpay_su.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\SofortPaymentMethod; diff --git a/version/114/paymentmethod/heidelpay_va.class.php b/version/114/paymentmethod/heidelpay_va.class.php index 0d72701..9d0af03 100644 --- a/version/114/paymentmethod/heidelpay_va.class.php +++ b/version/114/paymentmethod/heidelpay_va.class.php @@ -8,7 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' .$oPlugin->nVersion. '/paymentmethod/heidelpay_standard.class.php'; use Heidelpay\PhpPaymentApi\PaymentMethods\PayPalPaymentMethod; diff --git a/version/114/paymentmethod/helper/HeidelpayBasketHelper.php b/version/114/paymentmethod/helper/HeidelpayBasketHelper.php index db7a86f..41957cc 100644 --- a/version/114/paymentmethod/helper/HeidelpayBasketHelper.php +++ b/version/114/paymentmethod/helper/HeidelpayBasketHelper.php @@ -10,7 +10,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard'.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . ''.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; require_once PFAD_ROOT . PFAD_CLASSES . "class.JTL-Shop.Jtllog.php"; use Heidelpay\PhpBasketApi\Object\Authentication; diff --git a/version/114/paymentmethod/helper/PushNotificationHandler.php b/version/114/paymentmethod/helper/PushNotificationHandler.php index 1d5c398..e08f754 100644 --- a/version/114/paymentmethod/helper/PushNotificationHandler.php +++ b/version/114/paymentmethod/helper/PushNotificationHandler.php @@ -8,9 +8,7 @@ * @author David Owusu * @category JTL */ -require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/vendor/autoload.php'; -/*require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/' - . $oPlugin->nVersion . '/paymentmethod/heidelpay_standard.class.php';*/ +require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/vendor/autoload.php'; use Heidelpay\PhpPaymentApi\Push; @@ -53,7 +51,7 @@ public function __construct($xmlResponse) $shopPaymethod = Shop::DB()->select('tpluginzahlungsartklasse', 'cModulId', $moduleID); try { - require_once PFAD_ROOT . PFAD_PLUGIN . 'heidelpay_standard/version/114/paymentmethod/' + require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/114/paymentmethod/' .$shopPaymethod->cClassPfad; $classname = $shopPaymethod->cClassName; $this->paymentModule = new $classname($moduleID); From 2f9a28a1b02f508577244913cbb24e1fbb942ca5 Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Thu, 9 Aug 2018 17:32:29 +0200 Subject: [PATCH 4/6] Bugfix 18.06.26: correct some installation folder and version numbers. --- version/114/paymentmethod/helper/PushNotificationHandler.php | 2 +- .../114/paymentmethod/template/heidelpay_CreditDebitCard.tpl | 2 +- version/114/paymentmethod/template/heidelpay_DirectDebit.tpl | 2 +- version/114/paymentmethod/template/heidelpay_InvoiceSec.tpl | 2 +- version/114/paymentmethod/template/heidelpay_Santander.tpl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/version/114/paymentmethod/helper/PushNotificationHandler.php b/version/114/paymentmethod/helper/PushNotificationHandler.php index e08f754..b2822f4 100644 --- a/version/114/paymentmethod/helper/PushNotificationHandler.php +++ b/version/114/paymentmethod/helper/PushNotificationHandler.php @@ -51,7 +51,7 @@ public function __construct($xmlResponse) $shopPaymethod = Shop::DB()->select('tpluginzahlungsartklasse', 'cModulId', $moduleID); try { - require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/114/paymentmethod/' + require_once PFAD_ROOT . PFAD_PLUGIN . $oPlugin->cVerzeichnis . '/version/' . $oPlugin->nVersion . '/paymentmethod/' .$shopPaymethod->cClassPfad; $classname = $shopPaymethod->cClassName; $this->paymentModule = new $classname($moduleID); diff --git a/version/114/paymentmethod/template/heidelpay_CreditDebitCard.tpl b/version/114/paymentmethod/template/heidelpay_CreditDebitCard.tpl index 506c6d7..a9f09f9 100644 --- a/version/114/paymentmethod/template/heidelpay_CreditDebitCard.tpl +++ b/version/114/paymentmethod/template/heidelpay_CreditDebitCard.tpl @@ -14,6 +14,6 @@
- + \ No newline at end of file diff --git a/version/114/paymentmethod/template/heidelpay_DirectDebit.tpl b/version/114/paymentmethod/template/heidelpay_DirectDebit.tpl index 4ad0b22..1d1012b 100644 --- a/version/114/paymentmethod/template/heidelpay_DirectDebit.tpl +++ b/version/114/paymentmethod/template/heidelpay_DirectDebit.tpl @@ -14,7 +14,7 @@
{$paytext}
- +
{if $is_PG == TRUE}{html_options name='NAME.SALUTATION' options=$salutation selected=$salutation_pre}{/if} diff --git a/version/114/paymentmethod/template/heidelpay_InvoiceSec.tpl b/version/114/paymentmethod/template/heidelpay_InvoiceSec.tpl index c6c607d..7929b25 100644 --- a/version/114/paymentmethod/template/heidelpay_InvoiceSec.tpl +++ b/version/114/paymentmethod/template/heidelpay_InvoiceSec.tpl @@ -13,7 +13,7 @@
{$paytext}
- + {html_options name='NAME.SALUTATION' options=$salutation selected=$salutation_pre}

diff --git a/version/114/paymentmethod/template/heidelpay_Santander.tpl b/version/114/paymentmethod/template/heidelpay_Santander.tpl index 3ca87e8..cc19511 100644 --- a/version/114/paymentmethod/template/heidelpay_Santander.tpl +++ b/version/114/paymentmethod/template/heidelpay_Santander.tpl @@ -13,7 +13,7 @@
{$paytext}
- + {html_options name='NAME.SALUTATION' options=$salutation selected=$salutation_pre}

{if isset($birthdate)} From 97c6b6ef2fe18dfd7199db8dff575cbc88215c7d Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Tue, 21 Aug 2018 15:40:45 +0200 Subject: [PATCH 5/6] (JTL-25) fix: Switch correctly to live modus for finalization --- version/114/frontend/heidelpay.hook181.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/version/114/frontend/heidelpay.hook181.php b/version/114/frontend/heidelpay.hook181.php index de7e0d6..1681364 100644 --- a/version/114/frontend/heidelpay.hook181.php +++ b/version/114/frontend/heidelpay.hook181.php @@ -30,8 +30,10 @@ $_query_sandbox_url = 'https://test-heidelpay.hpcgw.net/TransactionCore/xml'; $url = $_query_sandbox_url; +$sandboxMode = 1; if ($oPlugin->oPluginEinstellungAssoc_arr [$oBestellung->cModulId . '_transmode'] == 'LIVE') { $url = $_query_live_url; + $sandboxMode = 0; } // if Versand oder Teilversand - Status s. defines_inc.php @@ -52,8 +54,6 @@ 'transType' => 'PAYMENT' ); - $sandboxMode = 1; - $xmlQueryClass = new XmlQuery(); $config = array( @@ -66,8 +66,6 @@ $finalizedOrder = Shop::DB()->select('xplugin_heidelpay_standard_finalize', 'cshort_id', $result[0]); //if finalize wasn't found in the database, do finalize if ($finalizedOrder === null) { - - $res = $xmlQueryClass->doRequest( array( 'load' => urlencode($xmlQueryClass->getXMLRequest($config, $xml_params)) From c2b723816f215fac976d5f0f19fb2f4f3e3a2c73 Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Wed, 29 Aug 2018 11:38:58 +0200 Subject: [PATCH 6/6] Set version number for release 28.08.29 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5896bdc..4284893 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ##114 -### 18.08.01 +### 18.08.29 #### Fixed - spaces in front or after payment credentials, caused the transaction to fail. - Secured invoice was not disabled after customer was denied by insurance provider.