Merge branch 'main' into 'mod/presupuesto_admin'

Main

See merge request jjimenez/safekat!478
This commit is contained in:
2025-01-18 11:02:48 +00:00
23 changed files with 412 additions and 395 deletions

View File

@ -3,6 +3,9 @@
namespace App\Models\Configuracion;
use App\Entities\Tarifas\Maquinas\TareaMaquinaEntity;
use CodeIgniter\Database\BaseBuilder;
use CodeIgniter\Database\MySQLi\Builder;
use CodeIgniter\Database\Query;
use CodeIgniter\Model;
class MaquinaTareaModel extends Model
@ -55,14 +58,19 @@ class MaquinaTareaModel extends Model
* @return array
*
*/
public function getSelectQuery(?string $q = null) : array
public function getSelectQuery(?string $q = null): array
{
$query = $this->builder()->select(["id","name","description"])
->where("deleted_at",null);
if($q){
$query->like("nombre",$q);
$query = $this->builder()->select(["id", "name", "description"])
->where("deleted_at", null);
if ($q) {
$query->like("nombre", $q);
}
return $query->get()->getResultArray();
}
public function getQueryDatatable(): BaseBuilder
{
return $this->builder()->select(["id","name","description","created_at"])
->where("deleted_at", null);
}
}