diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 0e0e6d8e..d38b35bc 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -13,6 +13,7 @@ use App\Ramcar\InvoiceStatus;
 use App\Ramcar\ModeOfPayment;
 use App\Ramcar\TransactionOrigin;
 use App\Ramcar\JOEventType;
+use App\Ramcar\FacilitatedType;
 
 use App\Entity\JobOrder;
 use App\Entity\BatteryManufacturer;
@@ -137,6 +138,14 @@ class JobOrderController extends BaseController
         // $params['customers'] = $em->getRepository(Customer::class)->findAll();
         $params['promos'] = $em->getRepository(Promo::class)->findAll();
 
+        // list of hubs
+        $hubs = $em->getRepository(Hub::class)->findBy([], ['name' => 'ASC']);
+        $fac_hubs = [];
+        foreach ($hubs as $hub)
+        {
+            $fac_hubs[$hub->getID()] = $hub->getName() . ' - ' . $hub->getBranch();
+        }
+
         // name values
         $params['service_types'] = ServiceType::getCollection();
         $params['warranty_classes'] = WarrantyClass::getCollection();
@@ -144,6 +153,8 @@ class JobOrderController extends BaseController
         $params['statuses'] = JOStatus::getCollection();
         $params['discount_apply'] = DiscountApply::getCollection();
         $params['trade_in_types'] = TradeInType::getCollection();
+        $params['facilitated_types'] = FacilitatedType::getCollection();
+        $params['facilitated_hubs'] = $fac_hubs;
         $params['sources'] = TransactionOrigin::getCollection();
     }
 
diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index 412473c8..c0c07115 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -249,6 +249,19 @@ class JobOrder
      */
     protected $flag_coolant;
 
+    // facilitated by hub, non-hub, annex
+    /**
+     * @ORM\Column(type="string", length=8, nullable=true)
+     */
+    protected $facilitated_type;
+
+    // the location that facilitated the job order
+    /**
+     * @ORM\ManyToOne(targetEntity="Hub", inversedBy="job_orders")
+     * @ORM\JoinColumn(name="facilitated_hub_id", referencedColumnName="id", nullable=true)
+     */
+    protected $facilitated_by;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
diff --git a/src/Ramcar/FacilitatedType.php b/src/Ramcar/FacilitatedType.php
new file mode 100644
index 00000000..6735d460
--- /dev/null
+++ b/src/Ramcar/FacilitatedType.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Ramcar;
+
+class FacilitatedType extends NameValue
+{
+    const HUB       = 'hub';
+    const NON_HUB   = 'non-hub';
+    const ANNEX     = 'annex';
+
+    const COLLECTION = [
+        'hub' => 'Hub',
+        'non-hub' => 'Non-Hub',
+        'annex' => 'Annex',
+    ];
+}
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index f566ab00..1cc759ef 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -517,6 +517,29 @@
 							{% if mode in ['update-processing', 'update-reassign-hub'] %}
 								<div class="m-form__seperator m-form__seperator--dashed"></div>
 								<div class="m-form__section">
+                                    <div class="form-group m-form__group row">
+                                        <div class="col-lg-2">
+                                            <label for="faciliateted-type">Facilitated By</label>
+                                            <select class="form-control m-input" id="facilitated-type">
+                                                <option value="">None</option>
+                                                {% for key, type in facilitated_types %}
+                                                    <option value="{{ key }}">{{ type }}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                        <div class="col-lg-8">
+                                            <label for="faciliateted-by">&nbsp;</label>
+                                            <select class="form-control m-input" id="facilitated-by">
+                                                <option value="">None</option>
+                                                {% for key, name in facilitated_hubs %}
+                                                    <option value="{{ key }}">{{ name }}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+								<div class="m-form__seperator m-form__seperator--dashed"></div>
+								<div class="m-form__section">
 									<div class="m-form__heading">
 										<h3 class="m-form__heading-title">
 											Nearest Hubs
diff --git a/templates/job-order/form.pdf.html.twig b/templates/job-order/form.pdf.html.twig
index d301def1..9944a44c 100644
--- a/templates/job-order/form.pdf.html.twig
+++ b/templates/job-order/form.pdf.html.twig
@@ -401,6 +401,17 @@
 							{% if mode in ['update-processing', 'update-reassign-hub'] %}
 								<div class="m-form__seperator m-form__seperator--dashed"></div>
 								<div class="m-form__section">
+                                    <div class="form-group m-form__group row">
+                                        <div class="col-lg-2">
+                                            <label for="faciliateted-type"></label>
+											<select class="form-control m-input" id="facilitated-type">
+												<option value="">None</option>
+												{% for key, type in facilitated_types %}
+													<option value="{{ key }}">{{ type }}</option>
+												{% endfor %}
+											</select>
+                                        </div>
+                                    </div>
 									<div class="m-form__heading">
 										<h3 class="m-form__heading-title">
 											Nearest Hubs