X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_pkg.cgi;h=aa3b3b15aadfe6fba90c7ba45596c2c7f643a27d;hb=497bd20a2aa6a33cff22c25232929b3d7aeaac86;hp=e9670cd22169b12443042062cbd508681d0804b1;hpb=a4c96748eb6eab29a70f3a944c6520283a635c78;p=freeside.git

diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index e9670cd22..aa3b3b15a 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,6 +1,8 @@
 <!-- mason kludge -->
 <%
 
+my $conf = new FS::Conf;
+
 my %uiview = ();
 my %uiadd = ();
 foreach my $part_svc ( qsearch('part_svc',{}) ) {
@@ -36,7 +38,7 @@ my $otaker = $cust_pkg->getfield('otaker');
 print <<END;
 <SCRIPT>
 function areyousure(href) {
-    if (confirm("Permanantly delete included services and cancel this package?") == true)
+    if (confirm("Permanently delete included services and cancel this package?") == true)
         window.location.href = href;
 }
 </SCRIPT>
@@ -81,12 +83,14 @@ print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
       '</TABLE></TD></TR></TABLE>'
 ;
 
-#  print <<END;
-#<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
-#<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-#Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
-#<INPUT TYPE="submit" VALUE="Cancel later">
-#END
+unless ($expire) {
+  print <<END;
+<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
+<INPUT TYPE="submit" VALUE="Cancel later">
+END
+}
 
 unless ($cancel) {
 
@@ -118,18 +122,18 @@ unless ($cancel) {
         my($svcnum)=$cust_svc->svcnum;
         my($label, $value, $svcdb) = $cust_svc->label;
         print <<END;
-<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc: $value<A></TD></TR>
+<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View/Edit) $svc: $value<A></TD></TR>
 END
       } else {
-        print <<END;
-<TR>
-  <TD><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">
-      (Add) $svc</A>
-   or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">
-      (Link to existing) $svc</A>
-  </TD>
-</TR>
-END
+        print qq!<TR><TD>!.
+              qq!<A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">!.
+              qq!(Provision) $svc</A>!;
+
+        print qq! or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
+              qq!(Link to legacy) $svc</A>!
+          if $conf->exists('legacy_link');
+
+        print '</TD></TR>';
       }
 
     }
@@ -137,11 +141,13 @@ END
   }
 
   print "</TABLE><FONT SIZE=-1>",
-        "Choose (View) to view or edit an existing service<BR>",
-        "Choose (Add) to setup a new service<BR>",
-        "Choose (Link to existing) to link to a legacy (pre-Freeside) service",
-        "</FONT>"
-  ;
+        "Choose (View/Edit) to view or edit an existing service<BR>",
+        "Choose (Provision) to setup a new service<BR>";
+
+  print "Choose (Link to legacy) to link to a legacy (pre-Freeside) service"
+    if $conf->exists('legacy_link');
+
+  print "</FONT>";
 }
 
 #formatting