fix date parsing when using international dates (package date edit), RT#8027

[freeside.git] / httemplate / edit / process / quick-cust_pkg.cgi

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 9c24743..2fde17f 100644 (file)
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -3,12 +3,15 @@
 <% $cgi->redirect(popurl(3). 'misc/order_pkg.html?'. $cgi->query_string ) %>
 %} else {
 %  my $frag = "cust_pkg". $cust_pkg->pkgnum;
+%  my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+%               ? ''
+%               : ';show=packages';
 <% header('Package ordered') %>
   <SCRIPT TYPE="text/javascript">
     // XXX fancy ajax rebuild table at some point, but a page reload will do for now
 
     // XXX chop off trailing #target and replace... ?
-    window.top.location = '<% popurl(3). "view/cust_main.cgi?keywords=$custnum;fragment=$frag#$frag" %>';
+    window.top.location = '<% popurl(3). "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag" %>';
 
   </SCRIPT>
 
@@ -16,8 +19,10 @@
 %}
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Order customer package');
+  unless $curuser->access_right('Order customer package');
 
 #untaint custnum (probably not necessary, searching for it is escape enough)
 $cgi->param('custnum') =~ /^(\d+)$/
@@ -40,12 +45,28 @@ my $refnum = $1;
 $cgi->param('locationnum') =~ /^(\-?\d*)$/
   or die 'illegal locationnum '. $cgi->param('locationnum');
 my $locationnum = $1;
+$cgi->param('discountnum') =~ /^(\-?\d*)$/
+  or die 'illegal discountnum '. $cgi->param('discountnum');
+my $discountnum = $1;
+
 
 my $cust_pkg = new FS::cust_pkg {
-  'custnum'     => $custnum,
-  'pkgpart'     => $pkgpart,
-  'refnum'      => $refnum,
-  'locationnum' => $locationnum,
+  'custnum'              => $custnum,
+  'pkgpart'              => $pkgpart,
+  'start_date'           => ( scalar($cgi->param('start_date'))
+                                ? parse_datetime($cgi->param('start_date'))
+                                : ''
+                            ),
+  'no_auto'              => scalar($cgi->param('no_auto')),
+  'refnum'               => $refnum,
+  'locationnum'          => $locationnum,
+  'discountnum'          => $discountnum,
+  #for the create a new discount case
+  'discountnum__type'    => scalar($cgi->param('discountnum__type')),
+  'discountnum_amount'   => scalar($cgi->param('discountnum_amount')),
+  'discountnum_percent'  => scalar($cgi->param('discountnum_percent')),
+  'discountnum_months'   => scalar($cgi->param('discountnum_months')),
+  #'discountnum_disabled' => scalar($cgi->param('discountnum_disabled')),
 };
 
 my %opt = ( 'cust_pkg' => $cust_pkg );