[freeside-commits] freeside/httemplate/misc did_order_confirm.html, 1.1.2.2, 1.1.2.3 did_order_confirmed.html, 1.1.2.2, 1.1.2.3 did_order_provision.html, NONE, 1.1.2.2

[Erik Levinson]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	did_order_confirm.html did_order_confirmed.html 
Added Files:
      Tag: FREESIDE_2_1_BRANCH
	did_order_provision.html 
Log Message:
bulk DID orders/inventory enhancements, RT11291

Index: did_order_confirmed.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/did_order_confirmed.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- did_order_confirmed.html	11 Apr 2011 23:03:32 -0000	1.1.2.2
+++ did_order_confirmed.html	15 Apr 2011 03:09:52 -0000	1.1.2.3
@@ -1,6 +1,6 @@
-<% include('/elements/header-popup.html', "DID order confirmed") %>
+<% include('/elements/header-popup.html', $success_msg ) %>
   <SCRIPT TYPE="text/javascript">
-    window.top.location.reload();
+    <% $js %>
   </SCRIPT>
   </BODY>
 </HTML>
@@ -8,6 +8,12 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
+$cgi->param('action') =~ /^(confirm|cancel)$/ or die 'illegal action';
+my $action = $1;
+my $success_msg = '';
+my $error = '';
+my $js = 'window.top.location.reload();';
+
 $cgi->param('ordernum') =~ /^(\d+)$/ or die 'illegal ordernum';
 my $ordernum = $1;
 my $did_order = qsearchs( {
@@ -16,7 +22,9 @@
 } );
 die "No order $ordernum" unless $did_order;
 
+if ( $action eq 'confirm' ) {
 my $confirmed = '';
+    my $sucess_msg = 'DID order confirmed';
 $confirmed = parse_datetime($cgi->param('confirmed'))
     if $cgi->param('confirmed') && $cgi->param('confirmed') !~ /^\d+$/;
 $confirmed = $1
@@ -24,14 +32,17 @@
 
 die "invalid confirmation date" unless $confirmed;
 
-my $error = '';
 $did_order->confirmed($confirmed);
 $did_order->vendor_order_id($cgi->param('vendor_order_id'));
 $error = $did_order->replace;
-
 if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(1). "did_order_confirm.html?". $cgi->query_string );
 }
-
+}
+elsif ( $action eq 'cancel' ) {
+    my $sucess_msg = 'DID order cancelled';
+    $error = $did_order->delete;
+    $js = "window.location.href = '${p}browse/did_order.html'";
+}
 </%init>

Index: did_order_confirm.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/did_order_confirm.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- did_order_confirm.html	11 Apr 2011 23:03:31 -0000	1.1.2.2
+++ did_order_confirm.html	15 Apr 2011 03:09:52 -0000	1.1.2.3
@@ -4,6 +4,7 @@
 
 <FORM NAME="did_order_confirm" ACTION="<% popurl(1) %>did_order_confirmed.html" METHOD=POST>
 <INPUT TYPE="hidden" NAME="ordernum" VALUE="<% $ordernum %>">
+<INPUT TYPE="hidden" NAME="action" VALUE="confirm">
 <TABLE>
     <TR>    
         <TD>Order #</TD>

--- NEW FILE: did_order_provision.html ---
<% include('/elements/header-popup.html', 'Bulk DID order - DID provisioning' ) %>

<% include('/elements/error.html') %>

<FORM NAME="did_order_confirm" ACTION="<% popurl(1) %>did_order_confirmed.html" METHOD=POST>
<INPUT TYPE="hidden" NAME="action" VALUE="provision">
<INPUT TYPE="hidden" NAME="ordernum" VALUE="<% $ordernum %>">
<TABLE>
    <TR>    
        <TD>Order #</TD>
        <TD><% $ordernum %></TD>
    </TR>
    <TR>
        <TD COLSPAN="2"><INPUT TYPE="SUBMIT" value="Provision"></TD>
    </TR>
</TABLE>

<%init>

die "access denied"
  unless $FS::CurrentUser::CurrentUser->access_right('Import');

$cgi->param('ordernum') =~ /^(\d+)$/ or die 'illegal ordernum';
my $ordernum = $1;
my $did_order = qsearchs( {
  'table'     => 'did_order',
  'hashref'   => { 'ordernum' => $ordernum },
} );
die "No order $ordernum" unless $did_order;

die "Order is not in received status and/or DIDs not assigned to a customer"
    unless $did_order->received && $did_order->custnum; 


</%init>