jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'add/calculo_credito_cliente'

Browse Source 
Main

See merge request jjimenez/safekat!614
This commit is contained in:
Jaime Jimenez Ortega
2025-03-27 11:24:03 +00:00
parent 793f378f98 670c10fdde
commit 3430b2d9d1
7 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Controllers/Presupuestos/Presupuestoadmin.php
View File

@ -399,6 +399,8 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$this->viewData['formAction'] = route_to('updatePresupuestoAdmin', $id);
$this->viewData['cliente_id'] = $presupuestoEntity->cliente_id;
// Si se ha llamado a esta funcion porque se ha duplicado el presupuesto
// se actualiza la bbdd para que sólo ejecute algunas funciones una vez
if ($presupuestoEntity->is_duplicado) {

39
ci4/app/Controllers/Soporte/Ticketcontroller.php
View File

@ -60,43 +60,10 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
private function sendMail($subject, $body, $recipient)
{
$settings_model = new SettingsModel();
$config = $settings_model->first()->toArray();
$gateway = $config['email_gateway'];
$body = html_entity_decode($body);
// Funcion wrapper para el servicio de envio de correos dentro de la fucionalidad previa
$emailService = service('emailService');
if ($gateway == 'smtp') {
try {
//https://codeigniter.com/user_guide/libraries/email.html
$email = \Config\Services::email();
$config['protocol'] = $config['email_gateway'];
$config['SMTPHost'] = $config['email_smtp'];
$config['SMTPUser'] = $config['email_address'];
$config['SMTPPass'] = $config['email_pass'];
$config['SMTPPort'] = intval($config['email_port']);
$config['SMTPCrypto'] = $config['email_cert'] == 'none' ? '' : $config['email_cert'];
$config['SMTPTimeout'] = 15;
$config['mailType'] = 'html';
$config['wordWrap'] = true;
$email->initialize($config);
$email->setFrom($config['email_address'], $config['email_name']);
$email->setTo($recipient);
$email->setSubject($subject);
$email->setMessage($body);
if (!$email->send()) {
return false;
} else {
return true;
}
} catch (\Exception $ex) {
return false;
}
}
return false;
return $emailService->send($subject, $body, $recipient);
}
public function add()