diff --git a/config/acl.yaml b/config/acl.yaml
index 7bb0a9b2..5695e217 100644
--- a/config/acl.yaml
+++ b/config/acl.yaml
@@ -289,3 +289,43 @@ access_keys:
           label: Rejection Report
         - id: report.battery.conflict
           label: Battery Conflict Report
+
+    - id: service
+      label: Other Services
+      acls:
+        - id: service.menu
+          label: Menu
+        - id: service.list
+          label: List
+        - id: service.add
+          label: Add
+        - id: service.update
+          label: Update
+        - id: service.delete
+          label: Delete
+
+    - id: partner
+      label: Partners
+      acls:
+        - id: partner.menu
+          label: Menu
+        - id: partner.list
+          label: List
+        - id: partner.add
+          label: Add
+        - id: partner.update
+          label: Update
+        - id: partner.delete
+          label: Delete
+
+    - id: review
+      label: Reviews
+      acls:
+        - id: review.menu
+          label: Menu
+        - id: review.list
+          label: List
+        - id: review.view
+          label: View
+        - id: review.delete
+          label: Delete
diff --git a/config/menu.yaml b/config/menu.yaml
index 1d5b0bcd..d470f680 100644
--- a/config/menu.yaml
+++ b/config/menu.yaml
@@ -143,3 +143,25 @@ main_menu:
       acl: warranty.search
       label: Customer Battery Search
       parent: support
+
+    - id: service
+      acl: service.menu
+      label: Other Services
+      icon: flaticon-squares
+    - id: service_list
+      acl: service.list
+      label: Services
+      parent: service
+
+    - id: partner
+      acl: partner.menu
+      label: Partners
+      icon: flaticon-network
+    - id: partner_list
+      acl: partner.list
+      label: Partners
+      parent: partner
+    - id: review_list
+      acl: review.list
+      label: Reviews
+      parent: partner
diff --git a/config/routes/api.yaml b/config/routes/api.yaml
index 2d3a11bc..5e04aea3 100644
--- a/config/routes/api.yaml
+++ b/config/routes/api.yaml
@@ -129,3 +129,19 @@ api_activate_warranty:
     path: /api/activate_warranty
     controller: App\Controller\APIController:activateWarranty
     methods: [POST]
+
+api_service_list:
+    path: /api/services
+    controller: App\Controller\APIController:listServices
+    methods: [GET]
+
+api_partner_info:
+    path: /api/partner/{pid}
+    controller: App\Controller\APIController:getPartnerInformation
+    methods: [GET]
+
+api_partner:
+    path: /api/partners
+    controller: App\Controller\APIController:getClosestPartners
+    methods: [GET]
+
diff --git a/config/routes/partner.yaml b/config/routes/partner.yaml
new file mode 100644
index 00000000..e1640b9b
--- /dev/null
+++ b/config/routes/partner.yaml
@@ -0,0 +1,33 @@
+partner_list:
+    path: /partners
+    controller: App\Controller\PartnerController::index
+
+partner_rows:
+    path: /partners/rows
+    controller: App\Controller\PartnerController::rows
+    methods: [POST]
+
+partner_create:
+    path: /partners/create
+    controller: App\Controller\PartnerController::addForm
+    methods: [GET]
+
+partner_create_submit:
+    path: /partners/create
+    controller: App\Controller\PartnerController::addSubmit
+    methods: [POST]
+
+partner_update:
+    path: /partners/{id}
+    controller: App\Controller\PartnerController::updateForm
+    methods: [GET]
+
+partner_update_submit:
+    path: /partners/{id}
+    controller: App\Controller\PartnerController::updateSubmit
+    methods: [POST]
+
+partner_delete:
+    path: /partners/{id}
+    controller: App\Controller\PartnerController::destroy
+    methods: [DELETE]
diff --git a/config/routes/review.yaml b/config/routes/review.yaml
new file mode 100644
index 00000000..01024400
--- /dev/null
+++ b/config/routes/review.yaml
@@ -0,0 +1,18 @@
+review_list:
+    path: /reviews
+    controller: App\Controller\ReviewController::index
+
+review_rows:
+    path: /reviews/rows
+    controller: App\Controller\ReviewController::rows
+    methods: [POST]
+
+review_view_form:
+    path: /reviews/{id}/view
+    controller: App\Controller\ReviewController::openViewForm
+    methods: [GET]
+
+review_delete:
+    path: /reviews/{id}
+    controller: App\Controller\ReviewController::destroy
+    methods: [DELETE]
diff --git a/config/routes/service.yaml b/config/routes/service.yaml
new file mode 100644
index 00000000..5118552b
--- /dev/null
+++ b/config/routes/service.yaml
@@ -0,0 +1,33 @@
+service_list:
+    path: /services
+    controller: App\Controller\ServiceController::index
+
+service_rows:
+    path: /services/rows
+    controller: App\Controller\ServiceController::rows
+    methods: [POST]
+
+service_create:
+    path: /services/create
+    controller: App\Controller\ServiceController::addForm
+    methods: [GET]
+
+service_create_submit:
+    path: /services/create
+    controller: App\Controller\ServiceController::addSubmit
+    methods: [POST]
+
+service_update:
+    path: /services/{id}
+    controller: App\Controller\ServiceController::updateForm
+    methods: [GET]
+
+service_update_submit:
+    path: /services/{id}
+    controller: App\Controller\ServiceController::updateSubmit
+    methods: [POST]
+
+service_delete:
+    path: /services/{id}
+    controller: App\Controller\ServiceController::destroy
+    methods: [DELETE]
diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 55a8efa3..49fe68e8 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -38,7 +38,13 @@ use App\Entity\Promo;
 use App\Entity\Battery;
 use App\Entity\RiderRating;
 use App\Entity\JOEvent;
+<<<<<<< HEAD
 use App\Entity\Warranty;
+=======
+use App\Entity\Service;
+use App\Entity\Partner;
+use App\Entity\Review;
+>>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f
 
 use DateTime;
 use Exception;
@@ -1813,14 +1819,21 @@ class APIController extends Controller
         return $res->getReturnResponse();
     }
 
+<<<<<<< HEAD
     public function activateWarranty(Request $req)
     {
         $required_params = ['plate_number'];
+=======
+    public function listServices(Request $req)
+    {
+        $required_params = [];
+>>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f
         $em = $this->getDoctrine()->getManager();
         $res = $this->checkParamsAndKey($req, $em, $required_params);
         if ($res->isError())
             return $res->getReturnResponse();
 
+<<<<<<< HEAD
         $plate_number = $req->request->get('plate_number');
 
         // find warranty using plate number
@@ -1847,10 +1860,51 @@ class APIController extends Controller
         $warranty->setActivated();
 
         $em->flush();
+=======
+        // services
+        $results = $em->getRepository(Service::class)->findAll();
+        if (empty($results))
+        {
+            $res->setError(true)
+                ->setErrorMessage('No services available.');
+            return $res->getReturnResponse();
+        }
+
+        $services = [];
+        foreach ($results as $result)
+        {
+            // get partners
+            $partners = [];
+            $service_partners = $result->getPartners();
+            foreach($service_partners as $sp)
+            {
+                $partners[] = [
+                    'id' => $sp->getID(),
+                    'name' => $sp->getName(),
+                    'branch' => $sp->getBranch(),
+                    'address' => $sp->getAddress(),
+                    'contact_nums' => $sp->getContactNumbers(),
+                    'time_open' => $sp->getTimeOpen()->format("g:i A"),
+                    'time_close' => $sp->getTimeClose()->format("g:i A"),
+                ];
+            }
+
+            $services[] = [
+                'id' => $result->getID(),
+                'name' => $result->getName(),
+                'partners' => $partners,
+            ];
+        }
+
+        $data['services'] = $services;
+
+        $res->setData($data);
+>>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f
 
         return $res->getReturnResponse();
     }
 
+<<<<<<< HEAD
     protected function findWarranty($plate_number) 
     {
         $em = $this->getDoctrine()->getManager();
@@ -1915,5 +1969,109 @@ class APIController extends Controller
         ];
 
         return $warr;
+=======
+    public function getPartnerInformation(Request $req, $pid)
+    {
+        $required_params = [];
+        $em = $this->getDoctrine()->getManager();
+        $res = $this->checkParamsAndKey($req, $em, $required_params);
+        if ($res->isError())
+            return $res->getReturnResponse();
+
+        // get partner
+        $partner = $em->getRepository(Partner::class)->findOneBy(['id' => $pid]);
+        if ($partner == null)
+        {
+            $res->setError(true)
+                ->setErrorMessage('No partner found.');
+            return $res->getReturnResponse();
+        }
+
+        // get reviews for partner
+        $reviews = $em->getRepository(Review::class)->findBy(['partner' => $partner]);
+        $rev = [];
+        if (!empty($reviews))
+        {
+            foreach($reviews as $review)
+            {
+                $rev[] = [
+                    'id' => $review->getID(),
+                    'rating' => $review->getRating(),
+                    'message' => $review->getMessage(),
+                    'date_create' => $review->getDateCreate()->format("d M Y g:i A"),
+                    'mobile_session' => $review->getMobileSession()->getID(),
+                ];
+            }
+        }
+        
+        $data['partner'] = [
+            'id' => $partner->getID(),
+            'name' => $partner->getName(),
+            'branch' => $partner->getBranch(),
+            'address' => $partner->getAddress(),
+            'contact_nums' => $partner->getContactNumbers(),
+            'time_open' => $partner->getTimeOpen()->format("g:i A"),
+            'time_close' => $partner->getTimeClose()->format("g:i A"),
+            'reviews' => $rev,
+        ];
+
+        $res->setData($data);
+
+        return $res->getReturnResponse();
+    }
+
+    public function getClosestPartners(Request $req)
+    {
+        $required_params = [
+            'longitude',
+            'latitude',
+            'service_id',
+            'limit',
+        ];
+        $em = $this->getDoctrine()->getManager();
+        $res = $this->checkParamsAndKey($req, $em, $required_params);
+        if ($res->isError())
+            return $res->getReturnResponse();
+
+        $long = $req->query->get('longitude');
+        $lat = $req->query->get('latitude');
+        $service_id = $req->query->get('service_id');
+        $limit = $req->query->get('limit');
+
+        // get partners within range
+        $query = $em->createQuery('SELECT p, st_distance(p.coordinates, point(:lng, :lat)) as dist FROM App\Entity\Partner p
+                JOIN App\Entity\Service s where s.id = :service_id ORDER BY dist')
+                ->setParameter('lat', $lat)
+                ->setParameter('lng', $long)
+                ->setParameter('service_id', $service_id);
+
+        $query->setMaxResults($limit);
+        $result = $query->getResult();
+
+        $data = [];
+        foreach($result as $row)
+        {
+            $partner = [];
+            $partner[] =  [
+                'id' => $row[0]->getID(),
+                'name' => $row[0]->getName(),
+                'branch' => $row[0]->getBranch(),
+                'address' => $row[0]->getAddress(),
+                'contact_nums' => $row[0]->getContactNumbers(),
+                'time_open' => $row[0]->getTimeOpen()->format("g:i A"),
+                'time_close' => $row[0]->getTimeClose()->format("g:i A"),
+            ]; 
+
+            $data[] = [
+                'partner' => $partner,
+                'db_distance' => $row['dist'],
+            ];
+        }
+
+        $res->setData($data);
+
+        return $res->getReturnResponse();
+
+>>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f
     }
 }
diff --git a/src/Controller/PartnerController.php b/src/Controller/PartnerController.php
new file mode 100644
index 00000000..44439d98
--- /dev/null
+++ b/src/Controller/PartnerController.php
@@ -0,0 +1,314 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\Partner;
+use App\Entity\Service;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use CrEOF\Spatial\PHP\Types\Geometry\Point;
+use DateTime;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+class PartnerController extends Controller
+{
+    /**
+     * @Menu(selected="partner_list")
+     */
+    public function index()
+    {
+        $this->denyAccessUnlessGranted('partner.list', null, 'No access.');
+
+        return $this->render('partner/list.html.twig');
+    }
+
+    public function rows(Request $req)
+    {
+        $this->denyAccessUnlessGranted('partner.list', null, 'No access.');
+
+        // get query builder
+        $qb = $this->getDoctrine()
+                ->getRepository(Partner::class)
+                ->createQueryBuilder('q');
+
+        // get datatable params
+        $datatable = $req->request->get('datatable');
+
+        // count total records
+        $tquery = $qb->select('COUNT(q)');
+        $this->setQueryFilters($datatable, $tquery);
+        $total = $tquery->getQuery()
+            ->getSingleScalarResult();
+
+        // get current page number
+        $page = $datatable['pagination']['page'] ?? 1;
+
+        $perpage = $datatable['pagination']['perpage'];
+        $offset = ($page - 1) * $perpage;
+
+        // add metadata
+        $meta = [
+            'page' => $page,
+            'perpage' => $perpage,
+            'pages' => ceil($total / $perpage),
+            'total' => $total,
+            'sort' => 'asc',
+            'field' => 'id'
+        ];
+
+         // build query
+        $query = $qb->select('q');
+        $this->setQueryFilters($datatable, $query);
+
+        // check if sorting is present, otherwise use default
+        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
+            $order = $datatable['sort']['sort'] ?? 'asc';
+            $query->orderBy('q.' . $datatable['sort']['field'], $order);
+        } else {
+            $query->orderBy('q.id', 'asc');
+        }
+
+        // get rows for this page
+        $obj_rows = $query->setFirstResult($offset)
+            ->setMaxResults($perpage)
+            ->getQuery()
+            ->getResult();
+
+        // process rows
+        $rows = [];
+        foreach ($obj_rows as $orow) {
+            // add row data
+            $row['id'] = $orow->getID();
+            $row['name'] = $orow->getName();
+            $row['branch'] = $orow->getBranch();
+            $row['address'] = $orow->getAddress();
+            $row['contact_nums'] = $orow->getContactNumbers();
+            $row['time_open'] = $orow->getTimeOpen()->format('g:i A');
+            $row['time_close'] = $orow->getTimeClose()->format('g:i A');
+
+            // add row metadata
+            $row['meta'] = [
+                'update_url' => '',
+                'delete_url' => ''
+            ];
+
+            // add crud urls
+            if ($this->isGranted('partner.update'))
+                $row['meta']['update_url'] = $this->generateUrl('partner_update', ['id' => $row['id']]);
+            if ($this->isGranted('partner.delete'))
+                $row['meta']['delete_url'] = $this->generateUrl('partner_delete', ['id' => $row['id']]);
+
+            $rows[] = $row;
+        }
+
+        // response
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
+    }
+
+    /**
+     * @Menu(selected="partner_list")
+     */
+    public function addForm()
+    {
+        $this->denyAccessUnlessGranted('partner.add', null, 'No access.');
+
+        $params = [];
+        $params['obj'] = new Partner();
+        $params['mode'] = 'create';
+
+        $em = $this->getDoctrine()->getManager();
+
+        // get services
+        $params['services'] = $em->getRepository(Service::class)->findAll();
+
+        // response
+        return $this->render('partner/form.html.twig', $params);
+    }
+
+    public function addSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator)
+    {
+        $this->denyAccessUnlessGranted('partner.add', null, 'No access.');
+
+        // create new object
+        $em = $this->getDoctrine()->getManager();
+        $obj = new Partner();
+
+        $this->setObject($obj, $em, $req);
+        
+        // validate
+        $errors = $validator->validate($obj);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->persist($obj);
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @Menu(selected="partner_list")
+     */
+    public function updateForm($id)
+    {
+        $this->denyAccessUnlessGranted('partner.update', null, 'No access.');
+
+        // get row data
+        $em = $this->getDoctrine()->getManager();
+        $obj = $em->getRepository(Partner::class)->find($id);
+
+        // make sure this row exists
+        if (empty($obj))
+            throw $this->createNotFoundException('The item does not exist');
+
+        $params = [];
+        $params['obj'] = $obj;
+        $params['services'] = $em->getRepository(Service::class)->findAll();
+        $params['mode'] = 'update';
+
+        // response
+        return $this->render('partner/form.html.twig', $params);
+    }
+
+    public function updateSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator, $id)
+    {
+        $this->denyAccessUnlessGranted('partner.update', null, 'No access.');
+
+        // get object data
+        $em = $this->getDoctrine()->getManager();
+        $obj = $em->getRepository(Partner::class)->find($id);
+
+        // make sure this object exists
+        if (empty($obj))
+            throw $this->createNotFoundException('The item does not exist');
+
+        $this->setObject($obj, $em, $req);
+
+        // validate
+        $errors = $validator->validate($obj);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    public function destroy($id)
+    {
+        $this->denyAccessUnlessGranted('partner.delete', null, 'No access.');
+
+        // get object data
+        $em = $this->getDoctrine()->getManager();
+        $obj = $em->getRepository(Partner::class)->find($id);
+
+        if (empty($obj))
+            throw $this->createNotFoundException('The item does not exist');
+
+        // delete this object
+        $em->remove($obj);
+        $em->flush();
+
+        // response
+        $response = new Response();
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->send();
+    }
+    
+    protected function setQueryFilters($datatable, QueryBuilder $query)
+    {
+        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
+            $query->where('q.name LIKE :filter')
+                ->orWhere('q.address LIKE :filter')
+                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
+        }
+    }
+
+    protected function setObject(Partner $obj, EntityManager $em, Request $req)
+    {
+        // coordinates
+        $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
+
+        // times
+        $format = 'g:i A';
+        $time_open = DateTime::createFromFormat($format, $req->request->get('time_open'));
+        $time_close = DateTime::createFromFormat($format, $req->request->get('time_close'));
+
+        // set and save values
+        $obj->setName($req->request->get('name'))
+            ->setCreatedBy($this->getUser())
+            ->setBranch($req->request->get('branch'))
+            ->setAddress($req->request->get('address'))
+            ->setContactNumbers($req->request->get('contact_nums'))
+            ->setTimeOpen($time_open)
+            ->setTimeClose($time_close)
+            ->setCoordinates($point)
+            ->clearServices();
+
+        // set services
+         $services = $req->request->get('services');
+
+        if (!empty($services)) 
+        {
+            foreach($services as $service_id)
+            {
+                // check if service exists
+                $service = $em->getRepository(Service::class)->find($service_id);
+
+                if (!empty($service))
+                    $obj->addService($service);
+            }
+        }
+    }
+
+}
diff --git a/src/Controller/ReviewController.php b/src/Controller/ReviewController.php
new file mode 100644
index 00000000..b5acae33
--- /dev/null
+++ b/src/Controller/ReviewController.php
@@ -0,0 +1,168 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\Review;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use DateTime;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+class ReviewController extends Controller
+{
+    /**
+     * @Menu(selected="review_list")
+     */
+    public function index()
+    {
+        $this->denyAccessUnlessGranted('review.list', null, 'No access.');
+
+        return $this->render('review/list.html.twig');
+    }
+
+    public function rows(Request $req)
+    {
+        $this->denyAccessUnlessGranted('review.list', null, 'No access.');
+
+        // get query builder
+        $qb = $this->getDoctrine()
+                ->getRepository(Review::class)
+                ->createQueryBuilder('q');
+
+        // get datatable params
+        $datatable = $req->request->get('datatable');
+
+        // count total records
+        $tquery = $qb->select('COUNT(q)');
+        $this->setQueryFilters($datatable, $tquery);
+        $total = $tquery->getQuery()
+            ->getSingleScalarResult();
+
+        // get current page number
+        $page = $datatable['pagination']['page'] ?? 1;
+
+        $perpage = $datatable['pagination']['perpage'];
+        $offset = ($page - 1) * $perpage;
+
+        // add metadata
+        $meta = [
+            'page' => $page,
+            'perpage' => $perpage,
+            'pages' => ceil($total / $perpage),
+            'total' => $total,
+            'sort' => 'asc',
+            'field' => 'id'
+        ];
+
+        // build query
+        $query = $qb->select('q');
+        $this->setQueryFilters($datatable, $query);
+
+        // check if sorting is present, otherwise use default
+        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
+            $order = $datatable['sort']['sort'] ?? 'asc';
+            $query->orderBy('q.' . $datatable['sort']['field'], $order);
+        } else {
+            $query->orderBy('q.id', 'asc');
+        }
+
+        // get rows for this page
+        $obj_rows = $query->setFirstResult($offset)
+            ->setMaxResults($perpage)
+            ->getQuery()
+            ->getResult();
+
+        // process rows
+        $rows = [];
+        foreach ($obj_rows as $orow)
+        {
+            // add row data
+            $row['id'] = $orow->getID();
+            $row['partner'] = $orow->getPartner()->getName();
+            $row['rating'] = $orow->getRating();
+            $row['message'] = $orow->getMessage();
+            $row['mobile_session'] = $orow->getMobileSession()->getID();
+
+            // add row metadata
+            $row['meta'] = [
+                'view_url' => '',
+                'delete_url' => ''
+            ];
+
+            // add view and delete urls
+            if ($this->isGranted('review.view'))
+                $row['meta']['view_url'] = $this->generateUrl('review_view_form', ['id' => $row['id']]);
+            if ($this->isGranted('review.delete'))
+                $row['meta']['delete_url'] = $this->generateUrl('review_delete', ['id' => $row['id']]);
+
+            $rows[] = $row;
+        }
+
+        // response
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
+    }
+
+    /**
+     * @Menu(selected="review_list")
+     */
+    public function openViewForm($id)
+    {
+        $this->denyAccessUnlessGranted('review.view', null, 'No access.');
+
+        // get row data
+        $em = $this->getDoctrine()->getManager();
+        $obj = $em->getRepository(Review::class)->find($id);
+
+        // make sure this row exists
+        if (empty($obj))
+            throw $this->createNotFoundException('The item does not exist');
+
+        $params = [];
+        $params['obj'] = $obj;
+
+        // response
+        return $this->render('review/form.html.twig', $params);
+    }
+
+    public function destroy($id)
+    {
+        $this->denyAccessUnlessGranted('review.delete', null, 'No access.');
+
+        // get object data
+        $em = $this->getDoctrine()->getManager();
+        $obj = $em->getRepository(Review::class)->find($id);
+
+        if (empty($obj))
+            throw $this->createNotFoundException('The item does not exist');
+
+        // delete this object
+        $em->remove($obj);
+        $em->flush();
+
+        // response
+        $response = new Response();
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->send();
+    }
+
+
+    protected function setQueryFilters($datatable, QueryBuilder $query)
+    {
+        // TODO: Improve search query
+        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
+            $query->where('q.message LIKE :filter')
+                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
+        }
+    }
+
+
+}
diff --git a/src/Controller/ServiceController.php b/src/Controller/ServiceController.php
new file mode 100644
index 00000000..90c6fc84
--- /dev/null
+++ b/src/Controller/ServiceController.php
@@ -0,0 +1,272 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\Service;
+
+use Doctrine\ORM\Query;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+class ServiceController extends Controller
+{
+    /**
+     * @Menu(selected="service_list")
+     */
+    public function index()
+    {
+        $this->denyAccessUnlessGranted('service.list', null, 'No access.');
+
+        return $this->render('service/list.html.twig');
+    }
+
+    public function rows(Request $req)
+    {
+        $this->denyAccessUnlessGranted('service.list', null, 'No access.');
+
+        // build query
+        $qb = $this->getDoctrine()
+                ->getRepository(Service::class)
+                ->createQueryBuilder('q');
+
+        // get datatable params
+        $datatable = $req->request->get('datatable');
+
+        // count total records
+        $tquery = $qb->select('COUNT(q)');
+
+        // add fitlers to count query
+        $this->setQueryFilters($datatable, $tquery);
+
+        $total = $tquery->getQuery()
+            ->getSingleScalarResult();
+
+        // get current page number
+        $page = $datatable['pagination']['page'] ?? 1;
+
+        $perpage = $datatable['pagination']['perpage'];
+        $offset = ($page - 1) * $perpage;
+
+        // add metadata
+        $meta = [
+            'page' => $page,
+            'perpage' => $perpage,
+            'pages' => ceil($total / $perpage),
+            'total' => $total,
+            'sort' => 'asc',
+            'field' => 'id'
+        ];
+
+        // build query
+        $query = $qb->select('q');
+
+        // add filters to query
+        $this->setQueryFilters($datatable, $query);
+
+        // check if sorting is present, otherwise use default
+        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
+            $order = $datatable['sort']['sort'] ?? 'asc';
+            $query->orderBy('q.' . $datatable['sort']['field'], $order);
+        } else {
+            $query->orderBy('q.id', 'asc');
+        }
+
+        // get rows for this page
+        $obj_rows = $query->setFirstResult($offset)
+            ->setMaxResults($perpage)
+            ->getQuery()
+            ->getResult();
+
+        // process rows
+        $rows = [];
+        foreach ($obj_rows as $orow) {
+            // add row data
+            $row['id'] = $orow->getID();
+            $row['name'] = $orow->getName();
+            $row['partners'] = $orow->getPartners();
+
+            // add row metadata
+            $row['meta'] = [
+                'update_url' => '',
+                'delete_url' => ''
+            ];
+
+            // add crud urls
+            if ($this->isGranted('service.update'))
+                $row['meta']['update_url'] = $this->generateUrl('service_update', ['id' => $row['id']]);
+            if ($this->isGranted('service.delete'))
+                $row['meta']['delete_url'] = $this->generateUrl('service_delete', ['id' => $row['id']]);
+
+            $rows[] = $row;
+        }
+
+        // response
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
+    }
+
+    /**
+     * @Menu(selected="service_list")
+     */
+    public function addForm()
+    {
+        $this->denyAccessUnlessGranted('service.add', null, 'No access.');
+
+        $params = [];
+        $params['obj'] = new Service();
+        $params['mode'] = 'create';
+
+        // response
+        return $this->render('service/form.html.twig', $params);
+    }
+
+    public function addSubmit(Request $req, ValidatorInterface $validator)
+    {
+        $this->denyAccessUnlessGranted('service.add', null, 'No access.');
+
+        // create new object
+        $em = $this->getDoctrine()->getManager();
+        $row = new Service();
+
+        // set and save values
+        $row->setName($req->request->get('name'));
+
+        // validate
+        $errors = $validator->validate($row);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        } else {
+            // validated! save the entity
+            $em->persist($row);
+            $em->flush();
+
+            // return successful response
+            return $this->json([
+                'success' => 'Changes have been saved!'
+            ]);
+        }
+    }
+
+    /**
+     * @Menu(selected="service_list")
+     */
+    public function updateForm($id)
+    {
+        $this->denyAccessUnlessGranted('service.update', null, 'No access.');
+
+        $params = [];
+        $params['mode'] = 'update';
+
+        // get row data
+        $em = $this->getDoctrine()->getManager();
+        $row = $em->getRepository(Service::class)->find($id);
+
+        // make sure this row exists
+        if (empty($row))
+            throw $this->createNotFoundException('The item does not exist');
+
+        $params['obj'] = $row;
+
+        // response
+        return $this->render('service/form.html.twig', $params);
+    }
+
+    public function updateSubmit(Request $req, ValidatorInterface $validator, $id)
+    {
+        $this->denyAccessUnlessGranted('service.update', null, 'No access.');
+
+        // get row data
+        $em = $this->getDoctrine()->getManager();
+        $row = $em->getRepository(Service::class)->find($id);
+
+        // make sure this row exists
+        if (empty($row))
+            throw $this->createNotFoundException('The item does not exist');
+
+        // set and save values
+        $row->setName($req->request->get('name'));
+
+        // validate
+        $errors = $validator->validate($row);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        } else {
+            // validated! save the entity
+            $em->flush();
+
+            // return successful response
+            return $this->json([
+                'success' => 'Changes have been saved!'
+            ]);
+        }
+    }
+
+    /**
+     * @Menu(selected="service_list")
+     */
+    public function destroy($id)
+    {
+        $this->denyAccessUnlessGranted('service.delete', null, 'No access.');
+
+        $params = [];
+
+        // get row data
+        $em = $this->getDoctrine()->getManager();
+        $row = $em->getRepository(Service::class)->find($id);
+
+        if (empty($row))
+            throw $this->createNotFoundException('The item does not exist');
+
+        // delete this row
+        $em->remove($row);
+        $em->flush();
+
+        // response
+        $response = new Response();
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->send();
+    }
+
+    protected function setQueryFilters($datatable, &$query)
+    {
+        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
+            $query->where('q.name LIKE :filter')
+                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
+        }
+    }
+
+}
diff --git a/src/Entity/MobileSession.php b/src/Entity/MobileSession.php
index 831d14fd..c36092ed 100644
--- a/src/Entity/MobileSession.php
+++ b/src/Entity/MobileSession.php
@@ -3,6 +3,9 @@
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
 use DateTime;
 
 /**
@@ -91,6 +94,12 @@ class MobileSession
      */
     protected $date_code_sent;
 
+    // reviews made by mobile session
+    /**
+     * @ORM\OneToMany(targetEntity="Review", mappedBy="mobile_session")
+     */
+    protected $reviews;
+
 
     public function __construct()
     {
@@ -101,6 +110,7 @@ class MobileSession
         $this->confirm_flag = false;
         $this->date_confirmed = null;
         $this->date_code_sent = null;
+        $this->reviews = new ArrayCollection();
     }
 
     public function generateKeyID()
@@ -239,4 +249,9 @@ class MobileSession
     {
         return $this->date_code_sent;
     }
+
+    public function getReviews()
+    {
+        return $this->reviews;
+    }
 }
diff --git a/src/Entity/Partner.php b/src/Entity/Partner.php
new file mode 100644
index 00000000..bb8d9580
--- /dev/null
+++ b/src/Entity/Partner.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Entity;
+
+use App\Ramcar\Location;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+
+use DateTime;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="partner")
+ */
+class Partner
+{
+    use Location;
+
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    // name
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $name;
+
+    // date created
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $date_create;
+
+    // user that created the partner
+    /**
+     * @ORM\ManyToOne(targetEntity="User", inversedBy="partners_created")
+     * @ORM\JoinColumn(name="create_user_id", referencedColumnName="id", nullable=true)
+     */
+    protected $created_by;
+
+    // services provided
+    /**
+     * @ORM\ManyToMany(targetEntity="Service", inversedBy="partners")
+     * @ORM\JoinTable(name="partner_services")
+     */
+    protected $services;
+
+    public function __construct()
+    {
+        $this->time_open = new DateTime();
+        $this->time_close = new DateTime();
+        $this->services = new ArrayCollection();
+        $this->date_create = new DateTime();
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getDateCreate()
+    {
+        return $this->date_create;
+    }
+
+    public function setCreatedBy(User $created_by)
+    {
+        $this->created_by = $created_by;
+        return $this;
+    }
+
+    public function getCreatedBy()
+    {
+        return $this->created_by;
+    }
+
+    public function addService(Service $service)
+    {
+        $this->services->add($service);
+        return $this;
+    }
+
+    public function clearServices()
+    {
+        $this->services->clear();
+        return $this;
+    }
+
+    public function getServices()
+    {
+        $str_services = [];
+        foreach ($this->services as $service)
+            $str_services[] = $service->getID();
+
+        return $str_services;
+    }
+
+    public function getServicesObjects()
+    {
+        return $this->services;
+    }
+
+}
diff --git a/src/Entity/Review.php b/src/Entity/Review.php
new file mode 100644
index 00000000..57ee2c6f
--- /dev/null
+++ b/src/Entity/Review.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+use DateTime;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="review")
+ */
+class Review
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    // partner being reviewed
+    /**
+     * @ORM\ManyToOne(targetEntity="Partner")
+     * @ORM\JoinColumn(name="partner_id", referencedColumnName="id")
+     */
+    protected $partner;
+
+    // customer's rating of partner
+    /**
+     * @ORM\Column(type="integer")
+     */
+    protected $rating;
+
+    // message that goes with the rating
+    /**
+     * @ORM\Column(type="text")
+     */
+    protected $message;
+
+    // date created
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $date_create;
+
+    // mobile session that sent review
+    /**
+     * @ORM\ManyToOne(targetEntity="MobileSession", inversedBy="reviews")
+     * @ORM\JoinColumn(name="mobile_session_id", referencedColumnName="id")
+     */
+    protected $mobile_session;
+
+    public function __construct()
+    {
+        $this->date_create = new DateTime();
+        $this->rating = 0;
+        $this->comment = "";
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setPartner(Partner $partner)
+    {
+        $this->partner = $partner;
+        return $this;
+    }
+
+    public function getPartner()
+    {
+        return $this->partner;
+    }
+
+    public function setRating($rating)
+    {
+        $this->rating = $rating;
+        return $this;
+    }
+
+    public function getRating()
+    {
+        return $this->rating;
+    }
+
+
+    public function setMessage($message)
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    public function getDateCreate()
+    {
+        return $this->date_create;
+    }
+
+    public function setMobileSession(MobileSession $mobile_session)
+    {
+        $this->mobile_session = $mobile_session;
+        return $this;
+    }
+
+    public function getMobileSession()
+    {
+        return $this->mobile_session;
+    }
+
+}
diff --git a/src/Entity/Service.php b/src/Entity/Service.php
new file mode 100644
index 00000000..e24cd672
--- /dev/null
+++ b/src/Entity/Service.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="service")
+ */
+class Service
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    // name of service
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $name;
+
+    // link to partners with this service
+    /**
+     * @ORM\ManyToMany(targetEntity="Partner", mappedBy="services", fetch="EXTRA_LAZY")
+     */
+    protected $partners;
+
+    public function __construct()
+    {
+        $this->partners = new ArrayCollection();
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function addPartner(Partner $partner)
+    {
+        $this->partners[$partner->getID()] = $partner;
+
+        return $this;
+    }
+
+    public function clearPartners()
+    {
+        $this->partners->clear();
+        return $this;
+    }
+
+    public function getPartners()
+    {
+        return $this->partners;
+    }
+
+}
diff --git a/src/Entity/User.php b/src/Entity/User.php
index c7304ef3..a57afb97 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -104,6 +104,12 @@ class User extends BaseUser implements Serializable
      */
     protected $invoices;
 
+    // partners made by this user
+    /**
+     * @ORM\OneToMany(targetEntity="Partner", mappedBy="created_by")
+     */
+    protected $partners_created;
+
     public function __construct()
     {
         parent::__construct();
@@ -112,6 +118,7 @@ class User extends BaseUser implements Serializable
         $this->job_orders_created = new ArrayCollection();
         $this->job_orders_assigned = new ArrayCollection();
         $this->tickets = new ArrayCollection();
+        $this->partners_created =  new ArrayCollection();
     }
 
     public function getID()
@@ -297,4 +304,9 @@ class User extends BaseUser implements Serializable
     {
         return $this->invoices;
     }
+
+    public function getPartnersCreated()
+    {
+        return $this->partners_created;
+    }
 }
diff --git a/templates/partner/form.html.twig b/templates/partner/form.html.twig
new file mode 100644
index 00000000..4495cd3f
--- /dev/null
+++ b/templates/partner/form.html.twig
@@ -0,0 +1,328 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+<!-- BEGIN: Subheader -->
+<div class="m-subheader">
+    <div class="d-flex align-items-center">
+        <div class="mr-auto">
+            <h3 class="m-subheader__title">Partners</h3>
+        </div>
+    </div>
+</div>
+<!-- END: Subheader -->
+<div class="m-content">
+    <!--Begin::Section-->
+    <div class="row">
+        <div class="col-xl-12">
+            <div class="m-portlet m-portlet--mobile">
+                <div class="m-portlet__head">
+                    <div class="m-portlet__head-caption">
+                        <div class="m-portlet__head-title">
+                            <span class="m-portlet__head-icon">
+                                <i class="fa fa-building"></i>
+                            </span>
+                            <h3 class="m-portlet__head-text">
+                                {% if mode == 'update' %}
+                                    Edit Partner 
+                                    <small>{{ obj.getName() }}</small>
+                                {% else %}
+                                    New Partner
+                                {% endif %}
+                            </h3>
+                        </div>
+                    </div>
+                </div>
+                <form id="row-form" class="m-form m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('partner_update_submit', {'id': obj.getId()}) : url('partner_create_submit') }}">
+                    <div class="m-portlet__body">
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label for="name" data-field="name">
+                                    Name
+                                </label>
+                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName()|default('') }}">
+                                <div class="form-control-feedback hide" data-field="name"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="branch" data-field="branch">
+                                    Branch
+                                </label>
+                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch()|default('') }}">
+                                <div class="form-control-feedback hide" data-field="branch"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label for="address" data-field="address">
+                                    Address
+                                </label>
+                                <textarea class="form-control m-input" id="address" rows="4" name="address">{{ obj.getAddress|default('') }}</textarea>
+                                 <div class="form-control-feedback hide" data-field="address"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="contact_nums" data-field="contact_nums">
+                                    Contact Numbers
+                                </label>
+                                <textarea class="form-control m-input" id="contact_nums" rows="4" name="contact_nums">{{ obj.getContactNumbers }}</textarea>
+                                <div class="form-control-feedback hide" data-field="contact_nums"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-3">
+                                <label for="time_open">
+                                    Time Open
+                                </label>
+                                <div class="input-group timepicker">
+                                    <input id="timepicker_open" type="text" name="time_open" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getTimeOpen.format('g:i A') }}" />
+                                    <span class="input-group-addon">
+                                        <i class="la la-clock-o"></i>
+                                    </span>
+                                </div>
+                                <div class="form-control-feedback hide" data-field="time_open"></div>
+                            </div>
+                            <div class="col-lg-3">
+                                <label for="time_close">
+                                    Time Close
+                                </label>
+                                <div class="input-group timepicker">
+                                    <input id="timepicker_close" type="text" name="time_close" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getTimeClose.format('g:i A') }}" />
+                                    <span class="input-group-addon">
+                                        <i class="la la-clock-o"></i>
+                                    </span>
+                                </div>
+                                <div class="form-control-feedback hide" data-field="time_close"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row">
+                            <div class="col-lg-12">
+                                <label>
+                                    Map Coordinates
+                                </label>
+                                <input type="hidden" id="map_lat" name="coord_lat" value="">
+                                <input type="hidden" id="map_lng" name="coord_lng" value="">
+                                <div class="input-group">
+                                    <input type="text" class="form-control" id="m_gmap_address" placeholder="Search">
+                                    <span class="input-group-btn">
+                                        <button class="btn btn-primary" id="m_gmap_btn">
+                                            <i class="fa fa-search"></i>
+                                        </button>
+                                    </span>
+                                </div>
+                                <div id="m_gmap" style="height:600px;"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row">
+                            <div class="col-lg-6">
+                                <label for="created_by" data-field="created_by">
+                                    Created By
+                                </label>
+                                <input type="text" name="created_by" class="form-control m-input" value="{{ obj.getCreatedBy.getFullName|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="created_by"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="date_create" data-field="date_create">
+                                    Date Created
+                                </label>
+                                <input type="text" name="date_created" class="form-control m-input" value="{{ obj.getDateCreate|date('d M Y - h:i A') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="branch"></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">
+                                        Services
+                                    </h3>
+                                </div>
+                                <div class="form-group m-form__group row">
+                                    <div class="col-lg-12">
+                                        {% if services is empty %}
+                                                No services available.
+                                            {% else %}
+                                                <div class="m-checkbox-list">
+                                                    {% for service in services %}
+                                                        <label class="m-checkbox">
+                                                            <input type="checkbox" name="services[]" value="{{ service.getID() }}"{{ service.getID() in obj.getServices() ? ' checked' : '' }}>
+                                                                {{ service.getName() }}
+                                                            <span></span>
+                                                        </label>
+                                                    {% endfor %}
+                                                </div>
+                                                <div class="form-control-feedback hide" data-field="services"></div>
+                                                <span class="m-form__help">Check all services that apply</span>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="m-portlet__foot m-portlet__foot--fit">
+                <div class="m-form__actions m-form__actions--solid m-form__actions--right">
+                    <div class="row">
+                        <div class="col-lg-12">
+                            <button type="submit" class="btn btn-success">Submit</button>
+                                <a href="{{ url('partner_list') }}" class="btn btn-secondary">Back</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+{% endblock %}
+
+
+{% block scripts %}
+<script src="//maps.google.com/maps/api/js?key={{ gmaps_api_key }}" type="text/javascript"></script>
+<script src="/assets/vendors/custom/gmaps/gmaps.js" type="text/javascript"></script>
+
+<script>
+
+// BEGIN google maps stuff
+function selectPoint(map, latlng) {
+    var lat = latlng.lat();
+    var lng = latlng.lng();
+
+    // show it in map
+    map.removeMarkers();
+    map.setCenter(lat, lng);
+    map.addMarker({
+        lat: lat,
+        lng: lng
+    });
+
+    // set value in hidden input
+    $('#map_lat').val(lat);
+    $('#map_lng').val(lng);
+}
+
+var map = new GMaps({
+    div: '#m_gmap',
+    lat: 14.6091,
+    lng: 121.0223,
+    click: function(e) {
+        // handle click in map
+        selectPoint(map, e.latLng);
+        e.stop();
+    }
+});
+var handleAction = function() {
+    var text = $.trim($('#m_gmap_address').val());
+    GMaps.geocode({
+        address: text,
+        callback: function(results, status) {
+            map.removeMarkers();
+            if (status == 'OK') {
+                selectPoint(map, results[0].geometry.location);
+            }
+        },
+        region: 'ph'
+    });
+}
+
+$('#m_gmap_btn').click(function(e) {
+    e.preventDefault();
+    handleAction();
+});
+
+$("#m_gmap_address").keypress(function(e) {
+    var keycode = (e.keyCode ? e.keyCode : e.which);
+    if (keycode == '13') {
+        e.preventDefault();
+        handleAction();
+    }
+});
+
+// END google maps stuff
+
+$(document).ready(function() {
+    // timepickers
+    $('#timepicker_open, #timepicker_close').timepicker({
+        format: "HH:ii P",
+        minuteStep: 1,
+        showMeridian: true,
+        snapToStep: true,
+        bootcssVer: 3,
+        todayHighlight: true,
+        autoclose: true
+    });
+
+    // check if we need to set map
+    {% if mode == 'update' %}
+    var latlng = new google.maps.LatLng({{ obj.getCoordinates.getLatitude }}, {{ obj.getCoordinates.getLongitude }});
+    selectPoint(map, latlng);
+    {% endif %}
+
+});
+
+
+$(function() {
+    $("#row-form").submit(function(e) {
+        var form = $(this);
+
+        e.preventDefault();
+
+        $.ajax({
+            method: "POST",
+            url: form.prop('action'),
+            data: form.serialize()
+        }).done(function(response) {
+            // remove all error classes
+            removeErrors();
+            swal({
+                title: 'Done!',
+                text: 'Your changes have been saved!',
+                type: 'success',
+                onClose: function() {
+                    window.location.href = "{{ url('partner_list') }}";
+                }
+            });
+        }).fail(function(response) {
+            if (response.status == 422) {
+                var errors = response.responseJSON.errors;
+                var firstfield = false;
+
+                // remove all error classes first
+                removeErrors();
+
+                // display errors contextually
+                $.each(errors, function(field, msg) {
+                    var formfield = $("[name='" + field + "']");
+                    var label = $("label[data-field='" + field + "']");
+                    var msgbox = $(".form-control-feedback[data-field='" + field + "']");
+
+                    // add error classes to bad fields
+                    formfield.addClass('form-control-danger');
+                    label.addClass('has-danger');
+                    msgbox.html(msg).addClass('has-danger').removeClass('hide');
+
+                    // check if this field comes first in DOM
+                    var domfield = formfield.get(0);
+
+                    if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
+                        firstfield = domfield;
+                    }
+                });
+
+                // focus on first bad field
+                firstfield.focus();
+
+                // scroll to above that field to make it visible
+                $('html, body').animate({
+                    scrollTop: $(firstfield).offset().top - 200
+                }, 100);
+            }
+        });
+    });
+
+    // remove all error classes
+    function removeErrors() {
+        $(".form-control-danger").removeClass('form-control-danger');
+        $("[data-field]").removeClass('has-danger');
+        $(".form-control-feedback[data-field]").addClass('hide');
+    }
+
+});
+</script>
+{% endblock %}
diff --git a/templates/partner/list.html.twig b/templates/partner/list.html.twig
new file mode 100644
index 00000000..4ada99b0
--- /dev/null
+++ b/templates/partner/list.html.twig
@@ -0,0 +1,163 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+    <!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">
+                   Partners 
+                </h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-12">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__body">
+                    	<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
+                            <div class="row align-items-center">
+                                <div class="col-xl-8 order-2 order-xl-1">
+                                    <div class="form-group m-form__group row align-items-center">
+                                        <div class="col-md-4">
+                                            <div class="m-input-icon m-input-icon--left">
+                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
+                                                    <span class="m-input-icon__icon m-input-icon__icon--left">
+                                                        <span><i class="la la-search"></i></span>
+                                                    </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-xl-4 order-1 order-xl-2 m--align-right">
+                                    <a href="{{ url('partner_create') }}" class="btn btn-focus m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill">
+                                        <span>
+                                            <i class="fa fa-building"></i>
+                                            <span>New Partner</span>
+                                        </span>
+                                    </a>					
+                                    <div class="m-separator m-separator--dashed d-xl-none"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--begin: Datatable -->
+                        <div id="data-rows"></div>
+                        <!--end: Datatable -->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        var options = {
+            data: {
+                type: 'remote',
+                source: {
+                    read: {
+                        url: '{{ url("partner_rows") }}',
+                        method: 'POST',
+                    }
+                },
+                saveState: {
+                    cookie: false,
+                    webstorage: false
+                },
+                    pageSize: 10,
+                    serverPaging: true,
+                    serverFiltering: true,
+                    serverSorting: true
+            },
+            columns: [
+            {
+                field: 'id',
+                title: 'ID',
+                width: 30
+            },
+            {
+                field: 'name',
+                title: 'Name'
+            },
+            {
+                field: 'branch',
+                title: 'Branch'
+            },
+            {
+                field: 'address',
+                title: 'Address'
+            },
+            {
+                field: 'contact_nums',
+                title: 'Contact Numbers'
+            },
+            {
+                field: 'time_open',
+                title: 'Time Open'
+            },
+            {
+                field: 'time_close',
+                title: 'Time Close'
+            },
+            {
+                field: 'Actions',
+                width: 110,
+                title: 'Actions',
+                sortable: false,
+                overflow: 'visible',
+                template: function (row, index, datatable) {
+                    var actions = '';
+                            
+                    if (row.meta.update_url != '') {
+                        actions += '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.name + '" title="Edit"><i class="la la-edit"></i></a>';
+                    }
+
+                    if (row.meta.delete_url != '') {
+                        actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.name + '" title="Delete"><i class="la la-trash"></i></a>';
+                    }
+							
+                    return actions;
+                },
+            }
+            ],
+            search: {
+                onEnter: false,
+                input: $('#data-rows-search'),
+                delay: 400
+            }
+        };
+
+        var table = $("#data-rows").mDatatable(options);
+
+        $(document).on('click', '.btn-delete', function(e) {
+            var url = $(this).prop('href');
+                var id = $(this).data('id');
+                var btn = $(this);
+
+            e.preventDefault();
+
+            swal({
+                title: 'Confirmation',
+                html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
+                type: 'warning',
+                showCancelButton: true
+            }).then((result) => {
+                if (result.value) {
+                    $.ajax({
+                        method: "DELETE",
+                        url: url
+                    }).done(function(response) {
+                        table.row(btn.parents('tr')).remove();
+                        table.reload();
+                    });
+                }
+            });
+        });
+    });
+</script>
+{% endblock %}
diff --git a/templates/review/form.html.twig b/templates/review/form.html.twig
new file mode 100644
index 00000000..5b173816
--- /dev/null
+++ b/templates/review/form.html.twig
@@ -0,0 +1,86 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+<!-- BEGIN: Subheader -->
+<div class="m-subheader">
+    <div class="d-flex align-items-center">
+        <div class="mr-auto">
+            <h3 class="m-subheader__title">Reviews</h3>
+        </div>
+    </div>
+</div>
+<!-- END: Subheader -->
+<div class="m-content">
+    <!--Begin::Section-->
+    <div class="row">
+        <div class="col-xl-12">
+            <div class="m-portlet m-portlet--mobile">
+                <div class="m-portlet__head">
+                    <div class="m-portlet__head-caption">
+                        <div class="m-portlet__head-title">
+                            <span class="m-portlet__head-icon">
+                                <i class="fa fa-building"></i>
+                                    View Review
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <form id="row-form" class="m-form m-form--label-align-right" }}">
+                    <div class="m-portlet__body">
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label for="partner" data-field="partner">
+                                   Partner 
+                                </label>
+                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getPartner.getName|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="partner"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="rating" data-field="rating">
+                                    Rating
+                                </label>
+                                <input type="text" name="rating" class="form-control m-input" value="{{ obj.getRating }}" disabled>
+                                <div class="form-control-feedback hide" data-field="rating"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-12">
+                                <label for="message" data-field="message">
+                                    Message
+                                </label>
+                                <textarea class="form-control m-input" id="message" rows="4" name="message" disabled>{{ obj.getMessage }} </textarea>
+                                 <div class="form-control-feedback hide" data-field="message"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label for="mobile_session" data-field="mobile_session">
+                                   Mobile Session
+                                </label>
+                                <input type="text" name="mobile_session" class="form-control m-input" value="{{ obj.getMobileSession.getID|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="mobile_session"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="date_create" data-field="date_create">
+                                   Date Created
+                                </label>
+                                <input type="text" name="date_create" class="form-control m-input" value="{{ obj.getDateCreate|date('d M Y - h:i A') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="date_create"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="m-portlet__foot m-portlet__foot--fit">
+                <div class="m-form__actions m-form__actions--solid m-form__actions--right">
+                    <div class="row">
+                        <div class="col-lg-12">
+                                <a href="{{ url('review_list') }}" class="btn btn-secondary">Back</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+{% endblock %}
diff --git a/templates/review/list.html.twig b/templates/review/list.html.twig
new file mode 100644
index 00000000..a7fecacc
--- /dev/null
+++ b/templates/review/list.html.twig
@@ -0,0 +1,146 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+    <!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">
+                   Reviews 
+                </h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-12">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__body">
+                    	<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
+                            <div class="row align-items-center">
+                                <div class="col-xl-8 order-2 order-xl-1">
+                                    <div class="form-group m-form__group row align-items-center">
+                                        <div class="col-md-4">
+                                            <div class="m-input-icon m-input-icon--left">
+                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
+                                                    <span class="m-input-icon__icon m-input-icon__icon--left">
+                                                        <span><i class="la la-search"></i></span>
+                                                    </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--begin: Datatable -->
+                        <div id="data-rows"></div>
+                        <!--end: Datatable -->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        var options = {
+            data: {
+                type: 'remote',
+                source: {
+                    read: {
+                        url: '{{ url("review_rows") }}',
+                        method: 'POST',
+                    }
+                },
+                saveState: {
+                    cookie: false,
+                    webstorage: false
+                },
+                    pageSize: 10,
+                    serverPaging: true,
+                    serverFiltering: true,
+                    serverSorting: true
+            },
+            columns: [
+            {
+                field: 'id',
+                title: 'ID',
+                width: 30
+            },
+            {
+                field: 'partner',
+                title: 'Partner'
+            },
+            {
+                field: 'rating',
+                title: 'Rating'
+            },
+            {
+                field: 'message',
+                title: 'Message'
+            },
+            {
+                field: 'mobile_session',
+                title: 'Mobile'
+            },
+            {
+                field: 'Actions',
+                width: 110,
+                title: 'Actions',
+                sortable: false,
+                overflow: 'visible',
+                template: function (row, index, datatable) {
+                    var actions = '';
+                            
+                    if (row.meta.view_url != '') {
+                        actions += '<a href="' + row.meta.view_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.id + '" title="View"><i class="la la-edit"></i></a>';
+                    }
+
+                    if (row.meta.delete_url != '') {
+                        actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.id + '" title="Delete"><i class="la la-trash"></i></a>';
+                    }
+							
+                    return actions;
+                },
+            }
+            ],
+            search: {
+                onEnter: false,
+                input: $('#data-rows-search'),
+                delay: 400
+            }
+        };
+
+        var table = $("#data-rows").mDatatable(options);
+
+        $(document).on('click', '.btn-delete', function(e) {
+            var url = $(this).prop('href');
+                var id = $(this).data('id');
+                var btn = $(this);
+
+            e.preventDefault();
+
+            swal({
+                title: 'Confirmation',
+                html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
+                type: 'warning',
+                showCancelButton: true
+            }).then((result) => {
+                if (result.value) {
+                    $.ajax({
+                        method: "DELETE",
+                        url: url
+                    }).done(function(response) {
+                        table.row(btn.parents('tr')).remove();
+                        table.reload();
+                    });
+                }
+            });
+        });
+    });
+</script>
+{% endblock %}
diff --git a/templates/service/form.html.twig b/templates/service/form.html.twig
new file mode 100644
index 00000000..49a10bdc
--- /dev/null
+++ b/templates/service/form.html.twig
@@ -0,0 +1,133 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+	<!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">Services</h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-8">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__head">
+                        <div class="m-portlet__head-caption">
+                            <div class="m-portlet__head-title">
+                                <span class="m-portlet__head-icon">
+                                    <i class="la la-key"></i>
+                                </span>
+                                <h3 class="m-portlet__head-text">
+                                    {% if mode == 'update' %}
+                                        Edit Service
+                                        <small>{{ obj.getID() }}</small>
+                                    {% else %}
+                                        New Service
+                                    {% endif %}
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('service_update_submit', {'id': obj.getID()}) : url('service_create_submit') }}">
+                        <div class="m-portlet__body">	
+                            <div class="form-group m-form__group row">
+                                <label class="col-lg-3 col-form-label" data-field="name">
+                                    Name:
+                                </label>
+                                <div class="col-lg-9">
+                                    <input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
+                                    <div class="form-control-feedback hide" data-field="name"></div>
+                                </div>
+                            </div>	
+                        </div>
+                        <div class="m-portlet__foot m-portlet__foot--fit">
+                            <div class="m-form__actions m-form__actions--solid m-form__actions--right">
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <button type="submit" class="btn btn-success">Submit</button>
+                                            <a href="{{ url('service_list') }}" class="btn btn-secondary">Back</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        $("#row-form").submit(function(e) {
+            var form = $(this);
+
+            e.preventDefault();
+
+            $.ajax({
+                method: "POST",
+                url: form.prop('action'),
+                data: form.serialize()
+            }).done(function(response) {
+                // remove all error classes
+                removeErrors();
+                swal({
+                    title: 'Done!',
+                    text: 'Your changes have been saved!',
+                    type: 'success',
+                    onClose: function() {
+                        window.location.href = "{{ url('service_list') }}";
+                    }
+                });
+            }).fail(function(response) {
+                if (response.status == 422 || response.status == 403) {
+                    var errors = response.responseJSON.errors;
+                    var firstfield = false;
+
+                    // remove all error classes first
+                    removeErrors();
+
+                    // display errors contextually
+                    $.each(errors, function(field, msg) {
+                        var formfield = $("[name='" + field + "']");
+                        var label = $("label[data-field='" + field + "']");
+                        var msgbox = $(".form-control-feedback[data-field='" + field + "']");
+
+                        // add error classes to bad fields
+                        formfield.addClass('form-control-danger');
+                        label.addClass('has-danger');
+                        msgbox.html(msg).addClass('has-danger').removeClass('hide');
+
+                        // check if this field comes first in DOM
+                        var domfield = formfield.get(0);
+
+                        if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
+                            firstfield = domfield;
+                        }
+                    });
+
+                    // focus on first bad field
+                    firstfield.focus();
+
+                    // scroll to above that field to make it visible
+                    $('html, body').animate({
+                        scrollTop: $(firstfield).offset().top - 200
+                    }, 100);
+                }
+            });
+        });
+
+        // remove all error classes
+        function removeErrors() {
+            $(".form-control-danger").removeClass('form-control-danger');
+            $("[data-field]").removeClass('has-danger');
+            $(".form-control-feedback[data-field]").addClass('hide');
+        }
+    });
+</script>
+{% endblock %}
diff --git a/templates/service/list.html.twig b/templates/service/list.html.twig
new file mode 100644
index 00000000..a4d5be72
--- /dev/null
+++ b/templates/service/list.html.twig
@@ -0,0 +1,142 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+    <!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">
+                   Services 
+                </h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-12">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__body">
+                    	<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
+                            <div class="row align-items-center">
+                                <div class="col-xl-8 order-2 order-xl-1">
+                                    <div class="form-group m-form__group row align-items-center">
+                                        <div class="col-md-4">
+                                            <div class="m-input-icon m-input-icon--left">
+                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
+                                                    <span class="m-input-icon__icon m-input-icon__icon--left">
+                                                        <span><i class="la la-search"></i></span>
+                                                    </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-xl-4 order-1 order-xl-2 m--align-right">
+                                    <a href="{{ url('service_create') }}" class="btn btn-focus m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill">
+                                        <span>
+                                            <i class="la la-key"></i>
+                                            <span>New Service</span>
+                                        </span>
+                                    </a>					
+                                    <div class="m-separator m-separator--dashed d-xl-none"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--begin: Datatable -->
+                        <div id="data-rows"></div>
+                        <!--end: Datatable -->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        var options = {
+            data: {
+                type: 'remote',
+                source: {
+                    read: {
+                        url: '{{ url("service_rows") }}',
+                        method: 'POST'
+                    }
+                },
+                saveState: {
+                    cookie: false,
+                    webstorage: false
+                },
+                pageSize: 10,
+                serverPaging: true,
+                serverFiltering: true,
+                serverSorting: true
+            },
+            columns: [
+            {
+                field: 'id',
+                title: 'ID'
+            },
+            {
+                field: 'name',
+                title: 'Name'
+            },
+            {
+                field: 'Actions',
+                width: 110,
+                title: 'Actions',
+                sortable: false,
+                overflow: 'visible',
+                template: function (row, index, datatable) {
+                    var actions = '';
+                            
+                    if (row.meta.update_url != '') {
+                        actions += '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.name + '" title="Edit"><i class="la la-edit"></i></a>';
+                    }
+
+                    if (row.meta.delete_url != '') {
+                        actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.id + '" title="Delete"><i class="la la-trash"></i></a>';
+                    }
+							
+                    return actions;
+                },
+            }
+            ],
+            search: {
+                onEnter: false,
+                input: $('#data-rows-search'),
+                delay: 400
+            }
+        };
+
+        var table = $("#data-rows").mDatatable(options);
+
+        $(document).on('click', '.btn-delete', function(e) {
+            var url = $(this).prop('href');
+            var id = $(this).data('id');
+            var btn = $(this);
+
+            e.preventDefault();
+
+            swal({
+                title: 'Confirmation',
+                html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
+                type: 'warning',
+                showCancelButton: true
+            }).then((result) => {
+                if (result.value) {
+                    $.ajax({
+                        method: "DELETE",
+                        url: url
+                    }).done(function(response) {
+                        table.row(btn.parents('tr')).remove();
+                        table.reload();
+                    });
+                }
+            });
+        });
+    });
+</script>
+{% endblock %}