projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34a368e
)
repeatability cleanup, #37340
author
Mark Wells
<mark@freeside.biz>
Mon, 31 Aug 2015 20:32:38 +0000
(13:32 -0700)
committer
Mark Wells
<mark@freeside.biz>
Mon, 31 Aug 2015 21:20:02 +0000
(14:20 -0700)
FS/FS/TicketSystem/RT_External.pm
patch
|
blob
|
history
FS/FS/UI/Web.pm
patch
|
blob
|
history
FS/FS/part_pkg/prorate_calendar.pm
patch
|
blob
|
history
httemplate/browse/part_pkg.cgi
patch
|
blob
|
history
httemplate/browse/part_svc.cgi
patch
|
blob
|
history
httemplate/edit/part_pkg.cgi
patch
|
blob
|
history
httemplate/elements/email-link.html
patch
|
blob
|
history
httemplate/elements/form-create_ticket.html
patch
|
blob
|
history
httemplate/search/cust_bill.html
patch
|
blob
|
history
diff --git
a/FS/FS/TicketSystem/RT_External.pm
b/FS/FS/TicketSystem/RT_External.pm
index
9f07732
..
b5414b9
100644
(file)
--- a/
FS/FS/TicketSystem/RT_External.pm
+++ b/
FS/FS/TicketSystem/RT_External.pm
@@
-315,22
+315,22
@@
sub href_params_new_ticket {
my $subtype = $object->table;
my $pkey = $object->get($object->primary_key);
my $subtype = $object->table;
my $pkey = $object->get($object->primary_key);
- my
%
param = (
+ my
@
param = (
'Queue' => ($cust_main->agent->ticketing_queueid || $default_queueid),
'new-MemberOf'=> "freeside://freeside/$subtype/$pkey",
'Requestors' => $requestors,
);
'Queue' => ($cust_main->agent->ticketing_queueid || $default_queueid),
'new-MemberOf'=> "freeside://freeside/$subtype/$pkey",
'Requestors' => $requestors,
);
- ( $self->baseurl.'Ticket/Create.html',
%
param );
+ ( $self->baseurl.'Ticket/Create.html',
@
param );
}
sub href_new_ticket {
my $self = shift;
}
sub href_new_ticket {
my $self = shift;
- my( $base,
%
param ) = $self->href_params_new_ticket(@_);
+ my( $base,
@
param ) = $self->href_params_new_ticket(@_);
my $uri = new URI $base;
my $uri = new URI $base;
- $uri->query_form(
%
param);
+ $uri->query_form(
@
param);
$uri;
}
$uri;
}
diff --git
a/FS/FS/UI/Web.pm
b/FS/FS/UI/Web.pm
index
13b2e2d
..
0e54aa2
100644
(file)
--- a/
FS/FS/UI/Web.pm
+++ b/
FS/FS/UI/Web.pm
@@
-623,6
+623,7
@@
sub random_id {
if (!defined $NO_RANDOM_IDS) {
my $conf = FS::Conf->new;
$NO_RANDOM_IDS = $conf->exists('no_random_ids') ? 1 : 0;
if (!defined $NO_RANDOM_IDS) {
my $conf = FS::Conf->new;
$NO_RANDOM_IDS = $conf->exists('no_random_ids') ? 1 : 0;
+ warn "TEST MODE--RANDOM ID NUMBERS DISABLED\n" if $NO_RANDOM_IDS;
}
if ( $NO_RANDOM_IDS ) {
if ( $digits > 0 ) {
}
if ( $NO_RANDOM_IDS ) {
if ( $digits > 0 ) {
diff --git
a/FS/FS/part_pkg/prorate_calendar.pm
b/FS/FS/part_pkg/prorate_calendar.pm
index
83a80f5
..
c50cae0
100644
(file)
--- a/
FS/FS/part_pkg/prorate_calendar.pm
+++ b/
FS/FS/part_pkg/prorate_calendar.pm
@@
-36,7
+36,7
@@
use base 'FS::part_pkg::flat';
},
'fieldorder' => [ 'cutoff_day', 'prorate_defer_bill', 'prorate_round_day', 'prorate_verbose' ],
'freq' => 'm',
},
'fieldorder' => [ 'cutoff_day', 'prorate_defer_bill', 'prorate_round_day', 'prorate_verbose' ],
'freq' => 'm',
- 'weight' => 2
0
,
+ 'weight' => 2
3
,
);
my %freq_max_days = ( # the length of the shortest period of each cycle type
);
my %freq_max_days = ( # the length of the shortest period of each cycle type
diff --git
a/httemplate/browse/part_pkg.cgi
b/httemplate/browse/part_pkg.cgi
index
c2f1430
..
07f104e
100755
(executable)
--- a/
httemplate/browse/part_pkg.cgi
+++ b/
httemplate/browse/part_pkg.cgi
@@
-591,6
+591,7
@@
push @fields,
},
];
}
},
];
}
+ sort
grep { $options{$_} =~ /\S/ }
grep { $_ !~ /^(setup|recur)_fee$/
and $_ !~ /^report_option_\d+$/ }
grep { $options{$_} =~ /\S/ }
grep { $_ !~ /^(setup|recur)_fee$/
and $_ !~ /^report_option_\d+$/ }
diff --git
a/httemplate/browse/part_svc.cgi
b/httemplate/browse/part_svc.cgi
index
ec5f321
..
88f8d8d
100755
(executable)
--- a/
httemplate/browse/part_svc.cgi
+++ b/
httemplate/browse/part_svc.cgi
@@
-161,7
+161,7
@@
function part_export_areyousure(href) {
% }
%
% my($n1)='';
% }
%
% my($n1)='';
-% foreach my $field ( @fields ) {
+% foreach my $field (
sort
@fields ) {
%
% #a few lines of false laziness w/edit/part_svc.cgi
% my $def = FS::part_svc->svc_table_fields($svcdb)->{$field};
%
% #a few lines of false laziness w/edit/part_svc.cgi
% my $def = FS::part_svc->svc_table_fields($svcdb)->{$field};
diff --git
a/httemplate/edit/part_pkg.cgi
b/httemplate/edit/part_pkg.cgi
index
9f5510d
..
570c5ac
100755
(executable)
--- a/
httemplate/edit/part_pkg.cgi
+++ b/
httemplate/edit/part_pkg.cgi
@@
-989,9
+989,13
@@
my $html_bottom = sub {
#$html .= '</SELECT></TD></TR>';
my $href = $plans{$layer}->{'fields'};
#$html .= '</SELECT></TD></TR>';
my $href = $plans{$layer}->{'fields'};
- my @fields = exists($plans{$layer}->{'fieldorder'})
- ? @{$plans{$layer}->{'fieldorder'}}
- : keys %{ $href };
+ my @fields;
+ if ( $plans{$layer}->{'fieldorder'} ) {
+ @fields = @{ $plans{$layer}->{'fieldorder'} };
+ } else {
+ warn "FS::part_pkg::$layer has no fieldorder.\n";
+ @fields = keys %$href;
+ }
# hash of dependencies for each of the Pricing Plan fields.
# make sure NOT to use double-quotes inside the 'msg' value.
# hash of dependencies for each of the Pricing Plan fields.
# make sure NOT to use double-quotes inside the 'msg' value.
@@
-1015,7
+1019,7
@@
my $html_bottom = sub {
}
}
};
}
}
};
-
+
foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
if(!exists($href->{$field})) {
foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
if(!exists($href->{$field})) {
@@
-1029,7
+1033,8
@@
my $html_bottom = sub {
next if !$display;
}
next if !$display;
}
- $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
+ $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>
+ ';
my $format = sub { shift };
$format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
my $format = sub { shift };
$format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
@@
-1128,9
+1133,11
@@
my $html_bottom = sub {
$html .= '</TD></TR>';
}
$html .= '</TABLE>';
$html .= '</TD></TR>';
}
$html .= '</TABLE>';
-
- $html .= qq(<INPUT TYPE="hidden" NAME="${layer}__OPTIONS" VALUE=").
- join(',', keys %{ $href } ). '">';
+
+ $html .= include('/elements/hidden.html',
+ field => $layer.'__OPTIONS',
+ value => join(',', @fields)
+ );
$html;
$html;
diff --git
a/httemplate/elements/email-link.html
b/httemplate/elements/email-link.html
index
2612faa
..
16935cf
100644
(file)
--- a/
httemplate/elements/email-link.html
+++ b/
httemplate/elements/email-link.html
@@
-10,7
+10,8
@@
die "'table' required" if !$table;
die "'search_hash' required" if !$search_hash;
my $uri = new URI;
die "'search_hash' required" if !$search_hash;
my $uri = new URI;
-$uri->query_form($search_hash);
+my @params = map { $_, $search_hash->{$_} } sort keys %$search_hash;
+$uri->query_form(@params);
my $query = $uri->query;
my $label = ($opt{'label'} || 'Email a notice to these customers');
</%init>
my $query = $uri->query;
my $label = ($opt{'label'} || 'Email a notice to these customers');
</%init>
diff --git
a/httemplate/elements/form-create_ticket.html
b/httemplate/elements/form-create_ticket.html
index
362e823
..
d76c0d8
100644
(file)
--- a/
httemplate/elements/form-create_ticket.html
+++ b/
httemplate/elements/form-create_ticket.html
@@
-6,7
+6,7
@@
function updateTicketLink() {
link.href = "<% $new_base.'?'.
join(';', map(
{ ($_ eq 'Queue') ? () : "$_=$new_param{$_}"}
link.href = "<% $new_base.'?'.
join(';', map(
{ ($_ eq 'Queue') ? () : "$_=$new_param{$_}"}
- keys %new_param),'Queue=') %>" + selector.options[selector.selectedIndex].value;
+
sort
keys %new_param),'Queue=') %>" + selector.options[selector.selectedIndex].value;
}
</SCRIPT>
<A NAME="tickets"><FONT CLASS="fsinnerbox-title">Tickets</FONT></A>
}
</SCRIPT>
<A NAME="tickets"><FONT CLASS="fsinnerbox-title">Tickets</FONT></A>
diff --git
a/httemplate/search/cust_bill.html
b/httemplate/search/cust_bill.html
index
017e829
..
6e3617b
100755
(executable)
--- a/
httemplate/search/cust_bill.html
+++ b/
httemplate/search/cust_bill.html
@@
-196,7
+196,7
@@
my $html_init = join("\n", map {
( my $action = $_ ) =~ s/_$//;
include('/elements/progress-init.html',
$_.'form',
( my $action = $_ ) =~ s/_$//;
include('/elements/progress-init.html',
$_.'form',
- [ keys %search ],
+ [
sort
keys %search ],
"../misc/${_}invoices.cgi",
{ 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
$_, #key
"../misc/${_}invoices.cgi",
{ 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
$_, #key
@@
-206,7
+206,7
@@
my $html_init = join("\n", map {
my @values = ref($search{$f}) ? @{ $search{$f} } : $search{$f};
map qq!<INPUT TYPE="hidden" NAME="$f" VALUE="$_">!, @values;
}
my @values = ref($search{$f}) ? @{ $search{$f} } : $search{$f};
map qq!<INPUT TYPE="hidden" NAME="$f" VALUE="$_">!, @values;
}
- keys %search
+
sort
keys %search
),
qq!</FORM>!
} qw( print_ email_ fax_ ftp_ spool_ ) ).
),
qq!</FORM>!
} qw( print_ email_ fax_ ftp_ spool_ ) ).