fix to (hopefully) allow multiple progress-init's in a page, also add second $cgi...

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 7844f56..ba9f6ed 100644 (file)
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -14,7 +14,7 @@
 <%= include('/elements/xmlhttp.html',
               'method' => 'POST',
               'url'    => $action,
-              'subs'   => [ 'start_job' ],
+              'subs'   => [ $key.'start_job' ],
            )
 %>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
@@ -32,7 +32,7 @@ function <%=$key%>process () {
 
   document.<%=$formname%>.submit.disabled=true;
 
-  overlib( 'Submitting job to server...', WIDTH, 432, HEIGHT, 136, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
   var Hash = new Array();
   var x = 0;
@@ -68,13 +68,13 @@ function <%=$key%>process () {
 
   //alert('start_job( ' + Hash + ', <%=$key%>myCallback )' );
   //alert('start_job()' );
-  start_job( Hash, <%=$key%>myCallback );
+  <%=$key%>start_job( Hash, <%=$key%>myCallback );
 
 }
 
 function <%=$key%>myCallback( jobnum ) {
 
-  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 432, 136, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 444, 168, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
 }
 

diff --git a/httemplate/misc/email_invoice_events.cgi b/httemplate/misc/email_invoice_events.cgi
index 12d58d6..b5e66d5 100644 (file)
--- a/httemplate/misc/email_invoice_events.cgi
+++ b/httemplate/misc/email_invoice_events.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail', $cgi;
 $server->process;
 
 %>

diff --git a/httemplate/misc/email_invoices.cgi b/httemplate/misc/email_invoices.cgi
index 0a39783..bd23126 100644 (file)
--- a/httemplate/misc/email_invoices.cgi
+++ b/httemplate/misc/email_invoices.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail', $cgi;
 $server->process;
 
 %>

diff --git a/httemplate/misc/fax_invoice_events.cgi b/httemplate/misc/fax_invoice_events.cgi
index a8ded05..9a5e8aa 100644 (file)
--- a/httemplate/misc/fax_invoice_events.cgi
+++ b/httemplate/misc/fax_invoice_events.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax', $cgi;
 $server->process;
 
 %>

diff --git a/httemplate/misc/fax_invoices.cgi b/httemplate/misc/fax_invoices.cgi
index f16ba8b..24bee7d 100644 (file)
--- a/httemplate/misc/fax_invoices.cgi
+++ b/httemplate/misc/fax_invoices.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax', $cgi;
 $server->process;
 
 %>

diff --git a/httemplate/misc/print_invoice_events.cgi b/httemplate/misc/print_invoice_events.cgi
index c6a7885..3cf4cf7 100644 (file)
--- a/httemplate/misc/print_invoice_events.cgi
+++ b/httemplate/misc/print_invoice_events.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint', $cgi;
 $server->process;
 
 %>

diff --git a/httemplate/misc/print_invoices.cgi b/httemplate/misc/print_invoices.cgi
index d7b271c..6d32eaa 100644 (file)
--- a/httemplate/misc/print_invoices.cgi
+++ b/httemplate/misc/print_invoices.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint', $cgi;
 $server->process;
 
 %>