Mxperts_NoRegion - Version 0.1.5

Version Notes

none / keine

Release Info

Developer	Magento Core Team
Extension	Mxperts_NoRegion
Version	0.1.5
Comparing to
See all releases

Code changes from version 0.1.4 to 0.1.5

Files changed (14) hide show

app/code/local/Mxperts/NoRegion/Block/Customer/Edit/Tab/Addresses.php +6 -4
app/code/local/Mxperts/NoRegion/Block/Customer/Grid.php +6 -4
app/code/local/Mxperts/NoRegion/Helper/Data.php +5 -4
app/code/local/Mxperts/NoRegion/Model/Address.php +5 -3
app/code/local/Mxperts/NoRegion/Model/Quote/Address.php +5 -3
app/code/local/Mxperts/NoRegion/etc/config.xml +7 -6
app/code/local/Mxperts/NoRegion/etc/system.xml +5 -3
app/design/frontend/default/default/layout/noregion.xml +37 -15
app/design/frontend/default/default/template/noregion/checkout/onepage/billing.phtml +208 -101
app/design/frontend/default/default/template/noregion/checkout/onepage/shipping.phtml +161 -72
app/design/frontend/default/default/template/noregion/customer/address/edit.phtml +132 -62
app/design/frontend/default/default/template/noregion/customer/form/address.phtml +0 -223
app/design/frontend/default/default/template/noregion/customer/form/register.phtml +0 -276
package.xml +14 -8

app/code/local/Mxperts/NoRegion/Block/Customer/Edit/Tab/Addresses.php CHANGED Viewed

	@@ -2,11 +2,13 @@
2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
6	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

7	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
8	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/

10	class Mxperts_NoRegion_Block_Customer_Edit_Tab_Addresses extends Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses
11	//Mage_Adminhtml_Block_Widget_Form
12	{
	@@ -28,7 +30,7 @@ class Mxperts_NoRegion_Block_Customer_Edit_Tab_Addresses extends Mage_Adminhtml_
28
29	if ($regionElement = $form->getElement('region')) {
30	//$regionElement->setRenderer(Mage::getModel('adminhtml/customer_renderer_region'));
31	- $regionElement->setNoDisplay(true); //Setting the State/Province ~~Field~~ of
32	}
33
34	if ($regionElement = $form->getElement('region_id')) {


2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11	+
12	class Mxperts_NoRegion_Block_Customer_Edit_Tab_Addresses extends Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses
13	//Mage_Adminhtml_Block_Widget_Form
14	{

30
31	if ($regionElement = $form->getElement('region')) {
32	//$regionElement->setRenderer(Mage::getModel('adminhtml/customer_renderer_region'));
33	+ $regionElement->setNoDisplay(true); //Setting the State/Province field of
34	}
35
36	if ($regionElement = $form->getElement('region_id')) {

app/code/local/Mxperts/NoRegion/Block/Customer/Grid.php CHANGED Viewed

	@@ -2,11 +2,13 @@
2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
6	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

7	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
8	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/

10	class Mxperts_NoRegion_Block_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid
11	//Dont extend the class Mage_Adminhtml_Block_Customer_Grid because this class adding the missing / commented columns again into the Grid!
12	{
	@@ -205,4 +207,4 @@ class Mxperts_NoRegion_Block_Customer_Grid extends Mage_Adminhtml_Block_Widget_G
205	return $this->getUrl('//edit', array('id'=>$row->getId()));
206	}
207
208	- }


2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11	+
12	class Mxperts_NoRegion_Block_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid
13	//Dont extend the class Mage_Adminhtml_Block_Customer_Grid because this class adding the missing / commented columns again into the Grid!
14	{

207	return $this->getUrl('//edit', array('id'=>$row->getId()));
208	}
209
210	+ }

app/code/local/Mxperts/NoRegion/Helper/Data.php CHANGED Viewed

	@@ -2,11 +2,12 @@
2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
6	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

7	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
8	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	- */
10	class Mxperts_NoRegion_Helper_Data extends Mage_Core_Helper_Abstract
11	{
12


2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	+ */
11	class Mxperts_NoRegion_Helper_Data extends Mage_Core_Helper_Abstract
12	{
13

app/code/local/Mxperts/NoRegion/Model/Address.php CHANGED Viewed

	@@ -2,11 +2,13 @@
2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
6	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

7	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
8	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/

10	class Mxperts_NoRegion_Model_Address extends Mage_Customer_Model_Address
11	{
12	public function validate()


2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11	+
12	class Mxperts_NoRegion_Model_Address extends Mage_Customer_Model_Address
13	{
14	public function validate()

app/code/local/Mxperts/NoRegion/Model/Quote/Address.php CHANGED Viewed

	@@ -2,11 +2,13 @@
2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
6	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

7	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
8	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/

10	class Mxperts_NoRegion_Model_Quote_Address extends Mage_Sales_Model_Quote_Address
11	{
12	public function validate()


2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11	+
12	class Mxperts_NoRegion_Model_Quote_Address extends Mage_Sales_Model_Quote_Address
13	{
14	public function validate()

app/code/local/Mxperts/NoRegion/etc/config.xml CHANGED Viewed

	@@ -2,16 +2,17 @@
2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
6	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

7	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
8	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10	-->
11	<config>
12	<modules>
13	<Mxperts_NoRegion>
14	- <version>0.1.3</version>
15	<depends>
16	<Mage_Adminhtml />
17	<Mage_Customer />
	@@ -34,11 +35,11 @@
34	</blocks>
35
36	<models>
37	- <customer>
38	<rewrite>
39	<address>Mxperts_NoRegion_Model_Address</address>
40	</rewrite>
41	- </customer>
42	<sales>
43	<rewrite>
44	<quote_address>Mxperts_NoRegion_Model_Quote_Address</quote_address>


2	/**
3	* @category Mxperts
4	* @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11	-->
12	<config>
13	<modules>
14	<Mxperts_NoRegion>
15	+ <version>0.1.5</version>
16	<depends>
17	<Mage_Adminhtml />
18	<Mage_Customer />

35	</blocks>
36
37	<models>
38	+ <customer>
39	<rewrite>
40	<address>Mxperts_NoRegion_Model_Address</address>
41	</rewrite>
42	+ </customer>
43	<sales>
44	<rewrite>
45	<quote_address>Mxperts_NoRegion_Model_Quote_Address</quote_address>

app/code/local/Mxperts/NoRegion/etc/system.xml CHANGED Viewed

	@@ -3,10 +3,11 @@
3	/**
4	* @category Mxperts
5	* @package Mxperts_NoRegion
6	- * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <~~daniel.sasse~~@golox.eu>
7	- * @developer Daniel Sasse <~~sasse~~@~~mxperts~~.de>

8	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11	-->
12	<config>
	@@ -28,6 +29,7 @@
28	<fields>
29	<enabled translate="label">
30	<label>Enabled</label>

31	<frontend_type>select</frontend_type>
32	<source_model>adminhtml/system_config_source_yesno</source_model>
33	<sort_order>20</sort_order>


3	/**
4	* @category Mxperts
5	* @package Mxperts_NoRegion
6	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
7	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
8	+ * @version 0.1.5
9	* @copyright TMEDIA cross communications, Doris Teitge-Seifert
10	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
11	*/
12	-->
13	<config>

29	<fields>
30	<enabled translate="label">
31	<label>Enabled</label>
32	+ <comment><![CDATA[- <b>Hide</b> the Field <b>State / Province</b>? <br /> - Das Feld <b>Bundesland</b> verstecken?]]></comment>
33	<frontend_type>select</frontend_type>
34	<source_model>adminhtml/system_config_source_yesno</source_model>
35	<sort_order>20</sort_order>

app/design/frontend/default/default/layout/noregion.xml CHANGED Viewed

@@ -15,9 +15,13 @@
             Checkout - No availability for showing and editing State / Province
             -->
             	<checkout_multishipping_customer_address>
-            -
            		<remove name="customer_address_edit"/>
                     <reference name="content">
-            -
                        <block type="customer/address_edit" name="noregion.customer_address_edit" template="noregion/customer/address/edit.phtml"/>
                     </reference>
                 </checkout_multishipping_customer_address>
@@ -26,13 +30,33 @@ Checkout - No availability for showing and editing State / Province
                     <reference name="content">
             			<action method="unsetChild"><name>checkout.onepage.review</name></action><!--Important for compatiblity to the Marked Ready Germany Extension -->
                         <block type="checkout/onepage" name="noregion.checkout.onepage" template="checkout/onepage.phtml">
-            -
                            <block type="checkout/onepage_login" name="checkout.onepage.login" as="login" template="checkout/onepage/login.phtml"/>
-            -
                            <block type="checkout/onepage_billing" name="checkout.onepage.billing" as="billing" template="noregion/checkout/onepage/billing.phtml"/>
-            -
                            <block type="checkout/onepage_shipping" name="checkout.onepage.shipping" as="shipping" template="noregion/checkout/onepage/shipping.phtml"/>
                             <block type="checkout/onepage_shipping_method" name="checkout.onepage.shipping_method" as="shipping_method" template="checkout/onepage/shipping_method.phtml">
                                 <block type="checkout/onepage_shipping_method_available" name="checkout.onepage.shipping_method.available" as="available" template="checkout/onepage/shipping_method/available.phtml"/>
                                 <block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
-            -
                            </block>
                             <block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
                                 <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/methods.phtml">
                                     <action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>
@@ -47,17 +71,15 @@ Checkout - No availability for showing and editing State / Province
             <!--
             Customer - No availability of showing and editing State / Province
             -->
-            -
            	<customer_account_create>
-            -
            		<remove name="customer_form_register"/>
-            -
                    <reference name="content">
-            -
                        <block type="customer/form_register" name="noregion_customer_form_register" template="noregion/customer/form/register.phtml"/>
-            -
                    </reference>
-            -
                </customer_account_create>
-            -
             	<customer_address_form>
-            -
            		<remove name="customer_address_edit"/>
                     <reference name="content">
-            -
                        <block type="customer/address_edit" name="noregion.customer_address_edit" template="noregion/customer/address/edit.phtml"/>
                     </reference>
                 </customer_address_form>
             </layout>


15	Checkout - No availability for showing and editing State / Province
16	-->
17	<checkout_multishipping_customer_address>
18	+ <remove name="customer_address_edit"/><!--important for Magento 1.3.x (Double Templates)-->
19	<reference name="content">
20	+ <block type="customer/address_edit" name="noregion_customer_address_edit" as="billing" template="customer/address/edit.phtml">
21	+ <action method="setTemplate" ifconfig="customer/noregion/enabled" ifvalue="1">
22	+ <template>noregion/customer/address/edit.phtml</template>
23	+ </action>
24	+ </block>
25	</reference>
26	</checkout_multishipping_customer_address>
27

30	<reference name="content">
31	<action method="unsetChild"><name>checkout.onepage.review</name></action><!--Important for compatiblity to the Marked Ready Germany Extension -->
32	<block type="checkout/onepage" name="noregion.checkout.onepage" template="checkout/onepage.phtml">
33	+ <block type="checkout/onepage_login" name="checkout.onepage.login" as="login" template="checkout/onepage/login.phtml">
34	+ <block type="page/html_wrapper" name="checkout.onepage.login.before" as="login_before">
35	+ <action method="setMayBeInvisible"><value>1</value></action><!-- since Magento 1.4.x -->
36	+ </block>
37	+ </block>
38	+
39	+ <block type="checkout/onepage_billing" name="checkout.onepage.billing" as="billing" template="checkout/onepage/billing.phtml">
40	+ <action method="setTemplate" ifconfig="customer/noregion/enabled" ifvalue="1">
41	+ <template>noregion/checkout/onepage/billing.phtml</template>
42	+ </action>
43	+ </block>
44	+
45	+ <block type="checkout/onepage_shipping" name="checkout.onepage.shipping" as="shipping" template="checkout/onepage/shipping.phtml">
46	+ <action method="setTemplate" ifconfig="customer/noregion/enabled" ifvalue="1">
47	+ <template>noregion/checkout/onepage/shipping.phtml</template>
48	+ </action>
49	+ </block>
50	+
51	+ <!--Original blocks for billing and shipping section-->
52	+ <!--<block type="checkout/onepage_shipping" name="checkout.onepage.shipping" as="shipping" template="noregion/checkout/onepage/billing.phtml"/>-->
53	+ <!--<block type="checkout/onepage_shipping" name="checkout.onepage.shipping" as="shipping" template="noregion/checkout/onepage/shipping.phtml"/>-->
54	+ <!--Original blocks End-->
55	+
56	<block type="checkout/onepage_shipping_method" name="checkout.onepage.shipping_method" as="shipping_method" template="checkout/onepage/shipping_method.phtml">
57	<block type="checkout/onepage_shipping_method_available" name="checkout.onepage.shipping_method.available" as="available" template="checkout/onepage/shipping_method/available.phtml"/>
58	<block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
59	+ </block>
60	<block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
61	<block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/methods.phtml">
62	<action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>

71	<!--
72	Customer - No availability of showing and editing State / Province
73	-->







74	<customer_address_form>
75	+ <remove name="customer_address_edit"/><!--important for Magento 1.3.x (Double Templates)-->
76	<reference name="content">
77	+ <block type="customer/address_edit" name="noregion_customer_address_edit" as="billing" template="customer/address/edit.phtml">
78	+ <action method="setTemplate" ifconfig="customer/noregion/enabled" ifvalue="1">
79	+ <template>noregion/customer/address/edit.phtml</template>
80	+ </action>
81	+ </block>
82	</reference>
83	</customer_address_form>
84	+
85	</layout>

app/design/frontend/default/default/template/noregion/checkout/onepage/billing.phtml CHANGED Viewed

@@ -1,3 +1,19 @@
             <?php
             /**
              * Magento
@@ -24,7 +40,6 @@
              * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
              */
             ?>
-            -
            <?php if(Mage::getStoreConfig('customer/noregion/enabled')): ?>
             <form id="co-billing-form" action="">
             <?php if ($this->customerHasAddresses()): ?>
                 <p><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></p>
@@ -140,114 +155,206 @@
                 var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions);
             //]]>
             </script>
-            -
            <?php endif; ?>
-            -
            <?php if(!Mage::getStoreConfig('customer/noregion/enabled')): ?>
-            -
            <form id="co-billing-form" action="">
-            -
            <?php if ($this->customerHasAddresses()): ?>
-            -
                <p><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></p>
-            -
                <ul><li><p><?php echo $this->getAddressesHtmlSelect('billing') ?></p></li></ul>
-            -
            <?php endif ?>
-            -
                <fieldset class="group-select" id="billing-new-address-form" <?php if ($this->customerHasAddresses()): ?>style="display:none"<?php endif ?>>
-            -
                    <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
-            -
                    <ul>
-            -
                        <li><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())
-            -
                            ->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
-            -
                        <li><div class="input-box">
-            -
                            <label for="billing:company"><?php echo $this->__('Company') ?></label><br />
-            -
                            <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" /></div>
-            -
                <?php if(!$this->isCustomerLoggedIn()): ?>
-            -
                            <div class="input-box">
-            -
                            <label for="billing:email"><?php echo $this->__('Email Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="validate-email required-entry input-text" /></div>
-            -
                <?php endif ?>
                             </li>
-            -
                        <li><label for="billing:street1"><?php echo $this->__('Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="required-entry input-text" /></li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                        <li><input type="text" title="<?php echo $this->__('Street Address '.$_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" /></li>
-            -
            <?php endfor ?>
-            -
                        <li><div class="input-box">
-            -
                            <label for="billing:postcode"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="validate-zip-international required-entry input-text" /></div>
-            -
            				<div class="input-box">
-            -
                            <label for="billing:city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="required-entry input-text" id="billing:city" /></div>
-            -
                        </li>
-            -
                        <li><div class="input-box">
-            -
                            <label for="billing:region"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br/>
-            -
                            <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                                <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                            </select>
-            -
                            <script type="text/javascript">
-            -
                                $('billing:region_id').setAttribute('defaultValue',  "<?php echo $this->getAddress()->getRegionId() ?>");
-            -
                            </script>
-            -
                            <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>"  title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="billing:country_id"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
-            -
                                <?php echo $this->getCountryHtmlSelect('billing') ?></div></li>
-            -
                        <li><div class="input-box">
-            -
                            <label for="billing:telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br/>
-            -
                            <input type="text" name="billing[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="required-entry input-text" id="billing:telephone" /></div>
-            -
                            <div class="input-box">
-            -
                            <label for="billing:fax"><?php echo $this->__('Fax') ?></label><br/>
-            -
                            <input type="text" name="billing[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="billing:fax" /></div></li>
-            -
                        <?php if(!$this->isCustomerLoggedIn()): ?>
-            -
            <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
-            -
            <?php if ($_dob->isEnabled()): ?>
-            -
                        <li>
-            -
                            <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())
-            -
                                ->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-            -
                        </li>
-            -
            <?php endif ?>
-            -
            <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
-            -
            <?php if ($_taxvat->isEnabled()): ?>
-            -
                        <li>
-            -
                            <?php echo $_taxvat->setTaxvat($this->getQuote()->getCustomerTaxvat())
-            -
                                ->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-            -
                        </li>
-            -
            <?php endif ?>
-            -
                            <li id="register-customer-password">
-            -
                            <div class="input-box">
-            -
                            <label for="billing:customer_password"><?php echo $this->__('Password') ?> <span class="required">*</span></label><br/>
-            -
                            <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="required-entry validate-password input-text" /></div>
-            -
                            <div class="input-box">
-            -
                            <label for="billing:confirm_password"><?php echo $this->__('Confirm Password') ?> <span class="required">*</span></label><br/>
-            -
                            <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="required-entry validate-password input-text" /></div></li>
-            -
                        <?php endif ?>
-            -
                        <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
-            -
                            <li><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="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> /> <label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
-            -
                        <?php else:?>
-            -
                            <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
-            -
                        <?php endif;?>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <fieldset>
-            -
                    <?php if ($this->canShip()): ?>
-            -
                        <p>
-            -
                            <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1" <?php if ($this->isUseBillingAddressForShipping()) {?>checked="checked" <?php }?>onclick="$('shipping:same_as_billing').checked = true;" />&nbsp;<label for="billing:use_for_shipping_yes"><?php echo  $this->__('Ship to this address') ?></label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0" <?php if (!$this->isUseBillingAddressForShipping()) {?>checked="checked" <?php }?>onclick="$('shipping:same_as_billing').checked = false;" />&nbsp;<label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
-            -
                        </p>
-            -
                    <?php else: ?>
-            -
                        <p class="no-display"><input type="hidden" name="billing[use_for_shipping]" value="1" /></p>
-            -
                    <?php endif; ?>
-            -
                </fieldset>
-            -
            </form>
-            -
            <div class="button-set">
-            -
                <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                <div id="billing-buttons-container">
-            -
                    <button type="button" class="form-button right" onclick="billing.save()"><span><?php echo $this->__('Continue') ?></span></button>
-            -
                    <span id="billing-please-wait" style="display:none;" class="opc-please-wait">
-            -
                        <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt="" /> &nbsp; <?php echo $this->__('Loading next step...') ?> &nbsp;
                     </span>
                 </div>
-            -
            </div>
-            -
             <script type="text/javascript">
             //<![CDATA[
                 var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
@@ -256,7 +363,7 @@
                 //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
                 $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
-            -
                var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions);
             //]]>
             </script>
             <?php endif; ?>


1	+ <?php
2	+ /**
3	+ * @category Mxperts
4	+ * @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	+ * @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	+ */
11	+ ?>
12	+
13	+ <?php $regiover=intval(substr(str_replace(".","",Mage::getVersion()),0,2)); ?>
14	+ <?php if ($regiover<14): ?>
15	+ <?php //Version 1.3.xxx oder kleiner ?>
16	+
17	<?php
18	/**
19	* Magento

40	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
41	*/
42	?>

43	<form id="co-billing-form" action="">
44	<?php if ($this->customerHasAddresses()): ?>
45	<p><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></p>

155	var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions);
156	//]]>
157	</script>

158
159
160	+ <?php elseif ($regiover==14): ?>
161	+ <?php //Verson 1.4.xxx ?>



162
163	+ <?php
164	+ /**
165	+ * Magento
166	+ *
167	+ * NOTICE OF LICENSE
168	+ *
169	+ * This source file is subject to the Academic Free License (AFL 3.0)
170	+ * that is bundled with this package in the file LICENSE_AFL.txt.
171	+ * It is also available through the world-wide-web at this URL:
172	+ * http://opensource.org/licenses/afl-3.0.php
173	+ * If you did not receive a copy of the license and are unable to
174	+ * obtain it through the world-wide-web, please send an email
175	+ * to license@magentocommerce.com so we can send you a copy immediately.
176	+ *
177	+ * DISCLAIMER
178	+ *
179	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
180	+ * versions in the future. If you wish to customize Magento for your
181	+ * needs please refer to http://www.magentocommerce.com for more information.
182	+ *
183	+ * @category design
184	+ * @package base_default
185	+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
186	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
187	+ */
188	+ ?>
189	+ <form id="co-billing-form" action="">
190	+ <fieldset>
191	+ <ul class="form-list">
192	+ <?php if ($this->customerHasAddresses()): ?>
193	+ <li class="wide">
194	+ <label for="billing-address-select"><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></label>
195	+ <div class="input-box">
196	+ <?php echo $this->getAddressesHtmlSelect('billing') ?>
197	+ </div>
198	+ </li>
199	+ <?php endif; ?>
200	+ <li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
201	+ <fieldset>
202	+ <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
203	+ <ul>
204	+ <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
205	+ <li class="fields">
206	+ <div class="field">
207	+ <label for="billing:company"><?php echo $this->__('Company') ?></label>
208	+ <div class="input-box">
209	+ <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
210	+ </div>
211	+ </div>
212	+ <?php if(!$this->isCustomerLoggedIn()): ?>
213	+ <div class="field">
214	+ <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
215	+ <div class="input-box">
216	+ <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
217	+ </div>
218	+ </div>
219	+ <?php endif ?>
220	</li>
221	+ <li class="wide">
222	+ <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
223	+ <div class="input-box">
224	+ <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="input-text required-entry" />
225	+ </div>
226	+ </li>
227	+ <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
228	+ <li class="wide">
229	+ <div class="input-box">
230	+ <input type="text" title="<?php echo $this->__('Street Address '.$_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" />
231	+ </div>
232	+ </li>
233	+ <?php endfor ?>
234	+ <li class="fields">
235	+
236	+ <div class="field">
237	+ <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
238	+ <div class="input-box">
239	+ <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international required-entry" />
240	+ </div>
241	+ </div>
242	+
243	+ <div class="field">
244	+ <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
245	+ <div class="input-box">
246	+ <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="input-text required-entry" id="billing:city" />
247	+ </div>
248	+ </div>
249	+ <div class="field" style="display:none;">
250	+ <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
251	+ <div class="input-box">
252	+ <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
253	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
254	+ </select>
255	+ <script type="text/javascript">
256	+ //<![CDATA[
257	+ $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
258	+ //]]>
259	+ </script>
260	+ <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
261	+ </div>
262	+ </div>
263	+ </li>
264	+ <li class="fields">
265	+
266	+ <div class="field">
267	+ <label for="billing:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
268	+ <div class="input-box">
269	+ <?php echo $this->getCountryHtmlSelect('billing') ?>
270	+ </div>
271	+ </div>
272	+ </li>
273	+ <li lang="fields">
274	+ <div class="field">
275	+ <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
276	+ <div class="input-box">
277	+ <input type="text" name="billing[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" id="billing:telephone" />
278	+ </div>
279	+ </div>
280	+ <div class="field">
281	+ <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
282	+ <div class="input-box">
283	+ <input type="text" name="billing[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="billing:fax" />
284	+ </div>
285	+ </div>
286	+ </li>
287	+ <?php if(!$this->isCustomerLoggedIn()): ?>
288
289	+ <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
290	+ <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
291	+ <?php if ($_dob->isEnabled() \|\| $_gender->isEnabled()): ?>
292	+ <li class="fields">
293	+ <?php if ($_dob->isEnabled()): ?>
294	+ <div class="field">
295	+ <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
296	+ </div>
297	+ <?php endif; ?>
298	+ <?php if ($_gender->isEnabled()): ?>
299	+ <div class="field">
300	+ <?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
301	+ </div>
302	+ <?php endif ?>
303	+ </li>
304	+ <?php endif ?>
305
306	+ <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
307	+ <?php if ($_taxvat->isEnabled()): ?>
308	+ <li>
309	+ <?php echo $_taxvat->setTaxvat($this->getQuote()->getCustomerTaxvat())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
310	+ </li>
311	+ <?php endif ?>

312
313	+ <li class="fields" id="register-customer-password">
314	+ <div class="field">
315	+ <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
316	+ <div class="input-box">
317	+ <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
318	+ </div>
319	+ </div>
320	+ <div class="field">
321	+ <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
322	+ <div class="input-box">
323	+ <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
324	+ </div>
325	+ </div>
326	+ </li>
327	+ <?php endif; ?>
328	+ <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
329	+ <li class="control">
330	+ <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="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>
331	+ </li>
332	+ <?php else:?>
333	+ <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
334	+ <?php endif; ?>
335	+ </ul>
336	+ </fieldset>
337	+ </li>
338	+ <?php if ($this->canShip()): ?>
339	+ <li class="control">
340	+ <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>
341	+ <li class="control">
342	+ <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>
343	+ </li>
344	+ <?php endif; ?>
345	+ </ul>
346	+ <?php if (!$this->canShip()): ?>
347	+ <input type="hidden" name="billing[use_for_shipping]" value="1" />
348	+ <?php endif; ?>
349	+ <div class="buttons-set" id="billing-buttons-container">
350	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
351	+ <button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
352	+ <span class="please-wait" id="billing-please-wait" style="display:none;">
353	+ <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...') ?>
354	</span>
355	</div>
356	+ </fieldset>
357	+ </form>
358	<script type="text/javascript">
359	//<![CDATA[
360	var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');

363	//billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
364	$('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
365
366	+ var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, 'billing:postcode');
367	//]]>
368	</script>
369	<?php endif; ?>

app/design/frontend/default/default/template/noregion/checkout/onepage/shipping.phtml CHANGED Viewed

@@ -1,3 +1,19 @@
             <?php
             /**
              * Magento
@@ -24,7 +40,6 @@
              * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
              */
             ?>
-            -
            <?php if(Mage::getStoreConfig('customer/noregion/enabled')): ?>
             <form id="co-shipping-form" action="">
             <?php if ($this->customerHasAddresses()): ?>
                <p><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></p>
@@ -65,7 +80,7 @@
                             $('shipping:region_id').setAttribute('defaultValue',  "<?php echo $this->getAddress()->getRegionId() ?>");
                         </script>
                         <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" /></div></li>
-            -
                    <li><!--Hier war Postleitzahl-->
                         <div class="input-box">
                         <label for="shipping:country_id"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
@@ -109,81 +124,154 @@
                 var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions);
             //]]>
             </script>
-            -
            <?php endif; ?>
-            -
            <?php if(!Mage::getStoreConfig('customer/noregion/enabled')): ?>
-            -
            <form id="co-shipping-form" action="">
-            -
            <?php if ($this->customerHasAddresses()): ?>
-            -
               <p><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></p>
-            -
               <p><?php echo $this->getAddressesHtmlSelect('shipping') ?></p>
-            -
            <?php endif ?>
-            -
            <fieldset class="group-select" id="shipping-new-address-form" <?php if ($this->customerHasAddresses()): ?>style="display:none"<?php endif ?>>
-            -
                <input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
-            -
                <ul>
-            -
                    <li><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())
-            -
                            ->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?></li>
-            -
                    <li><div class="input-box">
-            -
                        <label for="shipping:company"><?php echo $this->__('Company') ?></label><br/>
-            -
                        <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" onchange="shipping.setSameAsBilling(false);" /></div>
-            -
            <?php if(false): ?>
-            -
                        <div class="input-box">
-            -
                        <label for="shipping:email"><?php echo $this->__('Email Address') ?> <span class="required">*</span></label><br />
-            -
                        <input type="text" name="shipping[email]" id="shipping:email" value="<?php echo $this->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="validate-email required-entry input-text" /></div>
-            -
            <?php endif ?>
-            -
                        </li>
-            -
                    <li><label for="shipping:street1"><?php echo $this->__('Address') ?> <span class="required">*</span></label><br />
-            -
                        <input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="required-entry input-text" onchange="shipping.setSameAsBilling(false);" /></li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                    <li><input type="text" title="<?php echo $this->__('Street Address '.$_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" onchange="shipping.setSameAsBilling(false);"/></li>
-            -
            <?php endfor ?>
-            -
                    <li><div class="input-box">
-            -
                        <label for="shipping:postcode"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
-            -
                        <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="validate-zip-international required-entry input-text" onchange="shipping.setSameAsBilling(false);"/></div>
-            -
            			<div class="input-box">
-            -
                        <label for="shipping:city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                        <input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="required-entry input-text" id="shipping:city" onchange="shipping.setSameAsBilling(false);" /></div>
                     </li>
-            -
                    <li>
-            -
            			<div class="input-box">
-            -
                        <label for="shipping:region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
-            -
                        <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                            <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                        </select>
-            -
                        <script type="text/javascript">
-            -
                            $('shipping:region_id').setAttribute('defaultValue',  "<?php echo $this->getAddress()->getRegionId() ?>");
-            -
                        </script>
-            -
                        <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" /></div>
-            -
                        <div class="input-box">
-            -
                        <label for="shipping:country_id"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
-            -
                        <?php echo $this->getCountryHtmlSelect('shipping') ?>
-            -
                        </div></li>
-            -
                    <li><div class="input-box">
-            -
                        <label for="shipping:telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
-            -
                        <input type="text" name="shipping[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="required-entry input-text" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" /></div>
-            -
                        <div class="input-box">
-            -
                        <label for="shipping:fax"><?php echo $this->__('Fax') ?></label><br />
-            -
                        <input type="text" name="shipping[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" /></div></li>
-            -
                    <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
-            -
                        <li><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;?> /> <label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
-            -
                    <?php else:?>
-            -
                        <li><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
-            -
                    <?php endif;?>
                 </ul>
-            -
            </fieldset>
-            -
                <p><input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1" <?php if($this->getAddress()->getSameAsBilling()): ?>checked="checked"<?php endif ?> onclick="shipping.setSameAsBilling(this.checked)" /> &nbsp;<label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label></p>
-            -
            </form>
-            -
            <div class="button-set">
-            -
                <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                <div id="shipping-buttons-container">
-            -
                    <a href="#" class="back left" onclick="checkout.back(); return false;"><?php echo $this->__('Back') ?></a>
-            -
                    <button type="button" class="form-button right" onclick="shipping.save()"><span><?php echo $this->__('Continue') ?></span></button>
-            -
                    <span id="shipping-please-wait" style="display:none;" class="opc-please-wait">
-            -
                        <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt="" /> &nbsp; <?php echo $this->__('Loading next step...') ?> &nbsp;
                     </span>
                 </div>
-            -
            </div>
-            -
             <script type="text/javascript">
             //<![CDATA[
                 var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
@@ -193,7 +281,8 @@
                 //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
                 $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
-            -
                var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions);
             //]]>
             </script>
             <?php endif; ?>


1	+ <?php
2	+ /**
3	+ * @category Mxperts
4	+ * @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	+ * @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	+ */
11	+ ?>
12	+
13	+ <?php $regiover=intval(substr(str_replace(".","",Mage::getVersion()),0,2)); ?>
14	+ <?php if ($regiover<14): ?>
15	+ <?php //Version 1.3.xxx oder kleiner ?>
16	+
17	<?php
18	/**
19	* Magento

40	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
41	*/
42	?>

43	<form id="co-shipping-form" action="">
44	<?php if ($this->customerHasAddresses()): ?>
45	<p><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></p>

80	$('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
81	</script>
82	<input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" /></div></li>
83	+ <li>
84
85	<div class="input-box">
86	<label for="shipping:country_id"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />

124	var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions);
125	//]]>
126	</script>

127
128	+ <?php elseif ($regiover==14): ?>
129	+ <?php //Verson 1.4.xxx ?>




130
131	+ <?php
132	+ /**
133	+ * Magento
134	+ *
135	+ * NOTICE OF LICENSE
136	+ *
137	+ * This source file is subject to the Academic Free License (AFL 3.0)
138	+ * that is bundled with this package in the file LICENSE_AFL.txt.
139	+ * It is also available through the world-wide-web at this URL:
140	+ * http://opensource.org/licenses/afl-3.0.php
141	+ * If you did not receive a copy of the license and are unable to
142	+ * obtain it through the world-wide-web, please send an email
143	+ * to license@magentocommerce.com so we can send you a copy immediately.
144	+ *
145	+ * DISCLAIMER
146	+ *
147	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
148	+ * versions in the future. If you wish to customize Magento for your
149	+ * needs please refer to http://www.magentocommerce.com for more information.
150	+ *
151	+ * @category design
152	+ * @package base_default
153	+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
154	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
155	+ */
156	+ ?>
157	+ <form action="" id="co-shipping-form">
158	+ <ul class="form-list">
159	+ <?php if ($this->customerHasAddresses()): ?>
160	+ <li class="wide">
161	+ <label for="shipping-address-select"><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></label>
162	+ <div class="input-box">
163	+ <?php echo $this->getAddressesHtmlSelect('shipping') ?>
164	+ </div>
165	+ </li>
166	+ <?php endif ?>
167	+ <li id="shipping-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
168	+ <fieldset>
169	+ <input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
170	+ <ul>
171	+ <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?></li>
172	+ <li class="fields">
173	+ <div class="fields">
174	+ <label for="shipping:company"><?php echo $this->__('Company') ?></label>
175	+ <div class="input-box">
176	+ <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" onchange="shipping.setSameAsBilling(false);" />
177	+ </div>
178	+ </div>
179	+ <?php if(false): ?>
180	+ <div class="fields">
181	+ <label for="shipping:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
182	+ <div class="input-box">
183	+ <input type="text" name="shipping[email]" id="shipping:email" value="<?php echo $this->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
184	+ </div>
185	+ </div>
186	+ <?php endif ?>
187	+ </li>
188	+ <li class="wide">
189	+ <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
190	+ <div class="input-box">
191	+ <input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="input-text required-entry" onchange="shipping.setSameAsBilling(false);" />
192	+ </div>
193	+ </li>
194	+ <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
195	+ <li class="wide">
196	+ <div class="input-box">
197	+ <input type="text" title="<?php echo $this->__('Street Address '.$_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" onchange="shipping.setSameAsBilling(false);" />
198	+ </div>
199	+ </li>
200	+ <?php endfor ?>
201	+ <li class="fields">
202	+ <div class="field">
203	+ <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
204	+ <div class="input-box">
205	+ <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international required-entry" onchange="shipping.setSameAsBilling(false);" />
206	+ </div>
207	+ </div>
208	+
209	+ <div class="field">
210	+ <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
211	+ <div class="input-box">
212	+ <input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="input-text required-entry" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
213	+ </div>
214	+ </div>
215	+ <div class="field" style="display:none;">
216	+ <label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
217	+ <div class="input-box">
218	+ <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
219	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
220	+ </select>
221	+ <script type="text/javascript">
222	+ //<![CDATA[
223	+ $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
224	+ //]]>
225	+ </script>
226	+ <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
227	+ </div>
228	+ </div>
229	+ </li>
230	+ <li class="fields">
231	+
232	+ <div class="field">
233	+ <label for="shipping:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
234	+ <div class="input-box">
235	+ <?php echo $this->getCountryHtmlSelect('shipping') ?>
236	+ </div>
237	+ </div>
238	+ </li>
239	+ <li class="fields">
240	+ <div class="field">
241	+ <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
242	+ <div class="input-box">
243	+ <input type="text" name="shipping[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
244	+ </div>
245	+ </div>
246	+ <div class="field">
247	+ <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
248	+ <div class="input-box">
249	+ <input type="text" name="shipping[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
250	+ </div>
251	+ </div>
252	+ </li>
253	+ <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
254	+ <li class="control">
255	+ <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>
256	+ <?php else:?>
257	+ <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
258	+ <?php endif;?>
259	+ </ul>
260	+ </fieldset>
261	+ </li>
262	+ <li class="control">
263	+ <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
264	</li>

























265	</ul>
266	+ <div class="buttons-set" id="shipping-buttons-container">
267	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
268	+ <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
269	+ <button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
270	+ <span id="shipping-please-wait" class="please-wait" style="display:none;">
271	+ <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...') ?>




272	</span>
273	</div>
274	+ </form>

275	<script type="text/javascript">
276	//<![CDATA[
277	var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',

281	//shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
282	$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
283
284	+ var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions, undefined, 'shipping:postcode');
285	//]]>
286	</script>
287	+
288	<?php endif; ?>

app/design/frontend/default/default/template/noregion/customer/address/edit.phtml CHANGED Viewed

@@ -1,3 +1,19 @@
             <?php
             /**
              * Magento
@@ -31,7 +47,6 @@
              * @see Mage_Customer_Block_Address_Edit
              */
             ?>
-            -
            <?php if(Mage::getStoreConfig('customer/noregion/enabled')): ?>
             <?php if($this->getTitle()): ?>
             <div class="page-head">
                 <h3><?php echo $this->getTitle() ?></h3>
@@ -134,109 +149,164 @@
                 var dataForm = new VarienForm('form-validate', true);
                 new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
             </script>
-            -
            <?php endif; ?>
-            -
            <?php if(!Mage::getStoreConfig('customer/noregion/enabled')): ?>
             <?php if($this->getTitle()): ?>
-            -
            <div class="page-head">
-            -
                <h3><?php echo $this->getTitle() ?></h3>
             </div>
             <?php endif; ?>
             <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
             <form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
-            -
                <fieldset class="group-select">
                 <?php echo $this->getBlockHtml('formkey')?>
                 <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
                 <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
-            -
                    <h4 class="legend"><?php echo $this->__('Contact Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
                             <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer())->toHtml() ?>
                         </li>
-            -
                        <li>
-            -
                            <label for="company"><?php echo $this->__('Company') ?></label><br />
-            -
                            <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" class="input-text" />
-            -
                        </li>
-            -
                        <li>
                             <div class="input-box">
-            -
                                <label for="telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="telephone" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="required-entry input-text" id="telephone" />
                             </div>
-            -
                            <div class="input-box">
-            -
                                <label for="fax"><?php echo $this->__('Fax') ?></label><br />
-            -
                                <input type="text" name="fax" id="fax" title="<?php echo $this->__('Fax') ?>" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" class="input-text" />
                             </div>
                         </li>
                     </ul>
-            -
                </fieldset>
-            -
                <fieldset class="group-select">
-            -
                     <h4 class="legend"><?php echo $this->__('Address') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="required-entry input-text" />
-            -
                        </li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                        <li>
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
-            -
                        </li>
-            -
            <?php endfor ?>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="zip"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="validate-zip-international required-entry input-text" />
-            -
                            </div>
                             <div class="input-box">
-            -
                                <label for="city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>"  title="<?php echo $this->__('City') ?>" class="required-entry input-text" id="city" />
                             </div>
                         </li>
-            -
                        <li>
                             <div class="input-box">
-            -
                                <label for="region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
-            -
                                <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                                   <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                                </select>
-            -
                                <script type="text/javascript">
-            -
                                    $('region_id').setAttribute('defaultValue',  "<?php echo $this->getAddress()->getRegionId() ?>");
-            -
                                </script>
-            -
                                <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>"  title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
                             </div>
-            -
                            <div class="input-box">
-            -
                                <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
-            -
                                <?php echo $this->getCountryHtmlSelect() ?>
                             </div>
                         </li>
-            -
                        <li>
                             <?php if($this->isDefaultBilling()): ?>
                                 <strong><?php echo $this->__('Default Billing Address') ?></strong>
                             <?php elseif($this->canSetAsDefaultBilling()): ?>
-            -
                                <input type="checkbox" id="primary_billing" name="default_billing" value="1" />&nbsp;
-            -
                                <label for="primary_billing"><?php echo $this->__('Use as my default billing address') ?></label>
                             <?php else: ?>
                                 <input type="hidden" name="default_billing" value="1" />
                             <?php endif; ?>
                         </li>
-            -
                        <li>
                             <?php if($this->isDefaultShipping()): ?>
                                 <strong><?php echo $this->__('Default Shipping Address') ?></strong>
                             <?php elseif($this->canSetAsDefaultShipping()): ?>
-            -
                                <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" />&nbsp;
-            -
                                <label for="primary_shipping"><?php echo $this->__('Use as my default shipping address') ?></label>
                             <?php else: ?>
                                 <input type="hidden" name="default_shipping" value="1" />
                             <?php endif; ?>
                         </li>
                     </ul>
-            -
                </fieldset>
-            -
                <div class="button-set">
                     <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                    <a href="<?php echo $this->getBackUrl() ?>" class="left">&laquo; <?php echo $this->__('Back') ?></a>
-            -
                    <button class="form-button" type="submit"><span><?php echo $this->__('Save Address') ?></span></button>
                 </div>
             </form>
             <script type="text/javascript">
                 var dataForm = new VarienForm('form-validate', true);
-            -
                new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
             </script>
             <?php endif; ?>


1	+ <?php
2	+ /**
3	+ * @category Mxperts
4	+ * @package Mxperts_NoRegion
5	+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Igor Jankovic <jankovic@tmedia.de>, Daniel Sasse <info@golox-web.de>
6	+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7	+ * @version 0.1.5
8	+ * @copyright TMEDIA cross communications, Doris Teitge-Seifert
9	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	+ */
11	+ ?>
12	+
13	+ <?php $regiover=intval(substr(str_replace(".","",Mage::getVersion()),0,2)); ?>
14	+ <?php if ($regiover<14): ?>
15	+ <?php //Version 1.3.xxx oder kleiner ?>
16	+
17	<?php
18	/**
19	* Magento

47	* @see Mage_Customer_Block_Address_Edit
48	*/
49	?>

50	<?php if($this->getTitle()): ?>
51	<div class="page-head">
52	<h3><?php echo $this->getTitle() ?></h3>

149	var dataForm = new VarienForm('form-validate', true);
150	new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
151	</script>

152
153	+ <?php elseif ($regiover==14): ?>
154	+ <?php //Verson 1.4.xxx ?>
155	+
156	+ <?php
157	+ /**
158	+ * Magento
159	+ *
160	+ * NOTICE OF LICENSE
161	+ *
162	+ * This source file is subject to the Academic Free License (AFL 3.0)
163	+ * that is bundled with this package in the file LICENSE_AFL.txt.
164	+ * It is also available through the world-wide-web at this URL:
165	+ * http://opensource.org/licenses/afl-3.0.php
166	+ * If you did not receive a copy of the license and are unable to
167	+ * obtain it through the world-wide-web, please send an email
168	+ * to license@magentocommerce.com so we can send you a copy immediately.
169	+ *
170	+ * DISCLAIMER
171	+ *
172	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
173	+ * versions in the future. If you wish to customize Magento for your
174	+ * needs please refer to http://www.magentocommerce.com for more information.
175	+ *
176	+ * @category design
177	+ * @package base_default
178	+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
179	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
180	+ */
181	+ ?>
182	+ <?php
183	+ /**
184	+ * Edit customer address template
185	+ *
186	+ * @see Mage_Customer_Block_Address_Edit
187	+ */
188	+ ?>
189	<?php if($this->getTitle()): ?>
190	+ <div class="page-title">
191	+ <h1><?php echo $this->getTitle() ?></h1>
192	</div>
193	<?php endif; ?>
194	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
195	<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
196	+ <div class="fieldset">
197	<?php echo $this->getBlockHtml('formkey')?>
198	<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
199	<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
200	+ <h2 class="legend"><?php echo $this->__('Contact Information') ?></h2>
201	+ <ul class="form-list">
202	+ <li class="fields">
203	<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer())->toHtml() ?>
204	</li>
205	+ <li class="wide">
206	+ <label for="company"><?php echo $this->__('Company') ?></label>



207	<div class="input-box">
208	+ <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" class="input-text" />

209	</div>
210	+ </li>
211	+ <li class="fields">
212	+ <div class="field">
213	+ <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
214	+ <div class="input-box">
215	+ <input type="text" name="telephone" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" id="telephone" />
216	+ </div>
217	+ </div>
218	+ <div class="field">
219	+ <label for="fax"><?php echo $this->__('Fax') ?></label>
220	+ <div class="input-box">
221	+ <input type="text" name="fax" id="fax" title="<?php echo $this->__('Fax') ?>" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" class="input-text" />
222	+ </div>
223	</div>
224	</li>
225	</ul>
226	+ </div>
227	+ <div class="fieldset">
228	+ <h2 class="legend"><?php echo $this->__('Address') ?></h2>
229	+ <ul class="form-list">
230	+ <li class="wide">
231	+ <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>












232	<div class="input-box">
233	+ <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text required-entry" />

234	</div>
235	</li>
236	+ <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
237	+ <li class="wide">
238	<div class="input-box">
239	+ <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />







240	</div>
241	+ </li>
242	+ <?php endfor ?>
243	+ <li class="fields">
244	+ <div class="field">
245	+ <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
246	+ <div class="input-box">
247	+ <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international required-entry" />
248	+ </div>
249	+ </div>
250	+ <div class="field">
251	+ <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
252	+ <div class="input-box">
253	+ <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text required-entry" id="city" />
254	+ </div>
255	+ </div>
256	+ <div class="field" style="display:none;">
257	+ <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
258	+ <div class="input-box">
259	+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
260	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
261	+ </select>
262	+ <script type="text/javascript">
263	+ //<![CDATA[
264	+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
265	+ //]]>
266	+ </script>
267	+ <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
268	+ </div>
269	</div>
270	</li>
271	+ <li class="fields">
272	+ <div class="field">
273	+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
274	+ <div class="input-box">
275	+ <?php echo $this->getCountryHtmlSelect() ?>
276	+ </div>
277	+ </div>
278	+ </li>
279	+ <li<?php if($this->canSetAsDefaultBilling()) echo ' class="control"' ?>>
280	<?php if($this->isDefaultBilling()): ?>
281	<strong><?php echo $this->__('Default Billing Address') ?></strong>
282	<?php elseif($this->canSetAsDefaultBilling()): ?>
283	+ <input type="checkbox" id="primary_billing" name="default_billing" value="1" title="<?php echo $this->__('Use as my default billing address') ?>" class="checkbox" /><label for="primary_billing"><?php echo $this->__('Use as my default billing address') ?></label>

284	<?php else: ?>
285	<input type="hidden" name="default_billing" value="1" />
286	<?php endif; ?>
287	</li>
288	+ <li<?php if($this->canSetAsDefaultShipping()) echo ' class="control"' ?>>
289	<?php if($this->isDefaultShipping()): ?>
290	<strong><?php echo $this->__('Default Shipping Address') ?></strong>
291	<?php elseif($this->canSetAsDefaultShipping()): ?>
292	+ <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" title="<?php echo $this->__('Use as my default shipping address') ?>" class="checkbox" /><label for="primary_shipping"><?php echo $this->__('Use as my default shipping address') ?></label>

293	<?php else: ?>
294	<input type="hidden" name="default_shipping" value="1" />
295	<?php endif; ?>
296	</li>
297	</ul>
298	+ </div>
299	+ <div class="buttons-set">
300	<p class="required"><?php echo $this->__('* Required Fields') ?></p>
301	+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->__('Back') ?></a></p>
302	+ <button type="submit" title="<?php echo $this->__('Save Address') ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
303	</div>
304	</form>
305	<script type="text/javascript">
306	+ //<![CDATA[
307	var dataForm = new VarienForm('form-validate', true);
308	+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
309	+ //]]>
310	</script>
311	+
312	<?php endif; ?>

app/design/frontend/default/default/template/noregion/customer/form/address.phtml DELETED Viewed

@@ -1,223 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Academic Free License (AFL 3.0)
-            -
             * that is bundled with this package in the file LICENSE_AFL.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/afl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category   design_default
-            -
             * @package    Mage
-            -
             * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
-            -
             * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-            -
             */
-            -
            ?>
-            -
            <?php if(Mage::getStoreConfig('customer/noregion/enabled')): ?>
-            -
            <script type="text/javascript">countryRegions = <?php echo $this->helper('directory')->getRegionJson() ?></script>
-            -
-            -
            <div class="page-head">
-            -
                <h3><?php if($data->getAddressId()): ?><?php echo $this->__('Edit Address Entry') ?><?php else: ?><?php echo $this->__('New Address Entry') ?><?php endif ?></h3>
-            -
            <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-            -
            <form action="<?php echo $action ?>" method="post" id="form-validate">
-            -
                <fieldset class="group-select">
-            -
            <input type="hidden" name="address_id" value="<?php echo $data->getAddressId() ?>" />
-            -
            <input type="hidden" name="customer_id" id="address_id" value="<?php echo $data->getCustomerId() ?>" />
-            -
                    <h3 class="legend"><?php echo $this->__('Personal Information') ?></h3>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($data)->toHtml() ?>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="company"><?php echo $this->__('Company') ?></label><br />
-            -
                                <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->htmlEscape($data->getCompany()) ?>" class="input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <fieldset class="group-select">
-            -
                    <h3 class="legend"><?php echo $this->__('Address') ?></h3>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($data->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="required-entry input-text" />
-            -
                        </li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                        <li>
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($data->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
-            -
                        </li>
-            -
            <?php endfor ?>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="zip"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="postcode" value="<?php echo $this->htmlEscape($data->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="validate-zip-international required-entry input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="city" value="<?php echo $this->htmlEscape($data->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="required-entry input-text" id="city" />
-            -
                            </div>
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
-            -
                                <select name="country_id" id="country" title="<?php echo $this->__('Country') ?>" class="validate-select">
-            -
                                    <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
-            -
                                </select>
-            -
                            </div>
-            -
            				<div class="input-box" style="display:none">
-            -
                                <label for="region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
-            -
                                <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                                    <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                                </select>
-            -
                                <script type="text/javascript">
-            -
                                    $('region_id').setAttribute('defaultValue',  "<?php echo $this->getAddress()->getRegionId() ?>");
-            -
                                </script>
-            -
                                <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>"  title="<?php echo $this->__('State/Province') ?>" class="required-entry  input-text" style="display:none" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="telephone" value="<?php echo $this->htmlEscape($data->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text" id="telephone" /></div>
-            -
                            <div class="input-box">
-            -
                                <label for="fax"><?php echo $this->__('Fax') ?></label><br />
-            -
                                <input type="text" name="fax" value="<?php echo $this->htmlEscape($data->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="fax" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <?php foreach ($primaryTypes as $code=>$type): ?>
-            -
                            <li>
-            -
                            <?php if ($address->isPrimary($type['address_type_id'])): ?>
-            -
                                <?php echo $this->__("This is My Primary %s Address", ucfirst($type['name'])) ?>
-            -
                            <?php else: ?>
-            -
                                <input type="checkbox" id="primary_<?php echo $code ?>" name="primary_types[]" value="<?php echo $type['address_type_id'] ?>" />&nbsp;
-            -
                                <label for="primary_<?php echo $code ?>"><?php echo $this->__("Use as My Primary %s Address", ucfirst($type['name'])) ?></label>
-            -
                            <?php endif ?>
-            -
                            </li>
-            -
                        <?php endforeach ?>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <div class="button-set">
-            -
                    <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                    <a href="<?php echo $this->getUrl('customer/address/') ?>" class="left">&laquo; <?php echo $this->__('Back') ?></a>
-            -
                    <button class="form-button" type="submit"><span><?php echo $this->__('Save Address') ?></span></button>
-            -
                </div>
-            -
            </form>
-            -
            <script type="text/javascript">
-            -
                var dataForm = new VarienForm('form-validate', true);
-            -
                //dataForm.setElementsRelation('country', 'state', '<?php echo $this->getUrl('directory/json/childRegion') ?>');
-            -
-            -
                new RegionUpdater('country', 'region', 'region_id', countryRegions);
-            -
            </script>
-            -
            <?php endif; ?>
-            -
-            -
-            -
            <?php if(!Mage::getStoreConfig('customer/noregion/enabled')): ?>
-            -
            <script type="text/javascript">countryRegions = <?php echo $this->helper('directory')->getRegionJson() ?></script>
-            -
-            -
            <div class="page-head">
-            -
                <h3><?php if($data->getAddressId()): ?><?php echo $this->__('Edit Address Entry') ?><?php else: ?><?php echo $this->__('New Address Entry') ?><?php endif ?></h3>
-            -
            <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-            -
            <form action="<?php echo $action ?>" method="post" id="form-validate">
-            -
                <fieldset class="group-select">
-            -
            <input type="hidden" name="address_id" value="<?php echo $data->getAddressId() ?>" />
-            -
            <input type="hidden" name="customer_id" id="address_id" value="<?php echo $data->getCustomerId() ?>" />
-            -
                    <h3 class="legend"><?php echo $this->__('Personal Information') ?></h3>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($data)->toHtml() ?>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="company"><?php echo $this->__('Company') ?></label><br />
-            -
                                <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->htmlEscape($data->getCompany()) ?>" class="input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <fieldset class="group-select">
-            -
                    <h3 class="legend"><?php echo $this->__('Address') ?></h3>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($data->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="required-entry input-text" />
-            -
                        </li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                        <li>
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($data->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
-            -
                        </li>
-            -
            <?php endfor ?>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="zip"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="postcode" value="<?php echo $this->htmlEscape($data->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="validate-zip-international required-entry input-text" />
-            -
                            </div>
-            -
            				<div class="input-box">
-            -
                                <label for="city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="city" value="<?php echo $this->htmlEscape($data->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="required-entry input-text" id="city" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
-            -
                                <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                                    <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                                </select>
-            -
                                <script type="text/javascript">
-            -
                                    $('region_id').setAttribute('defaultValue',  "<?php echo $this->getAddress()->getRegionId() ?>");
-            -
                                </script>
-            -
                                <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>"  title="<?php echo $this->__('State/Province') ?>" class="required-entry  input-text" style="display:none" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
-            -
                                <select name="country_id" id="country" title="<?php echo $this->__('Country') ?>" class="validate-select">
-            -
                                    <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
-            -
                                </select>
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="telephone" value="<?php echo $this->htmlEscape($data->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text" id="telephone" /></div>
-            -
                            <div class="input-box">
-            -
                                <label for="fax"><?php echo $this->__('Fax') ?></label><br />
-            -
                                <input type="text" name="fax" value="<?php echo $this->htmlEscape($data->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="fax" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <?php foreach ($primaryTypes as $code=>$type): ?>
-            -
                            <li>
-            -
                            <?php if ($address->isPrimary($type['address_type_id'])): ?>
-            -
                                <?php echo $this->__("This is My Primary %s Address", ucfirst($type['name'])) ?>
-            -
                            <?php else: ?>
-            -
                                <input type="checkbox" id="primary_<?php echo $code ?>" name="primary_types[]" value="<?php echo $type['address_type_id'] ?>" />&nbsp;
-            -
                                <label for="primary_<?php echo $code ?>"><?php echo $this->__("Use as My Primary %s Address", ucfirst($type['name'])) ?></label>
-            -
                            <?php endif ?>
-            -
                            </li>
-            -
                        <?php endforeach ?>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <div class="button-set">
-            -
                    <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                    <a href="<?php echo $this->getUrl('customer/address/') ?>" class="left">&laquo; <?php echo $this->__('Back') ?></a>
-            -
                    <button class="form-button" type="submit"><span><?php echo $this->__('Save Address') ?></span></button>
-            -
                </div>
-            -
            </form>
-            -
            <script type="text/javascript">
-            -
                var dataForm = new VarienForm('form-validate', true);
-            -
                //dataForm.setElementsRelation('country', 'state', '<?php echo $this->getUrl('directory/json/childRegion') ?>');
-            -
-            -
                new RegionUpdater('country', 'region', 'region_id', countryRegions);
-            -
            </script>
-            -
            <?php endif; ?>

app/design/frontend/default/default/template/noregion/customer/form/register.phtml DELETED Viewed

@@ -1,276 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Academic Free License (AFL 3.0)
-            -
             * that is bundled with this package in the file LICENSE_AFL.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/afl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category   design_default
-            -
             * @package    Mage
-            -
             * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
-            -
             * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-            -
             */
-            -
            ?>
-            -
            <?php
-            -
            /**
-            -
             * Create account form template
-            -
             *
-            -
             * @see Mage_Customer_Block_Form_Register
-            -
             */
-            -
            ?>
-            -
            <?php if(Mage::getStoreConfig('customer/noregion/enabled')): ?>
-            -
            <div class="page-head">
-            -
                <h3><?php echo $this->__('Create an Account') ?></h3>
-            -
            </div>
-            -
            <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-            -
            <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
-            -
                <fieldset class="group-select wide">
-            -
                <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
-            -
                <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
-            -
                    <h4 class="legend"><?php echo $this->__('Personal Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->toHtml() ?>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="email_address"><?php echo $this->__('Email Address') ?> <span class="required">*</span></label><br/>
-            -
                                <input type="text" name="email" id="email_address" value="<?php echo $this->htmlEscape($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="validate-email required-entry input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <?php if ($this->isNewsletterEnabled()): ?>
-            -
                        <li>
-            -
                            <input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed" <?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif ?> />
-            -
                            <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
-            -
                        </li>
-            -
                        <?php endif ?>
-            -
            <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
-            -
            <?php if ($_dob->isEnabled()): ?>
-            -
                        <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
-            -
            <?php endif ?>
-            -
            <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
-            -
            <?php if ($_taxvat->isEnabled()): ?>
-            -
                        <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
-            -
            <?php endif ?>
-            -
                    </ul>
-            -
                </fieldset>
-            -
            <?php if($this->getShowAddressFields()): ?>
-            -
                <input type="hidden" name="create_address" value="1" />
-            -
                <fieldset class="group-select wide">
-            -
                    <h4 class="legend"><?php echo $this->__('Address Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="company"><?php echo $this->__('Company') ?></label><br />
-            -
                                <input type="text" name="company" id="company" value="<?php echo $this->htmlEscape($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="lastname"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="telephone" id="telephone" value="<?php echo $this->htmlEscape($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="required-entry input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
                            <label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="required-entry input-text" />
-            -
                        </li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                        <li>
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
-            -
            <?php endfor ?>
-            -
                        </li>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="zip"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br/>
-            -
                                <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="validate-zip-international required-entry input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="required-entry input-text" id="city" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br/>
-            -
                                <?php echo $this->getCountryHtmlSelect() ?>
-            -
                            </div>
-            -
            				<div class="input-box" style="display:none;">
-            -
                                <label for="region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
-            -
                                <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                                    <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                                </select>
-            -
                                <script type="text/javascript">
-            -
                                    $('region_id').setAttribute('defaultValue',  "<?php echo $this->getFormData()->getRegionId() ?>");
-            -
                                </script>
-            -
                                <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
-            -
                            </div>
-            -
                        </li>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <input type="hidden" name="default_billing" value="1" />
-            -
                <input type="hidden" name="default_shipping" value="1" />
-            -
            <?php endif; ?>
-            -
                <fieldset class="group-select wide">
-            -
                    <h4 class="legend"><?php echo $this->__('Login Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="password"><?php echo $this->__('Password') ?> <span class="required">*</span></label><br/>
-            -
                                <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="required-entry validate-password input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="confirmation"><?php echo $this->__('Confirm Password') ?> <span class="required">*</span></label><br />
-            -
                                <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="required-entry validate-cpassword input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <div class="button-set">
-            -
                    <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                    <a href="<?php echo $this->getBackUrl() ?>" class="left">&laquo; <?php echo $this->__('Back') ?></a>
-            -
                    <button class="form-button" type="submit"><span><?php echo $this->__('Submit') ?></span></button>
-            -
                </div>
-            -
            </form>
-            -
            <script type="text/javascript">
-            -
            //<![CDATA[
-            -
                var dataForm = new VarienForm('form-validate', true);
-            -
                <?php if($this->getShowAddressFields()): ?>
-            -
                new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
-            -
                <?php endif; ?>
-            -
            //]]>
-            -
            </script>
-            -
            <?php endif; ?>
-            -
-            -
            <?php if(!Mage::getStoreConfig('customer/noregion/enabled')): ?>
-            -
            <div class="page-head">
-            -
                <h3><?php echo $this->__('Create an Account') ?></h3>
-            -
            </div>
-            -
            <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-            -
            <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
-            -
                <fieldset class="group-select wide">
-            -
                <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
-            -
                <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
-            -
                    <h4 class="legend"><?php echo $this->__('Personal Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->toHtml() ?>
-            -
                        </li>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="email_address"><?php echo $this->__('Email Address') ?> <span class="required">*</span></label><br/>
-            -
                                <input type="text" name="email" id="email_address" value="<?php echo $this->htmlEscape($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="validate-email required-entry input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <?php if ($this->isNewsletterEnabled()): ?>
-            -
                        <li>
-            -
                            <input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed" <?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif ?> />
-            -
                            <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
-            -
                        </li>
-            -
                        <?php endif ?>
-            -
            <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
-            -
            <?php if ($_dob->isEnabled()): ?>
-            -
                        <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
-            -
            <?php endif ?>
-            -
            <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
-            -
            <?php if ($_taxvat->isEnabled()): ?>
-            -
                        <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
-            -
            <?php endif ?>
-            -
                    </ul>
-            -
                </fieldset>
-            -
            <?php if($this->getShowAddressFields()): ?>
-            -
                <input type="hidden" name="create_address" value="1" />
-            -
                <fieldset class="group-select wide">
-            -
                    <h4 class="legend"><?php echo $this->__('Address Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="company"><?php echo $this->__('Company') ?></label><br />
-            -
                                <input type="text" name="company" id="company" value="<?php echo $this->htmlEscape($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="lastname"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="telephone" id="telephone" value="<?php echo $this->htmlEscape($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="required-entry input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
                            <label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="required-entry input-text" />
-            -
                        </li>
-            -
            <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
-            -
                        <li>
-            -
                            <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
-            -
            <?php endfor ?>
-            -
                        </li>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="zip"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br/>
-            -
                                <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="validate-zip-international required-entry input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
-            -
                                <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="required-entry input-text" id="city" />
-            -
                            </div>
-            -
                        </li>
-            -
                        <li>
-            -
            				<div class="input-box">
-            -
                                <label for="region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
-            -
                                <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
-            -
                                    <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
-            -
                                </select>
-            -
                                <script type="text/javascript">
-            -
                                    $('region_id').setAttribute('defaultValue',  "<?php echo $this->getFormData()->getRegionId() ?>");
-            -
                                </script>
-            -
                                <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br/>
-            -
                                <?php echo $this->getCountryHtmlSelect() ?>
-            -
                            </div>
-            -
                        </li>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <input type="hidden" name="default_billing" value="1" />
-            -
                <input type="hidden" name="default_shipping" value="1" />
-            -
            <?php endif; ?>
-            -
                <fieldset class="group-select wide">
-            -
                    <h4 class="legend"><?php echo $this->__('Login Information') ?></h4>
-            -
                    <ul>
-            -
                        <li>
-            -
                            <div class="input-box">
-            -
                                <label for="password"><?php echo $this->__('Password') ?> <span class="required">*</span></label><br/>
-            -
                                <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="required-entry validate-password input-text" />
-            -
                            </div>
-            -
                            <div class="input-box">
-            -
                                <label for="confirmation"><?php echo $this->__('Confirm Password') ?> <span class="required">*</span></label><br />
-            -
                                <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="required-entry validate-cpassword input-text" />
-            -
                            </div>
-            -
                        </li>
-            -
                    </ul>
-            -
                </fieldset>
-            -
                <div class="button-set">
-            -
                    <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-            -
                    <a href="<?php echo $this->getBackUrl() ?>" class="left">&laquo; <?php echo $this->__('Back') ?></a>
-            -
                    <button class="form-button" type="submit"><span><?php echo $this->__('Submit') ?></span></button>
-            -
                </div>
-            -
            </form>
-            -
            <script type="text/javascript">
-            -
            //<![CDATA[
-            -
                var dataForm = new VarienForm('form-validate', true);
-            -
                <?php if($this->getShowAddressFields()): ?>
-            -
                new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
-            -
                <?php endif; ?>
-            -
            //]]>
-            -
            </script>
-            -
            <?php endif; ?>

package.xml CHANGED Viewed

	@@ -1,18 +1,24 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Mxperts_NoRegion</name>
4	- <version>0.1.4</version>
5	<stability>stable</stability>
6	- <license uri="http://opensource.org/licenses/osl-3.0.php">~~Open Software License (~~OSL ~~3.0)~~</license>
7	<channel>community</channel>
8	<extends/>
9	- <summary>Hide "State / Province" on the Store-Frontend ~~Versteckt~~ ~~"Bundesland / Kanton" im Shop-Frontend</~~summary>
10	- <description>~~Hide "State / Province" on the Store-Frontend </description>~~






11	<notes>none / keine</notes>
12	- <authors><author><name>~~Daniel Sasse</name><user>auto-converted</user><email>sasse@mxperts.de</email></author><author><name>~~Johannes Teitge</name><user>auto-converted</user><email>teitge@tmedia.de</email></author><author><name>~~Igor~~ ~~Jankovic~~</name><user>auto-converted</user><email>~~jankovic~~@~~tmedia~~.de</email></author></authors>
13	- <date>~~2009~~-11-20</date>
14	- <time>12:45:16</time>
15	- <contents><target name="~~mageetc~~"><dir name="~~modules~~"><~~file~~ name="~~Mxperts_NoRegion.xml~~" ~~hash~~="~~f9f52307b6775dc2182f844cb4acebd2~~"~~/></~~dir~~></target><target~~ name="~~magelocal~~"><~~dir~~ name="~~Mxperts~~"~~><dir~~ ~~name~~="~~NoRegion~~"><dir name="~~Block~~"><dir name="~~Customer~~"><dir name="~~Edit~~"><dir name="~~Tab~~"><file name="~~Addresses~~.~~php~~" hash="~~ec9fa7a3fb4014a979c306528d1935ff~~"~~/></dir></dir><~~file name="~~Grid~~.~~php~~" hash="~~85aae7613b93143ae389e7843182c277~~"/></dir></dir><dir name="~~etc~~"><~~file name="config.xml" hash="f6d8868799a2f79bec36cfccd95028ae"/><file name="system.xml" hash="a7a81d2e1a70f4fb2ecffc19b35ee5e2"/></~~dir~~><dir~~ name="~~Helper~~"><file name="~~Data~~.~~php~~" hash="~~6883e9931b37c228c87531fc99c2c3ec~~"/></dir><~~dir~~ name="~~Model~~"><dir name="~~Quote~~"><file name="~~Address~~.~~php~~" hash="~~496da654002f7db614d611885d7e5eec~~"/></dir><~~file~~ name="~~Address.php~~" ~~hash~~="~~14918ff42e149f2c393e43383d8e426f~~"~~/></~~dir~~></dir></dir></target><target~~ name="~~magedesign~~"><dir name="~~frontend~~"><dir name="~~default~~"><dir name="~~default~~"><dir name="~~layout~~"><file name="~~noregion~~.~~xml~~" hash="~~0e2c1764957960890cff2686ad79ee70~~"/></dir><~~dir~~ name="~~template~~"~~><dir~~ ~~name~~="~~noregion~~"><dir ~~name="checkout"~~><dir name="~~onepage~~"><file name="~~billing~~.~~phtml~~" hash="~~4dc6857dea86e9fd8995da59a9cf1705~~"/><file name="~~shipping~~.~~phtml~~" hash="~~80a08c20dc1e7d0599659b9ffcf0a905~~"/></dir~~></dir~~><dir name="~~customer~~"><~~dir name="address"><~~file name="~~edit~~.~~phtml~~" hash="~~fbab0bdb301a3d462875cc5909530232~~"/></dir><dir name="~~form~~"><file name="~~address~~.~~phtml~~" hash="~~0851e7e981297662cdeac15a4d718e24~~"~~/><~~file name="~~register~~.~~phtml~~" hash="~~21458dd2f5641b7122e9ace73b014416~~"/></dir></dir></dir></~~dir></dir></dir></dir></~~target></contents>
16	<compatible/>
17	<dependencies/>
18	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Mxperts_NoRegion</name>
4	+ <version>0.1.5</version>
5	<stability>stable</stability>
6	+ <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7	<channel>community</channel>
8	<extends/>
9	+ <summary>Hide "State / Province" in the Store-Frontend & Backend.</summary>
10	+ <description>EN_US
11	+ Hide "State / Province" in the Store-Frontend & Backend. The Customer have no possibility to enter or edit "State / Province" statements in the checkout shipping & billing steps. Also this field is missing in the Customer Accound and in the multishipping chekout process.
12	+
13	+ The Module is designed for the issues on the German Market - if you want more infos about it in english, please contact us.
14	+
15	+ DE_AT_CH
16	+ Versteckt das Feld "Bundesland / Kanton" im Shop-Frontend + Backend. Der Kunde hat keine Möglichkeit dieses Feld im Checkout, Multishipping Checkout und im Benutzerkonto zu sehen oder entsprechende Daten zu editieren. Des Weiteren wird die Anordnung der Felder wo sonst "Bundesland" zur Auswahl steht dahingehend verändert, dass die Reihenfolge wie folgt aussieht.</description>
17	<notes>none / keine</notes>
18	+ <authors><author><name>Johannes Teitge</name><user>auto-converted</user><email>teitge@tmedia.de</email></author><author><name>Daniel Sasse</name><user>auto-converted</user><email>info@golox-web.de</email></author></authors>
19	+ <date>2010-04-13</date>
20	+ <time>13:00:57</time>
21	+ <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="noregion.xml" hash="65dc4f00e1f734dff13a76071d6df3b6"/></dir><dir name="template"><dir name="noregion"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="3d04abbb4d088f78f9f3aec7d80f7b37"/><file name="shipping.phtml" hash="5ce7305556c69e9d01253b33a76dffee"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="a0a7103bc6bd26d367c2846c3870008e"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mxperts_NoRegion.xml" hash="f9f52307b6775dc2182f844cb4acebd2"/></dir></target><target name="magelocal"><dir name="Mxperts"><dir name="NoRegion"><dir name="Block"><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Addresses.php" hash="54b2af8e1988a4249b75f1659d787d5f"/></dir></dir><file name="Grid.php" hash="69560a87177d06d98cdc07dc03face30"/></dir></dir><dir name="etc"><file name="config.xml" hash="18d477358e52de4da6bf79d658f1233d"/><file name="system.xml" hash="a6dd1f35be8aa4f54df45aa110de99f0"/></dir><dir name="Helper"><file name="Data.php" hash="1e8508975fac9f70e1e52059d8c63843"/></dir><dir name="Model"><dir name="Quote"><file name="Address.php" hash="5ba933fe2884cc6ce3f5bd325ef9a6aa"/></dir><file name="Address.php" hash="e71f56efb410c3ab8dd9e9053a658097"/></dir></dir></dir></target></contents>
22	<compatible/>
23	<dependencies/>
24	</package>