Mage_Exactor_Tax - Version 2014.12.04

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 2014.12.04
Comparing to
See all releases


Code changes from version 2014.10.30 to 2014.12.04

Files changed (4) hide show
  1. app/code/local/ZzzzzExactor/Tax/Helper/Mapping.php +26 -12
  2. lib/ExactorCommons/ExactorCommons.php +1 -0
  3. lib/ExactorCommons/config.php +1 -1
  4. package.xml +4 -4
app/code/local/ZzzzzExactor/Tax/Helper/Mapping.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
 
2
  /**
3
  * User: LOGICIFY\corvis
4
  * Date: 4/20/12
5
  * Time: 1:12 PM
6
  */
7
-
8
  class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
9
  {
10
 
@@ -506,8 +506,13 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
506
  {
507
  $exemptionId = '';
508
  if ($merchantSettings->getExemptionsSupported()) {
509
- $customerExemptionId = $quoteAddress->getQuote()->getCustomer()->getData(self::ATTRIBUTE_NAME_EXEMPTION);
510
- if ($customerExemptionId != null) $exemptionId = $customerExemptionId;
 
 
 
 
 
511
  }
512
  return $exemptionId;
513
  }
@@ -522,8 +527,13 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
522
  {
523
  $exemptionId = '';
524
  if ($merchantSettings->getExemptionsSupported()) {
525
- $customerExemptionId = $creditMemo->getOrder()->getCustomerTaxvat();
526
- if ($customerExemptionId != null) $exemptionId = $customerExemptionId;
 
 
 
 
 
527
  }
528
  return $exemptionId;
529
  }
@@ -539,7 +549,11 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
539
  $exemptionId = '';
540
  if ($merchantSettings->getExemptionsSupported()) {
541
  $customerExemptionId = $order->getCustomerTaxvat();
542
- if ($customerExemptionId != null) $exemptionId = $customerExemptionId;
 
 
 
 
543
  }
544
  return $exemptionId;
545
  }
@@ -679,10 +693,10 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
679
  /**
680
  * Calculates prorated shipping and handling amounts for partial payments \ refunds.
681
  *
682
- * @param $orderedShippingAmount - total shipping amount from the order. Typically getOrder()->getBaseShippingAmount()
683
- * @param $alreadyProcessedAmount - a part of shipping amount that was already processed, for instance $creditMemo->getOrder()->getBaseShippingRefunded()
684
- * @param $targetShippingAmount - shipping amount to process, e.g. $invoice->getBaseShippingAmount()
685
- * @param $handlingTotalAmount - total handling amount
686
  * @param Mage_Core_Model_Store $store
687
  * @return array (shipping amount, handling amount)
688
  */
@@ -937,8 +951,8 @@ class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
937
  {
938
  if ($address == null || !$address->hasData()) return false;
939
  return strlen(trim($address->getStreet1())) > 0
940
- && strlen(trim($address->getFullName())) > 0
941
- && strlen(trim($address->getCity())) > 0;
942
  }
943
 
944
  /**
1
  <?php
2
+
3
  /**
4
  * User: LOGICIFY\corvis
5
  * Date: 4/20/12
6
  * Time: 1:12 PM
7
  */
 
8
  class ZzzzzExactor_Tax_Helper_Mapping extends Mage_Core_Helper_Abstract
9
  {
10
 
506
  {
507
  $exemptionId = '';
508
  if ($merchantSettings->getExemptionsSupported()) {
509
+ $customer = $quoteAddress->getQuote()->getCustomer();
510
+ $customerExemptionId = $customer->getData(self::ATTRIBUTE_NAME_EXEMPTION);
511
+ if ($customerExemptionId != null) {
512
+ $exemptionId = $customerExemptionId;
513
+ } else {
514
+ $exemptionId = $customer->getId();
515
+ }
516
  }
517
  return $exemptionId;
518
  }
527
  {
528
  $exemptionId = '';
529
  if ($merchantSettings->getExemptionsSupported()) {
530
+ $order = $creditMemo->getOrder();
531
+ $customerExemptionId = $order->getCustomerTaxvat();
532
+ if ($customerExemptionId != null) {
533
+ $exemptionId = $customerExemptionId;
534
+ } else {
535
+ $exemptionId = $order->getCustomerId();
536
+ }
537
  }
538
  return $exemptionId;
539
  }
549
  $exemptionId = '';
550
  if ($merchantSettings->getExemptionsSupported()) {
551
  $customerExemptionId = $order->getCustomerTaxvat();
552
+ if ($customerExemptionId != null) {
553
+ $exemptionId = $customerExemptionId;
554
+ } else {
555
+ $exemptionId = $order->getCustomerId();
556
+ }
557
  }
558
  return $exemptionId;
559
  }
693
  /**
694
  * Calculates prorated shipping and handling amounts for partial payments \ refunds.
695
  *
696
+ * @param $orderedShippingAmount - total shipping amount from the order. Typically getOrder()->getBaseShippingAmount()
697
+ * @param $alreadyProcessedAmount - a part of shipping amount that was already processed, for instance $creditMemo->getOrder()->getBaseShippingRefunded()
698
+ * @param $targetShippingAmount - shipping amount to process, e.g. $invoice->getBaseShippingAmount()
699
+ * @param $handlingTotalAmount - total handling amount
700
  * @param Mage_Core_Model_Store $store
701
  * @return array (shipping amount, handling amount)
702
  */
951
  {
952
  if ($address == null || !$address->hasData()) return false;
953
  return strlen(trim($address->getStreet1())) > 0
954
+ && strlen(trim($address->getFullName())) > 0
955
+ && strlen(trim($address->getCity())) > 0;
956
  }
957
 
958
  /**
lib/ExactorCommons/ExactorCommons.php CHANGED
@@ -530,6 +530,7 @@ class ExactorDigitalSignatureBuilder{
530
  private function appendInvoiceFields($invoice){
531
  if ($invoice == null) return;
532
  $this->appendValue($invoice->getSaleDate());
 
533
  $this->appendAddressFields($invoice->getShipTo());
534
  $this->appendAddressFields($invoice->getShipFrom());
535
  if ($invoice->getLineItems() == null) return;
530
  private function appendInvoiceFields($invoice){
531
  if ($invoice == null) return;
532
  $this->appendValue($invoice->getSaleDate());
533
+ $this->appendValue($invoice->getExemptionId());
534
  $this->appendAddressFields($invoice->getShipTo());
535
  $this->appendAddressFields($invoice->getShipFrom());
536
  if ($invoice->getLineItems() == null) return;
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','20141030');
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','20141204');
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>2014.10.30</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 &amp; 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>2014-10-30</date>
16
- <time>16:25:23</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="b58bcf01d15af966358aa1e0f27b9fbe"/><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="86c86c20e78a01e8cd22d6d1c9b9f245"/></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="11e80ef7e4fb3ae7d6964c3b887a5a11"/></dir><dir name="Model"><dir name="Sales"><dir name="Total"><dir name="Quote"><dir name="Nominal"><file name="Tax.php" hash="26eb88861c5f47c410ec837059e28bee"/></dir><file name="Tax.php" hash="dbdb8a2b0292c7c58646ac27bf99e78c"/></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="c423218861b708c3d572ac77623c6280"/></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="03b83a20edc9a129a16230b5033f94ce"/><file name="ExactorDomainObjects.php" hash="c708118429f6bea5c5c3a9c4caf28e99"/><file name="Magento.php" hash="07fe9cf20e5368ac6c6dee45c26a07f8"/><file name="RegionResolver.php" hash="2537638a7895a169cee4b1df786d22fb"/><file name="XmlProcessing.php" hash="1fe961d5c14d507b2bb82fd3dd94237c"/><file name="config.php" hash="11f897a29f98dcad4e77003c028cd6be"/></dir></target></contents>
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>2014.12.04</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 &amp; 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>2014-12-04</date>
16
+ <time>12:09:19</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="b58bcf01d15af966358aa1e0f27b9fbe"/><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="86c86c20e78a01e8cd22d6d1c9b9f245"/></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="d8fdb3bec42806f6f66f0a40b5445662"/></dir><dir name="Model"><dir name="Sales"><dir name="Total"><dir name="Quote"><dir name="Nominal"><file name="Tax.php" hash="26eb88861c5f47c410ec837059e28bee"/></dir><file name="Tax.php" hash="dbdb8a2b0292c7c58646ac27bf99e78c"/></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="c423218861b708c3d572ac77623c6280"/></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="636fc1508daf618d434a35ee8f2b3a1a"/><file name="ExactorDomainObjects.php" hash="c708118429f6bea5c5c3a9c4caf28e99"/><file name="Magento.php" hash="07fe9cf20e5368ac6c6dee45c26a07f8"/><file name="RegionResolver.php" hash="2537638a7895a169cee4b1df786d22fb"/><file name="XmlProcessing.php" hash="1fe961d5c14d507b2bb82fd3dd94237c"/><file name="config.php" hash="180220ffb338e8567d61d5fa8db16905"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>