diff --git a/admin/survey/classes/objects/obj.MailAdapter.php b/admin/survey/classes/objects/obj.MailAdapter.php index c970ba0b7..1eec08100 100644 --- a/admin/survey/classes/objects/obj.MailAdapter.php +++ b/admin/survey/classes/objects/obj.MailAdapter.php @@ -22,6 +22,7 @@ class MailAdapter{ * "alert" - email obvescanje (aktivacija ankete, zakljucena anketa, arhiv ankete...) * "admin" - email povezan z administracijo (alerti za admine) * "account" - email povezan z upravljanjem racuna (dodan dostop do anket...) + * "payments" - email povezan s placili paketov (posiljanje racunov, predracunov...) */ private $type = ''; @@ -138,7 +139,7 @@ class MailAdapter{ $this->settings['1ka']['SMTPReplyTo'] = $email_server_settings['secondary_mail']['SMTPReplyTo']; $this->settings['1ka']['SMTPUsername'] = $email_server_settings['secondary_mail']['SMTPUsername']; $this->settings['1ka']['SMTPPassword'] = $email_server_settings['secondary_mail']['SMTPPassword']; - } + } } // Nimamo se nicesar v bazi - nastavimo default nastavitve else{ @@ -223,6 +224,15 @@ class MailAdapter{ if(isset($email_server_settings['SMTPSecure'])) $this->settings['smtp']['SMTPSecure'] = $email_server_settings['SMTPSecure']; + + // ce posiljamo v povezavi s placili (racuni, predracuni...) - posiljamo preko tretjega maila (invoice@1ka.si) + if($this->type == 'payments' && isset($email_server_settings['payments_mail'])){ + $this->settings['smtp']['SMTPFrom'] = $email_server_settings['payments_mail']['SMTPFrom']; + $this->settings['smtp']['SMTPFromNice'] = $email_server_settings['payments_mail']['SMTPFromNice']; + $this->settings['smtp']['SMTPReplyTo'] = $email_server_settings['payments_mail']['SMTPReplyTo']; + $this->settings['smtp']['SMTPUsername'] = $email_server_settings['payments_mail']['SMTPUsername']; + $this->settings['smtp']['SMTPPassword'] = $email_server_settings['payments_mail']['SMTPPassword']; + } } diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index 1b939bae9..c6311aac6 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -751,7 +751,7 @@ class UserNarocila{ $content .= $signature; try{ - $MA = new MailAdapter(); + $MA = new MailAdapter($anketa=null, $type='payments'); $MA->addRecipients($narocilo_data['email']); @@ -974,7 +974,7 @@ class UserNarocila{ $content .= $signature; try{ - $MA = new MailAdapter(); + $MA = new MailAdapter($anketa=null, $type='payments'); $MA->addRecipients($rowNarocilo['email']); $resultX = $MA->sendMail($content, $subject); } @@ -1008,7 +1008,7 @@ class UserNarocila{ $content .= $signature; try{ - $MA = new MailAdapter(); + $MA = new MailAdapter($anketa=null, $type='payments'); $MA->addRecipients($rowNarocilo['email']);