projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix submission bug w/chrome, RT#12638
[freeside.git]
/
httemplate
/
misc
/
cancel_pkg.html
diff --git
a/httemplate/misc/cancel_pkg.html
b/httemplate/misc/cancel_pkg.html
index
8dffba7
..
10c0e0d
100755
(executable)
--- a/
httemplate/misc/cancel_pkg.html
+++ b/
httemplate/misc/cancel_pkg.html
@@
-17,7
+17,7
@@
<BR><BR>
<BR><BR>
-<% ucfirst($method)
. " $pkgnum: " .$part_pkg->pkg. ' - ' .$part_pkg->
comment %>
+<% ucfirst($method)
%> <% $part_pkg->pkg_
comment %>
<% ntable("#cccccc", 2) %>
% if ($method eq 'expire' || $method eq 'adjourn') {
<% ntable("#cccccc", 2) %>
% if ($method eq 'expire' || $method eq 'adjourn') {
@@
-31,7
+31,7
@@
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "expire_date",
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "expire_date",
- ifFormat: "
%m/%d/%Y
",
+ ifFormat: "
<% $date_format %>
",
button: "expire_button",
align: "BR"
});
button: "expire_button",
align: "BR"
});
@@
-43,14
+43,14
@@
'field' => 'reasonnum',
'reason_class' => $class,
'curr_value' => $reasonnum,
'field' => 'reasonnum',
'reason_class' => $class,
'curr_value' => $reasonnum,
- 'control_button' =>
'document.sc_popup.submit'
,
+ 'control_button' =>
"document.getElementById('confirm_cancel_pkg_button')"
,
)
%>
</TABLE>
<BR>
)
%>
</TABLE>
<BR>
-<INPUT TYPE="submit" NAME="submit"
VALUE="<% $submit %>" disabled='true'
>
+<INPUT TYPE="submit" NAME="submit"
ID="confirm_cancel_pkg_button" VALUE="<% $submit %>" DISABLED
>
</FORM>
</BODY>
</FORM>
</BODY>
@@
-58,7
+58,10
@@
<%init>
<%init>
-my $date = time2str("%m/%d/%Y", time);
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $date = time2str($date_format, time);
my($pkgnum, $reasonnum);
if ( $cgi->param('error') ) {
my($pkgnum, $reasonnum);
if ( $cgi->param('error') ) {