X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=4f511cc36c51d97b0a2c0edf3562cecc543d7ef5;hb=0301d1273aae53a35f428cff5a501849768befc8;hp=17c56055e09f3d3f638a4853fb1c9e4e74920304;hpb=e0a26680d75fc2000bde195eba7946805a3aaa28;p=freeside.git

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 17c56055e..4f511cc36 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -5,23 +5,7 @@
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 
-<SCRIPT TYPE="text/javascript">
-
-  function enable_order_pkg () {
-    if ( document.OrderPkgForm.pkgpart.selectedIndex > 0 ) {
-      document.OrderPkgForm.submitButton.disabled = false;
-      if ( document.OrderPkgForm.pkgpart.options[document.OrderPkgForm.pkgpart.selectedIndex].getAttribute('data-can_discount') == 1 ) {
-        document.OrderPkgForm.discountnum.disabled = false;
-      } else {
-        document.OrderPkgForm.discountnum.disabled = true;
-      }
-    } else {
-      document.OrderPkgForm.submitButton.disabled = true;
-      document.OrderPkgForm.discountnum.disabled = true;
-    }
-  }
-
-</SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT>
 
 <% include('/elements/error.html') %>
 
@@ -80,6 +64,13 @@
   %>
 % }
 
+% if ( $curuser->access_right('Waive setup fee') ) {
+    <TR>
+      <TH ALIGN="right">Waive setup fee </TH>
+      <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="waive_setup" VALUE="Y"></TD>
+    </TR>
+% }
+
 % if ( $conf->exists('pkg_referral') ) {
   <% include('/elements/tr-select-part_referral.html',
                'curr_value'    => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum,
@@ -94,6 +85,7 @@
 
     <INPUT TYPE  = "hidden"
            NAME  = "locationnum"
+           ID    = "locationnum"
            VALUE = "<% scalar($cgi->param('lock_locationnum')) |h %>"
     >
 
@@ -136,10 +128,10 @@
 <BR>
 % my $onclick = $cgi->param('lock_locationnum')
 %                 ? 'document.OrderPkgForm.submit()'
-%                 : 'standardize_locations()';
-<INPUT NAME="submitButton"
-       TYPE="button"
-       VALUE="Order Package"
+%                 : 'standardize_new_location()';
+<INPUT NAME    = "submitButton"
+       TYPE    = "button"
+       VALUE   = "Order Package"
        onClick = "this.disabled=true; <% $onclick %>;"
        <% $pkgpart ? '' : 'DISABLED' %>
 >