Release 1.1.3

README.md

@@ -10,7 +10,7 @@ This repository contains the Magento 1 extension that enables to process payment
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.2/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.3/docs/en/documentation.html)
 
 ## Support
 
@@ -32,4 +32,4 @@ For Magento 1.6.x you need to install the [Magento compatibility module](https:/
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/magento-1/blob/1.1.2/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/magento-1/blob/1.1.3/LICENSE) for more information.

app/code/community/Wallee/Payment/Model/Service/LineItem.php

@@ -99,7 +99,7 @@ protected function getInvoiceShippingLineItem(Mage_Sales_Model_Order_Invoice $in
             $lineItem->setQuantity(1);
             $lineItem->setSku('shipping');
             $tax = $this->getShippingTax($invoice->getOrder());
-            if ($tax->getRate() > 0) {
+            if ($tax != null && $tax->getRate() > 0) {
                 $lineItem->setTaxes(array(
                     $tax
                 ));
@@ -359,7 +359,7 @@ protected function getShippingLineItem($entity)
             $lineItem->setQuantity(1);
             $lineItem->setSku('shipping');
             $tax = $this->getShippingTax($entity);
-            if ($tax->getRate() > 0) {
+            if ($tax != null && $tax->getRate() > 0) {
                 $lineItem->setTaxes(array(
                     $tax
                 ));
@@ -398,6 +398,9 @@ protected function getShippingTax($entity)
             $entity->getStore());
         $shippingTaxClass = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
             $entity->getStore());
+        if (! $shippingTaxClass) {
+            return null;
+        }
 
         /* @var Mage_Tax_Model_Class $taxClass */
         $taxClass = Mage::getModel('tax/class')->load($shippingTaxClass);

app/code/community/Wallee/Payment/etc/config.xml

@@ -13,7 +13,7 @@
 <config>
 	<modules>
 		<Wallee_Payment>
-			<version>1.1.2</version>
+			<version>1.1.3</version>
 		</Wallee_Payment>
 	</modules>
 	<global>
@@ -357,7 +357,7 @@
 	<default>
 		<wallee_payment>
 			<information>
-				<version>1.1.2</version>
+				<version>1.1.3</version>
 				<sdk_version>2.1.5</sdk_version>
 			</information>
 			<general>

app/code/community/Wallee/Payment/etc/system.xml

@@ -30,7 +30,7 @@
 					<show_in_default>1</show_in_default>
 					<show_in_website>1</show_in_website>
 					<show_in_store>1</show_in_store>
-					<comment><![CDATA[If you need help setting up the wallee extension, check out the <a href="https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.2/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
+					<comment><![CDATA[If you need help setting up the wallee extension, check out the <a href="https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.3/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
 					<fields>
 						<version translate="label">
 							<label>Module Version</label>

app/locale/de_DE/Wallee_Payment.csv

@@ -36,7 +36,7 @@
 "Giftcard (%s)","Geschenkkarte (%s)"
 "Giftcard","Geschenkkarte"
 "Hold Delivery","Lieferung halten"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der wallee-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.2/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
+"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der wallee-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.3/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
 "Inactive","Inaktiv"
 "Information","Informationen"
 "Line Items","Positionen"

app/locale/en_US/Wallee_Payment.csv

@@ -36,7 +36,7 @@
 "Giftcard (%s)","Giftcard (%s)"
 "Giftcard","Giftcard"
 "Hold Delivery","Hold Delivery"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>."
+"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-1/1.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>."
 "Inactive","Inactive"
 "Information","Information"
 "Line Items","Line Items"

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/magento-1/releases/tag/1.1.2/">
+		<a href="https://github.com/wallee-payment/magento-1/releases/tag/1.1.3/">
 			Source
 		</a>
 	</li>
@@ -51,7 +51,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/magento-1/releases/tag/1.1.2/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/magento-1/releases/tag/1.1.3/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload them to the root directory of your store using FTP/SSH.</p>