Added simpletype

BluemIntegration.php

@@ -76,7 +76,11 @@ public function RequestTransactionStatus($mandateID, $entranceCode)
 	 * @param int $customer_id The Customer ID
 	 * @param int $order_id    The Order ID
 	 */
-	public function CreateNewTransaction($customer_id, $order_id): EMandateResponse
+	public function CreateNewTransaction(
+		$customer_id, $order_id, 
+		$transaction_type = "default", 
+		$simple_redirect_url = ""
+		)
 	{
 
 		if (is_null($customer_id)) {
@@ -93,7 +97,9 @@ public function CreateNewTransaction($customer_id, $order_id): EMandateResponse
 			$this->CreateMandateID($order_id, $customer_id),
 			($this->configuration->environment == BLUEM_ENVIRONMENT_TESTING &&
 				isset($this->configuration->expected_return) ?
-				$this->configuration->expected_return : "")
+				$this->configuration->expected_return : ""),
+			$transaction_type,
+			$simple_redirect_url
 		);
 
 		return $this->PerformRequest($r);
@@ -115,7 +121,8 @@ public function CreateEntranceCode(): String
 	 */
 	public function CreateMandateID(String $order_id, String $customer_id): String
 	{
-		if($this->configuration->senderID === "S1300")  // veteranen search team
+		// veteranen search team
+		if($this->configuration->senderID === "S1300")  
 		{
 			return "M".Carbon::now()->format('YmdHis');
 		} 
@@ -152,7 +159,7 @@ public function PerformRequest(EMandateRequest $transaction_request)
 		try {
 			$http_response = $req->send();
 			if ($http_response->getStatus() == 200) {
-				// echo $http_response->getBody();
+
 				$response = new EMandateResponse($http_response->getBody());
 				if (!$response->Status()) {
 

EMandateRequest.php

@@ -270,7 +270,9 @@ class EMandateTransactionRequest extends EMandateRequest
 	private $purchaseID;
 	private $sendOption;
 
-	function __construct($config, $customer_id, $order_id, $mandateID, String $expected_return="none")
+	function __construct($config, $customer_id, $order_id, $mandateID, String $expected_return="none",
+	$transaction_type = "default",
+	$simple_redirect_url="")
 	{
 
 		parent::__construct($config,"",$expected_return);
@@ -279,6 +281,10 @@ function __construct($config, $customer_id, $order_id, $mandateID, String $expec
 
 		$this->merchantReturnURLBase = $config->merchantReturnURLBase;
 
+		$this->transaction_type = $transaction_type;	
+		if($this->transaction_type==="simple" && $simple_redirect_url!=="") {
+			$this->merchantReturnURL = $simple_redirect_url."?mandateID={$this->mandateID}"; 
+		}
 
 		$now = Carbon::now();
 
@@ -309,7 +315,10 @@ function __construct($config, $customer_id, $order_id, $mandateID, String $expec
 		}
 		$this->purchaseID = "{$purchaseIDPrefix}{$this->debtorReference}-{$order_id}";  // INKOOPNUMMER
 
-
+
+
+		$this->automatically_redirect = "1";
+
 	}
 	public function XmlString()
 	{
@@ -329,7 +338,7 @@ public function XmlString()
 language="nl" 
 sendOption="none">
 <MandateID>'.$this->mandateID.'</MandateID>
-<MerchantReturnURL automaticRedirect="1">'.$this->merchantReturnURL.'</MerchantReturnURL>
+<MerchantReturnURL automaticRedirect="'.$this->automatically_redirect.'">'.$this->merchantReturnURL.'</MerchantReturnURL>
 <SequenceType>'.$this->sequenceType.'</SequenceType>
 <EMandateReason>'.$this->eMandateReason.'</EMandateReason>
 <DebtorReference>'.$this->debtorReference.'</DebtorReference>