Commit e06d4fb2 authored by oskar's avatar oskar

'Waehrung' in basket fixed. fix #40

parent 78d62ce0
......@@ -104,8 +104,12 @@ class PayPalExpress extends PaymentMethod
$this->tZahlungsart = (class_exists('Shop')) ? Shop::DB()->query($sql, 1) : $GLOBALS['DB']->executeQuery($sql, 1);
$this->oPlugin = $oPlugin;
$this->pluginbez = 'kPlugin_' . $oPlugin->kPlugin . '_paypalexpress';
$this->currencyISO = (isset($_SESSION['Waehrung'])) ? $_SESSION['Waehrung']->cISO : null;
$this->cISOSprache = (isset($_SESSION['cISOSprache'])) ? $_SESSION['cISOSprache'] : null;
if (407 < Shop::getVersion()) {
$this->currencyISO = (isset($_SESSION['Waehrung'])) ? $_SESSION['Waehrung']->cISO : null;
} else {
$this->currencyISO = Session::Currency()->getCode() ?: null;
}
$this->cISOSprache = (isset($_SESSION['cISOSprache'])) ? $_SESSION['cISOSprache'] : null;
if ($oPlugin->oPluginEinstellungAssoc_arr[$this->pluginbez . '_api_live_sandbox'] === 'live') {
$this->PayPalURL = 'https://www.paypal.com/checkoutnow?useraction=continue&token=';
$this->endPoint = 'https://api-3t.paypal.com/nvp';
......@@ -378,7 +382,7 @@ class PayPalExpress extends PaymentMethod
unset($_SESSION['reshash'], $_SESSION['paypalexpress']);
if (isset($_SESSION['Kunde']) && intval($_SESSION['Kunde']->nRegistriert) === 0) {
if (isset($_SESSION['Kunde']) && (int)$_SESSION['Kunde']->nRegistriert === 0) {
unset($_SESSION['Kunde']);
}
}
......@@ -454,7 +458,7 @@ class PayPalExpress extends PaymentMethod
{
foreach ($oVersandart_arr as $key => $oVersandart) {
if (!isset($oVersandart->kZahlungsart)) {
$sql = 'SELECT
$sql = 'SELECT
kZahlungsart
FROM tversandartzahlungsart
WHERE tversandartzahlungsart.kVersandart = ' . $oVersandart->kVersandart . '
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment