X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=b232debd7baa139c54b4e1ed1f634689655fdc6e;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hp=f911431542ad052927298a322693445c033920ba;hpb=20bddf47a41b6d064b3cfa4c41e55c157cf0c3de;p=freeside.git

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index f91143154..b232debd7 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -1,76 +1,23 @@
 <% include('/elements/header-popup.html', 'Order new package' ) %>
 
-<% include('/elements/xmlhttp.html',
-              'url'  => $p.'misc/location.cgi',
-              'subs' => [ 'get_location' ],
-           )
-%>
+<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+<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 locationnum_changed(what) {
-    var locationnum = what.options[what.selectedIndex].value;
-    if ( locationnum == -1 ) {
-
-%     for (@location_fields) { 
-        what.form.<%$_%>.disabled = false;
-        what.form.<%$_%>.style.backgroundColor = '#ffffff';
-%     } 
-
-      what.form.address1.value = '';
-      what.form.address2.value = '';
-      what.form.city.value = '';
-      what.form.zip.value = '';
-      changeSelect(what.form.country, <% $countrydefault |js_string %>);
-%#shouldn't we sleep/wait here until the state dropdown is updated?
-%#(is it even triggered???)
-      changeSelect(what.form.state, <% $statedefault |js_string %>);
-      what.form.county.selectedIndex = 0;
-
-    } else {
-
-      if ( locationnum == 0 ) {
-        what.form.address1.value = <% $cust_main->address1 |js_string %>;
-        what.form.address2.value = <% $cust_main->address2 |js_string %>;
-        what.form.city.value = <% $cust_main->city |js_string %>;
-        what.form.zip.value = <% $cust_main->zip |js_string %>;
-        changeSelect(what.form.country, <% $cust_main->country | js_string %> );
-%#shouldn't we sleep/wait here until the state dropdown is updated?
-%#(is it even triggered???)
-        changeSelect(what.form.state, <% $cust_main->state | js_string %> );
-%#shouldn't we sleep/wait here until the county dropdown is updated?
-%#(is it even triggered???)
-        changeSelect(what.form.county, <% $cust_main->county | js_string %> );
-      } else {
-        get_location( locationnum, update_location );
-      } 
-
-%#sleep/wait until dropdowns are updated?
-%     for (@location_fields) { 
-        what.form.<%$_%>.disabled = true;
-        what.form.<%$_%>.style.backgroundColor = '#dddddd';
-%     } 
-
-    }
-  }
-
-  function changeSelect(what, value) {
-    for ( var i=0; i<what.length; i++) {
-      if ( what.options[i].value == value ) {
-        what.selectedIndex = i;
-      }
-    }
-  }
-
-  function update_location( hash ) {
-    alert(hash);
-  }
-
   function enable_order_pkg () {
     if ( document.OrderPkgForm.pkgpart.selectedIndex > 0 ) {
-      document.OrderPkgForm.submit.disabled = false;
+      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.submit.disabled = true;
+      document.OrderPkgForm.submitButton.disabled = true;
+      document.OrderPkgForm.discountnum.disabled = true;
     }
   }
 
@@ -83,18 +30,44 @@
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main->custnum %>">
 
 <% ntable("#cccccc", 2) %>
+<% include('/elements/tr-select-cust-part_pkg.html',
+             'curr_value' => $pkgpart,
+             'classnum'   => -1,
+             'cust_main'  => $cust_main,
+             'onchange'   => 'enable_order_pkg',
+          )
+%>
+
 <TR>
-  <TH ALIGN="right">Package</TH>
-  <TD COLSPAN=7>
-    <% include('/elements/select-cust-part_pkg.html',
-                 'curr_value' => $pkgpart,
-                 'cust_main'  => $cust_main,
-                 'onchange'   => 'enable_order_pkg',
-              )
-    %>
+  <TH ALIGN="right">Start date </TD>
+  <TD COLSPAN=6>
+    <% include('/elements/input-date-field.html',{
+                'name'      => 'start_date',
+                'format'    => $date_format,
+                'value'     => $start_date,
+                'noinit'    => 1,
+              }) %>
+    <FONT SIZE=-1>(leave blank to start immediately)</FONT>
   </TD>
 </TR>
 
+% if ( $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
+%   my $what = lc(FS::payby->shortname($cust_main->payby));
+    <TR>
+      <TH ALIGN="right">Disable automatic <% $what %> charge </TH>
+      <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD>
+    </TR>
+% }
+
+% if ( $curuser->access_right('Discount customer package') ) {
+  <% include('/elements/tr-select-discount.html',
+               'element_etc' => 'DISABLED',
+               'colspan'     => 7,
+               'cgi'         => $cgi,
+            )
+  %>
+% }
+
 % 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,
@@ -105,53 +78,49 @@
   %>
 % }
 
+<% include('/elements/tr-select-cust_location.html',
+             'cgi'       => $cgi,
+             'cust_main' => $cust_main,
+          )
+%>
+
 <TR>
-  <TH ALIGN="right">Service location</TH>
-  <TD COLSPAN=7>
-    <SELECT NAME="locationnum" onChange="locationnum_changed(this);">
-      <OPTION VALUE="">(default service address)
-%     foreach my $loc ( $cust_main->cust_location ) {
-        <OPTION VALUE="<% $loc->locationnum %>"
-                <% $locationnum == $loc->locationnum ? 'SELECTED' : '' %>
-        ><% $loc->line |h %>
-%     }
-      <OPTION VALUE="-1"
-              <% $locationnum == -1 ? 'SELECTED' : '' %>
-      >Add new location
-    </SELECT>
+  <TH ALIGN="right">Contract end date </TD>
+  <TD COLSPAN=6>
+    <% include('/elements/input-date-field.html',{
+                'name'      => 'contract_end',
+                'format'    => $date_format,
+                'value'     => '',
+                'noinit'    => 1,
+                }) %>
   </TD>
 </TR>
 
-<% include('/elements/location.html',
-             'object'       => $cust_location,
-             #'onchange' ?  probably not
-             'disabled'     => ( $locationnum == -1 ? '' : 'DISABLED' ),
-             'no_asterisks' => 1,
+</TABLE>
+
+<% include( '/elements/standardize_locations.html',
+            'form'       => "OrderPkgForm",
+            'onlyship'   => 1,
+            'no_company' => 1,
+            'callback'   => 'document.OrderPkgForm.submit();',
           )
 %>
 
-</TABLE>
-
 <BR>
-<INPUT NAME="submit" TYPE="submit" VALUE="Order Package" <% $pkgpart ? '' : 'DISABLED' %>>
+<INPUT NAME="submitButton" TYPE="button" VALUE="Order Package" onClick = "this.disabled=true; standardize_locations();" <% $pkgpart ? '' : 'DISABLED' %>>
 
 </FORM>
 </BODY>
 </HTML>
-<%once>
-
-my @location_fields = qw( address1 address2 city county state zip country );
-
-</%once>
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Order customer package');
+  unless $curuser->access_right('Order customer package');
 
 my $conf = new FS::Conf;
-my $countrydefault = $conf->config('countrydefault') || 'US';
-my $statedefault = $conf->config('statedefault')
-                   || ($countrydefault eq 'US' ? 'CA' : '');
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
 $cgi->param('custnum') =~ /^(\d+)$/ or die "no custnum";
 my $custnum = $1;
@@ -163,19 +132,11 @@ my $cust_main = qsearchs({
 
 my $pkgpart = scalar($cgi->param('pkgpart'));
 
-$cgi->param('locationnum') =~ /^(\d*)$/ or die "illegal locationnum";
-my $locationnum = $1;
-my $cust_location;
-if ( $locationnum ) {
-  $cust_location = qsearchs('cust_location', { 'locationnum' => $locationnum } )
-    or die "unknown locationnum";
-} else {
-  $cust_location = new FS::cust_location;
-  if ( $cgi->param('error') && $locationnum == -1 ) {
-    $cust_location->$_( $cgi->param($_) ) foreach @location_fields;
-  } else {
-    $cust_location->$_( $cust_main->$_() ) foreach @location_fields;
-  }
+my $format = $date_format. ' %T %z (%Z)'; #false laziness w/REAL_cust_pkg.cgi?
+my $start_date = '';
+if( ! $conf->exists('order_pkg-no_start_date') ) {
+  $start_date = $cust_main->next_bill_date;
+  $start_date = $start_date ? time2str($format, $start_date) : '';
 }
 
 </%init>