[freeside-commits] branch master updated. c80c0c11bce165716c08e04eea3a587fc7a58210

Ivan ivan at 420.am
Tue Nov 8 01:33:44 PST 2016


The branch, master has been updated
       via  c80c0c11bce165716c08e04eea3a587fc7a58210 (commit)
      from  eb778278d1f0c9ceaed5ba4ae1b0a5730b8b1f57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c80c0c11bce165716c08e04eea3a587fc7a58210
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Nov 8 01:33:43 2016 -0800

    4.x style one-time charge

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index dde8917..3300815 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,11 +1,13 @@
+% if ( $quotationnum ) {
 <& /elements/header.html, mt('One-time charge'), '',
             ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
 &>
+% } else {
+<& /elements/header-cust_main.html, view=>'packages', cust_main=>$cust_main &>
+<h2>One-time charge</h2>
+% }
 
-<LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-setup.js"></SCRIPT>
+<& /elements/init_calendar.html &>
 <SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/xregexp-all.js"></SCRIPT>
 
 <& /elements/error.html &>
@@ -95,13 +97,7 @@ function bill_now_changed (what) {
 </SCRIPT>
 
 <P>
-% if ( $cust_main ) {
-<& /elements/small_custview.html,
-             $cust_main->custnum,
-             scalar($conf->config('countrydefault')),
-             1, #no balance
-&>
-% } else {
+% if ( $prospect_main ) {
 <& /elements/small_prospect_view.html, $prospect_main &>
 % }
 </P>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/quick-charge.html |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)




More information about the freeside-commits mailing list