X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fquotation.pm;h=a3f061291b4330dc404bc9cbc36255ffdce399ad;hb=d856e90f730f72d173c2eedde4c81bba20c583b8;hp=f4c68d5175778c899a12b8f455fea405b7bc2ddc;hpb=f2ca904433495eff9e00802aa37da902b6518546;p=freeside.git

diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index f4c68d517..a3f061291 100644
--- a/FS/FS/quotation.pm
+++ b/FS/FS/quotation.pm
@@ -138,8 +138,9 @@ sub check {
 
   $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
 
-  return 'confidence must be an integer between 1 and 100'
-    if length($self->confidence) && (($self->confidence < 1) || ($self->confidence > 100));
+  return 'confidence percentage must be an integer between 1 and 100'
+    if length($self->confidence)
+    && ( ($self->confidence < 1) || ($self->confidence > 100) );
 
   return 'prospectnum or custnum must be specified'
     if ! $self->prospectnum
@@ -277,9 +278,10 @@ sub _items_sections {
   my %opt = @_;
   my $escape = $opt{escape}; # the only one we care about
 
+
   my %show; # package frequency => 1 if there's anything to display
   my %subtotals = (); # package frequency => subtotal
-  my $disable_total = 0;
+  my $prorate_total = 0;
   foreach my $pkg ($self->quotation_pkg) {
 
     my $part_pkg = $pkg->part_pkg;
@@ -293,7 +295,7 @@ sub _items_sections {
     #this is a shitty hack based on what's in part_pkg/ at the moment
     # but its good enough for the 99% common case of preventing totals from
     # displaying for prorate packages
-    $disable_total = 1
+    $prorate_total = 1
       if $part_pkg->plan =~ /^(prorate|torrus|agent$)/
       || $part_pkg->option('recur_method') eq 'prorate'
       || ( $part_pkg->option('sync_bill_date')
@@ -301,6 +303,9 @@ sub _items_sections {
              && $self->cust_main->billing_pkgs #num_billing_pkgs when we have it
          );
 
+    #possible improvement: keep track of flat vs. prorate totals to make the
+    # bottom range more accurate when mixing flat and prorate packages
+
   }
   my @pkg_freq_order = keys %{ FS::Misc->pkg_freqs };
 
@@ -335,15 +340,31 @@ sub _items_sections {
     };
   }
 
-  unless ( $disable_total || $no_recurring ) {
+  unless ( $no_recurring ) {
     my $total = 0;
     $total += $_ for values %subtotals;
-    push @sections, {
-      'description' => 'First payment',
+    my %total = (
       'sort_weight' => 0,
-      'category'   => 'Total category', #required but what's it used for?
-      'subtotal'    => sprintf('%.2f',$total)
-    };
+      'category'    => 'Total category', #required but what's it used for?
+    );
+
+    if ( $prorate_total ) {
+
+      push @sections, {
+        %total,
+        'description' => 'First payment (depending on day of month)',
+        'subtotal'    => [ $subtotals{0}, $total ],
+      };
+
+    } else {
+
+      push @sections, {
+        %total,
+        'description' => 'First payment',
+        'subtotal'    => $total,
+      };
+    }
+
   }
 
   return \@sections, [];
@@ -695,7 +716,10 @@ sub estimate {
     my $cust_main;
     if ( $cust_or_prospect->isa('FS::prospect_main') ) {
       $cust_main = $cust_or_prospect->convert_cust_main;
-      die "$cust_main (simulating customer signup)\n" unless ref $cust_main;
+      unless ( ref($cust_main) ) {
+        $temp_dbh->rollback;
+        die "$cust_main (simulating customer signup)\n";
+      }
       $fake_self->set('prospectnum', '');
       $fake_self->set('custnum', $cust_main->custnum);
     } else {
@@ -705,7 +729,10 @@ sub estimate {
     # order packages
     local($FS::cust_pkg::disable_start_on_hold) = 1;
     $error = $fake_self->order(\%pkgnum_of);
-    die "$error (simulating package order)\n" if $error;
+    if ( $error ) {
+      $temp_dbh->rollback;
+      die "$error (simulating package order)\n";
+    }
 
     my @new_pkgs = map { FS::cust_pkg->by_key($_) } values(%pkgnum_of);
 
@@ -718,7 +745,10 @@ sub estimate {
       'no_usage_reset'  => 1,
     );
     $error = $cust_main->bill(%bill_opt);
-    die "$error (simulating initial billing)\n" if $error;
+    if ( $error ) {
+      $temp_dbh->rollback;
+      die "$error (simulating initial billing)\n" if $error;
+    }
 
     # pick dates for future bills
     my %next_bill_pkgs;
@@ -734,7 +764,10 @@ sub estimate {
       $bill_opt{'return_bill'} = $return_bill[$i] = [];
       $bill_opt{'pkg_list'} = $next_bill_pkgs{$next_bill};
       $error = $cust_main->bill(%bill_opt);
-      die "$error (simulating recurring billing cycle $i)\n" if $error;
+      if ( $error ) {
+        $temp_dbh->rollback;
+        die "$error (simulating recurring billing cycle $i)\n";
+      }
       $i++;
     }