Release 1.0.17

Author: sbossert

README.md

@@ -11,8 +11,8 @@ This repository contains the OpenCart  wallee payment module that enables the sh
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.16/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.17/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.16/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.17/LICENSE) for more information.

docs/en/documentation.html

@@ -21,7 +21,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.16/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.17/">
 			Source
 		</a>
 	</li>
@@ -48,7 +48,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.16/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.17/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>

upload/admin/model/extension/wallee/migration.php

@@ -7,7 +7,12 @@ class ModelExtensionWalleeMigration extends Model {
 			'name' => 'initialize',
 			'version' => '1.0.0',
 			'function' => 'oc_wallee_update_1_0_0_initialize' 
-		) 
+		),
+		'1.0.1' => array(
+			'name' => 'order_id_nullable',
+			'version' => '1.0.1',
+			'function' => 'oc_wallee_update_1_0_1_order_id_nullable'
+		)
 	);
 
 	public function migrate(){
@@ -230,4 +235,9 @@ private function oc_wallee_update_1_0_0_initialize(){
 				UNIQUE KEY (`constraint_key`)
 				) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
 	}
+	
+	private function oc_wallee_update_1_0_1_order_id_nullable(){
+		$this->db->query(
+				"ALTER TABLE `" . DB_PREFIX . "wallee_transaction_info` MODIFY COLUMN `order_id` int(11) unsigned NULL;");
+	}
 }

upload/admin/view/template/extension/wallee/transaction.tpl

@@ -93,7 +93,6 @@
 	                	<input type="text" class="form-control" name="filters[space_view_id]" value="<?php if(isset($filters['space_view_id'])) { echo $filters['space_view_id']; }?>">
 	                </td>
 	                <td class="text-right">
-	                <!-- TODO dropdown -->
 	                <select class="form-control" name="filters[state]">
 	                	<?php foreach ($order_statuses as $status): ?>
 	                	<option value="<?php echo $status?>" <?php if(isset($filters['state']) && $filters['state'] == $status) { echo "selected"; } ?>><?php echo $status; ?></option>

upload/system/library/wallee/dynamic/catalog/controller.php

@@ -43,6 +43,7 @@ public function confirm(){
 			$this->load->language('payment/wallee');
 			$result['message'] = $this->language->get('error_confirmation'); 
 			unset($this->session->data['order_id']); // this order number cannot be used anymore
+			Wallee\Service\Transaction::instance($this->registry)->clearTransactionInSession();
 		}
 
 		$this->response->addHeader('Content-Type: application/json');

upload/system/library/wallee/entity/abstract_entity.php

@@ -170,7 +170,15 @@ public function save(){
 		$valuesQuery = '';
 
 		foreach ($data_array as $key => $value) {
-			$valuesQuery .= "`" . $key . '`="' . $db->escape($value) . '",';
+			if($value === null) {
+				$value = 'NULL';
+			}
+			else {
+				$value = '"'.$db->escape($value) .'"';
+			}
+			if($value !== null) {
+				$valuesQuery .= "`$key`=$value,";
+			}
 		}
 
 		$valuesQuery = rtrim($valuesQuery, ',');

upload/system/library/wallee/helper.php

@@ -51,7 +51,7 @@ private function __construct(Registry $registry){
 	 */
 	public function getCustomerSessionIdentifier(){
 		$customer = $this->getCustomer();
-		if (isset($customer['customer_id']) && $this->registry->get('customer')->isLogged()) {
+		if (isset($customer['customer_id']) && $this->registry->get('customer') && $this->registry->get('customer')->isLogged()) {
 			return "customer_" . $customer['customer_id'];
 		}
 		$guestId = $this->buildGuestSessionIdentifier($customer);
@@ -73,7 +73,7 @@ public function getCustomerSessionIdentifier(){
 	}
 
 	private function buildCartSessionIdentifier(array $data){
-		if (isset($data['cart']) && is_array($data['cart']) && count($data['cart'] == 1)) {
+		if (isset($data['cart']) && is_array($data['cart']) && count($data['cart']) == 1) {
 			$cartKeys = array_keys($data['cart']);
 			return "cart_" . hash('sha512', $cartKeys[0]);
 		}
@@ -151,7 +151,7 @@ public function getAddress($key, $order_info = array()){
 			$address = $this->getAddress('payment', $order_info);
 		}
 		if(empty($address)) {
-			if ($customer->isLogged() && isset($session[$key . '_address_id'])) {
+			if ($customer && $customer->isLogged() && isset($session[$key . '_address_id'])) {
 				$address = $address_model->getAddress($session[$key . '_address_id']);
 			}
 			if (isset($session['guest'][$key]) && is_array($session['guest'][$key])) { // billing only
@@ -297,7 +297,7 @@ public function getOrderModel(){
 
 	public function getCustomer(){
 		$data = $this->registry->get('session')->data;
-		if ($this->registry->get('customer')->isLogged()) {
+		if ($this->registry->get('customer') && $this->registry->get('customer')->isLogged()) {
 			$customer_id = $this->registry->get('session')->data['customer_id'];
 			$this->registry->get('load')->model('account/customer');
 			$customer = $this->registry->get('model_account_customer')->getCustomer($customer_id);
@@ -494,7 +494,7 @@ public function getWebhookUrl(){
 	public function isValidOrder($order_id){
 		if (!$this->isAdmin()) {
 			$order_info = $this->getOrder($order_id);
-			if ($this->registry->get('customer')->isLogged() && isset($this->registry->get('session')->data['customer_id'])) {
+			if ($this->registry->get('customer') && $this->registry->get('customer')->isLogged() && isset($this->registry->get('session')->data['customer_id'])) {
 				if ($this->registry->get('session')->data['customer_id'] != $order_info['customer_id']) {
 					return false;
 				}

upload/system/library/wallee/service/transaction.php

@@ -39,6 +39,7 @@ public function getJavascriptUrl(){
 		$transaction = $this->getTransaction(array(), false, array(
 			\Wallee\Sdk\Model\TransactionState::PENDING 
 		));
+		$this->persist($transaction, array());
 		return $this->getTransactionService()->buildJavaScriptUrl($transaction->getLinkedSpaceId(), $transaction->getId());
 	}
 
@@ -142,7 +143,7 @@ public function getTransaction($order_info = array(), $cache = true, $allowed_st
 				$create = empty($allowed_states) ? false : !in_array(self::$transaction_cache[$sessionId]->getState(), $allowed_states);
 			}
 			if ($create) {
-				unset($order_info['order_id']);
+				throw new Exception("Order ID was already used."); // Todo test
 			}
 		}
 
@@ -155,9 +156,11 @@ public function getTransaction($order_info = array(), $cache = true, $allowed_st
 	}
 
 	private function persist($transaction, array $order_info){
+		$id = null;
 		if (isset($order_info['order_id'])) {
-			$this->updateTransactionInfo($transaction, $order_info['order_id']);
+			$id = $order_info['order_id'];  // Todo test
 		}
+		$this->updateTransactionInfo($transaction, $id);
 		$this->storeTransactionIdsInSession($transaction);
 		$this->storeCoupon($transaction);
 		$this->storeShipping($transaction);
@@ -485,7 +488,7 @@ private function hasTransactionInSession(){
 				 \WalleeHelper::instance($this->registry)->compareStoredCustomerSessionIdentifier();
 	}
 
-	private function clearTransactionInSession(){
+	public function clearTransactionInSession(){
 		if ($this->hasTransactionInSession()) {
 			unset($this->registry->get('session')->data['wallee_transaction_id']);
 			unset($this->registry->get('session')->data['wallee_customer']);