Release 1.0.18

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.17/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.18/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.17/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.18/LICENSE) for more information.

docs/en/assets/base.css

@@ -70,27 +70,27 @@ h1 {
 h2 {
   font-size: 1.625rem;
   font-weight: 300;
-  margin-bottom: 1.875rem;
+  margin-bottom: 1.3rem;
 }
 
 h3 {
   font-size: 1.3rem;
   font-weight: 300;
-  margin-top: 1.875rem;
+  margin-top: 1.3rem;
 }
 
 h4 {
   font-size: 1.125rem;
   font-weight: 400;
   margin-top: 1.875rem;
-  margin-bottom: 1.875rem;
+  margin-bottom: 1.3rem;
 }
 
 h5 {
   font-size: 1rem;
   font-weight: bold;
   margin-top: 1.875rem;
-  margin-bottom: 1.875rem;
+  margin-bottom: 1.3rem;
 }
 
 p {
@@ -452,12 +452,18 @@ ol.glossary li::before {
   margin-top: 0;
 }
 
+.chapter > .chapter-title h1 {
+  border-bottom: 2px solid #eeeeee;
+  margin-bottom: 1.5rem;
+  padding-bottom: 0.2em;
+}
+
 .chapter-title .title-number, .section-title .title-number {
   display: none;
 }
 
 .paragraph {
-  line-height: 2em;
+  line-height: 1.75em;
 }
 
 .paragraph + .paragraph {
@@ -554,14 +560,17 @@ ol.glossary li::before {
 
 .admonitionblock.important {
   background: #fce1e1;
+  border-left: 5px solid #ff6060;
 }
 
 .admonitionblock.note, .admonitionblock.tip {
   background: #e0f2fc;
+  border-left: 5px solid #88d5ff;
 }
 
 .admonitionblock.caution, .admonitionblock.warning {
   background: #fdf3d8;
+  border-left: 5px solid #f1c654;
 }
 
 table.tableblock {

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.17/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.18/">
 			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.17/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.18/">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/system/library/wallee/helper.php

@@ -115,7 +115,7 @@ public function compareStoredCustomerSessionIdentifier(){
 			case 'customer':
 				return isset($customer['customer_id']) && 'customer_' . $customer['customer_id'] == $id;
 			case 'user':
-				return isset($customer['user_id']) && 'user_' . $customer['user_id'] == $id;
+				return (isset($customer['user_id']) && 'user_' . $customer['user_id'] == $id) || (isset($data['user_id']) && 'user_' . $data['user_id'] == $id);
 			case 'guest':
 				return $this->buildGuestSessionIdentifier($customer) == $id;
 			case 'cart':

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

@@ -16,6 +16,7 @@ class LineItem extends AbstractService {
 	private $products;
 	private $shipping;
 	private $coupon;
+	private $coupon_total;
 	private $voucher;
 	private $total;
 	private $xfeepro;
@@ -36,6 +37,7 @@ public function getReducedItemsFromOrder(array $order_info, $transaction_id, $sp
 		$this->tax = \WalleeVersionHelper::newTax($this->registry);
 		$this->tax->setShippingAddress($order_info['shipping_country_id'], $order_info['shipping_zone_id']);
 		$this->tax->setPaymentAddress($order_info['payment_country_id'], $order_info['payment_zone_id']);
+		$this->coupon_total = 0;
 
 		\WalleeHelper::instance($this->registry)->xfeeproDisableIncVat();
 		$line_items = $this->getItemsFromOrder($order_info, $transaction_id, $space_id);
@@ -88,6 +90,7 @@ public function getItemsFromOrder(array $order_info){
 		$order_total = 0;
 		$items = array();
 
+		$this->coupon_total = 0;
 		$this->fixed_taxes = array();
 		$this->products = $order_model->getOrderProducts($order_info['order_id']);
 		$voucher = $order_model->getOrderVouchers($order_info['order_id']);
@@ -190,6 +193,11 @@ private function createLineItems($currency_code){
 			$calculated_total += $item->getAmountIncludingTax();
 		}
 
+		if($this->coupon) {
+			$items[] = $item  = $this->createLineItemFromCoupon();
+			$calculated_total += $item->getAmountIncludingTax();
+		}
+		
 		if ($this->shipping) {
 			$items[] = $item = $this->createLineItemFromShipping();
 			$calculated_total += $item->getAmountIncludingTax();
@@ -358,7 +366,13 @@ private function createLineItemFromProduct($product){
 			elseif ($this->coupon['type'] == 'P') {
 				$discount = $product['total'] / 100 * $this->coupon['discount'];
 			}
-			$amount_excluding_tax -= $discount;
+			$this->coupon_total -= $discount;
+			$line_item->setAttributes(array(
+				"coupon" => new \Wallee\Sdk\Model\LineItemAttributeCreate(array(
+					'label' => $this->coupon['name'],
+					'value' => $discount
+				))
+			));
 		}
 
 		$line_item->setName($product['name']);
@@ -403,8 +417,21 @@ private function createUniqueIdFromProduct($product){
 		}
 		return $id;
 	}
-
-	private function createLineItemFromVoucher($voucher, $id){
+	
+	private function createLineItemFromCoupon(){
+		$line_item = new LineItemCreate();
+		
+		$line_item->setName($this->coupon['name']);
+		$line_item->setQuantity(1);
+		$line_item->setType(LineItemType::DISCOUNT);
+		$line_item->setSKU($this->coupon['code']);
+		$line_item->setUniqueId($this->coupon['coupon_id']);
+		$line_item->setAmountIncludingTax(\WalleeHelper::instance($this->registry)->formatAmount($this->coupon_total));
+		
+		return $this->cleanLineItem($line_item);
+	}
+	
+	private function createLineItemFromVoucher(){
 		$line_item = new LineItemCreate();
 
 		$line_item->setName($this->voucher['name']);

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

@@ -162,7 +162,6 @@ private function persist($transaction, array $order_info){
 		}
 		$this->updateTransactionInfo($transaction, $id);
 		$this->storeTransactionIdsInSession($transaction);
-		$this->storeCoupon($transaction);
 		$this->storeShipping($transaction);
 	}
 
@@ -335,6 +334,10 @@ public function updateTransactionInfo(\Wallee\Sdk\Model\Transaction $transaction
 				$info->setFailureReason($transaction->getFailureReason()->getDescription());
 			}
 		}
+		// TODO into helper?
+		if($this->hasSaveableCoupon()) {
+			$info->setCouponCode($this->getCoupon());
+		}
 		$info->save();
 		return $info;
 	}
@@ -522,17 +525,12 @@ private function storeShipping(\Wallee\Sdk\Model\Transaction $transaction){
 			$shipping_info->save();
 		}
 	}
-
-	private function storeCoupon(\Wallee\Sdk\Model\Transaction $transaction){
-		if (isset($this->registry->get('session')->data['coupon']) && isset($this->registry->get('session')->data['order_id'])) {
-			$transaction_info = \Wallee\Entity\TransactionInfo::loadByOrderId($this->registry,
-					$this->registry->get('session')->data['order_id']);
-			$transaction_info->setTransactionId($transaction->getId());
-			$transaction_info->setSpaceId($transaction->getLinkedSpaceId());
-			$transaction_info->setOrderId($this->registry->get('session')->data['order_id']);
-			$transaction_info->setCouponCode($this->registry->get('session')->data['coupon']);
-			$transaction_info->setState(\Wallee\Sdk\Model\TransactionState::CREATE);
-			$transaction_info->save();
-		}
+	
+	private function hasSaveableCoupon() {
+		return isset($this->registry->get('session')->data['coupon']) && isset($this->registry->get('session')->data['order_id']);
+	}
+	
+	private function getCoupon() {
+		return $this->registry->get('session')->data['coupon'];
 	}
 }