diff --git a/config/routes/static.yaml b/config/routes/static.yaml
new file mode 100644
index 00000000..afe18b39
--- /dev/null
+++ b/config/routes/static.yaml
@@ -0,0 +1,2 @@
+static_battery_image:
+    path: /battery
diff --git a/public/battery/enduro_mobile.jpg b/public/battery/enduro_mobile.jpg
new file mode 100644
index 00000000..06137302
Binary files /dev/null and b/public/battery/enduro_mobile.jpg differ
diff --git a/public/battery/excel_mobile.jpg b/public/battery/excel_mobile.jpg
new file mode 100644
index 00000000..89048661
Binary files /dev/null and b/public/battery/excel_mobile.jpg differ
diff --git a/public/battery/gold_mobile.jpg b/public/battery/gold_mobile.jpg
new file mode 100644
index 00000000..cdcb2e82
Binary files /dev/null and b/public/battery/gold_mobile.jpg differ
diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 1bf511fd..af2bc547 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -642,6 +642,9 @@ class APIController extends Controller
         $batts = $vehicle->getBatteries();
         foreach ($batts as $batt)
         {
+            // TODO: workaround for now, we get static image of battery based on model name
+            $filename = trim(strtolower($batt->getModel()->getName())) . '_mobile.jpg';
+            $file_path = $req->getSchemeAndHttpHost() . $this->generateUrl('static_battery_image') . '/' . $filename;
             $batt_list[] = [
                 'id' => $batt->getID(),
                 'mfg_id' => $batt->getManufacturer()->getID(),
@@ -653,6 +656,7 @@ class APIController extends Controller
                 'price' => $batt->getSellingPrice(),
                 'wty_private' => $batt->getWarrantyPrivate(),
                 'wty_commercial' => $batt->getWarrantyCommercial(),
+                'image_url' => $file_path,
             ];
         }
 
@@ -1253,6 +1257,20 @@ class APIController extends Controller
                 'status' => $status,
             ];
 
+            // customer vehicle
+            $cv = $jo->getCustomerVehicle();
+            $jo_data['customer_vehicle'] = [
+                'id' => $cv->getID(),
+                'plate_number' => $cv->getPlateNumber(),
+            ];
+
+            // rider
+            $rider = $jo->getRider();
+            if ($rider != null)
+            {
+                $jo_data['rider'] = $rider->getFullName();
+            }
+
             // invoice items
             $items = [];
             $jo_items = $jo->getInvoice()->getItems();
@@ -1276,7 +1294,7 @@ class APIController extends Controller
                     $jo_data['date_fulfilled'] = $jo->getDateFulfilled()->format('M d, Y');
                     break;
                 case JOStatus::CANCELLED:
-                    $jo_data['date_cancelled'] = $jo->getDateCancelled()->format('M d, Y');
+                    $jo_data['date_cancelled'] = $jo->getDateCancel()->format('M d, Y');
                     break;
             }