From 3a02c437eadd9a39f7e56056ca987a4846650209 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Jun 2009 02:39:09 +0000
Subject: finish up initial work on customer view tabs (ensure links back to
 customer view call include show=packages if default view isn't jumbo or
 packages already), RT#5586

---
 httemplate/edit/process/quick-cust_pkg.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to '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 9c2474330..57c696e7e 100644
--- 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+)$/
-- 
cgit v1.2.1


From 958afb8d05de67e12df258b57bedcf85028b6253 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Aug 2009 00:39:14 +0000
Subject: don't start recurring billing when a start date hasn't been reached
 yet either... and since that works, add the start date to new package order,
 RT#5347

---
 httemplate/edit/process/quick-cust_pkg.cgi | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '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 57c696e7e..7a0f08280 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -49,6 +49,10 @@ my $locationnum = $1;
 my $cust_pkg = new FS::cust_pkg {
   'custnum'     => $custnum,
   'pkgpart'     => $pkgpart,
+  'start_date'  => ( scalar($cgi->param('start_date'))
+                       ? str2time($cgi->param('start_date'))
+                       : ''
+                   ),
   'refnum'      => $refnum,
   'locationnum' => $locationnum,
 };
-- 
cgit v1.2.1