From 3b4c81f03cb5ff6c5a775d31db78b72094bb4fb6 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Mon, 5 Feb 2018 13:17:12 +0800
Subject: [PATCH] Fix job order processing bugs

---
 src/Controller/JobOrderController.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 2ed5ea96..cbee449f 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -385,6 +385,12 @@ class JobOrderController extends BaseController
     {
         $this->denyAccessUnlessGranted('jo_proc.list', null, 'No access.');
 
+        // get object data
+        $em = $this->getDoctrine()->getManager();
+        $obj = $em->getRepository(JobOrder::class)->find($id);
+        $processor = $obj->getProcessedBy();
+        $user = $this->getUser();
+
         // check if we're the one processing, return error otherwise
         if ($processor == null)
             throw $this->createAccessDeniedException('Not the processor');
@@ -395,9 +401,6 @@ class JobOrderController extends BaseController
         // initialize error list
         $error_array = [];
 
-        // get object data
-        $em = $this->getDoctrine()->getManager();
-        $obj = $em->getRepository(JobOrder::class)->find($id);
 
         // make sure this object exists
         if (empty($obj))
@@ -455,10 +458,6 @@ class JobOrderController extends BaseController
             ], 422);
         }
 
-        // unlock job order and set version to 0, so someone else can modify it
-        // NOTE: we don't touch processed_by since we're the one who processed it
-        $obj->setVersion(0);
-
         // validated! save the entity
         $em->flush();