Merge pull request #13 from easyship/release/1.0.2

release/1.0.2
easyship · Feb 18, 2019 · d316e2e · d316e2e
2 parents f70f446 + 426756a
commit d316e2e
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 25 deletions.
diff --git a/app/code/local/Easyship/Shipping/Block/Adminhtml/Config/Connect.php b/app/code/local/Easyship/Shipping/Block/Adminhtml/Config/Connect.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Block_Adminhtml_Config_Connect
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Block/Adminhtml/Config/Generate.php b/app/code/local/Easyship/Shipping/Block/Adminhtml/Config/Generate.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Block_Adminhtml_Config_Generate
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Helper/Data.php b/app/code/local/Easyship/Shipping/Helper/Data.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Helper_Data
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Items.php b/app/code/local/Easyship/Shipping/Model/Api2/Items.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Items
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Items/Rest.php b/app/code/local/Easyship/Shipping/Model/Api2/Items/Rest.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Items_Rest
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 class Easyship_Shipping_Model_Api2_Items_Rest extends Easyship_Shipping_Model_Api2_Items

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Items/Rest/Admin/V1.php b/app/code/local/Easyship/Shipping/Model/Api2/Items/Rest/Admin/V1.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Items_Rest_Admin_V1
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 class Easyship_Shipping_Model_Api2_Items_Rest_Admin_V1 extends Easyship_Shipping_Model_Api2_Items_Rest

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipment.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipment.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipment
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipment/Rest.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipment/Rest.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipment_Rest
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipment/Rest/Admin/V1.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipment/Rest/Admin/V1.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipment_Rest_Admin_V1
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 class Easyship_Shipping_Model_Api2_Shipment_Rest_Admin_V1 extends Easyship_Shipping_Model_Api2_Shipment_Rest

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipment/Validator/Shipment.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipment/Validator/Shipment.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipment_Validator_Shipment
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipping.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipping.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipping
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
  */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipping/Rest.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipping/Rest.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipping_Rest
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Shipping/Rest/Admin/V1.php b/app/code/local/Easyship/Shipping/Model/Api2/Shipping/Rest/Admin/V1.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Shipping_Rest_Admin_V1
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
  */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Token.php b/app/code/local/Easyship/Shipping/Model/Api2/Token.php
@@ -4,7 +4,7 @@
  * Class Easyship_Shipping_Model_Api2_Token
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Token/Rest.php b/app/code/local/Easyship/Shipping/Model/Api2/Token/Rest.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Token_Rest
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Token/Rest/Admin/V1.php b/app/code/local/Easyship/Shipping/Model/Api2/Token/Rest/Admin/V1.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Token_Rest_Admin_V1
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Tracks.php b/app/code/local/Easyship/Shipping/Model/Api2/Tracks.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Tracks
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Tracks/Rest.php b/app/code/local/Easyship/Shipping/Model/Api2/Tracks/Rest.php
@@ -4,7 +4,7 @@
  * Class Easyship_Shipping_Model_Api2_Tracks_Rest
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
 */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Tracks/Rest/Admin/V1.php b/app/code/local/Easyship/Shipping/Model/Api2/Tracks/Rest/Admin/V1.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Tracks_Rest_Admin_V1
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
  */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Api2/Tracks/Validator/Tracks.php b/app/code/local/Easyship/Shipping/Model/Api2/Tracks/Validator/Tracks.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Api2_Tracks_Validator_Tracks
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
  */
 

diff --git a/app/code/local/Easyship/Shipping/Model/Carrier.php b/app/code/local/Easyship/Shipping/Model/Carrier.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Model_Carrier
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
  */
 
@@ -239,10 +239,10 @@ protected function getFinalItemPrice($item)
         $baseDiscountAmount = $item->getBaseDiscountAmount();
 
         if (!empty($discountAmount) && ($baseDiscountAmount > 0)) {
-            return (float)$item->getPrice() - $item->getDiscountAmount();
+            return (float)$item->getTaxAmount() + $item->getPrice() - $item->getDiscountAmount();
         }
 
-        return (float)$item->getPrice();
+        return (float)$item->getTaxAmount() + $item->getPrice();
     }
 
     /**

diff --git a/app/code/local/Easyship/Shipping/controllers/Adminhtml/EasyshipController.php b/app/code/local/Easyship/Shipping/controllers/Adminhtml/EasyshipController.php
@@ -3,7 +3,7 @@
  * Class Easyship_Shipping_Adminhtml_EasyshipController
  * Author: Easyship
  * Developer: Sunny Cheung, Holubiatnikova Anna, Aloha Chen, Phanarat Pak, Paul Lugangne Delpon
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author URI: https://www.easyship.com
  */
 

diff --git a/app/code/local/Easyship/Shipping/etc/config.xml b/app/code/local/Easyship/Shipping/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Easyship_Shipping>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </Easyship_Shipping>
     </modules>
     <global>