mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
Desarrollo de funcionalidad: pruebas!!
This commit is contained in:
4
ci4/.env
4
ci4/.env
@ -22,8 +22,8 @@ CI_ENVIRONMENT = development
|
|||||||
# APP
|
# APP
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
|
|
||||||
app.baseURL = 'https://sk-jjo.imnavajas.es'
|
#app.baseURL = 'https://sk-jjo.imnavajas.es'
|
||||||
# app.baseURL = 'https://sk-imn.imnavajas.es'
|
app.baseURL = 'https://sk-imn.imnavajas.es'
|
||||||
# app.baseURL = "http://safekat.test/"
|
# app.baseURL = "http://safekat.test/"
|
||||||
# app.forceGlobalSecureRequests = false
|
# app.forceGlobalSecureRequests = false
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@ class PresupuestoModel extends \App\Models\GoBaseModel
|
|||||||
6 => "t1.inc_rei",
|
6 => "t1.inc_rei",
|
||||||
7 => "t1.paginas",
|
7 => "t1.paginas",
|
||||||
8 => "t1.tirada",
|
8 => "t1.tirada",
|
||||||
9 => "t1.total_pedido",
|
9 => "t1.total_presupuesto",
|
||||||
10 => "t6.estado",
|
10 => "t6.estado",
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -314,7 +314,7 @@ class PresupuestoModel extends \App\Models\GoBaseModel
|
|||||||
"t1.id AS id, t1.created_at AS fecha, t2.nombre AS cliente,
|
"t1.id AS id, t1.created_at AS fecha, t2.nombre AS cliente,
|
||||||
CONCAT(t3.first_name, ' ', t3.last_name) AS comercial, t1.titulo AS titulo,
|
CONCAT(t3.first_name, ' ', t3.last_name) AS comercial, t1.titulo AS titulo,
|
||||||
t5.nombre AS pais, t1.inc_rei AS inc_rei, t1.paginas AS paginas, t1.tirada AS tirada,
|
t5.nombre AS pais, t1.inc_rei AS inc_rei, t1.paginas AS paginas, t1.tirada AS tirada,
|
||||||
t1.total_pedido AS total_pedido, t1.total_presupuesto AS total_presupuesto, t6.estado AS estado"
|
t1.total_presupuesto AS total_presupuesto, t1.total_presupuesto AS total_presupuesto, t6.estado AS estado"
|
||||||
);
|
);
|
||||||
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
|
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
|
||||||
$builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
|
$builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
|
||||||
|
|||||||
@ -118,7 +118,7 @@
|
|||||||
$('.dataTables_processing').hide();
|
$('.dataTables_processing').hide();
|
||||||
const theData = jqXHR.responseJSON;
|
const theData = jqXHR.responseJSON;
|
||||||
drawCallback(theData);
|
drawCallback(theData);
|
||||||
popErrorAlert(jqXHR.responseJSON.messages.error)
|
popErrorAlert(jqXHR.responseJSON.message)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -364,7 +364,7 @@ const actionBtns_lp = function(data) {
|
|||||||
`;
|
`;
|
||||||
};
|
};
|
||||||
|
|
||||||
var tableLineasPresupuesto = new DataTable('#tableLineasPresupuesto',{
|
window.tableLineasPresupuesto = new DataTable('#tableLineasPresupuesto',{
|
||||||
scrollX: true,
|
scrollX: true,
|
||||||
searching: false,
|
searching: false,
|
||||||
paging: false,
|
paging: false,
|
||||||
@ -376,6 +376,9 @@ var tableLineasPresupuesto = new DataTable('#tableLineasPresupuesto',{
|
|||||||
language: {
|
language: {
|
||||||
url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
|
url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
|
||||||
},
|
},
|
||||||
|
initComplete: function (settings, json) {
|
||||||
|
//getVisibleTabs();
|
||||||
|
},
|
||||||
columnDefs: [
|
columnDefs: [
|
||||||
{
|
{
|
||||||
targets: 0,
|
targets: 0,
|
||||||
|
|||||||
@ -739,8 +739,11 @@
|
|||||||
|
|
||||||
getVisibleTabs();
|
getVisibleTabs();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('#tab-pv-bn').on( "click", function() {
|
$('#tab-pv-bn').on( "click", function() {
|
||||||
|
|
||||||
|
|
||||||
previewInteriorPlana('bn');
|
previewInteriorPlana('bn');
|
||||||
|
|
||||||
} );
|
} );
|
||||||
|
|||||||
@ -463,6 +463,24 @@ function getObjetoLP(lpName) {
|
|||||||
|
|
||||||
function getVisibleTabs() {
|
function getVisibleTabs() {
|
||||||
|
|
||||||
|
window.tableLineasPresupuesto.rows().every( function ( rowIdx, tableLoop, rowLoop ) {
|
||||||
|
var rowData = this.data();
|
||||||
|
console.log(rowData.row_id);
|
||||||
|
$("#tab-pv-bn").show();
|
||||||
|
} );
|
||||||
|
|
||||||
|
/*
|
||||||
|
tableLineasPresupuesto.rows().data().every( function ( rowIdx, tableLoop, rowLoop ) {
|
||||||
|
var rowData = this.data();
|
||||||
|
console.log(rowData.row_id);
|
||||||
|
if ($('#' + rowData.row_id + '_checkPapel').prop('checked')) {
|
||||||
|
totalPapel += parseFloat($('#' + rowData.row_id + '_totalPapelPedido').val())
|
||||||
|
margenPapel += parseFloat($('#' + rowData.row_id + '_margenPapelPedido').val())
|
||||||
|
}
|
||||||
|
});*/
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
$("#tableLineasPresupuesto tbody tr").each(function () {
|
$("#tableLineasPresupuesto tbody tr").each(function () {
|
||||||
let isVisible = $(this).is(":visible");
|
let isVisible = $(this).is(":visible");
|
||||||
let lpName = $(this).attr('id').replace('lp_', '');
|
let lpName = $(this).attr('id').replace('lp_', '');
|
||||||
@ -514,30 +532,8 @@ function getVisibleTabs() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
$("#tableLineasPresupuesto tbody tr:hidden").each(function () {
|
|
||||||
|
|
||||||
//console.log("Hidden: " + $(this).attr('id'));
|
|
||||||
if ($(this).attr('id').indexOf('cubierta') > -1) {
|
|
||||||
$("#" + $(this).attr('id').replace('lp_', 'tab-pv-')).hide();
|
|
||||||
$("#" + $(this).attr('id').replace('lp_', 'tab-pv-esquema-')).hide();
|
|
||||||
$("#pv_cubierta").removeClass("active show");
|
|
||||||
$("#pv_esquema_cubierta").removeClass("active show");
|
|
||||||
} else if ($(this).attr('id').indexOf('_data') > -1) {
|
|
||||||
// Do nothing here
|
|
||||||
} else if ($(this).attr('id').indexOf('_rot') > -1) {
|
|
||||||
$("#" + $(this).attr('id').replace('lp_rot_', 'tab-pv-rot-')).hide();
|
|
||||||
$("#" + $(this).attr('id').replace('lp_', 'pv_')).removeClass("active show");
|
|
||||||
} else {
|
|
||||||
$("#" + $(this).attr('id').replace('lp_', 'tab-pv-')).hide();
|
|
||||||
$("#" + $(this).attr('id').replace('lp_', 'pv_')).removeClass("active show");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<?php if(str_contains($formAction,'edit')): ?>
|
<?php if(str_contains($formAction,'edit')): ?>
|
||||||
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems") ?>
|
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems") ?>
|
||||||
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems") ?>
|
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems") ?>
|
||||||
|
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_previewItems") ?>
|
||||||
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems") ?>
|
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems") ?>
|
||||||
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios") ?>
|
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios") ?>
|
||||||
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_comentariosItems") ?>
|
<?= view("themes/backend/vuexy/form/presupuestos/cosidotapablanda/_comentariosItems") ?>
|
||||||
|
|||||||
Reference in New Issue
Block a user