Merge branch 'fronkdev' into 'master'
changed Rimoapi::addRemark() to take api key parameter See merge request fronk/thetool!2007
This commit is contained in:
@@ -1420,8 +1420,14 @@ class PreorderController extends mfBaseController {
|
||||
|
||||
$new_remark = date("d.m.Y").": ".$new_remark;
|
||||
|
||||
$api_creds = $preorder->getNetownerRimoApiCredentials();
|
||||
$this->log->debug(__METHOD__.": Rimo Api Creds: ".print_r($api_creds, true));
|
||||
if(!$api_creds) return false;
|
||||
|
||||
$apikey = $api_creds["prod"]["key"];
|
||||
|
||||
// upload remark to Rimo
|
||||
if(!Rimoapi::addRemark($workorder->rimo_id, $new_remark)) {
|
||||
if(!Rimoapi::addRemark($apikey, $workorder->rimo_id, $new_remark)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -553,13 +553,13 @@ class Rimoapi {
|
||||
return $resp_data;
|
||||
}
|
||||
|
||||
public static function addRemark($object_id, $text) {
|
||||
public static function addRemark($apikey, $object_id, $text) {
|
||||
if(!$object_id || !$text) return false;
|
||||
|
||||
$log = mfLoghandler::singleton();
|
||||
|
||||
$params = [];
|
||||
$params['apiKey'] = RIMO_API_JSON_APIKEY;
|
||||
$params['apiKey'] = $apikey;
|
||||
$params['objectId'] = $object_id;
|
||||
$params['text'] = $text;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user