Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 7705) +++ /controller/wpsg_AdminController.class.php (revision 7706) @@ -1069,5 +1069,6 @@ $arOrder = wpsg_order::find(array( - 'status' => wpsg_ShopController::STATUS_UNVOLLSTAENDIG + 'status' => wpsg_ShopController::STATUS_UNVOLLSTAENDIG, + 'limit' => [0, 10000] )); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 7705) +++ /controller/wpsg_ShopController.class.php (revision 7706) @@ -744,4 +744,7 @@ */ public function init() { + + // https://codex.wordpress.org/Transients_API + if (!session_id()) session_start(); $locale = apply_filters('plugin_locale', get_locale(), 'wpsg'); @@ -1577,6 +1580,5 @@ $this->arSystemCheck = $arData; - if ($countError > 0) - { + if ($countError > 0) { $this->addBackendError( @@ -3237,6 +3239,5 @@ } - if (!is_admin()) - { + if (!is_admin()) { // Sollte die Session noch nicht mit Werten gefÌllt sein dann hier die Kundenvoreinstellungen laden @@ -3264,7 +3265,7 @@ if (wpsg_isSizedArray($_REQUEST['wpsg']['checkout'])) $this->basket->save(false); - $this->basket->save(false); - - } + //$this->basket->save(false); Hatte Hartmut mal eingebaut, keine Ahnung warum aber das fÌhrt zum stÀndigen speichern der Bestellungen und damit auch zum eintragen der Kunden + + } } // public function template_redirect() @@ -3404,5 +3405,5 @@ $this->callMods('sendMail', array($mail_key, $o_id, $k_id, &$empfaenger, &$subject, &$mail_text_send, &$headers, &$anhang)); - + \apply_filters('wpsg_sendMail', [$mail_key, $o_id, $k_id, &$empfaenger, &$subject, &$mail_text_send, &$headers, &$anhang]); Index: /controller/wpsg_SystemController.class.php =================================================================== --- /controller/wpsg_SystemController.class.php (revision 7705) +++ /controller/wpsg_SystemController.class.php (revision 7706) @@ -162,5 +162,5 @@ /** * Gibt die Antwort einer URL zurÌck - * @throws \wpsg\Exception + * @throws Exception */ public function get_url_content($url) { @@ -169,5 +169,5 @@ if (is_array($result)) return $result['body']; - else throw new \wpsg\Exception($result->errors); + else throw new Exception($result->errors); } // public function get_url_content($url) @@ -177,6 +177,5 @@ * Wird mittels writeBackendMessage ausgegeben */ - public function addBackendMessage($message) - { + public function addBackendMessage($message) { $message_key = md5($message); @@ -221,7 +220,6 @@ * @return bool|void */ - public function addBackendError($message, $hideLinkKey = false, $addBlendOut = true) - { - + public function addBackendError($message, $hideLinkKey = false, $addBlendOut = true) { + if ($hideLinkKey === false) $message_key = md5($message); else $message_key = $hideLinkKey; @@ -261,5 +259,5 @@ } - + $_SESSION['wpsg']['backendError'][$message_key] = $message; Index: /lib/filter_functions.inc.php =================================================================== --- /lib/filter_functions.inc.php (revision 7705) +++ /lib/filter_functions.inc.php (revision 7706) @@ -34,22 +34,17 @@ } // function wpsg_dispatch() - function wpsg_admin_notices() - { - + function wpsg_admin_notices() { + $wpsg_update_data = wpsg_get_update_data(); - if (is_object($wpsg_update_data['updateData'])) - { - - if (property_exists($wpsg_update_data['updateData'], 'banner')) - { + if (is_object($wpsg_update_data['updateData'])) { + + if (property_exists($wpsg_update_data['updateData'], 'banner')) { $arBanner = $wpsg_update_data['updateData']->banner; - if (wpsg_isSizedArray($arBanner)) - { - - foreach ($arBanner as $b) - { + if (wpsg_isSizedArray($arBanner)) { + + foreach ($arBanner as $b) { echo '
'; @@ -64,5 +59,5 @@ } - + echo $GLOBALS['wpsg_sc']->writeBackendMessage(); Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 7705) +++ /lib/wpsg_basket.class.php (revision 7706) @@ -672,5 +672,5 @@ */ public function save($finish_order = true, $sendmail = true, $save = false) { - + $knr = ''; @@ -686,5 +686,5 @@ $this->shop->callMods('basket_save_kunde', array(&$data, &$this->arCheckout)); - + $k_id = wpsg_getStr($this->arCheckout['id']); @@ -742,5 +742,5 @@ if (!wpsg_isSizedInt($_SESSION['wpsg']['checkout']['id'])) { - + $k_id = $this->db->ImportQuery(WPSG_TBL_KU, $data); Index: /lib/wpsg_header.class.php =================================================================== --- /lib/wpsg_header.class.php (revision 7705) +++ /lib/wpsg_header.class.php (revision 7706) @@ -65,5 +65,20 @@ } // public static function JSONData() - + + public static function AUTO($file, $filename = false) { + + if ($filename === false) $filename = basename($file); + + header('Content-Disposition: inline; filename="'.$filename.'"'); + + header('Pragma: public'); + header('Content-type: '.\mime_content_type($file)); + header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 + header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Datum in der Vergangenheit + + readfile($file); + + } + public static function ZIP($file, $filename = false) { Index: /model/wpsg_exception.class.php =================================================================== --- /model/wpsg_exception.class.php (revision 7705) +++ /model/wpsg_exception.class.php (revision 7706) @@ -19,6 +19,5 @@ private $data = null; - public function __construct($message, $typ = null, $arData = array(), $code = 0, Exception $previous = null) - { + public function __construct($message, $typ = null, $arData = array(), $code = 0, Exception $previous = null) { parent::__construct($message, $code, $previous); Index: /model/wpsg_model.class.php =================================================================== --- /model/wpsg_model.class.php (revision 7705) +++ /model/wpsg_model.class.php (revision 7706) @@ -5,10 +5,11 @@ * @author Daschmi */ - class wpsg_model - { + class wpsg_model { /** @var array */ public static $_objCache = array(); + private $arMeta = null; + /** @var wpsg_db */ var $db = false; @@ -34,6 +35,10 @@ public function getId() { - - return intval($this->data['id']??''); + + $id = 0; + + if (isset($this->data['id'])) $id = intval($this->data['id']); + + return $id; } @@ -114,6 +119,5 @@ return []; - } - else { + } else { if (!isset(self::$_objCache[$class_name]) || !array_key_exists($id, self::$_objCache[$class_name]) || $noCache === true) { @@ -200,5 +204,5 @@ * Gibt einen META Value zurÌck */ - public function getMeta($meta_key) { + public function getMeta($meta_key, $reload = false) { $class = get_called_class(); @@ -206,7 +210,20 @@ if ($class::$_tableName === null) throw \wpsg\Exception::getInvalidValueException(); - $meta_value = $this->db->fetchOne("SELECT M.`meta_value` FROM `".WPSG_TBL_META."` AS M WHERE M.`meta_table` = '".wpsg_q($class::$_tableName)."' AND M.`meta_key` = '".wpsg_q($meta_key)."' AND `target_id` = '".wpsg_q($this->id)."' "); - - return $meta_value; + if ($this->arMeta === null || $reload === true) { + + $this->arMeta = $this->db->fetchAssocField(" + SELECT + M.`meta_key`, M.`meta_value` + FROM + `".WPSG_TBL_META."` AS M + WHERE + M.`meta_table` = '".wpsg_q($class::$_tableName)."' AND + M.`target_id` = '".wpsg_q($this->getId())."' + ", "meta_key", "meta_value"); + + } + + if (array_key_exists($meta_key, $this->arMeta)) return $this->arMeta[$meta_key]; + else return ''; } // public function getMeta($meta_key) Index: /model/wpsg_order_product.class.php =================================================================== --- /model/wpsg_order_product.class.php (revision 7705) +++ /model/wpsg_order_product.class.php (revision 7706) @@ -109,4 +109,13 @@ } + + /** + * @return wpsg_order + */ + public function getOrder() { + + return wpsg_order::getInstance($this->data['o_id']); + + } public function getPrice($tax_view = WPSG_NETTO) { Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 7705) +++ /model/wpsg_product.class.php (revision 7706) @@ -970,16 +970,13 @@ * @return wpsg_product */ - public static function getInstance($product_key, $noCache = false) - { + public static function getInstance($product_key, $noCache = false) { $class_name = get_called_class(); - if (wpsg_isSizedArray($product_key)) - { + if (wpsg_isSizedArray($product_key)) { $arReturn = []; - foreach ($product_key as $_id) - { + foreach ($product_key as $_id) { $arReturn[$_id] = self::getInstance($_id); @@ -989,11 +986,8 @@ return $arReturn; - } - else if (is_array($product_key)) return array(); - else - { - - if (!array_key_exists($class_name.'_'.$product_key, self::$_objCache) || $noCache === true) - { + } else if (is_array($product_key)) return array(); + else { + + if (!array_key_exists($class_name.'_'.$product_key, self::$_objCache) || $noCache === true) { $product_id = $GLOBALS['wpsg_sc']->getProduktId($product_key); Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 7705) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 7706) @@ -363,9 +363,7 @@ } // public function dispatch() - public function checkCheckout(&$state, &$error, &$arCheckout) - { - - if (isset($_REQUEST['wpsg_mod_kundenverwaltung_login'])) - { + public function checkCheckout(&$state, &$error, &$arCheckout) { + + if (isset($_REQUEST['wpsg_mod_kundenverwaltung_login'])) { // Error wird immer true, damit checkout2 nicht aufgerufen wird @@ -379,9 +377,7 @@ } - else if ($state == 1) - { - - if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_kundenverwaltung_wpuser'))) - { + else if ($state == 1) { + + if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_kundenverwaltung_wpuser'))) { $temp = wpsg_customer::find(array('email' => $arCheckout['email'])); @@ -399,5 +395,5 @@ $_SESSION['wpsg']['errorFields'][] = 'email'; $error = true; - + $_REQUEST['wpsg_checkout'] = 1; @@ -408,6 +404,5 @@ } - if (isset($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd1']) && isset($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd2'])) - { + if (isset($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd1']) && isset($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd2'])) { // Registrierungszwang und leer @@ -478,6 +473,5 @@ // Kunde ist nicht eingeloggt - if ($this->shop->get_option('wpsg_mod_kundenverwaltung_loginZwang') == '1') - { + if ($this->shop->get_option('wpsg_mod_kundenverwaltung_loginZwang') == '1') { $kunde_id = $this->db->fetchOne("SELECT K.`id` FROM `".WPSG_TBL_KU."` AS K WHERE K.`email` = '".wpsg_q($arCheckout['email'])."'"); @@ -498,7 +492,7 @@ $kunde_id = $this->db->fetchOne($strQuery); - if ($kunde_id > 0) - { - + if ($kunde_id > 0) { + + // !!!! $this->shop->addFrontendError(__('Ein Kunde mit dieser E-Mail Adresse existiert bereits, bitte loggen Sie sich ein oder fordern Sie ein neues Passwort an!', 'wpsg')); Index: /mods/wpsg_mod_paypalapi.class.php =================================================================== --- /mods/wpsg_mod_paypalapi.class.php (revision 7705) +++ /mods/wpsg_mod_paypalapi.class.php (revision 7706) @@ -44,7 +44,7 @@ } // public function init() - public function install() - { - + public function install() { + + $this->shop->checkDefault('wpsg_mod_paypalapi_version', 'v2'); $this->shop->checkDefault('wpsg_mod_paypalapi_aktiv', '1'); $this->shop->checkDefault('wpsg_mod_paypalapi_paypalexpress', '1'); @@ -66,13 +66,4 @@ public function settings_edit() { - /* - $oOrder = wpsg_order::getInstance(8); - $wpsg_basket = new wpsg_basket(); - $wpsg_basket->initFromDB(8); - $arBasket = $wpsg_basket->toArray(); - $this->api_startPayment_v2($arBasket, 8, false); - die(); - */ - $pages = get_pages(); @@ -112,5 +103,6 @@ } - + + $this->shop->update_option('wpsg_mod_paypalapi_version', $_REQUEST['wpsg_mod_paypalapi_version'], false, false, WPSG_SANITIZE_VALUES, ['v1', 'v2']); $this->shop->update_option('wpsg_mod_paypalapi_clientid', $_REQUEST['wpsg_mod_paypalapi_clientid'], false, false, WPSG_SANITIZE_APIKEY); $this->shop->update_option('wpsg_mod_paypalapi_secret', $_REQUEST['wpsg_mod_paypalapi_secret'], false, false, WPSG_SANITIZE_APIKEY); @@ -194,5 +186,5 @@ } - + $nProductWithoutAnr = intval($this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` WHERE `anr` = '' AND `deleted` != '1' AND `lang_parent` = '0' ")); @@ -266,24 +258,37 @@ } // public function wpsg_deinstall_sites() - public function setOrderStatus($order_id, $status_id, $inform) - { + public function setOrderStatus($order_id, $status_id, $inform) { $oOrder = wpsg_order::getInstance($order_id); - if ($oOrder->getPaymentID() == $this->id) - { + if ($oOrder->getPaymentID() == $this->id) { $arStornoState = (array)$this->shop->get_option('wpsg_mod_paypalapi_stornostate'); - if (array_key_exists($status_id, $arStornoState) && $arStornoState[$status_id] == '1') - { - - if (wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_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')); + if (array_key_exists($status_id, $arStornoState) && $arStornoState[$status_id] == '1') { + + if (wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid'))) { + + $state = $this->getState($order_id); + + if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v2') { + + if ($state[1] === 'COMPLETED') { + + $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')); + + } else $this->shop->addBackendError(__('PayPal RÌckzahlung nicht möglich.')); + + } else { + + $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')); + + } } @@ -497,7 +502,6 @@ } // public function order_ajax() - public function order_done(&$order_id, &$done_view) - { - + public function order_done(&$order_id, &$done_view) { + // Bestellungen mit 0 geben nix aus if ($done_view['basket']['sum']['preis_gesamt_brutto'] <= 0) return; @@ -567,5 +571,5 @@ $approval_url = ""; - foreach ($json_data['links'] as $k => $l) if ($l['rel'] == 'approve') $approval_url = $l['href']; + foreach ($json_data['links'] as $k => $l) if ($l['rel'] == 'approve' || $l['rel'] == 'approval_url') $approval_url = $l['href']; $this->shop->view['wpsg_mod_paypalapi']['approval_url'] = $approval_url; @@ -722,27 +726,44 @@ $jsonData = json_decode($bodyReceived, true); - - $payment_id = $jsonData['resource']['parent_payment']; - $amount = $jsonData['resource']['amount']['total']; - $order_id = $this->db->fetchOne("SELECT `target_id` FROM `".WPSG_TBL_META."` WHERE `meta_table` = 'WPSG_TBL_ORDER' AND `meta_key` = 'wpsg_mod_paypalapi_paymentid' AND `meta_value` = '".wpsg_q($payment_id)."' "); - - $oOrder = wpsg_order::getInstance($order_id); - if ($oOrder === false) die(__('Keine Bestellung zu PaymentID gefunden.', 'wpsg')); - - list($payment_state, $sale_state, $result) = $this->getState($order_id); - $orderPaymentID = $oOrder->getMeta('wpsg_mod_paypalapi_paymentid'); - - if ($this->shop->setPayMent($oOrder->id, $amount) && $orderPaymentID === $payment_id && $payment_state === 'approved' && $sale_state === 'completed') { - - $oOrder->log(__('PayPalAPI WebHook Erfolg', 'wpsg'), print_r($jsonData, 1)); + + if ($jsonData['event_type']['PAYMENT.CAPTURE.COMPLETED']) { + + $saleID = $jsonData['resource']['id']; + + $order_id = intval($this->db->fetchOne("SELECT `target_id` FROM `".WPSG_TBL_META."` WHERE `meta_table` = 'WPSG_TBL_ORDER' AND `meta_key` = 'wpsg_mod_paypalapi_saleid' AND `meta_value` = '".wpsg_q($saleID)."' ")); + $amount = $jsonData['resource']['amount']['value']; + + } else { + + $payment_id = $jsonData['resource']['parent_payment']; + $amount = $jsonData['resource']['amount']['total']; + $order_id = $this->db->fetchOne("SELECT `target_id` FROM `".WPSG_TBL_META."` WHERE `meta_table` = 'WPSG_TBL_ORDER' AND `meta_key` = 'wpsg_mod_paypalapi_paymentid' AND `meta_value` = '".wpsg_q($payment_id)."' "); + + } + + $oOrder = wpsg_order::getInstance($order_id); + if ($oOrder === false) die(__('Keine Bestellung zu PaymentID gefunden.', 'wpsg')); + + list($payment_state, $sale_state, $result) = $this->getState($order_id); + $orderPaymentID = $oOrder->getMeta('wpsg_mod_paypalapi_paymentid'); + + if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v1' && $this->shop->setPayMent($oOrder->id, $amount) && $orderPaymentID === $payment_id && $payment_state === 'approved' && $sale_state === 'completed') { + + $oOrder->log(__('PayPalAPI V1 WebHook Erfolg', 'wpsg'), print_r($jsonData, 1)); $this->shop->setOrderStatus($oOrder->id, 100, true); - - } else { - - $oOrder->log(__('PayPalAPI Abgelehnt', 'wpsg', print_r($jsonData, 1)."\r\nOrder PaymentID:".$orderPaymentID."\r\nRequest PaymentID:".$payment_id."\r\nOrder State:".$state)); + + } else if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v2' && $this->shop->setPayMent($oOrder->id, $amount) && $payment_state === 'COMPLETED' && $sale_state === 'COMPLETED') { + + $oOrder->log(__('PayPalAPI V2 WebHook Erfolg', 'wpsg'), print_r($jsonData, 1)); + + $this->shop->setOrderStatus($oOrder->id, 100, true); + + } else { + + $oOrder->log(__('PayPalAPI Abgelehnt', 'wpsg'), print_r($jsonData, 1)."\r\nOrder PaymentID:".$orderPaymentID."\r\nRequest PaymentID:".$payment_id); } - + header('HTTP/1.1 200 OK'); exit(1); @@ -761,6 +782,6 @@ $approval_url = false; - foreach ($json_data['links'] as $l) { if ($l['rel'] == 'approve') $approval_url = $l['href']; } - + foreach ($json_data['links'] as $l) { if ($l['rel'] == 'approve' || $l['rel'] == 'approval_url') $approval_url = $l['href']; } + $this->shop->redirect($approval_url); @@ -795,8 +816,5 @@ } - - $execute_url = false; - foreach ($json_data['links'] as $l) { if ($l['rel'] == 'approval_url') $execute_url = $l['href']; } - + $_SESSION['wpsg']['checkout']['payment'] = $this->id; @@ -821,15 +839,19 @@ if ($this->shop->hasMod('wpsg_mod_shippingadress') && !isset($_SESSION['wpsg']['checkout']['diff_shippingadress'])) { - if (isset($json_data['purchase_units'][0]['shipping'])) { + $shipping = wpsg_getArray($json_data['purchase_units'][0]['shipping']); + + if (wpsg_isSizedArray($shipping)) { $_SESSION['wpsg']['checkout']['diff_shippingadress'] = '1'; - $_SESSION['wpsg']['checkout']['shipping_vname'] = wpsg_getStr($json_data['purchase_units'][0]['shipping']['name']['given_name']); - $_SESSION['wpsg']['checkout']['shipping_name'] = wpsg_getStr($json_data['purchase_units'][0]['shipping']['name']['full_name']); - - $_SESSION['wpsg']['checkout']['shipping_strasse'] = wpsg_getStr($json_data['purchase_units'][0]['shipping']['address_line_1']); - $_SESSION['wpsg']['checkout']['shipping_plz'] = wpsg_getStr($json_data['purchase_units'][0]['shipping']['postal_code']); - $_SESSION['wpsg']['checkout']['shipping_ort'] = wpsg_getStr($json_data['purchase_units'][0]['shipping']['admin_area_2']); - $_SESSION['wpsg']['checkout']['shipping_land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper(wpsg_getStr($json_data['purchase_units'][0]['shipping']['country_code'])))."'"); + $arName = wpsg_explodeName($shipping['name']['given_name']); + + $_SESSION['wpsg']['checkout']['shipping_vname'] = wpsg_getStr($arName[0]); + $_SESSION['wpsg']['checkout']['shipping_name'] = wpsg_getStr($arName[1]); + + $_SESSION['wpsg']['checkout']['shipping_strasse'] = wpsg_getStr($shipping['address']['address_line_1']); + $_SESSION['wpsg']['checkout']['shipping_plz'] = wpsg_getStr($shipping['address']['postal_code']); + $_SESSION['wpsg']['checkout']['shipping_ort'] = wpsg_getStr($shipping['address']['admin_area_2']); + $_SESSION['wpsg']['checkout']['shipping_land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper(wpsg_getStr($shipping['address']['country_code'])))."'"); } @@ -905,5 +927,5 @@ $approval_url = false; - foreach ($json_data['links'] as $l) { if ($l['rel'] == 'approve') $approval_url = $l['href']; } + foreach ($json_data['links'] as $l) { if ($l['rel'] == 'approve' || $l['rel'] == 'approval_url') $approval_url = $l['href']; } // Das war mal drin mir ist nicht klar warum: @@ -953,21 +975,17 @@ * Wird optional beim speichern ausgelöst, versucht den WebHook anzulegen und setzt die BackendMeldungen */ - private function createWebHook() - { - - $create_webhook = false; + private function createWebHook() { + + $create_webhook = false; $nExists = false; $wh_url = $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'webHook', array(), true); - + $arWH = $this->api_getWebHooks(); - - if (wpsg_isSizedArray($arWH)) - { - - foreach ($arWH as $wh) - { - - if ($wh['url'] === $wh_url) - { - + + if (wpsg_isSizedArray($arWH)) { + + foreach ($arWH as $wh) { + + if ($wh['url'] === $wh_url) { + $nExists = true; break; @@ -978,6 +996,5 @@ if ($nExists === false) $create_webhook = true; - else - { + else { $this->shop->addBackendError(__('WebHook ist bereits registriert.', 'wpsg')); @@ -985,17 +1002,15 @@ } - } - else $create_webhook = true; - - if ($create_webhook === true) - { - + } 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(); @@ -1032,7 +1047,10 @@ $oOrder = wpsg_order::getInstance($order_id); if ($oOrder === false) throw new \wpsg\Exception(__('Bei einer Stornierung konnte Bestellung nicht geladen werden', 'wpsg')); - + + $payment_id = $oOrder->getMeta('wpsg_mod_paypalapi_paymentId'); $sale_id = $oOrder->getMeta('wpsg_mod_paypalapi_saleid'); - + + $payment_info = $this->api_getPaymentInfo_v2($payment_id); + $json_data = $this->api_refundSale_v2($sale_id, $oOrder->getAmount()); @@ -1075,6 +1093,4 @@ private function api_refundSale($sale_id, $amount) { - throw new \Exception(__('Veraltet', 'wpsg')); - $post_data = array( 'amount' => array( @@ -1091,4 +1107,10 @@ private function api_refundSale_v2($sale_id, $amount) { + + if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v1') { + + return $this->api_refundSale($sale_id, $amount); + + } $client = new \PayPalCheckoutSdk\Core\PayPalHttpClient($this->api_getEnvironment()); @@ -1112,18 +1134,19 @@ * Erstellt einen neuen WebHook fÌr ZahlungseingÀnge auf der Ìbergebenene URL */ - private function api_createWebHook($url) - { + private function api_createWebHook($url) { $post_data = array( 'url' => $url, 'event_types' => array( - array( + [ 'name' => 'PAYMENT.SALE.COMPLETED' - ) + ], [ + 'name' => 'PAYMENT.CAPTURE.COMPLETED' + ] ) ); $json_data = $this->api_call('v1/notifications/webhooks', $post_data, $this->api_getAccessToken()); - + if (wpsg_isSizedString($json_data['id'])) return true; else return false; @@ -1149,6 +1172,4 @@ private function api_executePayment($payment_id, $payer_id) { - throw new \Exception(__('Veraltet', 'wpsg')); - $post_data = array( 'payer_id' => $payer_id @@ -1162,4 +1183,10 @@ private function api_executePayment_v2($payment_id, $payer_id) { + + if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v1') { + + return $this->api_executePayment($payment_id, $payer_id); + + } $client = new \PayPalCheckoutSdk\Core\PayPalHttpClient($this->api_getEnvironment()); @@ -1256,4 +1283,281 @@ /** + * Authorisiert eine Zahlung + * https://developer.paypal.com/docs/api/payments/v1/#definition-transaction + * https://developer.paypal.com/docs/api/payments/v1/#definition-payer + * + */ + private function api_startPayment($arBasket, $order_id = false, $express = true) { + + // Dadurch wird die Bestellung in der DB fixiert und Platzhalter kÀnnen generiert werden + if (!wpsg_isSizedInt($order_id)) $order_id = $this->shop->basket->save(false, false, true); + + $oOrder = wpsg_order::getInstance($order_id); + $access_token = $this->api_getAccessToken(); + + $item_list = array( + 'items' => array() + ); + + $post_data = array(); + + $post_data['transactions'] = array( + array( + 'amount' => array( + 'total' => number_format($arBasket['sum']['preis_gesamt_brutto'], 2), + 'currency' => $this->currency + ), + 'description' => $this->shop->replaceUniversalPlatzhalter(__($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_subject'), 'wpsg'), $order_id), + ) + ); + + $subTotal = 0; + + // Produkte + foreach ($arBasket['produkte'] as $k => $p) + { + + $product_price = ((wpsg_isSizedString($arBasket['noMwSt'], '1'))?$p['preis_netto']:$p['preis_brutto']); + + $sku = $this->shop->getProductAnr($this->shop->getProduktID($p['id'])); + if (!wpsg_isSizedString($sku)) $sku = __('n.A.', 'wpsg'); + + $item_list['items'][] = array( + 'quantity' => $p['menge'], + 'name' => $this->shop->getProductName($this->shop->getProduktID($p['id']), true), + 'description' => '', + 'sku' => $sku, + 'url' => $this->shop->getProduktLink($this->shop->getProduktID($p['id'])), + 'price' => number_format($product_price, 2), + 'currency' => $this->currency + ); + + $subTotal += $product_price * $p['menge']; + + } + + // Gutschein + if (isset($arBasket['sum']['gs_brutto'])) + { + + $item_list['items'][] = array( + 'quantity' => '1', + 'name' => __('Gutschein', 'wpsg'), + 'description' => wpsg_translate(__('Eingelöster Gutschein Code:#1#', 'wpsg'), $arBasket['gs']['code']), + 'price' => number_format(-1 * $arBasket['sum']['gs_brutto'], 2), + 'currency' => $this->currency + ); + + $subTotal += -1 * $arBasket['sum']['gs_brutto']; + + } + + // Zahlungskosten/VergÌnstigungen + if (isset($arBasket['sum']['preis_payment_brutto']) && $arBasket['sum']['preis_payment_brutto'] != 0) + { + + $item_list['items'][] = array( + 'quantity' => '1', + 'name' => (($arBasket['sum']['preis_payment_brutto'] > 0)?__('GebÌhr fÌr Zahlungsart', 'wpsg'):__('Rabatt durch Zahlungsart', 'wpsg')), + 'description' => __('Rabatt, der Aufgrund der gewÀhlten Zahlungsart entstanden ist.', 'wpsg'), + 'price' => number_format($arBasket['sum']['preis_payment_brutto'], 2), + 'currency' => $this->currency + ); + + $subTotal += $arBasket['sum']['preis_payment_brutto']; + + } + + // Rabatte auf Warenkorb + if (isset($arBasket['sum']['preis_rabatt_brutto']) && $arBasket['sum']['preis_rabatt_brutto'] > 0) + { + + $item_list['items'][] = array( + 'quantity' => '1', + 'name' => __('Rabatt', 'wpsg'), + 'description' => __('Rabatt, der sich aus dem Warenkorbwert ergibt.', 'wpsg'), + 'price' => number_format(-1 * $arBasket['sum']['preis_rabatt_brutto'], 2), + 'currency' => $this->currency + ); + + $subTotal += -1 * $arBasket['sum']['preis_rabatt_brutto']; + + } + + /** @var wpsg_country $oInvoiceCountry */ + $oInvoiceCountry = null; if (wpsg_isSizedInt($arBasket['checkout']['land'])) $oInvoiceCountry = wpsg_country::getInstance($arBasket['checkout']['land']); + + /** @var wpsg_country $oShippingCountry */ + $oShippingCountry = null; + if ($oInvoiceCountry !== null) $oShippingCountry = $oInvoiceCountry; + if (wpsg_isSizedInt($arBasket['checkout']['shipping_land'])) $oShippingCountry = wpsg_country::getInstance($arBasket['checkout']['shipping_land']); + + $post_data['intent'] = 'sale'; + $post_data['payer'] = array( + 'payment_method' => 'paypal' + ); + + if ($oInvoiceCountry !== null && wpsg_isSizedString($arBasket['checkout']['plz'])) { + + $post_data['payer']['payer_info'] = [ + 'email' => $arBasket['checkout']['email'], + 'first_name' => $arBasket['checkout']['vname'], + 'last_name' => $arBasket['checkout']['name'], + 'billing_address' => [ + 'line1' => trim($arBasket['checkout']['strasse']), + 'line2' => '', + 'city' => trim($arBasket['checkout']['ort']), + 'country_code' => $oInvoiceCountry->getShorttext(), + 'postal_code' => trim($arBasket['checkout']['plz']), + ] + ]; + + if (strtotime($arBasket['checkout']['geb']) > 0) { + + $post_data['payer']['payer_info']['birth_date'] = date('Y-m-d', strtotime($arBasket['checkout']['geb'])); + + } + + if (preg_match('/^(?:\((\+?\d+)?\)|\+?\d+) ?\d*(-?\d{2,3} ?){0,4}$/', $arBasket['checkout']['tel'])) { + + $post_data['payer']['payer_info']['billing_address']['phone'] = preg_replace('/ /', '', $arBasket['checkout']['tel']); + + } + + } + + if ($oOrder->getId() > 0 && $oOrder->status == wpsg_ShopController::STATUS_UNVOLLSTAENDIG) + { + + $post_data['redirect_urls'] = array( + 'return_url' => $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'returnPayPalExpress'), + 'cancel_url' => $this->shop->getUrl(wpsg_ShopController::URL_BASKET) + ); + + } + else + { + + $post_data['redirect_urls'] = array( + 'return_url' => $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'returnPayPalExpress'), + 'cancel_url' => $this->shop->getDoneURL($oOrder->id) + ); + + } + + // Versandkosten/VergÌnstigungen + if (isset($arBasket['sum']['preis_shipping_brutto']) && $arBasket['sum']['preis_shipping_brutto'] > 0) + { + + $details['shipping'] = number_format($arBasket['sum']['preis_shipping_brutto'], 2); + + } + else if (isset($arBasket['sum']['preis_shipping_brutto']) && $arBasket['sum']['preis_shipping_brutto'] < 0) + { + + $item_list['items'][] = array( + 'quantity' => '1', + 'name' => __('Rabatt aufgrund Versandart', 'wpsg'), + 'price' => number_format($arBasket['sum']['preis_shipping_brutto'], 2), + 'currency' => $this->currency + ); + + $subTotal += $arBasket['sum']['preis_shipping_brutto']; + + } + + //wpsg_debug($item_list); + //wpsg_debug($subTotal); + + /* + * Daschmi@14.12.2016 + * Ich vergleiche hier die Summe der Positionen mit dem Ìbergebenen Brutto + * Bei Nettorechnungen kann es hier zu Problemen fÌhren Siehe Track Ticket 505 + */ + + $shipping_address = []; + + // Lieferadresse + if ($oShippingCountry !== null) { + + if (wpsg_getStr($arBasket['checkout']['diff_shippingadress']) == '1') { + + $shipping_address = [ + 'recipient_name' => trim($arBasket['checkout']['shipping_firma'].' '.$arBasket['checkout']['shipping_vname'].' '.$arBasket['checkout']['shipping_name']), + 'line1' => trim($arBasket['checkout']['shipping_strasse']), + 'line2' => '', + 'city' => trim($arBasket['checkout']['shipping_ort']), + 'country_code' => $oShippingCountry->getShorttext(), + 'postal_code' => trim($arBasket['checkout']['shipping_plz']) + ]; + + } else { + + $shipping_address = [ + 'recipient_name' => trim($arBasket['checkout']['firma'].' '.$arBasket['checkout']['vname'].' '.$arBasket['checkout']['name']), + 'line1' => trim($arBasket['checkout']['strasse']), + 'line2' => '', + 'city' => trim($arBasket['checkout']['ort']), + 'country_code' => $oShippingCountry->getShorttext(), + 'postal_code' => trim($arBasket['checkout']['plz']) + ]; + + } + + } + + if (wpsg_isSizedArray($shipping_address) && isset($post_data['transactions'][0]['item_list'])) { + + $post_data['transactions'][0]['item_list']['shipping_address'] = $shipping_address; + + } + + if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_details')) && floatval($subTotal) === floatval($arBasket['sum']['preis_gesamt_brutto'])) + { + + if (wpsg_isSizedArray($details)) + { + + $post_data['transactions'][0]['amount']['details'] = $details; + $post_data['transactions'][0]['amount']['details']['subtotal'] = number_format($subTotal, 2); + + } + + $post_data['transactions'][0]['item_list'] = $item_list; + } + else + { + + $post_data['transactions'][0]['item_list'] = array( + 'items' => array( + array( + 'quantity' => '1', + 'name' => $this->shop->replaceUniversalPlatzhalter(__($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_subject'), 'wpsg'), $order_id), + 'price' => number_format($arBasket['sum']['preis_gesamt_brutto'], 2), + 'currency' => $this->currency + ) + ) + ); + + } + + if (wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypalapi_paymentExperience'))) + { + + $post_data['experience_profile_id'] = $this->shop->get_option('wpsg_mod_paypalapi_paymentExperience'); + + } + + //die('
'.print_r($post_data, true).'
'); + + $json_data = $this->api_call('v1/payments/payment', $post_data, $access_token); + + if (wpsg_isSizedString($json_data['id'])) $oOrder->setMeta('wpsg_mod_paypalapi_paymentId', $json_data['id']); + + return $json_data; + + } // private function api_startPayment() + + /** * @param $arBasket * @param bool $order_id @@ -1262,4 +1566,10 @@ */ private function api_startPayment_v2($arBasket, $order_id = false, $express = true) { + + if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v1') { + + return $this->api_startPayment($arBasket, $order_id, $express); + + } if (!wpsg_isSizedInt($order_id)) $order_id = $this->shop->basket->save(false, false, true); @@ -1479,283 +1789,4 @@ /** - * Authorisiert eine Zahlung - * https://developer.paypal.com/docs/api/payments/v1/#definition-transaction - * https://developer.paypal.com/docs/api/payments/v1/#definition-payer - * - */ - private function api_startPayment($arBasket, $order_id = false, $express = true) { - - throw new \Exception("Veraltet"); - - $oOrder = wpsg_order::getInstance($order_id); - $access_token = $this->api_getAccessToken(); - - // Dadurch wird die Bestellung in der DB fixiert und Platzhalter kÀnnen generiert werden - if (!wpsg_isSizedInt($order_id)) $order_id = $this->shop->basket->save(false, false, true); - - $item_list = array( - 'items' => array() - ); - - $post_data = array(); - - $post_data['transactions'] = array( - array( - 'amount' => array( - 'total' => number_format($arBasket['sum']['preis_gesamt_brutto'], 2), - 'currency' => $this->currency - ), - 'description' => $this->shop->replaceUniversalPlatzhalter(__($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_subject'), 'wpsg'), $order_id), - ) - ); - - $subTotal = 0; - - // Produkte - foreach ($arBasket['produkte'] as $k => $p) - { - - $product_price = ((wpsg_isSizedString($arBasket['noMwSt'], '1'))?$p['preis_netto']:$p['preis_brutto']); - - $sku = $this->shop->getProductAnr($this->shop->getProduktID($p['id'])); - if (!wpsg_isSizedString($sku)) $sku = __('n.A.', 'wpsg'); - - $item_list['items'][] = array( - 'quantity' => $p['menge'], - 'name' => $this->shop->getProductName($this->shop->getProduktID($p['id']), true), - 'description' => '', - 'sku' => $sku, - 'url' => $this->shop->getProduktLink($this->shop->getProduktID($p['id'])), - 'price' => number_format($product_price, 2), - 'currency' => $this->currency - ); - - $subTotal += $product_price * $p['menge']; - - } - - // Gutschein - if (isset($arBasket['sum']['gs_brutto'])) - { - - $item_list['items'][] = array( - 'quantity' => '1', - 'name' => __('Gutschein', 'wpsg'), - 'description' => wpsg_translate(__('Eingelöster Gutschein Code:#1#', 'wpsg'), $arBasket['gs']['code']), - 'price' => number_format(-1 * $arBasket['sum']['gs_brutto'], 2), - 'currency' => $this->currency - ); - - $subTotal += -1 * $arBasket['sum']['gs_brutto']; - - } - - // Zahlungskosten/VergÌnstigungen - if (isset($arBasket['sum']['preis_payment_brutto']) && $arBasket['sum']['preis_payment_brutto'] != 0) - { - - $item_list['items'][] = array( - 'quantity' => '1', - 'name' => (($arBasket['sum']['preis_payment_brutto'] > 0)?__('GebÌhr fÌr Zahlungsart', 'wpsg'):__('Rabatt durch Zahlungsart', 'wpsg')), - 'description' => __('Rabatt, der Aufgrund der gewÀhlten Zahlungsart entstanden ist.', 'wpsg'), - 'price' => number_format($arBasket['sum']['preis_payment_brutto'], 2), - 'currency' => $this->currency - ); - - $subTotal += $arBasket['sum']['preis_payment_brutto']; - - } - - // Rabatte auf Warenkorb - if (isset($arBasket['sum']['preis_rabatt_brutto']) && $arBasket['sum']['preis_rabatt_brutto'] > 0) - { - - $item_list['items'][] = array( - 'quantity' => '1', - 'name' => __('Rabatt', 'wpsg'), - 'description' => __('Rabatt, der sich aus dem Warenkorbwert ergibt.', 'wpsg'), - 'price' => number_format(-1 * $arBasket['sum']['preis_rabatt_brutto'], 2), - 'currency' => $this->currency - ); - - $subTotal += -1 * $arBasket['sum']['preis_rabatt_brutto']; - - } - - /** @var wpsg_country $oInvoiceCountry */ - $oInvoiceCountry = null; if (wpsg_isSizedInt($arBasket['checkout']['land'])) $oInvoiceCountry = wpsg_country::getInstance($arBasket['checkout']['land']); - - /** @var wpsg_country $oShippingCountry */ - $oShippingCountry = null; - if ($oInvoiceCountry !== null) $oShippingCountry = $oInvoiceCountry; - if (wpsg_isSizedInt($arBasket['checkout']['shipping_land'])) $oShippingCountry = wpsg_country::getInstance($arBasket['checkout']['shipping_land']); - - $post_data['intent'] = 'sale'; - $post_data['payer'] = array( - 'payment_method' => 'paypal' - ); - - if ($oInvoiceCountry !== null && wpsg_isSizedString($arBasket['checkout']['plz'])) { - - $post_data['payer']['payer_info'] = [ - 'email' => $arBasket['checkout']['email'], - 'first_name' => $arBasket['checkout']['vname'], - 'last_name' => $arBasket['checkout']['name'], - 'billing_address' => [ - 'line1' => trim($arBasket['checkout']['strasse']), - 'line2' => '', - 'city' => trim($arBasket['checkout']['ort']), - 'country_code' => $oInvoiceCountry->getShorttext(), - 'postal_code' => trim($arBasket['checkout']['plz']), - ] - ]; - - if (strtotime($arBasket['checkout']['geb']) > 0) { - - $post_data['payer']['payer_info']['birth_date'] = date('Y-m-d', strtotime($arBasket['checkout']['geb'])); - - } - - if (preg_match('/^(?:\((\+?\d+)?\)|\+?\d+) ?\d*(-?\d{2,3} ?){0,4}$/', $arBasket['checkout']['tel'])) { - - $post_data['payer']['payer_info']['billing_address']['phone'] = preg_replace('/ /', '', $arBasket['checkout']['tel']); - - } - - } - - if ($oOrder->getId() > 0 && $oOrder->status == wpsg_ShopController::STATUS_UNVOLLSTAENDIG) - { - - $post_data['redirect_urls'] = array( - 'return_url' => $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'returnPayPalExpress'), - 'cancel_url' => $this->shop->getUrl(wpsg_ShopController::URL_BASKET) - ); - - } - else - { - - $post_data['redirect_urls'] = array( - 'return_url' => $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'returnPayPalExpress'), - 'cancel_url' => $this->shop->getDoneURL($oOrder->id) - ); - - } - - // Versandkosten/VergÌnstigungen - if (isset($arBasket['sum']['preis_shipping_brutto']) && $arBasket['sum']['preis_shipping_brutto'] > 0) - { - - $details['shipping'] = number_format($arBasket['sum']['preis_shipping_brutto'], 2); - - } - else if (isset($arBasket['sum']['preis_shipping_brutto']) && $arBasket['sum']['preis_shipping_brutto'] < 0) - { - - $item_list['items'][] = array( - 'quantity' => '1', - 'name' => __('Rabatt aufgrund Versandart', 'wpsg'), - 'price' => number_format($arBasket['sum']['preis_shipping_brutto'], 2), - 'currency' => $this->currency - ); - - $subTotal += $arBasket['sum']['preis_shipping_brutto']; - - } - - //wpsg_debug($item_list); - //wpsg_debug($subTotal); - - /* - * Daschmi@14.12.2016 - * Ich vergleiche hier die Summe der Positionen mit dem Ìbergebenen Brutto - * Bei Nettorechnungen kann es hier zu Problemen fÌhren Siehe Track Ticket 505 - */ - - $shipping_address = []; - - // Lieferadresse - if ($oShippingCountry !== null) { - - if (wpsg_getStr($arBasket['checkout']['diff_shippingadress']) == '1') { - - $shipping_address = [ - 'recipient_name' => trim($arBasket['checkout']['shipping_firma'].' '.$arBasket['checkout']['shipping_vname'].' '.$arBasket['checkout']['shipping_name']), - 'line1' => trim($arBasket['checkout']['shipping_strasse']), - 'line2' => '', - 'city' => trim($arBasket['checkout']['shipping_ort']), - 'country_code' => $oShippingCountry->getShorttext(), - 'postal_code' => trim($arBasket['checkout']['shipping_plz']) - ]; - - } else { - - $shipping_address = [ - 'recipient_name' => trim($arBasket['checkout']['firma'].' '.$arBasket['checkout']['vname'].' '.$arBasket['checkout']['name']), - 'line1' => trim($arBasket['checkout']['strasse']), - 'line2' => '', - 'city' => trim($arBasket['checkout']['ort']), - 'country_code' => $oShippingCountry->getShorttext(), - 'postal_code' => trim($arBasket['checkout']['plz']) - ]; - - } - - } - - if (wpsg_isSizedArray($shipping_address) && isset($post_data['transactions'][0]['item_list'])) { - - $post_data['transactions'][0]['item_list']['shipping_address'] = $shipping_address; - - } - - if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_details')) && floatval($subTotal) === floatval($arBasket['sum']['preis_gesamt_brutto'])) - { - - if (wpsg_isSizedArray($details)) - { - - $post_data['transactions'][0]['amount']['details'] = $details; - $post_data['transactions'][0]['amount']['details']['subtotal'] = number_format($subTotal, 2); - - } - - $post_data['transactions'][0]['item_list'] = $item_list; - } - else - { - - $post_data['transactions'][0]['item_list'] = array( - 'items' => array( - array( - 'quantity' => '1', - 'name' => $this->shop->replaceUniversalPlatzhalter(__($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_subject'), 'wpsg'), $order_id), - 'price' => number_format($arBasket['sum']['preis_gesamt_brutto'], 2), - 'currency' => $this->currency - ) - ) - ); - - } - - if (wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypalapi_paymentExperience'))) - { - - $post_data['experience_profile_id'] = $this->shop->get_option('wpsg_mod_paypalapi_paymentExperience'); - - } - - //die('
'.print_r($post_data, true).'
'); - - $json_data = $this->api_call('v1/payments/payment', $post_data, $access_token); - - if (wpsg_isSizedString($json_data['id'])) $oOrder->setMeta('wpsg_mod_paypalapi_paymentId', $json_data['id']); - - return $json_data; - - } // private function api_startPayment() - - /** * DEPRECATED * Informationen zu einer authorisierten Zahlung holen @@ -1763,6 +1794,4 @@ */ private function api_getPaymentInfo($payment_id, $noError = false) { - - throw new \Exception(__('Veraltet', 'wpsg')); $json_data = $this->api_call('v1/payments/payment/'.$payment_id, false, $this->api_getAccessToken(), false, $noError); @@ -1779,4 +1808,10 @@ private function api_getPaymentInfo_v2($payment_id, $noError = false) { + if ($this->shop->get_option('wpsg_mod_paypalapi_version') === 'v1') { + + return $this->api_getPaymentInfo($payment_id, $noError); + + } + $client = new \PayPalCheckoutSdk\Core\PayPalHttpClient($this->api_getEnvironment()); $json_data = $client->execute(new \PayPalCheckoutSdk\Orders\OrdersGetRequest($payment_id)); Index: /mods/wpsg_mod_printshop.class.php =================================================================== --- /mods/wpsg_mod_printshop.class.php (revision 7706) +++ /mods/wpsg_mod_printshop.class.php (revision 7706) @@ -0,0 +1,641 @@ +name = __('Druckerei', 'wpsg'); + $this->group = __('Produkte', 'wpsg'); + $this->desc = __('', 'wpsg'); + + } + + public function settings_edit() { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/settings_edit.phtml'); + + } + + public function product_addedit_content(&$product_content, &$product_data) { + + // Nur fÌr angelegte Produkte + if ($product_data['id'] <= 0) return false; + + $oProduct = wpsg_product::getInstance($product_data['id']); + + $this->shop->view['wpsg_mod_printshop'] = []; + + $this->shop->view['wpsg_mod_printshop']['set'] = intval($oProduct->getMeta('wpsg_mod_printshop_set')); + $this->shop->view['wpsg_mod_printshop']['mode'] = intval($oProduct->getMeta('wpsg_mod_printshop_mode')); + $this->shop->view['wpsg_mod_printshop']['unit_price'] = sanitize_text_field($oProduct->getMeta('wpsg_mod_printshop_unit_price')); + $this->shop->view['wpsg_mod_printshop']['width_step'] = intval($oProduct->getMeta('wpsg_mod_printshop_width_step')); + $this->shop->view['wpsg_mod_printshop']['width_min'] = intval($oProduct->getMeta('wpsg_mod_printshop_width_min')); + $this->shop->view['wpsg_mod_printshop']['width_max'] = intval($oProduct->getMeta('wpsg_mod_printshop_width_max')); + $this->shop->view['wpsg_mod_printshop']['length_step'] = intval($oProduct->getMeta('wpsg_mod_printshop_length_step')); + $this->shop->view['wpsg_mod_printshop']['length_min'] = intval($oProduct->getMeta('wpsg_mod_printshop_length_min')); + $this->shop->view['wpsg_mod_printshop']['length_max'] = intval($oProduct->getMeta('wpsg_mod_printshop_length_max')); + $this->shop->view['wpsg_mod_printshop']['width'] = wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_width')); + $this->shop->view['wpsg_mod_printshop']['width'] = wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_width')); + $this->shop->view['wpsg_mod_printshop']['productupload_set'] = intval($oProduct->getMeta('wpsg_mod_printshop_productupload_set')) > 0; + $this->shop->view['wpsg_mod_printshop']['productupload_length'] = intval($oProduct->getMeta('wpsg_mod_printshop_productupload_length')); + $this->shop->view['wpsg_mod_printshop']['productupload_mandatory'] = intval($oProduct->getMeta('wpsg_mod_printshop_productupload_mandatory')) > 0; + + $product_content['wpsg_mod_printshop'] = [ + 'title' => __('Druckereiprodukt', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/produkt_addedit_content.phtml', false) + ]; + + } + + /** + * @param $product_id + * @throws Exception + */ + public function produkt_save(&$product_id) { + + $r = [ + 'set' => intval(@$_REQUEST['wpsg_mod_printshop']['set']), + 'mode' => intval(@$_REQUEST['wpsg_mod_printshop']['mode']), + 'unit_price' => sanitize_text_field(@$_REQUEST['wpsg_mod_printshop']['unit_price']), + 'width' => wpsg_tf(@$_REQUEST['wpsg_mod_printshop']['width']), + 'width_step' => intval(@$_REQUEST['wpsg_mod_printshop']['width_step']), + 'width_min' => intval(@$_REQUEST['wpsg_mod_printshop']['width_min']), + 'width_max' => intval(@$_REQUEST['wpsg_mod_printshop']['width_max']), + 'length_step' => intval(@$_REQUEST['wpsg_mod_printshop']['length_step']), + 'length_min' => intval(@$_REQUEST['wpsg_mod_printshop']['length_min']), + 'length_max' => intval(@$_REQUEST['wpsg_mod_printshop']['length_max']), + 'productupload_set' => intval(@$_REQUEST['wpsg_mod_printshop']['productupload_set']), + 'productupload_length' => intval(@$_REQUEST['wpsg_mod_printshop']['productupload_length']), + 'productupload_mandatory' => intval(@$_REQUEST['wpsg_mod_printshop']['productupload_mandatory']), + ]; + + if ($r['mode'] > 0) { + + $oProduct = wpsg_product::getInstance($product_id); + + $oProduct->setMeta('wpsg_mod_printshop_set', $r['set']); + $oProduct->setMeta('wpsg_mod_printshop_mode', $r['mode']); + $oProduct->setMeta('wpsg_mod_printshop_unit_price', $r['unit_price']); + + if ($r['mode'] === self::MODE_AREA) { + + } else if ($r['mode'] === self::MODE_AREA_SELECT) { + + $oProduct->setMeta('wpsg_mod_printshop_width_step', $r['width_step']); + $oProduct->setMeta('wpsg_mod_printshop_width_min', $r['width_min']); + $oProduct->setMeta('wpsg_mod_printshop_width_max', $r['width_max']); + + $oProduct->setMeta('wpsg_mod_printshop_length_step', $r['length_step']); + $oProduct->setMeta('wpsg_mod_printshop_length_min', $r['length_min']); + $oProduct->setMeta('wpsg_mod_printshop_length_max', $r['length_max']); + + } else if ($r['mode'] === self::MODE_LFM) { + + $oProduct->setMeta('wpsg_mod_printshop_width', $r['width']); + + } else if ($r['mode'] === self::MODE_LFM_SELECT) { + + $oProduct->setMeta('wpsg_mod_printshop_width', $r['width']); + $oProduct->setMeta('wpsg_mod_printshop_length_step', $r['length_step']); + $oProduct->setMeta('wpsg_mod_printshop_length_min', $r['length_min']); + $oProduct->setMeta('wpsg_mod_printshop_length_max', $r['length_max']); + + } else throw \wpsg\Exception::getInvalidValueException(); + + $oProduct->setMeta('wpsg_mod_printshop_productupload_set', $r['productupload_set']); + $oProduct->setMeta('wpsg_mod_printshop_productupload_length', $r['productupload_length']); + $oProduct->setMeta('wpsg_mod_printshop_productupload_mandatory', $r['productupload_mandatory']); + + } + + } + + /** + * @throws Exception + */ + public function basket_preInsert() { + + $r = [ + 'insertAreaProduct' => intval($_REQUEST['wpsg']['insertAreaProduct']??0), + 'product_key' => sanitize_text_field($_REQUEST['wpsg']['product_key']??''), + 'menge' => intval($_REQUEST['wpsg']['menge']??0), + 'length' => wpsg_tf($_REQUEST['wpsg']['length']??0), + 'width' => wpsg_tf($_REQUEST['wpsg']['width']??0) + ]; + + if ($r['insertAreaProduct'] > 0) { + + $oProduct = wpsg_product::getInstance($r['product_key']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $price_onepice = $oProduct->getPrice($r['product_key']); + + $mode = intval($oProduct->getMeta('wpsg_mod_printshop_mode')); + + if ($mode === wpsg_mod_printshop::MODE_AREA) { + + $length = $r['length']; + $width = $r['width']; + + } else if ($mode === wpsg_mod_printshop::MODE_AREA_SELECT) { + + $arWidth = []; + $arLength = []; + + for ($i = intval($oProduct->getMeta('wpsg_mod_printshop_width_min')); $i <= intval($oProduct->getMeta('wpsg_mod_printshop_width_max')); $i += intval($oProduct->getMeta('wpsg_mod_printshop_width_step'))) { + + $arWidth[] = $i; + + } + + for ($i = intval($oProduct->getMeta('wpsg_mod_printshop_length_min')); $i <= intval($oProduct->getMeta('wpsg_mod_printshop_length_max')); $i += intval($oProduct->getMeta('wpsg_mod_printshop_length_step'))) { + + $arLength[] = $i; + + } + + if (in_array($r['width'], $arWidth)) $width = $r['width']; else throw \wpsg\Exception::getInvalidValueException(); + if (in_array($r['length'], $arLength)) $length = $r['length']; else throw \wpsg\Exception::getInvalidValueException(); + + } else if ($mode === wpsg_mod_printshop::MODE_LFM) { + + $length = $r['length']; + $width = wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_width')); + + } else if ($mode === self::MODE_LFM_SELECT) { + + $arLength = []; + + for ($i = intval($oProduct->getMeta('wpsg_mod_printshop_length_min')); $i <= intval($oProduct->getMeta('wpsg_mod_printshop_length_max')); $i += intval($oProduct->getMeta('wpsg_mod_printshop_length_step'))) { + + $arLength[] = $i; + + } + + if (in_array($r['length'], $arLength)) $length = $r['length']; else throw \wpsg\Exception::getInvalidValueException(); + + $width = wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_width')); + + } else throw wpsg\Exception::getInvalidFunctionException(); + + $price = round($width * $r['length'], 2) * $price_onepice; + + $this->set_data = [ + 'price' => $price, + 'width' => $width, + 'length' => $length + ]; + + } else throw wpsg\Exception::getInvalidFunctionException(); + + } + + } + + public function basket_produkttosession($produkt_key, &$menge, &$ses_data) { + + if ($this->set_data !== null) { + + $ses_data['wpsg_mod_printshop'] = $this->set_data; + + $this->set_data = null; + + } + + } + + public function basket_row_before(&$p, $i) { + + $oProduct = wpsg_product::getInstance($p['id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $this->shop->view['wpsg_mod_printshop'] = [ + 'width' => wpsg_tf($p['wpsg_mod_printshop']['width']), + 'length' => wpsg_tf($p['wpsg_mod_printshop']['length']), + 'price_onepice' => $oProduct->getPrice($p['product_key']), + 'unit_price' => sanitize_text_field($oProduct->getMeta('wpsg_mod_printshop_unit_price')) + ]; + + $this->shop->view['wpsg_mod_printshop']['area'] = round($this->shop->view['wpsg_mod_printshop']['width'] * $this->shop->view['wpsg_mod_printshop']['length'], 2); + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/basket_row_before.phtml'); + + } + + } + + public function basket_row(&$p, $i) { + + $oProduct = wpsg_product::getInstance($p['id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_productupload_set')) === 1) { + + $this->shop->view['wpsg_mod_printshop'] = [ + 'length' => wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_productupload_length')), + 'mandatory' => wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_productupload_mandatory')), + 'product_index' => $p['product_index'], + 'files' => wpsg_getArray($p['wpsg_mod_printshop']['files']) + ]; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/basket_row.phtml'); + + } + + } + + public function order_ajax() { + + if (wpsg_isSizedString($_REQUEST['do'], 'download')) { + + $r = [ + 'do' => 'download', + 'mod' => 'wpsg_mod_printshop', + 'noheader' => '1', + 'order_id' => intval($_REQUEST['order_id']), + 'product_index' => intval($_REQUEST['product_index']), + 'file' => sanitize_file_name(rawurldecode($_REQUEST['file'])) + ]; + + wpsg_checkNounce('Order', 'ajax', $r); + + $path = $this->getUploadPath($r['order_id'], $r['product_index'], false).basename($r['file']); + + if (file_exists($path)) { + + wpsg_header::AUTO($path, $r['file']); + exit; + + } + + } + + } + + public function template_redirect() { + + if (get_the_ID() === intval($this->shop->get_option('wpsg_page_basket')) && + (isset($_REQUEST['wpsg_basket_refresh']) || isset($_REQUEST['wpsg_basket_submit']))) { + + foreach (wpsg_getArray($_SESSION['wpsg']['basket']) as $product_index => $product_data) { + + $oProduct = wpsg_product::getInstance($product_data['id']); + + if ($oProduct->getMeta('wpsg_mod_printshop_productupload_set') === '1') { + + if (!isset($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'])) $_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'] = []; + + // Dateien löschen + foreach (wpsg_getArray($_REQUEST['wpsg_mod_printshop'][$product_index]['delete_file']) as $file_index) { + + if (isset($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'][$file_index])) { + + unlink($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'][$file_index]['tmpnam']); + unset($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'][$file_index]); + + } + + } + + // Dateien hinzufÌgen + foreach (wpsg_getArray($_FILES['wpsg_mod_printshop']['error'][$product_index]) as $file_index => $error_code) { + + if (intval($error_code) === 0) { + + $tmpnam = tempnam(sys_get_temp_dir(), 'wpsg_mod_printshop'); + + move_uploaded_file($_FILES['wpsg_mod_printshop']['tmp_name'][$product_index][$file_index], $tmpnam); + + $_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'][] = [ + 'tmpnam' => $tmpnam, + 'file_name' => $_FILES['wpsg_mod_printshop']['name'][$product_index][$file_index] + ]; + + } + + } + + } + + } + + } + + } + + public function checkBasket(&$ok) { + + foreach (wpsg_getArray($_SESSION['wpsg']['basket']) as $product_index => $product_data) { + + $oProduct = wpsg_product::getInstance($product_data['id']); + + if ($oProduct->getMeta('wpsg_mod_printshop_productupload_set') === '1') { + + if (!isset($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'])) $_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'] = []; + + // Maximalanzahl prÌfen + $max_upload = intval($oProduct->getMeta('wpsg_mod_printshop_productupload_length')); + + if ($max_upload > 0 && sizeof($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files']) > $max_upload) { + + $this->shop->addFrontendError(wpsg_translate( + __('Anzahl an Uploads (#1#) in Produkt "#2#" Ìberschreitet die maximal mögliche Menge an Uploads (#3#).', 'wpsg'), + sizeof($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files']), + $oProduct->getProductName(), + $max_upload, + )); + + $ok = false; + + } + + // Pflichtfeld ÌberprÌfen + if ($oProduct->getMeta('wpsg_mod_printshop_productupload_mandatory') === '1') { + + if (sizeof($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files']) == 0) { + + $this->shop->addFrontendError(wpsg_translate( + __('Sie mÌssen mindestens eine Datei zu Produkt "#1#" hochladen.', 'wpsg'), + $oProduct->getProductName() + )); + + $ok = false; + + } + + } + + } + + } + + } // public function checkCheckout(&$state, &$error, &$arCheckout) + + public function order_view_row_before(&$p, $i) { + + $oProduct = wpsg_product::getInstance($p['product_id']); + $oOrderProduct = wpsg_order_product::getInstance($p['order_product_id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $this->shop->view['wpsg_mod_printshop'] = [ + 'order_id' => $oOrderProduct->getOrder()->getId(), + 'product_index' => $oOrderProduct->getProductIndex(), + 'i' => intval($i), + 'width' => wpsg_tf($oOrderProduct->getMeta('wpsg_mod_printshop_width')), + 'length' => wpsg_tf($oOrderProduct->getMeta('wpsg_mod_printshop_length')), + 'price_onepice' => wpsg_tf($oOrderProduct->getMeta('wpsg_mod_printshop_price_onepice')), + 'unit_price' => sanitize_text_field($oOrderProduct->getMeta('wpsg_mod_printshop_unit_price')), + 'arFiles' => $this->getFiles($oOrderProduct->getOrder()->getId(), $oOrderProduct->getProductIndex()) + ]; + + $this->shop->view['wpsg_mod_printshop']['area'] = round($this->shop->view['wpsg_mod_printshop']['width'] * $this->shop->view['wpsg_mod_printshop']['length'], 2); + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/order_view_row.phtml'); + + } + + } + + public function mail_row($i, $p) { + + //$this->htmlMail = true; + + $oProduct = wpsg_product::getInstance($p['product_id']); + $oOrderProduct = wpsg_order_product::getInstance($p['order_product_id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $this->shop->view['wpsg_mod_printshop'] = [ + 'i' => intval($i), + 'width' => wpsg_tf($oOrderProduct->getMeta('wpsg_mod_printshop_width')), + 'length' => wpsg_tf($oOrderProduct->getMeta('wpsg_mod_printshop_length')), + 'price_onepice' => wpsg_tf($oOrderProduct->getMeta('wpsg_mod_printshop_price_onepice')), + 'unit_price' => sanitize_text_field($oOrderProduct->getMeta('wpsg_mod_printshop_unit_price')) + ]; + + $this->shop->view['wpsg_mod_printshop']['area'] = round($this->shop->view['wpsg_mod_printshop']['width'] * $this->shop->view['wpsg_mod_printshop']['length'], 2); + + if ($this->shop->htmlMail === true) + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/mail_row_html.phtml'); + else + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/mail_row.phtml'); + + } + + } + + public function overview_row_before(&$p, $i) { + + $oProduct = wpsg_product::getInstance($p['id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $this->shop->view['wpsg_mod_printshop'] = [ + 'width' => wpsg_tf($p['wpsg_mod_printshop']['width']), + 'length' => wpsg_tf($p['wpsg_mod_printshop']['length']), + 'price_onepice' => $oProduct->getPrice($p['product_key']), + 'unit_price' => sanitize_text_field($oProduct->getMeta('wpsg_mod_printshop_unit_price')) + ]; + + $this->shop->view['wpsg_mod_printshop']['area'] = round($this->shop->view['wpsg_mod_printshop']['width'] * $this->shop->view['wpsg_mod_printshop']['length'], 2); + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/overview_row_before.phtml'); + + } + + } + + public function overview_row(&$p, $i) { + + $oProduct = wpsg_product::getInstance($p['id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_productupload_set')) === 1 && wpsg_isSizedArray($p['wpsg_mod_printshop']['files'])) { + + $this->shop->view['wpsg_mod_printshop'] = [ + 'length' => wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_productupload_length')), + 'mandatory' => wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_productupload_mandatory')), + 'product_index' => $p['product_index'], + 'files' => $p['wpsg_mod_printshop']['files'] + ]; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_printshop/overview_row.phtml'); + + } + + } + + public function basket_save_done(&$order_id, &$kunde_id, &$oBasket) { + + $oOrder = wpsg_order::getInstance($order_id); + + foreach ($oOrder->getOrderProducts() as $oOrderProduct) { + + if ($oOrderProduct->getProduct()->getMeta('wpsg_mod_printshop_productupload_set') === '1') { + + $product_index = $oOrderProduct->getProductIndex(); + + if (wpsg_isSizedArray($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'])) { + + $path = $this->getUploadPath($order_id, $product_index); + + foreach ($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'] as $f) { + + copy($f['tmpnam'], $path.$f['file_name']); + + } + + } + + } + + } + + } + + public function calculation_addProduct(&$product_data, $ses_data) { + + if (isset($ses_data['wpsg_mod_printshop'])) { + + $product_data['set'] = $ses_data['wpsg_mod_printshop']['price']; + $product_data['bruttonetto'] = $this->shop->getBackendTaxview(); + + } + + } + + public function renderProdukt_templateSelect(&$produkt_data, &$template_file) { + + $oProduct = wpsg_product::getInstance($produkt_data['id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $template_file = WPSG_PATH_VIEW.'/mods/mod_printshop/producttemplate.phtml'; + + } + + } + + public function calculation_saveProduct_after(&$oCalculation, $calc_product, &$db_product_data, $finish_order) { + + $oProduct = wpsg_product::getInstance($calc_product['product_id']); + + if (intval($oProduct->getMeta('wpsg_mod_printshop_set')) === 1) { + + $ac = $_SESSION['wpsg']['basket'][$calc_product['product_index']]['wpsg_mod_printshop']??null; + + if (is_null($ac)) throw new \wpsg\Exception(__('Keine Daten zum speichern des FlÀchenproduktes')); + + if (!isset($ac['price']) || !isset($ac['width']) || !isset($ac['length'])) throw new \wpsg\Exception(__('Es fehlen Daten zum speichern des FlÀchenproduktes')); + + $oOrderProduct = wpsg_order_product::getInstance(intval($calc_product['order_product_id'])); + + $oOrderProduct->setMeta('wpsg_mod_printshop_price', wpsg_tf($ac['price'])); + $oOrderProduct->setMeta('wpsg_mod_printshop_width', wpsg_tf($ac['width'])); + $oOrderProduct->setMeta('wpsg_mod_printshop_length', wpsg_tf($ac['length'])); + $oOrderProduct->setMeta('wpsg_mod_printshop_price_onepice', wpsg_tf($oProduct->getPrice($calc_product['product_key']))); + $oOrderProduct->setMeta('wpsg_mod_printshop_unit_price', sanitize_text_field($oProduct->getMeta('wpsg_mod_printshop_unit_price'))); + + } + + } + + public function downloadFileRedirect() { + + $product_index = intval($_REQUEST['product_index']); + $file_index = intval($_REQUEST['file_index']); + + $file = wpsg_getStr($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'][$file_index]['tmpnam']); + + if (file_exists($file)) { + + wpsg_header::AUTO( + $file, + wpsg_getStr($_SESSION['wpsg']['basket'][$product_index]['wpsg_mod_printshop']['files'][$file_index]['file_name']) + ); + + } else { + + $this->shop->addFrontendError(__('Datei konnte nicht gefunden werden.', 'wpsg')); + $this->shop->redirect($this->shop->getURL(wpsg_ShopController::URL_BASKET)); + + } + + } + + /** + * @param int $order_id + * @param int $product_index + * @param bool $create + * @return string + */ + public function getUploadPath($order_id, $product_index, $create = true) { + + $path = WPSG_PATH_UPLOADS.'wpsg_mod_printshop/files/'.$order_id.'/'.$product_index.'/'; + + if ($create) $this->shop->protectDirectory($path); + + return $path; + + } + + public function getFiles($order_id, $product_index) { + + $arFiles = []; + $path = $this->getUploadPath($order_id, $product_index, false); + + if (file_exists($path)) { + + foreach (scandir($path) as $f) { + + if (!in_array($f, ['.', '..', '.htaccess'])) { + + $arFiles[] = $path.$f; + + } + + } + + } + + return $arFiles; + + } + + /* Statische Funktionen */ + + public static function getInstance() { + + if (!isset(static::$instance)) static::$instance = new static; + + return static::$instance; + + } + + } + + Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 7705) +++ /views/css/frontend.css (revision 7706) @@ -77,4 +77,7 @@ .wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; padding:0.75em 1em; } .wpsg_basket .wpsg_basket_weiter_shoppen {background:#1a1a1a none repeat scroll 0 0; border:0 none; border-radius:2px; color:#fff; font-weight:700; line-height:1; text-transform:uppercase; padding:0.85em 0.875em 0.78em;} +.wpsg_basket .product_action_printshop .label { align-self:flex-start; } +.wpsg_basket .product_action_printshop .files ul li { list-style:none; display:flex; align-items:center; justify-content:flex-end; } +.wpsg_basket .product_action_printshop .files ul li img { margin-left:5px; cursor:pointer; } /* Checkout + Request*/ @@ -544,3 +547,3 @@ .wpsg_produkt_wrapper2 .wpsg_productimages { margin-right:0px !important; } .wpsg_produkt_wrapper2 .bigimg img { margin:0 15px 15px 15px; width:100px; height:auto; float:left; } - + Index: /views/mods/mod_paypalapi/settings_edit.phtml =================================================================== --- /views/mods/mod_paypalapi/settings_edit.phtml (revision 7705) +++ /views/mods/mod_paypalapi/settings_edit.phtml (revision 7706) @@ -7,4 +7,5 @@ ?> + 'V1', 'v2' => 'V2'], $this->get_option('wpsg_mod_paypalapi_version'), []); ?> get_option('wpsg_mod_paypalapi_clientid'), array('hint' => __('Erhalten Sie im PayPal Account.', 'wpsg'), 'help' => 'wpsg_mod_paypal_clientid', 'hint' => wpsg_translate('nohspc_'.__('Erhalten Sie im PayPal Developer Interface.', 'wpsg'), 'https://developer.paypal.com/'))); ?> get_option('wpsg_mod_paypalapi_secret'), array('hint' => __('Erhalten Sie im PayPal Account.', 'wpsg'), 'help' => 'wpsg_mod_paypal_secret', 'hint' => wpsg_translate('nohspc_'.__('Erhalten Sie im PayPal Developer Interface.', 'wpsg'), 'https://developer.paypal.com/'))); ?> @@ -99,7 +100,19 @@ get_option('wpsg_mod_paypalapi_plus_hint'), array('help' => 'wpsg_shippay_hint')); ?> - + Index: /views/mods/mod_printshop/basket_row.phtml =================================================================== --- /views/mods/mod_printshop/basket_row.phtml (revision 7706) +++ /views/mods/mod_printshop/basket_row.phtml (revision 7706) @@ -0,0 +1,48 @@ +view['wpsg_mod_printshop']; + +?> + +
+
+ +
+ + 1)?'multiple':''); ?> /> + +
+
+ + + +
    + $f) { ?> +
  • + + + + + <?php echo __('Löschen', 'wpsg'); ?> +
    • + +
+ + + +

+ + + +
+
Index: /views/mods/mod_printshop/basket_row_before.phtml =================================================================== --- /views/mods/mod_printshop/basket_row_before.phtml (revision 7706) +++ /views/mods/mod_printshop/basket_row_before.phtml (revision 7706) @@ -0,0 +1,34 @@ +view['wpsg_mod_printshop']; + +?> + +
+
+ +
+
+ get_option('wpsg_currency').'/'.$view['unit_price'].'²'); ?> +
+
+ +
+
+ + + ( x ) + +
+
+ +
+
Index: /views/mods/mod_printshop/mail_row.phtml =================================================================== --- /views/mods/mod_printshop/mail_row.phtml (revision 7706) +++ /views/mods/mod_printshop/mail_row.phtml (revision 7706) @@ -0,0 +1,18 @@ +view['wpsg_mod_printshop']; + + // 150,55 m x 1,5 m = 225,83 m² + $strOut = wpsg_ff($view['width'], $view['unit_price'], true, 0).' x '.wpsg_ff($view['length'], $view['unit_price'], true, 0).' = '.wpsg_ff($view['area'], $view['unit_price'].'²'); + + // (1 m² ≠+ 1,00 EUR) + $strOut .= '('.wpsg_ff($view['price_onepice'], $this->get_option('wpsg_currency').' / '.$view['unit_price'].'²').')'; + + echo wpsg_pad_left(__('Größe:', 'wpsg').' ', 12); ?> Index: /views/mods/mod_printshop/mail_row_html.phtml =================================================================== --- /views/mods/mod_printshop/mail_row_html.phtml (revision 7706) +++ /views/mods/mod_printshop/mail_row_html.phtml (revision 7706) @@ -0,0 +1,19 @@ +view['wpsg_mod_printshop']; + +?> + + +   + + :  x = + (1 ² ≅ get_option('wpsg_currency')); ?>) + + Index: /views/mods/mod_printshop/order_view_row.phtml =================================================================== --- /views/mods/mod_printshop/order_view_row.phtml (revision 7706) +++ /views/mods/mod_printshop/order_view_row.phtml (revision 7706) @@ -0,0 +1,46 @@ +view['wpsg_mod_printshop']; + $arCalculation = $this->view['arCalculation']; + +?> + + + + + + + x = + (1 ² ≅ get_option('wpsg_currency')); ?>) + + + + + + + + + + + 'download', 'mod' => 'wpsg_mod_printshop', 'noheader' => '1', 'order_id' => $view['order_id'], 'product_index' => $view['product_index'], 'file' => rawurlencode(basename($f))]); + + $arFileLinks[] = ''.basename($f).''; + + } echo implode(', ', $arFileLinks); ?> + + + + + +view['wpsg_mod_printshop']; + +?> + +
+
+ +
+ +
+
+ + $f) { + + $arFiles[] = ''.$f['file_name'].''; + + } + + echo implode(', ', $arFiles); + + } ?> + +
+
Index: /views/mods/mod_printshop/overview_row_before.phtml =================================================================== --- /views/mods/mod_printshop/overview_row_before.phtml (revision 7706) +++ /views/mods/mod_printshop/overview_row_before.phtml (revision 7706) @@ -0,0 +1,34 @@ +view['wpsg_mod_printshop']; + +?> + +
+
+ +
+
+ get_option('wpsg_currency').'/'.$view['unit_price'].'²'); ?> +
+
+ +
+
+ + + ( x ) + +
+
+ +
+
Index: /views/mods/mod_printshop/product.phtml =================================================================== --- /views/mods/mod_printshop/product.phtml (revision 7706) +++ /views/mods/mod_printshop/product.phtml (revision 7706) @@ -0,0 +1,227 @@ +view['ap']; + + $pi = $this->view['product_index']; + + /** @var wpsg_product $oProduct */ + $oProduct = $this->view['oProduct']; + + if ($ap['mode'] === wpsg_mod_printshop::MODE_AREA) { + + $width = ''; + $length = ''; + + } else if ($ap['mode'] === wpsg_mod_printshop::MODE_AREA_SELECT) { + + $arWidth = []; + $arLength = []; + + for ($i = intval($ap['width_min']); $i <= intval($ap['width_max']); $i += intval($ap['width_step'])) { + + $arWidth[] = $i; + + } + + for ($i = intval($ap['length_min']); $i <= intval($ap['length_max']); $i += intval($ap['length_step'])) { + + $arLength[] = $i; + + } + + $width = $arWidth[0]; + $length = $arLength[0]; + + } else if ($ap['mode'] === wpsg_mod_printshop::MODE_LFM) { + + $width = $ap['width']; + $length = ''; + + } else if ($ap['mode'] === wpsg_mod_printshop::MODE_LFM_SELECT) { + + for ($i = intval($ap['length_min']); $i <= intval($ap['length_max']); $i += intval($ap['length_step'])) { + + $arLength[] = $i; + + } + + $width = $ap['width']; + $length = $arLength[0]; + + } + +?> + +
+ + + + + +
+ + +
+ +
+ +
+ + +
+ + + +
+ +
+ + + + x + + + +
+
+ + + +
+ + +
+ +
+ +
+ + +
+ + + +
+ + +
+ +
+ +
+ + +
+ + + +
+ +
+ + +
+ +
+ +
+ + + + Index: /views/mods/mod_printshop/producttemplate.phtml =================================================================== --- /views/mods/mod_printshop/producttemplate.phtml (revision 7706) +++ /views/mods/mod_printshop/producttemplate.phtml (revision 7706) @@ -0,0 +1,449 @@ +view['oProduct']; + + $ap = [ + 'set' => intval($oProduct->getMeta('wpsg_mod_printshop_set')), + 'mode' => intval($oProduct->getMeta('wpsg_mod_printshop_mode')), + 'price_unit' => sanitize_text_field($oProduct->getMeta('wpsg_mod_printshop_unit_price')), + 'width' => wpsg_tf($oProduct->getMeta('wpsg_mod_printshop_width')), + 'width_step' => intval($oProduct->getMeta('wpsg_mod_printshop_width_step')), + 'width_min' => intval($oProduct->getMeta('wpsg_mod_printshop_width_min')), + 'width_max' => intval($oProduct->getMeta('wpsg_mod_printshop_width_max')), + 'length_step' => intval($oProduct->getMeta('wpsg_mod_printshop_length_step')), + 'length_min' => intval($oProduct->getMeta('wpsg_mod_printshop_length_min')), + 'length_max' => intval($oProduct->getMeta('wpsg_mod_printshop_length_max')) + ]; + + $this->view['ap'] = $ap; + +?> + +
+ + + + +
+ + titleDisplayed) { ?> +

getProductName($this->view['data']['id']); ?>

+

view['data']['detailname']; ?>

+ + + callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ + callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ + + imagehandler->getAttachmentID($this->view['data']['product_key']); + + /* Array mit allen AttachmentIDs der Produktbilder */ + $arAttachmentIDsAll = $this->imagehandler->getAttachmentIDs($this->view['data']['product_id']); + + ?> + + +
+ +
+ + 0) { for ($i = 0; $i < sizeof($arAttachmentIDsAll); $i ++) { ?> + + + + + rel="gallery-wpsg-getTemplateIndex(); ?>" title="getProductName($this->view['data']['id']); ?>" href="" class="thickbox"> + + + + + + + +
+ +
+ + + + get_option('wpsg_showArticelnumber') == '1') { ?> +
+ : view['data']['anr']); ?>
+ get_option('wpsg_mod_produktartikel_ean'))) {?> + :view['data']['ean']); ?>
+ + get_option('wpsg_mod_produktartikel_gtin'))) {?> + :view['data']['gtin']); ?>
+
+ + + + view['oProduct']->canDisplayPrice()) { ?> + +
+ + + + + + view['oProduct']->getOldPrice(); ?> + + view['oProduct']->getPrice($this->view['data']['product_key'])) { ?> + view['oProduct']->getPrice($this->view['data']['product_key']), $this->get_option('wpsg_currency')); ?> + get_option('wpsg_currency')); ?> + + view['oProduct']->getPrice($this->view['data']['product_key']), $this->get_option('wpsg_currency')); ?> + + +
+ + get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> + +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ + + +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */?> + + get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?> + ab #2# € versandkostenfrei)', 'wpsg'), + wpsg_ff($this->view['data']['mwst_value']), + wpsg_ff($this->get_option('wpsg_mod_freeshipping_minvalue')), + $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN) + ); ?> + + view['data']['mwst_value'])); ?> + + + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + + hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */ ?> + + get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?> + ab #2# € versandkostenfrei)', 'wpsg'), + wpsg_ff($this->view['data']['mwst_value']), + wpsg_ff($this->get_option('wpsg_mod_freeshipping_minvalue')), + $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN) + ); ?> + + view['data']['mwst_value'])); ?> + + + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + +
+ + + + + + getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + +
+ + view['data']['shortdesc']; ?> + +
+ +
+ + + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> + +
+ + view['data']['stock']) > '0') {?> + + + view['data']['stock']); ?> + + + + + + + +
+ + + + + hasMod('wpsg_mod_fuellmenge')) { ?> + +
+ + view['data']['fmenge']) > '0') { ?> + + + + '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], + ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', + wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) + ); ?> + + + + + + + +
+ + + + + + hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> +
+ + view['data']['weight']) > '0') { ?> + + view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> + + + +
+ + + + + hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> + + + callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?> + +
callMod('wpsg_mod_deliverytime', 'displayStoreText', array($this->view['data']['product_key']))); ?>
+ + callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?> + + +   + + + + + + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + + +
+ +
+ +
+ + + +
+ + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> +
+ + + + + + + + + +
+ + view['data']['beschreibung'])) > 0) { ?> +
+
+
+ view['data']['beschreibung']; ?> +
+
+
+ + +
+ + + +
+ callMod('wpsg_mod_productvariants', 'renderTemplate', array($this->view['data']['product_key'])); ?> +
+ + + callMods('product_bottom', array(&$this->view['data']['product_key'], $this->getTemplateIndex())); ?> + + + + render(WPSG_PATH_VIEW.'mods/mod_printshop/product.phtml'); ?> + + +
+
+ view['oProduct']->canOrder()) { ?> +
+ + + + view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> /> + + + hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?> + + callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?> + +
+ + callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?> + +
+ + + + + + + + + + get_option('wpsg_afterinsert'), array('2', '3'))) { ?> + + + +
+ +
+
+ +
+ + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> + + view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> /> + + + + + +
+ + view['data']['longdescription'])) > 0) { ?> +
+
+
+ view['data']['longdescription']; ?> +
+
+
+ + +
+ + + +
+ + view['data']['moreinfos'])) > 0) { ?> +
+
+
+ view['data']['moreinfos']; ?> +
+
+
+ + +
+ + + +
+ + view['data']['moreinfos2'])) > 0) { ?> +
+
+
+ view['data']['moreinfos2']; ?> +
+
+
+ + +
+ + +
+ + +
+ + + +
+ +
+ +
Index: /views/mods/mod_printshop/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_printshop/produkt_addedit_content.phtml (revision 7706) +++ /views/mods/mod_printshop/produkt_addedit_content.phtml (revision 7706) @@ -0,0 +1,236 @@ +view['wpsg_mod_printshop']; + + $arMode = [ + wpsg_mod_printshop::MODE_AREA => __('FlÀchenprodukt, freie Eingabe von Breite/LÀnge im Frontend', 'wpsg'), + wpsg_mod_printshop::MODE_AREA_SELECT => __('FlÀchenprodukt, definierte Auswahl von Breite/LÀnge im Frontend', 'wpsg'), + wpsg_mod_printshop::MODE_LFM => __('FlÀchenprodukt, freie Eingabe der Laufmeter im Frontend', 'wpsg'), + wpsg_mod_printshop::MODE_LFM_SELECT => __('FlÀchenprodukt, definierte Auswahl der Laufmeter im Frontend', 'wpsg') + ]; + + if (!isset($view['mode'])) $view['mode'] = wpsg_mod_printshop::MODE_AREA; + if (!isset($view['unit_price'])) $view['unit_price'] = 'm'; + + if (!isset($view['width_step'])) $view['width_step'] = 10; else $view['width_step'] = $view['width_step']; + if (!isset($view['width_min'])) $view['width_min'] = 10; else $view['width_min'] = $view['width_min']; + if (!isset($view['width_max'])) $view['width_max'] = 100; else $view['width_max'] = $view['width_max']; + + if (!isset($view['length_step'])) $view['length_step'] = 10; else $view['length_step'] = $view['length_step']; + if (!isset($view['length_min'])) $view['length_min'] = 10; else $view['length_min'] = $view['length_min']; + if (!isset($view['length_max'])) $view['length_max'] = 100; else $view['length_max'] = $view['length_max']; + + if (!isset($view['width'])) $view['width'] = 1000; else $view['width'] = wpsg_tf($view['width']); + +?> + + + + + + + + + + + + Index: /views/mods/mod_printshop/settings_edit.phtml =================================================================== --- /views/mods/mod_printshop/settings_edit.phtml (revision 7706) +++ /views/mods/mod_printshop/settings_edit.phtml (revision 7706) @@ -0,0 +1,11 @@ +view); + ?>