diff --git a/config/services.yaml b/config/services.yaml
index 8fe325e4..0ea9afd4 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -247,3 +247,11 @@ services:
             $redis_prov: "@App\\Service\\RedisClientProvider"
             $loc_key: "%env(LOCATION_RIDER_ACTIVE_KEY)%"
             $status_key: "%env(STATUS_RIDER_KEY)%"
+
+    App\EventListener\JobOrderStatusListener:
+        arguments: 
+            $wh: "@App\\Service\\WarrantyHandler"
+        tags:
+            - name: 'doctrine.orm.entity_listener'
+              event: 'postUpdate'
+              entity: 'App\Entity\JobOrder' 
diff --git a/src/EventListener/JobOrderStatusListener.php b/src/EventListener/JobOrderStatusListener.php
new file mode 100644
index 00000000..6e746fd2
--- /dev/null
+++ b/src/EventListener/JobOrderStatusListener.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\EventListener;
+
+use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
+
+use App\Entity\JobOrder;
+
+use App\Service\WarrantyHandler;
+
+class JobOrderStatusListener
+{
+    public function __construct(WarrantyHandler $wh)
+    {
+        $this->wh = $wh;
+    }
+
+    public function postUpdate(JobOrder $jo, LifecycleEventArgs $args)
+    {
+        $status = $jo->getStatus();
+
+        if ($status == JOStatus::FULFILLED)
+        {
+            error_log('hello!');
+            // create warranty
+            /*
+            if ($this->checkIfNewBattery($jo))
+            {
+                $serial = null;
+                $warranty_class = $jo->getWarrantyClass();
+                $first_name = $jo->getCustomer()->getFirstName();
+                $last_name = $jo->getCustomer()->getLastName();
+                $mobile_number = $jo->getCustomer()->getPhoneMobile();
+
+                // check if date fulfilled is null
+                if ($jo->getDateFulfill() ==  null)
+                    $date_purchase = $jo->getDateCreate();
+                else
+                    $date_purchase = $jo->getDateFulfill();
+
+                // validate plate number
+                // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
+                $plate_number = Warranty::cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
+                if ($plate_number != false)
+                {
+                    $batt_list = array();
+                    $invoice = $jo->getInvoice();
+                    if (!empty($invoice))
+                    {
+                        // get battery
+                        $invoice_items = $invoice->getItems();
+                        foreach ($invoice_items as $item)
+                        {
+                            $battery = $item->getBattery();
+                            if ($battery != null)
+                            {
+                                $batt_list[] = $item->getBattery();
+                            }
+                        }
+                    }
+
+                    $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
+                }
+            } */
+        }
+
+    }
+
+}