Page MenuHomeIn-Portal Phabricator
Files F785535

advanced
No OneTemporary
Actions

File Metadata

Created
Wed, Feb 12, 1:47 PM

advanced
View Options

Index: branches/1.1.x/in-commerce/my_account/edit_address.tpl
===================================================================
--- branches/1.1.x/in-commerce/my_account/edit_address.tpl (revision 13467)
+++ branches/1.1.x/in-commerce/my_account/edit_address.tpl (revision 13468)
@@ -1,94 +1,94 @@
<!--##
<NAME>Edit Address</NAME>
<DESC>Edit Address page</DESC>
<SECTION>My Account||Store</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_EditAddress"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyAddresses,lu_title_EditAddress" templates="platform/my_account/my_account,in-commerce/my_account/my_addresses,in-commerce/my_account/edit_address"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_EditAddress"/>
</inp2:m_Capture>
<form method="post" action="<inp2:m_FormAction />">
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="addr_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<strong><inp2:m_Phrase label="lu_AddressModificationBlocked"/></strong>
<inp2:m_else/>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="lu_fld_FullName"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company" title="lu_fld_Company"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="lu_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="lu_fld_AddressLine2"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City" title="lu_fld_City"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State" title="lu_fld_State"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip" title="lu_fld_ZipCode"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country" has_empty="1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone" title="lu_fld_Phone"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax" title="lu_fld_Fax"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email" title="lu_fld_Email"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping" title="lu_fld_LastUsedAsShipping"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling" title="lu_fld_LastUsedAsBilling" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input class="button" type="submit" name="events[addr][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update" no_editing="1"/>"/>
<input type="hidden" name="next_template" value="in-commerce/my_account/my_addresses"/>
</inp2:m_RenderElement>
</table>
</inp2:m_if>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.1.x/in-commerce/my_account/new_address.tpl
===================================================================
--- branches/1.1.x/in-commerce/my_account/new_address.tpl (revision 13467)
+++ branches/1.1.x/in-commerce/my_account/new_address.tpl (revision 13468)
@@ -1,93 +1,93 @@
<!--##
<NAME>Add New Address</NAME>
<DESC>Add New Address Form</DESC>
<SECTION>My Account||Store</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AddAddress"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyAddresses,lu_title_AddAddress" templates="platform/my_account/my_account,in-commerce/my_account/my_addresses,in-commerce/my_account/new_address"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:addr_PresetFormFields/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AddAddress"/>
</inp2:m_Capture>
<form method="post" action="<inp2:m_FormAction />">
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="addr_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<strong><inp2:m_Phrase label="lu_AddressModificationBlocked"/></strong>
<inp2:m_else/>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="lu_fld_FullName"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company" title="lu_fld_Company"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="lu_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="lu_fld_AddressLine2"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City" title="lu_fld_City"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State" title="lu_fld_State"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip" title="lu_fld_ZipCode"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country" has_empty="1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone" title="lu_fld_Phone"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax" title="lu_fld_Fax"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email" title="lu_fld_Email"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping" title="lu_fld_LastUsedAsShipping"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling" title="lu_fld_LastUsedAsBilling" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input class="button" type="submit" name="events[addr][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
<input type="hidden" name="next_template" value="in-commerce/my_account/my_addresses"/>
</inp2:m_RenderElement>
</table>
</inp2:m_if>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.1.x/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl
===================================================================
--- branches/1.1.x/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl (revision 13467)
+++ branches/1.1.x/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl (revision 13468)
@@ -1,64 +1,64 @@
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_comm_BillingInfo"/>
</inp2:m_Capture>
<inp2:ord_ShowDefaultAddress type="billing"/>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_Phrase label="lu_EnterBillingAddress"/><br /><br />
<inp2:m_if check="ord_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<table class="form-data fullwidth">
<inp2:m_include template="in-commerce/elements/addresses.elm"/>
<inp2:m_if check="ord_OrderHasTangibleItems">
<inp2:m_if check="m_LoggedIn"><inp2:m_else/>
<tr>
<td class="field-name"><inp2:m_Phrase label="lu_SameAsShipping"/>:</td>
<td class="field-value">
<input type="checkbox" name="same_address" onclick="document.getElementById('events[ord][OnUpdate]').click();" value="1"<inp2:m_if check="m_GetEquals" name="same_address" value="1"> checked</inp2:m_if>" />
</td>
</tr>
</inp2:m_if>
</inp2:m_if>
<inp2:m_if check="m_LoggedIn">
<inp2:m_RenderElement name="inp_edit_select_address" type="billing" title="lu_fld_SelectAddress"/>
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingTo" title="lu_fld_FullName"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCompany" title="lu_fld_Company"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCity" title="lu_fld_City"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingState" title="lu_fld_State"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingZip" title="lu_fld_Zip"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCountry" title="lu_fld_Country"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingEmail" title="lu_fld_Email" is_last="1"/>
<inp2:m_else/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="lu_fld_FullName" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="lu_fld_Company" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City" style="width: 200px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="lu_fld_State" style="width: 200px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" style="width: 100px;" />
- <inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" />
+ <inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone" style="width: 150px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
</inp2:m_if>
<inp2:m_RenderElement design="inp_edit_buttons" width="200">
<input type="hidden" name="check_billing_address" value="true"/>
<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress" no_editing="1"/>"/>
</inp2:m_RenderElement>
</table>
</inp2:m_RenderElement>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
===================================================================
--- branches/1.1.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl (revision 13467)
+++ branches/1.1.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl (revision 13468)
@@ -1,53 +1,53 @@
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_ShippingInformation"/>
</inp2:m_Capture>
<inp2:ord_ShowDefaultAddress type="shipping"/>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_Phrase label="lu_EnterShippingAddress"/><br /><br />
<inp2:m_if check="ord_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<table class="form-data fullwidth">
<inp2:m_include template="in-commerce/elements/addresses.elm"/>
<inp2:m_if check="m_LoggedIn">
<inp2:m_RenderElement name="inp_edit_select_address" type="shipping" title="lu_fld_SelectAddress"/>
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingTo" title="lu_fld_FullName"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCompany" title="lu_fld_Company"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingAddress1" title="lu_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingAddress2" title="lu_fld_AddressLine2"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingState" title="lu_fld_State"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingZip" title="lu_fld_Zip"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCountry" title="lu_fld_Country"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingPhone" title="lu_fld_Phone"/>
<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingEmail" title="lu_fld_Email" is_last="1"/>
<inp2:m_else/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City" style="width: 200px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="lu_fld_State" style="width: 200px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
- <inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" />
+ <inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
</inp2:m_if>
<inp2:m_RenderElement design="inp_edit_buttons" width="200">
<input type="hidden" name="check_shipping_address" value="true"/>
<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress" no_editing="1"/>"/>
</inp2:m_RenderElement>
</table>
</inp2:m_RenderElement>
\ No newline at end of file

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server