Version Notes
Made compatible with 1.2.1.2
Download this release
Release Info
Developer | Magento Core Team |
Extension | Minerva_Shipping |
Version | 1.2.1 |
Comparing to | |
See all releases |
Code changes from version 1.2.0 to 1.2.1
- app/code/community/Mage/Sales/Model/Quote/Address/Rate.php +80 -0
- app/code/community/Minerva/Sales/Model/Quote/Address/Rate.php +79 -0
- app/code/community/Minerva/Shipping/Model/Carrier/Multiflat.php +1 -0
- app/design/frontend/default/minerva_default/template/checkout/cart/shipping.phtml +108 -0
- app/design/frontend/default/minerva_default/template/checkout/onepage/shipping_method/available.phtml +59 -0
- package.xml +13 -8
app/code/community/Mage/Sales/Model/Quote/Address/Rate.php
ADDED
@@ -0,0 +1,80 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @package Mage_Sales
|
23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
|
27 |
+
|
28 |
+
class Mage_Sales_Model_Quote_Address_Rate extends Mage_Shipping_Model_Rate_Abstract
|
29 |
+
{
|
30 |
+
protected $_address;
|
31 |
+
|
32 |
+
protected function _construct()
|
33 |
+
{
|
34 |
+
$this->_init('sales/quote_address_rate');
|
35 |
+
}
|
36 |
+
|
37 |
+
protected function _beforeSave()
|
38 |
+
{
|
39 |
+
parent::_beforeSave();
|
40 |
+
if ($this->getAddress()) {
|
41 |
+
$this->setAddressId($this->getAddress()->getId());
|
42 |
+
}
|
43 |
+
return $this;
|
44 |
+
}
|
45 |
+
|
46 |
+
public function setAddress(Mage_Sales_Model_Quote_Address $address)
|
47 |
+
{
|
48 |
+
$this->_address = $address;
|
49 |
+
return $this;
|
50 |
+
}
|
51 |
+
|
52 |
+
public function getAddress()
|
53 |
+
{
|
54 |
+
return $this->_address;
|
55 |
+
}
|
56 |
+
|
57 |
+
public function importShippingRate(Mage_Shipping_Model_Rate_Result_Abstract $rate)
|
58 |
+
{
|
59 |
+
if ($rate instanceof Mage_Shipping_Model_Rate_Result_Error) {
|
60 |
+
$this
|
61 |
+
->setCode($rate->getCarrier().'_error')
|
62 |
+
->setCarrier($rate->getCarrier())
|
63 |
+
->setCarrierTitle($rate->getCarrierTitle())
|
64 |
+
->setErrorMessage($rate->getErrorMessage())
|
65 |
+
;
|
66 |
+
} elseif ($rate instanceof Mage_Shipping_Model_Rate_Result_Method) {
|
67 |
+
$this
|
68 |
+
->setCode($rate->getCarrier().'_'.$rate->getMethod())
|
69 |
+
->setCarrier($rate->getCarrier())
|
70 |
+
->setCarrierTitle($rate->getCarrierTitle())
|
71 |
+
->setMethod($rate->getMethod())
|
72 |
+
->setMethodTitle($rate->getMethodTitle())
|
73 |
+
->setMethodDetails($rate->getMethodDetails())
|
74 |
+
->setMethodDescription($rate->getMethodDescription())
|
75 |
+
->setPrice($rate->getPrice())
|
76 |
+
;
|
77 |
+
}
|
78 |
+
return $this;
|
79 |
+
}
|
80 |
+
}
|
app/code/community/Minerva/Sales/Model/Quote/Address/Rate.php
ADDED
@@ -0,0 +1,79 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @package Mage_Sales
|
23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
|
27 |
+
class Mage_Sales_Model_Quote_Address_Rate extends Mage_Shipping_Model_Rate_Abstract
|
28 |
+
{
|
29 |
+
protected $_address;
|
30 |
+
|
31 |
+
protected function _construct()
|
32 |
+
{
|
33 |
+
$this->_init('sales/quote_address_rate');
|
34 |
+
}
|
35 |
+
|
36 |
+
protected function _beforeSave()
|
37 |
+
{
|
38 |
+
parent::_beforeSave();
|
39 |
+
if ($this->getAddress()) {
|
40 |
+
$this->setParentId($this->getAddress()->getId());
|
41 |
+
}
|
42 |
+
return $this;
|
43 |
+
}
|
44 |
+
|
45 |
+
public function setAddress(Mage_Sales_Model_Quote_Address $address)
|
46 |
+
{
|
47 |
+
$this->_address = $address;
|
48 |
+
return $this;
|
49 |
+
}
|
50 |
+
|
51 |
+
public function getAddress()
|
52 |
+
{
|
53 |
+
return $this->_address;
|
54 |
+
}
|
55 |
+
|
56 |
+
public function importShippingRate(Mage_Shipping_Model_Rate_Result_Abstract $rate)
|
57 |
+
{
|
58 |
+
if ($rate instanceof Mage_Shipping_Model_Rate_Result_Error) {
|
59 |
+
$this
|
60 |
+
->setCode($rate->getCarrier().'_error')
|
61 |
+
->setCarrier($rate->getCarrier())
|
62 |
+
->setCarrierTitle($rate->getCarrierTitle())
|
63 |
+
->setErrorMessage($rate->getErrorMessage())
|
64 |
+
;
|
65 |
+
} elseif ($rate instanceof Mage_Shipping_Model_Rate_Result_Method) {
|
66 |
+
$this
|
67 |
+
->setCode($rate->getCarrier().'_'.$rate->getMethod())
|
68 |
+
->setCarrier($rate->getCarrier())
|
69 |
+
->setCarrierTitle($rate->getCarrierTitle())
|
70 |
+
->setMethod($rate->getMethod())
|
71 |
+
->setMethodDescription($rate->getMethodTitle())
|
72 |
+
->setMethodDetails($rate->getMethodDetails())
|
73 |
+
->setMethodDescription($rate->getMethodDescription())
|
74 |
+
->setPrice($rate->getPrice())
|
75 |
+
;
|
76 |
+
}
|
77 |
+
return $this;
|
78 |
+
}
|
79 |
+
}
|
app/code/community/Minerva/Shipping/Model/Carrier/Multiflat.php
CHANGED
@@ -59,6 +59,7 @@ class Minerva_Shipping_Model_Carrier_Multiflat extends Mage_Shipping_Model_Carri
|
|
59 |
$method->setMethod($this->getConfigData('name'.$i));
|
60 |
$method->setMethodTitle($this->getConfigData('name'.$i));
|
61 |
$method->setMethodDetails($this->getConfigData('details'.$i));
|
|
|
62 |
$method->setPrice($shippingPrice);
|
63 |
$method->setCost($shippingPrice);
|
64 |
$result->append($method);
|
59 |
$method->setMethod($this->getConfigData('name'.$i));
|
60 |
$method->setMethodTitle($this->getConfigData('name'.$i));
|
61 |
$method->setMethodDetails($this->getConfigData('details'.$i));
|
62 |
+
$method->setMethodDescription($this->getConfigData('details'.$i));
|
63 |
$method->setPrice($shippingPrice);
|
64 |
$method->setCost($shippingPrice);
|
65 |
$result->append($method);
|
app/design/frontend/default/minerva_default/template/checkout/cart/shipping.phtml
ADDED
@@ -0,0 +1,108 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php * If you did not receive a copy of the license and are unable to
|
11 |
+
* obtain it through the world-wide-web, please send an email
|
12 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
13 |
+
*
|
14 |
+
* @category design_default
|
15 |
+
* @package Mage
|
16 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
17 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
18 |
+
*/
|
19 |
+
?>
|
20 |
+
<?php
|
21 |
+
/**
|
22 |
+
* @see Mage_Checkout_Block_Cart_Shipping
|
23 |
+
*/
|
24 |
+
?>
|
25 |
+
<div class="shipping-estimate box">
|
26 |
+
<h4><?php echo $this->__('Estimate Shipping and Tax') ?></h4>
|
27 |
+
<form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
|
28 |
+
<p><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
|
29 |
+
<p><label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br /><span><?php echo Mage::getBlockSingleton('directory/data')->getCountryHtmlSelect($this->getEstimateCountryId()) ?></span></p>
|
30 |
+
<?php //if($this->getStateActive()): ?>
|
31 |
+
<p>
|
32 |
+
<label for="region_id"><?php echo $this->__('State/Province') ?><?php if ($this->isStateProvinceRequired()):?> <span class="required">*</span><?php endif;?></label><br />
|
33 |
+
<select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" style="display:none"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
|
34 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
35 |
+
</select>
|
36 |
+
<script type="text/javascript">
|
37 |
+
$('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
|
38 |
+
</script>
|
39 |
+
<input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getEstimateRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
|
40 |
+
</p>
|
41 |
+
<?php //endif; ?>
|
42 |
+
<?php if($this->getCityActive()): ?>
|
43 |
+
<p><label for="city"><?php echo $this->__('City') ?><?php if ($this->isCityRequired()):?> <span class="required">*</span><?php endif;?></label><br />
|
44 |
+
<input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->htmlEscape($this->getEstimateCity()) ?>" />
|
45 |
+
</p>
|
46 |
+
<?php endif; ?>
|
47 |
+
<p><label for="postcode"><?php echo $this->__('Zip/Postal Code') ?><?php if ($this->isZipCodeRequired()):?> <span class="required">*</span><?php endif;?></label><br />
|
48 |
+
<input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->htmlEscape($this->getEstimatePostcode()) ?>" /></p>
|
49 |
+
<p><button type="button" onclick="coShippingMethodForm.submit()" class="form-button-alt"><span><?php echo $this->__('Get a Quote') ?></span></button></p>
|
50 |
+
</form>
|
51 |
+
<script type="text/javascript">
|
52 |
+
new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
|
53 |
+
</script>
|
54 |
+
|
55 |
+
<?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
|
56 |
+
<div class="divider"></div>
|
57 |
+
<form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
|
58 |
+
<dl class="shipment-methods">
|
59 |
+
<?php foreach ($_shippingRateGroups as $code => $_rates): ?>
|
60 |
+
<dt><?php echo $this->getCarrierName($code) ?></dt>
|
61 |
+
<dd>
|
62 |
+
<ul>
|
63 |
+
<?php foreach ($_rates as $_rate): ?>
|
64 |
+
<li class="<?php if ($_rate->getErrorMessage()) echo 'error-msg';?>">
|
65 |
+
<?php if ($_rate->getErrorMessage()): ?>
|
66 |
+
<?php echo $_rate->getErrorMessage() ?>
|
67 |
+
<?php else: ?>
|
68 |
+
<input name="estimate_method" type="radio" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> />
|
69 |
+
<label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
|
70 |
+
<strong>
|
71 |
+
<?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
|
72 |
+
<?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
|
73 |
+
|
74 |
+
<?php echo $_excl; ?>
|
75 |
+
<?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
|
76 |
+
(<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
|
77 |
+
<?php endif; ?>
|
78 |
+
</strong></label><br/><div class="shipDetails"><?php echo $_rate->getMethodDetails() ?></div>
|
79 |
+
<?php endif ?>
|
80 |
+
</li>
|
81 |
+
<?php endforeach; ?>
|
82 |
+
</ul>
|
83 |
+
</dd>
|
84 |
+
<?php endforeach; ?>
|
85 |
+
</dl>
|
86 |
+
<fieldset>
|
87 |
+
<button type="submit" class="form-button-alt" name="do" value="<?php echo $this->__('Update Total') ?>"><span><?php echo $this->__('Update Total') ?></span></button>
|
88 |
+
</fieldset>
|
89 |
+
</form>
|
90 |
+
<?php endif; ?>
|
91 |
+
|
92 |
+
<script type="text/javascript">
|
93 |
+
var coShippingMethodForm = new VarienForm('shipping-zip-form');
|
94 |
+
Validation.addAllThese(
|
95 |
+
[
|
96 |
+
['validate-postcode', '<?php echo $this->__('Please enter a valid zip code. For example 90602 or 90602-1234.') ?>', function(v) {
|
97 |
+
var element = $('postcode');
|
98 |
+
if (element && ('' != element.value)) {
|
99 |
+
if (!element.value.match(/(^[A-z0-9]{2,10}([\s]{0,2}|[\-]{0,2})[A-z0-9]{2,10}$)/ )) {
|
100 |
+
return false;
|
101 |
+
}
|
102 |
+
}
|
103 |
+
return true;
|
104 |
+
}]
|
105 |
+
]
|
106 |
+
);
|
107 |
+
</script>
|
108 |
+
</div>
|
app/design/frontend/default/minerva_default/template/checkout/onepage/shipping_method/available.phtml
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design_default
|
22 |
+
* @package Mage
|
23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
|
28 |
+
<strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong>
|
29 |
+
<?php else: ?>
|
30 |
+
<dl class="shipment-methods">
|
31 |
+
<?php foreach ($_shippingRateGroups as $code => $_rates): ?>
|
32 |
+
<dt><?php echo $this->getCarrierName($code) ?></dt>
|
33 |
+
<dd>
|
34 |
+
<ul>
|
35 |
+
<?php foreach ($_rates as $_rate): ?>
|
36 |
+
<li>
|
37 |
+
<?php if ($_rate->getErrorMessage()): ?>
|
38 |
+
<ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
|
39 |
+
<?php else: ?>
|
40 |
+
<input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> />
|
41 |
+
<label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
|
42 |
+
<strong>
|
43 |
+
<?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
|
44 |
+
<?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
|
45 |
+
|
46 |
+
<?php echo $_excl; ?>
|
47 |
+
<?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
|
48 |
+
(<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
|
49 |
+
<?php endif; ?>
|
50 |
+
</strong>
|
51 |
+
</label><br /><div class="shipDetails"><?php echo $_rate->getMethodDetails() ?></div>
|
52 |
+
<?php endif ?>
|
53 |
+
</li>
|
54 |
+
<?php endforeach; ?>
|
55 |
+
</ul>
|
56 |
+
</dd>
|
57 |
+
<?php endforeach; ?>
|
58 |
+
</dl>
|
59 |
+
<?php endif; ?>
|
package.xml
CHANGED
@@ -1,13 +1,13 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Minerva_Shipping</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Adds the ability to enter pickup locations or multiple flatrates and displays method details.</summary>
|
10 |
-
<description>PLEASE NOTE: THIS EXTENSION IS NOW COMPATIBLE WITH 1.2.1.2.
|
11 |
|
12 |
As I have time I will extend the classes to hopefully make it not as version dependent; however, it relies heavily on template files.
|
13 |
|
@@ -23,6 +23,13 @@ This extension is free to the community but I do work on it in my spare time so
|
|
23 |
• I have been really busy lately so have not been able to modify in awhile, but hope to do so again soon.
|
24 |
|
25 |
<span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;">Release Notes</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
26 |
1.0.0 - Changes
|
27 |
• Extension is now compatible with Magento 1.1.6; previous versions will no longer be supported.
|
28 |
|
@@ -45,11 +52,9 @@ This module adds a flexible shipping module with two main uses:
|
|
45 |
|
46 |
2. Multiple Flatrates - List up to 10 different flatrates so you can set a flat fee for Standard Shipping, Expedited Shipping, etc.
|
47 |
|
48 |
-
There are two template files needed and both are included for the default
|
49 |
• app/design/frontend/default/minerva_default/template/checkout/cart/shipping.phtml
|
50 |
• app/design/frontend/default/minerva_default/template/checkout/onepage/shipping/available.phtml
|
51 |
-
• app/design/frontend/default/minerva_modern/template/checkout/cart/shipping.phtml
|
52 |
-
• app/design/frontend/default/minerva_modern/template/checkout/onepage/shipping/available.phtml
|
53 |
|
54 |
The class shipDetails is built into these two template files. The standard css tag for this class would be:
|
55 |
.shipDetails { padding-left: 25px; }
|
@@ -63,9 +68,9 @@ The class shipDetails is built into these two template files. The standard css t
|
|
63 |
• If you enter quotation marks in the Event/Method field the checkout will display an error message.</description>
|
64 |
<notes>Made compatible with 1.2.1.2</notes>
|
65 |
<authors><author><name>Sherrie Rohde</name><user>auto-converted</user><email>sherrie@minervapromotions.com</email></author><author><name>Robert Chambers</name><user>auto-converted</user><email>admin@robertchambers.co.uk</email></author><author><name>Shane Harper</name><user>auto-converted</user><email>shane@collinsharper.com</email></author></authors>
|
66 |
-
<date>2009-03-
|
67 |
-
<time>
|
68 |
-
<contents><target name="magecommunity"><dir name="Minerva"><dir name="Shipping"><dir name="etc"><file name="config.xml" hash="9a4a8af0d264fe748d3495b26b6d2fdd"/><file name="system.xml" hash="78dde03b08466e3560a5485145883e74"/></dir><dir name="Model"><dir name="Carrier"><file name="Multiflat.php" hash="
|
69 |
<compatible/>
|
70 |
<dependencies/>
|
71 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Minerva_Shipping</name>
|
4 |
+
<version>1.2.1</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>
|
8 |
<extends/>
|
9 |
<summary>Adds the ability to enter pickup locations or multiple flatrates and displays method details.</summary>
|
10 |
+
<description>PLEASE NOTE: THIS EXTENSION IS NOW COMPATIBLE WITH 1.2.1.2.
|
11 |
|
12 |
As I have time I will extend the classes to hopefully make it not as version dependent; however, it relies heavily on template files.
|
13 |
|
23 |
• I have been really busy lately so have not been able to modify in awhile, but hope to do so again soon.
|
24 |
|
25 |
<span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;">Release Notes</span>
|
26 |
+
1.2.1 - Changes
|
27 |
+
• Extension displays descriptions again
|
28 |
+
|
29 |
+
1.2.0 - Changes
|
30 |
+
• Extension is now compatible with Magento 1.2.x
|
31 |
+
• Extension no longer creates invoicing and shipping errors caused by 1.1.x transition
|
32 |
+
|
33 |
1.0.0 - Changes
|
34 |
• Extension is now compatible with Magento 1.1.6; previous versions will no longer be supported.
|
35 |
|
52 |
|
53 |
2. Multiple Flatrates - List up to 10 different flatrates so you can set a flat fee for Standard Shipping, Expedited Shipping, etc.
|
54 |
|
55 |
+
There are two template files needed and both are included for the default package. These files are
|
56 |
• app/design/frontend/default/minerva_default/template/checkout/cart/shipping.phtml
|
57 |
• app/design/frontend/default/minerva_default/template/checkout/onepage/shipping/available.phtml
|
|
|
|
|
58 |
|
59 |
The class shipDetails is built into these two template files. The standard css tag for this class would be:
|
60 |
.shipDetails { padding-left: 25px; }
|
68 |
• If you enter quotation marks in the Event/Method field the checkout will display an error message.</description>
|
69 |
<notes>Made compatible with 1.2.1.2</notes>
|
70 |
<authors><author><name>Sherrie Rohde</name><user>auto-converted</user><email>sherrie@minervapromotions.com</email></author><author><name>Robert Chambers</name><user>auto-converted</user><email>admin@robertchambers.co.uk</email></author><author><name>Shane Harper</name><user>auto-converted</user><email>shane@collinsharper.com</email></author></authors>
|
71 |
+
<date>2009-03-19</date>
|
72 |
+
<time>19:55:25</time>
|
73 |
+
<contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="minerva_default"><dir name="template"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="d6a52d117c45c01e7588075562f3a3f3"/></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="72d57e80da895cf962461843608f131d"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Mage"><dir name="Sales"><dir name="Model"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="5bf0e572af50b5af6ec8d033ac3ae651"/></dir></dir></dir></dir></dir><dir name="Minerva"><dir name="Sales"><dir name="Model"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="55207952d3db3f461551abe507379ac4"/></dir></dir></dir></dir><dir name="Shipping"><dir name="etc"><file name="config.xml" hash="9a4a8af0d264fe748d3495b26b6d2fdd"/><file name="system.xml" hash="78dde03b08466e3560a5485145883e74"/></dir><dir name="Model"><dir name="Carrier"><file name="Multiflat.php" hash="8a284266e7b468deadaaf4647dd454c1"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Minerva_Shipping.xml" hash="8d480a535a58a0035fe0c964077a1a97"/></dir></target></contents>
|
74 |
<compatible/>
|
75 |
<dependencies/>
|
76 |
</package>
|