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

Merge branch 'bug/error_tipo_imp_color' into 'main'

Browse Source 
Arreglado el bug

See merge request jjimenez/safekat!133
This commit is contained in:
Jaime Jimenez Ortega
2024-01-18 07:44:44 +00:00
parent 9a08959eb8 3f5a6288bd
commit b2a5f39ab5
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php
View File

@ -1082,6 +1082,10 @@
$('#compPaginasNegrohq').val('0');
$('#compPaginasNegro').val($('#paginas').val())
if($('#tipoImpresion').select2('data')[0].id == 'negro'){
$('#compGramajeColor').val('').trigger('change')
$('#compPapelColor').val(0).trigger('change')
}
if( $('#tableCompIntPlana').DataTable().rows().count() > 0 &&
$('#tableCompIntPlana').DataTable().cell(0, 0).data().includes('hq')) {
@ -1101,6 +1105,11 @@
$('#compPaginasColor').val('0')
$('#compPaginasNegro').val('0')
$('#compPaginasNegrohq').val($('#paginas').val())
if($('#tipoImpresion').select2('data')[0].id == 'negrohq'){
$('#compGramajeColorhq').val('').trigger('change')
$('#compPapelColorhq').val(0).trigger('change')
}
if($('#tableCompIntPlana').DataTable().rows().count() > 0 &&
!$('#tableCompIntPlana').DataTable().cell(0, 0).data().includes('hq')) {
@ -1117,7 +1126,7 @@
})
function checkComparadorInt(is_color, is_hq, actualizarLinea=false) {
function checkComparadorInt(is_color, is_hq, actualizarLineaPlana=false, actualizarLineaRot=false) {
try{
@ -1134,11 +1143,11 @@
checkDatosPedidoForComp()) {
getLineasIntPlana(is_color, is_hq, actualizarLinea).then((result) =>{
getLineasIntPlana(is_color, is_hq, actualizarLineaPlana).then((result) =>{
// Para rotativa, si es color el papel y el gramaje tiene que ser igual
if(!is_color)
{
getLineasIntRot(is_hq, actualizarLinea);
getLineasIntRot(is_hq, actualizarLineaRot);
}
else
{
@ -1149,7 +1158,7 @@
if(($('#compPapelNegro').select2('data')[0].id == $('#compPapelColor').select2('data')[0].id &&
$('#compGramajeNegro').select2('data')[0].text.trim() == $('#compGramajeColor').select2('data')[0].text.trim()))
{
getLineasIntRot(is_hq, actualizarLinea);
getLineasIntRot(is_hq, actualizarLineaRot);
}
else
{

24
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php
View File

@ -3361,23 +3361,23 @@ function updateLineasPresupuesto(){
$('#tableLineasPresupuesto tbody tr:visible ').each(function(){
if(this.id.endsWith('_bn')){
checkComparadorInt(false, false, true);
if(this.id.endsWith('lp_bn')){
checkComparadorInt(false, false, true, false);
}
else if(this.id.endsWith('_bnhq')){
checkComparadorInt(false, true, true);
else if(this.id.endsWith('lp_bnhq')){
checkComparadorInt(false, true, true, false);
}
else if(this.id.endsWith('_color')){
checkComparadorInt(true, false, true);
else if(this.id.endsWith('lp_color')){
checkComparadorInt(true, false, true, false);
}
else if(this.id.endsWith('_colorhq')){
checkComparadorInt(true, true, true);
else if(this.id.endsWith('lp_colorhq')){
checkComparadorInt(true, true, true, false);
}
else if(this.id.endsWith('_rot_bn')){
checkComparadorInt(false, false, true)
else if(this.id.endsWith('lp_rot_bn')){
checkComparadorInt(false, false, false, true)
}
else if(this.id.endsWith('_rot_color')){
checkComparadorInt(false,true, true);
else if(this.id.endsWith('lp_rot_color')){
checkComparadorInt(false,true, false, true);
}
else if(this.id.endsWith('_cubierta')){
checkComparadorCubierta(true)