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

tarifas acabado/manipulado/preimpresion terminadas. Faltan envios

Browse Source
This commit is contained in:
Jaime Jimenez
2023-05-17 20:38:05 +02:00
parent 39598b697d
commit 5788d392d9
16 changed files with 154 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Controllers/GoBaseController.php
View File

@ -228,7 +228,7 @@ abstract class GoBaseController extends Controller {
if (isset($this->primaryModel) && isset(static::$singularObjectNameCc) && !empty(static::$singularObjectNameCc) && !isset($this->viewData[(static::$singularObjectNameCc) . 'List'])) {
//JJO
if ($this->soft_delete):
$this->viewData[(static::$singularObjectNameCc) . 'List'] = $this->primaryModel->asObject()->where('is_deletedadad', 0)->findAll();
$this->viewData[(static::$singularObjectNameCc) . 'List'] = $this->primaryModel->asObject()->where('is_deleted', 0)->findAll();
else:
$this->viewData[(static::$singularObjectNameCc) . 'List'] = $this->primaryModel->asObject()->findAll();
endif;
@ -347,7 +347,7 @@ abstract class GoBaseController extends Controller {
if (!isset($error)) :
try {
if ($deletePermanently && !$this->soft_delete) :
if (is_numeric($id)) :
if (is_numeric($id)) :
$rawResult = $this->primaryModel->delete($id);
else:
$rawResult = $this->primaryModel->where($this->primaryModel->getPrimaryKeyName(), $id)->delete();