From 29472410e3b882a6a6b74fe48d28db411fe8fcff Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Tue, 12 Oct 2010 01:15:17 +0000
Subject: package contract end date field, RT#9918

---
 httemplate/edit/REAL_cust_pkg.cgi          | 6 ++++--
 httemplate/edit/process/quick-cust_pkg.cgi | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 77e5da141..98a37bb94 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -55,12 +55,14 @@
   <& .row_edit, cust_pkg=>$cust_pkg, column=>'setup',     label=>'Setup' &>
   <& .row_edit, cust_pkg=>$cust_pkg, column=>'last_bill', label=>$last_bill_or_renewed &>
   <& .row_edit, cust_pkg=>$cust_pkg, column=>'bill',      label=>$next_bill_or_prepaid_until &>
-  <& .row_display, cust_pkg=>$cust_pkg, column=>'adjourn',   label=>'Adjournment', note=>'(will <b>suspend</b> this package when the date is reached)' &>
-  <& .row_display, cust_pkg=>$cust_pkg, column=>'susp',   label=>'Suspension' &>
+  <& .row_display, cust_pkg=>$cust_pkg, column=>'contract_end',label=>'Contract end' &>
+  <& .row_display, cust_pkg=>$cust_pkg, column=>'adjourn',  label=>'Adjournment', note=>'(will <b>suspend</b> this package when the date is reached)' &>
+  <& .row_display, cust_pkg=>$cust_pkg, column=>'susp',     label=>'Suspension' &>
 
   <& .row_display, cust_pkg=>$cust_pkg, column=>'expire',   label=>'Expiration', note=>'(will <b>cancel</b> this package when the date is reached)' &>
   <& .row_display, cust_pkg=>$cust_pkg, column=>'cancel',   label=>'Cancellation' &>
 
+
 <%def .row_edit>
 <%args>
   $cust_pkg
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 71f424ca3..599f7607c 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -66,6 +66,10 @@ my $cust_pkg = new FS::cust_pkg {
   'discountnum_amount'   => scalar($cgi->param('discountnum_amount')),
   'discountnum_percent'  => scalar($cgi->param('discountnum_percent')),
   'discountnum_months'   => scalar($cgi->param('discountnum_months')),
+  'contract_end'         => ( scalar($cgi->param('contract_end'))
+                                ? parse_datetime($cgi->param('contract_end'))
+                                : ''
+                            ),
   #'discountnum_disabled' => scalar($cgi->param('discountnum_disabled')),
 };
 
-- 
cgit v1.2.1