Apply fixes from StyleCI

This commit is contained in:
Manish Verma
2016-12-13 13:14:54 +00:00
committed by StyleCI Bot
parent 857d3004eb
commit 88f3df2180
161 changed files with 4729 additions and 3879 deletions

View File

@@ -4,12 +4,13 @@ namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
class Condition extends Model {
protected $table = "conditions";
class Condition extends Model
{
protected $table = 'conditions';
protected $fillable = ['job', 'value'];
public function getConditionValue($job) {
public function getConditionValue($job)
{
$value = ['condition' => '', 'at' => ''];
$condition = $this->where('job', $job)->first();
if ($condition) {
@@ -19,21 +20,24 @@ class Condition extends Model {
$value = ['condition' => $this->checkArray(0, $condition_value), 'at' => $this->checkArray(1, $condition_value)];
}
}
return $value;
}
public function checkArray($key,$array){
$value = "";
if(is_array($array)){
if(array_key_exists($key, $array)){
public function checkArray($key, $array)
{
$value = '';
if (is_array($array)) {
if (array_key_exists($key, $array)) {
$value = $array[$key];
}
}
return $value;
}
public function checkActiveJob() {
public function checkActiveJob()
{
$result = ['fetching' => '', 'notification' => '', 'work' => '', 'message' => '', 'remind' => ''];
$emails = new \App\Model\helpdesk\Settings\Email();
$email = $emails->find(1);
@@ -41,19 +45,19 @@ class Condition extends Model {
if ($email->email_fetching == 1) {
$result['fetching'] = true;
}
if($email->notification_cron==1){
if ($email->notification_cron == 1) {
$result['notification'] = true;
}
}
$works = new \App\Model\helpdesk\Workflow\WorkflowClose();
$work = $works->find(1);
//dd($work);
if($work){
if($work->condition==1){
if ($work) {
if ($work->condition == 1) {
$result['work'] = true;
}
}
return $result;
}
}

View File

@@ -4,9 +4,8 @@ namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
class FaveoMail extends Model {
protected $table = "faveo_mails";
protected $fillable = ["drive", "key", "value","email_id"];
class FaveoMail extends Model
{
protected $table = 'faveo_mails';
protected $fillable = ['drive', 'key', 'value', 'email_id'];
}

View File

@@ -4,9 +4,8 @@ namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
class FaveoQueue extends Model {
protected $table = "faveo_queues";
protected $fillable = ["key", "value","service_id"];
class FaveoQueue extends Model
{
protected $table = 'faveo_queues';
protected $fillable = ['key', 'value', 'service_id'];
}

View File

@@ -6,6 +6,6 @@ use Illuminate\Database\Eloquent\Model;
class MailService extends Model
{
protected $table = "mail_services";
protected $fillable = ["name","short_name"];
protected $table = 'mail_services';
protected $fillable = ['name', 'short_name'];
}

View File

@@ -7,55 +7,67 @@ use Lang;
class QueueService extends Model
{
protected $table = "queue_services";
protected $fillable = ["name","short_name","status"];
public function extraFieldRelation(){
protected $table = 'queue_services';
protected $fillable = ['name', 'short_name', 'status'];
public function extraFieldRelation()
{
$related = "App\Model\MailJob\FaveoQueue";
return $this->hasMany($related,'service_id');
return $this->hasMany($related, 'service_id');
}
public function getExtraField($key){
$value = "";
$setting = $this->extraFieldRelation()->where('key',$key)->first();
if($setting){
public function getExtraField($key)
{
$value = '';
$setting = $this->extraFieldRelation()->where('key', $key)->first();
if ($setting) {
$value = $setting->value;
}
return $value;
}
public function getName(){
$name = $this->attributes['name'];
public function getName()
{
$name = $this->attributes['name'];
$id = $this->attributes['id'];
$html = "<a href=".url('queue/'.$id).">".$name."</a>";
$html = '<a href='.url('queue/'.$id).'>'.$name.'</a>';
return $html;
}
public function getStatus(){
public function getStatus()
{
$status = $this->attributes['status'];
$html = "<span style='color:red'>".Lang::get('lang.inactive')."</span>";
if($status==1){
$html = "<span style='color:green'>".Lang::get('lang.active')."</span>";
$html = "<span style='color:red'>".Lang::get('lang.inactive').'</span>';
if ($status == 1) {
$html = "<span style='color:green'>".Lang::get('lang.active').'</span>';
}
return $html;
}
public function getAction(){
public function getAction()
{
$id = $this->attributes['id'];
$status = $this->attributes['status'];
$html = "<a href=".url('queue/'.$id.'/activate')." class='btn btn-primary'>".Lang::get('lang.activate')."</a>";
if($status==1){
$html = "<a href='#' class='btn btn-primary' disabled>".Lang::get('lang.activate')."</a>";
$html = '<a href='.url('queue/'.$id.'/activate')." class='btn btn-primary'>".Lang::get('lang.activate').'</a>';
if ($status == 1) {
$html = "<a href='#' class='btn btn-primary' disabled>".Lang::get('lang.activate').'</a>';
}
return $html;
}
public function isActivate(){
public function isActivate()
{
$check = true;
$settings = $this->extraFieldRelation()->get();
if($settings->count()==0){
if ($settings->count() == 0) {
$check = false;
}
return $check;
}
}