[freeside-commits] freeside/httemplate/view cust_main.cgi, 1.112.2.1, 1.112.2.2

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv5753/httemplate/view

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_main.cgi 
Log Message:
componentize conflicting %once subroutines (rt#3250)

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main.cgi,v
retrieving revision 1.112.2.1
retrieving revision 1.112.2.2
diff -u -d -r1.112.2.1 -r1.112.2.2
--- cust_main.cgi	19 Dec 2007 22:31:38 -0000	1.112.2.1
+++ cust_main.cgi	16 Mar 2008 22:41:55 -0000	1.112.2.2
@@ -38,7 +38,15 @@
 %        && $cust_main->ncancelled_pkgs
 %      ) {
 
-  <% cust_cancel_link($cust_main) %> | 
+  <% include( '/elements/popup_link-cust_main.html',
+              { 'action'      => $p. 'misc/cancel_cust.html',
+                'label'       => 'Cancel&nbsp;this&nbsp;customer',
+                'actionlabel' => 'Confirm Cancellation',
+                'color'       => '#ff0000',
+                'cust_main'   => $cust_main,
+              }
+            )
+  %> | 
 
 % } 
 % if ( $conf->exists('deletecustomers')
@@ -169,33 +177,3 @@
 die "Customer not found!" unless $cust_main;
 
 </%init>
-<%once>
-
-
-sub cust_cancel_link { cust_popup_link( 'misc/cancel_cust.html',
-                                        'Cancel&nbsp;this&nbsp;customer',
-                                        'Confirm Cancellation',
-                                        '#ff0000',
-                                        @_,
-                                      );
-}
-
-#false laziness w/view/cust_main/packages.html
-
-sub cust_popup_link {
-  my($action, $label, $actionlabel, $color, $cust_main) = @_;
-  $action .= '?'. $cust_main->custnum;
-  popup_link($action, $label, $actionlabel, $color);
-}
-
-sub popup_link {
-  my($action, $label, $actionlabel, $color) = @_;
-  $color ||= '#333399';
-  qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('$p$action', 540, 336, 'pkg_or_svc_action_popup' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color', CLOSETEXT, '' ); return false;">$label</A>!;
-
-# CLOSETEXT, '', 
-#WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3,
-#BGCOLOR, '#ff0000', CGCOLOR, '#ff0000'
-}
-
-</%once>