Compare commits

..

No commits in common. "9d9304d30ebcdbdde13af6008902cd81615dc8fe" and "adfb564ccc9fd2116e1eb4ae307cf7f745964af7" have entirely different histories.

4 changed files with 9 additions and 19 deletions

View File

@ -26,18 +26,8 @@ class AutomationsApi extends ApiController
$this->requireAuth();
$obj = $this->input;
if (
empty($obj['name']) ||
!isset($obj['name']) ||
!isset($obj['conditions']) ||
!isset($obj['tasks']) ||
!isset($obj['days'])
) {
throw new Exception("Invalid request payload", 400);
}
$response = [];
$response = AutomationManager::create($obj['name'],json_encode($obj['days']), json_encode($obj['tasks']), json_encode($obj['conditions']));
$response = AutomationManager::create($obj['name'],$obj['days'], $obj['tasks'], $obj['conditions']);
$this->response(['value'=>'OK']);
}

View File

@ -17,14 +17,14 @@ class AutomationManager{
return Db::command ('UPDATE automation SET executed = 0 WHERE automation_id=?', array ($automationId));
}
public static function create ($name, $onDays, $doCode, $ifCode, $userId = 1, $automationId = "") {
$userId = UserManager::getUserData('user_id', $userId);
public static function create ($name, $onDays, $doCode, $ifCode, $automationId = "") {
$userId = UserManager::getUserData('user_id');
$scene = array (
'name' => $name,
'owner_id' => $userId,
'on_days' => $onDays,
'conditions' => $ifCode,
'tasks' => $doCode,
'if_something' => $ifCode,
'do_something' => $doCode,
);
try {
if ($automationId == "") {

View File

@ -14,7 +14,7 @@ class SettingsManager{
}
public static function create ($name, $value, $type = '') {
if (!self::getByName($name)){
//if (!self::getByName($name)){
$setting = array (
'name' => $name,
'value' => $value,
@ -26,7 +26,7 @@ class SettingsManager{
echo $error->getMessage();
die();
}
}
//}
}
public static function update ($name, $value, $type = '') {

View File

@ -38,7 +38,7 @@ class DameJidlo extends VirtualDeviceManager
echo 'Error:' . curl_error($ch);
}
curl_close($ch);
var_dump(isset(json_decode($result, true)['data']['active_orders'][0]['delivery']['time']['eta']) ? json_decode($result, true)['data']['active_orders'][0]['delivery']['time']['eta'] : 0);
return (isset(json_decode($result, true)['data']['active_orders'][0]['delivery']['time']['eta']) ? json_decode($result, true)['data']['active_orders'][0]['delivery']['time']['eta'] : 0);
}
@ -80,6 +80,6 @@ class DameJidlo extends VirtualDeviceManager
} else if ($value <= 1) {
return "less " . $value;
}
return $value;
return '';
}
}