X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=1ceefcb8163652e728b3c61cddb7b92d60ac4df8;hb=de1462c50bb8f9c841d193accddd1e4a4e9390e6;hp=eca6c78e5b4197f997a3f43c778f6bb116f8e428;hpb=52bea6aecfcc8274fd852f626a0f751e1b5bd6a8;p=freeside.git

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index eca6c78e5..1ceefcb81 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,5 +1,5 @@
 <& /elements/header-popup.html, mt('One-time charge'), '',
-            ( $cgi->param('error') ? '' : 'onload="addRow()"' ),
+            ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
 &>
 
 <LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
@@ -100,11 +100,13 @@ function bill_now_changed (what) {
       onSubmit = "document.QuickChargeForm.submit.disabled=true; return validate_quick_charge();"
 >
 
-<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
+<INPUT TYPE="hidden" NAME="custnum"     VALUE="<% $cust_main ? $cust_main->custnum : '' %>">
+<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospect_main ? $prospect_main->prospectnum : '' %>">
+<INPUT TYPE="hidden" NAME="quotationnum" VALUE="<% $quotationnum %>">
 
 <TABLE ID="QuickChargeTable" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 STYLE="background-color: #cccccc">
 
-% if ( $cust_pkg ) {
+% if ( $cust_pkg ) { #modify one-time charge
 
 <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $cust_pkg->pkgnum %>">
 % my $field = '/elements/tr-input-text.html';
@@ -167,7 +169,22 @@ function bill_now_changed (what) {
           noinit  => 1,
         }
       &>
-%   }
+
+      <& /elements/tr-checkbox.html,
+        label => emt('Invoice this charge separately'),
+        field => 'separate_bill',
+        value => 'Y',
+        curr_value => $cust_pkg->get('separate_bill'),
+      &>
+      <TR>
+        <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD>
+        <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
+      </TR>
+
+      <& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass')  &>
+
+      <& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum')  &>
+% }
 
 % } else { # new one-time charge
 
@@ -209,63 +226,73 @@ function bill_now_changed (what) {
 
 <& /elements/tr-select-pkg_class.html, 'curr_value' => $classnum  &>
 
-<TR>
-  <TD ALIGN="right"><% mt('Invoice now') |h %></TD>
-  <TD>
-    <INPUT TYPE  = "checkbox"
-           NAME  = "bill_now"
-           VALUE = "1"
-           <% $cgi->param('bill_now') ? 'CHECKED' : '' %>
-           onClick  = "bill_now_changed(this);"
-           onChange = "bill_now_changed(this);"
-    >
-    <% mt('with terms') |h %> 
-    <& /elements/select-terms.html,
-         'curr_value' => scalar($cgi->param('invoice_terms')),
-         'disabled'   => ( $cgi->param('bill_now') ? 0 : 1 ),
-         'agentnum'   => $cust_main->agentnum,
-    &>
-  </TD>
-</TR>
+% unless ( $quotationnum ) {
 
-%# false laziness w/misc/order_pkg.html
-<TR>
-  <TD ALIGN="right"><% mt('Charge date') |h %> </TD>
-  <TD>
-    <INPUT TYPE  = "text"
-           NAME  = "start_date"
-           SIZE  = 32
-           ID    = "start_date_text"
-           VALUE = "<% $start_date %>"
-           onKeyPress="return enable_quick_charge(event)"
-           <% $cgi->param('bill_now')
-                ? 'STYLE = "background-color:#dddddd" DISABLED'
-                : ''
-           %>
-    >
-    <IMG SRC   = "<%$fsurl%>images/calendar.png"
-         ID    = "start_date_button"
-         TITLE = "<% mt('Select date') |h %>"
-         STYLE = "cursor:pointer<% $cgi->param('bill_now') ? ';display:none' : '' %>"
-    >
-    <IMG SRC   = "<%$fsurl%>images/calendar-disabled.png"
-         ID    = "start_date_button_disabled"
-         <% $cgi->param('bill_now') ? '' : 'STYLE="display:none"' %>
-    >
-    <FONT SIZE=-1>(<% mt('leave blank to charge immediately') |h %>)</FONT>
-  </TD>
-</TR>
+    <TR>
+      <TD ALIGN="right"><% mt('Invoice now') |h %></TD>
+      <TD>
+        <INPUT TYPE  = "checkbox"
+               NAME  = "bill_now"
+               VALUE = "1"
+               <% $cgi->param('bill_now') ? 'CHECKED' : '' %>
+               onClick  = "bill_now_changed(this);"
+               onChange = "bill_now_changed(this);"
+        >
+        <% mt('with terms') |h %> 
+        <& /elements/select-terms.html,
+             'curr_value' => scalar($cgi->param('invoice_terms')),
+             'disabled'   => ( $cgi->param('bill_now') ? 0 : 1 ),
+             'agentnum'   => $cust_or_prospect->agentnum,
+        &>
+      </TD>
+    </TR>
 
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "start_date_text",
-    ifFormat:   "<% $date_format %>",
-    button:     "start_date_button",
-    align:      "BR"
-  });
-</SCRIPT>
+%   # false laziness w/misc/order_pkg.html
+    <TR>
+      <TD ALIGN="right"><% mt('Charge date') |h %> </TD>
+      <TD>
+        <INPUT TYPE  = "text"
+               NAME  = "start_date"
+               SIZE  = 32
+               ID    = "start_date_text"
+               VALUE = "<% $start_date %>"
+               onKeyPress="return enable_quick_charge(event)"
+               <% $cgi->param('bill_now')
+                    ? 'STYLE = "background-color:#dddddd" DISABLED'
+                    : ''
+               %>
+        >
+        <IMG SRC   = "<%$fsurl%>images/calendar.png"
+             ID    = "start_date_button"
+             TITLE = "<% mt('Select date') |h %>"
+             STYLE = "cursor:pointer<% $cgi->param('bill_now') ? ';display:none' : '' %>"
+        >
+        <IMG SRC   = "<%$fsurl%>images/calendar-disabled.png"
+             ID    = "start_date_button_disabled"
+             <% $cgi->param('bill_now') ? '' : 'STYLE="display:none"' %>
+        >
+        <FONT SIZE=-1>(<% mt('leave blank to charge immediately') |h %>)</FONT>
+      </TD>
+    </TR>
 
-% if ( $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
+    <SCRIPT TYPE="text/javascript">
+      Calendar.setup({
+        inputField: "start_date_text",
+        ifFormat:   "<% $date_format %>",
+        button:     "start_date_button",
+        align:      "BR"
+      });
+    </SCRIPT>
+
+<& /elements/tr-checkbox.html,
+  label => emt('Invoice this charge separately'),
+  field => 'separate_bill',
+  value => 'Y'
+&>
+
+% }
+
+% if ( ! $quotationnum && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
 %   my $what = lc(FS::payby->shortname($cust_main->payby));
     <TR>
       <TD ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TD>
@@ -300,13 +327,14 @@ function bill_now_changed (what) {
   </TD>
 </TR>
 
+% my $row = 0;
+% unless ($quotationnum) {
 <TR>
   <TD></TD>
   <TD><FONT SIZE="-1"><% mt('Optional additional description (also printed on invoice):') |h %> </FONT></TD>
 </TR>
 
-% my $row = 0;
-% foreach (@description) {
+%   foreach (@description) {
     <TR>
       <TD></TD>
       <TD>
@@ -321,8 +349,9 @@ function bill_now_changed (what) {
         >
       </TD>
     </TR>
-% $row++;
-% } 
+%     $row++;
+%   }
+% }
 
 
 </TABLE>
@@ -409,7 +438,7 @@ my $conf = new FS::Conf;
 my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 my $money_char = $conf->config('money_char') || '$';
 
-my ($cust_main, $cust_pkg);
+my( $cust_main, $cust_pkg, $prospect_main, $quotationnum ) = ( '', '', '', '' );
 if ( $cgi->param('change_pkgnum') ) {
   # change an existing one-time charge
   die "access denied"
@@ -419,18 +448,37 @@ if ( $cgi->param('change_pkgnum') ) {
   $cust_pkg = FS::cust_pkg->by_key($1) or die "pkgnum $1 not found";
   $cust_main = $cust_pkg->cust_main;
 } else {
-  $cgi->param('custnum') =~ /^(\d+)$/ or die 'illegal custnum';
-  $cust_main = FS::cust_main->by_key($1) or die "custnum $1 not found";
+  if ( $cgi->param('quotationnum') =~ /^(\d+)$/ ) {
+    $quotationnum = $1;
+  }
+  if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+    $cust_main = FS::cust_main->by_key($1) or die "custnum $1 not found";
+  }
+  if ( $cgi->param('prospectnum') =~ /^(\d+)$/ ) {
+    $prospect_main = FS::prospect_main->by_key($1) or die "prospectnum $1 not found";
+  }
+  die "custnum or prospectnum must be specified"
+    unless $cust_main || $prospect_main;
 }
 
-my $custnum = $cust_main->custnum;
-# agent-virt
-if (!exists($curuser->agentnums_href->{$cust_main->agentnum})) {
-  die "custnum $custnum not found";
+my $cust_or_prospect = $cust_main || $prospect_main;
+
+if ( $cust_main ) {
+  my $custnum = $cust_main->custnum;
+  # agent-virt
+  if (!exists($curuser->agentnums_href->{$cust_main->agentnum})) {
+    die "custnum $custnum not found";
+  }
+} elsif ( $prospect_main ) {
+  my $prospectnum = $prospect_main->prospectnum;
+  # agent-virt
+  if (!exists($curuser->agentnums_href->{$prospect_main->agentnum})) {
+    die "prospectnum $prospectnum not found";
+  }
 }
 
 my $format = "%m/%d/%Y %T %z (%Z)"; #false laziness w/REAL_cust_pkg.cgi?
-my $start_date = $cust_main->next_bill_date;
+my $start_date = $cust_main ? $cust_main->next_bill_date : '';
 $start_date = $start_date ? time2str($format, $start_date) : '';
 
 my $amount = '';
@@ -453,12 +501,12 @@ $cgi->param('pkg') =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/
 my $pkg = $1;
 
 my $default_terms;
-if ( $cust_main->invoice_terms ) {
+if ( $cust_main && $cust_main->invoice_terms ) {
   $default_terms = emt("Customer default ([_1])", $cust_main->invoice_terms);
 } else {
   $default_terms =
     emt( "Default ([_1])",
-         ( $conf->config('invoice_default_terms', $cust_main->agentnum)
+         ( $conf->config('invoice_default_terms', $cust_or_prospect->agentnum)
              || emt('Payable upon receipt')
          )
        );