From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 29 Oct 2015 17:52:04 +0000 (-0700)
Subject: fix appointments vs. no direct elements/ access, RT#34237, RT#23357
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=1598480a192e9a056834d636fbd7de7ae00dead6

fix appointments vs. no direct elements/ access, RT#34237, RT#23357
---

diff --git a/httemplate/elements/make_appointment.html b/httemplate/elements/make_appointment.html
deleted file mode 100644
index ddf377f54..000000000
--- a/httemplate/elements/make_appointment.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<& /elements/header-popup.html &>
-
-% #XXX actually, the action needs to repace the top-level window with this
-% #$params->{'action'} = $p. 'rt/Search/Schedule.html?'. $query;
-<FORM NAME="appointment_form" METHOD="POST" ACTION="<% $p %>elements/schedule-appointment.html">
-
-<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cgi->param('custnum') |h %>">
-
-% my @sched_item = qsearch('sched_item', { 'disabled' => '', });
-% my @username = map $_->access_user->username, @sched_item;
-% foreach my $username (@username) { 
-  <INPUT TYPE="hidden" NAME="username" VALUE="<% $username |h %>">
-% }
-
-Length: 
-<SELECT NAME="LengthMin">
-%  for ( my $hours = .5; $hours < 10.5; $hours += .5 ) {
-%    my $min = $hours * 60;
-     <OPTION VALUE="<% $min %>"
-             <% $min == $default_length ? 'SELECTED' : '' %>
-     ><% $hours %> hour<% $hours > 1 ? 's' : '' %>
-%  }
-</SELECT>
-<BR>
-<BR>
-
-<INPUT TYPE="submit" VALUE="Schedule appointment">
-
-</FORM>
-
-<& /elements/footer-popup.html &>
-<%init>
-
-my $default_length = FS::Conf->new->config('default_appointment_length') || 180;
-
-#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?  (well, we're already a popup now) we're getting complicated like form-creat_ticket.html
-
-
-</%init>
diff --git a/httemplate/elements/popup_link-make_appointment.html b/httemplate/elements/popup_link-make_appointment.html
index 60a337c04..3a8d37a8c 100644
--- a/httemplate/elements/popup_link-make_appointment.html
+++ b/httemplate/elements/popup_link-make_appointment.html
@@ -26,6 +26,6 @@ $params->{'actionlabel'} ||= 'Schedule appointment';
 #$params->{'width'} ||= 350;
 #$params->{'height'} ||= 220;
 
-$params->{'action'} = $p. '/elements/make_appointment.html?custnum='. $params->{'custnum'};
+$params->{'action'} = $p. 'misc/make_appointment.html?custnum='. $params->{'custnum'};
 
 </%init>
diff --git a/httemplate/misc/make_appointment.html b/httemplate/misc/make_appointment.html
new file mode 100644
index 000000000..ddf377f54
--- /dev/null
+++ b/httemplate/misc/make_appointment.html
@@ -0,0 +1,39 @@
+<& /elements/header-popup.html &>
+
+% #XXX actually, the action needs to repace the top-level window with this
+% #$params->{'action'} = $p. 'rt/Search/Schedule.html?'. $query;
+<FORM NAME="appointment_form" METHOD="POST" ACTION="<% $p %>elements/schedule-appointment.html">
+
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cgi->param('custnum') |h %>">
+
+% my @sched_item = qsearch('sched_item', { 'disabled' => '', });
+% my @username = map $_->access_user->username, @sched_item;
+% foreach my $username (@username) { 
+  <INPUT TYPE="hidden" NAME="username" VALUE="<% $username |h %>">
+% }
+
+Length: 
+<SELECT NAME="LengthMin">
+%  for ( my $hours = .5; $hours < 10.5; $hours += .5 ) {
+%    my $min = $hours * 60;
+     <OPTION VALUE="<% $min %>"
+             <% $min == $default_length ? 'SELECTED' : '' %>
+     ><% $hours %> hour<% $hours > 1 ? 's' : '' %>
+%  }
+</SELECT>
+<BR>
+<BR>
+
+<INPUT TYPE="submit" VALUE="Schedule appointment">
+
+</FORM>
+
+<& /elements/footer-popup.html &>
+<%init>
+
+my $default_length = FS::Conf->new->config('default_appointment_length') || 180;
+
+#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?  (well, we're already a popup now) we're getting complicated like form-creat_ticket.html
+
+
+</%init>
diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index b8740635d..ab2d69d34 100644
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -317,7 +317,7 @@ my @menu = (
       label       => 'Schedule new appointment',
       confexists  => 'ticket_system',
       acl        => 'Make appointment',
-      popup       => "elements/make_appointment.html?custnum=$custnum",
+      popup       => "misc/make_appointment.html?custnum=$custnum",
       actionlabel => 'Schedule appointment',
     },
   ],