Merge remote-tracking branch 'upstream/3.1' into HOR-998

workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php

@@ -179,10 +179,13 @@ class NotificationDevice
             }
 
             $userIds = $arrayTaskUser;
+            //sub process
+            $taskAssignType = (isset($nextDel["TAS_ASSIGN_TYPE"])) ? $nextDel["TAS_ASSIGN_TYPE"] : $nextDel["SP_TYPE"];
             $message = '#' . $appFields['APP_NUMBER'] . ' : ' . $appFields['APP_TITLE'];
             $data = array(
                 'processId' => $appFields['PRO_UID'],
                 'taskId' => $nextDel["TAS_UID"],
+                'taskAssignType' => $taskAssignType,
                 'caseId' => $appFields['APP_UID'],
                 'caseTitle' => $appFields['APP_TITLE'],
                 'delIndex' => $iNewDelIndex,
@@ -281,5 +284,4 @@ class NotificationDevice
 
         return $arrayTaskUser;
     }
-
 }

workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php

@@ -100,17 +100,19 @@ class PushMessageIOS
 //            $errstr, 60, STREAM_CLIENT_CONNECT|STREAM_CLIENT_PERSISTENT, $ctx);
 //        if (!$fp)
 //            exit("Failed to connect: $err $errstr" . PHP_EOL);
-
+        $alert = new \stdClass();
+        $alert->{'loc-key'} =  $data['taskAssignType'];
+        $alert->{'loc-args'} =  array($message);
         // Create the payload body
         if (!is_null($data)) {
             $body['aps'] = array(
-                'alert' => $message,
+                'alert' => $alert,
                 'sound' => 'default',
                 'data' => $data
             );
         } else {
             $body['aps'] = array(
-                'alert' => $message,
+                'alert' => $alert,
                 'sound' => 'default'
             );
         }