Merge branch 'main' into 'dev/views'

# Conflicts:
#   ci4/.env
#   ci4/app/Controllers/Test.php
This commit is contained in:
Ignacio Martinez Navajas
2023-06-20 13:30:37 +00:00
17 changed files with 1220 additions and 357 deletions

View File

@ -15,14 +15,11 @@ class Test extends BaseController
public function index()
{
$t_model = new TarifaAcabadoLineaModel();
$count = $t_model->select('*')
->where(array( 'tarifa_acabado_id'=> 13,
'tirada_min'=> 1,
'tirada_max'=> 1,
'is_deleted'=> 0))
->countAllResults();
var_dump($count);
/*
$papel = new Papelesimpresion();
var_dump($papel->datatablePG());*/
return redirect()->to(site_url('tarifas/tarifaacabado/edit/'. 30))->with('sweet-success', 'OK');
//return redirect()->to('https://sk-jjo.imnavajas.es/tarifas/tarifaacabado/edit/30');
}
}