Mage_Exactor_Tax - Version 2017.06.07

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


Code changes from version 2016.06.16 to 2017.06.07

Files changed (8) hide show
  1. app/code/local/ZzzzzExactor/ExactorSettings/controllers/AjaxController.php +0 -33
  2. app/code/local/ZzzzzExactor/ExactorSettings/etc/config.xml +0 -11
  3. app/code/local/ZzzzzExactor/Sales/Model/Observer.php +1 -17
  4. app/design/adminhtml/default/default/layout/exactoronestepcheckout.xml +0 -7
  5. app/design/frontend/base/default/layout/exactoronestepcheckout.xml +0 -7
  6. js/exactor/exactor.js +0 -44
  7. lib/ExactorCommons/config.php +2 -2
  8. package.xml +4 -4
app/code/local/ZzzzzExactor/ExactorSettings/controllers/AjaxController.php DELETED
@@ -1,33 +0,0 @@
1
- <?php
2
- /**
3
- * User: LOGICIFY\corvis
4
- * Date: 5/7/12
5
- * Time: 1:13 PM
6
- */
7
-
8
- class ZzzzzExactor_ExactorSettings_AjaxController extends Mage_Core_Controller_Front_Action{
9
- const FIELD_EXACTOR_STATUS = "exactor_status";
10
-
11
- /** @var Mage_Core_Model_Session_Abstract */
12
- private $session;
13
-
14
- protected function _construct()
15
- {
16
- parent::_construct();
17
- $this->session = Mage::getSingleton('core/session', array('name' => 'frontend'));
18
- }
19
-
20
-
21
- public function getExactorStatusAction(){
22
- $jsonBody=array();
23
- $messageCollection = $this->session->getMessages();
24
- $errorsArray = $messageCollection->getErrors();
25
- $jsonBody[self::FIELD_EXACTOR_STATUS] = null;
26
- if (count($errorsArray) > 0){
27
- $messageCollection->clear();
28
- $jsonBody[self::FIELD_EXACTOR_STATUS] = $errorsArray[0]->getCode();
29
- }
30
- $this->getResponse()->setBody(json_encode($jsonBody));
31
- }
32
- }
33
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/ZzzzzExactor/ExactorSettings/etc/config.xml CHANGED
@@ -123,15 +123,4 @@
123
  </layout>
124
  </adminhtml>
125
 
126
-
127
- <frontend>
128
- <layout>
129
- <updates>
130
- <ExactorSettings>
131
- <file>exactoronestepcheckout.xml</file>
132
- </ExactorSettings>
133
- </updates>
134
- </layout>
135
- </frontend>
136
-
137
  </config>
123
  </layout>
124
  </adminhtml>
125
 
 
 
 
 
 
 
 
 
 
 
 
126
  </config>
app/code/local/ZzzzzExactor/Sales/Model/Observer.php CHANGED
@@ -414,24 +414,8 @@ class ZzzzzExactor_Sales_Model_Observer
414
  $this->logger->trace('called', 'handleNewCreditMemo');
415
  $merchantSettings = $this->loadMerchantSettings($observer->getCreditmemo()->getOrder());
416
  if ($merchantSettings == null) return;
417
- // TODO: What about COMMIT on shipment
418
  if ($merchantSettings->getCommitOption() != ZzzzzExactor_Core_Model_MerchantSettings::COMMIT_NEVER) {
419
- if ($merchantSettings->getCommitOption() == ZzzzzExactor_Core_Model_MerchantSettings::COMMIT_ON_SHIPMENT) {
420
- $exactorTrnInfo = $this->exactorProcessingService->loadTransactionInfoByOrderId(
421
- $observer->getCreditmemo()->getOrder()->getIncrementId());
422
- if ($exactorTrnInfo != null && $exactorTrnInfo->getIsCommited()) {
423
- try {
424
- $this->refundTransactionForOrder($observer->getCreditmemo()->getOrder(), $merchantSettings);
425
- $exactorTrnInfo->setIsCommited(false);
426
- $this->exactorProcessingService->getPluginCallback()
427
- ->saveTransactionInfo($exactorTrnInfo, $exactorTrnInfo->getSignature());
428
- } catch (Exception $e) {
429
- $this->logger->error("Can't refund credit memo", 'handleNewCreditMemo');
430
- }
431
- }
432
- } else {
433
- $this->partialRefund($observer->getCreditmemo());
434
- }
435
  }
436
  }
437
 
414
  $this->logger->trace('called', 'handleNewCreditMemo');
415
  $merchantSettings = $this->loadMerchantSettings($observer->getCreditmemo()->getOrder());
416
  if ($merchantSettings == null) return;
 
417
  if ($merchantSettings->getCommitOption() != ZzzzzExactor_Core_Model_MerchantSettings::COMMIT_NEVER) {
418
+ $this->partialRefund($observer->getCreditmemo());
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
419
  }
420
  }
421
 
app/design/adminhtml/default/default/layout/exactoronestepcheckout.xml DELETED
@@ -1,7 +0,0 @@
1
- <layoutUpdate>
2
- <default>
3
- <reference name="head">
4
- <action method="addJs"><script>exactor/exactor.js</script></action>
5
- </reference>
6
- </default>
7
- </layoutUpdate>
 
 
 
 
 
 
 
app/design/frontend/base/default/layout/exactoronestepcheckout.xml DELETED
@@ -1,7 +0,0 @@
1
- <layoutUpdate>
2
- <default>
3
- <reference name="head">
4
- <action method="addJs"><script>exactor/exactor.js</script></action>
5
- </reference>
6
- </default>
7
- </layoutUpdate>
 
 
 
 
 
 
 
js/exactor/exactor.js DELETED
@@ -1,44 +0,0 @@
1
- document.observe('dom:loaded', function() {
2
- if($('onestepcheckout-place-order')!=null){
3
- var exactorStatusUrl="../ExactorSettings/ajax/getExactorStatus";
4
- var originalOSCHandler=null;
5
- var buttonElement = $('onestepcheckout-place-order');
6
- // Handle place order click event
7
- buttonElement.observe('click', function(e){
8
- //$('onestepcheckout-place-order').getStorage().get('prototype_event_registry').get('click');
9
- var submitOriginalHandlers = Event.cache[buttonElement._eventId || (buttonElement._prototypeEventID || [])[0]].click;;
10
- if (submitOriginalHandlers.length > 1){
11
- originalOSCHandler = submitOriginalHandlers[1];
12
- // Unbind original
13
- $('onestepcheckout-place-order').stopObserving('click');
14
- $('onestepcheckout-place-order').observe('click', doExactorStatusRequestChain);
15
- doExactorStatusRequestChain(e);
16
- }
17
- });
18
-
19
- function doExactorStatusRequestChain(event){
20
- // First validate the form
21
- /*var form = new VarienForm('onestepcheckout-form');
22
- if(!form.validator.validate()) {
23
- Event.stop(event);
24
- }*/
25
- new Ajax.Request(exactorStatusUrl, {
26
- method: 'get',
27
- onSuccess: function (transport){
28
- if(transport.status == 200){
29
- var data = transport.responseText.evalJSON();
30
- if (data.exactor_status){
31
- alert(data.exactor_status);
32
- //window.location.href="javascript:showDialog('','" + data.exactor_status + "','error',2)";
33
- Event.stop(event);
34
- }
35
- else
36
- originalOSCHandler(event);
37
- }
38
- }
39
- });
40
- Event.stop(event);
41
- }
42
- }
43
-
44
- });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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','20160616');
27
  ExactorProcessingServiceFactory::getInstance()->setup(new MagentoExactorCallback());
28
 
29
  /* Initializing configuration object */
@@ -32,4 +32,4 @@ $config->pushFeatureConfigString('');
32
 
33
  /* Pushing parameters */
34
  $config->set(EXACTOR_CONFIG_EXEMPT_DISCOUNTS, array());
35
- //$config->set(EXACTOR_CONFIG_ALWAYS_OVERRIDE_TAX, true);
23
 
24
  /* Initializing factories */
25
  ExactorLoggingFactory::getInstance()->setup('MagentoLogger', IExactorLogger::DEBUG);
26
+ ExactorConnectionFactory::getInstance()->setup('Magento','20170607');
27
  ExactorProcessingServiceFactory::getInstance()->setup(new MagentoExactorCallback());
28
 
29
  /* Initializing configuration object */
32
 
33
  /* Pushing parameters */
34
  $config->set(EXACTOR_CONFIG_EXEMPT_DISCOUNTS, array());
35
+ $config->set(EXACTOR_CONFIG_ALWAYS_OVERRIDE_TAX, true);
package.xml CHANGED
@@ -1,7 +1,7 @@
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,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>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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Exactor_Tax</name>
4
+ <version>2017.06.07</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>2017-06-07</date>
16
+ <time>09:10:21</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="IndexController.php" hash="064275cda39bf28a23f0e30cda85d546"/></dir><dir name="etc"><file name="config.xml" hash="f19c4c35acae0b1a5ea0341909e05b5f"/></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="a7393e03f646e6b1ae098770c5c659f1"/></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"/></dir><dir name="template"><dir name="ExactorSettings"><file name="settingsform.phtml" hash="6241068fc198ad096f76e2b33fd62e0c"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZzzzzExactor.xml" hash="d5d93cb5e6608f3cf87f5a57ed1448c7"/></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="15abd1dc75e5796f51e087c5bc28355f"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>