Bemaged_NoFax - Version 1.1.0

Version Notes

Security Improvements

Release Info

Developer	Matthijs IJsseldijk
Extension	Bemaged_NoFax
Version	1.1.0
Comparing to
See all releases

Code changes from version 1.0.4 to 1.1.0

Files changed (5) hide show

app/code/community/Bemaged/NoFax/etc/config.xml +1 -1
app/design/frontend/base/default/template/bemaged/nofax/checkout/onepage/billing.phtml +21 -20
app/design/frontend/base/default/template/bemaged/nofax/checkout/onepage/shipping.phtml +17 -16
app/design/frontend/base/default/template/bemaged/nofax/customer/widget/fax.phtml +1 -1
package.xml +5 -5

app/code/community/Bemaged/NoFax/etc/config.xml CHANGED Viewed

	@@ -17,7 +17,7 @@
17	<config>
18	<modules>
19	<Bemaged_NoFax>
20	- <version>1.0.4</version>
21	</Bemaged_NoFax>
22	</modules>
23	<global>


17	<config>
18	<modules>
19	<Bemaged_NoFax>
20	+ <version>1.1.0</version>
21	</Bemaged_NoFax>
22	</modules>
23	<global>

app/design/frontend/base/default/template/bemaged/nofax/checkout/onepage/billing.phtml CHANGED Viewed

	@@ -10,17 +10,18 @@
10	* http://opensource.org/licenses/afl-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
22	* @package base_default
23	- * @copyright Copyright (c) 2015 ~~Matthijs~~ ~~IJsseldijk~~ (~~https~~://www.~~bemaged~~.com)

24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
	@@ -44,14 +45,14 @@
44	<div class="field">
45	<label for="billing:company"><?php echo $this->__('Company') ?></label>
46	<div class="input-box">
47	- <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
48	</div>
49	</div>
50	<?php if(!$this->isCustomerLoggedIn()): ?>
51	<div class="field">
52	<label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53	<div class="input-box">
54	- <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
55	</div>
56	</div>
57	<?php endif; ?>
	@@ -60,14 +61,14 @@
60	<li class="wide">
61	<label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
62	<div class="input-box">
63	- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
64	</div>
65	</li>
66	<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
67	<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
68	<li class="wide">
69	<div class="input-box">
70	- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
71	</div>
72	</li>
73	<?php endfor; ?>
	@@ -75,7 +76,7 @@
75	<li class="wide">
76	<label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
77	<div class="input-box">
78	- <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
79	</div>
80	</li>
81	<?php endif; ?>
	@@ -83,13 +84,13 @@
83	<div class="field">
84	<label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
85	<div class="input-box">
86	- <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
87	</div>
88	</div>
89	<div class="field">
90	<label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
91	<div class="input-box">
92	- <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
93	<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
94	</select>
95	<script type="text/javascript">
	@@ -97,7 +98,7 @@
97	$('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
98	//]]>
99	</script>
100	- <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
101	</div>
102	</div>
103	</li>
	@@ -105,7 +106,7 @@
105	<div class="field">
106	<label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
107	<div class="input-box">
108	- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
109	</div>
110	</div>
111	<div class="field">
	@@ -119,7 +120,7 @@
119	<div class="field">
120	<label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
121	<div class="input-box">
122	- <input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
123	</div>
124	</div>
125	<?php echo $this->getLayout()->createBlock('nofax/widget_fax')->setObject($this->getAddress()->getFax() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
	@@ -154,20 +155,20 @@
154	<div class="field">
155	<label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
156	<div class="input-box">
157	- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
158	</div>
159	</div>
160	<div class="field">
161	<label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
162	<div class="input-box">
163	- <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
164	</div>
165	</div>
166	</li>
167	<?php endif; ?>
168	<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
169	<li class="control">
170	- <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
171	</li>
172	<?php else:?>
173	<li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
	@@ -180,9 +181,9 @@
180	<?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
181	<?php if ($this->canShip()): ?>
182	<li class="control">
183	- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
184	<li class="control">
185	- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
186	</li>
187	<?php endif; ?>
188	</ul>
	@@ -191,9 +192,9 @@
191	<?php endif; ?>
192	<div class="buttons-set" id="billing-buttons-container">
193	<p class="required"><?php echo $this->__('* Required Fields') ?></p>
194	- <button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
195	<span class="please-wait" id="billing-please-wait" style="display:none;">
196	- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
197	</span>
198	</div>
199	</fieldset>


10	* http://opensource.org/licenses/afl-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@magento.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.magento.com for more information.
20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24	+ * @modified Matthijs IJsseldijk (hello@bemaged.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	?>

45	<div class="field">
46	<label for="billing:company"><?php echo $this->__('Company') ?></label>
47	<div class="input-box">
48	+ <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
49	</div>
50	</div>
51	<?php if(!$this->isCustomerLoggedIn()): ?>
52	<div class="field">
53	<label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
54	<div class="input-box">
55	+ <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
56	</div>
57	</div>
58	<?php endif; ?>

61	<li class="wide">
62	<label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
63	<div class="input-box">
64	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
65	</div>
66	</li>
67	<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
68	<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
69	<li class="wide">
70	<div class="input-box">
71	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
72	</div>
73	</li>
74	<?php endfor; ?>

76	<li class="wide">
77	<label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
78	<div class="input-box">
79	+ <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
80	</div>
81	</li>
82	<?php endif; ?>

84	<div class="field">
85	<label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
86	<div class="input-box">
87	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
88	</div>
89	</div>
90	<div class="field">
91	<label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
92	<div class="input-box">
93	+ <select id="billing:region_id" name="billing[region_id]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
94	<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
95	</select>
96	<script type="text/javascript">

98	$('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
99	//]]>
100	</script>
101	+ <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
102	</div>
103	</div>
104	</li>

106	<div class="field">
107	<label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
108	<div class="input-box">
109	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
110	</div>
111	</div>
112	<div class="field">

120	<div class="field">
121	<label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
122	<div class="input-box">
123	+ <input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
124	</div>
125	</div>
126	<?php echo $this->getLayout()->createBlock('nofax/widget_fax')->setObject($this->getAddress()->getFax() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>

155	<div class="field">
156	<label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
157	<div class="input-box">
158	+ <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" class="input-text required-entry validate-password" />
159	</div>
160	</div>
161	<div class="field">
162	<label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
163	<div class="input-box">
164	+ <input type="password" name="billing[confirm_password]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
165	</div>
166	</div>
167	</li>
168	<?php endif; ?>
169	<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
170	<li class="control">
171	+ <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save in address book')) ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
172	</li>
173	<?php else:?>
174	<li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>

181	<?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
182	<?php if ($this->canShip()): ?>
183	<li class="control">
184	+ <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo Mage::helper('core')->quoteEscape($this->__('Ship to this address')) ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
185	<li class="control">
186	+ <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo Mage::helper('core')->quoteEscape($this->__('Ship to different address')) ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
187	</li>
188	<?php endif; ?>
189	</ul>

192	<?php endif; ?>
193	<div class="buttons-set" id="billing-buttons-container">
194	<p class="required"><?php echo $this->__('* Required Fields') ?></p>
195	+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
196	<span class="please-wait" id="billing-please-wait" style="display:none;">
197	+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
198	</span>
199	</div>
200	</fieldset>

app/design/frontend/base/default/template/bemaged/nofax/checkout/onepage/shipping.phtml CHANGED Viewed

	@@ -10,17 +10,18 @@
10	* http://opensource.org/licenses/afl-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
22	* @package base_default
23	- * @copyright Copyright (c) 2015 ~~Matthijs~~ ~~IJsseldijk~~ (~~https~~://www.~~bemaged~~.com)

24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
	@@ -43,7 +44,7 @@
43	<div class="fields">
44	<label for="shipping:company"><?php echo $this->__('Company') ?></label>
45	<div class="input-box">
46	- <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
47	</div>
48	</div>
49	</li>
	@@ -51,14 +52,14 @@
51	<li class="wide">
52	<label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
53	<div class="input-box">
54	- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
55	</div>
56	</li>
57	<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
58	<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
59	<li class="wide">
60	<div class="input-box">
61	- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
62	</div>
63	</li>
64	<?php endfor; ?>
	@@ -66,7 +67,7 @@
66	<li class="wide">
67	<label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
68	<div class="input-box">
69	- <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo $this->__('VAT Number'); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
70	</div>
71	</li>
72	<?php endif; ?>
	@@ -74,13 +75,13 @@
74	<div class="field">
75	<label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
76	<div class="input-box">
77	- <input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
78	</div>
79	</div>
80	<div class="field">
81	<label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
82	<div class="input-box">
83	- <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
84	<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
85	</select>
86	<script type="text/javascript">
	@@ -88,7 +89,7 @@
88	$('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
89	//]]>
90	</script>
91	- <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
92	</div>
93	</div>
94	</li>
	@@ -96,7 +97,7 @@
96	<div class="field">
97	<label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
98	<div class="input-box">
99	- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
100	</div>
101	</div>
102	<div class="field">
	@@ -110,14 +111,14 @@
110	<div class="field">
111	<label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
112	<div class="input-box">
113	- <input type="text" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
114	</div>
115	</div>
116	<?php echo $this->getLayout()->createBlock('nofax/widget_fax')->setObject($this->getAddress()->getFax() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->toHtml() ?>
117	</li>
118	<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
119	<li class="control">
120	- <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
121	<?php else:?>
122	<li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
123	<?php endif;?>
	@@ -131,9 +132,9 @@
131	<div class="buttons-set" id="shipping-buttons-container">
132	<p class="required"><?php echo $this->__('* Required Fields') ?></p>
133	<p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
134	- <button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
135	<span id="shipping-please-wait" class="please-wait" style="display:none;">
136	- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
137	</span>
138	</div>
139	</form>
	@@ -143,7 +144,7 @@
143	'<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
144	var shippingForm = new VarienForm('co-shipping-form');
145	shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
146	- //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
147	$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
148
149	var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');


10	* http://opensource.org/licenses/afl-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@magento.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.magento.com for more information.
20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24	+ * @modified Matthijs IJsseldijk (hello@bemaged.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	?>

44	<div class="fields">
45	<label for="shipping:company"><?php echo $this->__('Company') ?></label>
46	<div class="input-box">
47	+ <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
48	</div>
49	</div>
50	</li>

52	<li class="wide">
53	<label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
54	<div class="input-box">
55	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
56	</div>
57	</li>
58	<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
59	<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
60	<li class="wide">
61	<div class="input-box">
62	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
63	</div>
64	</li>
65	<?php endfor; ?>

67	<li class="wide">
68	<label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
69	<div class="input-box">
70	+ <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
71	</div>
72	</li>
73	<?php endif; ?>

75	<div class="field">
76	<label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
77	<div class="input-box">
78	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
79	</div>
80	</div>
81	<div class="field">
82	<label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
83	<div class="input-box">
84	+ <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
85	<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
86	</select>
87	<script type="text/javascript">

89	$('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
90	//]]>
91	</script>
92	+ <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
93	</div>
94	</div>
95	</li>

97	<div class="field">
98	<label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
99	<div class="input-box">
100	+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
101	</div>
102	</div>
103	<div class="field">

111	<div class="field">
112	<label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
113	<div class="input-box">
114	+ <input type="text" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
115	</div>
116	</div>
117	<?php echo $this->getLayout()->createBlock('nofax/widget_fax')->setObject($this->getAddress()->getFax() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->toHtml() ?>
118	</li>
119	<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
120	<li class="control">
121	+ <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save in address book')) ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
122	<?php else:?>
123	<li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
124	<?php endif;?>

132	<div class="buttons-set" id="shipping-buttons-container">
133	<p class="required"><?php echo $this->__('* Required Fields') ?></p>
134	<p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
135	+ <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
136	<span id="shipping-please-wait" class="please-wait" style="display:none;">
137	+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
138	</span>
139	</div>
140	</form>

144	'<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
145	var shippingForm = new VarienForm('co-shipping-form');
146	shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
147	+ //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Select State/Province...')) ?>');
148	$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
149
150	var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');

app/design/frontend/base/default/template/bemaged/nofax/customer/widget/fax.phtml CHANGED Viewed

	@@ -29,7 +29,7 @@
29	<div class="field">
30	<label for="<?php echo $this->getFieldId('fax')?>"<?php echo $isFaxRequired ? ' class="required"' : '' ?>><?php echo $isFaxRequired ? '<em>*</em>' : '' ?><?php echo $this->getStoreLabel('fax') ?></label>
31	<div class="input-box">
32	- <input type="text" name="<?php echo $this->getFieldName('fax')?>" value="<?php echo $this->escapeHtml($this->getObject()->getFax()) ?>" title="<?php echo $this->getStoreLabel('fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" ~~id="~~<?php echo $this->~~getFieldId('fax')?>" <?php echo $this->~~getFieldParams() ?> />
33	</div>
34	</div>
35	<?php endif; ?>


29	<div class="field">
30	<label for="<?php echo $this->getFieldId('fax')?>"<?php echo $isFaxRequired ? ' class="required"' : '' ?>><?php echo $isFaxRequired ? '<em>*</em>' : '' ?><?php echo $this->getStoreLabel('fax') ?></label>
31	<div class="input-box">
32	+ <input type="text" id="<?php echo $this->getFieldId('fax')?>" name="<?php echo $this->getFieldName('fax')?>" value="<?php echo $this->escapeHtml($this->getObject()->getFax()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('fax')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" <?php echo $this->getFieldParams() ?> />
33	</div>
34	</div>
35	<?php endif; ?>

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Bemaged_NoFax</name>
4	- <version>1.0.4</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>
	@@ -12,11 +12,11 @@
12	This module adds a new field to the backend Customer Configuration > Name and Address Options from which the frontend Fax input field for Billing and Shipping Address during checkout can be controlled. By default the Show Fax option will be enabled. Select Show Fax: “No” and Save Config to remove the Fax field from the Billing and Shipping forms in checkout.
13
14	The extension comes with English (en_US), Dutch (nl_NL) and German (de_DE) language packs. Feel free to contact us in case you want us to add your language to the module.</description>
15	- <notes>~~Minor~~ ~~bug fix~~</notes>
16	<authors><author><name>Matthijs IJsseldijk</name><user>BeMaged</user><email>hello@bemaged.com</email></author></authors>
17	- <date>2015-04-25</date>
18	- <time>11:33:40</time>
19	- <contents><target name="magecommunity"><dir name="Bemaged"><dir name="NoFax"><dir name="Block"><dir name="Widget"><file name="Fax.php" hash="619dab38d0094018a11bdfbe4d83869b"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d3be381bacc735935946fcd9342b8c38"/></dir><dir name="etc"><file name="config.xml" hash="~~84669ad4ee6e1ad0726607cf40631719~~"/><file name="system.xml" hash="2e745e27d7816a4c23fc0c78915285ca"/></dir><dir name="sql"><dir name="nofax_setup"><file name="mysql4-install-0.0.1.php" hash="95edcc5d29a5cd2f3fb0c1c5101da4a2"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Bemaged_NoFax.xml" hash="48e00a4dc8cde9771cf0e6f1390ff987"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="bemaged_nofax.xml" hash="c791a6934f8e0e8df2ab305b28eff6f4"/></dir><dir name="template"><dir name="bemaged"><dir name="nofax"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="~~fc1d78384df11f8cf21a8b44d2b81bb8~~"/><file name="shipping.phtml" hash="~~92f1df6e5bad78cc3e14712c771287c0~~"/></dir></dir><dir name="customer"><dir name="widget"><file name="fax.phtml" hash="~~d32feee88a305890226e8f51228d6eac~~"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Bemaged_NoFax.csv" hash="0100a90a34fd72642361904b28afc2d0"/></dir><dir name="de_DE"><file name="Bemaged_NoFax.csv" hash="6d6eebb19fc22eb32025be1bb345ff92"/></dir><dir name="nl_NL"><file name="Bemaged_NoFax.csv" hash="0225f52faa79de18212753526755c9e6"/></dir></target></contents>
20	<compatible/>
21	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
22	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Bemaged_NoFax</name>
4	+ <version>1.1.0</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>

12	This module adds a new field to the backend Customer Configuration > Name and Address Options from which the frontend Fax input field for Billing and Shipping Address during checkout can be controlled. By default the Show Fax option will be enabled. Select Show Fax: “No” and Save Config to remove the Fax field from the Billing and Shipping forms in checkout.
13
14	The extension comes with English (en_US), Dutch (nl_NL) and German (de_DE) language packs. Feel free to contact us in case you want us to add your language to the module.</description>
15	+ <notes>Security Improvements</notes>
16	<authors><author><name>Matthijs IJsseldijk</name><user>BeMaged</user><email>hello@bemaged.com</email></author></authors>
17	+ <date>2015-08-26</date>
18	+ <time>08:14:35</time>
19	+ <contents><target name="magecommunity"><dir name="Bemaged"><dir name="NoFax"><dir name="Block"><dir name="Widget"><file name="Fax.php" hash="619dab38d0094018a11bdfbe4d83869b"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d3be381bacc735935946fcd9342b8c38"/></dir><dir name="etc"><file name="config.xml" hash="f9a812671ee63c0fc1a3a92a56c397af"/><file name="system.xml" hash="2e745e27d7816a4c23fc0c78915285ca"/></dir><dir name="sql"><dir name="nofax_setup"><file name="mysql4-install-0.0.1.php" hash="95edcc5d29a5cd2f3fb0c1c5101da4a2"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Bemaged_NoFax.xml" hash="48e00a4dc8cde9771cf0e6f1390ff987"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="bemaged_nofax.xml" hash="c791a6934f8e0e8df2ab305b28eff6f4"/></dir><dir name="template"><dir name="bemaged"><dir name="nofax"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="edf7380ff2096d3ae228f453574b8886"/><file name="shipping.phtml" hash="fa873c6a36875f55eeea9faf02c93f82"/></dir></dir><dir name="customer"><dir name="widget"><file name="fax.phtml" hash="bb24ac59f25a725f4d469d401eed9b82"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Bemaged_NoFax.csv" hash="0100a90a34fd72642361904b28afc2d0"/></dir><dir name="de_DE"><file name="Bemaged_NoFax.csv" hash="6d6eebb19fc22eb32025be1bb345ff92"/></dir><dir name="nl_NL"><file name="Bemaged_NoFax.csv" hash="0225f52faa79de18212753526755c9e6"/></dir></target></contents>
20	<compatible/>
21	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
22	</package>