Index: /lib/wpsg_calculation.class.php =================================================================== --- /lib/wpsg_calculation.class.php (revision 8419) +++ /lib/wpsg_calculation.class.php (revision 8420) @@ -426,5 +426,5 @@ } - + /** * Setzt die Zahlungskosten @@ -1510,4 +1510,6 @@ } + $kosten = 0; + foreach ($arKosten as $k) { Index: /lib/wpsg_header.class.php =================================================================== --- /lib/wpsg_header.class.php (revision 8419) +++ /lib/wpsg_header.class.php (revision 8420) @@ -58,9 +58,10 @@ } // public static function PDFPlugin($filename) - public static function JSONData($arData) - { + public static function JSONData($arData) { header('Content-Type: application/json'); - die(json_encode($arData)); + + echo json_encode($arData); + exit; } // public static function JSONData() Index: /mods/mod_paypalapi/GiroPayPalAPI.php =================================================================== --- /mods/mod_paypalapi/GiroPayPalAPI.php (revision 8420) +++ /mods/mod_paypalapi/GiroPayPalAPI.php (revision 8420) @@ -0,0 +1,156 @@ +client_id = $client_id; + $this->client_secret = $client_secret; + $this->bSandbox = $bSandbox; + + } + + public function captureOrder(string $paypal_order_id): array { + + $r = $this->call( + '/v2/checkout/orders/'.$paypal_order_id.'/capture', + null + ); + + return $r; + + } + + public function creeateOrder(\wpsg_order $oOrder): string { + + $r = $this->call( + '/v2/checkout/orders', + [ + 'intent' => 'CAPTURE', + 'purchase_units' => [ + [ + 'reference_id' => $oOrder->getId(), + 'amount' => [ + 'currency_code' => 'EUR', + 'value' => $oOrder->getToPay() + ] + ] + ] + ] + ); + + if (!isset($r['id'])) die(wpsg_debug($r)); + + return $r['id']; + + } + + private function call(string $path, ?array $arBodyData = null): ?array { + + if ($this->bSandbox) $url = 'https://api-m.sandbox.paypal.com'.$path; + else $url = 'https://api-m.paypal.com'.$path; + + $ch = curl_init(); + + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_USERPWD, $this->client_id.":".$this->client_secret); + curl_setopt($ch, CURLOPT_HTTPHEADER, [ + "Content-Type: application/json" + ]); + + curl_setopt($ch, CURLOPT_POST, true); + + if ($arBodyData !== null) { + + curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($arBodyData)); + + } + + $response = curl_exec($ch); + + if (curl_errno($ch)) throw new \Exception('cURL Error: '.curl_error($ch)); + + $response_data = json_decode($response, true); + + return $response_data; + + } + + public function integrateSDK() { + + if ($this->bSandbox) echo ''; + else echo ''; + + } + + private function getToken(): string { + + $ch = curl_init(); + + curl_setopt($ch, CURLOPT_URL, "https://api-m.sandbox.paypal.com/v1/oauth2/token"); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_USERPWD, "$this->client_id:$this->client_secret"); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, [ + "Content-Type: application/x-www-form-urlencoded" + ]); + curl_setopt($ch, CURLOPT_POSTFIELDS, "grant_type=client_credentials"); + + $response = curl_exec($ch); + + if (curl_errno($ch)) throw new \Exception('cURL Error: '.curl_error($ch)); + + $response_data = json_decode($response, true); + + if (!isset($response_data['access_token'])) throw new \Exception('PayPalAPI Error'); + + return $response_data['access_token']; + + } + + public static function getInstance(): GiroPayPalAPI { + + if (self::$instance === null) { + + if (intval(\wpsg_ShopController::getShop()->get_option('wpsg_mod_paypalapi_sandbox')) > 0) { + + self::$instance = new GiroPayPalAPI( + \wpsg_ShopController::getShop()->get_option('wpsg_mod_paypalapi_sandbox_clientid'), + \wpsg_ShopController::getShop()->get_option('wpsg_mod_paypalapi_sandbox_secret'), + true, + ); + + } else { + + self::$instance = new GiroPayPalAPI( + \wpsg_ShopController::getShop()->get_option('wpsg_mod_paypalapi_clientid'), + \wpsg_ShopController::getShop()->get_option('wpsg_mod_paypalapi_secret'), + false, + ); + + } + + } + + return self::$instance; + + } + + } Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 8419) +++ /mods/wpsg_mod_basic.class.php (revision 8420) @@ -114,5 +114,6 @@ 5503 => 'wpsg_mod_paymentqr', 5600 => 'wpsg_mod_orderstates', - 5700 => 'wpsg_mod_payone' + 5700 => 'wpsg_mod_payone', + 5800 => 'wpsg_mod_quickcheckout' ); Index: /mods/wpsg_mod_paypalapi.class.php =================================================================== --- /mods/wpsg_mod_paypalapi.class.php (revision 8419) +++ /mods/wpsg_mod_paypalapi.class.php (revision 8420) @@ -24,6 +24,5 @@ * Costructor */ - public function __construct() - { + public function __construct() { parent::__construct(); @@ -32,4 +31,6 @@ $this->group = __('Zahlungsarten', 'wpsg'); $this->desc = __('Ermöglicht die Zahlungsart PayPal und PayPal PLUS, Ìber die REST API Schnittstelle und Login mit PayPal Express.', 'wpsg'); + + require_once dirname(__FILE__).DIRECTORY_SEPARATOR.'mod_paypalapi'.DIRECTORY_SEPARATOR.'GiroPayPalAPI.php'; } // public function __construct() @@ -58,6 +59,9 @@ $this->shop->checkDefault('wpsg_mod_paypalapi_experience_locale_code', 'DE'); - $this->shop->checkDefault('wpsg_mod_paypalapi_plus_aktiv', '1'); - + $this->shop->checkDefault('wpsg_mod_paypalapi_plus_aktiv', '1'); + + $this->shop->checkDefault('wpsg_mod_paypalapi_giropay_name', 'GiroPay'); + $this->shop->checkDefault('wpsg_mod_paypalapi_giropay_hint', 'Kommen Sie auf die sichere Seite und zahlen Sie mit GiroPay, was von vielen deutschen Banken unterstÌtz wird.'); + $this->shop->checkDefault('wpsg_mod_paypalapi_stornostate', array('400' => '1', '500' => '1')); @@ -133,4 +137,8 @@ $this->shop->update_option('wpsg_mod_paypalapi_experience_locale_code', $_REQUEST['wpsg_mod_paypalapi_experience_locale_code'], false, false, WPSG_SANITIZE_VALUES, ['DE', 'GB', 'FR']); + $this->shop->update_option('wpsg_mod_paypalapi_giropay_aktiv', $_REQUEST['wpsg_mod_paypalapi_giropay_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_paypalapi_giropay_name', $_REQUEST['wpsg_mod_paypalapi_giropay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_paypalapi_giropay_hint', $_REQUEST['wpsg_mod_paypalapi_giropay_hint'], false, false, WPSG_SANITIZE_TEXTAREA); + $this->shop->update_option('wpsg_mod_paypalapi_plus_aktiv', $_REQUEST['wpsg_mod_paypalapi_plus_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_paypalapi_plus_basket', $_REQUEST['wpsg_mod_paypalapi_plus_basket'], false, false, WPSG_SANITIZE_CHECKBOX); @@ -313,9 +321,29 @@ 'logo' => $this->shop->getRessourceURL('mods/mod_paypalapi/gfx/logo_100x25.png') ); - + + } + + if (is_admin() || $this->shop->get_option('wpsg_mod_paypalapi_giropay_aktiv') === '1') { + + $arPayment[$this->id.'_1'] = array( + 'id' => $this->id.'_1', + 'name' => __($this->shop->get_option('wpsg_mod_paypalapi_giropay_name'), 'wpsg'), + 'price' => $this->shop->get_option('wpsg_mod_paypalapi_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_paypalapi_mwst'), + 'mwst_null' => $this->shop->get_option('wpsg_mod_paypalapi_mwstland'), + 'hint' => __($this->shop->get_option('wpsg_mod_paypalapi_giropay_hint'), 'wpsg').'

', + 'logo' => $this->shop->getRessourceURL('mods/mod_paypalapi/gfx/giropay.svg') + ); + } } // public function addPayment(&$arPayment) - + + public function checkout2_inner_prebutton(&$checkout_view): void { + + $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/checkout2_inner_prebutton.phtml'); + + } + public function checkout_handlePayment() { @@ -495,4 +523,23 @@ if ($oOrder->getToPay(WPSG_BRUTTO) <= 0) return; + if ($oOrder->getPaymentID() === '10_1') { + + return; + + /* + $captured = $oOrder->getMeta('wpsg_mod_giropay_captured', false, 0); + + if ($captured === 0) { + + if ($this->isSandbox()) $this->shop->view['clientId'] = $this->shop->get_option('wpsg_mod_paypalapi_sandbox_clientid'); + else $this->shop->view['clientId'] = $this->shop->get_option('wpsg_mod_paypalapi_clientid'); + + } + + $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/order_done_giropay.phtml'); + */ + + } + // Bestellungen die nicht mit PayPal API beglichen werden sollen ignorieren if ($oOrder->getPaymentID() != $this->id) return; @@ -634,11 +681,9 @@ } // public function order_done(&$order_id) - public function order_view_afterpayment(&$order_id) - { + public function order_view_afterpayment(&$order_id) { $oOrder = wpsg_order::getInstance($order_id); - if ($oOrder->getPaymentID() == $this->id) - { + if ($oOrder->getPaymentID() == $this->id || $oOrder->getPaymentID() === '10_1') { $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/order_view_afterpayment.phtml'); @@ -749,4 +794,19 @@ } // public function basket_submitSuccess() + public function handle_order() { + + if (($_SESSION['wpsg']['checkout']['payment']??'') === '10_1') { + + if ($this->isSandbox()) $this->shop->view['clientId'] = $this->shop->get_option('wpsg_mod_paypalapi_sandbox_clientid'); + else $this->shop->view['clientId'] = $this->shop->get_option('wpsg_mod_paypalapi_clientid'); + + $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/overview_button.phtml'); + + return -2; + + } + + } + /* Redirects */ @@ -1047,4 +1107,107 @@ } // public function PaymentSelectRedirect() + + /** + * Wird vor Bestellabschluss stat dem Button "zahlungspflichtig bestellen" aufgerufen + * @return void + */ + public function giroPayCreateOrderFromSessionRedirect(): void { + + try { + + $this->shop->basket->initFromSession(); + + $order_id = $this->shop->basket->save(false, false, true); + $paypal_order_id = \wpsg\GiroPayPalAPI::getInstance()->creeateOrder(wpsg_order::getInstance($order_id)); + + $oOrder = wpsg_order::getInstance($order_id); + $oOrder->setMeta('wpsg_mod_paypalapi_paymentid', $paypal_order_id); + + wpsg_header::JSONData([ + 'id' => $paypal_order_id + ]); + + } catch (\Throwable $e) { + + wpsg_header::JSONData([ + 'error' => $e->getMessage() + ]); + + } + + } + + /** + * Wird beim platzieren der Bestellung aufgerufen + * @return void + */ + public function giroPayCreateOrderRedirect(): void { + + // wpsg_debug($_REQUEST); + // wpsg_debug(file_get_contents('php://input')); + + $order_id = intval($_REQUEST['order_id']); + $paypal_order_id = \wpsg\GiroPayPalAPI::getInstance()->creeateOrder(wpsg_order::getInstance($order_id)); + + $oOrder = wpsg_order::getInstance($order_id); + $oOrder->setMeta('wpsg_mod_paypalapi_paymentid', $paypal_order_id); + + wpsg_header::JSONData([ + 'id' => $paypal_order_id + ]); + + exit; + + } + + public function giroPayCancelOrderRedirect(): void { + + $this->shop->addFrontendError(__('Zahlung wurde bei/von GiroPay abgebrochen. Bitte eine andere Zahlungsart wÀhlen oder erneut versuchen.', 'wpsg')); + + $this->shop->redirect( + \wpsg_ShopController::getShop()->getURL(\wpsg_ShopController::URL_CHECKOUT2) + ); + + } + + public function giroPayApproveOrderRedirect(): void { + + $request = json_decode(file_get_contents('php://input'), true); + + $paypal_order_id = $request['orderID']; + $paypal_order_json = \wpsg\GiroPayPalAPI::getInstance()->captureOrder($paypal_order_id); + + $order_id = intval($paypal_order_json['purchase_units'][0]['reference_id']); + + $oOrder = wpsg_order::getInstance($order_id); + $oOrder->setMeta('wpsg_mod_paypalapi_saleid', $paypal_order_json['purchase_units'][0]['payments']['captures'][0]['id']); + + $this->shop->basket->initFromDB($order_id); + $this->shop->basket->save(true, true, true); + + wpsg_header::JSONData([ + 'order_paypal' => $paypal_order_json, + 'order_done_url' => $this->shop->getDoneURL($order_id) + ]); + + exit; + + } + + /** + * Gehört zur Giropay Option vom Checkot2 + * @return void + */ + public function giroPaySetRedirect(): void { + + //wpsg_debug($_REQUEST); + //wpsg_debug(file_get_contents('php://input')); + //die(); + + $_SESSION['wpsg']['checkout']['payment'] = '10_1'; + + $this->shop->redirect($this->shop->getURL(wpsg_ShopController::URL_OVERVIEW)); + + } /* Aktionen */ Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 8419) +++ /mods/wpsg_mod_productvariants.class.php (revision 8420) @@ -141,5 +141,6 @@ $this->shop->update_option('wpsg_vp_detailview', $_REQUEST['wpsg_vp_detailview'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_vp_replaceanr', wpsg_xss($_REQUEST['wpsg_vp_replaceanr'])); - + $this->shop->update_option('wpsg_vp_product_stock_nocalc', intval($_REQUEST['wpsg_vp_product_stock_nocalc'])); + } // public function settings_save() @@ -1639,6 +1640,8 @@ } // private function setProductVariation($product_id, $field, $value) - private function setStockFromVariation($product_id) - { + private function setStockFromVariation($product_id) { + + // Die Funktion berechnet den Bestand auch im Backend + if ($this->shop->get_option('wpsg_vp_product_stock_nocalc') === '1') return; if ($this->isVariantsProductKey($product_id)) { @@ -2065,8 +2068,18 @@ } - + $this->db->unlockTables(); - $this->setStockFromVariation($produkt_key); + if ($this->shop->get_option('wpsg_vp_product_stock_nocalc') === '1') { + + // Produktbestand reduzieren + $this->db->Query("UPDATE ".WPSG_TBL_PRODUCTS." SET `stock` = `stock` - '".intval($menge)."' WHERE `id` = '".wpsg_q($this->shop->getProduktID($produkt_key))."' "); + + } else { + + // Produktbestand aus Variantenbestand ermitteln + $this->setStockFromVariation($produkt_key); + + } $this->checkMinStock($arVar, $produkt_key); Index: /views/mods/mod_ordercondition/overview_top.phtml =================================================================== --- /views/mods/mod_ordercondition/overview_top.phtml (revision 8419) +++ /views/mods/mod_ordercondition/overview_top.phtml (revision 8420) @@ -12,5 +12,5 @@