mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
add code and comment to tarifas envios
This commit is contained in:
@ -9,6 +9,9 @@ return [
|
|||||||
'isDeleted' => 'Is Deleted',
|
'isDeleted' => 'Is Deleted',
|
||||||
'moduleTitle' => 'Tarifas Envíos',
|
'moduleTitle' => 'Tarifas Envíos',
|
||||||
'nombre' => 'Nombre',
|
'nombre' => 'Nombre',
|
||||||
|
'code' => 'Código',
|
||||||
|
'comment' => 'Comentario',
|
||||||
|
'comment_placeholder' => 'Inserte un comentario',
|
||||||
'paisId' => 'Pais',
|
'paisId' => 'Pais',
|
||||||
'tarifaEnvio' => 'Tarifa Envío',
|
'tarifaEnvio' => 'Tarifa Envío',
|
||||||
'tarifaEnvioList' => 'Lista Tarifas Envío',
|
'tarifaEnvioList' => 'Lista Tarifas Envío',
|
||||||
|
|||||||
@ -74,7 +74,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel
|
|||||||
*/
|
*/
|
||||||
public function getResource(string $search = "")
|
public function getResource(string $search = "")
|
||||||
{
|
{
|
||||||
$builder = $this->db->table($this->table . " t1")->select("t1.id as id, t1.nombre AS nombre, t2.nombre AS pais_id");
|
$builder = $this->db->table($this->table . " t1")->select("t1.id as id, t1.nombre AS nombre,t1.code AS code, t2.nombre AS pais_id");
|
||||||
$builder->join("lg_paises t2", "t1.pais_id = t2.id", "left");
|
$builder->join("lg_paises t2", "t1.pais_id = t2.id", "left");
|
||||||
|
|
||||||
//JJO
|
//JJO
|
||||||
@ -85,6 +85,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel
|
|||||||
: $builder
|
: $builder
|
||||||
->groupStart()
|
->groupStart()
|
||||||
->like("t1.nombre", $search)
|
->like("t1.nombre", $search)
|
||||||
|
->orLike("t2.code", $search)
|
||||||
->orLike("t2.id", $search)
|
->orLike("t2.id", $search)
|
||||||
->orLike("t1.pais_id", $search)
|
->orLike("t1.pais_id", $search)
|
||||||
->orLike("t1.nombre", $search)
|
->orLike("t1.nombre", $search)
|
||||||
|
|||||||
@ -88,6 +88,7 @@
|
|||||||
],
|
],
|
||||||
columns : [
|
columns : [
|
||||||
{ 'data': 'nombre' },
|
{ 'data': 'nombre' },
|
||||||
|
{ 'data': 'code' },
|
||||||
{ 'data': 'pais_id' },
|
{ 'data': 'pais_id' },
|
||||||
{ 'data': actionBtns }
|
{ 'data': actionBtns }
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user