Version Notes
Added Log table view
Configuration area for what is logged (Ping, GetTax, Filter, Validate, Queue)
New button to clear errors from log
Country code to requests, using config value at shipping/origin/country_id
Fix fatal error on bundled items
Fixed discount bug related to discount codes
Fixed error that did not allow user to proceed through checkout (fatal error with $store, fixed to $storeId)
Changed extension to use base currency total amounts rather than checkout currency total amounts
Changed dates in request
Currency code added to requests, using store base currency code
Download this release
Release Info
| Developer | Gregory Segall |
| Extension | OnePica_AvaTax |
| Version | 2.4.3.0 |
| Comparing to | |
| See all releases | |
Code changes from version 2.4.2.0 to 2.4.3.0
- app/code/community/OnePica/AvaTax/.DS_Store +0 -0
- app/code/community/OnePica/AvaTax/Block/Adminhtml/Export/Log/Grid.php +12 -6
- app/code/community/OnePica/AvaTax/Block/Adminhtml/Export/Log/View.php +72 -0
- app/code/community/OnePica/AvaTax/Block/Adminhtml/Export/Queue/Grid.php +2 -1
- app/code/community/OnePica/AvaTax/Helper/Data.php +11 -0
- app/code/community/OnePica/AvaTax/Model/.DS_Store +0 -0
- app/code/community/OnePica/AvaTax/Model/Abstract.php +12 -9
- app/code/community/OnePica/AvaTax/Model/Avatax/Abstract.php +2 -2
- app/code/community/OnePica/AvaTax/Model/Avatax/Estimate.php +4 -3
- app/code/community/OnePica/AvaTax/Model/Avatax/Invoice.php +23 -7
- app/code/community/OnePica/AvaTax/Model/Records/Log.php +20 -0
- app/code/community/OnePica/AvaTax/Model/Records/Mysql4/Queue.php +21 -15
- app/code/community/OnePica/AvaTax/Model/Records/Queue/Process.php +18 -2
- app/code/community/OnePica/AvaTax/Model/Source/Logtype.php +54 -0
- app/code/community/OnePica/AvaTax/controllers/Adminhtml/GridController.php +24 -0
- app/code/community/OnePica/AvaTax/etc/adminhtml.xml +0 -2
- app/code/community/OnePica/AvaTax/etc/config.xml +2 -1
- app/code/community/OnePica/AvaTax/etc/system.xml +12 -1
- app/code/community/OnePica/AvaTax/lib/classes/GetTaxRequest.class.php +29 -0
- app/code/community/OnePica/AvaTax/lib/classes/wsdl/Tax.wsdl +2 -0
- app/design/adminhtml/default/default/layout/avatax.xml +6 -0
- package.xml +22 -7
app/code/community/OnePica/AvaTax/.DS_Store
ADDED
|
Binary file
|
app/code/community/OnePica/AvaTax/Block/Adminhtml/Export/Log/Grid.php
CHANGED
|
@@ -41,12 +41,12 @@ class OnePica_AvaTax_Block_Adminhtml_Export_Log_Grid extends OnePica_AvaTax_Bloc
|
|
| 41 |
return $this->_addColumnsForExport(array(
|
| 42 |
'log_id' => 'number',
|
| 43 |
'store_id' => 'number',
|
| 44 |
-
'level' => '
|
| 45 |
-
'type' => '
|
| 46 |
-
'request' => 'text',
|
| 47 |
-
'result' => 'text',
|
| 48 |
-
'additional' => 'text',
|
| 49 |
-
'created_at' => 'datetime'
|
| 50 |
));
|
| 51 |
return $this;
|
| 52 |
}
|
|
@@ -62,4 +62,10 @@ class OnePica_AvaTax_Block_Adminhtml_Export_Log_Grid extends OnePica_AvaTax_Bloc
|
|
| 62 |
return parent::_prepareCollection();
|
| 63 |
}
|
| 64 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
}
|
| 41 |
return $this->_addColumnsForExport(array(
|
| 42 |
'log_id' => 'number',
|
| 43 |
'store_id' => 'number',
|
| 44 |
+
'level' => Mage::getModel('avatax_records/log')->getLevelOptions(),
|
| 45 |
+
'type' => Mage::getModel('avatax_records/log')->getTypeOptions(),
|
| 46 |
+
// 'request' => 'text',
|
| 47 |
+
// 'result' => 'text',
|
| 48 |
+
// 'additional' => 'text',
|
| 49 |
+
'created_at' => 'datetime',
|
| 50 |
));
|
| 51 |
return $this;
|
| 52 |
}
|
| 62 |
return parent::_prepareCollection();
|
| 63 |
}
|
| 64 |
|
| 65 |
+
public function getRowUrl($row)
|
| 66 |
+
{
|
| 67 |
+
return $this->getUrl('*/*/logView', array('id' => $row->getId()));
|
| 68 |
+
}
|
| 69 |
+
|
| 70 |
+
|
| 71 |
}
|
app/code/community/OnePica/AvaTax/Block/Adminhtml/Export/Log/View.php
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* OnePica_AvaTax
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Open Software License (OSL 3.0), a
|
| 8 |
+
* copy of which is available through the world-wide-web at this URL:
|
| 9 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 10 |
+
*
|
| 11 |
+
* @category OnePica
|
| 12 |
+
* @package OnePica_AvaTax
|
| 13 |
+
* @author OnePica Codemaster <codemaster@onepica.com>
|
| 14 |
+
* @copyright Copyright (c) 2009 One Pica, Inc.
|
| 15 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 16 |
+
*/
|
| 17 |
+
|
| 18 |
+
class OnePica_AvaTax_Block_Adminhtml_Export_Log_View extends Mage_Adminhtml_Block_Widget_Container
|
| 19 |
+
{
|
| 20 |
+
/**
|
| 21 |
+
* Store curent event
|
| 22 |
+
*
|
| 23 |
+
* @var OnePical_Avatax_Model_Event
|
| 24 |
+
*/
|
| 25 |
+
protected $_currentEevent = null;
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Add back button
|
| 29 |
+
*
|
| 30 |
+
*/
|
| 31 |
+
public function __construct()
|
| 32 |
+
{
|
| 33 |
+
parent::__construct();
|
| 34 |
+
|
| 35 |
+
$this->_addButton('back', array(
|
| 36 |
+
'label' => Mage::helper('avatax')->__('Back'),
|
| 37 |
+
'onclick' => "setLocation('" . Mage::getSingleton('adminhtml/url')->getUrl('*/*/log'). "')",
|
| 38 |
+
'class' => 'back'
|
| 39 |
+
));
|
| 40 |
+
}
|
| 41 |
+
|
| 42 |
+
/**
|
| 43 |
+
* Header text getter
|
| 44 |
+
*
|
| 45 |
+
* @return string
|
| 46 |
+
*/
|
| 47 |
+
public function getHeaderText()
|
| 48 |
+
{
|
| 49 |
+
if ($this->getCurrentEvent()) {
|
| 50 |
+
return '<h3 class="icon-head" style="background-image:url(' . $this->getSkinUrl('images/fam_application_view_tile.gif') . ');">' .
|
| 51 |
+
$this->__('AvaTax Action Log Entry #%d', $this->getCurrentEvent()->getId()) .
|
| 52 |
+
'</h3>';
|
| 53 |
+
}
|
| 54 |
+
return '<h3 class="icon-head" style="background-image:url(' . $this->getSkinUrl('images/fam_application_view_tile.gif') . ');">' .
|
| 55 |
+
$this->__('AvaTax Action Log Entry Details') .
|
| 56 |
+
'</h3>';
|
| 57 |
+
}
|
| 58 |
+
|
| 59 |
+
/**
|
| 60 |
+
* Get current event
|
| 61 |
+
*
|
| 62 |
+
* @return OnePica_AvaTax_Model_Event|null
|
| 63 |
+
*/
|
| 64 |
+
public function getCurrentEvent()
|
| 65 |
+
{
|
| 66 |
+
if (null === $this->_currentEevent) {
|
| 67 |
+
$this->_currentEevent = Mage::registry('current_event');
|
| 68 |
+
}
|
| 69 |
+
return $this->_currentEevent;
|
| 70 |
+
}
|
| 71 |
+
|
| 72 |
+
}
|
app/code/community/OnePica/AvaTax/Block/Adminhtml/Export/Queue/Grid.php
CHANGED
|
@@ -38,7 +38,8 @@ class OnePica_AvaTax_Block_Adminhtml_Export_Queue_Grid extends OnePica_AvaTax_Bl
|
|
| 38 |
*/
|
| 39 |
public function getMainButtonsHtml()
|
| 40 |
{
|
| 41 |
-
|
|
|
|
| 42 |
$html .= parent::getMainButtonsHtml();
|
| 43 |
return $html;
|
| 44 |
}
|
| 38 |
*/
|
| 39 |
public function getMainButtonsHtml()
|
| 40 |
{
|
| 41 |
+
$html = $this->getButtonHtml($this->__('Clear Queue Now'), 'setLocation(\'' . $this->getUrl('*/*/clearQueue') . '\')');
|
| 42 |
+
$html .= $this->getButtonHtml($this->__('Process Queue Now'), 'setLocation(\'' . $this->getUrl('*/*/processQueue') . '\')');
|
| 43 |
$html .= parent::getMainButtonsHtml();
|
| 44 |
return $html;
|
| 45 |
}
|
app/code/community/OnePica/AvaTax/Helper/Data.php
CHANGED
|
@@ -112,6 +112,17 @@ class OnePica_AvaTax_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 112 |
{
|
| 113 |
return $this->_getConfig('log_status', $store);
|
| 114 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 115 |
|
| 116 |
/**
|
| 117 |
* Returns shipping line item faked sku
|
| 112 |
{
|
| 113 |
return $this->_getConfig('log_status', $store);
|
| 114 |
}
|
| 115 |
+
|
| 116 |
+
/**
|
| 117 |
+
* Returns the logging type
|
| 118 |
+
*
|
| 119 |
+
* @return string
|
| 120 |
+
*/
|
| 121 |
+
public function getLogType($store=null)
|
| 122 |
+
{
|
| 123 |
+
return explode(",", $this->_getConfig('log_type_list', $store));
|
| 124 |
+
}
|
| 125 |
+
|
| 126 |
|
| 127 |
/**
|
| 128 |
* Returns shipping line item faked sku
|
app/code/community/OnePica/AvaTax/Model/.DS_Store
ADDED
|
Binary file
|
app/code/community/OnePica/AvaTax/Model/Abstract.php
CHANGED
|
@@ -62,15 +62,18 @@ abstract class OnePica_AvaTax_Model_Abstract extends Varien_Object
|
|
| 62 |
$resultType = str_replace('Result', '', get_class($result));
|
| 63 |
$type = $requestType ? $requestType : $resultType;
|
| 64 |
if($type == 'Varien_Object') $type = 'Unknown';
|
| 65 |
-
|
| 66 |
-
Mage::
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
|
|
|
|
|
|
|
|
|
| 74 |
}
|
| 75 |
|
| 76 |
/**
|
| 62 |
$resultType = str_replace('Result', '', get_class($result));
|
| 63 |
$type = $requestType ? $requestType : $resultType;
|
| 64 |
if($type == 'Varien_Object') $type = 'Unknown';
|
| 65 |
+
|
| 66 |
+
if (in_array($resultType, Mage::helper('avatax')->getLogType($storeId)))
|
| 67 |
+
{
|
| 68 |
+
Mage::getModel('avatax_records/log')
|
| 69 |
+
->setStoreId($storeId)
|
| 70 |
+
->setLevel($result->getResultCode())
|
| 71 |
+
->setType($type)
|
| 72 |
+
->setRequest(print_r($request, true))
|
| 73 |
+
->setResult(print_r($result, true))
|
| 74 |
+
->setAdditional($additional)
|
| 75 |
+
->save();
|
| 76 |
+
}
|
| 77 |
}
|
| 78 |
|
| 79 |
/**
|
app/code/community/OnePica/AvaTax/Model/Avatax/Abstract.php
CHANGED
|
@@ -91,7 +91,7 @@ abstract class OnePica_AvaTax_Model_Avatax_Abstract extends OnePica_AvaTax_Model
|
|
| 91 |
$this->_request->setDiscount(0.00); //cannot be used in Magento
|
| 92 |
$this->_request->setSalespersonCode(Mage::helper('avatax')->getSalesPersonCode($storeId));
|
| 93 |
$this->_request->setLocationCode(Mage::helper('avatax')->getLocationCode($storeId));
|
| 94 |
-
$this->_request->setCountry(Mage::getStoreConfig('shipping/origin/country_id', $
|
| 95 |
$this->_request->setCurrencyCode(Mage::app()->getStore()->getBaseCurrencyCode());
|
| 96 |
$this->_addCustomer($object);
|
| 97 |
if($object instanceof Mage_Sales_Model_Order && $object->getIncrementId()) {
|
|
@@ -233,4 +233,4 @@ abstract class OnePica_AvaTax_Model_Avatax_Abstract extends OnePica_AvaTax_Model
|
|
| 233 |
}
|
| 234 |
return $this;
|
| 235 |
}
|
| 236 |
-
}
|
| 91 |
$this->_request->setDiscount(0.00); //cannot be used in Magento
|
| 92 |
$this->_request->setSalespersonCode(Mage::helper('avatax')->getSalesPersonCode($storeId));
|
| 93 |
$this->_request->setLocationCode(Mage::helper('avatax')->getLocationCode($storeId));
|
| 94 |
+
$this->_request->setCountry(Mage::getStoreConfig('shipping/origin/country_id', $storeId));
|
| 95 |
$this->_request->setCurrencyCode(Mage::app()->getStore()->getBaseCurrencyCode());
|
| 96 |
$this->_addCustomer($object);
|
| 97 |
if($object instanceof Mage_Sales_Model_Order && $object->getIncrementId()) {
|
| 233 |
}
|
| 234 |
return $this;
|
| 235 |
}
|
| 236 |
+
}
|
app/code/community/OnePica/AvaTax/Model/Avatax/Estimate.php
CHANGED
|
@@ -101,8 +101,9 @@ class OnePica_AvaTax_Model_Avatax_Estimate extends OnePica_AvaTax_Model_Avatax_A
|
|
| 101 |
if ($this->isProductCalculated($item)) {
|
| 102 |
$tax = 0;
|
| 103 |
foreach ($item->getChildren() as $child) {
|
|
|
|
| 104 |
$tax += $this->getItemTax($child);
|
| 105 |
-
}
|
| 106 |
return $tax;
|
| 107 |
} else {
|
| 108 |
$key = $this->_getRates($item);
|
|
@@ -174,7 +175,7 @@ class OnePica_AvaTax_Model_Avatax_Estimate extends OnePica_AvaTax_Model_Avatax_A
|
|
| 174 |
$makeRequest &= count($this->_lineToLineId) ? true : false;
|
| 175 |
$makeRequest &= $this->_request->getDestinationAddress() == '' ? false : true;
|
| 176 |
$makeRequest &= $address->getId() ? true : false;
|
| 177 |
-
|
| 178 |
//make request if needed and save results in cache
|
| 179 |
if ($makeRequest) {
|
| 180 |
$result = $this->_send($address->getStoreId());
|
|
@@ -421,4 +422,4 @@ class OnePica_AvaTax_Model_Avatax_Estimate extends OnePica_AvaTax_Model_Avatax_A
|
|
| 421 |
return $lineNumber;
|
| 422 |
}
|
| 423 |
|
| 424 |
-
}
|
| 101 |
if ($this->isProductCalculated($item)) {
|
| 102 |
$tax = 0;
|
| 103 |
foreach ($item->getChildren() as $child) {
|
| 104 |
+
$child->setAddress($item->getAddress());
|
| 105 |
$tax += $this->getItemTax($child);
|
| 106 |
+
}
|
| 107 |
return $tax;
|
| 108 |
} else {
|
| 109 |
$key = $this->_getRates($item);
|
| 175 |
$makeRequest &= count($this->_lineToLineId) ? true : false;
|
| 176 |
$makeRequest &= $this->_request->getDestinationAddress() == '' ? false : true;
|
| 177 |
$makeRequest &= $address->getId() ? true : false;
|
| 178 |
+
|
| 179 |
//make request if needed and save results in cache
|
| 180 |
if ($makeRequest) {
|
| 181 |
$result = $this->_send($address->getStoreId());
|
| 422 |
return $lineNumber;
|
| 423 |
}
|
| 424 |
|
| 425 |
+
}
|
app/code/community/OnePica/AvaTax/Model/Avatax/Invoice.php
CHANGED
|
@@ -40,9 +40,12 @@ class OnePica_AvaTax_Model_Avatax_Invoice extends OnePica_AvaTax_Model_Avatax_Ab
|
|
| 40 |
* @param Mage_Sales_Model_Order_Invoice $invoice
|
| 41 |
* @return array
|
| 42 |
*/
|
| 43 |
-
public function invoice($invoice) {
|
| 44 |
$order = $invoice->getOrder();
|
| 45 |
-
|
|
|
|
|
|
|
|
|
|
| 46 |
$shippingAddress = ($order->getShippingAddress()) ? $order->getShippingAddress() : $order->getBillingAddress();
|
| 47 |
if(!$shippingAddress) {
|
| 48 |
throw new Exception($this->__('There is no address attached to this order'));
|
|
@@ -61,7 +64,11 @@ class OnePica_AvaTax_Model_Avatax_Invoice extends OnePica_AvaTax_Model_Avatax_Ab
|
|
| 61 |
|
| 62 |
$this->_setOriginAddress($order->getStoreId());
|
| 63 |
$this->_setDestinationAddress($shippingAddress);
|
| 64 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
|
| 66 |
$configAction = Mage::getStoreConfig('tax/avatax/action', $order->getStoreId());
|
| 67 |
$commitAction = OnePica_AvaTax_Model_Config::ACTION_CALC_SUBMIT_COMMIT;
|
|
@@ -100,8 +107,11 @@ class OnePica_AvaTax_Model_Avatax_Invoice extends OnePica_AvaTax_Model_Avatax_Ab
|
|
| 100 |
* @see OnePica_AvaTax_Model_Observer::salesOrderPlaceAfter()
|
| 101 |
* @param Mage_Sales_Model_Order_Creditmemo $creditmemo
|
| 102 |
*/
|
| 103 |
-
public function creditmemo($creditmemo) {
|
| 104 |
$order = $creditmemo->getOrder();
|
|
|
|
|
|
|
|
|
|
| 105 |
|
| 106 |
$shippingAddress = ($order->getShippingAddress()) ? $order->getShippingAddress() : $order->getBillingAddress();
|
| 107 |
if(!$shippingAddress) {
|
|
@@ -124,12 +134,18 @@ class OnePica_AvaTax_Model_Avatax_Invoice extends OnePica_AvaTax_Model_Avatax_Ab
|
|
| 124 |
$this->_setDestinationAddress($shippingAddress);
|
| 125 |
|
| 126 |
// Set the tax date for calculation.
|
| 127 |
-
|
| 128 |
$override = new TaxOverride();
|
| 129 |
-
|
|
|
|
| 130 |
$override->setTaxOverrideType(TaxOverrideType::$TaxDate);
|
| 131 |
$override->setReason('Credit memo - refund');
|
| 132 |
$this->_request->setTaxOverride($override);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 133 |
|
| 134 |
$configAction = Mage::getStoreConfig('tax/avatax/action', $order->getStoreId());
|
| 135 |
$commitAction = OnePica_AvaTax_Model_Config::ACTION_CALC_SUBMIT_COMMIT;
|
|
@@ -419,4 +435,4 @@ class OnePica_AvaTax_Model_Avatax_Invoice extends OnePica_AvaTax_Model_Avatax_Ab
|
|
| 419 |
$this->_lines[] = $line;
|
| 420 |
}
|
| 421 |
|
| 422 |
-
}
|
| 40 |
* @param Mage_Sales_Model_Order_Invoice $invoice
|
| 41 |
* @return array
|
| 42 |
*/
|
| 43 |
+
public function invoice($invoice, $queue) {
|
| 44 |
$order = $invoice->getOrder();
|
| 45 |
+
$invoiceDate = $order->getInvoiceCollection()->getFirstItem()->getCreatedAt();
|
| 46 |
+
$orderDate = $order->getCreatedAt();
|
| 47 |
+
$statusDate = $queue->getUpdatedAt();
|
| 48 |
+
|
| 49 |
$shippingAddress = ($order->getShippingAddress()) ? $order->getShippingAddress() : $order->getBillingAddress();
|
| 50 |
if(!$shippingAddress) {
|
| 51 |
throw new Exception($this->__('There is no address attached to this order'));
|
| 64 |
|
| 65 |
$this->_setOriginAddress($order->getStoreId());
|
| 66 |
$this->_setDestinationAddress($shippingAddress);
|
| 67 |
+
//$this->_request->setPaymentDate(date('Y-m-d'));
|
| 68 |
+
$this->_request->setDocDate(substr($invoiceDate, 0, 10));
|
| 69 |
+
$this->_request->setPaymentDate(substr($invoiceDate, 0, 10));
|
| 70 |
+
$this->_request->setTaxDate(substr($orderDate, 0, 10));
|
| 71 |
+
$this->_request->setStatusDate(substr($statusDate, 0, 10));
|
| 72 |
|
| 73 |
$configAction = Mage::getStoreConfig('tax/avatax/action', $order->getStoreId());
|
| 74 |
$commitAction = OnePica_AvaTax_Model_Config::ACTION_CALC_SUBMIT_COMMIT;
|
| 107 |
* @see OnePica_AvaTax_Model_Observer::salesOrderPlaceAfter()
|
| 108 |
* @param Mage_Sales_Model_Order_Creditmemo $creditmemo
|
| 109 |
*/
|
| 110 |
+
public function creditmemo($creditmemo, $queue) {
|
| 111 |
$order = $creditmemo->getOrder();
|
| 112 |
+
$orderDate = $order->getCreatedAt();
|
| 113 |
+
$statusDate = $queue->getUpdatedAt();
|
| 114 |
+
$creditmemoDate = $order->getCreditmemosCollection()->getFirstItem()->getCreatedAt();
|
| 115 |
|
| 116 |
$shippingAddress = ($order->getShippingAddress()) ? $order->getShippingAddress() : $order->getBillingAddress();
|
| 117 |
if(!$shippingAddress) {
|
| 134 |
$this->_setDestinationAddress($shippingAddress);
|
| 135 |
|
| 136 |
// Set the tax date for calculation.
|
| 137 |
+
//$invoiceDate = $order->getInvoiceCollection()->getFirstItem()->getCreatedAt();
|
| 138 |
$override = new TaxOverride();
|
| 139 |
+
//$override->setTaxDate(substr($invoiceDate, 0, 10));
|
| 140 |
+
$override->setTaxDate(substr($orderDate, 0, 10));
|
| 141 |
$override->setTaxOverrideType(TaxOverrideType::$TaxDate);
|
| 142 |
$override->setReason('Credit memo - refund');
|
| 143 |
$this->_request->setTaxOverride($override);
|
| 144 |
+
|
| 145 |
+
$this->_request->setDocDate(substr($creditmemoDate, 0, 10));
|
| 146 |
+
$this->_request->setPaymentDate(substr($creditmemoDate, 0, 10));
|
| 147 |
+
$this->_request->setTaxDate(substr($orderDate, 0, 10));
|
| 148 |
+
$this->_request->setStatusDate(substr($statusDate, 0, 10));
|
| 149 |
|
| 150 |
$configAction = Mage::getStoreConfig('tax/avatax/action', $order->getStoreId());
|
| 151 |
$commitAction = OnePica_AvaTax_Model_Config::ACTION_CALC_SUBMIT_COMMIT;
|
| 435 |
$this->_lines[] = $line;
|
| 436 |
}
|
| 437 |
|
| 438 |
+
}
|
app/code/community/OnePica/AvaTax/Model/Records/Log.php
CHANGED
|
@@ -18,6 +18,10 @@
|
|
| 18 |
|
| 19 |
class OnePica_AvaTax_Model_Records_Log extends Mage_Core_Model_Abstract
|
| 20 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
| 21 |
public function _construct()
|
| 22 |
{
|
| 23 |
parent::_construct();
|
|
@@ -32,4 +36,20 @@ class OnePica_AvaTax_Model_Records_Log extends Mage_Core_Model_Abstract
|
|
| 32 |
return $this;
|
| 33 |
}
|
| 34 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 35 |
}
|
| 18 |
|
| 19 |
class OnePica_AvaTax_Model_Records_Log extends Mage_Core_Model_Abstract
|
| 20 |
{
|
| 21 |
+
|
| 22 |
+
const LOG_LEVEL_SUCCESS = 'Success';
|
| 23 |
+
const LOG_LEVEL_ERROR = 'Error';
|
| 24 |
+
|
| 25 |
public function _construct()
|
| 26 |
{
|
| 27 |
parent::_construct();
|
| 36 |
return $this;
|
| 37 |
}
|
| 38 |
|
| 39 |
+
public function getTypeOptions() {
|
| 40 |
+
$storeId = Mage::app()->getStore()->getId();
|
| 41 |
+
$types = Mage::helper('avatax')->getLogType($storeId);
|
| 42 |
+
foreach ($types as $key => $value)
|
| 43 |
+
{
|
| 44 |
+
$result[$value] = $value;
|
| 45 |
+
}
|
| 46 |
+
return $result;
|
| 47 |
+
}
|
| 48 |
+
|
| 49 |
+
public function getLevelOptions() {
|
| 50 |
+
return array(
|
| 51 |
+
self::LOG_LEVEL_SUCCESS => self::LOG_LEVEL_SUCCESS,
|
| 52 |
+
self::LOG_LEVEL_ERROR => self::LOG_LEVEL_ERROR
|
| 53 |
+
);
|
| 54 |
+
}
|
| 55 |
}
|
app/code/community/OnePica/AvaTax/Model/Records/Mysql4/Queue.php
CHANGED
|
@@ -45,13 +45,16 @@ class OnePica_AvaTax_Model_Records_Mysql4_Queue extends Mage_Core_Model_Mysql4_A
|
|
| 45 |
protected function _afterSave(Mage_Core_Model_Abstract $object) {
|
| 46 |
$logStatus = Mage::getStoreConfig('tax/avatax/log_status', $object->getStoreId());
|
| 47 |
if($logStatus) {
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
|
| 52 |
-
|
| 53 |
-
|
| 54 |
-
|
|
|
|
|
|
|
|
|
|
| 55 |
}
|
| 56 |
return $this;
|
| 57 |
}
|
|
@@ -65,14 +68,17 @@ class OnePica_AvaTax_Model_Records_Mysql4_Queue extends Mage_Core_Model_Mysql4_A
|
|
| 65 |
protected function _afterDelete(Mage_Core_Model_Abstract $object) {
|
| 66 |
$logStatus = Mage::getStoreConfig('tax/avatax/log_status', $object->getStoreId());
|
| 67 |
if($logStatus) {
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
|
|
|
|
|
|
|
|
|
| 76 |
return $this;
|
| 77 |
}
|
| 78 |
|
| 45 |
protected function _afterSave(Mage_Core_Model_Abstract $object) {
|
| 46 |
$logStatus = Mage::getStoreConfig('tax/avatax/log_status', $object->getStoreId());
|
| 47 |
if($logStatus) {
|
| 48 |
+
if (in_array('Queue', Mage::helper('avatax')->getLogType($storeId)))
|
| 49 |
+
{
|
| 50 |
+
Mage::getModel('avatax_records/log')
|
| 51 |
+
->setStoreId($object->getStoreId())
|
| 52 |
+
->setLevel('Success')
|
| 53 |
+
->setType('Queue')
|
| 54 |
+
->setRequest(print_r($object->getData(), true))
|
| 55 |
+
->setResult('Saved')
|
| 56 |
+
->save();
|
| 57 |
+
}
|
| 58 |
}
|
| 59 |
return $this;
|
| 60 |
}
|
| 68 |
protected function _afterDelete(Mage_Core_Model_Abstract $object) {
|
| 69 |
$logStatus = Mage::getStoreConfig('tax/avatax/log_status', $object->getStoreId());
|
| 70 |
if($logStatus) {
|
| 71 |
+
if (in_array('Queue', Mage::helper('avatax')->getLogType($storeId)))
|
| 72 |
+
{
|
| 73 |
+
Mage::getModel('avatax_records/log')
|
| 74 |
+
->setStoreId($object->getStoreId())
|
| 75 |
+
->setLevel('Success')
|
| 76 |
+
->setType('Queue')
|
| 77 |
+
->setRequest(print_r($object->getData(), true))
|
| 78 |
+
->setResult('Deleted')
|
| 79 |
+
->save();
|
| 80 |
+
}
|
| 81 |
+
}
|
| 82 |
return $this;
|
| 83 |
}
|
| 84 |
|
app/code/community/OnePica/AvaTax/Model/Records/Queue/Process.php
CHANGED
|
@@ -17,6 +17,22 @@
|
|
| 17 |
|
| 18 |
class OnePica_AvaTax_Model_Records_Queue_Process extends OnePica_AvaTax_Model_Abstract
|
| 19 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 20 |
/**
|
| 21 |
* Run the complete process
|
| 22 |
*
|
|
@@ -83,7 +99,7 @@ class OnePica_AvaTax_Model_Records_Queue_Process extends OnePica_AvaTax_Model_Ab
|
|
| 83 |
$item->setAttempt($item->getAttempt() + 1);
|
| 84 |
try {
|
| 85 |
$invoice = Mage::getModel('sales/order_invoice')->load($item->getEntityId());
|
| 86 |
-
if($invoice->getId()) Mage::getModel('avatax/avatax_invoice')->invoice($invoice);
|
| 87 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_COMPLETE)->setMessage(null)->save();
|
| 88 |
} catch (OnePica_AvaTax_Model_Avatax_Exception_Unbalanced $e) {
|
| 89 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_UNBALANCED)->setMessage($e->getMessage())->save();
|
|
@@ -111,7 +127,7 @@ class OnePica_AvaTax_Model_Records_Queue_Process extends OnePica_AvaTax_Model_Ab
|
|
| 111 |
$item->setAttempt($item->getAttempt() + 1);
|
| 112 |
try {
|
| 113 |
$creditmemo = Mage::getModel('sales/order_creditmemo')->load($item->getEntityId());
|
| 114 |
-
if($creditmemo->getId()) Mage::getModel('avatax/avatax_invoice')->creditmemo($creditmemo);
|
| 115 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_COMPLETE)->setMessage(null)->save();
|
| 116 |
} catch (OnePica_AvaTax_Model_Avatax_Exception_Unbalanced $e) {
|
| 117 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_UNBALANCED)->setMessage($e->getMessage())->save();
|
| 17 |
|
| 18 |
class OnePica_AvaTax_Model_Records_Queue_Process extends OnePica_AvaTax_Model_Abstract
|
| 19 |
{
|
| 20 |
+
/**
|
| 21 |
+
* Remove the Failed process
|
| 22 |
+
*
|
| 23 |
+
* @return self
|
| 24 |
+
*/
|
| 25 |
+
public function clear() {
|
| 26 |
+
$queue = Mage::getModel('avatax_records/queue')->getCollection()
|
| 27 |
+
->addFieldToFilter('status', OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_FAILED);
|
| 28 |
+
|
| 29 |
+
foreach($queue as $item) {
|
| 30 |
+
$item->delete();
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
+
return $this;
|
| 34 |
+
}
|
| 35 |
+
|
| 36 |
/**
|
| 37 |
* Run the complete process
|
| 38 |
*
|
| 99 |
$item->setAttempt($item->getAttempt() + 1);
|
| 100 |
try {
|
| 101 |
$invoice = Mage::getModel('sales/order_invoice')->load($item->getEntityId());
|
| 102 |
+
if($invoice->getId()) Mage::getModel('avatax/avatax_invoice')->invoice($invoice, $item);
|
| 103 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_COMPLETE)->setMessage(null)->save();
|
| 104 |
} catch (OnePica_AvaTax_Model_Avatax_Exception_Unbalanced $e) {
|
| 105 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_UNBALANCED)->setMessage($e->getMessage())->save();
|
| 127 |
$item->setAttempt($item->getAttempt() + 1);
|
| 128 |
try {
|
| 129 |
$creditmemo = Mage::getModel('sales/order_creditmemo')->load($item->getEntityId());
|
| 130 |
+
if($creditmemo->getId()) Mage::getModel('avatax/avatax_invoice')->creditmemo($creditmemo, $item);
|
| 131 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_COMPLETE)->setMessage(null)->save();
|
| 132 |
} catch (OnePica_AvaTax_Model_Avatax_Exception_Unbalanced $e) {
|
| 133 |
$item->setStatus(OnePica_AvaTax_Model_Records_Queue::QUEUE_STATUS_UNBALANCED)->setMessage($e->getMessage())->save();
|
app/code/community/OnePica/AvaTax/Model/Source/Logtype.php
ADDED
|
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* OnePica_AvaTax
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Open Software License (OSL 3.0), a
|
| 8 |
+
* copy of which is available through the world-wide-web at this URL:
|
| 9 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 10 |
+
*
|
| 11 |
+
* @category OnePica
|
| 12 |
+
* @package OnePica_AvaTax
|
| 13 |
+
* @author OnePica Codemaster <codemaster@onepica.com>
|
| 14 |
+
* @copyright Copyright (c) 2009 One Pica, Inc.
|
| 15 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 16 |
+
*/
|
| 17 |
+
|
| 18 |
+
|
| 19 |
+
class OnePica_AvaTax_Model_Source_Logtype
|
| 20 |
+
{
|
| 21 |
+
const PING = 'Ping';
|
| 22 |
+
const GET_TAX = 'GetTax';
|
| 23 |
+
const FILTER = 'Filter';
|
| 24 |
+
const VALIDATE = 'Validate';
|
| 25 |
+
const QUEUE = 'Queue';
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Gets the list of type for the admin config dropdown
|
| 29 |
+
*
|
| 30 |
+
* @return array
|
| 31 |
+
*/
|
| 32 |
+
public function toOptionArray()
|
| 33 |
+
{
|
| 34 |
+
return array(
|
| 35 |
+
array(
|
| 36 |
+
'value' => self::PING,
|
| 37 |
+
'label' => Mage::helper('avatax')->__('Ping')),
|
| 38 |
+
array(
|
| 39 |
+
'value' => self::GET_TAX,
|
| 40 |
+
'label' => Mage::helper('avatax')->__('Get Tax')),
|
| 41 |
+
array(
|
| 42 |
+
'value' => self::FILTER,
|
| 43 |
+
'label' => Mage::helper('avatax')->__('Filter')),
|
| 44 |
+
array(
|
| 45 |
+
'value' => self::VALIDATE,
|
| 46 |
+
'label' => Mage::helper('avatax')->__('Validate')),
|
| 47 |
+
array(
|
| 48 |
+
'value' => self::QUEUE,
|
| 49 |
+
'label' => Mage::helper('avatax')->__('Queue'))
|
| 50 |
+
|
| 51 |
+
|
| 52 |
+
);
|
| 53 |
+
}
|
| 54 |
+
}
|
app/code/community/OnePica/AvaTax/controllers/Adminhtml/GridController.php
CHANGED
|
@@ -25,6 +25,12 @@ class OnePica_AvaTax_Adminhtml_GridController extends Mage_Adminhtml_Controller_
|
|
| 25 |
protected function _construct() {
|
| 26 |
$this->setUsedModuleName('OnePica_AvaTax');
|
| 27 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 28 |
|
| 29 |
public function logAction() {
|
| 30 |
$this->_setTitle($this->__('Sales'))->_setTitle($this->__('Tax'))->_setTitle($this->__('AvaTax Log'));
|
|
@@ -34,6 +40,24 @@ class OnePica_AvaTax_Adminhtml_GridController extends Mage_Adminhtml_Controller_
|
|
| 34 |
->_addContent($this->getLayout()->createBlock('avatax/adminhtml_export_log_grid'))
|
| 35 |
->renderLayout();
|
| 36 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
|
| 38 |
public function queueAction() {
|
| 39 |
$this->_setTitle($this->__('Sales'))->_setTitle($this->__('Tax'))->_setTitle($this->__('AvaTax Queue'));
|
| 25 |
protected function _construct() {
|
| 26 |
$this->setUsedModuleName('OnePica_AvaTax');
|
| 27 |
}
|
| 28 |
+
|
| 29 |
+
public function clearQueueAction() {
|
| 30 |
+
Mage::getModel('avatax_records/queue_process')->clear();
|
| 31 |
+
$this->_redirect('*/*/queue');
|
| 32 |
+
}
|
| 33 |
+
|
| 34 |
|
| 35 |
public function logAction() {
|
| 36 |
$this->_setTitle($this->__('Sales'))->_setTitle($this->__('Tax'))->_setTitle($this->__('AvaTax Log'));
|
| 40 |
->_addContent($this->getLayout()->createBlock('avatax/adminhtml_export_log_grid'))
|
| 41 |
->renderLayout();
|
| 42 |
}
|
| 43 |
+
|
| 44 |
+
public function logViewAction() {
|
| 45 |
+
$this->_setTitle($this->__('Sales'))->_setTitle($this->__('Tax'))->_setTitle($this->__('AvaTax Log'));
|
| 46 |
+
|
| 47 |
+
$logId = $this->getRequest()->getParam('id');
|
| 48 |
+
$model = Mage::getModel('avatax/records_log')->load($logId);
|
| 49 |
+
|
| 50 |
+
if (!$model->getId()) {
|
| 51 |
+
$this->_redirect('*/*/');
|
| 52 |
+
return;
|
| 53 |
+
}
|
| 54 |
+
|
| 55 |
+
Mage::register('current_event', $model);
|
| 56 |
+
|
| 57 |
+
$this->loadLayout()
|
| 58 |
+
->_setActiveMenu('sales/tax/avatax_log')
|
| 59 |
+
->renderLayout();
|
| 60 |
+
}
|
| 61 |
|
| 62 |
public function queueAction() {
|
| 63 |
$this->_setTitle($this->__('Sales'))->_setTitle($this->__('Tax'))->_setTitle($this->__('AvaTax Queue'));
|
app/code/community/OnePica/AvaTax/etc/adminhtml.xml
CHANGED
|
@@ -45,12 +45,10 @@
|
|
| 45 |
<title>AvaTax Order Sync Queue</title>
|
| 46 |
<action>avatax/adminhtml_grid/queue</action>
|
| 47 |
</avatax_queue>
|
| 48 |
-
<!--
|
| 49 |
<avatax_log translate="title" module="avatax">
|
| 50 |
<title>AvaTax Log</title>
|
| 51 |
<action>avatax/adminhtml_grid/log</action>
|
| 52 |
</avatax_log>
|
| 53 |
-
-->
|
| 54 |
</children>
|
| 55 |
</tax>
|
| 56 |
</children>
|
| 45 |
<title>AvaTax Order Sync Queue</title>
|
| 46 |
<action>avatax/adminhtml_grid/queue</action>
|
| 47 |
</avatax_queue>
|
|
|
|
| 48 |
<avatax_log translate="title" module="avatax">
|
| 49 |
<title>AvaTax Log</title>
|
| 50 |
<action>avatax/adminhtml_grid/log</action>
|
| 51 |
</avatax_log>
|
|
|
|
| 52 |
</children>
|
| 53 |
</tax>
|
| 54 |
</children>
|
app/code/community/OnePica/AvaTax/etc/config.xml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
<config>
|
| 21 |
<modules>
|
| 22 |
<OnePica_AvaTax>
|
| 23 |
-
<version>2.4.
|
| 24 |
</OnePica_AvaTax>
|
| 25 |
</modules>
|
| 26 |
<global>
|
|
@@ -246,6 +246,7 @@
|
|
| 246 |
<log_lifetime>3</log_lifetime>
|
| 247 |
<queue_success_lifetime>7</queue_success_lifetime>
|
| 248 |
<queue_failed_lifetime>60</queue_failed_lifetime>
|
|
|
|
| 249 |
<cust_code_format>0</cust_code_format>
|
| 250 |
<shipping_sku>Shipping</shipping_sku>
|
| 251 |
<gw_order_sku>GwOrder</gw_order_sku>
|
| 20 |
<config>
|
| 21 |
<modules>
|
| 22 |
<OnePica_AvaTax>
|
| 23 |
+
<version>2.4.3.0</version>
|
| 24 |
</OnePica_AvaTax>
|
| 25 |
</modules>
|
| 26 |
<global>
|
| 246 |
<log_lifetime>3</log_lifetime>
|
| 247 |
<queue_success_lifetime>7</queue_success_lifetime>
|
| 248 |
<queue_failed_lifetime>60</queue_failed_lifetime>
|
| 249 |
+
<log_type_list>Ping,Get Tax,Filter,Validate,Queue</log_type_list>
|
| 250 |
<cust_code_format>0</cust_code_format>
|
| 251 |
<shipping_sku>Shipping</shipping_sku>
|
| 252 |
<gw_order_sku>GwOrder</gw_order_sku>
|
app/code/community/OnePica/AvaTax/etc/system.xml
CHANGED
|
@@ -155,6 +155,17 @@
|
|
| 155 |
<show_in_website>0</show_in_website>
|
| 156 |
<show_in_store>0</show_in_store>
|
| 157 |
</queue_failed_lifetime>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 158 |
<log_export>
|
| 159 |
<label></label>
|
| 160 |
<frontend_model>avatax/adminhtml_system_config_form_field_export</frontend_model>
|
|
@@ -209,7 +220,7 @@
|
|
| 209 |
<show_in_website>1</show_in_website>
|
| 210 |
<show_in_store>1</show_in_store>
|
| 211 |
</gw_items_sku>
|
| 212 |
-
|
| 213 |
<label>Gift Wrap Printed Card Sku</label>
|
| 214 |
<comment>Required. The sku sent to denote gift wrap printed card costs.</comment>
|
| 215 |
<frontend_type>text</frontend_type>
|
| 155 |
<show_in_website>0</show_in_website>
|
| 156 |
<show_in_store>0</show_in_store>
|
| 157 |
</queue_failed_lifetime>
|
| 158 |
+
|
| 159 |
+
<log_type_list>
|
| 160 |
+
<label>Log Type</label>
|
| 161 |
+
<frontend_type>multiselect</frontend_type>
|
| 162 |
+
<source_model>avatax/source_logtype</source_model>
|
| 163 |
+
<sort_order>125</sort_order>
|
| 164 |
+
<show_in_default>1</show_in_default>
|
| 165 |
+
<show_in_website>0</show_in_website>
|
| 166 |
+
<show_in_store>0</show_in_store>
|
| 167 |
+
</log_type_list>
|
| 168 |
+
|
| 169 |
<log_export>
|
| 170 |
<label></label>
|
| 171 |
<frontend_model>avatax/adminhtml_system_config_form_field_export</frontend_model>
|
| 220 |
<show_in_website>1</show_in_website>
|
| 221 |
<show_in_store>1</show_in_store>
|
| 222 |
</gw_items_sku>
|
| 223 |
+
<gw_printed_card_sku translate="label comment">
|
| 224 |
<label>Gift Wrap Printed Card Sku</label>
|
| 225 |
<comment>Required. The sku sent to denote gift wrap printed card costs.</comment>
|
| 226 |
<frontend_type>text</frontend_type>
|
app/code/community/OnePica/AvaTax/lib/classes/GetTaxRequest.class.php
CHANGED
|
@@ -48,6 +48,12 @@ class GetTaxRequest
|
|
| 48 |
private $PaymentDate; //date
|
| 49 |
private $ExchangeRate; //decimal
|
| 50 |
private $ExchangeRateEffDate; //date
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
|
| 52 |
|
| 53 |
|
|
@@ -395,6 +401,7 @@ class GetTaxRequest
|
|
| 395 |
*/
|
| 396 |
public function setExchangeRateEffDate($value){ $this->ExchangeRateEffDate = $value; return $this; } //date
|
| 397 |
|
|
|
|
| 398 |
/**
|
| 399 |
*TaxOverride for the document.
|
| 400 |
*
|
|
@@ -408,6 +415,24 @@ class GetTaxRequest
|
|
| 408 |
$this->ReferenceCode=$value;
|
| 409 |
}
|
| 410 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 411 |
/**#@+
|
| 412 |
* Accessor
|
| 413 |
* @access public
|
|
@@ -491,6 +516,10 @@ class GetTaxRequest
|
|
| 491 |
}
|
| 492 |
}
|
| 493 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
| 494 |
|
| 495 |
|
| 496 |
/**#@-*/
|
| 48 |
private $PaymentDate; //date
|
| 49 |
private $ExchangeRate; //decimal
|
| 50 |
private $ExchangeRateEffDate; //date
|
| 51 |
+
|
| 52 |
+
|
| 53 |
+
//@author: Rapshtynska Svitlana
|
| 54 |
+
//Added new properties
|
| 55 |
+
private $TaxDate; //date
|
| 56 |
+
private $StatusDate; //date
|
| 57 |
|
| 58 |
|
| 59 |
|
| 401 |
*/
|
| 402 |
public function setExchangeRateEffDate($value){ $this->ExchangeRateEffDate = $value; return $this; } //date
|
| 403 |
|
| 404 |
+
|
| 405 |
/**
|
| 406 |
*TaxOverride for the document.
|
| 407 |
*
|
| 415 |
$this->ReferenceCode=$value;
|
| 416 |
}
|
| 417 |
|
| 418 |
+
|
| 419 |
+
//@author: Rapshtynska Svitlana
|
| 420 |
+
/**
|
| 421 |
+
* TaxDate should be in the format yyyy-mm-dd
|
| 422 |
+
*
|
| 423 |
+
* @param date $value
|
| 424 |
+
*/
|
| 425 |
+
public function setTaxDate($value) { $this->TaxDate = $value; return $this; } //date
|
| 426 |
+
|
| 427 |
+
/**
|
| 428 |
+
* StatusDate should be in the format yyyy-mm-dd
|
| 429 |
+
*
|
| 430 |
+
* @param date $value
|
| 431 |
+
*/
|
| 432 |
+
public function setStatusDate($value) { $this->StatusDate = $value; return $this; } //date
|
| 433 |
+
|
| 434 |
+
|
| 435 |
+
|
| 436 |
/**#@+
|
| 437 |
* Accessor
|
| 438 |
* @access public
|
| 516 |
}
|
| 517 |
}
|
| 518 |
}
|
| 519 |
+
|
| 520 |
+
//@author: Rapshtynska Svitlana
|
| 521 |
+
public function getTaxDate() { return $this->TaxDate; } //date
|
| 522 |
+
public function getStatusDate() { return $this->StatusDate; } //date
|
| 523 |
|
| 524 |
|
| 525 |
/**#@-*/
|
app/code/community/OnePica/AvaTax/lib/classes/wsdl/Tax.wsdl
CHANGED
|
@@ -40,6 +40,8 @@
|
|
| 40 |
<s:element minOccurs="1" maxOccurs="1" name="PaymentDate" type="s:date" />
|
| 41 |
<s:element minOccurs="1" maxOccurs="1" name="ExchangeRate" type="s:decimal" />
|
| 42 |
<s:element minOccurs="1" maxOccurs="1" name="ExchangeRateEffDate" type="s:date" />
|
|
|
|
|
|
|
| 43 |
</s:sequence>
|
| 44 |
</s:extension>
|
| 45 |
</s:complexContent>
|
| 40 |
<s:element minOccurs="1" maxOccurs="1" name="PaymentDate" type="s:date" />
|
| 41 |
<s:element minOccurs="1" maxOccurs="1" name="ExchangeRate" type="s:decimal" />
|
| 42 |
<s:element minOccurs="1" maxOccurs="1" name="ExchangeRateEffDate" type="s:date" />
|
| 43 |
+
<s:element minOccurs="1" maxOccurs="1" name="TaxDate" type="s:date" />
|
| 44 |
+
<s:element minOccurs="1" maxOccurs="1" name="StatusDate" type="s:date" />
|
| 45 |
</s:sequence>
|
| 46 |
</s:extension>
|
| 47 |
</s:complexContent>
|
app/design/adminhtml/default/default/layout/avatax.xml
CHANGED
|
@@ -5,4 +5,10 @@
|
|
| 5 |
<block type="avatax/adminhtml_notification_toolbar" name="avatax_notifications"></block>
|
| 6 |
</reference>
|
| 7 |
</default>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 8 |
</layout>
|
| 5 |
<block type="avatax/adminhtml_notification_toolbar" name="avatax_notifications"></block>
|
| 6 |
</reference>
|
| 7 |
</default>
|
| 8 |
+
|
| 9 |
+
<avatax_adminhtml_grid_logview>
|
| 10 |
+
<reference name="content">
|
| 11 |
+
<block type="avatax/adminhtml_export_log_view" name ="avatax_log_view" template="avatax/log/view.phtml"></block>
|
| 12 |
+
</reference>
|
| 13 |
+
</avatax_adminhtml_grid_logview>
|
| 14 |
</layout>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>OnePica_AvaTax</name>
|
| 4 |
-
<version>2.4.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -18,15 +18,30 @@ Released as a commercial extension, this software will not work unless you have
|
|
| 18 |

|
| 19 |

|
| 20 |
At One Pica (www.onepica.com), we strive to build increasingly scalable and flexible enterprise systems for all of our clients, large and small. We want to give back to this community both to promote its success and as a sign of our gratitude. Please feel free to contact us on ways we can improve this extension or extend on this framework.</description>
|
| 21 |
-
<notes>
|
| 22 |

|
| 23 |
-
|
| 24 |

|
| 25 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 26 |
<authors><author><name>Gregory Segall</name><user>gsegall</user><email>magento@onepica.com</email></author></authors>
|
| 27 |
-
<date>2013-
|
| 28 |
-
<time>
|
| 29 |
-
<contents><target name="magecommunity"><dir name="OnePica"><dir name="AvaTax"><dir name="Block"><dir name="Adminhtml"><dir name="Export"><dir name="Abstract"><file name="Grid.php" hash="b5db0baa25adca61990553cdfae054f8"/></dir><dir name="Log"><file name="Grid.php" hash="c6bb9de3726a50b0cdd2521b26453826"/></dir><dir name="Queue"><file name="Grid.php" hash="4636d4ac081ab67534f4a67923548f97"/></dir></dir><dir name="Notification"><file name="Toolbar.php" hash="a0cb132e6fb73412879a5b0b7f85871c"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Export.php" hash="a834887971b517d7141cb2c8868d68b1"/></dir></dir></dir></dir><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="a34316cf45867eb83de49243f0fdf4c6"/></dir><file name="Grid.php" hash="a7222bf20619ea8104e4d3d0066f27fd"/></dir></dir></dir><dir name="Checkout"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="d8af44108fc4b6da43ebe039acb0dea0"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="43b9d348dd541ab5d0b20cc14b623276"/><dir name="Tax"><file name="Data.php" hash="81edee6048e5e9487f5c0a3e985d1b15"/></dir></dir><dir name="Model"><file name="Abstract.php" hash="2726b0e3fd4985d30e63720831be3ded"/><dir name="Admin"><file name="Session.php" hash="e19ebf06208e3d2edef45683401fe7a8"/></dir><dir name="Adminhtml"><file name="Config.php" hash="9b6824426007b7714f58bab8dd857f2b"/><dir name="Sales"><dir name="Order"><file name="Create.php" hash="21d324f879214b08894f9c672aac5d16"/></dir></dir></dir><dir name="Avatax"><file name="Abstract.php" hash="66c8faaa849db610d25abe232efe34b2"/><file name="Address.php" hash="8752e8b8edcf9011a8b6d41f69e86ed0"/><file name="Estimate.php" hash="97b3a6333fd268c7d8139006236cae2d"/><dir name="Exception"><file name="Address.php" hash="9052a48d9c3b46811c3db4090dc610d4"/><file name="Commitfailure.php" hash="23559a21d37fd14904f088e8c2357992"/><file name="Unbalanced.php" hash="3ee206bb1cfb87cceae006a2c1b6b5e7"/></dir><file name="Invoice.php" hash="5ee31f08793d9f542bfa0d4cbc0fa752"/><file name="Ping.php" hash="61fc25b14e144ffbae8629e497cd5305"/></dir><file name="Config.php" hash="7f202ecb12a601971369714f1281d5ba"/><file name="Observer.php" hash="29f3b36cc3ee84b06e5d38f142eb7594"/><dir name="Records"><file name="Log.php" hash="f9ba2ae74bf896bbb10193ab8701975a"/><dir name="Mysql4"><dir name="Log"><file name="Collection.php" hash="14344f43b12f84d745f522589b83e271"/></dir><file name="Log.php" hash="dd367bc03d936fab12d93b5a950ec102"/><dir name="Queue"><file name="Collection.php" hash="faac004ece9a1e413f870dedfc925e38"/></dir><file name="Queue.php" hash="6a792249159a89fb4ae81bec09d8d227"/></dir><dir name="Queue"><file name="Process.php" hash="2cbce4248c0ceff2492a410067872fd5"/></dir><file name="Queue.php" hash="881da6750ca3e3e43425b3182533b39d"/></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Grand.php" hash="ce472ac13ac610db29175afc735c5701"/><file name="Tax.php" hash="63bee68afe39c1006df03fd23eac6c8b"/></dir></dir><file name="Address.php" hash="1d081008d83046eba3869006918dc171"/></dir></dir><file name="Session.php" hash="72849341ba81db155cc8d998b7dfef69"/><dir name="Source"><file name="Actions.php" hash="55cde933437761b778ebea15075568ab"/><file name="Customercodeformat.php" hash="1478c6fcba951ae497e7621d6cf808e0"/><file name="Error.php" hash="467b37421490cfe5eba060fc5e1af240"/><file name="Logmode.php" hash="63ab9699d71f2a6031a37d249c816b10"/><file name="Onerrorfrontend.php" hash="9ecd5015d95925adfe1626634d91820e"/><dir name="Regionfilter"><file name="List.php" hash="3b86c8f2a69aeeb9eb0c1988393f10ac"/><file name="Mode.php" hash="1a1bc328674db870d0cf4ef69a05de17"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ExportController.php" hash="3d770db9c1dbc8199c305e69387b679f"/><file name="GridController.php" hash="a8c319bc7815618399e56bad11f36fb8"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="33c360104d36eed21cd7172637fb6227"/><file name="config.xml" hash="65c1c03f299d2c3d75940b15dd9f6d32"/><file name="system-disabled.xml" hash="851329d6173bca6f2a2f074880c8289a"/><file name="system.xml" hash="f9dff318f3a544ab8fdf376dcc6fa5f5"/></dir><dir name="lib"><file name="AvaTax.php" hash="d9d2ac44a3a7a4d5ca34752df3d70afb"/><dir name="classes"><file name="ATConfig.class.php" hash="9ccc6722b520cf4068235ecea5d9cade"/><file name="ATObject.class.php" hash="b9b910adcb86703cff3a59f38665a003"/><file name="AVObject.class.php" hash="b65c5532b01074a57a20703513148301"/><file name="Address.class.php" hash="06f5487c223132005a65d633930f5b72"/><file name="AddressServiceSoap.class.php" hash="776cbf348c32a7dc20cc47f90b2cc806"/><file name="AddressType.class.php" hash="1458d719ab0c4d1ff93244527b8c75cf"/><file name="AdjustTaxRequest.class.php" hash="a67ce5082335bcd553ac7ead85a7a36c"/><file name="AdjustTaxResult.class.php" hash="0fb71e82a0aa38ff792fb45d3b19c664"/><file name="ApplyPaymentRequest.class.php" hash="65fab85ca47b7c9ad84e861d6e2e9a01"/><file name="ApplyPaymentResult.class.php" hash="ddf7a332575f7c972f11f95430179b01"/><file name="AvalaraSoapClient.class.php" hash="e3561a81c82ac293767271195c8cf2e5"/><file name="BaseResult.class.php" hash="8dc91ad90e7b9fb12dbea3d5e3279892"/><dir name="BatchSvc"><file name="AuditMessage.class.php" hash="b2cf0248904656cd10b3d28f3cfa25a1"/><file name="AvaTaxBatchSvc.php" hash="2c6ecf16cec6926ca0438772c08e4f70"/><file name="BaseResult.class.php" hash="911a199f0fd54e00ccab6fad53f89ba3"/><file name="Batch.class.php" hash="ded2b8509c4223732b91608fffea43a5"/><file name="BatchDelete.class.php" hash="27b5510c8199a6e348e7c983a1b68778"/><file name="BatchDeleteResponse.class.php" hash="a181bdf63032b6f292f32a3c2d8dc008"/><file name="BatchFetch.class.php" hash="efeee6d7bcc181c1a4d4a5d165169ca8"/><file name="BatchFetchResponse.class.php" hash="e5c8f28218e1240cf360a61456baeeb5"/><file name="BatchFetchResult.class.php" hash="10549cd50bc803814381bea5e62d951e"/><file name="BatchFile.class.php" hash="0ef50e2a8147f2f57d3072128f6561ee"/><file name="BatchFileDelete.class.php" hash="b937b21facf90fb1db1f1ee70a0fefdd"/><file name="BatchFileDeleteResponse.class.php" hash="8753ed5b4aa5ed2b8f790b5d529698d2"/><file name="BatchFileFetch.class.php" hash="3a374c13d668707e004d779ee6377880"/><file name="BatchFileFetchResponse.class.php" hash="09fe9b8cc3a426b3ab13b4eb9a462914"/><file name="BatchFileFetchResult.class.php" hash="49e84f4dd96483229649539e4bcea9bd"/><file name="BatchFileSave.class.php" hash="72589688feea7a1d6afd1c27794b2585"/><file name="BatchFileSaveResponse.class.php" hash="1850184ea711a501f61ad3cbd7284069"/><file name="BatchFileSaveResult.class.php" hash="1266eefddc041b850b58616935300187"/><file name="BatchProcess.class.php" hash="60912e77dd6e6a0f6629b2e86ce0df09"/><file name="BatchProcessRequest.class.php" hash="a01a7987cc0dc962ee1499f0ab92f346"/><file name="BatchProcessResponse.class.php" hash="db13565dc7b3b1544ef5ada36c32a568"/><file name="BatchProcessResult.class.php" hash="7a4d631658c89539ea07a0236b17cf13"/><file name="BatchSave.class.php" hash="616295413418b16410cd008e3f20b28b"/><file name="BatchSaveResponse.class.php" hash="2cb0ada61c6501877c08da49bbb4a946"/><file name="BatchSaveResult.class.php" hash="bced01bdbfbdd476bca9c9d0176bd785"/><file name="BatchSvc.class.php" hash="a42b48303d7ffa8074821d738ec5b37e"/><file name="DeleteRequest.class.php" hash="259dd71651fbc6307e3ba39ba37b0982"/><file name="DeleteResult.class.php" hash="8c39215b0e317f7834a147869ca7fb17"/><file name="FetchRequest.class.php" hash="3b2cea507374b08bd6b6ea23c9487494"/><file name="FilterRequest.class.php" hash="14d910ba0d03a2179263a03404a85194"/><file name="FilterResult.class.php" hash="0608a53670e6e156628451303d11ace3"/><file name="IsAuthorized.class.php" hash="589c1aff4109cc480312675f2e04aa0e"/><file name="IsAuthorizedResponse.class.php" hash="64db8c37e7946c2902ea9e46ae86cb78"/><file name="IsAuthorizedResult.class.php" hash="5b177cc88d91c63ee998fe5712b44bcc"/><file name="Message.class.php" hash="034c2276b6de0eb234f63d9cb5c1dae0"/><file name="Ping.class.php" hash="119c38ad0e7cd85eb1b550d51a6e2425"/><file name="PingResponse.class.php" hash="f92a631e8c09cfa884acd6b820232e83"/><file name="PingResult.class.php" hash="f818d99e05c0d3c014dbf3e5986ec599"/><file name="Profile.class.php" hash="7fda4e5d8db696d854cd7d1cec25f799"/><file name="SeverityLevel.class.php" hash="043ecef6038f2e95fe282f4c979af425"/></dir><file name="BoundaryLevel.class.php" hash="9a27f3e00bbe8dde729e7e54fb323d62"/><file name="CancelCode.class.php" hash="ef3f56a04d1aade150cb08c3a9134c9b"/><file name="CancelTaxRequest.class.php" hash="19d5af5d81c6e125766c927e76971e4e"/><file name="CancelTaxResult.class.php" hash="07228ddee4ab305bc9b1512b996105f7"/><file name="CommitTaxRequest.class.php" hash="b066a6d15874be72549053f66826c9e1"/><file name="CommitTaxResult.class.php" hash="30372831394d6bdeb705b93af413b71f"/><file name="DetailLevel.class.php" hash="82c39ae81735c84cf42e45f08d2a09a9"/><file name="DocStatus.class.php" hash="bbdb6cc343319bb996f5780d90d3a5a0"/><file name="DocumentType.class.php" hash="d27a4700fefed81cb9f8c701c3939982"/><file name="DynamicSoapClient.class.php" hash="0ab14d845214d6a4c4d1dbe32666bf2f"/><file name="Enum.class.php" hash="0d16eadf4c991e7f52ef41de5cbc92e7"/><file name="GetTaxHistoryRequest.class.php" hash="b598dcee1bcaa13e4c123e558bc5d545"/><file name="GetTaxHistoryResult.class.php" hash="4c85747ef17f770ae4ec94d9e27f681f"/><file name="GetTaxRequest.class.php" hash="fa70226c752f353c3e136f7f530721cf"/><file name="GetTaxResult.class.php" hash="e2cf17e68126a6b0e4f5440a072dc581"/><file name="IsAuthorizedResult.class.php" hash="c570782cd50745810995c787048c8864"/><file name="JurisdictionType.class.php" hash="68b8022228fbc22d60fd74914f2a2749"/><file name="Line.class.php" hash="9afc25c9ce2581b929173d92af8b801d"/><file name="Message.class.php" hash="06a099c0f099e4e6a10c3be887b07b30"/><file name="PingResult.class.php" hash="22d83358dd7c4f8ffe3e720da3c1b565"/><file name="PostTaxRequest.class.php" hash="3301991ededc9fbad1dd45c6aa80dc51"/><file name="PostTaxResult.class.php" hash="36f02467db90d6beb33681e4f1c0a26e"/><file name="ReconcileTaxHistoryRequest.class.php" hash="ce0164310a18a7d464217ce69d7b4fc2"/><file name="ReconcileTaxHistoryResult.class.php" hash="baab8d603255b246731bcb7bca149596"/><file name="SearchTaxHistoryResult.class.php" hash="6a86da07d80fff3518a2be6e74694662"/><file name="ServiceMode.class.php" hash="9a4e633e225d4cdc62b28a041ca4d739"/><file name="SeverityLevel.class.php" hash="72d3fe39e2ced741aa8917b8e8be7c6f"/><file name="TaxDetail.class.php" hash="b6be13edfa217119a5c82c3a291ba340"/><file name="TaxLine.class.php" hash="be67b350e74efc326d1d6dcf5a21978c"/><file name="TaxOverride.class.php" hash="b0f99ad5bfe71e06bfcb60312032fdb3"/><file name="TaxOverrideType.class.php" hash="f5d2434c2a369605f82d2a182ddbea74"/><file name="TaxRequest.class.php" hash="7a6a1dbf317aedb18b225efa7c90da88"/><file name="TaxServiceSoap.class.php" hash="9deec191eb6a90239eaed2537d06ffe1"/><file name="TaxType.class.php" hash="a8a6fe2ed98440606f50190e3f5aa914"/><file name="TextCase.class.php" hash="dd265892e4733ef7f2e6d5cd53daa087"/><file name="ValidAddress.class.php" hash="9aef14ddcda74827f288bce6cf5e18e0"/><file name="ValidateRequest.class.php" hash="df76ee0d0acef422e1640796f627bd4f"/><file name="ValidateResult.class.php" hash="cd7fff7ffa3fbc9d04d3fe15b9d877e9"/><dir name="wsdl"><file name="Address.wsdl" hash="2ca743760c961db0ae03e4c6900667cb"/><file name="BatchSvc.wsdl" hash="eae666b959c1889d586919da4ebccefd"/><file name="Tax.wsdl" hash="03e2e9f97c0a553d91ca42c53d64a83b"/></dir></dir><file name="functions.php" hash="b94adf9f4887ff8f023fdaff5c64d974"/></dir><dir name="sql"><dir name="avatax_records_setup"><file name="mysql4-install-0.1.0.php" hash="cae21cd6e672cb07b606b5ab58fc5fd7"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="3bde3555bafe3f4dbb6b620b75abfa02"/><file name="mysql4-upgrade-1.0.1-2.0.0.php" hash="1b6d23e38621253e76c12a48e5494c64"/><file name="mysql4-upgrade-2.2.0-2.2.1.php" hash="82c4fc41cf9a235072c585028c23fecd"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="OnePica_AvaTax.xml" hash="9a548b57f519da49acf5fe116d2aeabe"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="avatax.xml" hash="b2b846600743476d4c9bd55bd970da2a"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="avatax.xml" hash="b47bd34f2df8092cdcbc973be8356777"/></dir></dir></dir></dir></target></contents>
|
| 30 |
<compatible/>
|
| 31 |
<dependencies><required><php><min>5.2.3</min><max>6.0.0</max></php><extension><name>curl</name><min></min><max></max></extension><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
|
| 32 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>OnePica_AvaTax</name>
|
| 4 |
+
<version>2.4.3.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
| 18 |

|
| 19 |

|
| 20 |
At One Pica (www.onepica.com), we strive to build increasingly scalable and flexible enterprise systems for all of our clients, large and small. We want to give back to this community both to promote its success and as a sign of our gratitude. Please feel free to contact us on ways we can improve this extension or extend on this framework.</description>
|
| 21 |
+
<notes>Added Log table view
|
| 22 |

|
| 23 |
+
Configuration area for what is logged (Ping, GetTax, Filter, Validate, Queue)
|
| 24 |

|
| 25 |
+
New button to clear errors from log
|
| 26 |
+

|
| 27 |
+
Country code to requests, using config value at shipping/origin/country_id
|
| 28 |
+

|
| 29 |
+
Fix fatal error on bundled items
|
| 30 |
+

|
| 31 |
+
Fixed discount bug related to discount codes
|
| 32 |
+

|
| 33 |
+
Fixed error that did not allow user to proceed through checkout (fatal error with $store, fixed to $storeId)
|
| 34 |
+

|
| 35 |
+
Changed extension to use base currency total amounts rather than checkout currency total amounts
|
| 36 |
+

|
| 37 |
+
Changed dates in request
|
| 38 |
+

|
| 39 |
+
Currency code added to requests, using store base currency code
|
| 40 |
+
</notes>
|
| 41 |
<authors><author><name>Gregory Segall</name><user>gsegall</user><email>magento@onepica.com</email></author></authors>
|
| 42 |
+
<date>2013-05-07</date>
|
| 43 |
+
<time>18:14:03</time>
|
| 44 |
+
<contents><target name="magecommunity"><dir name="OnePica"><dir name="AvaTax"><dir name="Block"><dir name="Adminhtml"><dir name="Export"><dir name="Abstract"><file name="Grid.php" hash="b5db0baa25adca61990553cdfae054f8"/></dir><dir name="Log"><file name="Grid.php" hash="3d36d791700f8a747bb492732ff86077"/><file name="View.php" hash="99f17c532b545e34fb6ca207c2beeb37"/></dir><dir name="Queue"><file name="Grid.php" hash="52efc8e013002639cc2f0f88010c91ec"/></dir></dir><dir name="Notification"><file name="Toolbar.php" hash="a0cb132e6fb73412879a5b0b7f85871c"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Export.php" hash="a834887971b517d7141cb2c8868d68b1"/></dir></dir></dir></dir><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="a34316cf45867eb83de49243f0fdf4c6"/></dir><file name="Grid.php" hash="a7222bf20619ea8104e4d3d0066f27fd"/></dir></dir></dir><dir name="Checkout"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="d8af44108fc4b6da43ebe039acb0dea0"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="1c50b46c6bbd84734ec7e740f279d0fc"/><dir name="Tax"><file name="Data.php" hash="81edee6048e5e9487f5c0a3e985d1b15"/></dir></dir><dir name="Model"><file name="Abstract.php" hash="96dcb00145bbc1a28859bd5c0f2c380d"/><dir name="Admin"><file name="Session.php" hash="e19ebf06208e3d2edef45683401fe7a8"/></dir><dir name="Adminhtml"><file name="Config.php" hash="9b6824426007b7714f58bab8dd857f2b"/><dir name="Sales"><dir name="Order"><file name="Create.php" hash="21d324f879214b08894f9c672aac5d16"/></dir></dir></dir><dir name="Avatax"><file name="Abstract.php" hash="68e7cb4aefadf9e87828389d44e8274b"/><file name="Address.php" hash="8752e8b8edcf9011a8b6d41f69e86ed0"/><file name="Estimate.php" hash="331ee6dd5ec37954ec54aa9f64606d85"/><dir name="Exception"><file name="Address.php" hash="9052a48d9c3b46811c3db4090dc610d4"/><file name="Commitfailure.php" hash="23559a21d37fd14904f088e8c2357992"/><file name="Unbalanced.php" hash="3ee206bb1cfb87cceae006a2c1b6b5e7"/></dir><file name="Invoice.php" hash="08764c536526d8c54e09c9d2a831fae4"/><file name="Ping.php" hash="61fc25b14e144ffbae8629e497cd5305"/></dir><file name="Config.php" hash="7f202ecb12a601971369714f1281d5ba"/><file name="Observer.php" hash="29f3b36cc3ee84b06e5d38f142eb7594"/><dir name="Records"><file name="Log.php" hash="14d58227e9c6b96b46b6a00cd7952586"/><dir name="Mysql4"><dir name="Log"><file name="Collection.php" hash="14344f43b12f84d745f522589b83e271"/></dir><file name="Log.php" hash="dd367bc03d936fab12d93b5a950ec102"/><dir name="Queue"><file name="Collection.php" hash="faac004ece9a1e413f870dedfc925e38"/></dir><file name="Queue.php" hash="d56bb12d6bb135bfb29d0dea513b0e0a"/></dir><dir name="Queue"><file name="Process.php" hash="8e650e32f1208867441d041716adc098"/></dir><file name="Queue.php" hash="881da6750ca3e3e43425b3182533b39d"/></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Grand.php" hash="ce472ac13ac610db29175afc735c5701"/><file name="Tax.php" hash="63bee68afe39c1006df03fd23eac6c8b"/></dir></dir><file name="Address.php" hash="1d081008d83046eba3869006918dc171"/></dir></dir><file name="Session.php" hash="72849341ba81db155cc8d998b7dfef69"/><dir name="Source"><file name="Actions.php" hash="55cde933437761b778ebea15075568ab"/><file name="Customercodeformat.php" hash="1478c6fcba951ae497e7621d6cf808e0"/><file name="Error.php" hash="467b37421490cfe5eba060fc5e1af240"/><file name="Logmode.php" hash="63ab9699d71f2a6031a37d249c816b10"/><file name="Logtype.php" hash="cd46d9baf9ef70d24e1240a891a6b7be"/><file name="Onerrorfrontend.php" hash="9ecd5015d95925adfe1626634d91820e"/><dir name="Regionfilter"><file name="List.php" hash="3b86c8f2a69aeeb9eb0c1988393f10ac"/><file name="Mode.php" hash="1a1bc328674db870d0cf4ef69a05de17"/></dir></dir><file name=".DS_Store" hash="65255944ee79d37cac5700e36e70eaf0"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ExportController.php" hash="3d770db9c1dbc8199c305e69387b679f"/><file name="GridController.php" hash="d40ba09889406dffd747788e1c244dee"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="65419d8a1aed1cdb2e3bd1af076af732"/><file name="config.xml" hash="2d38d6df8942ffe48aaee468abf36f02"/><file name="system-disabled.xml" hash="851329d6173bca6f2a2f074880c8289a"/><file name="system.xml" hash="98b9a984c3b417545ab82e44aa0a39e7"/></dir><dir name="lib"><file name="AvaTax.php" hash="d9d2ac44a3a7a4d5ca34752df3d70afb"/><dir name="classes"><file name="ATConfig.class.php" hash="9ccc6722b520cf4068235ecea5d9cade"/><file name="ATObject.class.php" hash="b9b910adcb86703cff3a59f38665a003"/><file name="AVObject.class.php" hash="b65c5532b01074a57a20703513148301"/><file name="Address.class.php" hash="06f5487c223132005a65d633930f5b72"/><file name="AddressServiceSoap.class.php" hash="776cbf348c32a7dc20cc47f90b2cc806"/><file name="AddressType.class.php" hash="1458d719ab0c4d1ff93244527b8c75cf"/><file name="AdjustTaxRequest.class.php" hash="a67ce5082335bcd553ac7ead85a7a36c"/><file name="AdjustTaxResult.class.php" hash="0fb71e82a0aa38ff792fb45d3b19c664"/><file name="ApplyPaymentRequest.class.php" hash="65fab85ca47b7c9ad84e861d6e2e9a01"/><file name="ApplyPaymentResult.class.php" hash="ddf7a332575f7c972f11f95430179b01"/><file name="AvalaraSoapClient.class.php" hash="e3561a81c82ac293767271195c8cf2e5"/><file name="BaseResult.class.php" hash="8dc91ad90e7b9fb12dbea3d5e3279892"/><dir name="BatchSvc"><file name="AuditMessage.class.php" hash="b2cf0248904656cd10b3d28f3cfa25a1"/><file name="AvaTaxBatchSvc.php" hash="2c6ecf16cec6926ca0438772c08e4f70"/><file name="BaseResult.class.php" hash="911a199f0fd54e00ccab6fad53f89ba3"/><file name="Batch.class.php" hash="ded2b8509c4223732b91608fffea43a5"/><file name="BatchDelete.class.php" hash="27b5510c8199a6e348e7c983a1b68778"/><file name="BatchDeleteResponse.class.php" hash="a181bdf63032b6f292f32a3c2d8dc008"/><file name="BatchFetch.class.php" hash="efeee6d7bcc181c1a4d4a5d165169ca8"/><file name="BatchFetchResponse.class.php" hash="e5c8f28218e1240cf360a61456baeeb5"/><file name="BatchFetchResult.class.php" hash="10549cd50bc803814381bea5e62d951e"/><file name="BatchFile.class.php" hash="0ef50e2a8147f2f57d3072128f6561ee"/><file name="BatchFileDelete.class.php" hash="b937b21facf90fb1db1f1ee70a0fefdd"/><file name="BatchFileDeleteResponse.class.php" hash="8753ed5b4aa5ed2b8f790b5d529698d2"/><file name="BatchFileFetch.class.php" hash="3a374c13d668707e004d779ee6377880"/><file name="BatchFileFetchResponse.class.php" hash="09fe9b8cc3a426b3ab13b4eb9a462914"/><file name="BatchFileFetchResult.class.php" hash="49e84f4dd96483229649539e4bcea9bd"/><file name="BatchFileSave.class.php" hash="72589688feea7a1d6afd1c27794b2585"/><file name="BatchFileSaveResponse.class.php" hash="1850184ea711a501f61ad3cbd7284069"/><file name="BatchFileSaveResult.class.php" hash="1266eefddc041b850b58616935300187"/><file name="BatchProcess.class.php" hash="60912e77dd6e6a0f6629b2e86ce0df09"/><file name="BatchProcessRequest.class.php" hash="a01a7987cc0dc962ee1499f0ab92f346"/><file name="BatchProcessResponse.class.php" hash="db13565dc7b3b1544ef5ada36c32a568"/><file name="BatchProcessResult.class.php" hash="7a4d631658c89539ea07a0236b17cf13"/><file name="BatchSave.class.php" hash="616295413418b16410cd008e3f20b28b"/><file name="BatchSaveResponse.class.php" hash="2cb0ada61c6501877c08da49bbb4a946"/><file name="BatchSaveResult.class.php" hash="bced01bdbfbdd476bca9c9d0176bd785"/><file name="BatchSvc.class.php" hash="a42b48303d7ffa8074821d738ec5b37e"/><file name="DeleteRequest.class.php" hash="259dd71651fbc6307e3ba39ba37b0982"/><file name="DeleteResult.class.php" hash="8c39215b0e317f7834a147869ca7fb17"/><file name="FetchRequest.class.php" hash="3b2cea507374b08bd6b6ea23c9487494"/><file name="FilterRequest.class.php" hash="14d910ba0d03a2179263a03404a85194"/><file name="FilterResult.class.php" hash="0608a53670e6e156628451303d11ace3"/><file name="IsAuthorized.class.php" hash="589c1aff4109cc480312675f2e04aa0e"/><file name="IsAuthorizedResponse.class.php" hash="64db8c37e7946c2902ea9e46ae86cb78"/><file name="IsAuthorizedResult.class.php" hash="5b177cc88d91c63ee998fe5712b44bcc"/><file name="Message.class.php" hash="034c2276b6de0eb234f63d9cb5c1dae0"/><file name="Ping.class.php" hash="119c38ad0e7cd85eb1b550d51a6e2425"/><file name="PingResponse.class.php" hash="f92a631e8c09cfa884acd6b820232e83"/><file name="PingResult.class.php" hash="f818d99e05c0d3c014dbf3e5986ec599"/><file name="Profile.class.php" hash="7fda4e5d8db696d854cd7d1cec25f799"/><file name="SeverityLevel.class.php" hash="043ecef6038f2e95fe282f4c979af425"/></dir><file name="BoundaryLevel.class.php" hash="9a27f3e00bbe8dde729e7e54fb323d62"/><file name="CancelCode.class.php" hash="ef3f56a04d1aade150cb08c3a9134c9b"/><file name="CancelTaxRequest.class.php" hash="19d5af5d81c6e125766c927e76971e4e"/><file name="CancelTaxResult.class.php" hash="07228ddee4ab305bc9b1512b996105f7"/><file name="CommitTaxRequest.class.php" hash="b066a6d15874be72549053f66826c9e1"/><file name="CommitTaxResult.class.php" hash="30372831394d6bdeb705b93af413b71f"/><file name="DetailLevel.class.php" hash="82c39ae81735c84cf42e45f08d2a09a9"/><file name="DocStatus.class.php" hash="bbdb6cc343319bb996f5780d90d3a5a0"/><file name="DocumentType.class.php" hash="d27a4700fefed81cb9f8c701c3939982"/><file name="DynamicSoapClient.class.php" hash="0ab14d845214d6a4c4d1dbe32666bf2f"/><file name="Enum.class.php" hash="0d16eadf4c991e7f52ef41de5cbc92e7"/><file name="GetTaxHistoryRequest.class.php" hash="b598dcee1bcaa13e4c123e558bc5d545"/><file name="GetTaxHistoryResult.class.php" hash="4c85747ef17f770ae4ec94d9e27f681f"/><file name="GetTaxRequest.class.php" hash="9da97ed2bfaa71ae47900ee2c5e2aee2"/><file name="GetTaxResult.class.php" hash="e2cf17e68126a6b0e4f5440a072dc581"/><file name="IsAuthorizedResult.class.php" hash="c570782cd50745810995c787048c8864"/><file name="JurisdictionType.class.php" hash="68b8022228fbc22d60fd74914f2a2749"/><file name="Line.class.php" hash="9afc25c9ce2581b929173d92af8b801d"/><file name="Message.class.php" hash="06a099c0f099e4e6a10c3be887b07b30"/><file name="PingResult.class.php" hash="22d83358dd7c4f8ffe3e720da3c1b565"/><file name="PostTaxRequest.class.php" hash="3301991ededc9fbad1dd45c6aa80dc51"/><file name="PostTaxResult.class.php" hash="36f02467db90d6beb33681e4f1c0a26e"/><file name="ReconcileTaxHistoryRequest.class.php" hash="ce0164310a18a7d464217ce69d7b4fc2"/><file name="ReconcileTaxHistoryResult.class.php" hash="baab8d603255b246731bcb7bca149596"/><file name="SearchTaxHistoryResult.class.php" hash="6a86da07d80fff3518a2be6e74694662"/><file name="ServiceMode.class.php" hash="9a4e633e225d4cdc62b28a041ca4d739"/><file name="SeverityLevel.class.php" hash="72d3fe39e2ced741aa8917b8e8be7c6f"/><file name="TaxDetail.class.php" hash="b6be13edfa217119a5c82c3a291ba340"/><file name="TaxLine.class.php" hash="be67b350e74efc326d1d6dcf5a21978c"/><file name="TaxOverride.class.php" hash="b0f99ad5bfe71e06bfcb60312032fdb3"/><file name="TaxOverrideType.class.php" hash="f5d2434c2a369605f82d2a182ddbea74"/><file name="TaxRequest.class.php" hash="7a6a1dbf317aedb18b225efa7c90da88"/><file name="TaxServiceSoap.class.php" hash="9deec191eb6a90239eaed2537d06ffe1"/><file name="TaxType.class.php" hash="a8a6fe2ed98440606f50190e3f5aa914"/><file name="TextCase.class.php" hash="dd265892e4733ef7f2e6d5cd53daa087"/><file name="ValidAddress.class.php" hash="9aef14ddcda74827f288bce6cf5e18e0"/><file name="ValidateRequest.class.php" hash="df76ee0d0acef422e1640796f627bd4f"/><file name="ValidateResult.class.php" hash="cd7fff7ffa3fbc9d04d3fe15b9d877e9"/><dir name="wsdl"><file name="Address.wsdl" hash="2ca743760c961db0ae03e4c6900667cb"/><file name="BatchSvc.wsdl" hash="eae666b959c1889d586919da4ebccefd"/><file name="Tax.wsdl" hash="da6b3da89c3e4f3f7db6d0ed9d4d33de"/></dir></dir><file name="functions.php" hash="b94adf9f4887ff8f023fdaff5c64d974"/></dir><dir name="sql"><dir name="avatax_records_setup"><file name="mysql4-install-0.1.0.php" hash="cae21cd6e672cb07b606b5ab58fc5fd7"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="3bde3555bafe3f4dbb6b620b75abfa02"/><file name="mysql4-upgrade-1.0.1-2.0.0.php" hash="1b6d23e38621253e76c12a48e5494c64"/><file name="mysql4-upgrade-2.2.0-2.2.1.php" hash="82c4fc41cf9a235072c585028c23fecd"/></dir></dir><file name=".DS_Store" hash="9ec56fc55ff21aaf79db8a75f48bdc91"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="OnePica_AvaTax.xml" hash="9a548b57f519da49acf5fe116d2aeabe"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="avatax.xml" hash="e9ba43333bdc89b3de01845797d74c52"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="avatax.xml" hash="b47bd34f2df8092cdcbc973be8356777"/></dir></dir></dir></dir></target></contents>
|
| 45 |
<compatible/>
|
| 46 |
<dependencies><required><php><min>5.2.3</min><max>6.0.0</max></php><extension><name>curl</name><min></min><max></max></extension><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
|
| 47 |
</package>
|
