Lines 72-77
sub filter_by_lates {
Link Here
|
72 |
my @estimated_delivery_time_conditions; |
72 |
my @estimated_delivery_time_conditions; |
73 |
if ( defined $estimated_from or defined $estimated_to ) { |
73 |
if ( defined $estimated_from or defined $estimated_to ) { |
74 |
push @delivery_time_conditions, \[ "$date_add IS NOT NULL" ]; |
74 |
push @delivery_time_conditions, \[ "$date_add IS NOT NULL" ]; |
|
|
75 |
push @delivery_time_conditions, \[ "estimated_delivery_date IS NULL" ]; |
75 |
push @estimated_delivery_time_conditions, \[ "estimated_delivery_date IS NOT NULL" ]; |
76 |
push @estimated_delivery_time_conditions, \[ "estimated_delivery_date IS NOT NULL" ]; |
76 |
} |
77 |
} |
77 |
if ( defined $estimated_from ) { |
78 |
if ( defined $estimated_from ) { |
Lines 118-125
sub filter_by_lates {
Link Here
|
118 |
( ( @delivery_time_conditions and @estimated_delivery_time_conditions ) ? |
119 |
( ( @delivery_time_conditions and @estimated_delivery_time_conditions ) ? |
119 |
( -or => |
120 |
( -or => |
120 |
[ |
121 |
[ |
121 |
-and => \@delivery_time_conditions, |
122 |
-and => \@estimated_delivery_time_conditions, |
122 |
-and => \@estimated_delivery_time_conditions |
123 |
-and => \@delivery_time_conditions |
123 |
] |
124 |
] |
124 |
) |
125 |
) |
125 |
: () |
126 |
: () |
126 |
- |
|
|