diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php
index 38000a48..9bcba369 100644
--- a/src/Controller/WarrantyController.php
+++ b/src/Controller/WarrantyController.php
@@ -170,6 +170,9 @@ class WarrantyController extends Controller
         else
             $obj->setSerial($req->request->get('serial'));
 
+        // get outlet info, sender info
+        $req->request->get('outlet_name', '');
+
         // set and save values
         $obj->setWarrantyClass($req->request->get('warranty_class'))
             ->setFirstName($req->request->get('first_name'))
@@ -178,7 +181,12 @@ class WarrantyController extends Controller
             ->setDatePurchase($date_purchase)
             ->setClaimedFrom($req->request->get('claim_from'))
             ->setStatus($req->request->get('status'))
-            ->setCreateSource(WarrantySource::ADMIN_PANEL);
+            ->setCreateSource(WarrantySource::ADMIN_PANEL)
+            ->setOutletName($req->request->get('outlet_name', ''))
+            ->setOutletContactNumber($req->request->get('outlet_contact_number', ''))
+            ->setSenderName($req->request->get('sender_name', ''))
+            ->setSenderContactNumber($req->request->get('sender_contact_number', ''))
+            ->setOutletAddress($req->request->get('outlet_address', ''));
 
         if ($date_claim)
         {
@@ -280,6 +288,11 @@ class WarrantyController extends Controller
                 'battery_size' => $req->request->get('battery_size'),
                 'sap_battery' => $req->request->get('sap_battery'),
                 'plate_number' => $req->request->get('plate_number'),
+                'outlet_name' => $req->request->get('outlet_name', ''),
+                'outlet_contact_number' => $req->request->get('outlet_contact_number', ''),
+                'sender_name' => $req->request->get('sender_name', ''),
+                'sender_contact_number' => $req->request->get('sender_contact_number', ''),
+                'outlet_address' => $req->request->get('outlet_address', ''),
             ];
             $logger->logWarrantyInfo($log_data, '', $user_id, $action, $source);
 
@@ -345,7 +358,12 @@ class WarrantyController extends Controller
             ->setMobileNumber($req->request->get('mobile_number'))
             ->setDatePurchase($date_purchase)
             ->setClaimedFrom($req->request->get('claim_from'))
-            ->setStatus($req->request->get('status'));
+            ->setStatus($req->request->get('status'))
+            ->setOutletName($req->request->get('outlet_name', ''))
+            ->setOutletContactNumber($req->request->get('outlet_contact_number', ''))
+            ->setSenderName($req->request->get('sender_name', ''))
+            ->setSenderContactNumber($req->request->get('sender_contact_number', ''))
+            ->setOutletAddress($req->request->get('outlet_address', ''));
 
         if ($date_claim)
         {
diff --git a/src/Entity/Warranty.php b/src/Entity/Warranty.php
index 9a35b421..018173cf 100644
--- a/src/Entity/Warranty.php
+++ b/src/Entity/Warranty.php
@@ -245,6 +245,36 @@ class Warranty
      */
     protected $dealer_branch_code;
 
+    // for non-motiv warranties created via admin panel
+    /**
+     * @ORM\Column(type="string", length=80, options={"default": ""})
+     */
+    protected $outlet_name;
+
+    // for non-motiv warranties created via admin panel
+    /**
+     * @ORM\Column(type="string", length=30, options={"default": ""})
+     */
+    protected $outlet_contact_num;
+
+    // for non-motiv warranties created via admin panel
+    /**
+     * @ORM\Column(type="string", length=80, options={"default": ""})
+     */
+    protected $sender_name;
+
+    // for non-motiv warranties created via admin panel
+    /**
+     * @ORM\Column(type="string", length=30, options={"default": ""})
+     */
+    protected $sender_contact_num;
+
+    // for non-motiv warranties created via admin panel
+    /**
+     * @ORM\Column(type="string", length=180, options={"default": ""})
+     */
+    protected $outlet_address;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -256,6 +286,12 @@ class Warranty
         $this->odometer = 0;
         $this->flag_validated = false;
         $this->create_source = 'unknown';
+
+        $this->outlet_name = '';
+        $this->outlet_contact_num = '';
+        $this->sender_name = '';
+        $this->sender_contact_num = '';
+        $this->outlet_address = '';
     }
 
     public function getID()
@@ -694,4 +730,59 @@ class Warranty
     {
         return $this->dealer_branch_code;
     }
+
+    public function setOutletName($outlet_name)
+    {
+        $this->outlet_name = $outlet_name;
+        return $this;
+    }
+
+    public function getOutletName()
+    {
+        return $this->outlet_name;
+    }
+
+    public function setOutletContactNumber($outlet_contact_num)
+    {
+        $this->outlet_contact_num = $outlet_contact_num;
+        return $this;
+    }
+
+    public function getOutletContactNumber()
+    {
+        return $this->outlet_contact_num;
+    }
+
+    public function setSenderName($sender_name)
+    {
+        $this->sender_name = $sender_name;
+        return $this;
+    }
+
+    public function getSenderName()
+    {
+        return $this->sender_name;
+    }
+
+    public function setSenderContactNumber($sender_contact_num)
+    {
+        $this->sender_contact_num = $sender_contact_num;
+        return $this;
+    }
+
+    public function getSenderContactNumber()
+    {
+        return $this->sender_contact_num;
+    }
+
+    public function setOutletAddress($outlet_address)
+    {
+        $this->outlet_address = $outlet_address;
+        return $this;
+    }
+
+    public function getOutletAddress()
+    {
+        return $this->outlet_address;
+    }
 }
diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig
index a1210ca9..33a0d795 100644
--- a/templates/warranty/form.html.twig
+++ b/templates/warranty/form.html.twig
@@ -182,6 +182,51 @@
                                         <div class="form-control-feedback hide" data-field="status"></div>
                                     </div>
                                 </div>
+                                <div class="form-group m-form__group row">
+                                    <div class="col-lg-4">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="sender_name">
+                                                Sender Name
+                                            </label>
+                                            <input type="text" name="sender_name" class="form-control m-input" value="{{ obj.getSenderName }}" data-name="sender_name">
+                                            <div class="form-control-feedback hide" data-field="sender_name"></div>
+                                        </div>
+                                        <br>
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="sender_contact_number">
+                                                Sender Contact Number
+                                            </label>
+                                            <input type="text" name="sender_contact_number" class="form-control m-input" value="{{ obj.getSenderContactNumber }}" data-name="sender_contact_number">
+                                            <div class="form-control-feedback hide" data-field="sender_contact_number"></div> 
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-4">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="outlet_name">
+                                                Outlet Name
+                                            </label>
+                                            <input type="text" name="outlet_name" class="form-control m-input" value="{{ obj.getOutletName }}" data-name="outlet_name">
+                                            <div class="form-control-feedback hide" data-field="outlet_name"></div>
+                                        </div>
+                                        <br>
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="outlet_contact_number">
+                                                Outlet Contact Number
+                                            </label>
+                                            <input type="text" name="outlet_contact_number" class="form-control m-input" value="{{ obj.getOutletContactNumber }}" data-name="outlet_contact_number">
+                                            <div class="form-control-feedback hide" data-field="outlet_contact_number"></div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-4">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="outlet_address">
+                                                Outlet Address
+                                            </label>
+                                            <textarea name="outlet_address" class="form-control m-input" data-name="outlet_address" rows="6">{{ obj.getOutletAddress }}</textarea>
+                                            <div class="form-control-feedback hide" data-field="outlet_address"></div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <div class="m-portlet__foot m-portlet__foot--fit">