diff --git a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php index cc068a0b..805fc250 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php @@ -267,6 +267,13 @@ class Papelimpresiontipologias extends \App\Controllers\GoBaseResourceController ->validator( 'Validate::notEmpty',array( 'message' => lang('ImpresionTipologias.validation.amarillo.required') ) ), + Field::inst( 'cg' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.amarillo.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.amarillo.required') ) + ), Field::inst( 'gota_negro' ) ->validator( 'Validate::numeric', array( 'message' => lang('ImpresionTipologias.validation.gota_negro.decimal') ) diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php index add9d42e..dda86d55 100755 --- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php +++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php @@ -728,6 +728,7 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController $parametrosInkjet->rotativa_cyan = $datosTipologias[0]->cyan; $parametrosInkjet->rotativa_magenta = $datosTipologias[0]->magenta; $parametrosInkjet->rotativa_amarillo = $datosTipologias[0]->amarillo; + $parametrosInkjet->rotativa_cg = $datosTipologias[0]->cg; } $tarifamodel = new MaquinasTarifasImpresionModel(); diff --git a/ci4/app/Entities/Configuracion/Maquina.php b/ci4/app/Entities/Configuracion/Maquina.php index e508f8dc..11b5496b 100755 --- a/ci4/app/Entities/Configuracion/Maquina.php +++ b/ci4/app/Entities/Configuracion/Maquina.php @@ -25,6 +25,7 @@ class Maquina extends \CodeIgniter\Entity\Entity "precio_tinta_negro" => 0.0, "is_inkjet" => false, "precio_tinta_color" => 0.0, + "precio_tinta_cg" => 0.0, "velocidad_corte" => 0.0, "precio_hora_corte" => 0.0, "metrosxminuto" => 0.0, @@ -54,6 +55,7 @@ class Maquina extends \CodeIgniter\Entity\Entity "precio_tinta_negro" => "float", "is_inkjet" => "boolean", "precio_tinta_color" => "float", + "precio_tinta_cg" => "float", "velocidad_corte" => "float", "precio_hora_corte" => "float", "forzar_num_formas_horizontales_cubierta" => "?int", diff --git a/ci4/app/Entities/Configuracion/PapelImpresionTipologia.php b/ci4/app/Entities/Configuracion/PapelImpresionTipologia.php index c6f2cb16..5eb32465 100755 --- a/ci4/app/Entities/Configuracion/PapelImpresionTipologia.php +++ b/ci4/app/Entities/Configuracion/PapelImpresionTipologia.php @@ -13,6 +13,7 @@ class PapelImpresionTipologia extends \CodeIgniter\Entity\Entity "cyan" => 0.0, "magenta" => 0.0, "amarillo" => 0.0, + "cg" => 0.0, "gota_negro" => 0.0, "gota_color" => 0.0, ]; @@ -22,6 +23,7 @@ class PapelImpresionTipologia extends \CodeIgniter\Entity\Entity "cyan" => "float", "magenta" => "float", "amarillo" => "float", + "cg" => "float", "gota_negro" => "float", "gota_color" => "float", ]; diff --git a/ci4/app/Language/en/ImpresionTipologias.php b/ci4/app/Language/en/ImpresionTipologias.php index 79a0b197..24ff6259 100755 --- a/ci4/app/Language/en/ImpresionTipologias.php +++ b/ci4/app/Language/en/ImpresionTipologias.php @@ -3,6 +3,7 @@ return [ + 'cg' => 'CG', 'amarillo' => 'Yellow', 'bicolor' => 'Bicolor', 'color' => 'Color', diff --git a/ci4/app/Language/es/ImpresionTipologias.php b/ci4/app/Language/es/ImpresionTipologias.php index 57a37faa..b4e7d7d7 100755 --- a/ci4/app/Language/es/ImpresionTipologias.php +++ b/ci4/app/Language/es/ImpresionTipologias.php @@ -3,6 +3,7 @@ return [ + 'cg' => 'CG', 'amarillo' => 'Amarillo', 'bicolor' => 'Bicolor', 'color' => 'Color', diff --git a/ci4/app/Language/es/Maquinas.php b/ci4/app/Language/es/Maquinas.php index 5906df9f..1c8cfd7f 100755 --- a/ci4/app/Language/es/Maquinas.php +++ b/ci4/app/Language/es/Maquinas.php @@ -33,6 +33,7 @@ return [ 'ordenPlanning' => 'Orden Planning', 'padreId' => 'Variante', 'precioHoraCorte' => 'Precio Hora Corte', + 'precioTintaCG' => 'Precio Tinta CG', 'precioTintaColor' => 'Precio Tinta Color', 'precioTintaNegro' => 'Precio Tinta Negro', 'tipo' => 'Tipo', @@ -130,6 +131,12 @@ return [ ], + 'precio_tinta_cg' => [ + 'decimal' => 'El campo {field} debe contener un número decimal.', + 'required' => 'El campo {field} es obligatorio.', + + ], + 'precio_tinta_color' => [ 'decimal' => 'El campo {field} debe contener un número decimal.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Models/Configuracion/MaquinaModel.php b/ci4/app/Models/Configuracion/MaquinaModel.php index 9f9de24e..e59f6f9b 100755 --- a/ci4/app/Models/Configuracion/MaquinaModel.php +++ b/ci4/app/Models/Configuracion/MaquinaModel.php @@ -50,6 +50,7 @@ class MaquinaModel extends \App\Models\GoBaseModel "precio_tinta_negro", "is_inkjet", "precio_tinta_color", + "precio_tinta_cg", "velocidad_corte", "precio_hora_corte", "metrosxminuto", @@ -131,6 +132,10 @@ class MaquinaModel extends \App\Models\GoBaseModel "label" => "Maquinas.precioHoraCorte", "rules" => "decimal", ], + "precio_tinta_cg" => [ + "label" => "Maquinas.precioTintaColor", + "rules" => "decimal", + ], "precio_tinta_color" => [ "label" => "Maquinas.precioTintaColor", "rules" => "decimal", @@ -297,7 +302,7 @@ class MaquinaModel extends \App\Models\GoBaseModel ->select( "t1.id AS id, t1.nombre AS nombre, t1.is_padre AS is_padre, t1.tipo AS tipo, t1.velocidad AS velocidad, t1.ancho AS ancho, t1.alto AS alto, t1.ancho_impresion AS ancho_impresion, t1.alto_impresion AS alto_impresion, t1.alto_click AS alto_click, t1.min AS min, t1.max AS max, t1.duracion_jornada AS duracion_jornada, t1.orden_planning AS orden_planning, t1.is_rotativa AS is_rotativa, t1.precio_tinta_negro AS precio_tinta_negro, - t1.is_inkjet AS is_inkjet, t1.precio_tinta_color AS precio_tinta_color, t1.velocidad_corte AS velocidad_corte, + t1.is_inkjet AS is_inkjet, t1.precio_tinta_color AS precio_tinta_color, t1.precio_tinta_cg AS precio_tinta_cg, t1.velocidad_corte AS velocidad_corte, t1.precio_hora_corte AS precio_hora_corte, t1.metrosxminuto AS metrosxminuto, t1.forzar_num_formas_horizontales_cubierta AS forzar_num_formas_horizontales_cubierta, t1.forzar_num_formas_verticales_cubierta AS forzar_num_formas_verticales_cubierta, diff --git a/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php b/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php index f5e47534..bf73cbdc 100755 --- a/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php +++ b/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php @@ -19,6 +19,7 @@ class PapelImpresionTipologiaModel extends \App\Models\GoBaseModel "cyan", "magenta", "amarillo", + "cg", "gota_negro", "gota_color", ]; @@ -27,6 +28,11 @@ class PapelImpresionTipologiaModel extends \App\Models\GoBaseModel public static $labelField = "tipo"; protected $validationRules = [ + "cg"=> [ + "label" => "ImpresionTipologias.cg", + "rules" => "required|decimal", + ], + "amarillo" => [ "label" => "ImpresionTipologias.amarillo", "rules" => "required|decimal", diff --git a/ci4/app/Services/PresupuestoService.php b/ci4/app/Services/PresupuestoService.php index 46cf88e3..c8416175 100755 --- a/ci4/app/Services/PresupuestoService.php +++ b/ci4/app/Services/PresupuestoService.php @@ -285,6 +285,15 @@ class PresupuestoService extends BaseService round(($data['peso_gotas_magenta_pedido'] / 1000.0) * $maquina->precio_tinta_color, 2) + round(($data['peso_gotas_amarillo_pedido'] / 1000.0) * $maquina->precio_tinta_color, 2) , 2); + + // Esta calculado para color + if($maquina->is_inkjet){ + $data['num_gotas_cg'] = round($data['superficie'] * $data['resolucion'] * $data['resolucion'] * ($parametros->rotativa_cg / 100.0), 0); + $data['peso_gotas_cg'] = round((($data['num_gotas_cg'] * $parametros->rotativa_gota_color * $data['pulgada']) / (17.65 / 20.0)) * $pag_color * 1000, 6); + $data['peso_gotas_cg_pedido'] = round($data['peso_gotas_cg'], 2) * ($datosPedido->tirada + $datosPedido->merma); + + $data['precio_tinta'] += round(($data['peso_gotas_cg_pedido'] / 1000.0) * $maquina->precio_tinta_cg, 2); + } // precio pagina $data['precio_pagina_negro'] = round($pag_negro ? $data['precio_tinta'] / ($pag_negro * ($datosPedido->tirada + $datosPedido->merma)) : 0, 6); diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php index 55c17415..c8564185 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php @@ -174,13 +174,9 @@ - is_rotativa == false && $maquina->is_inkjet == false): ?> -