Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 5873) +++ /controller/wpsg_AdminController.class.php (revision 5877) @@ -146,8 +146,8 @@ 'subTemplate' => WPSG_PATH_VIEW.'/admin/seiten.phtml' ); - $this->shop->view['arSubAction']['customerpreset'] = array( - 'Menutext' => __('Kundenvoreinstellungen', 'wpsg'), - 'subTemplate' => WPSG_PATH_VIEW.'/admin/customerpreset.phtml' - ); + //$this->shop->view['arSubAction']['customerpreset'] = array( + // 'Menutext' => __('Kundenvoreinstellungen', 'wpsg'), + // 'subTemplate' => WPSG_PATH_VIEW.'/admin/customerpreset.phtml' + //); $this->shop->view['arSubAction']['kundendaten'] = array( 'Menutext' => __('Kundendaten', 'wpsg'), Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5873) +++ /controller/wpsg_ShopController.class.php (revision 5877) @@ -2571,4 +2571,6 @@ { + $this->addShipPay(); + load_plugin_textdomain('wpsg', false, dirname( plugin_basename( __FILE__ ) ).'/../lang/'); Index: /mods/wpsg_mod_deliverynote.class.php =================================================================== --- /mods/wpsg_mod_deliverynote.class.php (revision 5873) +++ /mods/wpsg_mod_deliverynote.class.php (revision 5877) @@ -152,5 +152,5 @@ } - else if ($_REQUEST['wpsg_mod_deliverynote_bp_del'] == "1") + else if ((array_key_exists('wpsg_mod_deliverynote_bp_del', $_REQUEST)) && ($_REQUEST['wpsg_mod_deliverynote_bp_del'] == "1")) { @@ -177,5 +177,5 @@ } - else if ($_REQUEST['wpsg_mod_deliverynote_logo_del'] == "1") + else if ((array_key_exists('wpsg_mod_deliverynote_logo_del', $_REQUEST)) && ($_REQUEST['wpsg_mod_deliverynote_logo_del'] == "1")) { Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 5873) +++ /mods/wpsg_mod_rechnungen.class.php (revision 5877) @@ -200,5 +200,5 @@ } - else if ($_REQUEST['wpsg_rechnungen_bp_del'] == "1") + else if ((array_key_exists('wpsg_rechnungen_bp_del', $_REQUEST)) && ($_REQUEST['wpsg_rechnungen_bp_del'] == "1")) { @@ -225,5 +225,5 @@ } - else if ($_REQUEST['wpsg_rechnungen_logo_del'] == "1") + else if ((array_key_exists('wpsg_rechnungen_logo_del', $_REQUEST)) && ($_REQUEST['wpsg_rechnungen_logo_del'] == "1")) { Index: /mods/wpsg_mod_shs.class.php =================================================================== --- /mods/wpsg_mod_shs.class.php (revision 5873) +++ /mods/wpsg_mod_shs.class.php (revision 5877) @@ -131,11 +131,12 @@ $this->shop->update_option('wpsg_mod_shs_autoend', $_REQUEST['wpsg_mod_shs_autoend']); - $this->shop->update_option('wpsg_mod_shs_mobileversion', $_REQUEST['wpsg_mod_shs_mobileversion']); - $this->shop->update_option('wpsg_mod_shs_creditcard_cardholder', $_REQUEST['wpsg_mod_shs_creditcard_cardholder']); - $this->shop->update_option('wpsg_mod_shs_creditcard_optionalcardholder', $_REQUEST['wpsg_mod_shs_creditcard_optionalcardholder']); - $this->shop->update_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu', $_REQUEST['wpsg_mod_shs_creditcard_sslifvisaenrolledu']); - $this->shop->update_option('wpsg_mod_shs_directdebit_accountholder', $_REQUEST['wpsg_mod_shs_directdebit_accountholder']); - $this->shop->update_option('wpsg_mod_shs_directdebit_optionalaccountholder', $_REQUEST['wpsg_mod_shs_directdebit_optionalaccountholder']); - $this->shop->update_option('wpsg_mod_shs_directdebit_checklist', $_REQUEST['wpsg_mod_shs_directdebit_checklist']); + $this->shop->update_option('wpsg_mod_shs_mobileversion', wpsg_getStr($_REQUEST['wpsg_mod_shs_mobileversion'])); + $this->shop->update_option('wpsg_mod_shs_creditcard_cardholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_cardholder'])); + $this->shop->update_option('wpsg_mod_shs_creditcard_optionalcardholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_optionalcardholder'])); + $this->shop->update_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_sslifvisaenrolledu'])); + $this->shop->update_option('wpsg_mod_shs_directdebit_accountholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_accountholder'])); + $this->shop->update_option('wpsg_mod_shs_directdebit_optionalaccountholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_optionalaccountholder'])); + $this->shop->update_option('wpsg_mod_shs_directdebit_checklist', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_checklist'])); + $this->shop->update_option('wpsg_mod_shs_transactiontype', $_REQUEST['wpsg_mod_shs_transactiontype']); Index: /mods/wpsg_mod_spconditions.class.php =================================================================== --- /mods/wpsg_mod_spconditions.class.php (revision 5873) +++ /mods/wpsg_mod_spconditions.class.php (revision 5877) @@ -19,5 +19,5 @@ $this->desc = __('Ermöglicht die Erstellung von Bedingungen fÌr Versand- und Zahlungsarten.', 'wpsg'); - if (defined('WPSG_TBL_SPCONDITIONS')) define('WPSG_TBL_SPCONDITIONS', $this->shop->prefix.'wpsg_spconditions'); + if (!defined('WPSG_TBL_SPCONDITIONS')) define('WPSG_TBL_SPCONDITIONS', $this->shop->prefix.'wpsg_spconditions'); } // public function __construct() Index: /mods/wpsg_mod_su.class.php =================================================================== --- /mods/wpsg_mod_su.class.php (revision 5873) +++ /mods/wpsg_mod_su.class.php (revision 5877) @@ -263,5 +263,5 @@ { - if ($_REQUEST['wpsg_plugin'] == 'wpsg_mod_su' && $_REQUEST['confirm'] == 'su') + if (wpsg_isSizedString($_REQUEST['wpsg_plugin'], 'wpsg_mod_su') && wpsg_isSizedString($_REQUEST['confirm'], 'su')) { Index: /mods/wpsg_mod_targo.class.php =================================================================== --- /mods/wpsg_mod_targo.class.php (revision 5873) +++ /mods/wpsg_mod_targo.class.php (revision 5877) @@ -40,5 +40,7 @@ $this->shop->checkDefault('wpsg_mod_targo_laufzeit_max', '60'); $this->shop->checkDefault('wpsg_mod_targo_rate_min', '10.00'); - $this->shop->checkDefault('wpsg_mod_targo_url', ''); + $this->shop->checkDefault('wpsg_mod_targo_url_test', ''); + $this->shop->checkDefault('wpsg_mod_targo_url_live', ''); + $this->shop->checkDefault('wpsg_mod_targo_url_use', '0'); $this->shop->checkDefault('wpsg_mod_targo_koop_id', ''); $this->shop->checkDefault('wpsg_mod_targo_dealerid', ''); @@ -47,6 +49,6 @@ $this->shop->checkDefault('wpsg_mod_targo_error', ''); - $this->shop->checkDefault('wpsg_mod_targo_bezeichnung', ''); - $this->shop->checkDefault('wpsg_mod_targo_hint', ''); + $this->shop->checkDefault('wpsg_mod_targo_bezeichnung', 'Targobank'); + $this->shop->checkDefault('wpsg_mod_targo_hint', 'Ermöglicht die Zahlungsabwicklung mit der Targobank'); $this->shop->checkDefault('wpsg_mod_targo_createwebhook', ''); $this->shop->checkDefault('wpsg_mod_targo_gebuehr', ''); @@ -55,12 +57,4 @@ } // public function install() - - public function init() - { - - spl_autoload_register(array($this, 'spl_autoload')); - - - } // public function init() public function settings_edit() @@ -94,5 +88,7 @@ $this->shop->update_option('wpsg_mod_targo_laufzeit_max', $_REQUEST['wpsg_mod_targo_laufzeit_max']); $this->shop->update_option('wpsg_mod_targo_rate_min', $_REQUEST['wpsg_mod_targo_rate_min']); - $this->shop->update_option('wpsg_mod_targo_url', $_REQUEST['wpsg_mod_targo_url']); + $this->shop->update_option('wpsg_mod_targo_url_test', $_REQUEST['wpsg_mod_targo_url_test']); + $this->shop->update_option('wpsg_mod_targo_url_live', $_REQUEST['wpsg_mod_targo_url_live']); + $this->shop->update_option('wpsg_mod_targo_url_use', $_REQUEST['wpsg_mod_targo_url_use']); $this->shop->update_option('wpsg_mod_targo_koop_id', $_REQUEST['wpsg_mod_targo_koop_id']); $this->shop->update_option('wpsg_mod_targo_dealerid', $_REQUEST['wpsg_mod_targo_dealerid']); @@ -101,52 +97,14 @@ $this->shop->update_option('wpsg_mod_targo_bezeichnung', $_REQUEST['wpsg_mod_targo_bezeichnung']); $this->shop->update_option('wpsg_mod_targo_hint', $_REQUEST['wpsg_mod_targo_hint']); - $this->shop->update_option('wpsg_mod_targo_createwebhook', $_REQUEST['wpsg_mod_targo_createwebhook']); + //$this->shop->update_option('wpsg_mod_targo_createwebhook', $_REQUEST['wpsg_mod_targo_createwebhook']); $this->shop->update_option('wpsg_mod_targo_gebuehr', $_REQUEST['wpsg_mod_targo_gebuehr']); $this->shop->update_option('wpsg_mod_targo_mwst', $_REQUEST['wpsg_mod_targo_mwst']); $this->shop->update_option('wpsg_mod_targo_mwstland', $_REQUEST['wpsg_mod_targo_mwstland']); - $this->shop->createPage(__('Erfolgreiche Targo Finanzierung', 'wpsg'), 'wpsg_mod_targo_success', $_REQUEST['wpsg_mod_targo_success']); - $this->shop->createPage(__('Fehlgeschlagene Targo Finanzierung', 'wpsg'), 'wpsg_mod_targo_error', $_REQUEST['wpsg_mod_targo_error']); + //$this->shop->createPage(__('Erfolgreiche Targo Finanzierung', 'wpsg'), 'wpsg_mod_targo_success', $_REQUEST['wpsg_mod_targo_success']); + //$this->shop->createPage(__('Fehlgeschlagene Targo Finanzierung', 'wpsg'), 'wpsg_mod_targo_error', $_REQUEST['wpsg_mod_targo_error']); } // public function settings_save() - - public function order_ajax() - { - - if (wpsg_isSizedString($_REQUEST['do'], 'refresh')) - { - - $state = $this->getPaymentState($_REQUEST['edit_id']); - - $this->shop->addBackendMessage(wpsg_translate(__('Status der Zahlung (#1#) erfolgreich abgefragt.', 'wpsg'), $state)); - - $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']); - - } - - } // public function order_ajax() - - public function checkGeneralBackendError() - { - //TODO - if ($this->shop->get_option('wpsg_mod_targo_mode') == '1') - { - - if (!wpsg_isSizedString($this->shop->get_option('wpsg_mod_targo_clientid')) && !wpsg_isSizedString($this->shop->get_option('wpsg_mod_targo_secret'))) - { - - $this->shop->addBackendError('nohspc_'.wpsg_translate( - wpsg_translate( - __('Das Modul "Targo" ist aktiviert und es wurden keine API Zugangsdatenhinterlegt. Gehen Sie in die Einstellungen des Moduls um die API Daten zu hinterlegen.', 'wpsg'), - WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_targo' - ) - )); - - } - - } - - } // public function checkGeneralBackendError() - + public function addPayment(&$arPayment) { @@ -173,28 +131,17 @@ $arPaymentTB[$this->id] = array( - 'id' => $this->id, - 'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_targo_mwst'), - 'mwst_value' => $mwst_value, - 'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'), - 'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')), - 'logo' => $this->shop->getRessourceURL('gfx/targologo.png') + 'id' => $this->id, + 'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'), + 'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'), + 'mwst' => $this->shop->get_option('wpsg_mod_targo_mwst'), + 'mwst_value' => $mwst_value, + 'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'), + 'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')), + 'logo' => $this->shop->getRessourceURL('gfx/targologo.png') ); $arPayment = wpsg_array_merge($arPaymentTB, $arPayment); } - /* - $arPayment[$this->id] = array( - 'id' => $this->id, - 'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_targo_mwst'), - 'mwst_value' => $mwst_value, - 'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'), - 'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')), - 'logo' => $this->shop->getRessourceURL('gfx/targologo.png') - ); - */ + if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) { @@ -266,34 +213,5 @@ } // public function calcPayment(&$arBasket) - - public function setOrderStatus($order_id, $status_id, $inform) - { - //TODO - $oOrder = wpsg_order::getInstance($order_id); - - if ($oOrder->getPaymentID() == $this->id) - { - - $arStornoState = (array)$this->shop->get_option('wpsg_mod_paypal_stornostate'); - - if (array_key_exists($status_id, $arStornoState) && $arStornoState[$status_id] == '1') - { - - if (wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypal_saleid'))) - { - - $bStorno = $this->stornoOrder($order_id); - - if ($bStorno === true) $this->shop->addBackendMessage(__('Zahlung erfolgreich Ìber die PayPal API storniert.', 'wpsg')); - else $this->shop->addBackendError(__('Es gab ein Problem bei der Stornierung der Zahlung Ìber die PayPal API. Bitte Bestellprotokoll beachten.', 'wpsg')); - - } - - } - - } - - } - + public function order_view_afterpayment(&$order_id) { @@ -310,6 +228,5 @@ $oOrder = wpsg_order::getInstance($order_id); - //KundenID: echo $oOrder->k_id; - + $this->shop->view['targoLink'] = $this->getTargoLink($order_id); $this->shop->view['o_id'] = $order_id; @@ -321,135 +238,6 @@ } // public function order_done(&$order_id) - public function wp_loaded() { - - if (wpsg_isSizedString($_REQUEST['wpsg_plugin'], 'wpsg_mod_targo') && wpsg_isSizedString($_REQUEST['confirm'], 'pp')) - { - //TODO - $this->shop->checkEscape(); - - // IPN Zahlungsbenachrichtigung - $req = 'cmd=_notify-validate'; - - foreach ($_POST as $key => $value) - { - - $req .= "&".$key."=".urlencode($value); - - } - - $header = ""; - $header .= "POST /cgi-bin/webscr HTTP/1.1\r\n"; - $header .= "Content-Type: application/x-www-form-urlencoded\r\n"; - - if ($this->shop->get_option('wpsg_mod_paypal_sandbox') == 1) - { - - $header .= "Host: www.sandbox.paypal.com\r\n"; - $fp = fsockopen ('tls://www.sandbox.paypal.com', 443, $errno, $errstr, 30); - - } - else - { - - $header .= "Host: www.paypal.com\r\n"; - $fp = fsockopen ('tls://www.paypal.com', 443, $errno, $errstr, 30); - - } - - $header .= "Connection: Close\r\n"; - $header .= "Content-Length: ".strlen($req)."\r\n\r\n"; - - if (!$fp) - { - - - - } - else - { - - fputs ($fp, $header.$req); - - while (!feof($fp)) - { - - $res = fgets ($fp, 1024); - - if (strcmp(trim($res), "VERIFIED") == 0) - { - - if (strtolower($_REQUEST['payment_status']) == "completed") - { - - // Wir haben hier nicht wpsg_hspc (htmlspecialchars) verwendet da es ein Problem mit seltsammen (Steuerzeichen?) gab - // Wenn mann sich den Request so angeschaut hat war alles in Ordnung konnte mit gleichen Daten auch nicht nachgestellt werden - // Problem trat nur bei den Requests von PayPal auf. - // Nicht zentral gelöst, da im Manual ein Hinweis auf ein mögliches Sicherheitsproblem existiert - - $this->db->ImportQuery(WPSG_TBL_OL, array( - "title" => __("PayPal VERIFIED", "wpsg"), - "cdate" => "NOW()", - "o_id" => wpsg_q($_REQUEST['custom']), - "mailtext" => wpsg_q(htmlentities(print_r($_REQUEST, 1), ENT_IGNORE)) - )); - - if ($this->shop->setPayMent($_REQUEST['custom'], $_REQUEST['mc_gross'])) - { - - $this->shop->setOrderStatus($_REQUEST['custom'], 100, true); - - } - - } - - } - else if (strcmp(trim($res), "INVALID") == 0) - { - - $this->db->ImportQuery(WPSG_TBL_OL, array( - "title" => __("Targo FAILED", "wpsg"), - "cdate" => "NOW()", - "o_id" => wpsg_q($_REQUEST['custom']), - "mailtext" => wpsg_q(wpsg_hspc(print_r($_REQUEST, 1))) - )); - - } - - } - - fclose($fp); - - } - - die(); - - } - - } // public function wp_loaded() - - public function mail_payment() - { - - if ($this->shop->view['basket']['checkout']['payment'] != $this->id) return; - - if ($this->shop->htmlMail === true) - { - - echo ''.__('Zahlungslink', 'wpsg').''.__(', um die Zahlung durchzufÌhren', 'wpsg'); - - } - else - { - - echo wpsg_pad_right(__('Zahlungslink', 'wpsg').':', 35).$this->shop->getDoneURL($this->shop->view['o_id']); - - } - - } // public function mail_payment() - /* Modulfunktionen */ - - /* Classic API */ - + /** * Gibt den Link fÌr die Bezahlung per Targo anhand der BestellID zurÌck @@ -462,244 +250,8 @@ } // public function getTargoLink($order_id) - - /** - * Startet die Zahlungsabwicklung Ìber PayPal mittels der API - */ - public function startPayPalPaymentRedirect() - { - - if (!wpsg_isSizedInt($_REQUEST['order_id'])) $this->shop->throwErrorCode('2_1'); - - $oOrder = wpsg_order::getInstance($_REQUEST['order_id']); - $paymentId = $oOrder->getMeta('wpsg_mod_paypal_paymentid'); - - if (wpsg_isSizedString($paymentId)) - { - - try - { - - $payment = \PayPal\Api\Payment::get($oOrder->getMeta('wpsg_mod_paypal_paymentid'), $this->getApiContext()); - $approvalLink = $payment->getApprovalLink(); - - if (!wpsg_isSizedString($approvalLink)) - { - - $oOrder->log(__('PayPal Fehler: Zahlung konnte nicht erneut ausgefÌhrt werden', 'wpsg'), 'PaymentStatus: '.$payment->getState()); - $this->shop->redirect($this->shop->getDoneURL($oOrder->id)); - - } - else - { - - $this->shop->redirect($payment->getApprovalLink()); - - } - - } - catch (Exception $ex) - { - - $data = json_decode($ex->getData(), true); - - ob_start(); - var_dump($ex); - $dump = ob_get_contents(); - ob_end_clean(); - - $oOrder->log(wpsg_translate(__('PayPal Fehler: #1#', 'wpsg'), $data['message']), print_r($data, 1)."\r\n".$dump); - - $this->shop->addFrontendError(__('PayPal Fehler, bitte Shop Betreiber kontaktieren.', 'wpsg')); - $this->shop->redirect(get_permalink($this->shop->get_option('wpsg_page_mod_paypal_error'))); - - } - - } - - if ($this->id != $oOrder->getPaymentID()) $this->shop->throwErrorCode('2_2'); - //TODO - $payer = new \PayPal\Api\Payer(); - $payer->setPaymentMethod("paypal"); - - $billing_address = new \PayPal\Api\Address(); - $billing_address->setCity($oOrder->getInvoiceCity()); - $billing_address->setPostalCode($oOrder->getInvoiceZip()); - $billing_address->setLine1($oOrder->getInvoiceStreet()); - $billing_address->setCountryCode($oOrder->getInvoiceCountryKuerzel()); - - $shipping_address = new \PayPal\Api\Address(); - $shipping_address->setCity($oOrder->getShippingCity()); - $shipping_address->setPostalCode($oOrder->getShippingZip()); - $shipping_address->setLine1($oOrder->getShippingStreet()); - $shipping_address->setCountryCode($oOrder->getShippingCountryKuerzel()); - - $payer_info = new \PayPal\Api\PayerInfo(); - $payer_info->setFirstName($oOrder->getInvoiceFirstName()); - $payer_info->setLastName($oOrder->getInvoiceName()); - $payer_info->setBillingAddress($billing_address); - //$payer_info->setShippingAddress($shipping_address); - - $payer->setPayerInfo($payer_info); - - - $amount = new \PayPal\Api\Amount(); - $amount->setCurrency($this->shop->get_option('wpsg_mod_paypal_currency')); - $amount->setTotal($oOrder->getAmount(WPSG_BRUTTO)); - //$amount->setDetails($details); - - $transaction = new \PayPal\Api\Transaction(); - $transaction->setAmount($amount); - //$transaction->setItemList($itemList); - $transaction->setDescription($this->shop->replaceUniversalPlatzhalter(__($this->shop->get_option('wpsg_mod_paypal_subject'), 'wpsg'), $oOrder->id)); - $transaction->setInvoiceNumber($oOrder->id); - - $redirectUrls = new \PayPal\Api\RedirectUrls(); - $redirectUrls->setReturnUrl($this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypal', 'executePayment')); - $redirectUrls->setCancelUrl(get_permalink($this->shop->get_option('wpsg_page_mod_paypal_error'))); - - $payment = new \PayPal\Api\Payment(); - $payment->setIntent("sale"); - $payment->setPayer($payer); - $payment->setRedirectUrls($redirectUrls); - $payment->setTransactions(array($transaction)); - - try - { - - $response = $payment->create($this->getApiContext()); - - $oOrder->setMeta('wpsg_mod_paypal_paymentid', $response->getId()); - - } - catch (Exception $ex) - { - - $data = json_decode($ex->getData(), true); - - ob_start(); - var_dump($ex); - $dump = ob_get_contents(); - ob_end_clean(); - - $oOrder->log(wpsg_translate(__('PayPal Fehler: #1#', 'wpsg'), $data['message']), print_r($data, 1)."\r\n".$dump); - - $this->shop->addFrontendError(__('PayPal Fehler, bitte Shop Betreiber kontaktieren.', 'wpsg')); - $this->shop->redirect($this->shop->getDoneURL($oOrder->id)); - - } - - $this->getPaymentState($oOrder->id); - - $this->shop->redirect($payment->getApprovalLink()); - - } // public function startPayPalPaymentRedirect() - - /** - * FÌhrt eine Zahlung aus wird von startPayPalPaymentRedirect aufgerufen - */ - public function executePaymentRedirect() - { - - $payment = \PayPal\Api\Payment::get($_REQUEST['paymentId'], $this->getApiContext()); - - $execution = new \PayPal\Api\PaymentExecution(); - $execution->setPayerId($_REQUEST['PayerID']); - - try - { - - $result = $payment->execute($execution, $this->getApiContext()); - - } - catch (Exception $ex) - { - - $this->shop->redirect(get_permalink($this->shop->get_option('wpsg_mod_targo_error'))); - - } - - $this->shop->redirect(get_permalink($this->shop->get_option('wpsg_mod_targo_success'))); - - } // public fucntion executePaymentRedirect() - - private function getPaymentState($order_id) - { - //TODO - $oOrder = wpsg_order::getInstance($order_id); - - if (!wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypal_paymentid'))) return false; - - try - { - - $payment = \PayPal\Api\Payment::get($oOrder->getMeta('wpsg_mod_paypal_paymentid'), $this->getApiContext()); - - $oOrder->setMeta('wpsg_mod_paypal_paymentstate', $payment->getState()); - - return $payment->getState(); - - } - catch (Exception $e) - { - - return false; - - } - - } - - - /** - * Wird optional beim speichern ausgelöst, versucht den WebHook anzulegen und setzt die BackendMeldungen - */ - private function createWebHook() - { - - $create_webhook = false; - $wh_url = $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_targoapi', 'webHook', array(), true); - - $arWH = $this->api_getWebHooks(); - - if (wpsg_isSizedArray($arWH)) - { - - foreach ($arWH as $wh) - { - - if ($wh['url'] === $wh_url) - { - - $nExists = true; - break; - - } - - } - - if ($nExists === false) $create_webhook = true; - else - { - - $this->shop->addBackendError(__('WebHook ist bereits registriert.', 'wpsg')); - - } - - } - else $create_webhook = true; - - if ($create_webhook === true) - { - - $bOK = $this->api_createWebHook($wh_url); - - if ($bOK === true) $this->shop->addBackendMessage(__('WebHook erfolgreich angelegt.', 'wpsg')); - else $this->shop->addBackendError(__('WebHook konnte nicht angelegt werden.', 'wpsg')); - - } - - } // private function createWebHook(); - + public function dealerTextRedirect() { + //die("dealerTextRedirekt"); /* @@ -715,91 +267,20 @@ //$url = "https://onlineapplication.uat.targobank.de/microsites/statustool/interface/request.asp" - } // public function webHookRedirect() - - private function stornoOrder($order_id) - { - //TODO + $order_id = $_REQUEST['order_id']; + // PAID speichern zu Bestellung $oOrder = wpsg_order::getInstance($order_id); - if ($oOrder === false) $this->shop->throwErrorCode('2_3'); - - $sale_id = $oOrder->getMeta('wpsg_mod_targo_saleid'); - - $amount = new \PayPal\Api\Amount(); - $amount->setCurrency($this->shop->get_option('wpsg_mod_paypal_currency')); - $amount->setTotal($oOrder->getAmount(WPSG_BRUTTO)); - - $refund = new \PayPal\Api\Refund(); - $refund->setAmount($amount); - - $sale = new \PayPal\Api\Sale(); - $sale->setId($sale_id); - - try - { - - $refundedSale = $sale->refund($refund, $this->getApiContext()); - - $oOrder->setMeta('wpsg_mod_paypal_saleid', null); - $oOrder->setMeta('wpsg_mod_paypal_paymentid', null); - - return true; - - } - catch (Exception $ex) - { - - $oOrder->log(wpsg_translate(__('Targo Fehler: #1#', 'wpsg'), $ex->getMessage())); - return false; - - } - - } // public function stornoOrder($order_id) - - /** - * Gibt den API Context fÌr alle API Anfragen zurÌck - */ - private function getApiContext() - { - //TODO - if ($this->apiContext === false) - { - - $this->apiContext = new \PayPal\Rest\ApiContext(new PayPal\Auth\OAuthTokenCredential( - $this->shop->get_option('wpsg_mod_paypal_clientid'), - $this->shop->get_option('wpsg_mod_paypal_secret') - )); - - if (!$this->isSandbox()) - { - - $this->apiContext->setConfig(array( - 'mode' => 'live' - )); - - } - - } - - return $this->apiContext; - - } // public function getApiContext() - - - /** - * Autoloader fÌr die Targo Klassen - */ - function spl_autoload($class) - { - - if (substr($class, 0, 6) == "Targo\\" || substr($class, 0, 4) == "Psr\\") - { - - $path = WPSG_PATH_LIB.str_replace("\\", DIRECTORY_SEPARATOR, $class).'.php'; - - if (file_exists($path)) require_once($path); - - } - - } // function spl_autoload($class) + $oOrder->setMeta('wpsg_mod_targo_paymentid', $_REQUEST['paid']); + + // Status umschalten (wpsg_ShopController->setOrderStatus($order_id, $status_id, $inform)) + // $inform sollte false sein, sonst bekommt der Kunde eine E-Mail $status_id ist wpsg_mod_targo::STATUS_CREDIT_ACCEPTED + $sc = new wpsg_ShopController(); + $sc->setOrderStatus($order_id, STATUS_CREDIT_ACCEPTED, false); + + // Log Eintrag speichern wpsg_order->log + // [session_id] => 1tm24iqd49c4cg1ct834bvqnp0 [paid] => 201610252052880 + $text = 'Session-ID: '.$_REQUEST['session_id'].' PAID: '.$_REQUEST['paid']; + $oOrder->log('RÌckantwort der Targobank', $text); + + } // public function dealerTextRedirect() } // class wpsg_mod_targo extends wpsg_mod_basic Index: /mods/wpsg_mod_trustedshops.class.php =================================================================== --- /mods/wpsg_mod_trustedshops.class.php (revision 5873) +++ /mods/wpsg_mod_trustedshops.class.php (revision 5877) @@ -177,5 +177,6 @@ // Wenn keine Elemente, dann keine Meldung - if (!wpsg_isSizedArray($this->getExportData())) return; + $expdata = $this->getExportData(); + if (!wpsg_isSizedArray($expdata)) return; $current_timestamp = $this->db->fetchOne("SELECT UNIX_TIMESTAMP()"); @@ -501,5 +502,5 @@ $timestamp = filemtime($this->cache_file); - if (mktime() - $timestamp < $this->cache_timeout) + if (time() - $timestamp < $this->cache_timeout) { Index: ews/admin/customerpreset.phtml =================================================================== --- /views/admin/customerpreset.phtml (revision 5873) +++ (revision ) @@ -1,43 +1,0 @@ - -
- -
-
-
-
- - - -
- -
- -
- - view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?> - view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?> - view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => - 'nohspc_'.wpsg_translate(__('Die LÀnder können in der LÀnderverwaltung definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender') - )); ?> - view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title', - 'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den Kundendaten definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'), - 'noIndex' => true - )); ?> - -
- - - -
- -
Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5873) +++ /views/css/admin.css (revision 5877) @@ -210,4 +210,5 @@ /* Modul Gutschein */ #wpsg-bs.wpsg_voucher .col_checkbox { width:20px; } +.wpsg_mod_voucher_fieldtable { font-size:12px; } /* Modul Lieferschein */ Index: /views/mods/mod_ordercondition/list.phtml =================================================================== --- /views/mods/mod_ordercondition/list.phtml (revision 5873) +++ /views/mods/mod_ordercondition/list.phtml (revision 5877) @@ -119,5 +119,5 @@ - + - - -
+ Index: /views/mods/mod_videodownload/settings_edit.phtml =================================================================== --- /views/mods/mod_videodownload/settings_edit.phtml (revision 5873) +++ /views/mods/mod_videodownload/settings_edit.phtml (revision 5877) @@ -8,15 +8,14 @@
-
-
-
-
-
-
-
-
-
+ + + +
-
+
get_option('wpsg_mod_videodownload_command'), array('help' => 'mod_videodownload_einstellungen_programmaufruf')); ?> get_option('wpsg_mod_videodownload_infocommand'), array('help' => 'mod_videodownload_einstellungen_programminfoaufruf')); ?> @@ -63,5 +62,5 @@
-
+
@@ -69,8 +68,8 @@ - - + + - + @@ -144,5 +143,5 @@ -
+

Index: /views/mods/mod_voucherproduct/settings_edit.phtml =================================================================== --- /views/mods/mod_voucherproduct/settings_edit.phtml (revision 5873) +++ /views/mods/mod_voucherproduct/settings_edit.phtml (revision 5877) @@ -9,15 +9,14 @@

-
-
-
-
-
-
-
-
-
+ +
+
    + +
    • +
+ +
-
+
@@ -55,6 +54,6 @@
-
-
+
+