diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 585c6135..0a25ee89 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -834,10 +834,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
                 $mobile_number = $obj->getCustomer()->getPhoneMobile();
 
                 // check if date fulfilled is null
-                if ($obj->getDateFulfill() ==  null)
-                    $date_purchase = $obj->getDateCreate();
-                else
-                    $date_purchase = $obj->getDateFulfill();
+                //if ($obj->getDateFulfill() ==  null)
+                //    $date_purchase = $obj->getDateCreate();
+                //else
+                //    $date_purchase = $obj->getDateFulfill();
+
+                // use date_schedule for warranty expiration computation
+                $date_purchase = $obj->getDateSchedule();
 
                 // validate plate number
                 // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
diff --git a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
index 3c3ede6c..138b7989 100644
--- a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
@@ -535,10 +535,13 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
             $mobile_number = $jo->getCustomer()->getPhoneMobile();
 
             // check if date fulfilled is null
-            if ($jo->getDateFulfill() ==  null)
-                $date_purchase = $jo->getDateCreate();
-            else
-                $date_purchase = $jo->getDateFulfill();
+            //if ($jo->getDateFulfill() ==  null)
+            //    $date_purchase = $jo->getDateCreate();
+            //else
+            //    $date_purchase = $jo->getDateFulfill();
+
+            // use date_schedule for warranty expiration computation
+            $date_purchase = $jo->getDateSchedule();
 
             $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());