[freeside-commits] branch FREESIDE_4_BRANCH updated. 801fc8102568cf06bcd727b8de376c19473e54a1

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


The branch, FREESIDE_4_BRANCH has been updated
       via  801fc8102568cf06bcd727b8de376c19473e54a1 (commit)
      from  5f5518389c3749e45131d6169299c825383f4fdc (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 801fc8102568cf06bcd727b8de376c19473e54a1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Nov 8 01:33:44 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