Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined httemplate/edit/process/quick-cust_pkg.cgi
index 3063198,c5eee0c..2dadbcc
--- 1/httemplate/edit/process/quick-cust_pkg.cgi
--- 2/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@@ -2,19 -2,24 +2,24 @@@
  %  $cgi->param('error', $error);
  <% $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';
- %  my $redir_url = popurl(3)
- %            ."view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag";
+ %
+ %  my $redir_url = popurl(3);
+ %  if ( $svcpart ) { # for going straight to service provisining after ordering
+ %    $redir_url .= 'edit/'.$part_svc->svcdb.'.cgi?'.
+ %                    'pkgnum='.$cust_pkg->pkgnum. ";svcpart=$svcpart";
+ %    $redir_url .= ";qualnum=$qualnum" if $qualnum;
+ %  } elsif ( $quotationnum ) {
+ %    $redir_url .= "view/quotation.html?quotationnum=$quotationnum";
+ %  } else {
+ %    my $custnum = $cust_main->custnum;
+ %    my $frag = "cust_pkg". $cust_pkg->pkgnum;
+ %    $redir_url .=
+ %      "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag";
+ %  }
  % 
- % # for going right to a provision service after ordering a package
- % if ( $svcpart ) { 
- %   $redir_url = popurl(3)."edit/".$part_svc->svcdb.".cgi?".
- %                  "pkgnum=".$cust_pkg->pkgnum. ";svcpart=$svcpart";
- %   $redir_url .= ";qualnum=$qualnum" if $qualnum;
- % }
  <% header('Package ordered') %>
    <SCRIPT TYPE="text/javascript">
      // XXX fancy ajax rebuild table at some point, but a page reload will do for now
@@@ -33,24 -38,35 +38,35 @@@ my $curuser = $FS::CurrentUser::Current
  die "access denied"
    unless $curuser->access_right('Order customer package');
  
- #untaint custnum (probably not necessary, searching for it is escape enough)
- $cgi->param('custnum') =~ /^(\d+)$/
-   or die 'illegal custnum '. $cgi->param('custnum');
- my $custnum = $1;
- my $cust_main = qsearchs({
-   'table'     => 'cust_main',
-   'hashref'   => { 'custnum' => $custnum },
-   'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
- });
- die 'unknown custnum' unless $cust_main;
+ my $cust_main;
+ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+   my $custnum = $1;
+   $cust_main = qsearchs({
+     'table'     => 'cust_main',
+     'hashref'   => { 'custnum' => $custnum },
+     'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+   });
+ }
+ 
+ my $prospect_main;
+ if ( $cgi->param('prospectnum') =~ /^(\d+)$/ ) {
+   my $prospectnum = $1;
+   $prospect_main = qsearchs({
+     'table'     => 'prospect_main',
+     'hashref'   => { 'prospectnum' => $prospectnum },
+     'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+   });
+ }
+ 
+ die 'no custnum or prospectnum' unless $cust_main || $prospect_main;
  
  #probably not necessary, taken care of by cust_pkg::check
  $cgi->param('pkgpart') =~ /^(\d+)$/
    or die 'illegal pkgpart '. $cgi->param('pkgpart');
  my $pkgpart = $1;
 -$cgi->param('quantity') =~ /^(\d+)$/
 +$cgi->param('quantity') =~ /^(\d*)$/
    or die 'illegal quantity '. $cgi->param('quantity');
 -my $quantity = $1;
 +my $quantity = $1 || 1;
  $cgi->param('refnum') =~ /^(\d*)$/
    or die 'illegal refnum '. $cgi->param('refnum');
  my $refnum = $1;
@@@ -72,47 -88,70 +88,70 @@@ if ( $cgi->param('svcpart') ) 
  }
  
  my $qualnum = '';
- if ( $cgi->param('qualnum') ) {
-   $cgi->param('qualnum') =~ /^(\d+)$/ or die 'illegal qualnum';
+ if ( $cgi->param('qualnum') =~ /^(\d+)$/ ) {
    $qualnum = $1;
  }
+ my $quotationnum = '';
+ if ( $cgi->param('quotationnum') =~ /^(\d+)$/ ) {
+   $quotationnum = $1;
+ }
+ # verify this quotation is visible to this user
  
+ my $cust_pkg = '';
+ my $quotation_pkg = '';
+ my $error = '';
  
- my $cust_pkg = new FS::cust_pkg {
-   'custnum'              => $custnum,
-   'pkgpart'              => $pkgpart,
-   'quantity'             => $quantity,
-   '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_setup'    => scalar($cgi->param('discountnum_setup')),
-   'contract_end'         => ( scalar($cgi->param('contract_end'))
-                                 ? parse_datetime($cgi->param('contract_end'))
-                                 : ''
-                             ),
-    'waive_setup'         => ( $cgi->param('waive_setup') eq 'Y' ? 'Y' : '' ),
- };
- 
- my %opt = ( 'cust_pkg' => $cust_pkg );
- 
- if ( $locationnum == -1 ) {
-   my $cust_location = new FS::cust_location {
-     map { $_ => scalar($cgi->param($_)) }
-         qw( custnum address1 address2 city county state zip country geocode )
-   };
-   $opt{'cust_location'} = $cust_location;
- }
+ my %hash = (
+     'pkgpart'              => $pkgpart,
+     'quantity'             => $quantity,
+     'start_date'           => ( scalar($cgi->param('start_date'))
+                                   ? parse_datetime($cgi->param('start_date'))
+                                   : ''
+                               ),
+     '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_setup'    => scalar($cgi->param('discountnum_setup')),
+     'contract_end'         => ( scalar($cgi->param('contract_end'))
+                                   ? parse_datetime($cgi->param('contract_end'))
+                                   : ''
+                               ),
+      'waive_setup'         => ( $cgi->param('waive_setup') eq 'Y' ? 'Y' : '' ),
+ );
+ $hash{'custnum'} = $cust_main->custnum if $cust_main;
+ 
+ if ( $quotationnum ) {
+ 
+   $quotation_pkg = new FS::quotation_pkg \%hash;
+   $quotation_pkg->quotationnum($quotationnum);
+   $quotation_pkg->prospectnum($prospect_main->prospectnum) if $prospect_main;
  
- my $error = $cust_main->order_pkg( \%opt );
+   #XXX handle new location
+   $error = $quotation_pkg->insert;
+ 
+ } else {
+ 
+   $cust_pkg = new FS::cust_pkg \%hash;
+ 
+   $cust_pkg->no_auto( scalar($cgi->param('no_auto')) );
+ 
+   my %opt = ( 'cust_pkg' => $cust_pkg );
+ 
+   if ( $locationnum == -1 ) {
+     my $cust_location = new FS::cust_location {
+       map { $_ => scalar($cgi->param($_)) }
+           qw( custnum address1 address2 city county state zip country geocode )
+     };
+     $opt{'cust_location'} = $cust_location;
+   }
+ 
+   $error = $cust_main->order_pkg( \%opt );
+ 
+ }
  
  </%init>