Initial import: Carteasy Shop (Dev-Stand)

2026-04-20 01:03:43 +02:00
commit d504f8a05d
3845 changed files with 761050 additions and 0 deletions
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package		Easyway Shop
+ * @copyright	Copyright (C) 2005 - 2012 TA-EDV
+ * @license		proprietary
+ * @author		Richard Kammermayer <rk@ta-edv.de>
+ * 
+ * Easyway Shop is a web e-commerce system
+ */
+
+
+class Computop_billpayPaymentMethod {
+
+
+	private $base_object;
+	private $layout_object;
+
+
+	private $customer_data;
+	private $shipping_address;
+	private $billing_address;
+	private $shoppingcart;
+	private $payment_method;
+	private $shipping_method;
+	private $gift_certificate;
+	private $order_id;
+
+
+	private $return_url;
+	private	$cancel_url;
+
+
+	function __construct($base_object, $layout_object) {
+		$this->base_object = $base_object;
+		$this->layout_object = $layout_object;
+
+		$this->customer_data = false;
+		$this->shipping_address = false;
+		$this->billing_address = false;
+		$this->shoppingcart = false;
+		$this->payment_method = false;
+		$this->shipping_method = false;
+		$this->gift_certificate = false;
+		$this->order_id = false;
+
+		$this->return_url = 'http://'.$_SERVER['SERVER_NAME'].'/Kasse/';
+		$this->cancel_url = $this->return_url.'&cancel=true';
+	} // end __construct
+
+
+	public function set_data($customer, $shipping, $billing, $shoppingcart, $delivery, $payment, $order_id = false) {
+		$this->customer_data = $customer;
+		$this->shipping_address = $shipping;
+		$this->billing_address = $billing;
+		$this->shoppingcart = $shoppingcart;
+		$this->payment_method = $delivery;
+		$this->shipping_method = $payment;
+		$this->order_id = $order_id;
+	} // end set_data
+
+
+	public function set_gift_certificate($gift_certificate) {
+		$this->gift_certificate = $gift_certificate;
+	} // end set_gift_certificate
+
+
+	public function set_order_id($order_id) {
+		$this->order_id = $order_id;
+	} // end set_order_id
+
+
+	public function before_order() {
+
+	} // end before_order
+
+
+	public function after_order($order_total = false) {
+		global $DEVMODE;
+
+		if ($this->gift_certificate) {
+			$order_total = $order_total - $this->gift_certificate->with_vat;
+		}
+
+		$order = new Order($this->base_object);
+
+		$call = 'payment_open';
+		$this->layout_object->assign('call', $call);
+
+		$merchantID = $this->base_object->config->shopConfiguration['computop_creditcard_merchant_id'];
+		$this->layout_object->assign('merchantID', $merchantID);
+		$trans_id = '10001';
+		$amount = intval($this->shoppingcart['order_total'] * 100);
+		$currency = 'EUR';
+		$url_success = 'https://'.$_SERVER['SERVER_NAME'].'/billpay_success/';
+		$url_failure = 'https://'.$_SERVER['SERVER_NAME'].'/billpay_failed/';
+		$url_notify = 'https://'.$_SERVER['SERVER_NAME'].'/billpay_failed/';
+		$order_desc = 'meine Bestellung';
+		$user_data = 'user';
+
+		$uri_string = "TransID=".$trans_id.
+			"&Amount=".$amount.
+			"&Currency=".$currency.
+			"&RefNr=12345".
+			"&Language=de".
+			"&NewCustomer=YES".
+			"&BillPayAction=1".
+			"&GtcValue=YES".
+
+			"&bdSalutation=Herr".
+			"&bdTitle=Dr".
+			"&bdFirstName=Richard".
+			"&bdLastName=Kammermayer".
+			"&bdStreet=Osterham".
+			"&bdStreetNr=54".
+			"&bdZip=84082".
+			"&bdCity=Laberweinting".
+			"&bdCountryCode=DEU".
+			"&EMail=richard_kammermayer@web.de".
+			"&Phone=234567".
+			"&MobileNr=4567890".
+
+			"&UseBillingData=Yes"./*
+			"&sdSalutation=".
+			"&sdTitle=".
+			"&sdFirstName=".
+			"&sdLastName=".
+			"&sdStreet=".
+			"&sdStreet2=".
+			"&sdStreetNr=".
+			"&sdZip=".
+			"&sdCity=".
+			"&sdCountryCode=".
+			"&sdPhone=".
+			"&sdMobileNr=".*/
+			"&DateOfBirth=1977-03-16".
+			"&IPAddr=192.168.11.10".
+			"&CompanyOrPerson=P".
+			/*
+			"&CompanyName=".
+			"&LegalForm=".
+			*/
+			"&ArticleList=765443;1;ArtikelName;ArtikelBeschreibung;1000;1019".
+			"&OrderDesc=DHL;0;0;0;0;1000;1019".
+			"&OrderHistory=";
+//		echo $uri_string;
+
+		include_once './libs/ctPayGatePHP/includes/function.inc.php';
+		$BlowFish = new ctBlowfish;
+		//$crypt_string = $BlowFish->ctEncrypt($uri_string, strlen($uri_string), $this->base_object->config->shopConfiguration['computop_creditcard_crypt_password']);
+		$crypt_return = $BlowFish->ctEncrypt($uri_string, $this->base_object->config->shopConfiguration['computop_creditcard_crypt_password']);
+		$crypt_string = $crypt_return['data'];
+		$this->layout_object->assign('crypt_string', $crypt_string);
+		$this->layout_object->assign('string_length', $crypt_return['len']);
+
+		// socket connection
+		$ch = curl_init('https://www.computop-paygate.com/Billpay.aspx');
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+		curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/3.0 (compatible; MSIE 5.01; Windows NT 5.0)");
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_HEADER, 0);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, 'merchantID='.$merchantID.'&Len='.$crypt_return['len'].'&Data='.$crypt_string);
+		curl_setopt($ch, CURLOPT_AUTOREFERER, true);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 40);
+		$data = curl_exec($ch);
+		curl_close($ch);
+
+		//echo $data;
+		$array_return = split('\&',$data);
+		$result = array();
+		foreach ($array_return as $arr1) {
+			$arr2 = split('\=',$arr1);
+			$result[$arr2[0]] = $arr2[1];
+		}
+
+		//echo var_dump($result);
+		$entcrypted = $BlowFish->ctDecrypt($result['Data'], $result['Len'], $this->base_object->config->shopConfiguration['computop_creditcard_crypt_password']);
+		//echo var_dump($entcrypted);
+		$array_return = split('\&',$entcrypted);
+		$result = array();
+		foreach ($array_return as $arr1) {
+			$arr2 = split('\=',$arr1);
+			$result[$arr2[0]] = $arr2[1];
+		}
+		echo var_dump($result);
+		return $this->layout_object->_fetch('content_cash_desk/computop_billpay.tpl');
+	} // end after_order
+
+
+	public function change_order() {
+		echo 1;exit();
+		global $DEVMODE;
+
+	} // end change_order
+
+
+} // end PaypalPaymentMethod
+
+/* EOF */
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package		Easyway Shop
+ * @copyright	Copyright (C) 2005 - 2012 TA-EDV
+ * @license		proprietary
+ * @author		Richard Kammermayer <rk@ta-edv.de>
+ * 
+ * Easyway Shop is a web e-commerce system
+ */
+
+
+class Computop_creditcardPaymentMethod {
+
+
+	private $base_object;
+	private $layout_object;
+
+
+	private $customer_data;
+	private $shipping_address;
+	private $billing_address;
+	private $shoppingcart;
+	private $payment_method;
+	private $shipping_method;
+	private $gift_certificate;
+	private $order_id;
+
+
+	private $return_url;
+	private	$cancel_url;
+
+
+	function __construct($base_object, $layout_object) {
+		$this->base_object = $base_object;
+		$this->layout_object = $layout_object;
+
+		$this->customer_data = false;
+		$this->shipping_address = false;
+		$this->billing_address = false;
+		$this->shoppingcart = false;
+		$this->payment_method = false;
+		$this->shipping_method = false;
+		$this->gift_certificate = false;
+		$this->order_id = false;
+
+		$this->return_url = 'http://'.$_SERVER['SERVER_NAME'].'/Kasse/';
+		$this->cancel_url = $this->return_url.'&cancel=true';
+	} // end __construct
+
+
+	public function set_data($customer, $shipping, $billing, $shoppingcart, $delivery, $payment, $order_id = false) {
+		$this->customer_data = $customer;
+		$this->shipping_address = $shipping;
+		$this->billing_address = $billing;
+		$this->shoppingcart = $shoppingcart;
+		$this->payment_method = $delivery;
+		$this->shipping_method = $payment;
+		$this->order_id = $order_id;
+	} // end set_data
+
+
+	public function set_gift_certificate($gift_certificate) {
+		$this->gift_certificate = $gift_certificate;
+	} // end set_gift_certificate
+
+
+	public function set_order_id($order_id) {
+		$this->order_id = $order_id;
+	} // end set_order_id
+
+
+	public function before_order() {
+
+	} // end before_order
+
+	public function during_order() {
+
+	} // end during_order
+
+	public function after_order($order_total = false) {
+		global $DEVMODE;
+
+		if ($this->gift_certificate) {
+			$order_total = $order_total - $this->gift_certificate->with_vat;
+		}
+
+		$order = new Order($this->base_object);
+
+		$call = 'payment_open';
+		$this->layout_object->assign('call', $call);
+
+		$merchantID = $this->base_object->config->shopConfiguration['computop_creditcard_merchant_id'];
+		$this->layout_object->assign('merchantID', $merchantID);
+		$trans_id = '10001';
+		$amount = intval($this->shoppingcart['order_total'] * 100);
+		$currency = 'EUR';
+		$url_success = 'https://'.$_SERVER['SERVER_NAME'].'/creditcard_success/';
+		$url_failure = 'https://'.$_SERVER['SERVER_NAME'].'/creditcard_failed/';
+		$url_notify = 'https://'.$_SERVER['SERVER_NAME'].'/creditcard_failed/';
+		$order_desc = 'meine Bestellung';
+		$user_data = 'user';
+
+		$uri_string = "TransID=".$trans_id.
+			"&Amount=".$amount.
+			"&Currency=".$currency.
+			"&OrderDesc=".$order_desc.
+			"&UserData=".$user_data.
+			"&URLSuccess=".$url_success.
+			"&URLNotify=".$url_notify.
+			"&URLFailure=".$url_failure;
+
+		include_once './libs/ctPayGatePHP/includes/function.inc.php';
+		$BlowFish = new ctBlowfish;
+		//$crypt_string = $BlowFish->ctEncrypt($uri_string, strlen($uri_string), $this->base_object->config->shopConfiguration['computop_creditcard_crypt_password']);
+		$crypt_return = $BlowFish->ctEncrypt($uri_string, $this->base_object->config->shopConfiguration['computop_creditcard_crypt_password']);
+		$crypt_string = $crypt_return['data'];
+		$this->layout_object->assign('crypt_string', $crypt_string);
+
+		$this->layout_object->assign('string_length', $crypt_return['len']);
+
+		return $this->layout_object->_fetch('content_cash_desk/computop_creditcard.tpl');
+	} // end after_order
+
+
+	public function change_order() {
+		global $DEVMODE;
+
+	} // end change_order
+
+
+} // end PaypalPaymentMethod
+
+/* EOF */
@@ -0,0 +1,121 @@
+<?php
+/*
+ * @version			$Id: index.php 10381 2008-06-01 03:35:53Z $
+ * @package			Carteasy
+ * @copyright		Copyright (C) 2005 - 2011 Wlanium
+ * @license			proprietary
+ * @author			Thomas Bartelt
+ * Carteasy is a web shop system
+ */
+
+
+include_once('./core/shop_klarna.class.php');
+
+
+class KlarnaPaymentMethod {
+
+
+	private $base_object;
+	private $layout_object;
+
+
+	private $customer_data;
+	private $shipping_address;
+	private $billing_address;
+	private $shoppingcart;
+	private $payment_method;
+	private $shipping_method;
+	private $gift_certificate;
+	private $order_id;
+
+
+	function __construct($base_object, $layout_object) {
+		$this->base_object = $base_object;
+		$this->layout_object = $layout_object;
+
+		$this->customer_data = false;
+		$this->shipping_address = false;
+		$this->billing_address = false;
+		$this->shoppingcart = false;
+		$this->payment_method = false;
+		$this->shipping_method = false;
+		$this->gift_certificate = false;
+		$this->order_id = false;
+	} // end __construct
+
+
+	public function set_data($customer, $shipping, $billing, $shoppingcart, $delivery, $payment, $order_id = false) {
+		$this->customer_data = $customer;
+		$this->shipping_address = $shipping;
+		$this->billing_address = $billing;
+		$this->shoppingcart = $shoppingcart;
+		$this->payment_method = $payment;
+		$this->shipping_method = $delivery;
+		$this->order_id = $order_id;
+	} // end set_data
+
+
+	public function set_gift_certificate($gift_certificate) {
+		$this->gift_certificate = $gift_certificate;
+	} // end set_gift_certificate
+
+
+	public function set_order_id($order_id) {
+		$this->order_id = $order_id;
+	} // end set_order_id
+
+
+	public function before_order($arg = false) {
+		$klarna_object = new Shop_klarna($this->base_object);
+
+		$klarna_object->set_shoppingcart($this->shoppingcart);
+		$klarna_object->set_order_data($this->shipping_method->price_add, $this->payment_method->paymentAdd);
+		$klarna_object->set_address($this->billing_address, $this->shipping_address);
+		if ($arg) {
+			$this->klarna_invoice_number = $klarna_object->transaction_test($arg);
+		} else {
+			$this->klarna_invoice_number = $klarna_object->transaction_test();
+		}
+
+		if (!$this->klarna_invoice_number) {
+			return $klarna_object->get_error();
+		}
+
+		return false;
+	} // end before_order
+
+
+	public function during_order($arg = false) {
+		/*
+		$klarna_object = new Shop_klarna($this->base_object);
+		$klarna_object->set_shoppingcart($this->shoppingcart);
+		$klarna_object->set_order_data($this->shipping_method->price_add, $this->payment_method->paymentAdd);
+		$klarna_object->set_address($this->billing_address, $this->shipping_address);
+
+		if ($arg) {
+			$return = $klarna_object->transaction($arg);
+		} else {
+			$return = $klarna_object->transaction();
+		}*/
+
+		if ($return) {
+			return array('klarna_invoice_number' => $this->klarna_invoice_number);
+		}
+
+		return false;
+	} // end during_order
+
+
+	public function after_order($order_total = false) {
+		return $this->layout_object->_fetch('content_cash_desk/completed.tpl');
+	} // end after_order
+
+
+	public function change_order() {
+
+	} // end change_order
+
+
+} // end KlarnaPaymentMethod
+
+/* EOF */
@@ -0,0 +1,87 @@
+<?php
+/*
+ * @version			$Id: index.php 10381 2008-06-01 03:35:53Z $
+ * @package			Carteasy
+ * @copyright		Copyright (C) 2005 - 2011 Wlanium
+ * @license			proprietary
+ * @author			Thomas Bartelt
+ * Carteasy is a web shop system
+ */
+
+
+class PaymorrowPaymentMethod {
+
+
+	private $base_object;
+	private $layout_object;
+
+
+	private $customer_data;
+	private $shipping_address;
+	private $billing_address;
+	private $shoppingcart;
+	private $payment_method;
+	private $shipping_method;
+	private $gift_certificate;
+	private $order_id;
+
+
+	function __construct($base_object, $layout_object) {
+		$this->base_object = $base_object;
+		$this->layout_object = $layout_object;
+
+		$this->customer_data = false;
+		$this->shipping_address = false;
+		$this->billing_address = false;
+		$this->shoppingcart = false;
+		$this->payment_method = false;
+		$this->shipping_method = false;
+		$this->gift_certificate = false;
+		$this->order_id = false;
+	} // end __construct
+
+
+	public function set_order_id($order_id) {
+		$this->order_id = $order_id;
+	} // end set_order_id
+
+
+	public function set_data($customer, $shipping, $billing, $shoppingcart, $delivery, $payment, $order_id = false) {
+		$this->customer_data = $customer;
+		$this->shipping_address = $shipping;
+		$this->billing_address = $billing;
+		$this->shoppingcart = $shoppingcart;
+		$this->payment_method = $delivery;
+		$this->shipping_method = $payment;
+		$this->order_id = $order_id;
+	} // end set_data
+
+
+	public function set_gift_certificate($gift_certificate) {
+		$this->gift_certificate = $gift_certificate;
+	} // end set_gift_certificate
+
+
+	public function set_order_id($order_id) {
+		$this->order_id = $order_id;
+	} // end set_order_id
+
+
+	public function before_order() {
+
+	} // end before_order
+
+
+	public function after_order() {
+
+	} // end after_order
+
+
+	public function change_order() {
+
+	} // end change_order
+
+
+} // end PaymorrowPaymentMethod
+
+/* EOF */
@@ -0,0 +1,272 @@
+<?php
+/*
+ * @version			$Id: index.php 10381 2008-06-01 03:35:53Z $
+ * @package			Carteasy
+ * @copyright		Copyright (C) 2005 - 2011 Wlanium
+ * @license			proprietary
+ * @author			Thomas Bartelt
+ * Carteasy is a web shop system
+ * 
+ * MODIFIED: PayPal v1 Session Fix - PFC Claude
+ * Added cart session management to eliminate session dependency during PayPal redirects
+ */
+
+include_once('core/paypal/nvp.class.php');
+include_once('core/paypal/expresscheckout.class.php');
+include_once('core/cart_session_manager.class.php');
+
+
+class PaypalPaymentMethod {
+
+
+	private $base_object;
+	private $layout_object;
+	private $cart_session_manager;
+
+
+	private $customer_data;
+	private $shipping_address;
+	private $billing_address;
+	private $shoppingcart;
+	private $payment_method;
+	private $shipping_method;
+	private $gift_certificate;
+	private $order_id;
+
+
+	private $return_url;
+	private	$cancel_url;
+
+
+	function __construct($base_object, $layout_object) {
+		$this->base_object = $base_object;
+		$this->layout_object = $layout_object;
+		
+		// PAYPAL FIX: Initialize cart session manager
+		$this->cart_session_manager = new CartSessionManager($base_object);
+
+		$this->customer_data = false;
+		$this->shipping_address = false;
+		$this->billing_address = false;
+		$this->shoppingcart = false;
+		$this->payment_method = false;
+		$this->shipping_method = false;
+		$this->gift_certificate = false;
+		$this->order_id = false;
+
+		$this->return_url = 'http://'.$_SERVER['SERVER_NAME'].'/Kasse/';
+		$this->cancel_url = $this->return_url.'&cancel=true';
+	} // end __construct
+
+
+	public function set_data($customer, $shipping, $billing, $shoppingcart, $delivery, $payment, $order_id = false) {
+		$this->customer_data = $customer;
+		$this->shipping_address = $shipping;
+		$this->billing_address = $billing;
+		$this->shoppingcart = $shoppingcart;
+		$this->payment_method = $delivery;
+		$this->shipping_method = $payment;
+		$this->order_id = $order_id;
+	} // end set_data
+
+
+	public function set_gift_certificate($gift_certificate) {
+		$this->gift_certificate = $gift_certificate;
+	} // end set_gift_certificate
+
+
+	public function set_order_id($order_id) {
+		$this->order_id = $order_id;
+	} // end set_order_id
+
+
+	public function before_order() {
+
+	} // end before_order
+
+	public function during_order() {
+
+	} // end during_order
+
+
+	public function after_order($order_total = false) {
+		global $DEVMODE;
+		if ($this->gift_certificate) {
+			$order_total = $order_total - $this->gift_certificate->with_vat;
+		}
+
+		$order = new Order($this->base_object);
+		$paypal = new ExpressCheckout($this->return_url, $this->cancel_url, $order_total, $this->shoppingcart);
+
+		if ($paypal->set_express_checkout()) {
+			$this->layout_object->assign('paypal_link', $paypal->get_link());
+			$token = $paypal->get_token();
+			$order->set_order_paypal_token($token, $this->order_id);
+			
+			// PAYPAL FIX: Store complete cart session data before redirect
+			$cart_session_data = array(
+				'customer_data' => $this->customer_data,
+				'shipping_address' => $this->shipping_address,  
+				'billing_address' => $this->billing_address,
+				'shoppingcart' => $this->shoppingcart,
+				'payment_method' => $this->payment_method,
+				'shipping_method' => $this->shipping_method,
+				'gift_certificate' => $this->gift_certificate,
+				'order_id' => $this->order_id,
+				'order_total' => $order_total,
+				'session_backup_time' => date('Y-m-d H:i:s'),
+				'user_agent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
+				'php_session_id' => session_id()
+			);
+			
+			// Store cart data with PayPal token as key
+			$cart_stored = $this->cart_session_manager->storeCartSession($token, $cart_session_data, 'paypal');
+			
+			if ($cart_stored) {
+				// Update status to processing (user is being redirected)
+				$this->cart_session_manager->updateCartStatus($token, 'processing');
+				error_log("PayPal Fix: Cart session stored successfully for token: {$token}");
+			} else {
+				error_log("PayPal Fix: FAILED to store cart session for token: {$token}");
+				// Continue anyway - fallback to original session handling
+			}
+
+			$call = 'payment_open';
+		} else {
+			$message = 'Beim Initialisieren von PayPal ist ein Fehler aufgetreten.';
+
+			if ($DEVMODE) {
+				$error_data = $paypal->get_error();
+				$message = "ERRORCODE: ".$error_data['ERRORCODE'];
+				$message .= "<br />SHORTMESSAGE: ".$error_data['SHORTMESSAGE'];
+				$message .= "<br />LONGMESSAGE: ".$error_data['LONGMESSAGE'];
+
+				$rawdata = $error_data['RAWDATA'];
+				$postfields = $error_data['POSTFIELDS'];
+
+				$this->layout_object->assign('postfields', $postfields);
+				$this->layout_object->assign('rawdata', $rawdata);
+			}
+
+			$this->layout_object->assign('message', $message);
+			$call = 'payment_error';
+		}
+
+		$this->layout_object->assign('call', $call);
+
+		return $this->layout_object->_fetch('content_cash_desk/paypal.tpl');
+	} // end after_order
+
+
+	public function change_order() {
+		global $DEVMODE;
+
+		$order = new Order($this->base_object);
+
+		if (isset($_GET['confirm'])) {
+			$token = $_GET['token'];
+			$payer_id = $_GET['PayerId'];
+
+			$order_data = $order->get_order_by_paypal_token($token);
+			
+			// PAYPAL FIX: Restore cart session data after PayPal return
+			$cart_session = $this->cart_session_manager->retrieveCartSession($token);
+			if ($cart_session && $cart_session['cart_data']) {
+				error_log("PayPal Fix: Cart session restored for token: {$token}");
+				
+				// Restore all cart data to current object (critical for order processing)
+				$cart_data = $cart_session['cart_data'];
+				$this->customer_data = $cart_data['customer_data'] ?? $this->customer_data;
+				$this->shipping_address = $cart_data['shipping_address'] ?? $this->shipping_address;
+				$this->billing_address = $cart_data['billing_address'] ?? $this->billing_address;  
+				$this->shoppingcart = $cart_data['shoppingcart'] ?? $this->shoppingcart;
+				$this->payment_method = $cart_data['payment_method'] ?? $this->payment_method;
+				$this->shipping_method = $cart_data['shipping_method'] ?? $this->shipping_method;
+				$this->gift_certificate = $cart_data['gift_certificate'] ?? $this->gift_certificate;
+				$this->order_id = $cart_data['order_id'] ?? $this->order_id;
+				
+				// Debug log
+				error_log("PayPal Fix: Restored order_id: {$this->order_id}, cart items: " . count($this->shoppingcart ?? []));
+			} else {
+				error_log("PayPal Fix: WARNING - No cart session found for token: {$token} - falling back to session/database");
+			}
+
+			$paypal = new ExpressCheckout($this->return_url, $this->cancel_url, $order->get_order_total_by_id($order_data->id));
+
+			if ($paypal->do_express_checkout_payment($token, $payer_id)) {
+				$paypal_raw_data = $paypal->get_return_array();
+				OrderHelper::set_paypal_transaction_data($order_data->id, $paypal_raw_data);
+
+				// set payment status on payed
+				$order->set_billing_status('2', $order_data->id);
+				$date = getdate();
+				$today = $date['year'].'-'.$date['mon'].'-'.$date['mday'];
+				$order->set_payment_date($today, $order_data->id);
+
+				$this->layout_object->assign('order_number', $order_data->order_number);
+				$this->layout_object->assign('customer_number', $order_data->customer_number);
+				
+				// PAYPAL FIX: Mark cart session as completed
+				$this->cart_session_manager->updateCartStatus($token, 'completed');
+
+				$call = 'payment_confirmed';
+			} else {
+				$this->layout_object->assign('message', 'Beim Bezahlabschluss ist ein Fehler aufgetreten. ');
+				
+				// PAYPAL FIX: Mark cart session as abandoned
+				$this->cart_session_manager->updateCartStatus($token, 'abandoned');
+				
+				$call = 'payment_error';
+			}
+		} else if (isset($_GET['cancel'])) {
+			$token = $_GET['token'] ?? '';
+			
+			// PAYPAL FIX: Mark cart session as abandoned on cancel
+			if ($token) {
+				$this->cart_session_manager->updateCartStatus($token, 'abandoned');
+			}
+			
+			$call = 'payment_cancelled';
+			$order->set_order_status('6', $order_data->id ?? 0);
+		} else if (isset($_GET['token'])) {
+			$token = $_GET['token'];
+			$payer_id = $_GET['PayerID'];
+
+			$order_data = $order->get_order_by_paypal_token($token);
+			
+			// PAYPAL FIX: Restore cart session for confirmation step
+			$cart_session = $this->cart_session_manager->retrieveCartSession($token);
+			if ($cart_session && $cart_session['cart_data']) {
+				$cart_data = $cart_session['cart_data'];
+				$this->shoppingcart = $cart_data['shoppingcart'] ?? $this->shoppingcart;
+				error_log("PayPal Fix: Cart restored for confirmation - token: {$token}");
+			}
+
+			$paypal = new ExpressCheckout($this->return_url, $this->cancel_url, $order->get_order_total_by_id($order_data->id));
+
+			if ($paypal->get_express_checkout_details($token)) {
+				$paypal_raw_data = $paypal->get_return_array();
+				OrderHelper::set_paypal_user_data($order_data->id, $paypal_raw_data);
+
+				$confirm_url = $this->return_url.'?token='.$token.'&PayerId='.$payer_id.'&order_id='.$order_data->id.'&confirm='.true;
+				$this->layout_object->assign('confirm_url', $confirm_url);
+
+				$call = 'payment_confirm';
+			} else {
+				$this->layout_object->assign('message', 'Bei der PayPal r&uuml;ckfrage ist ein Fehler aufgetreten.');
+				
+				// PAYPAL FIX: Mark as abandoned on error
+				$this->cart_session_manager->updateCartStatus($token, 'abandoned');
+				
+				$call = 'payment_error';
+			}
+		}
+
+		$this->layout_object->assign('call', $call);
+		return $this->layout_object->_fetch('content_cash_desk/paypal.tpl');
+	} // end change_order
+
+
+} // end PaypalPaymentMethod
+
+/* EOF */