X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Forder_pkg.js;h=d7a909187d14d69df053036884c231d3551fb5af;hb=9d175e20ee5a1d2088352acdee356afa30db5028;hp=48073593a668158c9eee5360c48162dd47182401;hpb=60ad366f6b218de3f229b4ccdc033b96863ea3e9;p=freeside.git

diff --git a/httemplate/elements/order_pkg.js b/httemplate/elements/order_pkg.js
index 48073593a..d7a909187 100644
--- a/httemplate/elements/order_pkg.js
+++ b/httemplate/elements/order_pkg.js
@@ -4,9 +4,18 @@ function pkg_changed () {
 
   if ( form.pkgpart.selectedIndex > 0 ) {
 
+    var opt = form.pkgpart.options[form.pkgpart.selectedIndex];
+    var date_button = document.getElementById('start_date_button');
+    var date_button_disabled = document.getElementById('start_date_disabled');
+    var date_text = document.getElementById('start_date_text');
+
+    var radio_now = document.getElementById('start_now');
+    var radio_on_hold = document.getElementById('start_on_hold');
+    var radio_on_date = document.getElementById('start_on_date');
+
     form.submitButton.disabled = false;
     if ( discountnum ) {
-      if ( form.pkgpart.options[form.pkgpart.selectedIndex].getAttribute('data-can_discount') == 1 ) {
+      if ( opt.getAttribute('data-can_discount') == 1 ) {
         form.discountnum.disabled = false;
         discountnum_changed(form.discountnum);
       } else {
@@ -15,17 +24,48 @@ function pkg_changed () {
       }
     }
 
-    if ( form.pkgpart.options[form.pkgpart.selectedIndex].getAttribute('data-can_start_date') == 1 ) {
-      form.start_date_text.disabled = false;
-      form.start_date.style.backgroundColor = '#ffffff';
-      form.start_date_button.style.display = '';
-      form.start_date_button_disabled.style.display = 'none';
-      form.invoice_terms.disabled = true;
-    } else {
-      form.start_date_text.disabled = true;
-      form.start_date.style.backgroundColor = '#dddddd';
-      form.start_date_button.style.display = 'none';
-      form.start_date_button_disabled.style.display = '';
+// if this form element exists, then the start date is a future
+// package change date; don't replace it
+    if ( form.delay ) {
+      return;
+    }
+    form.start_date_text.value = opt.getAttribute('data-start_date');
+    if ( opt.getAttribute('data-can_start_date') == 1 ) {
+      date_text.style.backgroundColor = '#ffffff';
+      date_text.disabled = false;
+      date_button.style.display = '';
+      date_button_disabled.style.display = 'none';
+      if ( radio_on_date ) {
+        // un-disable all the buttons that might get disabled
+        radio_on_date.disabled = false;
+        radio_now.disabled = false;
+        // if a start date has been entered, assume the user wants it
+        if ( form.start_date_text.value.length > 0 ) {
+          radio_now.checked = false;
+          radio_on_date.checked = true;
+        } else {
+          // if not, default to now
+          radio_now.checked = true;
+        }
+      }
+    } else { // the package is either fixed start date or start-on-hold
+      date_text.style.backgroundColor = '#dddddd';
+      date_text.disabled = true;
+      date_button.style.display = 'none';
+      date_button_disabled.style.display = '';
+      if ( radio_on_date ) {
+        if ( opt.getAttribute('data-start_on_hold') == 1 ) {
+          // disallow all options but "On hold"
+          radio_on_hold.checked = true;
+          radio_now.checked = false;
+          radio_now.disabled = true;
+        } else {
+          // disallow all options but "On date"
+          radio_on_hold.checked = false;
+          radio_now.checked = true;
+          radio_now.disabled = false;
+        }
+      }
     }
 
   } else {
@@ -44,3 +84,8 @@ function standardize_new_location() {
     form.submit();
   }
 }
+
+function submit_abort() {
+  document.OrderPkgForm.submitButton.disabled = false;
+  nd(1);
+}