From ecd9ee0dcf56ed3df2ea52dae75e55e16eefde35 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Mon, 12 Mar 2018 02:40:15 +0800
Subject: [PATCH] Remove service type display in jo process list #UAT

---
 config/routes/job_order.yaml                  |  4 +---
 src/Controller/JobOrderController.php         | 11 +++++++++++
 templates/job-order/list.processing.html.twig | 17 +++++++++--------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/config/routes/job_order.yaml b/config/routes/job_order.yaml
index 74849cad..5d22a4bd 100644
--- a/config/routes/job_order.yaml
+++ b/config/routes/job_order.yaml
@@ -10,10 +10,8 @@ jo_in_submit:
 
 jo_proc:
     path: /job-order/processing
-    controller: App\Controller\JobOrderController::listRows
+    controller: App\Controller\JobOrderController::listProcessing
     methods: [GET]
-    defaults:
-        tier: "proc"
 
 jo_proc_rows:
     path: /job-order/processing-rows
diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 8bba85b5..e550c379 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -357,6 +357,17 @@ class JobOrderController extends BaseController
         ];
     }
 
+    public function listProcessing()
+    {
+        $this->denyAccessUnlessGranted('jo_proc.list', null, 'No access.');
+
+        $params = $this->initParameters('jo_proc');
+
+        $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
+
+        return $this->render('job-order/list.processing.html.twig', $params);
+    }
+    
     public function listAssigning()
     {
         $this->denyAccessUnlessGranted('jo_assign.list', null, 'No access.');
diff --git a/templates/job-order/list.processing.html.twig b/templates/job-order/list.processing.html.twig
index b2da1286..e82e5796 100644
--- a/templates/job-order/list.processing.html.twig
+++ b/templates/job-order/list.processing.html.twig
@@ -6,7 +6,7 @@
         <div class="d-flex align-items-center">
             <div class="mr-auto">
                 <h3 class="m-subheader__title">
-                    Job Orders ({{ tier_name|capitalize }})
+                    Job Orders (Dispatch)
                 </h3>
             </div>
         </div>
@@ -52,7 +52,7 @@
 					type: 'remote',
 					source: {
 						read: {
-							url: '{{ url(rows_route) }}',
+							url: '{{ url('jo_proc_rows') }}',
 							method: 'POST'
 						}
 					},
@@ -81,10 +81,6 @@
 						field: 'delivery_address',
 						title: 'Customer Area'
 					},
-					{
-						field: 'service_type',
-						title: 'Type of Transaction'
-					},
 					{
 						field: 'date_schedule',
 						title: 'Scheduled Date'
@@ -105,8 +101,13 @@
 						overflow: 'visible',
 						template: function (row, index, datatable) {
 							var 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" title="View / Edit"><i class="la la-edit"></i></a>';
-							actions += '<a href="' + row.meta.unlock_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" title="View / Edit"><i class="la la-edit"></i></a>';
-							
+
+                            {% if is_granted('jo_proc.unlock') %}
+                                if (row.meta.unlock_url != '') {
+                                    actions += '<a href="' + row.meta.unlock_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" title="Unlock"><i class="fa fa-unlock"></i></a>';
+                                }
+                            {% endif %}
+
 							return actions;
 						},
 					}