Version Notes
* Hotfix SmartCalcs integration model casing.
* Trim shipping origin postal code before making API requests.
* Minor code cleanup.
Download this release
Release Info
| Developer | TaxJar |
| Extension | Taxjar_Salestaxautomation |
| Version | 1.6.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.6.0 to 1.6.1
- app/code/community/Taxjar/SalesTax/Model/Debug.php +1 -1
- app/code/community/Taxjar/SalesTax/Model/Observer/SaveConfig.php +2 -2
- app/code/community/Taxjar/SalesTax/Model/Sales/Total/Quote/Tax.php +1 -1
- app/code/community/Taxjar/SalesTax/Model/{SmartCalcs.php → Smartcalcs.php} +1 -1
- app/code/community/Taxjar/SalesTax/etc/config.xml +1 -1
- package.xml +7 -7
app/code/community/Taxjar/SalesTax/Model/Debug.php
CHANGED
|
@@ -49,7 +49,7 @@ class Taxjar_SalesTax_Model_Debug
|
|
| 49 |
$states = implode(',', unserialize(Mage::getStoreConfig('taxjar/config/states')));
|
| 50 |
$apiUser = Mage::getModel('api/user');
|
| 51 |
$existingUserId = $apiUser->load('taxjar', 'username')->getUserId();
|
| 52 |
-
$pluginVersion = '1.6.
|
| 53 |
$phpMemory = @ini_get('memory_limit');
|
| 54 |
$phpVersion = @phpversion();
|
| 55 |
$magentoVersion = Mage::getVersion();
|
| 49 |
$states = implode(',', unserialize(Mage::getStoreConfig('taxjar/config/states')));
|
| 50 |
$apiUser = Mage::getModel('api/user');
|
| 51 |
$existingUserId = $apiUser->load('taxjar', 'username')->getUserId();
|
| 52 |
+
$pluginVersion = '1.6.1';
|
| 53 |
$phpMemory = @ini_get('memory_limit');
|
| 54 |
$phpVersion = @phpversion();
|
| 55 |
$magentoVersion = Mage::getVersion();
|
app/code/community/Taxjar/SalesTax/Model/Observer/SaveConfig.php
CHANGED
|
@@ -30,7 +30,7 @@ class Taxjar_SalesTax_Model_Observer_SaveConfig
|
|
| 30 |
$client = Mage::getModel('taxjar/client');
|
| 31 |
$configuration = Mage::getModel('taxjar/configuration');
|
| 32 |
$regionId = Mage::getStoreConfig('shipping/origin/region_id');
|
| 33 |
-
$this->_storeZip = Mage::getStoreConfig('shipping/origin/postcode');
|
| 34 |
$this->_regionCode = Mage::getModel('directory/region')->load($regionId)->getCode();
|
| 35 |
$validZip = preg_match("/(\d{5}-\d{4})|(\d{5})/", $this->_storeZip);
|
| 36 |
$debug = Mage::getStoreConfig('taxjar/config/debug');
|
|
@@ -53,7 +53,7 @@ class Taxjar_SalesTax_Model_Observer_SaveConfig
|
|
| 53 |
return;
|
| 54 |
}
|
| 55 |
|
| 56 |
-
if ($validZip === 1 && isset($this->_storeZip) &&
|
| 57 |
$ratesJson = $client->getResource($apiKey, $this->apiUrl('rates'));
|
| 58 |
} else {
|
| 59 |
Mage::throwException('Please check that your zip code is a valid US zip code in Shipping Settings.');
|
| 30 |
$client = Mage::getModel('taxjar/client');
|
| 31 |
$configuration = Mage::getModel('taxjar/configuration');
|
| 32 |
$regionId = Mage::getStoreConfig('shipping/origin/region_id');
|
| 33 |
+
$this->_storeZip = trim(Mage::getStoreConfig('shipping/origin/postcode'));
|
| 34 |
$this->_regionCode = Mage::getModel('directory/region')->load($regionId)->getCode();
|
| 35 |
$validZip = preg_match("/(\d{5}-\d{4})|(\d{5})/", $this->_storeZip);
|
| 36 |
$debug = Mage::getStoreConfig('taxjar/config/debug');
|
| 53 |
return;
|
| 54 |
}
|
| 55 |
|
| 56 |
+
if ($validZip === 1 && isset($this->_storeZip) && $this->_storeZip !== '') {
|
| 57 |
$ratesJson = $client->getResource($apiKey, $this->apiUrl('rates'));
|
| 58 |
} else {
|
| 59 |
Mage::throwException('Please check that your zip code is a valid US zip code in Shipping Settings.');
|
app/code/community/Taxjar/SalesTax/Model/Sales/Total/Quote/Tax.php
CHANGED
|
@@ -31,10 +31,10 @@ class Taxjar_SalesTax_Model_Sales_Total_Quote_Tax extends Mage_Tax_Model_Sales_T
|
|
| 31 |
$this->_roundingDeltas = array();
|
| 32 |
$this->_baseRoundingDeltas = array();
|
| 33 |
$this->_hiddenTaxes = array();
|
|
|
|
| 34 |
$address->setShippingTaxAmount(0);
|
| 35 |
$address->setBaseShippingTaxAmount(0);
|
| 36 |
|
| 37 |
-
$this->_address = $address;
|
| 38 |
$smartCalcs = $this->_getSmartCalcs($address);
|
| 39 |
$smartCalcsResponse = $smartCalcs->getResponse();
|
| 40 |
|
| 31 |
$this->_roundingDeltas = array();
|
| 32 |
$this->_baseRoundingDeltas = array();
|
| 33 |
$this->_hiddenTaxes = array();
|
| 34 |
+
$this->_address = $address;
|
| 35 |
$address->setShippingTaxAmount(0);
|
| 36 |
$address->setBaseShippingTaxAmount(0);
|
| 37 |
|
|
|
|
| 38 |
$smartCalcs = $this->_getSmartCalcs($address);
|
| 39 |
$smartCalcsResponse = $smartCalcs->getResponse();
|
| 40 |
|
app/code/community/Taxjar/SalesTax/Model/{SmartCalcs.php → Smartcalcs.php}
RENAMED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
* SmartCalcs Model
|
| 20 |
* Performs sales tax calculations at checkout
|
| 21 |
*/
|
| 22 |
-
class
|
| 23 |
{
|
| 24 |
protected $_response;
|
| 25 |
|
| 19 |
* SmartCalcs Model
|
| 20 |
* Performs sales tax calculations at checkout
|
| 21 |
*/
|
| 22 |
+
class Taxjar_SalesTax_Model_Smartcalcs
|
| 23 |
{
|
| 24 |
protected $_response;
|
| 25 |
|
app/code/community/Taxjar/SalesTax/etc/config.xml
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Taxjar_SalesTax>
|
| 22 |
-
<version>1.6.
|
| 23 |
</Taxjar_SalesTax>
|
| 24 |
</modules>
|
| 25 |
<global>
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Taxjar_SalesTax>
|
| 22 |
+
<version>1.6.1</version>
|
| 23 |
</Taxjar_SalesTax>
|
| 24 |
</modules>
|
| 25 |
<global>
|
package.xml
CHANGED
|
@@ -1,20 +1,20 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Taxjar_Salestaxautomation</name>
|
| 4 |
-
<version>1.6.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>MIT</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Easily collect sales tax without altering your Magento store’s checkout experience or performance.</summary>
|
| 10 |
<description>TaxJar for Magento allows you to quickly calculate sales tax at checkout using our SmartCalcs API and zip-based rates as a backup.</description>
|
| 11 |
-
<notes>* SmartCalcs integration
|
| 12 |
-
*
|
| 13 |
-
*
|
| 14 |
<authors><author><name>TaxJar</name><user>taxjar</user><email>support@taxjar.com</email></author></authors>
|
| 15 |
-
<date>2016-04-
|
| 16 |
-
<time>
|
| 17 |
-
<contents><target name="magecommunity"><dir name="Taxjar"><dir name="SalesTax"><dir name="Block"><dir name="Adminhtml"><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="1e3f944f2c50c5ae9f215577c7f8eeba"/></dir><file name="Grid.php" hash="abee26b12865446aa06d30763c5c5d24"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="d19f2af9ff020d2e0d31369cf43eac50"/></dir><dir name="Model"><file name="Calculation.php" hash="89c05ee42f8316563ea610f11b53a26d"/><file name="Categories.php" hash="ec9523c7d5bdae21b48034434ea43797"/><file name="Client.php" hash="31cc9e1fdada520ee102b4bc2f443164"/><file name="Configuration.php" hash="831e93bcfdf2d10a55038f95dfcb00fb"/><file name="Debug.php" hash="
|
| 18 |
<compatible/>
|
| 19 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
| 20 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Taxjar_Salestaxautomation</name>
|
| 4 |
+
<version>1.6.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>MIT</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Easily collect sales tax without altering your Magento store’s checkout experience or performance.</summary>
|
| 10 |
<description>TaxJar for Magento allows you to quickly calculate sales tax at checkout using our SmartCalcs API and zip-based rates as a backup.</description>
|
| 11 |
+
<notes>* Hotfix SmartCalcs integration model casing.
|
| 12 |
+
* Trim shipping origin postal code before making API requests.
|
| 13 |
+
* Minor code cleanup.</notes>
|
| 14 |
<authors><author><name>TaxJar</name><user>taxjar</user><email>support@taxjar.com</email></author></authors>
|
| 15 |
+
<date>2016-04-12</date>
|
| 16 |
+
<time>21:37:56</time>
|
| 17 |
+
<contents><target name="magecommunity"><dir name="Taxjar"><dir name="SalesTax"><dir name="Block"><dir name="Adminhtml"><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="1e3f944f2c50c5ae9f215577c7f8eeba"/></dir><file name="Grid.php" hash="abee26b12865446aa06d30763c5c5d24"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="d19f2af9ff020d2e0d31369cf43eac50"/></dir><dir name="Model"><file name="Calculation.php" hash="89c05ee42f8316563ea610f11b53a26d"/><file name="Categories.php" hash="ec9523c7d5bdae21b48034434ea43797"/><file name="Client.php" hash="31cc9e1fdada520ee102b4bc2f443164"/><file name="Configuration.php" hash="831e93bcfdf2d10a55038f95dfcb00fb"/><file name="Debug.php" hash="1ae53e80ca55813260e24df9cb354a07"/><dir name="Import"><file name="Comment.php" hash="dff4f3c810e4c1e6e3ca7d85563636e9"/><file name="Rate.php" hash="1fcc66b5493c9963564fdd372e49a360"/><file name="Rule.php" hash="80f2a71950f0bf535608e25d99fbb236"/></dir><dir name="Observer"><file name="ImportRates.php" hash="6a9faaaa2231b04e430d3f4981d9ccdc"/><file name="SalesQuoteCollectTotalsBefore.php" hash="989a2823f1718385bec7143cc9a55ead"/><file name="SaveConfig.php" hash="26d8a559937081fd9d6c5620ea707ac2"/></dir><dir name="Sales"><dir name="Total"><dir name="Quote"><file name="Tax.php" hash="4fa3951e4de0174ea0fc3da3de64e741"/></dir></dir></dir><file name="Smartcalcs.php" hash="0dcb488208f445576935b3b22a280746"/></dir><dir name="etc"><file name="adminhtml.xml" hash="440972a63d83b2475f187f38172f54ca"/><file name="config.xml" hash="689e028a1427931d8e04c9aecc32d465"/><file name="system.xml" hash="2e4defe58b81bfa07b5c8a91fe0a7963"/></dir><dir name="sql"><dir name="salestax_setup"><file name="install-1.6.0.php" hash="9d400004ec642113a8cc907fe5d33960"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Taxjar_SalesTax.xml" hash="552596be5ec12440753bf69ed6005747"/></dir></target></contents>
|
| 18 |
<compatible/>
|
| 19 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
| 20 |
</package>
|
