diff --git a/ci4/app/Entities/Configuracion/PapelImpresion.php b/ci4/app/Entities/Configuracion/PapelImpresion.php index a68402f0..0e890e9a 100644 --- a/ci4/app/Entities/Configuracion/PapelImpresion.php +++ b/ci4/app/Entities/Configuracion/PapelImpresion.php @@ -22,8 +22,8 @@ class PapelImpresion extends \CodeIgniter\Entity\Entity "precio_pliego" => null, "bn" => true, "color" => true, - "portada" => false, "cubierta" => false, + "sobrecubierta" => false, "rotativa" => false, "is_deleted" => 0, "created_at" => null, @@ -42,8 +42,8 @@ class PapelImpresion extends \CodeIgniter\Entity\Entity "precio_pliego" => "float", "bn" => "boolean", "color" => "boolean", - "portada" => "boolean", "cubierta" => "boolean", + "sobrecubierta" => "boolean", "rotativa" => "boolean", "is_deleted" => "int", ]; diff --git a/ci4/app/Language/en/PapelImpresion.php b/ci4/app/Language/en/PapelImpresion.php index 6fd0222e..605450be 100644 --- a/ci4/app/Language/en/PapelImpresion.php +++ b/ci4/app/Language/en/PapelImpresion.php @@ -9,6 +9,7 @@ return [ 'color' => 'Colour', 'createdAt' => 'Created At', 'cubierta' => 'Cover', + 'sobrecubierta' => 'Dust jacket', 'defecto' => 'Default', 'deletedAt' => 'Deleted At', 'espesor' => 'Thickness', @@ -25,7 +26,6 @@ return [ 'papelesImpresion' => 'Print papers', 'papelesimpresion' => 'Print papers', 'pesoPorPliego' => 'Weight per sheet', - 'portada' => 'Cover', 'precioPliego' => 'Sheet price', 'precioTonelada' => 'Ton price', 'referencia' => 'Reference', diff --git a/ci4/app/Language/es/PapelImpresion.php b/ci4/app/Language/es/PapelImpresion.php index 3524238e..32152c72 100644 --- a/ci4/app/Language/es/PapelImpresion.php +++ b/ci4/app/Language/es/PapelImpresion.php @@ -9,6 +9,7 @@ return [ 'color' => 'Color', 'createdAt' => 'Creado en', 'cubierta' => 'Cubierta', + 'sobrecubierta' => 'Sobrecubierta', 'defecto' => 'Por defecto', 'deletedAt' => 'Borrado en', 'espesor' => 'Espesor', @@ -25,7 +26,6 @@ return [ 'papelesImpresion' => 'Papeles Impresion', 'papelesimpresion' => 'Papeles Impresion', 'pesoPorPliego' => 'Peso Por Pliego', - 'portada' => 'Portada', 'precioPliego' => 'Precio Pliego', 'precioTonelada' => 'Precio Tonelada', 'referencia' => 'Referencia', diff --git a/ci4/app/Models/Configuracion/PapelImpresionModel.php b/ci4/app/Models/Configuracion/PapelImpresionModel.php index be0b7714..5bff620a 100644 --- a/ci4/app/Models/Configuracion/PapelImpresionModel.php +++ b/ci4/app/Models/Configuracion/PapelImpresionModel.php @@ -63,8 +63,8 @@ class PapelImpresionModel extends \App\Models\GoBaseModel "precio_pliego", "bn", "color", - "portada", "cubierta", + "sobrecubierta", "rotativa", "isActivo", "deleted_at", @@ -84,95 +84,95 @@ class PapelImpresionModel extends \App\Models\GoBaseModel protected $validationRules = [ "alto" => [ - "label" => "PapelImpresions.alto", + "label" => "PapelImpresion.alto", "rules" => "required|decimal", ], "ancho" => [ - "label" => "PapelImpresions.ancho", + "label" => "PapelImpresion.ancho", "rules" => "required|decimal", ], "espesor" => [ - "label" => "PapelImpresions.espesor", + "label" => "PapelImpresion.espesor", "rules" => "required|decimal", ], "gramaje" => [ - "label" => "PapelImpresions.gramaje", + "label" => "PapelImpresion.gramaje", "rules" => "required|decimal", ], "mano" => [ - "label" => "PapelImpresions.mano", + "label" => "PapelImpresion.mano", "rules" => "required|decimal", ], "margen" => [ - "label" => "PapelImpresions.margen", + "label" => "PapelImpresion.margen", "rules" => "required|max_length[31]", ], "nombre" => [ - "label" => "PapelImpresions.nombre", + "label" => "PapelImpresion.nombre", "rules" => "trim|required|max_length[255]", ], "peso_por_pliego" => [ - "label" => "PapelImpresions.pesoPorPliego", + "label" => "PapelImpresion.pesoPorPliego", "rules" => "required|decimal", ], "precio_pliego" => [ - "label" => "PapelImpresions.precioPliego", + "label" => "PapelImpresion.precioPliego", "rules" => "required|decimal", ], "precio_tonelada" => [ - "label" => "PapelImpresions.precioTonelada", + "label" => "PapelImpresion.precioTonelada", "rules" => "required|decimal", ], "referencia" => [ - "label" => "PapelImpresions.referencia", - "rules" => "trim|required|max_length[13]", + "label" => "PapelImpresion.referencia", + "rules" => "trim|max_length[13]", ], ]; protected $validationMessages = [ "alto" => [ - "decimal" => "PapelImpresions.validation.alto.decimal", - "required" => "PapelImpresions.validation.alto.required", + "decimal" => "PapelImpresion.validation.alto.decimal", + "required" => "PapelImpresion.validation.alto.required", ], "ancho" => [ - "decimal" => "PapelImpresions.validation.ancho.decimal", - "required" => "PapelImpresions.validation.ancho.required", + "decimal" => "PapelImpresion.validation.ancho.decimal", + "required" => "PapelImpresion.validation.ancho.required", ], "espesor" => [ - "decimal" => "PapelImpresions.validation.espesor.decimal", - "required" => "PapelImpresions.validation.espesor.required", + "decimal" => "PapelImpresion.validation.espesor.decimal", + "required" => "PapelImpresion.validation.espesor.required", ], "gramaje" => [ - "decimal" => "PapelImpresions.validation.gramaje.decimal", - "required" => "PapelImpresions.validation.gramaje.required", + "decimal" => "PapelImpresion.validation.gramaje.decimal", + "required" => "PapelImpresion.validation.gramaje.required", ], "mano" => [ - "decimal" => "PapelImpresions.validation.mano.decimal", - "required" => "PapelImpresions.validation.mano.required", + "decimal" => "PapelImpresion.validation.mano.decimal", + "required" => "PapelImpresion.validation.mano.required", ], "margen" => [ - "max_length" => "PapelImpresions.validation.margen.max_length", - "required" => "PapelImpresions.validation.margen.required", + "max_length" => "PapelImpresion.validation.margen.max_length", + "required" => "PapelImpresion.validation.margen.required", ], "nombre" => [ - "max_length" => "PapelImpresions.validation.nombre.max_length", - "required" => "PapelImpresions.validation.nombre.required", + "max_length" => "PapelImpresion.validation.nombre.max_length", + "required" => "PapelImpresion.validation.nombre.required", ], "peso_por_pliego" => [ - "decimal" => "PapelImpresions.validation.peso_por_pliego.decimal", - "required" => "PapelImpresions.validation.peso_por_pliego.required", + "decimal" => "PapelImpresion.validation.peso_por_pliego.decimal", + "required" => "PapelImpresion.validation.peso_por_pliego.required", ], "precio_pliego" => [ - "decimal" => "PapelImpresions.validation.precio_pliego.decimal", - "required" => "PapelImpresions.validation.precio_pliego.required", + "decimal" => "PapelImpresion.validation.precio_pliego.decimal", + "required" => "PapelImpresion.validation.precio_pliego.required", ], "precio_tonelada" => [ - "decimal" => "PapelImpresions.validation.precio_tonelada.decimal", - "required" => "PapelImpresions.validation.precio_tonelada.required", + "decimal" => "PapelImpresion.validation.precio_tonelada.decimal", + "required" => "PapelImpresion.validation.precio_tonelada.required", ], "referencia" => [ - "max_length" => "PapelImpresions.validation.referencia.max_length", - "required" => "PapelImpresions.validation.referencia.required", + "max_length" => "PapelImpresion.validation.referencia.max_length", + //"required" => "PapelImpresion.validation.referencia.required", ], ]; @@ -209,7 +209,7 @@ class PapelImpresionModel extends \App\Models\GoBaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS id, t1.nombre AS nombre, t1.defecto AS defecto, t1.referencia AS referencia, t1.ancho AS ancho, t1.alto AS alto, t1.mano AS mano, t1.espesor AS espesor, t1.gramaje AS gramaje, t1.precio_tonelada AS precio_tonelada, t1.margen AS margen, t1.peso_por_pliego AS peso_por_pliego, t1.precio_pliego AS precio_pliego, t1.bn AS bn, t1.color AS color, t1.portada AS portada, t1.cubierta AS cubierta, t1.rotativa AS rotativa, t1.isActivo AS isActivo, t2.nombre AS papel_generico_id" + "t1.id AS id, t1.nombre AS nombre, t1.defecto AS defecto, t1.referencia AS referencia, t1.ancho AS ancho, t1.alto AS alto, t1.mano AS mano, t1.espesor AS espesor, t1.gramaje AS gramaje, t1.precio_tonelada AS precio_tonelada, t1.margen AS margen, t1.peso_por_pliego AS peso_por_pliego, t1.precio_pliego AS precio_pliego, t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta, t1.rotativa AS rotativa, t1.isActivo AS isActivo, t2.nombre AS papel_generico_id" ); $builder->join("lg_papel_generico t2", "t1.papel_generico_id = t2.id", "left"); diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php index 3b5144e8..30633eab 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php @@ -10,9 +10,9 @@
- +
@@ -56,9 +56,9 @@
-
@@ -152,9 +152,9 @@
-
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php index 4a476df1..dbfbe5ae 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php @@ -22,8 +22,8 @@ - + @@ -97,8 +97,8 @@ { 'data': 'gramaje' }, { 'data': 'bn' }, { 'data': 'color' }, - { 'data': 'portada' }, { 'data': 'cubierta' }, + { 'data': 'sobrecubierta' }, { 'data': 'rotativa' }, { 'data': 'isActivo' }, { 'data': actionBtns }