Version Notes
Supported Magento 1.5.0.0 - 1.7.x, Magento Enterprise 1.8-1.12.x
Download this release
Release Info
Developer | Exactor, Inc. |
Extension | Mage_Exactor_Tax |
Version | 2016.06.16 |
Comparing to | |
See all releases |
Code changes from version 2015.03.31 to 2016.06.16
app/code/local/ZzzzzExactor/Core/Model/MerchantSettings.php
CHANGED
@@ -23,7 +23,6 @@ class ZzzzzExactor_Core_Model_MerchantSettings extends Mage_Core_Model_Abstract
|
|
23 |
protected $skuSources = array(self::SKU_SOURCE_SKU_FIELD => 'SKU Field',
|
24 |
self::SKU_SOURCE_ATTRIBUTE_NAME => 'Attribute Set Name',
|
25 |
self::SKU_SOURCE_TAX_CLASS => 'Tax Class',
|
26 |
-
self::SKU_SOURCE_PRODUCT_CATEGORY => 'Product Category',
|
27 |
self::SKU_SOURCE_NONE => 'None'
|
28 |
);
|
29 |
|
23 |
protected $skuSources = array(self::SKU_SOURCE_SKU_FIELD => 'SKU Field',
|
24 |
self::SKU_SOURCE_ATTRIBUTE_NAME => 'Attribute Set Name',
|
25 |
self::SKU_SOURCE_TAX_CLASS => 'Tax Class',
|
|
|
26 |
self::SKU_SOURCE_NONE => 'None'
|
27 |
);
|
28 |
|
app/code/local/ZzzzzExactor/Tax/Helper/Mapping.php
CHANGED
@@ -40,8 +40,7 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
|
|
40 |
|
41 |
const ATTRIBUTE_NAME_EXEMPTION = 'taxvat';
|
42 |
|
43 |
-
const
|
44 |
-
|
45 |
|
46 |
private $logger;
|
47 |
|
@@ -107,8 +106,9 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
|
|
107 |
$fullName = trim($address->getName()); //trim($this->buildFullName($address->getFirstname(), $address->getLastname(), $address->getMiddlename()));
|
108 |
if (strlen($fullName) > 0)
|
109 |
$exactorAddress->setFullName($fullName);
|
110 |
-
if ($address->
|
111 |
-
$exactorAddress->setStreet1($address->
|
|
|
112 |
$exactorAddress->setCity($address->getCity());
|
113 |
$exactorAddress->setStateOrProvince($address->getRegionCode());
|
114 |
$exactorAddress->setCountry($address->getCountry());
|
@@ -183,7 +183,10 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
|
|
183 |
if ($taxClass == null) $sku = ''; else $sku = $taxClass->getClassName();
|
184 |
break;
|
185 |
}
|
186 |
-
|
|
|
|
|
|
|
187 |
}
|
188 |
|
189 |
private function isUSPSShipping($methodName)
|
40 |
|
41 |
const ATTRIBUTE_NAME_EXEMPTION = 'taxvat';
|
42 |
|
43 |
+
const MAX_DIGIT_SKU_CODE_LENGTH = 19;
|
|
|
44 |
|
45 |
private $logger;
|
46 |
|
106 |
$fullName = trim($address->getName()); //trim($this->buildFullName($address->getFirstname(), $address->getLastname(), $address->getMiddlename()));
|
107 |
if (strlen($fullName) > 0)
|
108 |
$exactorAddress->setFullName($fullName);
|
109 |
+
if ($address->getStreet1() != null)
|
110 |
+
$exactorAddress->setStreet1($address->getStreet1());
|
111 |
+
$exactorAddress->setStreet2($address->getStreet2());
|
112 |
$exactorAddress->setCity($address->getCity());
|
113 |
$exactorAddress->setStateOrProvince($address->getRegionCode());
|
114 |
$exactorAddress->setCountry($address->getCountry());
|
183 |
if ($taxClass == null) $sku = ''; else $sku = $taxClass->getClassName();
|
184 |
break;
|
185 |
}
|
186 |
+
if (ctype_digit($sku)) {
|
187 |
+
return substr($sku, 0, ZzzzzExactor_Tax_Helper_Mapping::MAX_DIGIT_SKU_CODE_LENGTH);
|
188 |
+
}
|
189 |
+
return $sku;
|
190 |
}
|
191 |
|
192 |
private function isUSPSShipping($methodName)
|
app/design/adminhtml/default/default/template/ExactorSettings/settingsform.phtml
CHANGED
@@ -104,7 +104,7 @@
|
|
104 |
<tr>
|
105 |
<td class="label"><?php echo $this->__('Street 1')?> <span class="required">*</span></td>
|
106 |
<td class="input-ele">
|
107 |
-
<input class="input-text validate-length
|
108 |
</td>
|
109 |
</tr>
|
110 |
<tr>
|
104 |
<tr>
|
105 |
<td class="label"><?php echo $this->__('Street 1')?> <span class="required">*</span></td>
|
106 |
<td class="input-ele">
|
107 |
+
<input class="input-text validate-length required-entry" maxlength="128" name="exactordetailsform[Street1]" value="<?php echo $accountSettings->getStreet1();?>"/>
|
108 |
</td>
|
109 |
</tr>
|
110 |
<tr>
|
lib/ExactorCommons/config.php
CHANGED
@@ -23,7 +23,7 @@ define('EXACTOR_CONFIG_ALWAYS_OVERRIDE_TAX', 'always-override-tax');
|
|
23 |
|
24 |
/* Initializing factories */
|
25 |
ExactorLoggingFactory::getInstance()->setup('MagentoLogger', IExactorLogger::DEBUG);
|
26 |
-
ExactorConnectionFactory::getInstance()->setup('Magento','
|
27 |
ExactorProcessingServiceFactory::getInstance()->setup(new MagentoExactorCallback());
|
28 |
|
29 |
/* Initializing configuration object */
|
23 |
|
24 |
/* Initializing factories */
|
25 |
ExactorLoggingFactory::getInstance()->setup('MagentoLogger', IExactorLogger::DEBUG);
|
26 |
+
ExactorConnectionFactory::getInstance()->setup('Magento','20160616');
|
27 |
ExactorProcessingServiceFactory::getInstance()->setup(new MagentoExactorCallback());
|
28 |
|
29 |
/* Initializing configuration object */
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Mage_Exactor_Tax</name>
|
4 |
-
<version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
@@ -12,9 +12,9 @@ Once installed, neither the merchant, nor the customer, need to perform any addi
|
|
12 |
For additional information, please refer to the Exactor Magento User Guide that is attached to the plug-in, or which you can download directly from the Exactor control panel (navigate to Account Management Integration Points & PlugIns).</description>
|
13 |
<notes>Supported Magento 1.5.0.0 - 1.7.x, Magento Enterprise 1.8-1.12.x</notes>
|
14 |
<authors><author><name>Exactor, Inc.</name><user>exactor</user><email>support@exactor.com</email></author></authors>
|
15 |
-
<date>
|
16 |
-
<time>08:
|
17 |
-
<contents><target name="magelocal"><dir name="ZzzzzExactor"><dir name="Core"><dir name="Helper"><file name="SessionCache.php" hash="4a48ea63099201bc04581febe21b7237"/></dir><dir name="Model"><file name="ExactorTransaction.php" hash="aee2205ef1e8b58fe8fead7385af2fdd"/><file name="MerchantSettings.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>Mage_Exactor_Tax</name>
|
4 |
+
<version>2016.06.16</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
12 |
For additional information, please refer to the Exactor Magento User Guide that is attached to the plug-in, or which you can download directly from the Exactor control panel (navigate to Account Management Integration Points & PlugIns).</description>
|
13 |
<notes>Supported Magento 1.5.0.0 - 1.7.x, Magento Enterprise 1.8-1.12.x</notes>
|
14 |
<authors><author><name>Exactor, Inc.</name><user>exactor</user><email>support@exactor.com</email></author></authors>
|
15 |
+
<date>2016-06-16</date>
|
16 |
+
<time>08:42:34</time>
|
17 |
+
<contents><target name="magelocal"><dir name="ZzzzzExactor"><dir name="Core"><dir name="Helper"><file name="SessionCache.php" hash="4a48ea63099201bc04581febe21b7237"/></dir><dir name="Model"><file name="ExactorTransaction.php" hash="aee2205ef1e8b58fe8fead7385af2fdd"/><file name="MerchantSettings.php" hash="4615d3b5b25185a68983c3ded624d109"/><dir name="Mysql4"><dir name="ExactorTransaction"><file name="Collection.php" hash="5078855300f1b8895c5429fb10f37854"/></dir><file name="ExactorTransaction.php" hash="4b8f45cc739ac05b71be3f38c0138109"/><dir name="MerchantSettings"><file name="Collection.php" hash="4c7e905444d9f02c1e82033cd147afc5"/></dir><file name="MerchantSettings.php" hash="fd98ded15c7dde7bcc1746a40c24aa85"/></dir><dir name="Type"><file name="Onepage.php" hash="8c9c744d769f4064dcc344d4d474dd2a"/></dir></dir><dir name="etc"><file name="config.xml" hash="654bd7d22e5a308722d8769a1233ad80"/></dir></dir><dir name="ExactorSettings"><dir name="Block"><file name="Form.php" hash="3189371ce1fca8f2ff72b165da762e2e"/></dir><dir name="Helper"><file name="Data.php" hash="08ff0be3da068e35731d5cbcb5ca031d"/><file name="VersionResolver.php" hash="e05646123b776551295cdc1050eb80a0"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FormController.php" hash="83e0faaffe8a93e4fbccf9e0c0b4914f"/></dir><file name="AjaxController.php" hash="e0a9122472eebdf2ba9d703b35e528e6"/><file name="IndexController.php" hash="064275cda39bf28a23f0e30cda85d546"/></dir><dir name="etc"><file name="config.xml" hash="63ed7c63ac663fa72b1a645275499c34"/></dir><dir name="sql"><dir name="ExactorSettings_setup"><file name="mysql4-install-14.04.2012.php" hash="171dcba8395c21dccd336c86cd92db5d"/><file name="upgrade-2012.06.14-2012.09.25.php" hash="217c13f3fecf41decff7f0cbc908f0f8"/></dir></dir></dir><dir name="Sales"><dir name="Model"><file name="Observer.php" hash="0b17d3af621eaecba8307a1b8dceb75a"/></dir><dir name="etc"><file name="config.xml" hash="20483c2cc3730e5ea279023ef47c3d14"/></dir></dir><dir name="Tax"><dir name="Helper"><file name="Calculation.php" hash="30378738db4beea10d7caeb256018be6"/><file name="Mapping.php" hash="72bd594e72c4a2463fa7aade156cbad9"/></dir><dir name="Model"><dir name="Sales"><dir name="Total"><dir name="Quote"><dir name="Nominal"><file name="Tax.php" hash="46e0b7698aee6354278cf59d34192d2d"/></dir><file name="Tax.php" hash="fd51a300f74a5d74ce7ef0564dd1b928"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="1c3235fa291ec1d81855a5015376cf51"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="exactorsettings.xml" hash="c6411fb02004382e2bde340e2eea8ba1"/><file name="exactoronestepcheckout.xml" hash="9fdfa1db5e4e60b4eec8f348c10aab07"/></dir><dir name="template"><dir name="ExactorSettings"><file name="settingsform.phtml" hash="6241068fc198ad096f76e2b33fd62e0c"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="exactoronestepcheckout.xml" hash="9fdfa1db5e4e60b4eec8f348c10aab07"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZzzzzExactor.xml" hash="d5d93cb5e6608f3cf87f5a57ed1448c7"/></dir></target><target name="mageweb"><dir name="js"><dir name="exactor"><file name="exactor.js" hash="5c23e40f4034e50a6e0df5b1c708b7e1"/></dir></dir></target><target name="magelib"><dir name="ExactorCommons"><file name="ExactorCommons.php" hash="167d88ecdd599a2445f394f46293db7c"/><file name="ExactorDomainObjects.php" hash="c708118429f6bea5c5c3a9c4caf28e99"/><file name="Magento.php" hash="190c773212f194297550d36ef404cf5b"/><file name="RegionResolver.php" hash="2537638a7895a169cee4b1df786d22fb"/><file name="XmlProcessing.php" hash="1fe961d5c14d507b2bb82fd3dd94237c"/><file name="config.php" hash="3e3027736dfb075f946bc5e1b48aba89"/></dir></target></contents>
|
18 |
<compatible/>
|
19 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
20 |
</package>
|