Mxperts_NoRegion - Version 1.1.3

Version Notes

keine / none

Download this release

Release Info

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


Code changes from version 1.1.2 to 1.1.3

Files changed (15) hide show
  1. app/code/local/Mxperts/NoRegion/Block/Customer/Edit/Renderer/Region.php +2 -2
  2. app/code/local/Mxperts/NoRegion/Block/Customer/Edit/Tab/Addresses.php +2 -2
  3. app/code/local/Mxperts/NoRegion/Block/Customer/Grid.php +2 -2
  4. app/code/local/Mxperts/NoRegion/Helper/Data.php +3 -2
  5. app/code/local/Mxperts/NoRegion/Model/Address.php +2 -2
  6. app/code/local/Mxperts/NoRegion/Model/Quote/Address.php +2 -2
  7. app/code/local/Mxperts/NoRegion/etc/config.xml +3 -3
  8. app/code/local/Mxperts/NoRegion/etc/system.xml +2 -2
  9. app/design/frontend/default/default/layout/noregion.xml +97 -2
  10. app/design/frontend/default/default/template/noregion/checkout/cart/shipping.phtml +143 -0
  11. app/design/frontend/default/default/template/noregion/checkout/onepage/billing.phtml +3 -155
  12. app/design/frontend/default/default/template/noregion/checkout/onepage/shipping.phtml +3 -123
  13. app/design/frontend/default/default/template/noregion/customer/address/edit.phtml +3 -148
  14. app/design/frontend/default/default/template/noregion/customer/form/register.phtml +216 -0
  15. package.xml +4 -4
app/code/local/Mxperts/NoRegion/Block/Customer/Edit/Renderer/Region.php CHANGED
@@ -2,9 +2,9 @@
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 1.1.2
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
  */
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
  */
app/code/local/Mxperts/NoRegion/Block/Customer/Edit/Tab/Addresses.php CHANGED
@@ -2,9 +2,9 @@
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 1.1.2
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
  */
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
  */
app/code/local/Mxperts/NoRegion/Block/Customer/Grid.php CHANGED
@@ -2,9 +2,9 @@
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 1.1.2
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
  */
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
  */
app/code/local/Mxperts/NoRegion/Helper/Data.php CHANGED
@@ -2,12 +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 <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
- * @version 1.1.2
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
 
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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_Helper_Data extends Mage_Core_Helper_Abstract
13
  {
14
 
app/code/local/Mxperts/NoRegion/Model/Address.php CHANGED
@@ -2,9 +2,9 @@
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 1.1.2
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
  */
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
  */
app/code/local/Mxperts/NoRegion/Model/Quote/Address.php CHANGED
@@ -2,9 +2,9 @@
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 1.1.2
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
  */
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
  */
app/code/local/Mxperts/NoRegion/etc/config.xml CHANGED
@@ -2,9 +2,9 @@
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 1.1.2
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
  */
@@ -12,7 +12,7 @@
12
  <config>
13
  <modules>
14
  <Mxperts_NoRegion>
15
- <version>1.1.2</version>
16
  <depends>
17
  <Mage_Adminhtml />
18
  <Mage_Customer />
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
  */
12
  <config>
13
  <modules>
14
  <Mxperts_NoRegion>
15
+ <version>1.1.3</version>
16
  <depends>
17
  <Mage_Adminhtml />
18
  <Mage_Customer />
app/code/local/Mxperts/NoRegion/etc/system.xml CHANGED
@@ -3,9 +3,9 @@
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 1.1.2
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
  */
3
  /**
4
  * @category Mxperts
5
  * @package Mxperts_NoRegion
6
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
7
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
8
+ * @version 1.1.3
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
  */
app/design/frontend/default/default/layout/noregion.xml CHANGED
@@ -3,9 +3,9 @@
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 1.1.2
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
  */
@@ -25,6 +25,62 @@ Checkout - No availability for showing and editing State / Province
25
  </block>
26
  </reference>
27
  </checkout_multishipping_customer_address>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
28
 
29
  <checkout_onepage_index>
30
  <remove name="checkout.onepage"/>
@@ -72,6 +128,45 @@ Checkout - No availability for showing and editing State / Province
72
  <!--
73
  Customer - No availability of showing and editing State / Province
74
  -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
75
  <customer_address_form>
76
  <remove name="customer_address_edit"/><!--important for Magento 1.3.x (Double Templates)-->
77
  <reference name="content">
3
  /**
4
  * @category Mxperts
5
  * @package Mxperts_NoRegion
6
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
7
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
8
+ * @version 1.1.3
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
  */
25
  </block>
26
  </reference>
27
  </checkout_multishipping_customer_address>
28
+
29
+ <!-- Warenkorb, kein Bundesland in der "Versandkosten geschaetzt Box" -->
30
+
31
+ <checkout_cart_index translate="label">
32
+ <remove name="checkout.cart"/><!--important for Magento 1.3.x (Double Templates)-->
33
+ <label>Shopping Cart</label>
34
+ <remove name="right"/>
35
+ <remove name="left"/>
36
+ <!-- Mage_Checkout -->
37
+ <reference name="root">
38
+ <action method="setTemplate"><template>page/1column.phtml</template></action>
39
+ </reference>
40
+ <reference name="content">
41
+ <block type="checkout/cart" name="noregion.checkout.cart"><!--modified name-->
42
+ <action method="setCartTemplate"><value>checkout/cart.phtml</value></action>
43
+ <action method="setEmptyTemplate"><value>checkout/cart/noItems.phtml</value></action>
44
+ <action method="chooseTemplate"/>
45
+ <action method="addItemRender"><type>simple</type><block>checkout/cart_item_renderer</block><template>checkout/cart/item/default.phtml</template></action>
46
+ <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/cart/item/default.phtml</template></action>
47
+ <action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/cart/item/default.phtml</template></action>
48
+
49
+ <block type="core/text_list" name="checkout.cart.top_methods" as="top_methods" translate="label">
50
+ <label>Payment Methods Before Checkout Button</label>
51
+ <block type="checkout/onepage_link" name="checkout.cart.methods.onepage" template="checkout/onepage/link.phtml"/>
52
+ </block>
53
+
54
+ <block type="page/html_wrapper" name="checkout.cart.form.before" as="form_before" translate="label">
55
+ <label>Shopping Cart Form Before</label>
56
+ </block>
57
+
58
+ <block type="core/text_list" name="checkout.cart.methods" as="methods" translate="label">
59
+ <label>Payment Methods After Checkout Button</label>
60
+ <block type="checkout/onepage_link" name="checkout.cart.methods.onepage" template="checkout/onepage/link.phtml"/>
61
+ <block type="checkout/multishipping_link" name="checkout.cart.methods.multishipping" template="checkout/multishipping/link.phtml"/>
62
+ </block>
63
+
64
+ <block type="checkout/cart_coupon" name="checkout.cart.coupon" as="coupon" template="checkout/cart/coupon.phtml"/>
65
+ <!--Modified shipping file-->
66
+
67
+
68
+ <block type="checkout/cart_shipping" name="checkout.cart.shipping" as="shipping" template="checkout/cart/shipping.phtml">
69
+ <action method="setTemplate" ifconfig="customer/noregion/enabled" ifvalue="1">
70
+ <template>noregion/checkout/cart/shipping.phtml</template>
71
+ </action>
72
+ </block>
73
+
74
+ <!--<block type="checkout/cart_shipping" name="checkout.cart.shipping" as="shipping" template="checkout/cart/shipping.phtml"/>-->
75
+ <block type="checkout/cart_crosssell" name="checkout.cart.crosssell" as="crosssell" template="checkout/cart/crosssell.phtml"/>
76
+
77
+ <block type="checkout/cart_totals" name="checkout.cart.totals" as="totals" template="checkout/cart/totals.phtml"/>
78
+ </block>
79
+ </reference>
80
+ <block type="core/text_list" name="additional.product.info" translate="label">
81
+ <label>Additional Product Info</label>
82
+ </block>
83
+ </checkout_cart_index>
84
 
85
  <checkout_onepage_index>
86
  <remove name="checkout.onepage"/>
128
  <!--
129
  Customer - No availability of showing and editing State / Province
130
  -->
131
+ <!-- Register Form-->
132
+ <customer_account_create translate="label">
133
+ <remove name="customer_form_register"/><!--important for Magento 1.3.x (Double Templates)-->
134
+ <remove name="recaptcha_form_register"/><!--important: compatiblity to fontis recaptcha extension, remove register page from this extension -->
135
+ <reference name="content">
136
+
137
+ <!--Modified Block - No Region on Registration Page-->
138
+ <block type="customer/form_register" name="noregion_customer_form_register" template="customer/form/register.phtml">
139
+ <action method="setTemplate" ifconfig="customer/noregion/enabled" ifvalue="1">
140
+ <template>noregion/customer/form/register.phtml</template>
141
+ </action>
142
+ <!-- If Fontis Recaptcha is installed and enabled, display recaptcha box -->
143
+
144
+
145
+ <block type="core/template" name="recaptcha.box" as="recaptcha_box" template="fontis/recaptcha/recaptcha.phtml">
146
+ <action method="setTemplate" ifconfig="fontis_recaptcha/recaptcha/customer" ifvalue="1">
147
+ <template>fontis/recaptcha/recaptcha.phtml</template>
148
+ </action>
149
+ </block>
150
+ <!-- End recaptcha box -->
151
+
152
+ <block type="page/html_wrapper" name="customer.form.register.fields.before" as="form_fields_before" translate="label">
153
+ <label>Form Fields Before</label>
154
+ </block>
155
+ </block>
156
+
157
+ <!--End modified block-->
158
+
159
+ <!-- Original Block-->
160
+ <!--<block type="customer/form_register" name="customer_form_register" template="customer/form/register.phtml">
161
+ <block type="page/html_wrapper" name="customer.form.register.fields.before" as="form_fields_before" translate="label">
162
+ <label>Form Fields Before</label>
163
+ </block>
164
+ </block>-->
165
+ </reference>
166
+ </customer_account_create>
167
+
168
+ <!-- Edit Address Form-->
169
+
170
  <customer_address_form>
171
  <remove name="customer_address_edit"/><!--important for Magento 1.3.x (Double Templates)-->
172
  <reference name="content">
app/design/frontend/default/default/template/noregion/checkout/cart/shipping.phtml ADDED
@@ -0,0 +1,143 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * @category Mxperts
4
+ * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
14
+ /**
15
+ * Magento
16
+ *
17
+ * NOTICE OF LICENSE
18
+ *
19
+ * This source file is subject to the Academic Free License (AFL 3.0)
20
+ * that is bundled with this package in the file LICENSE_AFL.txt.
21
+ * It is also available through the world-wide-web at this URL:
22
+ * http://opensource.org/licenses/afl-3.0.php
23
+ * If you did not receive a copy of the license and are unable to
24
+ * obtain it through the world-wide-web, please send an email
25
+ * to license@magentocommerce.com so we can send you a copy immediately.
26
+ *
27
+ * DISCLAIMER
28
+ *
29
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
30
+ * versions in the future. If you wish to customize Magento for your
31
+ * needs please refer to http://www.magentocommerce.com for more information.
32
+ *
33
+ * @category design
34
+ * @package base_default
35
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
36
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
37
+ */
38
+ ?>
39
+ <?php
40
+ /**
41
+ * @see Mage_Checkout_Block_Cart_Shipping
42
+ */
43
+ ?>
44
+ <div class="shipping">
45
+ <h2><?php echo $this->__('Estimate Shipping and Tax') ?></h2>
46
+ <div class="shipping-form">
47
+ <form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
48
+ <p><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
49
+ <ul class="form-list">
50
+ <li>
51
+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
52
+ <div class="input-box">
53
+ <?php echo Mage::getBlockSingleton('directory/data')->getCountryHtmlSelect($this->getEstimateCountryId()) ?>
54
+ </div>
55
+ </li>
56
+ <?php //if($this->getStateActive()): ?>
57
+ <?php // Here was the li element that display a select box for region/state ?>
58
+
59
+ <?php //endif; ?>
60
+ <?php if($this->getCityActive()): ?>
61
+ <li>
62
+ <label for="city"<?php if ($this->isCityRequired()) echo ' class="required"' ?>><?php if ($this->isCityRequired()) echo '<em>*</em>' ?><?php echo $this->__('City') ?></label>
63
+ <div class="input-box">
64
+ <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->htmlEscape($this->getEstimateCity()) ?>" />
65
+ </div>
66
+ </li>
67
+ <?php endif; ?>
68
+ <li>
69
+ <label for="postcode"<?php if ($this->isZipCodeRequired()) echo ' class="required"' ?>><?php if ($this->isZipCodeRequired()) echo '<em>*</em>' ?><?php echo $this->__('Zip/Postal Code') ?></label>
70
+ <div class="input-box">
71
+ <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->htmlEscape($this->getEstimatePostcode()) ?>" />
72
+ </div>
73
+ </li>
74
+ </ul>
75
+ <div class="buttons-set">
76
+ <button type="button" title="<?php echo $this->__('Get a Quote') ?>" onclick="coShippingMethodForm.submit()" class="button"><span><span><?php echo $this->__('Get a Quote') ?></span></span></button>
77
+ </div>
78
+ </form>
79
+ <script type="text/javascript">
80
+ //<![CDATA[
81
+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
82
+ //]]>
83
+ </script>
84
+
85
+ <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
86
+ <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
87
+ <dl class="sp-methods">
88
+ <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
89
+ <dt><?php echo $this->getCarrierName($code) ?></dt>
90
+ <dd>
91
+ <ul>
92
+ <?php foreach ($_rates as $_rate): ?>
93
+ <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"';?>>
94
+ <?php if ($_rate->getErrorMessage()): ?>
95
+ <?php echo $_rate->getErrorMessage() ?>
96
+ <?php else: ?>
97
+ <input name="estimate_method" type="radio" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
98
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
99
+ <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
100
+ <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
101
+ <?php echo $_excl; ?>
102
+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
103
+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
104
+ <?php endif; ?>
105
+ </label>
106
+ <?php endif ?>
107
+ </li>
108
+ <?php endforeach; ?>
109
+ </ul>
110
+ </dd>
111
+ <?php endforeach; ?>
112
+ </dl>
113
+ <div class="buttons-set">
114
+ <button type="submit" title="<?php echo $this->__('Update Total') ?>" class="button" name="do" value="<?php echo $this->__('Update Total') ?>"><span><span><?php echo $this->__('Update Total') ?></span></span></button>
115
+ </div>
116
+ </form>
117
+ <?php endif; ?>
118
+ <script type="text/javascript">
119
+ //<![CDATA[
120
+ var coShippingMethodForm = new VarienForm('shipping-zip-form');
121
+ var countriesWithOptionalZip = <?php echo $this->helper('directory')->getCountriesWithOptionalZip(true) ?>;
122
+
123
+ coShippingMethodForm.submit = function () {
124
+ var country = $F('country');
125
+ var optionalZip = false;
126
+
127
+ for (i=0; i < countriesWithOptionalZip.length; i++) {
128
+ if (countriesWithOptionalZip[i] == country) {
129
+ optionalZip = true;
130
+ }
131
+ }
132
+ if (optionalZip) {
133
+ $('postcode').removeClassName('required-entry');
134
+ }
135
+ else {
136
+ $('postcode').addClassName('required-entry');
137
+ }
138
+ return VarienForm.prototype.submit.bind(coShippingMethodForm)();
139
+ }
140
+ //]]>
141
+ </script>
142
+ </div>
143
+ </div>
app/design/frontend/default/default/template/noregion/checkout/onepage/billing.phtml CHANGED
@@ -2,164 +2,14 @@
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 1.1.2
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
20
- *
21
- * NOTICE OF LICENSE
22
- *
23
- * This source file is subject to the Academic Free License (AFL 3.0)
24
- * that is bundled with this package in the file LICENSE_AFL.txt.
25
- * It is also available through the world-wide-web at this URL:
26
- * http://opensource.org/licenses/afl-3.0.php
27
- * If you did not receive a copy of the license and are unable to
28
- * obtain it through the world-wide-web, please send an email
29
- * to license@magentocommerce.com so we can send you a copy immediately.
30
- *
31
- * DISCLAIMER
32
- *
33
- * Do not edit or add to this file if you wish to upgrade Magento to newer
34
- * versions in the future. If you wish to customize Magento for your
35
- * needs please refer to http://www.magentocommerce.com for more information.
36
- *
37
- * @category design_default
38
- * @package Mage
39
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
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>
46
- <ul><li><p><?php echo $this->getAddressesHtmlSelect('billing') ?></p></li></ul>
47
-
48
- <?php endif ?>
49
- <fieldset class="group-select" id="billing-new-address-form" <?php if ($this->customerHasAddresses()): ?>style="display:none"<?php endif ?>>
50
- <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
51
- <ul>
52
- <li><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())
53
- ->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
54
- <li><div class="input-box">
55
- <label for="billing:company"><?php echo $this->__('Company') ?></label><br />
56
- <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>
57
- <?php if(!$this->isCustomerLoggedIn()): ?>
58
- <div class="input-box">
59
- <label for="billing:email"><?php echo $this->__('Email Address') ?> <span class="required">*</span></label><br />
60
- <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>
61
- <?php endif ?>
62
- </li>
63
- <li><label for="billing:street1"><?php echo $this->__('Address') ?> <span class="required">*</span></label><br />
64
- <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>
65
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
66
- <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>
67
- <?php endfor ?>
68
- <li><div class="input-box">
69
- <label for="billing:postcode"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
70
- <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>
71
- <div class="input-box">
72
- <label for="billing:city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
73
- <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>
74
- </li>
75
- <li><div class="input-box" style="display:none;">
76
- <label for="billing:region"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br/>
77
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
78
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
79
- </select>
80
- <script type="text/javascript">
81
- $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
82
- </script>
83
- <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" />
84
- </div>
85
- <div class="input-box">
86
- <label for="billing:country_id"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
87
- <?php echo $this->getCountryHtmlSelect('billing') ?></div></li>
88
- <li><div class="input-box">
89
- <label for="billing:telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br/>
90
- <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>
91
- <div class="input-box">
92
- <label for="billing:fax"><?php echo $this->__('Fax') ?></label><br/>
93
- <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>
94
- <?php if(!$this->isCustomerLoggedIn()): ?>
95
-
96
- <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
97
- <?php if ($_dob->isEnabled()): ?>
98
- <li>
99
- <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())
100
- ->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
101
- </li>
102
- <?php endif ?>
103
-
104
- <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
105
- <?php if ($_taxvat->isEnabled()): ?>
106
- <li>
107
- <?php echo $_taxvat->setTaxvat($this->getQuote()->getCustomerTaxvat())
108
- ->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
109
- </li>
110
- <?php endif ?>
111
-
112
- <li id="register-customer-password">
113
- <div class="input-box">
114
- <label for="billing:customer_password"><?php echo $this->__('Password') ?> <span class="required">*</span></label><br/>
115
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="required-entry validate-password input-text" /></div>
116
- <div class="input-box">
117
- <label for="billing:confirm_password"><?php echo $this->__('Confirm Password') ?> <span class="required">*</span></label><br/>
118
- <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>
119
- <?php endif ?>
120
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
121
- <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>
122
- <?php else:?>
123
- <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
124
- <?php endif;?>
125
- </ul>
126
- </fieldset>
127
- <fieldset>
128
- <?php if ($this->canShip()): ?>
129
- <p>
130
- <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>
131
- </p>
132
- <?php else: ?>
133
- <p class="no-display"><input type="hidden" name="billing[use_for_shipping]" value="1" /></p>
134
- <?php endif; ?>
135
- </fieldset>
136
- </form>
137
- <div class="button-set">
138
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
139
- <div id="billing-buttons-container">
140
- <button type="button" class="form-button right" onclick="billing.save()"><span><?php echo $this->__('Continue') ?></span></button>
141
- <span id="billing-please-wait" style="display:none;" class="opc-please-wait">
142
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt="" /> &nbsp; <?php echo $this->__('Loading next step...') ?> &nbsp;
143
- </span>
144
- </div>
145
- </div>
146
-
147
- <script type="text/javascript">
148
- //<![CDATA[
149
- var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
150
- var billingForm = new VarienForm('co-billing-form');
151
-
152
- //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
153
- $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
154
-
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
@@ -365,6 +215,4 @@
365
 
366
  var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, 'billing:postcode');
367
  //]]>
368
- </script>
369
-
370
- <?php endif; ?>
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
14
  /**
15
  * Magento
215
 
216
  var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, 'billing:postcode');
217
  //]]>
218
+ </script>
 
 
app/design/frontend/default/default/template/noregion/checkout/onepage/shipping.phtml CHANGED
@@ -2,132 +2,14 @@
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 1.1.2
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
20
- *
21
- * NOTICE OF LICENSE
22
- *
23
- * This source file is subject to the Academic Free License (AFL 3.0)
24
- * that is bundled with this package in the file LICENSE_AFL.txt.
25
- * It is also available through the world-wide-web at this URL:
26
- * http://opensource.org/licenses/afl-3.0.php
27
- * If you did not receive a copy of the license and are unable to
28
- * obtain it through the world-wide-web, please send an email
29
- * to license@magentocommerce.com so we can send you a copy immediately.
30
- *
31
- * DISCLAIMER
32
- *
33
- * Do not edit or add to this file if you wish to upgrade Magento to newer
34
- * versions in the future. If you wish to customize Magento for your
35
- * needs please refer to http://www.magentocommerce.com for more information.
36
- *
37
- * @category design_default
38
- * @package Mage
39
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
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>
46
- <p><?php echo $this->getAddressesHtmlSelect('shipping') ?></p>
47
- <?php endif ?>
48
-
49
- <fieldset class="group-select" id="shipping-new-address-form" <?php if ($this->customerHasAddresses()): ?>style="display:none"<?php endif ?>>
50
- <input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
51
- <ul>
52
- <li><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())
53
- ->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?></li>
54
- <li><div class="input-box">
55
- <label for="shipping:company"><?php echo $this->__('Company') ?></label><br/>
56
- <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>
57
- <?php if(false): ?>
58
- <div class="input-box">
59
- <label for="shipping:email"><?php echo $this->__('Email Address') ?> <span class="required">*</span></label><br />
60
- <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>
61
- <?php endif ?>
62
- </li>
63
- <li><label for="shipping:street1"><?php echo $this->__('Address') ?> <span class="required">*</span></label><br />
64
- <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>
65
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
66
- <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>
67
- <?php endfor ?>
68
- <li><div class="input-box">
69
- <label for="shipping:postcode"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
70
- <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>
71
- <div class="input-box">
72
- <label for="shipping:city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
73
- <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>
74
- <div class="input-box" style="display:none;">
75
- <label for="shipping:region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
76
- <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
77
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
78
- </select>
79
- <script type="text/javascript">
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 />
87
- <?php echo $this->getCountryHtmlSelect('shipping') ?>
88
- </div></li>
89
- <li><div class="input-box">
90
- <label for="shipping:telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
91
- <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>
92
- <div class="input-box">
93
- <label for="shipping:fax"><?php echo $this->__('Fax') ?></label><br />
94
- <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>
95
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
96
- <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>
97
- <?php else:?>
98
- <li><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
99
- <?php endif;?>
100
- </ul>
101
- </fieldset>
102
- <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>
103
- </form>
104
- <div class="button-set">
105
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
106
- <div id="shipping-buttons-container">
107
- <a href="#" class="back left" onclick="checkout.back(); return false;"><?php echo $this->__('Back') ?></a>
108
- <button type="button" class="form-button right" onclick="shipping.save()"><span><?php echo $this->__('Continue') ?></span></button>
109
- <span id="shipping-please-wait" style="display:none;" class="opc-please-wait">
110
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt="" /> &nbsp; <?php echo $this->__('Loading next step...') ?> &nbsp;
111
- </span>
112
- </div>
113
- </div>
114
-
115
- <script type="text/javascript">
116
- //<![CDATA[
117
- var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
118
- '<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
119
- var shippingForm = new VarienForm('co-shipping-form');
120
- shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
121
- //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
122
- $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
123
-
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
@@ -283,6 +165,4 @@
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; ?>
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
14
  /**
15
  * Magento
165
 
166
  var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions, undefined, 'shipping:postcode');
167
  //]]>
168
+ </script>
 
 
app/design/frontend/default/default/template/noregion/customer/address/edit.phtml CHANGED
@@ -2,157 +2,14 @@
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 1.1.2
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
20
- *
21
- * NOTICE OF LICENSE
22
- *
23
- * This source file is subject to the Academic Free License (AFL 3.0)
24
- * that is bundled with this package in the file LICENSE_AFL.txt.
25
- * It is also available through the world-wide-web at this URL:
26
- * http://opensource.org/licenses/afl-3.0.php
27
- * If you did not receive a copy of the license and are unable to
28
- * obtain it through the world-wide-web, please send an email
29
- * to license@magentocommerce.com so we can send you a copy immediately.
30
- *
31
- * DISCLAIMER
32
- *
33
- * Do not edit or add to this file if you wish to upgrade Magento to newer
34
- * versions in the future. If you wish to customize Magento for your
35
- * needs please refer to http://www.magentocommerce.com for more information.
36
- *
37
- * @category design_default
38
- * @package Mage
39
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
40
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
41
- */
42
- ?>
43
- <?php
44
- /**
45
- * Edit customer address template
46
- *
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>
53
- </div>
54
- <?php endif; ?>
55
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
56
- <form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
57
- <fieldset class="group-select">
58
- <?php echo $this->getBlockHtml('formkey')?>
59
- <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
60
- <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
61
- <h4 class="legend"><?php echo $this->__('Contact Information') ?></h4>
62
- <ul>
63
- <li>
64
- <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer())->toHtml() ?>
65
- </li>
66
- <li>
67
- <label for="company"><?php echo $this->__('Company') ?></label><br />
68
- <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->htmlEscape($this->getAddress()->getCompany()) ?>" class="input-text" />
69
- </li>
70
- <li>
71
- <div class="input-box">
72
- <label for="telephone"><?php echo $this->__('Telephone') ?> <span class="required">*</span></label><br />
73
- <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" />
74
- </div>
75
- <div class="input-box">
76
- <label for="fax"><?php echo $this->__('Fax') ?></label><br />
77
- <input type="text" name="fax" id="fax" title="<?php echo $this->__('Fax') ?>" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" class="input-text" />
78
- </div>
79
- </li>
80
- </ul>
81
- </fieldset>
82
- <fieldset class="group-select">
83
- <h4 class="legend"><?php echo $this->__('Address') ?></h4>
84
- <ul>
85
- <li>
86
- <label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
87
- <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" />
88
- </li>
89
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
90
- <li>
91
- <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" />
92
- </li>
93
- <?php endfor ?>
94
- <li>
95
- <div class="input-box">
96
- <label for="zip"><?php echo $this->__('Zip/Postal Code') ?> <span class="required">*</span></label><br />
97
- <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" />
98
- </div>
99
- <div class="input-box">
100
- <label for="city"><?php echo $this->__('City') ?> <span class="required">*</span></label><br />
101
- <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" />
102
- </div>
103
- <div class="input-box" style="display:none;">
104
- <label for="region_id"><?php echo $this->__('State/Province') ?> <span class="required">*</span></label><br />
105
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none">
106
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
107
- </select>
108
- <script type="text/javascript">
109
- $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
110
- </script>
111
- <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" />
112
- </div>
113
- </li>
114
- <li>
115
- <div class="input-box">
116
- <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br />
117
- <?php echo $this->getCountryHtmlSelect() ?>
118
- </div>
119
- </li>
120
- <li>
121
- <?php if($this->isDefaultBilling()): ?>
122
- <strong><?php echo $this->__('Default Billing Address') ?></strong>
123
- <?php elseif($this->canSetAsDefaultBilling()): ?>
124
- <input type="checkbox" id="primary_billing" name="default_billing" value="1" />&nbsp;
125
- <label for="primary_billing"><?php echo $this->__('Use as my default billing address') ?></label>
126
- <?php else: ?>
127
- <input type="hidden" name="default_billing" value="1" />
128
- <?php endif; ?>
129
- </li>
130
- <li>
131
- <?php if($this->isDefaultShipping()): ?>
132
- <strong><?php echo $this->__('Default Shipping Address') ?></strong>
133
- <?php elseif($this->canSetAsDefaultShipping()): ?>
134
- <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" />&nbsp;
135
- <label for="primary_shipping"><?php echo $this->__('Use as my default shipping address') ?></label>
136
- <?php else: ?>
137
- <input type="hidden" name="default_shipping" value="1" />
138
- <?php endif; ?>
139
- </li>
140
- </ul>
141
- </fieldset>
142
- <div class="button-set">
143
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
144
- <a href="<?php echo $this->getBackUrl() ?>" class="left">&laquo; <?php echo $this->__('Back') ?></a>
145
- <button class="form-button" type="submit"><span><?php echo $this->__('Save Address') ?></span></button>
146
- </div>
147
- </form>
148
- <script type="text/javascript">
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
@@ -307,6 +164,4 @@
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; ?>
2
  /**
3
  * @category Mxperts
4
  * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
14
  /**
15
  * Magento
164
  var dataForm = new VarienForm('form-validate', true);
165
  new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
166
  //]]>
167
+ </script>
 
 
app/design/frontend/default/default/template/noregion/customer/form/register.phtml ADDED
@@ -0,0 +1,216 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * @category Mxperts
4
+ * @package Mxperts_NoRegion
5
+ * @authors TMEDIA cross communications <info@tmedia.de>, Johannes Teitge <teitge@tmedia.de>, Daniel Sasse <info@golox-web.de>
6
+ * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/>
7
+ * @version 1.1.3
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
14
+ /**
15
+ * Magento
16
+ *
17
+ * NOTICE OF LICENSE
18
+ *
19
+ * This source file is subject to the Academic Free License (AFL 3.0)
20
+ * that is bundled with this package in the file LICENSE_AFL.txt.
21
+ * It is also available through the world-wide-web at this URL:
22
+ * http://opensource.org/licenses/afl-3.0.php
23
+ * If you did not receive a copy of the license and are unable to
24
+ * obtain it through the world-wide-web, please send an email
25
+ * to license@magentocommerce.com so we can send you a copy immediately.
26
+ *
27
+ * DISCLAIMER
28
+ *
29
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
30
+ * versions in the future. If you wish to customize Magento for your
31
+ * needs please refer to http://www.magentocommerce.com for more information.
32
+ *
33
+ * @category design
34
+ * @package base_default
35
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
36
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
37
+ */
38
+ ?>
39
+ <?php
40
+ /**
41
+ * Create account form template
42
+ *
43
+ * @see Mage_Customer_Block_Form_Register
44
+ */
45
+ ?>
46
+ <div class="account-create">
47
+ <div class="page-title">
48
+ <h1><?php echo $this->__('Create an Account') ?></h1>
49
+ </div>
50
+ <?php echo $this->getChildHtml('form_fields_before')?>
51
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
52
+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
53
+ <div class="fieldset">
54
+ <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
55
+ <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
56
+ <h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
57
+ <ul class="form-list">
58
+ <li class="fields">
59
+ <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->toHtml() ?>
60
+ </li>
61
+ <li>
62
+ <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
63
+ <div class="input-box">
64
+ <input type="text" name="email" id="email_address" value="<?php echo $this->htmlEscape($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
65
+ </div>
66
+ </li>
67
+ <?php if ($this->isNewsletterEnabled()): ?>
68
+ <li class="control">
69
+ <div class="input-box">
70
+ <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; ?> class="checkbox" />
71
+ </div>
72
+ <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
73
+ </li>
74
+ <?php endif ?>
75
+ <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
76
+ <?php if ($_dob->isEnabled()): ?>
77
+ <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
78
+ <?php endif ?>
79
+ <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
80
+ <?php if ($_taxvat->isEnabled()): ?>
81
+ <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
82
+ <?php endif ?>
83
+ <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
84
+ <?php if ($_gender->isEnabled()): ?>
85
+ <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
86
+ <?php endif ?>
87
+ </ul>
88
+ </div>
89
+ <?php if($this->getShowAddressFields()): ?>
90
+ <div class="fieldset">
91
+ <input type="hidden" name="create_address" value="1" />
92
+ <h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
93
+ <ul class="form-list">
94
+ <li class="fields">
95
+ <div class="field">
96
+ <label for="company"><?php echo $this->__('Company') ?></label>
97
+ <div class="input-box">
98
+ <input type="text" name="company" id="company" value="<?php echo $this->htmlEscape($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
99
+ </div>
100
+ </div>
101
+ <div class="field">
102
+ <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
103
+ <div class="input-box">
104
+ <input type="text" name="telephone" id="telephone" value="<?php echo $this->htmlEscape($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" />
105
+ </div>
106
+ </div>
107
+ </li>
108
+ <li class="wide">
109
+ <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
110
+ <div class="input-box">
111
+ <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text required-entry" />
112
+ </div>
113
+ </li>
114
+ <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
115
+ <li class="wide">
116
+ <div class="input-box">
117
+ <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
118
+ </div>
119
+ </li>
120
+ <?php endfor ?>
121
+
122
+ <?php // Field order: Zip/Postal Code before City ?>
123
+ <li class="fields">
124
+ <div class="field">
125
+ <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
126
+ <div class="input-box">
127
+ <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international required-entry" />
128
+ </div>
129
+ </div>
130
+
131
+ <div class="field">
132
+ <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
133
+ <div class="input-box">
134
+ <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text required-entry" id="city" />
135
+ </div>
136
+ </div>
137
+
138
+ </li>
139
+
140
+ <li class="fields">
141
+ <div class="field">
142
+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
143
+ <div class="input-box">
144
+ <?php echo $this->getCountryHtmlSelect() ?>
145
+ </div>
146
+ </div>
147
+ </li>
148
+
149
+
150
+
151
+ <?php //display:none; for field State/province ?>
152
+ <div class="field" style="display:none;">
153
+ <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
154
+ <div class="input-box">
155
+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
156
+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
157
+ </select>
158
+ <script type="text/javascript">
159
+ //<![CDATA[
160
+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
161
+ //]]>
162
+ </script>
163
+ <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;" />
164
+ </div>
165
+ </div>
166
+ </li>
167
+
168
+ <?php // Original - ZIP /Postal Code was here ?>
169
+
170
+ </ul>
171
+ <input type="hidden" name="default_billing" value="1" />
172
+ <input type="hidden" name="default_shipping" value="1" />
173
+ </div>
174
+ <?php endif; ?>
175
+ <div class="fieldset">
176
+ <h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
177
+ <ul class="form-list">
178
+ <li class="fields">
179
+ <div class="field">
180
+ <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
181
+ <div class="input-box">
182
+ <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
183
+ </div>
184
+ </div>
185
+ <div class="field">
186
+ <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
187
+ <div class="input-box">
188
+ <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
189
+ </div>
190
+ </div>
191
+ </li>
192
+ </ul>
193
+ </div>
194
+
195
+ <!-- Fontis Recaptcha code -->
196
+ <?php if (Mage::getStoreConfig("fontis_recaptcha/recaptcha/customer")): ?>
197
+ <?php echo $this->getChildHtml('recaptcha_box') ?>
198
+ <?php endif; ?>
199
+ <!-- ********************* -->
200
+
201
+
202
+ <div class="buttons-set">
203
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
204
+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
205
+ <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
206
+ </div>
207
+ </form>
208
+ <script type="text/javascript">
209
+ //<![CDATA[
210
+ var dataForm = new VarienForm('form-validate', true);
211
+ <?php if($this->getShowAddressFields()): ?>
212
+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
213
+ <?php endif; ?>
214
+ //]]>
215
+ </script>
216
+ </div>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mxperts_NoRegion</name>
4
- <version>1.1.2</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
@@ -16,9 +16,9 @@ DE_AT_CH&#xD;
16
  Versteckt das Feld Bundesland / Kanton im Shop-Frontend + Backend. Der Kunde hat keine M&#xF6;glichkeit dieses Feld im Checkout, Multishipping Checkout und im Benutzerkonto zu sehen oder entsprechende Daten zu editieren.</description>
17
  <notes>keine / none</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>2011-04-28</date>
20
- <time>08:41:50</time>
21
- <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="Renderer"><file name="Region.php" hash="70b92b2ec44c8f47d63d9e9ca247e0b8"/></dir><dir name="Tab"><file name="Addresses.php" hash="e09a580ba4d8d37a2544cbbfcc695106"/></dir></dir><file name="Grid.php" hash="9016c7182381a1c0b6a1359ede975395"/></dir></dir><dir name="Helper"><file name="Data.php" hash="b02574c324b37fd924115b63e88934dd"/></dir><dir name="Model"><dir name="Quote"><file name="Address.php" hash="2cf4e5599b28139c3a5d4e611a6e9bb6"/></dir><file name="Address.php" hash="4bc95e5773efe82d2ddaddca02f2b244"/></dir><dir name="etc"><file name="config.xml" hash="fdea35b86de7e48bcfec92b2ba00b091"/><file name="system.xml" hash="5cecf967fdcf7a009ee03e223a0291ca"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="noregion.xml" hash="191dafa45adfc11ec7e91c6cb7ed207b"/></dir><dir name="template"><dir name="noregion"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="b2d2dced6f9bf35fef766e5ed09efcea"/><file name="shipping.phtml" hash="267085a5c72c5a68761f1672261d3c36"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="ca2a7fbd6b7f15943f20c559c1d141e6"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
22
  <compatible/>
23
  <dependencies/>
24
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mxperts_NoRegion</name>
4
+ <version>1.1.3</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
16
  Versteckt das Feld Bundesland / Kanton im Shop-Frontend + Backend. Der Kunde hat keine M&#xF6;glichkeit dieses Feld im Checkout, Multishipping Checkout und im Benutzerkonto zu sehen oder entsprechende Daten zu editieren.</description>
17
  <notes>keine / none</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>2011-05-22</date>
20
+ <time>11:23:25</time>
21
+ <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="Renderer"><file name="Region.php" hash="6ed258f9cf995a7ff1bc6229857bc902"/></dir><dir name="Tab"><file name="Addresses.php" hash="e64c7b5928e3d2e254ead94d5e993be8"/></dir></dir><file name="Grid.php" hash="3baef9fcaaec31d0163019ffeb5cd545"/></dir></dir><dir name="Helper"><file name="Data.php" hash="a068dd54a961434ca644281b7b8210df"/></dir><dir name="Model"><dir name="Quote"><file name="Address.php" hash="88f5a33dd98e522b69556443ba3093b5"/></dir><file name="Address.php" hash="75c9d63d6ab736b96e59c73437349a18"/></dir><dir name="etc"><file name="config.xml" hash="07688cd88120e8558a915c9e908d40df"/><file name="system.xml" hash="1757f56b384800054f2fd9981bd7cd48"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="noregion.xml" hash="29119d057c630a713ae0170b9fff8b6e"/></dir><dir name="template"><dir name="noregion"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="e0982122f49c81d7c08e246c8b5c1d1f"/></dir><dir name="onepage"><file name="billing.phtml" hash="79ffe00f950af8a4fd5b5f2038a720f3"/><file name="shipping.phtml" hash="3e9d5bfe0f0478d411242c12e1dee8ce"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="eedee0dc635cad3f83366e718806abd7"/></dir><dir name="form"><file name="register.phtml" hash="3f8edf75203e1798ba0c18276330500c"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
22
  <compatible/>
23
  <dependencies/>
24
  </package>