diff --git a/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm b/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm index 7c8f32704a..7db7d51467 100644 --- a/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm +++ b/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm @@ -62,14 +62,19 @@ sub validate { ); my $sdate = $parser->parse_datetime($start->value); + my ($sdt_err, $edt_err) = (0,0); unless($sdate) { $start->add_error("Invalid date format, must be YYYY-MM-DD hh:mm:ss"); + $sdt_err = 1; } my $edate = $parser->parse_datetime($end->value); unless($edate) { $end->add_error("Invalid date format, must be YYYY-MM-DD hh:mm:ss"); + $edt_err = 1; } + return if $sdt_err || $edt_err; + unless(DateTime->compare($sdate, $edate) == -1) { my $err_msg = 'End time must be later than start time'; $start->add_error($err_msg);