FS/FS/msa.pm

1 files changed, 28 insertions, 17 deletions

diff --git a/httemplate/misc/did_order_confirmed.html b/httemplate/misc/did_order_confirmed.html
index 53a41a738..aaded9f58 100644
--- a/httemplate/misc/did_order_confirmed.html
+++ b/httemplate/misc/did_order_confirmed.html
@@ -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,22 +22,27 @@ my $did_order = qsearchs( {
 } );
 die "No order $ordernum" unless $did_order;
 
-my $confirmed = '';
-$confirmed = parse_datetime($cgi->param('confirmed'))
-    if $cgi->param('confirmed') && $cgi->param('confirmed') !~ /^\d+$/;
-$confirmed = $1
-    if $cgi->param('confirmed') && $cgi->param('confirmed') =~ /^(\d+)$/;
-
-die "invalid confirmation date" unless $confirmed;
+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
+        if $cgi->param('confirmed') && $cgi->param('confirmed') =~ /^(\d+)$/;
 
-my $error = '';
-$did_order->confirmed($confirmed);
-$did_order->vendor_order_id($cgi->param('vendor_order_id'));
-$error = $did_order->replace;
+    die "invalid confirmation date" unless $confirmed;
 
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(1). "did_order_confirm.html?". $cgi->query_string );
+    $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>