Version Notes
- added missing totals in invoice
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | CashOnDelivery |
| Version | 1.0.3 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.2 to 1.0.3
- app/code/community/Phoenix/CashOnDelivery/Helper/Data.php +20 -9
- app/code/community/Phoenix/CashOnDelivery/Model/CashOnDelivery.php +7 -8
- app/code/community/Phoenix/CashOnDelivery/Model/Observer.php +18 -19
- app/code/community/Phoenix/CashOnDelivery/Model/Quote/Total.php +5 -4
- app/code/community/Phoenix/CashOnDelivery/etc/config.xml +1 -1
- app/design/adminhtml/default/default/layout/cashondelivery.xml +6 -0
- app/etc/modules/Mage_CashOnDelivery.xml +0 -33
- package.xml +5 -5
app/code/community/Phoenix/CashOnDelivery/Helper/Data.php
CHANGED
|
@@ -39,21 +39,34 @@ class Phoenix_CashOnDelivery_Helper_Data extends Mage_Core_Helper_Data
|
|
| 39 |
return (int)Mage::getStoreConfig(Phoenix_CashOnDelivery_Model_Quote_TaxTotal::CONFIG_XML_PATH_COD_TAX_CLASS, $store);
|
| 40 |
}
|
| 41 |
|
| 42 |
-
public function getCodPrice($price, $includingTax = null, $shippingAddress = null, $ctc = null, $store = null)
|
| 43 |
-
|
| 44 |
-
$pseudoProduct->setTaxClassId($this->getCodTaxClass($store));
|
| 45 |
-
|
| 46 |
$billingAddress = false;
|
| 47 |
if ($shippingAddress && $shippingAddress->getQuote() && $shippingAddress->getQuote()->getBillingAddress()) {
|
| 48 |
$billingAddress = $shippingAddress->getQuote()->getBillingAddress();
|
| 49 |
}
|
| 50 |
-
|
| 51 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 52 |
}
|
| 53 |
|
| 54 |
public function getCodFeeDisplayType($store = null)
|
| 55 |
{
|
| 56 |
-
|
| 57 |
$storeId = Mage::app()->getStore($store)->getId();
|
| 58 |
if (!isset($this->_shippingPriceDisplayType[$storeId])) {
|
| 59 |
$this->_shippingPriceDisplayType[$storeId] =
|
|
@@ -78,5 +91,3 @@ class Phoenix_CashOnDelivery_Helper_Data extends Mage_Core_Helper_Data
|
|
| 78 |
}
|
| 79 |
|
| 80 |
}
|
| 81 |
-
|
| 82 |
-
?>
|
| 39 |
return (int)Mage::getStoreConfig(Phoenix_CashOnDelivery_Model_Quote_TaxTotal::CONFIG_XML_PATH_COD_TAX_CLASS, $store);
|
| 40 |
}
|
| 41 |
|
| 42 |
+
public function getCodPrice($price, $includingTax = null, $shippingAddress = null, $ctc = null, $store = null)
|
| 43 |
+
{
|
|
|
|
|
|
|
| 44 |
$billingAddress = false;
|
| 45 |
if ($shippingAddress && $shippingAddress->getQuote() && $shippingAddress->getQuote()->getBillingAddress()) {
|
| 46 |
$billingAddress = $shippingAddress->getQuote()->getBillingAddress();
|
| 47 |
}
|
| 48 |
+
|
| 49 |
+
$calc = Mage::getSingleton('tax/calculation');
|
| 50 |
+
$taxRequest = $calc->getRateRequest(
|
| 51 |
+
$shippingAddress,
|
| 52 |
+
$billingAddress,
|
| 53 |
+
$shippingAddress->getQuote()->getCustomerTaxClassId(),
|
| 54 |
+
$store
|
| 55 |
+
);
|
| 56 |
+
$taxRequest->setProductClassId($this->getCodTaxClass($store));
|
| 57 |
+
$rate = $calc->getRate($taxRequest);
|
| 58 |
+
$tax = $calc->calcTaxAmount($price, $rate, $this->codPriceIncludesTax($store), true);
|
| 59 |
+
|
| 60 |
+
if ($this->codPriceIncludesTax($store)) {
|
| 61 |
+
return $includingTax ? $price : $price - $tax;
|
| 62 |
+
}
|
| 63 |
+
else {
|
| 64 |
+
return $includingTax ? $price + $tax : $price;
|
| 65 |
+
}
|
| 66 |
}
|
| 67 |
|
| 68 |
public function getCodFeeDisplayType($store = null)
|
| 69 |
{
|
|
|
|
| 70 |
$storeId = Mage::app()->getStore($store)->getId();
|
| 71 |
if (!isset($this->_shippingPriceDisplayType[$storeId])) {
|
| 72 |
$this->_shippingPriceDisplayType[$storeId] =
|
| 91 |
}
|
| 92 |
|
| 93 |
}
|
|
|
|
|
|
app/code/community/Phoenix/CashOnDelivery/Model/CashOnDelivery.php
CHANGED
|
@@ -18,7 +18,6 @@
|
|
| 18 |
|
| 19 |
class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Method_Abstract
|
| 20 |
{
|
| 21 |
-
|
| 22 |
/**
|
| 23 |
* unique internal payment method identifier
|
| 24 |
*
|
|
@@ -57,8 +56,8 @@ class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Met
|
|
| 57 |
* @return decimal
|
| 58 |
*
|
| 59 |
*/
|
| 60 |
-
|
| 61 |
-
|
| 62 |
if ($address->getCountry() == Mage::getStoreConfig('shipping/origin/country_id')) {
|
| 63 |
return $this->getInlandCosts();
|
| 64 |
} else {
|
|
@@ -68,7 +67,7 @@ class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Met
|
|
| 68 |
|
| 69 |
public function getAddressCodFee(Mage_Customer_Model_Address_Abstract $address, $value = null, $alreadyExclTax = false)
|
| 70 |
{
|
| 71 |
-
if (is_null($value)){
|
| 72 |
$value = $this->getAddressCosts($address);
|
| 73 |
}
|
| 74 |
if (Mage::helper('cashondelivery')->codPriceIncludesTax()) {
|
|
@@ -81,7 +80,7 @@ class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Met
|
|
| 81 |
|
| 82 |
public function getAddressCodTaxAmount(Mage_Customer_Model_Address_Abstract $address, $value = null, $alreadyExclTax = false)
|
| 83 |
{
|
| 84 |
-
if (is_null($value)){
|
| 85 |
$value = $this->getAddressCosts($address);
|
| 86 |
}
|
| 87 |
if (Mage::helper('cashondelivery')->codPriceIncludesTax()) {
|
|
@@ -105,7 +104,7 @@ class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Met
|
|
| 105 |
return false;
|
| 106 |
}
|
| 107 |
if (!is_null($quote)) {
|
| 108 |
-
if($this->getConfigData('shippingallowspecific', $quote->getStoreId())==1){
|
| 109 |
$country = $quote->getShippingAddress()->getCountry();
|
| 110 |
$availableCountries = explode(',', $this->getConfigData('shippingspecificcountry', $quote->getStoreId()));
|
| 111 |
if(!in_array($country, $availableCountries)){
|
|
@@ -113,10 +112,10 @@ class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Met
|
|
| 113 |
}
|
| 114 |
|
| 115 |
}
|
| 116 |
-
if ($this->getConfigData('disallowspecificshippingmethods', $quote->getStoreId())==1) {
|
| 117 |
$shippingMethodCode = explode('_',$quote->getShippingAddress()->getShippingMethod());
|
| 118 |
$shippingMethodCode = $shippingMethodCode[0];
|
| 119 |
-
if (in_array($shippingMethodCode, explode(','
|
| 120 |
return false;
|
| 121 |
}
|
| 122 |
}
|
| 18 |
|
| 19 |
class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Method_Abstract
|
| 20 |
{
|
|
|
|
| 21 |
/**
|
| 22 |
* unique internal payment method identifier
|
| 23 |
*
|
| 56 |
* @return decimal
|
| 57 |
*
|
| 58 |
*/
|
| 59 |
+
public function getAddressCosts(Mage_Customer_Model_Address_Abstract $address)
|
| 60 |
+
{
|
| 61 |
if ($address->getCountry() == Mage::getStoreConfig('shipping/origin/country_id')) {
|
| 62 |
return $this->getInlandCosts();
|
| 63 |
} else {
|
| 67 |
|
| 68 |
public function getAddressCodFee(Mage_Customer_Model_Address_Abstract $address, $value = null, $alreadyExclTax = false)
|
| 69 |
{
|
| 70 |
+
if (is_null($value)) {
|
| 71 |
$value = $this->getAddressCosts($address);
|
| 72 |
}
|
| 73 |
if (Mage::helper('cashondelivery')->codPriceIncludesTax()) {
|
| 80 |
|
| 81 |
public function getAddressCodTaxAmount(Mage_Customer_Model_Address_Abstract $address, $value = null, $alreadyExclTax = false)
|
| 82 |
{
|
| 83 |
+
if (is_null($value)) {
|
| 84 |
$value = $this->getAddressCosts($address);
|
| 85 |
}
|
| 86 |
if (Mage::helper('cashondelivery')->codPriceIncludesTax()) {
|
| 104 |
return false;
|
| 105 |
}
|
| 106 |
if (!is_null($quote)) {
|
| 107 |
+
if($this->getConfigData('shippingallowspecific', $quote->getStoreId()) == 1) {
|
| 108 |
$country = $quote->getShippingAddress()->getCountry();
|
| 109 |
$availableCountries = explode(',', $this->getConfigData('shippingspecificcountry', $quote->getStoreId()));
|
| 110 |
if(!in_array($country, $availableCountries)){
|
| 112 |
}
|
| 113 |
|
| 114 |
}
|
| 115 |
+
if ($this->getConfigData('disallowspecificshippingmethods', $quote->getStoreId()) == 1) {
|
| 116 |
$shippingMethodCode = explode('_',$quote->getShippingAddress()->getShippingMethod());
|
| 117 |
$shippingMethodCode = $shippingMethodCode[0];
|
| 118 |
+
if (in_array($shippingMethodCode, explode(',', $this->getConfigData('disallowedshippingmethods', $quote->getStoreId())))) {
|
| 119 |
return false;
|
| 120 |
}
|
| 121 |
}
|
app/code/community/Phoenix/CashOnDelivery/Model/Observer.php
CHANGED
|
@@ -17,17 +17,16 @@
|
|
| 17 |
* @copyright Copyright (c) 2010 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
/**
|
| 24 |
* Collects codFee from qoute/addresses to quote
|
| 25 |
*
|
| 26 |
* @param Varien_Event_Observer $observer
|
| 27 |
*
|
| 28 |
*/
|
| 29 |
-
|
| 30 |
-
|
| 31 |
$quote = $observer->getEvent()->getQuote();
|
| 32 |
$data = $observer->getInput();
|
| 33 |
$quote->setCodFee(0);
|
|
@@ -35,28 +34,29 @@ class Phoenix_CashOnDelivery_Model_Observer extends Mage_Core_Model_Abstract {
|
|
| 35 |
$quote->setCodTaxAmount(0);
|
| 36 |
$quote->setBaseCodTaxAmount(0);
|
| 37 |
foreach ($quote->getAllAddresses() as $address) {
|
| 38 |
-
$quote->setCodFee((float) $quote->getCodFee()
|
| 39 |
-
$quote->setBaseCodFee((float) $quote->getBaseCodFee()
|
| 40 |
|
| 41 |
-
$quote->setCodTaxAmount((float) $quote->getCodTaxAmount()
|
| 42 |
-
$quote->setBaseCodTaxAmount((float) $quote->getBaseCodTaxAmount()
|
| 43 |
}
|
| 44 |
}
|
| 45 |
|
| 46 |
/**
|
| 47 |
* Adds codFee to order
|
|
|
|
| 48 |
* @param Varien_Event_Observer $observer
|
| 49 |
*/
|
| 50 |
-
|
| 51 |
-
|
| 52 |
$payment = $observer->getPayment();
|
| 53 |
-
if ($payment->getMethodInstance()->getCode() != 'cashondelivery'){
|
| 54 |
return;
|
| 55 |
}
|
| 56 |
|
| 57 |
$order = $payment->getOrder();
|
| 58 |
$quote = Mage::getSingleton('checkout/session')->getQuote();
|
| 59 |
-
if (
|
| 60 |
$quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
|
| 61 |
}
|
| 62 |
$order->setCodFee($quote->getCodFee());
|
|
@@ -73,18 +73,17 @@ class Phoenix_CashOnDelivery_Model_Observer extends Mage_Core_Model_Abstract {
|
|
| 73 |
* adds totals block to each response
|
| 74 |
* This function is depricated, the totals block update is implemented
|
| 75 |
* in phoenix/cashondelivery/sales.js (SalesOrder class extension)
|
|
|
|
| 76 |
* @param Varien_Event_Observer $observer
|
| 77 |
*/
|
| 78 |
-
|
| 79 |
-
|
| 80 |
$action = $observer->getAction();
|
| 81 |
-
if ($action->getFullActionName() != 'adminhtml_sales_order_create_loadBlock' || !$action->getRequest()->getParam('json')){
|
| 82 |
return;
|
| 83 |
}
|
| 84 |
$layout = $observer->getLayout();
|
| 85 |
$layout->getUpdate()->addHandle('adminhtml_sales_order_create_load_block_totals');
|
| 86 |
}
|
| 87 |
|
| 88 |
-
}
|
| 89 |
-
|
| 90 |
-
?>
|
| 17 |
* @copyright Copyright (c) 2010 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
+
class Phoenix_CashOnDelivery_Model_Observer extends Mage_Core_Model_Abstract
|
| 21 |
+
{
|
|
|
|
| 22 |
/**
|
| 23 |
* Collects codFee from qoute/addresses to quote
|
| 24 |
*
|
| 25 |
* @param Varien_Event_Observer $observer
|
| 26 |
*
|
| 27 |
*/
|
| 28 |
+
public function sales_quote_collect_totals_after(Varien_Event_Observer $observer)
|
| 29 |
+
{
|
| 30 |
$quote = $observer->getEvent()->getQuote();
|
| 31 |
$data = $observer->getInput();
|
| 32 |
$quote->setCodFee(0);
|
| 34 |
$quote->setCodTaxAmount(0);
|
| 35 |
$quote->setBaseCodTaxAmount(0);
|
| 36 |
foreach ($quote->getAllAddresses() as $address) {
|
| 37 |
+
$quote->setCodFee((float) $quote->getCodFee() + $address->getCodFee());
|
| 38 |
+
$quote->setBaseCodFee((float) $quote->getBaseCodFee() + $address->getBaseCodFee());
|
| 39 |
|
| 40 |
+
$quote->setCodTaxAmount((float) $quote->getCodTaxAmount() + $address->getCodTaxAmount());
|
| 41 |
+
$quote->setBaseCodTaxAmount((float) $quote->getBaseCodTaxAmount() + $address->getBaseCodTaxAmount());
|
| 42 |
}
|
| 43 |
}
|
| 44 |
|
| 45 |
/**
|
| 46 |
* Adds codFee to order
|
| 47 |
+
*
|
| 48 |
* @param Varien_Event_Observer $observer
|
| 49 |
*/
|
| 50 |
+
public function sales_order_payment_place_end(Varien_Event_Observer $observer)
|
| 51 |
+
{
|
| 52 |
$payment = $observer->getPayment();
|
| 53 |
+
if ($payment->getMethodInstance()->getCode() != 'cashondelivery') {
|
| 54 |
return;
|
| 55 |
}
|
| 56 |
|
| 57 |
$order = $payment->getOrder();
|
| 58 |
$quote = Mage::getSingleton('checkout/session')->getQuote();
|
| 59 |
+
if (!$quote->getId()) {
|
| 60 |
$quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
|
| 61 |
}
|
| 62 |
$order->setCodFee($quote->getCodFee());
|
| 73 |
* adds totals block to each response
|
| 74 |
* This function is depricated, the totals block update is implemented
|
| 75 |
* in phoenix/cashondelivery/sales.js (SalesOrder class extension)
|
| 76 |
+
*
|
| 77 |
* @param Varien_Event_Observer $observer
|
| 78 |
*/
|
| 79 |
+
public function controller_action_layout_load_before(Varien_Event_Observer $observer)
|
| 80 |
+
{
|
| 81 |
$action = $observer->getAction();
|
| 82 |
+
if ($action->getFullActionName() != 'adminhtml_sales_order_create_loadBlock' || !$action->getRequest()->getParam('json')) {
|
| 83 |
return;
|
| 84 |
}
|
| 85 |
$layout = $observer->getLayout();
|
| 86 |
$layout->getUpdate()->addHandle('adminhtml_sales_order_create_load_block_totals');
|
| 87 |
}
|
| 88 |
|
| 89 |
+
}
|
|
|
|
|
|
app/code/community/Phoenix/CashOnDelivery/Model/Quote/Total.php
CHANGED
|
@@ -18,8 +18,8 @@
|
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 21 |
-
class Phoenix_CashOnDelivery_Model_Quote_Total extends Mage_Sales_Model_Quote_Address_Total_Abstract
|
| 22 |
-
|
| 23 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
| 24 |
{
|
| 25 |
$address->setBaseCodFee(0);
|
|
@@ -60,7 +60,7 @@ class Phoenix_CashOnDelivery_Model_Quote_Total extends Mage_Sales_Model_Quote_Ad
|
|
| 60 |
$baseTotal += $baseCodFee;
|
| 61 |
|
| 62 |
$address->setBaseCodFee($baseCodFee);
|
| 63 |
-
$address->setCodFee($store->convertPrice($baseCodFee,false));
|
| 64 |
|
| 65 |
// update totals
|
| 66 |
$address->setBaseGrandTotal($baseTotal);
|
|
@@ -74,7 +74,8 @@ class Phoenix_CashOnDelivery_Model_Quote_Total extends Mage_Sales_Model_Quote_Ad
|
|
| 74 |
return $this;
|
| 75 |
}
|
| 76 |
|
| 77 |
-
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
|
|
|
| 78 |
$amount = $address->getCodFee();
|
| 79 |
if ($amount!=0) {
|
| 80 |
$quote = $address->getQuote();
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 21 |
+
class Phoenix_CashOnDelivery_Model_Quote_Total extends Mage_Sales_Model_Quote_Address_Total_Abstract
|
| 22 |
+
{
|
| 23 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
| 24 |
{
|
| 25 |
$address->setBaseCodFee(0);
|
| 60 |
$baseTotal += $baseCodFee;
|
| 61 |
|
| 62 |
$address->setBaseCodFee($baseCodFee);
|
| 63 |
+
$address->setCodFee($store->convertPrice($baseCodFee, false));
|
| 64 |
|
| 65 |
// update totals
|
| 66 |
$address->setBaseGrandTotal($baseTotal);
|
| 74 |
return $this;
|
| 75 |
}
|
| 76 |
|
| 77 |
+
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
| 78 |
+
{
|
| 79 |
$amount = $address->getCodFee();
|
| 80 |
if ($amount!=0) {
|
| 81 |
$quote = $address->getQuote();
|
app/code/community/Phoenix/CashOnDelivery/etc/config.xml
CHANGED
|
@@ -23,7 +23,7 @@
|
|
| 23 |
<config>
|
| 24 |
<modules>
|
| 25 |
<Phoenix_CashOnDelivery>
|
| 26 |
-
<version>1.0.
|
| 27 |
</Phoenix_CashOnDelivery>
|
| 28 |
</modules>
|
| 29 |
|
| 23 |
<config>
|
| 24 |
<modules>
|
| 25 |
<Phoenix_CashOnDelivery>
|
| 26 |
+
<version>1.0.3</version>
|
| 27 |
</Phoenix_CashOnDelivery>
|
| 28 |
</modules>
|
| 29 |
|
app/design/adminhtml/default/default/layout/cashondelivery.xml
CHANGED
|
@@ -68,6 +68,12 @@
|
|
| 68 |
<block name="cod_fee" type="cashondelivery/invoice_totals_cod" before="tax"/>
|
| 69 |
</reference>
|
| 70 |
</adminhtml_sales_order_invoice_new>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
|
| 72 |
<adminhtml_sales_order_creditmemo_new>
|
| 73 |
<reference name="sales.order.view.totals.main">
|
| 68 |
<block name="cod_fee" type="cashondelivery/invoice_totals_cod" before="tax"/>
|
| 69 |
</reference>
|
| 70 |
</adminhtml_sales_order_invoice_new>
|
| 71 |
+
|
| 72 |
+
<adminhtml_sales_order_invoice_updateqty>
|
| 73 |
+
<reference name="invoice_totals">
|
| 74 |
+
<block name="cod_fee" type="cashondelivery/invoice_totals_cod" before="tax"/>
|
| 75 |
+
</reference>
|
| 76 |
+
</adminhtml_sales_order_invoice_updateqty>
|
| 77 |
|
| 78 |
<adminhtml_sales_order_creditmemo_new>
|
| 79 |
<reference name="sales.order.view.totals.main">
|
app/etc/modules/Mage_CashOnDelivery.xml
DELETED
|
@@ -1,33 +0,0 @@
|
|
| 1 |
-
<?xml version="1.0"?>
|
| 2 |
-
<!--
|
| 3 |
-
/**
|
| 4 |
-
* Magento
|
| 5 |
-
*
|
| 6 |
-
* NOTICE OF LICENSE
|
| 7 |
-
*
|
| 8 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
-
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
-
* It is also available through the world-wide-web at this URL:
|
| 11 |
-
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
-
* If you did not receive a copy of the license and are unable to
|
| 13 |
-
* obtain it through the world-wide-web, please send an email
|
| 14 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
-
*
|
| 16 |
-
* @category Phoenix
|
| 17 |
-
* @package Phoenix_CashOnDelivery
|
| 18 |
-
* @copyright Copyright (c) 2008-2009 Andrej Sinicyn, Mik3e
|
| 19 |
-
* @copyright Copyright (c) 2010 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
|
| 20 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 21 |
-
*/
|
| 22 |
-
-->
|
| 23 |
-
<config>
|
| 24 |
-
<modules>
|
| 25 |
-
<Mage_CashOnDelivery>
|
| 26 |
-
<active>false</active>
|
| 27 |
-
<codePool>community</codePool>
|
| 28 |
-
<depends>
|
| 29 |
-
<Mage_Payment />
|
| 30 |
-
</depends>
|
| 31 |
-
</Mage_CashOnDelivery>
|
| 32 |
-
</modules>
|
| 33 |
-
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>CashOnDelivery</name>
|
| 4 |
-
<version>1.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Cash on Delivery allows to book additional fee on delivery depending on inland or international delivery.</summary>
|
| 10 |
<description>Cash on Delivery allows to book additional fee on delivery depending on inland or international delivery.</description>
|
| 11 |
-
<notes>-
|
| 12 |
<authors><author><name>Phoenix Medien</name><user>auto-converted</user><email>info@phoenix-medien.de</email></author></authors>
|
| 13 |
-
<date>
|
| 14 |
-
<time>16:
|
| 15 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="cashondelivery.xml" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>CashOnDelivery</name>
|
| 4 |
+
<version>1.0.3</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Cash on Delivery allows to book additional fee on delivery depending on inland or international delivery.</summary>
|
| 10 |
<description>Cash on Delivery allows to book additional fee on delivery depending on inland or international delivery.</description>
|
| 11 |
+
<notes>- added missing totals in invoice</notes>
|
| 12 |
<authors><author><name>Phoenix Medien</name><user>auto-converted</user><email>info@phoenix-medien.de</email></author></authors>
|
| 13 |
+
<date>2012-03-26</date>
|
| 14 |
+
<time>15:16:26</time>
|
| 15 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="cashondelivery.xml" hash="d958bd8b5f96a4d6cb093800155bbf08"/></dir><dir name="template"><dir name="cashondelivery"><dir name="pdf"><file name="info.phtml" hash="b40f4cff0103aac523ef3699354d9eaf"/></dir><dir name="sales"><dir name="order"><dir name="create"><dir name="totals"><file name="cod.phtml" hash="7422de3104549c82730ce838ca1fe6ac"/></dir></dir></dir></dir><file name="form.phtml" hash="93353b0505440a40e58cdbe6eb21c1f3"/><file name="info.phtml" hash="fa71f954c15e6404ef29845910766811"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cashondelivery.xml" hash="f36ebac7ddc1b545afc1b455f60ab32a"/></dir><dir name="template"><dir name="cashondelivery"><dir name="checkout"><file name="cod.phtml" hash="32f3b650a32f742cbe9e7393c241151c"/></dir><file name="form.phtml" hash="50dc6f9e3b64f86d3e13fa36521c3fd1"/><file name="info.phtml" hash="e4595a0b3161234b6f1998df7b668258"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Phoenix_CashOnDelivery.csv" hash="d03007b6a0ecdd299f4938005b270705"/></dir><dir name="el_GR"><file name="Phoenix_CashOnDelivery.csv" hash="707f2191bf6e6fcd7b416153dc67ff3c"/></dir><dir name="en_US"><file name="Phoenix_CashOnDelivery.csv" hash="cd2ec780c7269dc23eec86bd61405329"/></dir><dir name="pl_PL"><file name="Phoenix_CashOnDelivery.csv" hash="0645f849c401d9ec5a059f8cfaf50518"/></dir></target><target name="mageweb"><dir name="js"><dir name="phoenix"><dir name="cashondelivery"><file name="sales.js" hash="3d499a43715b0226ece4e795aeffc967"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Phoenix_CashOnDelivery.xml" hash="399693025d037e98669e9495b5771a0b"/></dir></target><target name="magecommunity"><dir name="Phoenix"><dir name="CashOnDelivery"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Create"><dir name="Totals"><file name="Cod.php" hash="57b6ac50a1ab854e830c59f549418728"/></dir></dir><dir name="Creditmemo"><dir name="Totals"><file name="Cod.php" hash="519aadcd4036d02d46a42d38e2b20f24"/></dir></dir></dir></dir></dir><dir name="Checkout"><file name="Cod.php" hash="f086c179ff7e57fa8b90e0ddae279901"/></dir><dir name="Invoice"><dir name="Totals"><file name="Cod.php" hash="7c09dc9969f4b8a775f45978619a4789"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Cod.php" hash="8682a4dc107a8c9c2ec82f521def3e3d"/></dir></dir><file name="Form.php" hash="98db85c8cd1c61518e916ae8b009d4b4"/><file name="Info.php" hash="2e179e95f534db2a2ba4474d8ff36710"/></dir><dir name="etc"><file name="config.xml" hash="32b4e460e6a76860ddaa53ab75931833"/><file name="system.xml" hash="06688dc2945813fc4e796f037de7617b"/></dir><dir name="Helper"><file name="Data.php" hash="2de69fb72472a0b9a0fe2452ad67abfa"/></dir><dir name="Model"><dir name="Creditmemo"><file name="Total.php" hash="1d1606f8730d37136e4f5824d7561986"/></dir><dir name="Invoice"><file name="Tax.php" hash="e472d859623f7de7829aa2579cc54462"/><file name="Total.php" hash="3de53861c195c311615537eadcefd5dd"/></dir><dir name="Quote"><file name="TaxTotal.php" hash="b16472223336a13d6a65208a24ad108e"/><file name="Total.php" hash="207f481153d00451ccaf9d200d1cb056"/></dir><dir name="Sales"><dir name="Pdf"><file name="Cod.php" hash="259719c22d34e0a21c439d2d1b56e787"/></dir></dir><dir name="Source"><file name="AvailableShipmentMethods.php" hash="2959c8ac25cd736b4c3c12eb67ed39d2"/></dir><file name="CashOnDelivery.php" hash="d7daa0d56648ce3c74c79c98ab63f17c"/><file name="Observer.php" hash="8177fc07f0cc41dfb7862275dba22ae5"/></dir><dir name="sql"><dir name="cashondelivery_setup"><file name="mysql4-install-0.2.0.php" hash="d463e6ab6241dbc43486755a49efffa2"/><file name="mysql4-upgrade-0.2.0-0.2.1.php" hash="4dc5e368cc4e123e56a20a3ff66288c1"/><file name="mysql4-upgrade-0.3.2-0.3.3.php" hash="10f0c3c3c4941e3b1dab19270a24d5cf"/><file name="mysql4-upgrade-0.4.6-0.4.7.php" hash="22b07cb1ada2c86de4777f859f73ed85"/></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
