[interchange-cvs] interchange - jon modified dist/lib/UI/pages/admin/customer_view.html

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2003-08-20 03:34:20 GMT
Modified:  dist/lib/UI/pages/admin customer_view.html
Log:
Get rid of strange extra loop for billing information that just caused
extra queries for [bill-data userdb ...] calls. I'm sure someone will let
me know if this was important in a magical way I didn't notice. :)

Revision  Changes    Path
2.11      +18 -20    interchange/dist/lib/UI/pages/admin/customer_view.html


rev 2.11, prev_rev 2.10
Index: customer_view.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/customer_view.html,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -u -r2.10 -r2.11
--- customer_view.html	19 Aug 2003 20:15:41 -0000	2.10
+++ customer_view.html	20 Aug 2003 03:34:20 -0000	2.11
@@ -159,7 +159,6 @@
                      <tr> 
                         <td height="99%" valign="top" class="block4"> 
 [if-loop-param b_address1]
-	[loop prefix=bill list="[loop-code]"]
                            <table width="100%" border="0" cellspacing="0" cellpadding="1">
                               <tr> 
                                  <td width="30%" class="block4bold">[L]Name[/L]:</td>
@@ -169,48 +168,48 @@
 		]"><u>[loop-param b_fname] [loop-param b_lname]</A>
                                  </td>
                               </tr>
-							  [if-bill-data userdb b_company]
+							[if-loop-param b_company]
                               <tr> 
                                  <td width="30%" class="block4bold">[L]Company[/L]:</td>
                                  <td width="70%" class="maincontent">
-								 	[loop-param b_company]
+									[loop-param b_company]
                                  </td>
                               </tr>
-							  [/if-bill-data]
+							[/if-loop-param]
                               <tr> 
                                  <td valign="top" class="block4bold">[L]Address[/L]:</td>
                                  <td class="maincontent">
-								 [loop-param b_address1]
-								 [if-bill-data userdb b_address2]
-								 <br>
-								 [loop-param b_address2]
-								 [/if-bill-data]
-								 </td>
+								[loop-param b_address1]
+								[if-loop-param b_address2]
+								<br>
+								[loop-param b_address2]
+								[/if-loop-param]
+								</td>
                               </tr>
-							  [if-bill-data userdb b_country =~ /^US|^CA/]
+							[if-loop-param b_country =~ /^US|^CA/]
                               <tr> 
                                  <td class="block4bold">[L]City, State, Zip[/L]:</td>
                                  <td class="maincontent">[loop-param b_city], [loop-param state]  [loop-param zip]</td>
                               </tr>
-							  [else]
+							[else]
                               <tr> 
                                  <td class="block4bold">[L]City[/L]:</td>
                                  <td class="maincontent">[loop-param b_city]</td>
                               </tr>
-							  		[if-bill-param b_state]
+								[if-loop-param b_state]
                               <tr> 
                                  <td class="block4bold">[L]State[/L]:</td>
                                  <td class="maincontent">[loop-param b_state]</td>
                               </tr>
-								    [/if-bill-param]
-							  		[if-bill-param b_zip]
+								[/if-loop-param]
+								[if-loop-param b_zip]
                               <tr> 
                                  <td class="block4bold">[L]Postal code[/L]:</td>
                                  <td class="maincontent">[loop-param b_zip]</td>
                               </tr>
-								    [/if-bill-param]
-							  [/else]
-							  [/if-bill-data]
+								[/if-loop-param]
+							[/else]
+							[/if-loop-param]
                               <tr> 
                                  <td class="block4bold">[L]Country[/L]:</td>
                                  <td class="maincontent">[data table=country col=name key="[loop-param b_country]"]</td>
@@ -219,7 +218,6 @@
                                  <td height="15" colspan="2" class="block4bold"><img src="bg.gif" width="1" height="1"></td>
                               </tr>
                            </table>
-		[/loop]
 [else]
 						<i>[L]Same as shipping address[/L]</i>
 [/else]
@@ -395,4 +393,4 @@
 <!-- ----- END REAL STUFF ----- -->
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: customer_view.html,v 2.10 2003/08/19 20:15:41 jon Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: customer_view.html,v 2.11 2003/08/20 03:34:20 jon Exp $ -->