X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=b43d7e35ca7cd4da5a0b41033b3cae7af65d66eb;hb=8706262a6d18ef5103fb5972ca6443b73e700e6a;hp=d7d5869b0c3dac27d2a70819f2b1aa68ff41691c;hpb=52bea6aecfcc8274fd852f626a0f751e1b5bd6a8;p=freeside.git diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index d7d5869b0..b43d7e35c 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -392,7 +392,7 @@ sub insert { $payby = 'PREP' if $amount; - } elsif ( $self->payby =~ /^(CASH|WEST|MCRD|PPAL)$/ ) { + } elsif ( $self->payby =~ /^(CASH|WEST|MCRD|MCHK|PPAL)$/ ) { $payby = $1; $self->payby('BILL'); @@ -2346,8 +2346,8 @@ Returns all notes (see L) for this customer. sub notes { my($self,$orderby_classnum) = (shift,shift); - my $orderby = "_DATE DESC"; - $orderby = "CLASSNUM ASC, $orderby" if $orderby_classnum; + my $orderby = "sticky DESC, _date DESC"; + $orderby = "classnum ASC, $orderby" if $orderby_classnum; qsearch( 'cust_main_note', { 'custnum' => $self->custnum }, '', @@ -3459,6 +3459,7 @@ Old-style: =cut +#super false laziness w/quotation::charge sub charge { my $self = shift; my ( $amount, $setup_cost, $quantity, $start_date, $classnum );