X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust-part_pkg.html;h=767d23264ba3197e7f3ca3091a0680c67fe01681;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=75f1f6f0abdd5fd1ddd8daa3de272f796efc0c0e;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git

diff --git a/httemplate/elements/tr-select-cust-part_pkg.html b/httemplate/elements/tr-select-cust-part_pkg.html
index 75f1f6f0a..767d23264 100644
--- a/httemplate/elements/tr-select-cust-part_pkg.html
+++ b/httemplate/elements/tr-select-cust-part_pkg.html
@@ -1,15 +1,16 @@
 %if ( scalar(@pkg_class) > 1 && ! $conf->exists('disable-cust-pkg_class') ) {
 
-  <% include('/elements/xmlhttp.html',
+  <& /elements/xmlhttp.html,
                 'url'  => $p.'misc/cust-part_pkg.cgi',
                 'subs' => [ 'get_part_pkg' ],
-            )
-  %>
+  &>
 
   <SCRIPT TYPE="text/javascript">
 
-    function opt(what,value,text) {
+    function part_pkg_opt(what, value, text, can_discount, can_start_date) {
       var optionName = new Option(text, value, false, false);
+      optionName.setAttribute('data-can_discount',   can_discount);
+      optionName.setAttribute('data-can_start_date', can_start_date);
       var length = what.length;
       what.options[length] = optionName;
     }
@@ -17,7 +18,14 @@
     function classnum_changed(what) {
 
       what.form.pkgpart.disabled = 'disabled'; //disable part_pkg dropdown
-      what.form.submit.disabled = true; //disable the submit button
+      var submitButton = what.form.submitButton; // || what.form.submit;
+      if ( submitButton ) {
+        submitButton.disabled = true; //disable the submit button
+      }
+      var discountnum = what.form.discountnum;
+      if ( discountnum ) {
+        discountnum.disabled = true; //disable discount dropdown
+      }
 
       classnum = what.options[what.selectedIndex].value;
 
@@ -30,9 +38,13 @@
         // add the new packages
         opt(what.form.pkgpart, '', 'Select package');
         var packagesArray = eval('(' + part_pkg + ')' );
-        for ( var s = 0; s < packagesArray.length; s=s+2 ) {
-          var packagesLabel = packagesArray[s+1];
-          opt(what.form.pkgpart, packagesArray[s], packagesLabel);
+        for ( var s = 0; s < packagesArray.length; s=s+4 ) {
+          var packagesLabel  = packagesArray[s+1];
+          var can_discount   = packagesArray[s+2];
+          var can_start_date = packagesArray[s+3];
+          part_pkg_opt(
+            what.form.pkgpart, packagesArray[s], packagesLabel, can_discount, can_start_date
+          );
         }
 
         what.form.pkgpart.disabled = ''; //re-enable part_pkg dropdown
@@ -46,29 +58,27 @@
   </SCRIPT>
 
   <TR>
-    <TH ALIGN="right">Package Class</TH>
+    <TH ALIGN="right"><% mt('Package Class') |h %></TH>
     <TD COLSPAN=7>
-      <% include('/elements/select-cust-pkg_class.html',
+      <& /elements/select-cust-pkg_class.html,
                    'curr_value' => $opt{'classnum'},
                    'pkg_class'  => \@pkg_class,
                    'onchange'   => 'classnum_changed',
-                )
-      %>
+      &>
     </TD>
   </TR>
 
 %}
 
 <TR>
-  <TH ALIGN="right">Package</TH>
+  <TH ALIGN="right"><% mt('Package') |h %></TH>
   <TD COLSPAN=7>
-    <% include('/elements/select-cust-part_pkg.html',
+    <& /elements/select-cust-part_pkg.html,
                  'curr_value' => $opt{'curr_value'}, #$pkgpart
                  'classnum'   => $opt{'classnum'},
                  'cust_main'  => $opt{'cust_main'},  #$cust_main
-                 'onchange'   => 'enable_order_pkg',
-              )
-    %>
+                 'onchange'   => 'pkg_changed',
+    &>
   </TD>
 </TR>
 
@@ -84,9 +94,6 @@ $pre_label .= ' ' if length($pre_label) && $pre_label =~ /\S$/;
 my $cust_main = $opt{'cust_main'}
   or die "cust_main not specified";
 
-#my @pkg_class = sort { $a->classname cmp $b->classname }
-#                     qsearch( 'pkg_class', { 'disabled' => '' } );
-
 #"normal" part_pkg agent virtualization (agentnum or type)
 my @part_pkg = qsearch({
   'select'    => 'DISTINCT classnum',