cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #235 from ladybirdweb/analysis-zO50Ll

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Manish Verma
2016-10-10 19:08:32 +05:30
committed by GitHub
parent 8943243c85 c64bc8c465
commit 5e5d19a13b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Agent/helpdesk/MailController.php
View File

@@ -120,7 +120,6 @@ class MailController extends Controller
$mail = $mailbox->getMail($mailId);
try {
$mail = $mailbox->getMail($mailId);
} catch (\PhpImap\Exception $e) {
echo 'Connection error';
}
@@ -172,7 +171,7 @@ class MailController extends Controller
} else {
$subject = 'No Subject';
}
$to = $mail->to;
$fromname = $mail->fromName;
$fromaddress = $mail->fromAddress;

3
app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php
View File

@@ -52,7 +52,7 @@ class TicketWorkflowController extends Controller
if ($workflow) {
// get all the rules of workflow which has a foreign key of those workflow which are applied to creating any ticket from any source
$workflow_rules = WorkflowRules::where('workflow_id', '=', $workflow->id)->get();
foreach ($workflow_rules as $workflow_rule) {
// checking for the workflow rules to which workflow rule type it is
if ($workflow_rule->matching_scenario == 'email') {
@@ -124,7 +124,6 @@ class TicketWorkflowController extends Controller
$ticket_settings_details = $this->applyActionCondition($workflows_email->id, $ticket_settings_details);
}
} elseif ($workflow_rule->matching_scenario == 'email_to') {
foreach ($contact_details['email_to'] as $email_toaddress => $email_toname) {
if ($rule_condition = $this->checkRuleCondition($email_toaddress, $workflow_rule->matching_relation, $workflow_rule->matching_value) == true) {
$ticket_settings_details = $this->applyActionCondition($workflows_email->id, $ticket_settings_details);