0000896: User Address Management in Admin

Index: install/english.lang =================================================================== --- install/english.lang (revision 14944) +++ install/english.lang (working copy) @@ -302,8 +302,8 @@ <PHRASE Label="la_field_displayorder" Module="Core" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE> <PHRASE Label="la_field_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE> <PHRASE Label="la_fld_Action" Module="Core" Type="1" Column="QWN0aW9u">QWN0aW9u</PHRASE> ~~- <PHRASE Label="la_fld_AddressLine1" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>~~ ~~- <PHRASE Label="la_fld_AddressLine2" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>~~ + <PHRASE Label="la_fld_AddressLine1" Module="Core" Type="1" Column="QWRkcmVzcyBMaW5lIDE=">QWRkcmVzcyBMaW5lIDE=</PHRASE> + <PHRASE Label="la_fld_AddressLine2" Module="Core" Type="1" Column="QWRkcmVzcyBMaW5lIDI=">QWRkcmVzcyBMaW5lIDI=</PHRASE> <PHRASE Label="la_fld_AdminEmail" Module="Core" Type="1">TWVzc2FnZXMgZnJvbSBTaXRlIEFkbWluIGFyZSBmcm9t</PHRASE> <PHRASE Label="la_fld_AdminInterfaceLang" Module="Core" Type="1" Column="QWRtaW4gUHJpbWFyeQ==">QWRtaW4gUHJpbWFyeQ==</PHRASE> <PHRASE Label="la_fld_AdvancedCSS" Module="Core" Type="1">QWR2YW5jZWQgQ1NT</PHRASE> @@ -342,10 +342,10 @@ <PHRASE Label="la_fld_Changes" Module="Core" Type="1" Column="Q2hhbmdlcw==">Q2hhbmdlcw==</PHRASE> <PHRASE Label="la_fld_Charset" Module="Core" Type="1" Column="Q2hhcnNldA==">Q2hhcnNldA==</PHRASE> <PHRASE Label="la_fld_CheckDuplicatesMethod" Module="Core" Type="1">Q2hlY2sgRHVwbGljYXRlcyBieQ==</PHRASE> ~~- <PHRASE Label="la_fld_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>~~ + <PHRASE Label="la_fld_City" Module="Core" Type="1" Column="Q2l0eQ==">Q2l0eQ==</PHRASE> <PHRASE Label="la_fld_ColumnTranslation" Module="Core" Type="1" Hint="QXNzb2NpYXRlZCBjb2x1bW4gaGVhZGluZyB0cmFuc2xhdGlvbg==">Q29sdW1uIFBocmFzZQ==</PHRASE> <PHRASE Label="la_fld_Comments" Module="Core" Type="1">Q29tbWVudHM=</PHRASE> ~~- <PHRASE Label="la_fld_Company" Module="Core" Type="1">Q29tcGFueQ==</PHRASE>~~ + <PHRASE Label="la_fld_Company" Module="Core" Type="1" Column="Q29tcGFueQ==">Q29tcGFueQ==</PHRASE> <PHRASE Label="la_fld_ConfigHeader" Module="Core" Type="1">Q29uZmlndXJhdGlvbiBIZWFkZXIgTGFiZWw=</PHRASE> <PHRASE Label="la_fld_ContentBlock" Module="Core" Type="1">Q29udGVudCBCbG9jaw==</PHRASE> <PHRASE Label="la_fld_ConversionPercent" Module="Core" Type="1" Column="Q1RSLCAl">Q1RSLCAl</PHRASE> @@ -402,7 +402,7 @@ <PHRASE Label="la_fld_ExternalLink" Module="Core" Type="1" Column="RXh0ZXJuYWwgTGluaw==">RXh0ZXJuYWwgTGluaw==</PHRASE> <PHRASE Label="la_fld_ExternalUrl" Module="Core" Type="1">RXh0ZXJuYWwgVVJM</PHRASE> <PHRASE Label="la_fld_ExtraHeaders" Module="Core" Type="1">RXh0cmEgSGVhZGVycw==</PHRASE> ~~- <PHRASE Label="la_fld_Fax" Module="Core" Type="1">RmF4</PHRASE>~~ + <PHRASE Label="la_fld_Fax" Module="Core" Type="1" Column="RmF4">RmF4</PHRASE> <PHRASE Label="la_fld_FieldComparision" Module="Core" Type="1" Column="TWF0Y2ggVHlwZQ==">TWF0Y2ggVHlwZQ==</PHRASE> <PHRASE Label="la_fld_FieldName" Module="Core" Type="1" Column="RmllbGQgTmFtZQ==">RmllbGQgTmFtZQ==</PHRASE> <PHRASE Label="la_fld_FieldsEnclosedBy" Module="Core" Type="1">RmllbGRzIGVuY2xvc2VkIGJ5</PHRASE> @@ -600,7 +600,7 @@ <PHRASE Label="la_fld_SortValues" Module="Core" Type="1">U29ydCBWYWx1ZXM=</PHRASE> <PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1" Hint="aHR0cHM6Ly93d3cuZG9tYWluLmNvbS9wYXRo" Column="U1NMIFVybA==">U1NMIEZ1bGwgVVJM</PHRASE> <PHRASE Label="la_fld_StartDate" Module="Core" Type="1" Column="U3RhcnQgRGF0ZQ==">U3RhcnQgRGF0ZQ==</PHRASE> ~~- <PHRASE Label="la_fld_State" Module="Core" Type="1">U3RhdGU=</PHRASE>~~ + <PHRASE Label="la_fld_State" Module="Core" Type="1" Column="U3RhdGU=">U3RhdGU=</PHRASE> <PHRASE Label="la_fld_StateCountry" Module="Core" Type="1" Column="U3RhdGUgQ291bnRyeQ==">U3RhdGUgQ291bnRyeQ==</PHRASE> <PHRASE Label="la_fld_Status" Module="Core" Type="1" Column="U3RhdHVz">U3RhdHVz</PHRASE> <PHRASE Label="la_fld_Sticky" Module="Core" Type="1" Column="U3RpY2t5">U3RpY2t5</PHRASE> @@ -655,7 +655,7 @@ <PHRASE Label="la_fld_Votes" Module="Core" Type="1">Vm90ZXM=</PHRASE> <PHRASE Label="la_fld_Width" Module="Core" Type="1">V2lkdGg=</PHRASE> <PHRASE Label="la_fld_Z-Index" Module="Core" Type="1">Wi1JbmRleA==</PHRASE> ~~- <PHRASE Label="la_fld_ZIP" Module="Core" Type="1">WklQ</PHRASE>~~ + <PHRASE Label="la_fld_ZIP" Module="Core" Type="1" Column="WklQ">WklQ</PHRASE> <PHRASE Label="la_Font" Module="Core" Type="1">Rm9udCBQcm9wZXJ0aWVz</PHRASE> <PHRASE Label="la_FormCancelConfirmation" Module="Core" Type="1">RG8geW91IHdhbnQgdG8gc2F2ZSB0aGUgY2hhbmdlcz8=</PHRASE> <PHRASE Label="la_FormResetConfirmation" Module="Core" Type="1">QXJlIHlvdSBzdXJlIHlvdSB3b3VsZCBsaWtlIHRvIGRpc2NhcmQgdGhlIGNoYW5nZXM/</PHRASE>

Index: install/english.lang =================================================================== --- install/english.lang (revision 14949) +++ install/english.lang (working copy) @@ -302,8 +302,8 @@ <PHRASE Label="la_field_displayorder" Module="Core" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE> <PHRASE Label="la_field_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE> <PHRASE Label="la_fld_Action" Module="Core" Type="1" Column="QWN0aW9u">QWN0aW9u</PHRASE> ~~- <PHRASE Label="la_fld_AddressLine1" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>~~ ~~- <PHRASE Label="la_fld_AddressLine2" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>~~ + <PHRASE Label="la_fld_AddressLine1" Module="Core" Type="1" Column="QWRkcmVzcyBMaW5lIDE=">QWRkcmVzcyBMaW5lIDE=</PHRASE> + <PHRASE Label="la_fld_AddressLine2" Module="Core" Type="1" Column="QWRkcmVzcyBMaW5lIDI=">QWRkcmVzcyBMaW5lIDI=</PHRASE> <PHRASE Label="la_fld_AdminEmail" Module="Core" Type="1">TWVzc2FnZXMgZnJvbSBTaXRlIEFkbWluIGFyZSBmcm9t</PHRASE> <PHRASE Label="la_fld_AdminInterfaceLang" Module="Core" Type="1" Column="QWRtaW4gUHJpbWFyeQ==">QWRtaW4gUHJpbWFyeQ==</PHRASE> <PHRASE Label="la_fld_AdvancedCSS" Module="Core" Type="1">QWR2YW5jZWQgQ1NT</PHRASE> @@ -342,10 +342,10 @@ <PHRASE Label="la_fld_Changes" Module="Core" Type="1" Column="Q2hhbmdlcw==">Q2hhbmdlcw==</PHRASE> <PHRASE Label="la_fld_Charset" Module="Core" Type="1" Column="Q2hhcnNldA==">Q2hhcnNldA==</PHRASE> <PHRASE Label="la_fld_CheckDuplicatesMethod" Module="Core" Type="1">Q2hlY2sgRHVwbGljYXRlcyBieQ==</PHRASE> ~~- <PHRASE Label="la_fld_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>~~ + <PHRASE Label="la_fld_City" Module="Core" Type="1" Column="Q2l0eQ==">Q2l0eQ==</PHRASE> <PHRASE Label="la_fld_ColumnTranslation" Module="Core" Type="1" Hint="QXNzb2NpYXRlZCBjb2x1bW4gaGVhZGluZyB0cmFuc2xhdGlvbg==">Q29sdW1uIFBocmFzZQ==</PHRASE> <PHRASE Label="la_fld_Comments" Module="Core" Type="1">Q29tbWVudHM=</PHRASE> ~~- <PHRASE Label="la_fld_Company" Module="Core" Type="1">Q29tcGFueQ==</PHRASE>~~ + <PHRASE Label="la_fld_Company" Module="Core" Type="1" Column="Q29tcGFueQ==">Q29tcGFueQ==</PHRASE> <PHRASE Label="la_fld_ConfigHeader" Module="Core" Type="1">Q29uZmlndXJhdGlvbiBIZWFkZXIgTGFiZWw=</PHRASE> <PHRASE Label="la_fld_ContentBlock" Module="Core" Type="1">Q29udGVudCBCbG9jaw==</PHRASE> <PHRASE Label="la_fld_ConversionPercent" Module="Core" Type="1" Column="Q1RSLCAl">Q1RSLCAl</PHRASE> @@ -402,7 +402,7 @@ <PHRASE Label="la_fld_ExternalLink" Module="Core" Type="1" Column="RXh0ZXJuYWwgTGluaw==">RXh0ZXJuYWwgTGluaw==</PHRASE> <PHRASE Label="la_fld_ExternalUrl" Module="Core" Type="1">RXh0ZXJuYWwgVVJM</PHRASE> <PHRASE Label="la_fld_ExtraHeaders" Module="Core" Type="1">RXh0cmEgSGVhZGVycw==</PHRASE> ~~- <PHRASE Label="la_fld_Fax" Module="Core" Type="1">RmF4</PHRASE>~~ + <PHRASE Label="la_fld_Fax" Module="Core" Type="1" Column="RmF4">RmF4</PHRASE> <PHRASE Label="la_fld_FieldComparision" Module="Core" Type="1" Column="TWF0Y2ggVHlwZQ==">TWF0Y2ggVHlwZQ==</PHRASE> <PHRASE Label="la_fld_FieldName" Module="Core" Type="1" Column="RmllbGQgTmFtZQ==">RmllbGQgTmFtZQ==</PHRASE> <PHRASE Label="la_fld_FieldsEnclosedBy" Module="Core" Type="1">RmllbGRzIGVuY2xvc2VkIGJ5</PHRASE> @@ -429,6 +429,7 @@ <PHRASE Label="la_fld_FromEmail" Module="Core" Type="1" Column="RnJvbSBFLW1haWw=">RnJvbSBFbWFpbA==</PHRASE> <PHRASE Label="la_fld_FrontEndOnly" Module="Core" Type="1" Column="RnJvbnQtRW5kIE9ubHk=">RnJvbnQtRW5kIE9ubHk=</PHRASE> <PHRASE Label="la_fld_FrontRegistration" Module="Core" Type="1" Column="QWxsb3cgUmVnaXN0cmF0aW9u">QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==</PHRASE> + <PHRASE Label="la_fld_FullName" Module="Core" Type="1" Column="RnVsbCBOYW1l">RnVsbCBOYW1l</PHRASE> <PHRASE Label="la_fld_Group" Module="Core" Type="1" Column="R3JvdXA=">VXNlciBHcm91cA==</PHRASE> <PHRASE Label="la_fld_GroupId" Module="Core" Type="1">SUQ=</PHRASE> <PHRASE Label="la_fld_GroupName" Module="Core" Type="1" Column="R3JvdXAgTmFtZQ==">R3JvdXAgTmFtZQ==</PHRASE> @@ -600,7 +601,7 @@ <PHRASE Label="la_fld_SortValues" Module="Core" Type="1">U29ydCBWYWx1ZXM=</PHRASE> <PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1" Hint="aHR0cHM6Ly93d3cuZG9tYWluLmNvbS9wYXRo" Column="U1NMIFVybA==">U1NMIEZ1bGwgVVJM</PHRASE> <PHRASE Label="la_fld_StartDate" Module="Core" Type="1" Column="U3RhcnQgRGF0ZQ==">U3RhcnQgRGF0ZQ==</PHRASE> ~~- <PHRASE Label="la_fld_State" Module="Core" Type="1">U3RhdGU=</PHRASE>~~ + <PHRASE Label="la_fld_State" Module="Core" Type="1" Column="U3RhdGU=">U3RhdGU=</PHRASE> <PHRASE Label="la_fld_StateCountry" Module="Core" Type="1" Column="U3RhdGUgQ291bnRyeQ==">U3RhdGUgQ291bnRyeQ==</PHRASE> <PHRASE Label="la_fld_Status" Module="Core" Type="1" Column="U3RhdHVz">U3RhdHVz</PHRASE> <PHRASE Label="la_fld_Sticky" Module="Core" Type="1" Column="U3RpY2t5">U3RpY2t5</PHRASE> @@ -655,7 +656,7 @@ <PHRASE Label="la_fld_Votes" Module="Core" Type="1">Vm90ZXM=</PHRASE> <PHRASE Label="la_fld_Width" Module="Core" Type="1">V2lkdGg=</PHRASE> <PHRASE Label="la_fld_Z-Index" Module="Core" Type="1">Wi1JbmRleA==</PHRASE> ~~- <PHRASE Label="la_fld_ZIP" Module="Core" Type="1">WklQ</PHRASE>~~ + <PHRASE Label="la_fld_ZIP" Module="Core" Type="1" Column="WklQ">WklQ</PHRASE> <PHRASE Label="la_Font" Module="Core" Type="1">Rm9udCBQcm9wZXJ0aWVz</PHRASE> <PHRASE Label="la_FormCancelConfirmation" Module="Core" Type="1">RG8geW91IHdhbnQgdG8gc2F2ZSB0aGUgY2hhbmdlcz8=</PHRASE> <PHRASE Label="la_FormResetConfirmation" Module="Core" Type="1">QXJlIHlvdSBzdXJlIHlvdSB3b3VsZCBsaWtlIHRvIGRpc2NhcmQgdGhlIGNoYW5nZXM/</PHRASE> Index: install/upgrades.sql =================================================================== --- install/upgrades.sql (revision 14949) +++ install/upgrades.sql (working copy) @@ -2493,3 +2493,7 @@ UPDATE ConfigurationValues SET DisplayOrder = DisplayOrder - 0.01 WHERE VariableName IN ('Search_MinKeyword_Length', 'ExcludeTemplateSectionsFromSearch'); + +UPDATE Phrase +SET l<%PRIMARY_LANGUAGE%>_ColumnTranslation = l<%PRIMARY_LANGUAGE%>_Translation +WHERE PhraseKey IN ('LA_FLD_ADDRESSLINE1', 'LA_FLD_ADDRESSLINE2', 'LA_FLD_CITY', 'LA_FLD_COMPANY', 'LA_FLD_FAX', 'LA_FLD_STATE', 'LA_FLD_ZIP');

Index: admin_templates/users/user_address_edit.tpl =================================================================== --- admin_templates/users/user_address_edit.tpl (revision 0) +++ admin_templates/users/user_address_edit.tpl (revision 0) @@ -0,0 +1,74 @@ +<inp2:adm_SetPopupSize width="750" height="570"/> +<inp2:m_include t="incs/header" body_properties="" /> +<inp2:m_RenderElement name="combined_header" prefix="u" section="in-portal:user_list" title_preset="user_address_edit"/> + + +<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0"> + <tr> + <td> + <script type="text/javascript"> + a_toolbar = new ToolBar(); + + a_toolbar.AddButton( + new ToolBarButton( + 'select', + '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', + function() { + submit_event('addr', '<inp2:addr_SaveEvent/>'); + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'cancel', + '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', + function() { + cancel_edit('addr','OnCancel','<inp2:addr_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>'); + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'reset_edit', + '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', + function() { + reset_form('addr', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>'); + } + ) + ); + + a_toolbar.Render(); + </script> + </td> + </tr> +</table> + +<inp2:addr_SaveWarning name="grid_save_warning"/> +<inp2:addr_ErrorWarning name="form_error_warning"/> + +<inp2:m_RenderElement name="inp_edit_hidden" prefix="addr" field="PortalUserId"/> + +<div id="scroll_container"> + <table class="edit-form"> + <inp2:m_RenderElement name="inp_id_label" prefix="addr" field="AddressId" title="la_fld_Id"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="la_fld_FullName"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="la_fld_AddressLine1"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="la_fld_AddressLine2"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State"/> + <inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip"/> + <inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" has_empty="1"/> + <inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping"/> + <inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling"/> + <inp2:m_RenderElement name="inp_label" prefix="addr" field="IsProfileAddress"/> + <inp2:m_RenderElement name="inp_edit_filler" /> + </table> +</div> + +<inp2:m_include t="incs/footer"/> \ No newline at end of file Index: admin_templates/users/user_edit_addresses.tpl =================================================================== --- admin_templates/users/user_edit_addresses.tpl (revision 0) +++ admin_templates/users/user_edit_addresses.tpl (revision 0) @@ -0,0 +1,132 @@ +<inp2:adm_SetPopupSize width="570" height="540"/> +<inp2:m_include t="incs/header"/> +<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_addresses" tab_preset="Default" pagination_prefix="addr" pagination="1"/> + + +<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0"> + <tr> + <td> + <table width="100%" cellpadding="0" cellspacing="0"> + <tr> + <td> + <script type="text/javascript"> + a_toolbar = new ToolBar(); + + a_toolbar.AddButton( + new ToolBarButton( + 'select', + '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', + function() { + submit_event('u', '<inp2:u_SaveEvent/>'); + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'cancel', + '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', + function() { + cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>'); + } + ) + ); + + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( + new ToolBarButton( + 'prev', + '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', + function() { + go_to_id('u', '<inp2:u_PrevId/>'); + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'next', + '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', + function() { + go_to_id('u', '<inp2:u_NextId/>'); + } + ) + ); + + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); + +  + + function edit() + { + std_edit_temp_item('addr', 'in-commerce/users/user_address_edit'); + } + + a_toolbar.AddButton( + new ToolBarButton( + 'new_item', + '<inp2:m_phrase label="la_ToolTip_NewAddress" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>', + function() { + std_new_item('addr', 'in-commerce/users/user_address_edit') + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'edit', + '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', + edit + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'delete', + '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>', + function() { + std_delete_items('addr') + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'view', + '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', + function(id) { + show_viewmenu(a_toolbar, 'view'); + } + ) + ); + +  + + a_toolbar.Render(); + + <inp2:m_if check="u_IsSingle"> + a_toolbar.HideButton('prev'); + a_toolbar.HideButton('next'); + a_toolbar.HideButton('sep1'); + <inp2:m_else/> + <inp2:m_if check="u_IsLast"> + a_toolbar.DisableButton('next'); + </inp2:m_if> + <inp2:m_if check="u_IsFirst"> + a_toolbar.DisableButton('prev'); + </inp2:m_if> + </inp2:m_if> + </script> + </td> + </tr> + </table> + </td> + </tr> +</table> +<inp2:m_RenderElement name="grid" PrefixSpecial="addr" IdField="AddressId" grid="Default"/> +<script type="text/javascript"> +Grids['addr'].SetDependantToolbarButtons( new Array('edit','delete') ); +</script> + +<inp2:m_include t="incs/footer"/> Property changes on: admin_templates\users\user_edit_addresses.tpl ___________________________________________________________________ Added: svn:eol-style + LF Index: install/english.lang =================================================================== --- install/english.lang (revision 14949) +++ install/english.lang (working copy) @@ -265,9 +265,12 @@ <PHRASE Label="la_fld_Insurance_Type" Module="In-Commerce" Type="1">SW5zdXJhbmNlIFR5cGU=</PHRASE> <PHRASE Label="la_fld_InventoryStatus" Module="In-Commerce" Type="1">RW5hYmxlZA==</PHRASE> <PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1" Column="UHJvbW8=">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE> + <PHRASE Label="la_fld_IsProfileAddress" Module="In-Commerce" Type="1" Column="UHJvZmlsZSBBZGRyZXNz">UHJvZmlsZSBBZGRyZXNz</PHRASE> <PHRASE Label="la_fld_IsRecurringBilling" Module="In-Commerce" Type="1">UmVjdXJyaW5nIEJpbGxpbmc=</PHRASE> <PHRASE Label="la_fld_ItemsSold" Module="In-Commerce" Type="1">SXRlbXMgU29sZA==</PHRASE> <PHRASE Label="la_fld_LastPaymentDate" Module="In-Commerce" Type="1">TGFzdCBQYXltZW50IERhdGU=</PHRASE> + <PHRASE Label="la_fld_LastUsedAsBilling" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIGFzIFNoaXBwaW5n">TGFzdCBVc2VkIGFzIEJpbGxpbmc=</PHRASE> + <PHRASE Label="la_fld_LastUsedAsShipping" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIGFzIFNoaXBwaW5n">TGFzdCBVc2VkIGFzIFNoaXBwaW5n</PHRASE> <PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIEJ5">TGFzdCBVc2VkIEJ5</PHRASE> <PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIE9u">TGFzdCBVc2VkIE9u</PHRASE> <PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1" Column="TGlzdGFibGU=">TGlzdGFibGU=</PHRASE> @@ -640,6 +643,7 @@ <PHRASE Label="la_SZL" Module="In-Commerce" Type="1">TGlsYW5nZW5p</PHRASE> <PHRASE Label="la_tab_Access" Module="In-Commerce" Type="1">QWNjZXNz</PHRASE> <PHRASE Label="la_tab_AccessAndPricing" Module="In-Commerce" Type="1">QWNjZXNzICYgUHJpY2luZw==</PHRASE> + <PHRASE Label="la_tab_Addresses" Module="In-Commerce" Type="1">QWRkcmVzc2Vz</PHRASE> <PHRASE Label="la_tab_AffiliatePaymentTypes" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnQgVHlwZXM=</PHRASE> <PHRASE Label="la_tab_AffiliatePlans" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW5z</PHRASE> <PHRASE Label="la_tab_Affiliates" Module="In-Commerce" Type="1">QWZmaWxpYXRlcw==</PHRASE> @@ -713,6 +717,7 @@ <PHRASE Label="la_text_StoreName" Module="In-Commerce" Type="1">U3RvcmUgTmFtZQ==</PHRASE> <PHRASE Label="la_Text_TopSellers" Module="In-Commerce" Type="1">VG9wIHNlbGxlcnM=</PHRASE> <PHRASE Label="la_THB" Module="In-Commerce" Type="1">QmFodA==</PHRASE> + <PHRASE Label="la_title_AddingAddress" Module="In-Commerce" Type="1">QWRkaW5nIEFkZHJlc3M=</PHRASE> <PHRASE Label="la_title_AddingCurrency" Module="In-Commerce" Type="1">QWRkaW5nIEN1cnJlbmN5</PHRASE> <PHRASE Label="la_title_AddingGiftCertificate" Module="In-Commerce" Type="1">QWRkaW5nIEdpZnQgQ2VydGlmaWNhdGU=</PHRASE> <PHRASE Label="la_title_AddingManufacturer" Module="In-Commerce" Type="1">QWRkaW5nIG1hbnVmYWN0dXJlcg==</PHRASE> @@ -730,6 +735,7 @@ <PHRASE Label="la_title_Adding_Order" Module="In-Commerce" Type="1">QWRkaW5nIE9yZGVy</PHRASE> <PHRASE Label="la_title_Adding_PriceBracket" Module="In-Commerce" Type="1">QWRkaW5nIFByaWNlIEJyYWNrZXQ=</PHRASE> <PHRASE Label="la_title_Adding_Product" Module="In-Commerce" Type="1">QWRkaW5nIFByb2R1Y3Q=</PHRASE> + <PHRASE Label="la_title_Addresses" Module="In-Commerce" Type="1">QWRkcmVzc2Vz</PHRASE> <PHRASE Label="la_title_AffiliatePayments" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnRz</PHRASE> <PHRASE Label="la_title_AffiliatePaymentTypes" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnQgVHlwZXM=</PHRASE> <PHRASE Label="la_title_AffiliatePlans" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW5z</PHRASE> @@ -745,6 +751,7 @@ <PHRASE Label="la_title_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE> <PHRASE Label="la_title_DiscountItems" Module="In-Commerce" Type="1">RGlzY291bnQgSXRlbXM=</PHRASE> <PHRASE Label="la_title_Discounts" Module="In-Commerce" Type="1">RGlzY291bnRz</PHRASE> + <PHRASE Label="la_title_EditingAddress" Module="In-Commerce" Type="1">RWRpdGluZyBBZGRyZXNz</PHRASE> <PHRASE Label="la_title_EditingCurrency" Module="In-Commerce" Type="1">RWRpdGluZyBDdXJyZW5jeQ==</PHRASE> <PHRASE Label="la_title_EditingGiftCertificate" Module="In-Commerce" Type="1">RWRpdGluZyBHaWZ0IENlcnRpZmljYXRl</PHRASE> <PHRASE Label="la_title_EditingManufacturer" Module="In-Commerce" Type="1">RWRpdGluZyBNYW51ZmFjdHVyZXI=</PHRASE> @@ -837,6 +844,7 @@ <PHRASE Label="la_tooltip_Infinity" Module="In-Commerce" Type="1">SW5maW5pdHk=</PHRASE> <PHRASE Label="la_tooltip_Modify" Module="In-Commerce" Type="1">TW9kaWZ5</PHRASE> <PHRASE Label="la_tooltip_MoreBrackets" Module="In-Commerce" Type="1">TW9yZSBCcmFja2V0cw==</PHRASE> + <PHRASE Label="la_ToolTip_NewAddress" Module="In-Commerce" Type="1">TmV3IEFkZHJlc3M=</PHRASE> <PHRASE Label="la_ToolTip_NewAffiliatePaymentType" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQYXltZW50IFR5cGU=</PHRASE> <PHRASE Label="la_ToolTip_NewGiftCertificate" Module="In-Commerce" Type="1">TmV3IEdpZnQgQ2VydGlmaWNhdGU=</PHRASE> <PHRASE Label="la_tooltip_NewManufacturer" Module="In-Commerce" Type="1">TmV3IE1hbnVmYWN0dXJlcg==</PHRASE> @@ -954,4 +962,4 @@ <EVENT MessageType="html" Event="USER.GIFTCERTIFICATE" Type="1">U3ViamVjdDogR2lmdCBDZXJ0aWZpY2F0ZSAtIEVtYWlsIENvbmZpcm1hdGlvbgoKVGhpcyBpcyBhbiBlbWFpbCBjb25maXJtYXRpb24gdGhhdCBHaWZ0IENlcnRpZmljYXRlICI8aW5wMjptX3BhcmFtIG5hbWU9ImdpZmNlcnRfaWQiLz4iIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBlbWFpbGVkIHRvIDxpbnAyOm1fcGFyYW0gbmFtZT0idG9fbmFtZSIvPiAoPGEgaHJlZj0ibWFpbHRvOjxpbnAyOm1fcGFyYW0gbmFtZT0idG9fZW1haWwiLz4iPjxpbnAyOm1fcGFyYW0gbmFtZT0idG9fZW1haWwiLz48L2E+KSAu</EVENT> </EVENTS> </LANGUAGE> ~~-</LANGUAGES>~~ +</LANGUAGES> \ No newline at end of file Index: units/addresses/addresses_config.php =================================================================== --- units/addresses/addresses_config.php (revision 14949) +++ units/addresses/addresses_config.php (working copy) @@ -44,6 +44,16 @@ 'DoSpecial' => '*', 'DoEvent' => 'OnUpdateProfileAddress', ), + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnAfterConfigRead'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnModifyUsersConfig', + ), ), 'QueryString' => Array( @@ -51,7 +61,6 @@ 2 => 'Page', 3 => 'PerPage', 4 => 'event', ~~- 5 => 'mode',~~ ), 'IDField' => 'AddressId', @@ -104,13 +113,46 @@ 'not_null' => '1', 'required' => 1, 'default' => '' ), ~~- 'LastUsedAsBilling' => Array('type' => 'int','not_null' => 1, 'default' => 0),~~ ~~- 'LastUsedAsShipping' => Array('type' => 'int','not_null' => 1, 'default' => 0),~~ ~~- 'IsProfileAddress' => Array('type' => 'int','not_null' => 1, 'default' => 0),~~ + 'LastUsedAsBilling' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0 + ), + 'LastUsedAsShipping' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0 + ), + 'IsProfileAddress' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0 + ), ), 'VirtualFields' => Array( 'ShortAddress' => Array('type'=>'string', 'default' => ''), ), + 'Grids' => Array( + 'Default' => Array( + 'Fields' => Array( + 'AddressId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'To' => Array ('title' => 'column:la_fld_FullName', 'filter_block' => 'grid_like_filter'), + 'Company' => Array ('filter_block' => 'grid_like_filter'), + 'Phone' => Array ('filter_block' => 'grid_like_filter'), + 'Fax' => Array ('filter_block' => 'grid_like_filter'), + 'Email' => Array ('filter_block' => 'grid_like_filter'), + 'Address1' => Array ('title' => 'column:la_fld_AddressLine1', 'filter_block' => 'grid_like_filter'), + 'Address2' => Array ('title' => 'column:la_fld_AddressLine2', 'filter_block' => 'grid_like_filter'), + 'City' => Array ('filter_block' => 'grid_like_filter'), + 'State' => Array ('filter_block' => 'grid_like_filter'), + 'Zip' => Array ('filter_block' => 'grid_like_filter'), + 'Country' => Array ('filter_block' => 'grid_options_filter'), + 'LastUsedAsBilling' => Array ('filter_block' => 'grid_options_filter'), + 'LastUsedAsShipping' => Array ('filter_block' => 'grid_options_filter'), + 'IsProfileAddress' => Array ('filter_block' => 'grid_options_filter'), + ), + ), + ), ); \ No newline at end of file Index: units/addresses/addresses_event_handler.php =================================================================== --- units/addresses/addresses_event_handler.php (revision 14949) +++ units/addresses/addresses_event_handler.php (working copy) @@ -17,12 +17,13 @@ function mapPermissions() { parent::mapPermissions(); ~~- $permissions = Array(~~ + + $permissions = Array ( // user can view any form on front-end ~~- 'OnItemBuild' => Array('subitem' => true),~~ ~~- 'OnUpdate' => Array('subitem' => true),~~ ~~- 'OnCreate' => Array('subitem' => true),~~ ~~- 'OnDelete' => Array('subitem' => true),~~ + 'OnItemBuild' => Array ('subitem' => true), + 'OnUpdate' => Array ('subitem' => true), + 'OnCreate' => Array ('subitem' => true), + 'OnDelete' => Array ('subitem' => true), ); $this->permMapping = array_merge($this->permMapping, $permissions); @@ -49,11 +50,13 @@ */ protected function SetCustomQuery(&$event) { ~~- if ($this->Application->isAdminUser) {~~ ~~- return ;~~ + if ( $this->Application->isAdminUser ) { + return; } $object =& $event->getObject(); + /* @var $object kDBList */ + $user_id = $this->Application->RecallVar('user_id'); $object->addFilter('myitems_user','%1$s.PortalUserId = '.$user_id); } @@ -64,14 +67,14 @@ * @param kDBItem $object * @param string $type */ ~~- function processLastUsed(&$object, $type)~~ + protected function processLastUsed(&$object, $type) { ~~- $is_last = $object->GetDBField('LastUsedAs'.$type);~~ ~~- if ($is_last) {~~ ~~- $fields_hash = Array (~~ ~~- 'LastUsedAs'.$type => 0,~~ ~~- );~~ ~~- $this->Conn->doUpdate($fields_hash, $object->TableName, 'PortalUserId = '.$object->GetDBField('PortalUserId'));~~ + $is_last = $object->GetDBField('LastUsedAs' . $type); + + if ( $is_last ) { + $fields_hash = Array ('LastUsedAs' . $type => 0); + + $this->Conn->doUpdate($fields_hash, $object->TableName, 'PortalUserId = ' . $object->GetDBField('PortalUserId')); } } @@ -105,7 +108,14 @@ $this->processLastUsed($object, 'Billing'); } ~~- function OnUpdate(&$event)~~ + /** + * Updates kDBItem + * + * @param kEvent $event + * @return void + * @access protected + */ + protected function OnUpdate(kEvent &$event) { parent::OnUpdate($event); @@ -131,12 +141,13 @@ */ function setNextTemplate(&$event) { ~~- if ($this->Application->isAdminUser) {~~ ~~- return ;~~ + if ( $this->Application->isAdminUser ) { + return; } $event->SetRedirectParam('opener', 's'); $next_template = $this->Application->GetVar('next_template'); + if ($next_template) { $event->redirect = $next_template; } @@ -163,103 +174,136 @@ * [HOOK] Update PortalUser table when address marked as ProfileAddress is changed via addr prefix object * * @param kEvent $event + * @return bool + * @access protected */ ~~- function OnUpdateProfileAddress(&$event)~~ + protected function OnUpdateProfileAddress(kEvent &$event) { ~~- $user =& $this->Application->recallObject('u.current');~~ + $object =& $event->getObject(Array ('skip_autoload' => true)); + /* @var $object kDBItem */ ~~- if ($this->Application->GetVar('billing_address_id') > 0) {~~ ~~- $address_id = $this->Application->GetVar('billing_address_id');~~ ~~- }~~ ~~- elseif ($this->Application->GetVar('shipping_address_id') > 0) {~~ ~~- $address_id = $this->Application->GetVar('shipping_address_id');~~ ~~- }~~ ~~- else {~~ ~~- $address_id = false;~~ ~~- }~~ + if ( !$this->Application->isAdmin ) { + $address_id = $this->getOrderAddressId(); ~~- if (!$address_id) {~~ ~~- return true;~~ + if ( !$address_id ) { + return true; + } + + $object->Load($address_id); } ~~- $address =& $event->getObject(Array('skip_autoload' => true));~~ ~~- $address->Load($address_id);~~ ~~- if (!$address->GetDBField('IsProfileAddress')) {~~ + if ( !$object->GetDBField('IsProfileAddress') ) { return true; } ~~- $field_map = Array( 'Company' => 1,~~ ~~- 'Phone' => 1,~~ ~~- 'Fax' => 1,~~ ~~- 'Email' => 1,~~ ~~- 'Address1' => 'Street',~~ ~~- 'Address2' => 'Street2',~~ ~~- 'City' => 1,~~ ~~- 'State' => 1,~~ ~~- 'Zip' => 1,~~ ~~- 'Country' => 1,~~ ~~- );~~ + $field_map = Array ( + 'Company' => 1, + 'Phone' => 1, + 'Fax' => 1, + 'Email' => 1, + 'Address1' => 'Street', + 'Address2' => 'Street2', + 'City' => 1, + 'State' => 1, + 'Zip' => 1, + 'Country' => 1, + ); ~~- $user->setName( $address->GetDBField('To') );~~ + $user =& $this->Application->recallObject($this->Application->isAdmin ? 'u' : 'u.current'); + /* @var $user UsersItem */ + $user->setName( $object->GetDBField('To') ); + foreach ($field_map as $src_field => $dst_field) { ~~- if ($dst_field == 1) $dst_field = $src_field;~~ ~~- $user->SetDBField($dst_field, $address->GetDBField($src_field));~~ + if ( $dst_field == 1 ) { + $dst_field = $src_field; + } + + $user->SetDBField($dst_field, $object->GetDBField($src_field)); } return $user->Update(); } /** + * Returns ID of address, that is selected in address dropdown on shipping/billing step of checkout + * + * @return int + * @access protected + */ + protected function getOrderAddressId() + { + $ret = false; + + if ( $this->Application->GetVar('billing_address_id') > 0 ) { + $ret = $this->Application->GetVar('billing_address_id'); + } + elseif ( $this->Application->GetVar('shipping_address_id') > 0 ) { + $ret = $this->Application->GetVar('shipping_address_id'); + } + + return $ret; + } + + /** * [HOOK] Create user profile address based on PortalUser table data * * @param kEvent $event + * @return bool + * @access protected */ ~~- function OnUpdateUserProfile(&$event)~~ + protected function OnUpdateUserProfile(kEvent &$event) { $user =& $event->MasterEvent->getObject(); + /* @var $user UsersItem */ ~~- $load_keys = Array('PortalUserId' => $user->GetID(), 'IsProfileAddress' => 1);~~ + $load_keys = Array ('PortalUserId' => $user->GetID(), 'IsProfileAddress' => 1); ~~- $address =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));~~ ~~- $address->Load($load_keys);~~ + $object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); + /* @var $object kDBItem */ ~~- $field_map = Array( 'PortalUserId' => 1,~~ ~~- 'Company' => 1,~~ ~~- 'Phone' => 1,~~ ~~- 'Fax' => 1,~~ ~~- 'Email' => 1,~~ ~~- 'Address1' => 'Street',~~ ~~- 'Address2' => 'Street2',~~ ~~- 'City' => 1,~~ ~~- 'State' => 1,~~ ~~- 'Zip' => 1,~~ ~~- 'Country' => 1,~~ ~~- );~~ + $object->Load($load_keys); ~~- $full_name = trim($user->GetDBField('FirstName').' '.$user->GetDBField('LastName'));~~ ~~- $address->SetDBField('To', $full_name);~~ ~~- $address->SetDBField('IsProfileAddress', 1);~~ + $field_map = Array ( + 'PortalUserId' => 1, + 'Company' => 1, + 'Phone' => 1, + 'Fax' => 1, + 'Email' => 1, + 'Address1' => 'Street', + 'Address2' => 'Street2', + 'City' => 1, + 'State' => 1, + 'Zip' => 1, + 'Country' => 1, + ); + $full_name = trim($user->GetDBField('FirstName') . ' ' . $user->GetDBField('LastName')); + $object->SetDBField('To', $full_name); + $object->SetDBField('IsProfileAddress', 1); + foreach ($field_map as $dst_field => $src_field) { ~~- if ($src_field == 1) $src_field = $dst_field;~~ ~~- $address->SetDBField($dst_field, $user->GetDBField($src_field));~~ + if ( $src_field == 1 ) { + $src_field = $dst_field; + } + + $object->SetDBField($dst_field, $user->GetDBField($src_field)); } $sql = 'SELECT SUM(IF(LastUsedAsBilling = 1, 1, 0 )) AS HasBilling, SUM(IF(LastUsedAsShipping = 1, 1, 0)) AS HasShipping ~~- FROM '.$address->TableName.'~~ ~~- WHERE PortalUserId = '.$user->GetID();~~ + FROM ' . $object->TableName . ' + WHERE PortalUserId = ' . $user->GetID(); $address_status = $this->Conn->GetRow($sql); ~~- if (!$address_status['HasBilling']) {~~ ~~- $address->SetDBField('LastUsedAsBilling', 1);~~ + if ( !$address_status['HasBilling'] ) { + $object->SetDBField('LastUsedAsBilling', 1); } ~~- if (!$address_status['HasShipping']) {~~ ~~- $address->SetDBField('LastUsedAsShipping', 1);~~ + if ( !$address_status['HasShipping'] ) { + $object->SetDBField('LastUsedAsShipping', 1); } ~~- return $address->isLoaded() ? $address->Update() : $address->Create();~~ + return $object->isLoaded() ? $object->Update() : $object->Create(); } /** @@ -271,16 +315,18 @@ */ function checkItemStatus(&$event) { ~~- if ($this->Application->isAdminUser) {~~ + if ( $this->Application->isAdminUser ) { return true; } ~~- if (!$this->Application->LoggedIn()) {~~ + if ( !$this->Application->LoggedIn() ) { return false; } $object =& $event->getObject(); ~~- if (!$object->isLoaded()) {~~ + /* @var $object kDBItem */ + + if ( !$object->isLoaded() ) { return true; } @@ -308,7 +354,9 @@ $object =& $event->getObject(); /* @var $object kDBItem */ ~~- $object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));~~ + if ( !$this->Application->isAdmin ) { + $object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id')); + } $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ @@ -320,15 +368,22 @@ $this->processLastUsed($object, 'Billing'); } + /** + * Occurs before deleting item, id of item being + * deleted is stored as 'id' event param + * + * @param kEvent $event + * @access public + */ function OnBeforeItemDelete(&$event) { $object =& $event->getObject(); /* @var $object kDBItem */ ~~- if (!$object->isLoaded() || !$this->checkItemStatus($event)) {~~ + if ( !$object->isLoaded() || !$this->checkItemStatus($event) ) { // not trivially loaded object OR not current user address $event->status = kEvent::erPERM_FAIL; ~~- return ;~~ + return; } } @@ -350,4 +405,36 @@ $fields['Country']['default'] = $site_helper->getDefaultCountry('Shipping'); $this->Application->setUnitOption($event->Prefix, 'Fields', $fields); } + + /** + * [HOOK] Creates user addresses editing tab + * + * @param kEvent $event + */ + function OnModifyUsersConfig(&$event) + { + $title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets'); + + $title_presets['user_edit_addresses'] = Array ( + 'prefixes' => Array ('u', $event->Prefix . '_List'), + 'format' => "#u_status# '#u_titlefield#' - !la_title_Addresses! (#" . $event->Prefix . "_recordcount#)" + ); + + $title_presets['user_address_edit'] = Array ( + 'prefixes' => Array ('u', $event->Prefix), + 'new_status_labels' => Array ($event->Prefix => '!la_title_AddingAddress!'), + 'edit_status_labels' => Array ($event->Prefix => '!la_title_EditingAddress!'), + 'new_titlefield' => Array ($event->Prefix => '!la_title_NewAddress!'), + 'format' => "#u_status# '#u_titlefield#' - #{$event->Prefix}_status#" + ); + $this->Application->setUnitOption($event->MasterEvent->Prefix, 'TitlePresets', $title_presets); + + $edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets'); + + $edit_tab_presets['Default'][] = Array ( + 'title' => 'la_tab_Addresses', 't' => 'in-commerce/users/user_edit_addresses', 'priority' => 6 + ); + + $this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets); + } } \ No newline at end of file

Issue History
Date Modified	Username	Field	Change
2012-07-25 05:32	alex	Note Added: 0005011
2012-07-25 05:32	alex	Status	resolved => closed
2012-01-05 07:58	alex	Changeset attached	5.2.x r14996
2011-12-30 04:46	alex	Note Added: 0004362
2011-12-30 04:46	alex	Status	reviewed and tested => resolved
2011-12-30 04:46	alex	Fixed in Version	=> 5.2.0-B1
2011-12-30 04:46	alex	Resolution	open => fixed
2011-12-30 04:46	alex	Assigned To	!COMMUNITY => alex
2011-12-30 04:46	alex	Changeset attached	5.2.x r14954
2011-12-30 04:45	alex	Changeset attached	5.2.x r14953
2011-12-30 04:45	alex	Note Added: 0004361
2011-12-30 04:45	alex	Assigned To	alex => !COMMUNITY
2011-12-30 04:45	alex	Status	needs testing => reviewed and tested
2011-12-30 04:43	alex	File Added: address_management_modules_v2.patch
2011-12-30 04:43	alex	File Added: address_management_core_v2.patch
2011-12-29 13:10	administrator	Target Version	Icebox => 5.2.0
2011-12-29 12:15	erik	Note Added: 0004352
2011-12-29 12:15	erik	Assigned To	erik => alex
2011-12-29 12:15	erik	Developer	=> erik
2011-12-29 12:15	erik	Status	needs work => needs testing
2011-12-29 12:14	erik	File Added: address_management_modules_896.patch
2011-12-29 12:13	erik	File Added: address_management_core_896.patch
2011-12-29 03:15	alex	Estimate Points	0 => 1
2011-12-29 03:15	alex	Additional Information Updated	View Revisions
2011-12-15 18:29	Dmitry	Estimate Points	=> 0
2011-12-15 18:29	Dmitry	Assigned To	=> erik
2011-12-15 18:29	Dmitry	Status	active => needs work
2010-10-22 00:12	Dmitry	Summary	Address Management for User in Admin => User Address Management in Admin
2010-10-22 00:10	Dmitry	New Issue
2010-10-22 00:10	Dmitry	Reference	=> http://groups.google.com/group/in-portal-dev/browse_thread/thread/f7ef3c1456c85979
2010-10-22 00:10	Dmitry	Change Log Message	=> Ability to manage User Addresses in Admin

Notes
(0004352) erik (manager) 2011-12-29 12:15	Patches attached - needs testing

(0004361) alex (manager) 2011-12-30 04:45	Problems: 1. addresses deleting wasn't working 2. got "Editing User - Adding Address 'TitleField Missing' " - no title field while editing address in a bluebar 3. phrase for address editing page in a blue bar not translated 4. profile address changing wasn't affecting user record in admin 5. since column phrase translation doesn't get imported on upgrade, then sql were needed to create them Style fixes: 1. OnAfterConfigRead hook should be placed in addresses unit, since it that unit logically hooks to user's unit

(0004362) alex (manager) 2011-12-30 04:46	Fix committed to 5.2.x branch. Commit Message: Fixes 0000896: User Address Management in Admin Commit on behalf of Erik

(0005011) alex (manager) 2012-07-25 05:32	Since 5.2.0 version was released.

Related Changesets
Modules :: In-Commerce: 5.2.x r14996 Timestamp: 2012-01-05 07:58:48 Author: alex [ Details ] [ Diff ]	Bug 0000896: User Address Management in Admin 1. corrected way to hook to parent unit
	mod - /w/in-commerce/branches/5.2.x/units/addresses/addresses_config.php	[ Diff ] [ File ]

In-Portal CMS: 5.2.x r14954 Timestamp: 2011-12-30 04:46:07 Author: alex [ Details ] [ Diff ]	Fixes 0000896: User Address Management in Admin Commit on behalf of Erik
	mod - /in-portal/branches/5.2.x/core/install/english.lang	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/install/upgrades.sql	[ Diff ] [ File ]

Modules :: In-Commerce: 5.2.x r14953 Timestamp: 2011-12-30 04:45:46 Author: alex [ Details ] [ Diff ]	Bug 0000896: User Address Management in Admin Commit on behalf of Erik
	add - /w/in-commerce/branches/5.2.x/admin_templates/users	[ File ]
	add - /w/in-commerce/branches/5.2.x/admin_templates/users/user_address_edit.tpl	[ File ]
	add - /w/in-commerce/branches/5.2.x/admin_templates/users/user_edit_addresses.tpl	[ File ]
	mod - /w/in-commerce/branches/5.2.x/install/english.lang	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/addresses/addresses_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/addresses/addresses_event_handler.php	[ Diff ] [ File ]

Relationships [ Relation Graph ] [ Dependency Graph ]

In-Portal Issue Tracker