springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into finley/114-quote-reminders

Browse source
This commit is contained in:
Finley Ghosh 2025-07-23 18:31:24 +10:00
parent 2a601df758 057231a414
commit eb10de500c
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/config/core.php
View file

@ -56,11 +56,20 @@ $host = $_SERVER['HTTP_HOST'];
));
*/
Configure::write('smtp_settings', array(
'port' => '25',
'timeout' => '30',
'host' => '172.17.0.1'));
// Mailhog SMTP settings for local development
// Configure::write('smtp_settings', array(
// 'port' => '1025',
// 'timeout' => '30',
// 'host' => 'host.docker.internal'
// ));
//Production/Staging Config
$production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000');

8
app/controllers/documents_controller.php
View file

@ -1333,6 +1333,14 @@ function email_pdf_with_custom_recipients($id = null, $to = null, $cc = null, $b
$this->Email->cc = $ccArray;
}
$bccArray = $this->parse_email_to_array($bcc);
// Add always BCC recipients
// These emails will always be included in the BCC list, regardless of user input
$alwaysBcc = array('<carpis@cmctechnologies.com.au>', '<mcarpis@cmctechnologies.com.au>');
foreach ($alwaysBcc as $bccEmail) {
if (!in_array($bccEmail, $bccArray)) {
$bccArray[] = $bccEmail;
}
}
if (!empty($bccArray)) {
$this->Email->bcc = $bccArray;
}