Mage_Exactor_Tax - Version 2012.06.01

Version Notes

Supported Magento 1.5.0.0 - 1.7.x

Download this release

Release Info

Developer Exactor, Inc.
Extension Mage_Exactor_Tax
Version 2012.06.01
Comparing to
See all releases


Code changes from version 2012.05.28 to 2012.06.01

Files changed (6) hide show
  1. app/code/local/Exactor/ExactorSettings/controllers/Adminhtml/FormController.php +12 -3
  2. app/code/local/Exactor/ExactorSettings/etc/config.xml +1 -1
  3. app/code/local/Exactor/Tax/Model/Sales/Total/Quote/Tax.php +3 -2
  4. app/design/adminhtml/default/default/template/ExactorSettings/settingsform.phtml +3 -1
  5. lib/ExactorCommons/config.php +1 -1
  6. package.xml +4 -4
app/code/local/Exactor/ExactorSettings/controllers/Adminhtml/FormController.php CHANGED
@@ -47,6 +47,8 @@ class Exactor_ExactorSettings_Adminhtml_FormController extends Mage_Adminhtml_Co
47
 
48
  private $validationMessages = array();
49
 
 
 
50
  private function setupExactorCommonLibrary(){
51
  $libDir = Mage::getBaseDir("lib") . '/ExactorCommons';
52
  require_once($libDir . '/XmlProcessing.php');
@@ -83,8 +85,15 @@ class Exactor_ExactorSettings_Adminhtml_FormController extends Mage_Adminhtml_Co
83
  }
84
 
85
  private function sendRequestBack(){
86
- $storeviewId = $this->getRequest()->getParam('storeview',Mage::app()->getDefaultStoreView()->getId());
87
- $this->_redirect("*/*");
 
 
 
 
 
 
 
88
  }
89
 
90
  private function sendError($message){
@@ -123,7 +132,7 @@ class Exactor_ExactorSettings_Adminhtml_FormController extends Mage_Adminhtml_Co
123
  return $this->sendError($this->__(self::MSG_SESSION_KEY_MISMATCH));
124
  }
125
  $merchantSettings = $exactorSettingsHelper
126
- ->loadMerchantSettingsOrEmptyObject($formData['StoreViewID']);
127
  $merchantSettings->populateFromArray($formData);
128
  // Do pre-processing
129
  $this->preprocessInput($merchantSettings);
47
 
48
  private $validationMessages = array();
49
 
50
+ const PARAM_STORE_VIEW_ID = 'StoreViewID';
51
+
52
  private function setupExactorCommonLibrary(){
53
  $libDir = Mage::getBaseDir("lib") . '/ExactorCommons';
54
  require_once($libDir . '/XmlProcessing.php');
85
  }
86
 
87
  private function sendRequestBack(){
88
+ $storeviewId = $this->getRequest()->getParam('storeview',null);
89
+ $postData = $this->getRequest()->getPost(self::FORM_PARAM_CONTAINER);
90
+ if ($storeviewId == null && array_key_exists(self::PARAM_STORE_VIEW_ID, $postData)){
91
+ $storeviewId = $postData[self::PARAM_STORE_VIEW_ID];
92
+ }else{
93
+ $storeviewId = Mage::app()->getDefaultStoreView()->getId();
94
+ }
95
+ $queryParams = array('storeview' => $storeviewId);
96
+ $this->_redirect("*/*", $queryParams);
97
  }
98
 
99
  private function sendError($message){
132
  return $this->sendError($this->__(self::MSG_SESSION_KEY_MISMATCH));
133
  }
134
  $merchantSettings = $exactorSettingsHelper
135
+ ->loadMerchantSettingsOrEmptyObject($formData[self::PARAM_STORE_VIEW_ID]);
136
  $merchantSettings->populateFromArray($formData);
137
  // Do pre-processing
138
  $this->preprocessInput($merchantSettings);
app/code/local/Exactor/ExactorSettings/etc/config.xml CHANGED
@@ -28,7 +28,7 @@
28
  <config>
29
  <modules>
30
  <Exactor_ExactorSettings>
31
- <version>2012.05.28</version>
32
  </Exactor_ExactorSettings>
33
  </modules>
34
 
28
  <config>
29
  <modules>
30
  <Exactor_ExactorSettings>
31
+ <version>2012.06.01</version>
32
  </Exactor_ExactorSettings>
33
  </modules>
34
 
app/code/local/Exactor/Tax/Model/Sales/Total/Quote/Tax.php CHANGED
@@ -121,8 +121,9 @@ class Exactor_Tax_Model_Sales_Total_Quote_Tax extends Mage_Sales_Model_Quote_Add
121
 
122
  if ($merchantSettings == null){
123
  $this->applyTax(0);
124
- $this->logger->error(self::LOG_MESSAGE_TAX_CALC_FAILED . 'Missing or invalid Merchant Settings', 'collect');
125
- return;
 
126
  //return $this->processTaxCalculationFail('Missing or invalid Merchant Settings');
127
  }
128
 
121
 
122
  if ($merchantSettings == null){
123
  $this->applyTax(0);
124
+ $this->logger->info(self::LOG_MESSAGE_TAX_CALC_FAILED . 'Missing or invalid Merchant Settings. Pass request to internal Mage tax calc. system', 'collect');
125
+ $internalTaxCalculator = Mage::getSingleton("Mage_Tax_Model_Sales_Total_Quote_Tax");
126
+ return $internalTaxCalculator->collect($address);
127
  //return $this->processTaxCalculationFail('Missing or invalid Merchant Settings');
128
  }
129
 
app/design/adminhtml/default/default/template/ExactorSettings/settingsform.phtml CHANGED
@@ -32,7 +32,9 @@
32
  $pluginVersion = $this->getData('pluginVersion');
33
  $accountSettings = $this->getData('accountSettings');
34
  $websites = Mage::app()->getWebsites(true);
35
-
 
 
36
  ?>
37
  <div class="content-header">
38
  <table cellspacing="0" class="grid-header">
32
  $pluginVersion = $this->getData('pluginVersion');
33
  $accountSettings = $this->getData('accountSettings');
34
  $websites = Mage::app()->getWebsites(true);
35
+ if ($accountSettings->getID() == null){
36
+ $accountSettings->setStoreViewID($this->getStoreViewId());
37
+ }
38
  ?>
39
  <div class="content-header">
40
  <table cellspacing="0" class="grid-header">
lib/ExactorCommons/config.php CHANGED
@@ -6,6 +6,6 @@
6
  */
7
 
8
  ExactorLoggingFactory::getInstance()->setup('MagentoLogger', IExactorLogger::TRACE);
9
- ExactorConnectionFactory::getInstance()->setup('Magento','v20120528');
10
  ExactorProcessingServiceFactory::getInstance()->setup(new MagentoExactorCallback());
11
 
6
  */
7
 
8
  ExactorLoggingFactory::getInstance()->setup('MagentoLogger', IExactorLogger::TRACE);
9
+ ExactorConnectionFactory::getInstance()->setup('Magento','v20120601');
10
  ExactorProcessingServiceFactory::getInstance()->setup(new MagentoExactorCallback());
11
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Exactor_Tax</name>
4
- <version>2012.05.28</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</notes>
14
  <authors><author><name>Exactor, Inc.</name><user>exactor</user><email>support@exactor.com</email></author></authors>
15
- <date>2012-05-29</date>
16
- <time>14:11:36</time>
17
- <contents><target name="magelocal"><dir name="Exactor"><dir name="Core"><dir name="Helper"><file name="SessionCache.php" hash="4aab06767188e8ead64043654989473d"/></dir><dir name="Model"><file name="ExactorTransaction.php" hash="852aa20f6e3b7aa0001439d4bffe9724"/><file name="MerchantSettings.php" hash="b4c2acde5dfa929e89ea7ec9fe0f1b2f"/><dir name="Mysql4"><dir name="ExactorTransaction"><file name="Collection.php" hash="c7b890b4d3ab35e65a3856ae0e2fdf72"/></dir><file name="ExactorTransaction.php" hash="c91aebaae767613acf1c439a8b513c3b"/><dir name="MerchantSettings"><file name="Collection.php" hash="c1593f52e582e601409c4651c37495af"/><file name="Collection.php~" hash="d360e202eb30432ac41dc023ce13ffc0"/></dir><file name="MerchantSettings.php" hash="8f22b76bb64cdc7b1deb6f0e38889905"/></dir><dir name="Type"><file name="Onepage.php" hash="2d2aa64ed4562736e77b3cad12e8f48c"/></dir></dir><dir name="etc"><file name="config.xml" hash="853683228cba76b069de709eef9cc1af"/></dir></dir><dir name="ExactorSettings"><dir name="Block"><file name="Form.php" hash="7dcfb00922cfe305d8ae08cb20ca5e87"/></dir><dir name="Helper"><file name="Data.php" hash="9abafb58b091f8976fa289f394465415"/><file name="VersionResolver.php" hash="14dce068dfe2a7d3364c4bd29e6f8431"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FormController.php" hash="474106c737cbcfcf3a3f6ddf39dda90f"/></dir><file name="AjaxController.php" hash="c07aeeca00e1408e52945fc027569793"/><file name="IndexController.php" hash="f47cbc274dd68c57c30b60bbee69259e"/></dir><dir name="etc"><file name="config.xml" hash="a81bdbd636da58ea207eef111ce17f3a"/></dir><dir name="sql"><dir name="ExactorSettings_setup"><file name="mysql4-install-14.04.2012.php" hash="f35af1e12921b57479cb4b5677937a0c"/></dir></dir></dir><dir name="Sales"><dir name="Model"><file name="Observer.php" hash="65e826c0493adece2476ed24788ecb06"/><file name="Order.php" hash="e1b40101f4b60fc7bac20865f564ae17"/></dir><dir name="etc"><file name="config.xml" hash="46efe3b5565f4ae48c620396ee75bef7"/></dir></dir><dir name="Tax"><dir name="Helper"><file name="Calculation.php" hash="29c5252bdd48b173c90588f449114024"/><file name="Mapping.php" hash="a37a20157ce31eda4293b5d5625c122b"/></dir><dir name="Model"><file name="Observer.php" hash="30e509696ce1aa27f7b4a838bd25544a"/><dir name="Sales"><dir name="Total"><dir name="Quote"><dir name="Nominal"><file name="Tax.php" hash="156eff380df5b16db55449759f193490"/></dir><file name="Tax.php" hash="cf72ffeea12ed72126faa54d2404e1d3"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="4e5b936ded2b0dd8707c987d7ddef4ba"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="exactorsettings.xml" hash="3707eac08d2393c8796eebf1cf7a0bd9"/><file name="exactoronestepcheckout.xml" hash="9fdfa1db5e4e60b4eec8f348c10aab07"/></dir><dir name="template"><dir name="ExactorSettings"><file name="settingsform.phtml" hash="d408fb816628a1935bfe4a4ab226b9ca"/></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="Exactor.xml" hash="e8997e8e36a265141b37790caaef39d6"/></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="b78ebfdd66c36c419a312fc5c2d1b4bd"/><file name="ExactorDomainObjects.php" hash="390e7f9a18a328d8ef2b67121d1b813e"/><file name="Magento.php" hash="76da7333fe0692053a47f8564c7b513a"/><file name="XmlProcessing.php" hash="383fd21839889d720e2094e83ccc7a2a"/><file name="config.php" hash="767776abc9a242f57be6d4ac8aea3919"/></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>2012.06.01</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</notes>
14
  <authors><author><name>Exactor, Inc.</name><user>exactor</user><email>support@exactor.com</email></author></authors>
15
+ <date>2012-06-01</date>
16
+ <time>15:15:52</time>
17
+ <contents><target name="magelocal"><dir name="Exactor"><dir name="Core"><dir name="Helper"><file name="SessionCache.php" hash="4aab06767188e8ead64043654989473d"/></dir><dir name="Model"><file name="ExactorTransaction.php" hash="852aa20f6e3b7aa0001439d4bffe9724"/><file name="MerchantSettings.php" hash="b4c2acde5dfa929e89ea7ec9fe0f1b2f"/><dir name="Mysql4"><dir name="ExactorTransaction"><file name="Collection.php" hash="c7b890b4d3ab35e65a3856ae0e2fdf72"/></dir><file name="ExactorTransaction.php" hash="c91aebaae767613acf1c439a8b513c3b"/><dir name="MerchantSettings"><file name="Collection.php" hash="c1593f52e582e601409c4651c37495af"/><file name="Collection.php~" hash="d360e202eb30432ac41dc023ce13ffc0"/></dir><file name="MerchantSettings.php" hash="8f22b76bb64cdc7b1deb6f0e38889905"/></dir><dir name="Type"><file name="Onepage.php" hash="2d2aa64ed4562736e77b3cad12e8f48c"/></dir></dir><dir name="etc"><file name="config.xml" hash="853683228cba76b069de709eef9cc1af"/></dir></dir><dir name="ExactorSettings"><dir name="Block"><file name="Form.php" hash="7dcfb00922cfe305d8ae08cb20ca5e87"/></dir><dir name="Helper"><file name="Data.php" hash="9abafb58b091f8976fa289f394465415"/><file name="VersionResolver.php" hash="14dce068dfe2a7d3364c4bd29e6f8431"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FormController.php" hash="a154f13f8c4c04f838dfb79607078341"/></dir><file name="AjaxController.php" hash="c07aeeca00e1408e52945fc027569793"/><file name="IndexController.php" hash="f47cbc274dd68c57c30b60bbee69259e"/></dir><dir name="etc"><file name="config.xml" hash="12a642d265033cbdde96c651099c0ef4"/></dir><dir name="sql"><dir name="ExactorSettings_setup"><file name="mysql4-install-14.04.2012.php" hash="f35af1e12921b57479cb4b5677937a0c"/></dir></dir></dir><dir name="Sales"><dir name="Model"><file name="Observer.php" hash="65e826c0493adece2476ed24788ecb06"/><file name="Order.php" hash="e1b40101f4b60fc7bac20865f564ae17"/></dir><dir name="etc"><file name="config.xml" hash="46efe3b5565f4ae48c620396ee75bef7"/></dir></dir><dir name="Tax"><dir name="Helper"><file name="Calculation.php" hash="29c5252bdd48b173c90588f449114024"/><file name="Mapping.php" hash="a37a20157ce31eda4293b5d5625c122b"/></dir><dir name="Model"><file name="Observer.php" hash="30e509696ce1aa27f7b4a838bd25544a"/><dir name="Sales"><dir name="Total"><dir name="Quote"><dir name="Nominal"><file name="Tax.php" hash="156eff380df5b16db55449759f193490"/></dir><file name="Tax.php" hash="f3cd0fb3255e6c8b2ccb85e8509250f8"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="4e5b936ded2b0dd8707c987d7ddef4ba"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="exactorsettings.xml" hash="3707eac08d2393c8796eebf1cf7a0bd9"/><file name="exactoronestepcheckout.xml" hash="9fdfa1db5e4e60b4eec8f348c10aab07"/></dir><dir name="template"><dir name="ExactorSettings"><file name="settingsform.phtml" hash="c77a9c5461dbb37f0a8835e55f48f1d6"/></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="Exactor.xml" hash="e8997e8e36a265141b37790caaef39d6"/></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="b78ebfdd66c36c419a312fc5c2d1b4bd"/><file name="ExactorDomainObjects.php" hash="390e7f9a18a328d8ef2b67121d1b813e"/><file name="Magento.php" hash="76da7333fe0692053a47f8564c7b513a"/><file name="XmlProcessing.php" hash="383fd21839889d720e2094e83ccc7a2a"/><file name="config.php" hash="0c5b0bde55f390ac7b0820e2286604df"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>