[freeside-commits] freeside/httemplate/edit cust_pay.cgi, 1.31, 1.32 part_pkg.cgi, 1.119, 1.120

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv19099/httemplate/edit

Modified Files:
	cust_pay.cgi part_pkg.cgi 
Log Message:
prepayment discounts rt#5318

Index: cust_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_pay.cgi,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -d -r1.31 -r1.32
--- cust_pay.cgi	9 Apr 2010 08:18:24 -0000	1.31
+++ cust_pay.cgi	22 Sep 2010 19:16:19 -0000	1.32
@@ -46,6 +46,12 @@
   <TD><INPUT TYPE="text" NAME="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=8> by <B><% FS::payby->payname($payby) %></B></TD>
 </TR>
 
+  <% include('/elements/tr-select-discount_term.html',
+               'custnum' => $custnum,
+               'cgi'     => $cgi
+            )
+  %>
+
 % if ( $payby eq 'BILL' ) { 
   <TR>
     <TD ALIGN="right">Check #</TD>

Index: part_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_pkg.cgi,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -w -d -r1.119 -r1.120
--- part_pkg.cgi	13 Jul 2010 22:55:07 -0000	1.119
+++ part_pkg.cgi	22 Sep 2010 19:16:19 -0000	1.120
@@ -45,6 +45,7 @@
                             'agentnum'         => 'Agent',
                             'setup_fee'        => 'Setup fee',
                             'recur_fee'        => 'Recurring fee',
+                            'discountnum'      => 'Offer discounts for longer terms',
                             'bill_dst_pkgpart' => 'Include line item(s) from package',
                             'svc_dst_pkgpart'  => 'Include services of package',
                             'report_option'    => 'Report classes',
@@ -94,6 +95,7 @@
                                 type  => 'selectlayers-select',
                                 options => [ keys %plan_labels ],
                                 labels  => \%plan_labels,
+                                onchange => 'aux_planchanged(what);',
                               },
                               { field => 'setup_fee',
                                 type  => 'money',
@@ -195,6 +197,21 @@
                               'multiple' => 1,
                             },
 
+                            { 'type'    => 'tablebreak-tr-title',
+                              'value'   => 'Term discounts',
+                            },
+                            { 'field'      => 'discountnum',
+                              'type'       => 'select-table',
+                              'table'      => 'discount',
+                              'name_col'   => 'name',
+                              'hashref'    => { %$discountnum_hashref },
+                              #'extra_sql'  => 'AND (months IS NOT NULL OR months != 0)',
+                              'empty_label'=> 'Select discount',
+                              'm2_label'   => 'Offer discounts for longer terms',
+                              'm2m_method' => 'part_pkg_discount',
+                              'm2m_dstcol' => 'discountnum',
+                              'm2_error_callback' => $discount_error_callback,
+                            },
 
                             { 'type'    => 'tablebreak-tr-title',
                               'value'   => 'Pricing add-ons',
@@ -426,6 +443,23 @@
   $recur_disabled = $object->freq ? 0 : 1;
 };
 
+my $discount_error_callback = sub {
+  my( $cgi, $object ) = @_;
+  map {
+        if ( /^discountnum(\d+)$/ &&
+             ( my $discountnum = $cgi->param("discountnum$1") ) )
+        {
+          new FS::part_pkg_discount {
+            'pkgpart'     => $object->pkgpart,
+            'discountnum' => $discountnum,
+          };
+        } else {
+          ();
+        }
+      }
+  $cgi->param;
+};
+
 my $m2_error_callback_maker = sub {
   my $link_type = shift; #yay closures
   return sub {
@@ -484,6 +518,22 @@
 
     }
 
+    function aux_planchanged(what) {
+
+      alert('called!');
+      var plan = what.options[what.selectedIndex].value;
+      var table = document.getElementById('TableNumber7') // XXX NOT ROBUST
+
+      if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) {
+        //table.disabled = false;
+        table.style.visibility = '';
+      } else {
+        //table.disabled = true;
+        table.style.visibility = 'hidden';
+      }
+
+    }
+
   </SCRIPT>
 END
 
@@ -736,4 +786,9 @@
   }
 };
 
+my $discountnum_hashref = {
+                            'disabled' => '',
+                            'months' => { 'op' => '>', 'value' => 1 },
+                          };
+
 </%init>