diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index c45bd787..43e21a0e 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -1456,6 +1456,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $params['mode'] = 'onestep';
         $params['jo_service_charges'] = [];
         $params['discounts'] = $this->generateDiscountOptions();
+        $params['current_date'] = new DateTime();
 
         $this->fillDropdownParameters($params);
         $this->fillFormTags($params);
@@ -2524,6 +2525,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $params['obj'] = $new_jo;
         $params['mode'] = 'walk-in';
         $params['discounts'] = $this->generateDiscountOptions(); 
+        $params['current_date'] = new DateTime();
 
         $this->fillDropdownParameters($params);
         $this->fillFormTags($params);
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 83e866c5..35846621 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -1174,33 +1174,12 @@ $(function() {
     {% endif %}
 
 	$("#row-form").submit(function(e) {
+        e.preventDefault();
         if (form_in_process) {
             alert("Cannot submit form twice. First submission still in progress.");
             return false;
         }
 
-        // check date schedule if it's earlier
-        // if so, show an alert to let user know
-        var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
-        var date_schedule = new Date(date_time);
-        var current_date = new Date();
-
-        if (date_schedule < current_date)
-        {
-            //swal({
-            //    title: 'Warning!',
-            //    text: 'Schedule date and time is after today\'s date and time. Continue submission?',
-            //    type: 'warning',
-            //    showCancelButton: true,
-            //}).then(function(isConfirm) {
-            //    if (isConfirm) {
-            //        return true;
-            //    } else {
-            //        return false;
-            //    }
-            //});
-        }
-
         form_in_process = true;
 
 		var form = $(this);
@@ -1933,6 +1912,47 @@ $(function() {
         $("#or_name").val(cust_name);
     });
 
+    $('.dp').on('changeDate', function() {
+        // check date schedule if it's earlier
+        // if so, show an alert to let user know
+        var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
+        var date_schedule = new Date(date_time);
+        var current_date = new Date('{{ current_date|date('Y-m-d g:i A') }}');
+
+        // check if date is earlier than current
+        if (date_schedule < current_date)
+        {
+            swal({
+                title: 'Warning!',
+                text: 'Schedule date and time is before today\'s date and time.',
+                type: 'warning',
+            });
+        }
+    });
+
+    $('.tp').on('changeTime.timepicker', function(e) {
+        // set the schedule time what the user selects
+        $('#date-schedule-time').val(e.time.value);
+    });
+
+    $('.tp').on('hide.timepicker', function(e) {
+        // check time schedule along with date if it's earlier than current date
+        var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
+        var date_schedule = new Date(date_time);
+        var current_date = new Date('{{ current_date|date('Y-m-d g:i A') }}');
+
+        // check if date is earlier than current
+        if (date_schedule < current_date)
+        {
+            swal({
+                title: 'Warning!',
+                text: 'Schedule date and time is before today\'s date and time.',
+                type: 'warning',
+            });
+        }
+
+    });
+
 });
 </script>
 {% endblock %}
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index 63fe6b82..9c34a357 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -278,7 +278,7 @@
                                     <div class="col-lg-3">
                                         <label data-field="date_schedule">Scheduled Date</label>
                                         <div class="input-group date dp">
-                                            <input type="text" name="date_schedule_date" class="form-control m-input" data-default-value="{{ obj.getDateSchedule|default("now")|date('Y-m-d') }}" value="{{ obj.getDateSchedule|default("now")|date('d M Y') }}" readonly placeholder="Select a date" disabled>
+                                            <input type="text" id="date-schedule-date" name="date_schedule_date" class="form-control m-input" data-default-value="{{ obj.getDateSchedule|default("now")|date('Y-m-d') }}" value="{{ obj.getDateSchedule|default("now")|date('d M Y') }}" readonly placeholder="Select a date" disabled>
                                             <span class="input-group-addon">
                                                 <i class="la la-calendar glyphicon-th"></i>
                                             </span>
@@ -288,7 +288,7 @@
                                     <div class="col-lg-3">
                                         <label data-field="date_schedule">Scheduled Time</label>
                                         <div class="input-group">
-                                            <input type="text" name="date_schedule_time" class="form-control m-input tp" data-default-value="{{ obj.getDateSchedule|default("now")|date('g:i A') }}" value="{{ obj.getDateSchedule|default("now")|date('g:i A') }}" readonly placeholder="Select a time" disabled>
+                                            <input type="text" id="date-schedule-time" name="date_schedule_time" class="form-control m-input tp" data-default-value="{{ obj.getDateSchedule|default("now")|date('g:i A') }}" value="{{ obj.getDateSchedule|default("now")|date('g:i A') }}" readonly placeholder="Select a time" disabled>
                                             <span class="input-group-addon">
                                                 <i class="la la-clock-o glyphicon-th"></i>
                                             </span>
@@ -1113,6 +1113,48 @@ var vdata = false;
         var cust_name = $("#customer-first-name").val() + ' ' + $("#customer-last-name").val();
         $("#or_name").val(cust_name);
     });
+
+    $('.dp').on('changeDate', function() {
+        // check date schedule if it's earlier
+        // if so, show an alert to let user know
+        var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
+        var date_schedule = new Date(date_time);
+        var current_date = new Date('{{ current_date|date('Y-m-d g:i A') }}');
+
+        // check if date is earlier than current
+        if (date_schedule < current_date)
+        {
+            swal({
+                title: 'Warning!',
+                text: 'Schedule date and time is before today\'s date and time.',
+                type: 'warning',
+            });
+        }
+    });
+
+    $('.tp').on('changeTime.timepicker', function(e) {
+        // set the schedule time what the user selects
+        $('#date-schedule-time').val(e.time.value);
+    });
+
+    $('.tp').on('hide.timepicker', function(e) {
+        // check time schedule along with date if it's earlier than current date
+        var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
+        var date_schedule = new Date(date_time);
+        var current_date = new Date('{{ current_date|date('Y-m-d g:i A') }}');
+
+        // check if date is earlier than current
+        if (date_schedule < current_date)
+        {
+            swal({
+                title: 'Warning!',
+                text: 'Schedule date and time is before today\'s date and time.',
+                type: 'warning',
+            });
+        }
+
+    });
+
 });
 </script>
 {% endblock %}