From 2d9689ef1601b66950413af88f319a6e4e2ccf0f Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremyd@freeside.biz>
Date: Thu, 14 May 2015 15:34:17 -0400
Subject: Fix mis-spelling #35011

---
 httemplate/view/cust_main/packages/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 690f858ad..047abda0b 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -112,7 +112,7 @@
 %           }
 %           if ( $curuser->access_right('Unsuspend customer package') ) { 
 %             if ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold
-                (&nbsp;<% pkg_link('misc/unsusp_pkg', emt('Start bililng now'), $cust_pkg) %>&nbsp;)
+                (&nbsp;<% pkg_link('misc/unsusp_pkg', emt('Start billing now'), $cust_pkg) %>&nbsp;)
 %             } else {
                 (&nbsp;<% pkg_unsuspend_link($cust_pkg) %>&nbsp;)
                 (&nbsp;<% pkg_resume_link($cust_pkg) %>&nbsp;)
-- 
cgit v1.2.1


From 5d6ffe026e7ac113f619adf4db7561312bf4c72e Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 1 Jun 2015 16:03:29 -0500
Subject: RT#32226: Disable bulk order link under provisioning link for
 svc_phone

---
 httemplate/view/cust_main/packages/services.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html
index d7644b7de..39055f49a 100644
--- a/httemplate/view/cust_main/packages/services.html
+++ b/httemplate/view/cust_main/packages/services.html
@@ -10,6 +10,7 @@ function clearhint_search_cust_svc(obj, str) {
 }
     </SCRIPT>
 
+%  my $showdidlink = browse_received_did_inventory($cust_pkg->custnum);
 %  foreach my $part_svc (
 %    $cust_pkg->part_svc(
 %      'summarize_size'    => $opt{'cust_pkg-large_pkg_size'},
@@ -97,7 +98,7 @@ function clearhint_search_cust_svc(obj, str) {
 %             local $opt{'num_avail'} = $part_svc->num_avail;
               <BR><% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %>
 %           }
-%           if (browse_received_did_inventory($cust_pkg->custnum)) {
+%           if ($showdidlink) {
               <BR><A HREF="<%$p%>browse/did_order.html?custnum=<%$cust_pkg->custnum%>"><% mt('Browse Received DID Inventory') |h %></A> 
 %           }
 %       }
-- 
cgit v1.2.1


From f585e97f2a3690339066bbb7fbb6f87f4600cff6 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Jun 2015 20:58:28 -0700
Subject: fix pg replication slave display in status

---
 httemplate/view/Status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/Status.html b/httemplate/view/Status.html
index f1060874c..eb7df6846 100644
--- a/httemplate/view/Status.html
+++ b/httemplate/view/Status.html
@@ -93,7 +93,7 @@ if ( $db eq 'PostgreSQL' ) {
                 && FS::Record->scalar_sql('SHOW archive_mode') eq 'on';
 
   my $slave = 
-    FS::Record->scalar_sql('SHOW archive_command') =~ / postgres\@([\w\.\-]): /
+    FS::Record->scalar_sql('SHOW archive_command') =~ / postgres\@([\w\.\-]+): /
       ? $1 : '';
 
   $status{'Replication'} = [
-- 
cgit v1.2.1


From cca0cc20700b15a95b2c61e527b3a128c6efb32e Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Jun 2015 22:16:26 -0700
Subject: set appointment length, RT#33556

---
 httemplate/view/cust_main/appointments.html | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/appointments.html b/httemplate/view/cust_main/appointments.html
index 9bec7b9ae..335bd208b 100644
--- a/httemplate/view/cust_main/appointments.html
+++ b/httemplate/view/cust_main/appointments.html
@@ -2,16 +2,7 @@
 <A NAME="appointments"><FONT CLASS="fsinnerbox-title">Appointments</FONT></A>
 
 % if ( $FS::CurrentUser::CurrentUser->access_right('Make appointment') ) { 
-%# just a link for now,  should probably be FS::TicketSystem->href_schedule
-%# maybe need to add a dropdown for type (install etc.) from a custom field
-%# or maybe change to a popup and get that info there
-% my @sched_item = qsearch('sched_item', { 'disabled' => '', });
-% my @username = map $_->access_user->username, @sched_item;
-% my $query = join('&', map "username=$_", @username).
-%             '&LengthMin=180'. #XXX appointment length
-%             '&custnum='. $cust_main->custnum; #.
-%             #XXX '&pkgnum=$pkgnum";need to be for specific package/location, not just for a customer... default to active(/ordered) package in a pkg_class w/ticketing_queueid, otherwise, a popup?  we're getting complicated like form-creat_ticket.html
-<A HREF="<%$p%>rt/Search/Schedule.html?<% $query %>">Make appointment</A>
+  <& /elements/popup_link-make_appointment.html, custnum=>$cust_main->custnum &>
 % }
 
 %#  |
-- 
cgit v1.2.1