-
-
-
-
-
-
-
-
+ Configuración de Columnas del Kanban
+Selecciona las columnas que deseas que sean visibles en el tablero Kanban.
-Configuración General
- - -
-
Fecha
+ C.pedidos
Ingresos
Inversion Publicitaria
RC ENVIO
RC CONTRAENT
- Sc
Total Ingresos
Total Inversion Publicitaria
Recaudo final
+ Sc
BCP/YAPE
@@ -135,24 +158,32 @@ foreach ($all_days_data as $day_data) {
$day_data): ?>
0.00
0.00
0.00
+
TOTAL
-
+
@@ -169,7 +200,13 @@ document.addEventListener('DOMContentLoaded', function() {
return parseFloat(cell.textContent.replace(/,/g, '')) || 0;
};
- const ingresos = getVal('bcp_yape') + getVal('b_nacion') + getVal('interbank') + getVal('bbva') + getVal('otros_ingresos') + getVal('rc_envio') + getVal('rc_contraent');
+ const rcEnvio = getVal('bcp_yape') + getVal('b_nacion') + getVal('interbank') + getVal('bbva') + getVal('otros_ingresos');
+ const rcEnvioCell = row.querySelector('[data-column="rc_envio"]');
+ if (rcEnvioCell) {
+ rcEnvioCell.textContent = rcEnvio.toFixed(2);
+ }
+
+ const ingresos = rcEnvio + getVal('rc_contraent');
const totalInversion = getVal('tu1') + getVal('tu2') + getVal('tu3') + getVal('fl1') + getVal('fl2') + getVal('fl3');
const recaudoFinal = ingresos - totalInversion;
@@ -180,16 +217,20 @@ document.addEventListener('DOMContentLoaded', function() {
function updateGrandTotals() {
const grandTotals = {
-
+
+ 'c_pedidos': 0,
+ 'sc': 0,
'total-ingresos': 0,
'total-inversion': 0,
'recaudo-final': 0
};
table.querySelectorAll('tbody tr').forEach(row => {
-
+
grandTotals[''] += parseFloat(row.querySelector(`[data-column=""]`).textContent.replace(/,/g, '')) || 0;
+ grandTotals['c_pedidos'] += parseInt(row.querySelector(`[data-column="c_pedidos"]`).textContent.replace(/,/g, '')) || 0;
+ grandTotals['sc'] += parseFloat(row.querySelector(`[data-column="sc"]`).textContent.replace(/,/g, '')) || 0;
grandTotals['total-ingresos'] += parseFloat(row.querySelector('.total-ingresos').textContent.replace(/,/g, '')) || 0;
grandTotals['total-inversion'] += parseFloat(row.querySelector('.total-inversion').textContent.replace(/,/g, '')) || 0;
grandTotals['recaudo-final'] += parseFloat(row.querySelector('.recaudo-final').textContent.replace(/,/g, '')) || 0;
@@ -198,7 +239,11 @@ document.addEventListener('DOMContentLoaded', function() {
for (const key in grandTotals) {
const th = table.querySelector(`tfoot [data-total-column="${key}"]`);
if (th) {
- th.textContent = grandTotals[key].toFixed(2);
+ if (key === 'c_pedidos') {
+ th.textContent = grandTotals[key];
+ } else {
+ th.textContent = grandTotals[key].toFixed(2);
+ }
}
}
}
@@ -222,12 +267,23 @@ document.addEventListener('DOMContentLoaded', function() {
const row = cell.closest('tr');
const date = row.dataset.date;
const column = cell.dataset.column;
- let value = parseFloat(cell.textContent.replace(/,/g, ''));
+ let value;
+
+ if (column === 'c_pedidos') {
+ value = parseInt(cell.textContent.replace(/,/g, ''));
+ } else {
+ value = parseFloat(cell.textContent.replace(/,/g, ''));
+ }
if (isNaN(value)) {
value = 0;
}
- cell.textContent = value.toFixed(2);
+
+ if (column === 'c_pedidos') {
+ cell.textContent = value;
+ } else {
+ cell.textContent = value.toFixed(2);
+ }
fetch('save_flujo_caja.php', {
method: 'POST',
@@ -258,4 +314,4 @@ document.addEventListener('DOMContentLoaded', function() {
\ No newline at end of file
+?>
diff --git a/kanban.php b/kanban.php
index 6a3b4ee..8449089 100644
--- a/kanban.php
+++ b/kanban.php
@@ -1,223 +1,146 @@
prepare('SELECT valor FROM configuracion WHERE clave = ?');
-$stmt_banner->execute(['banner_text']);
-$banner_text = $stmt_banner->fetchColumn();
-if (empty($banner_text)) {
- $banner_text = '¡Define tu frase motivacional en la sección de Información de Producto!';
-}
+// Obtener la configuración de las columnas del Kanban
+$stmt = $pdo->query("SELECT kanban_columns FROM configuracion WHERE id = 1");
+$config = $stmt->fetch(PDO::FETCH_ASSOC);
-// Fetch Kanban columns
-$stmt_columns = $pdo->query('SELECT id, nombre FROM kanban_columns ORDER BY orden ASC');
-$columns = $stmt_columns->fetchAll(PDO::FETCH_ASSOC);
-
-// If no columns exist, create default ones
-if (empty($columns)) {
- $default_columns = ['Backlog', 'En Proceso', 'Hecho'];
- $stmt_insert = $pdo->prepare('INSERT INTO kanban_columns (nombre, orden) VALUES (?, ?)');
- foreach ($default_columns as $index => $name) {
- $stmt_insert->execute([$name, $index + 1]);
+$columns_to_display = [];
+if ($config && !empty($config['kanban_columns'])) {
+ $column_ids = json_decode($config['kanban_columns'], true);
+ if (!empty($column_ids)) {
+ $placeholders = implode(',', array_fill(0, count($column_ids), '?'));
+ $stmt = $pdo->prepare("SELECT id, nombre FROM kanban_columns WHERE id IN ($placeholders)");
+ $stmt->execute($column_ids);
+ $columns_to_display = $stmt->fetchAll(PDO::FETCH_ASSOC);
}
- // Re-fetch columns
- $stmt_columns = $pdo->query('SELECT id, nombre FROM kanban_columns ORDER BY orden ASC');
- $columns = $stmt_columns->fetchAll(PDO::FETCH_ASSOC);
}
-// Fetch info cards and group them by column
-$stmt_cards = $pdo->query('
- SELECT
- ip.id,
- ip.texto_informativo,
- ip.imagen_url,
- ip.column_id,
- p.nombre as producto_nombre
- FROM
- info_productos ip
- LEFT JOIN
- products p ON ip.producto_id = p.id
- ORDER BY
- ip.id ASC
-');
-$cards = $stmt_cards->fetchAll(PDO::FETCH_ASSOC);
-
-
-
-
-$cards_by_column = [];
-foreach ($cards as $card) {
- $column_id = $card['column_id'] ?: 'unassigned';
- $cards_by_column[$column_id][] = $card;
+if (empty($columns_to_display)) {
+ $stmt = $pdo->query("SELECT id, nombre FROM kanban_columns");
+ $columns_to_display = $stmt->fetchAll(PDO::FETCH_ASSOC);
}
+// Obtener todos los productos de información
+$stmt = $pdo->query("SELECT ip.*, p.nombre as producto_nombre FROM info_productos ip LEFT JOIN products p ON ip.product_id = p.id");
+$items = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+$pageTitle = "Kanban de Productos";
+$pageDescription = "Tablero Kanban para visualizar la información de los productos.";
+
+include 'layout_header.php';
?>
-
-
-
- Editar Banner del Kanban
-
-
-
+
\ No newline at end of file
diff --git a/db/migrations/053_add_c_pedidos_to_flujo_caja.sql b/db/migrations/053_add_c_pedidos_to_flujo_caja.sql
new file mode 100644
index 0000000..fd726c6
--- /dev/null
+++ b/db/migrations/053_add_c_pedidos_to_flujo_caja.sql
@@ -0,0 +1 @@
+ALTER TABLE `flujo_caja` ADD `c_pedidos` VARCHAR(255) NULL AFTER `fecha`;
\ No newline at end of file
diff --git a/flujo_de_caja.php b/flujo_de_caja.php
index f5dae5c..34649db 100644
--- a/flujo_de_caja.php
+++ b/flujo_de_caja.php
@@ -9,12 +9,21 @@ $start_date = "$year-$month-01";
$days_in_month = cal_days_in_month(CAL_GREGORIAN, $month, $year);
$end_date = "$year-$month-$days_in_month";
-$columns = [
+// Columns from DB that are editable
+$db_columns = [
'bcp_yape', 'b_nacion', 'interbank', 'bbva', 'otros_ingresos',
'tu1', 'tu2', 'tu3', 'fl1', 'fl2', 'fl3',
- 'rc_envio', 'rc_contraent', 'sc'
+ 'rc_contraent', 'sc', 'c_pedidos'
];
+// Columns to display in the table body in order
+$display_columns = [
+ 'bcp_yape', 'b_nacion', 'interbank', 'bbva', 'otros_ingresos',
+ 'tu1', 'tu2', 'tu3', 'fl1', 'fl2', 'fl3',
+ 'rc_envio', 'rc_contraent'
+];
+
+
// Fetch data from DB
$flujo_data = [];
try {
@@ -33,26 +42,39 @@ try {
$all_days_data = [];
for ($day = 1; $day <= $days_in_month; $day++) {
$date = date('Y-m-d', strtotime("$year-$month-$day"));
- $all_days_data[$date] = isset($flujo_data[$date]) ? $flujo_data[$date] : array_fill_keys($columns, '0.00');
+ if (isset($flujo_data[$date])) {
+ $all_days_data[$date] = $flujo_data[$date];
+ } else {
+ // Initialize with 0.00 for all expected columns
+ $all_days_data[$date] = array_fill_keys($db_columns, '0.00');
+ }
}
// Calculate totals
-$totals = array_fill_keys($columns, 0);
+$totals = array_fill_keys($display_columns, 0);
+$totals['sc'] = 0;
+$totals['c_pedidos'] = 0;
$totals['total_ingresos'] = 0;
$totals['total_inversion'] = 0;
$totals['recaudo_final'] = 0;
-foreach ($all_days_data as $day_data) {
- $ingresos_dia = (float)$day_data['bcp_yape'] + (float)$day_data['b_nacion'] + (float)$day_data['interbank'] + (float)$day_data['bbva'] + (float)$day_data['otros_ingresos'] + (float)$day_data['rc_envio'] + (float)$day_data['rc_contraent'];
- $inversion_dia = (float)$day_data['tu1'] + (float)$day_data['tu2'] + (float)$day_data['tu3'] + (float)$day_data['fl1'] + (float)$day_data['fl2'] + (float)$day_data['fl3'];
+foreach ($all_days_data as $date => &$day_data) {
+ $rc_envio_dia = (float)($day_data['bcp_yape'] ?? 0) + (float)($day_data['b_nacion'] ?? 0) + (float)($day_data['interbank'] ?? 0) + (float)($day_data['bbva'] ?? 0) + (float)($day_data['otros_ingresos'] ?? 0);
+ $day_data['rc_envio'] = $rc_envio_dia;
+
+ $ingresos_dia = $rc_envio_dia + (float)($day_data['rc_contraent'] ?? 0);
+ $inversion_dia = (float)($day_data['tu1'] ?? 0) + (float)($day_data['tu2'] ?? 0) + (float)($day_data['tu3'] ?? 0) + (float)($day_data['fl1'] ?? 0) + (float)($day_data['fl2'] ?? 0) + (float)($day_data['fl3'] ?? 0);
- foreach ($columns as $col) {
- $totals[$col] += (float)$day_data[$col];
+ foreach ($display_columns as $col) {
+ $totals[$col] += (float)($day_data[$col] ?? 0);
}
+ $totals['sc'] += (float)($day_data['sc'] ?? 0);
+ $totals['c_pedidos'] += (int)($day_data['c_pedidos'] ?? 0);
$totals['total_ingresos'] += $ingresos_dia;
$totals['total_inversion'] += $inversion_dia;
$totals['recaudo_final'] += ($ingresos_dia - $inversion_dia);
}
+unset($day_data);
?>
@@ -108,14 +130,15 @@ foreach ($all_days_data as $day_data) {
-
-
-
-
Tablero Kanban
-Visualiza el flujo de trabajo de la información de tus productos.
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-  ?>)
-
-
-
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/layout_header.php b/layout_header.php
index 036995e..98f66de 100644
--- a/layout_header.php
+++ b/layout_header.php
@@ -165,6 +165,12 @@ $navItems = [
'icon' => 'fa-users',
'text' => 'Gestionar Usuarios',
'roles' => ['Administrador', 'admin']
+ ],
+ 'configuracion' => [
+ 'url' => 'configuracion.php',
+ 'icon' => 'fa-cog',
+ 'text' => 'Configuración',
+ 'roles' => ['Administrador', 'admin']
]
];
diff --git a/save_flujo_caja.php b/save_flujo_caja.php
index 120aedc..481b667 100644
--- a/save_flujo_caja.php
+++ b/save_flujo_caja.php
@@ -10,9 +10,9 @@ if ($data) {
// Column name validation to prevent SQL injection
$allowed_columns = [
- 'bcp_yape', 'b_nacion', 'interbank', 'bbva', 'otros_ingresos',
+ 'c_pedidos', 'bcp_yape', 'b_nacion', 'interbank', 'bbva', 'otros_ingresos',
'tu1', 'tu2', 'tu3', 'fl1', 'fl2', 'fl3',
- 'rc_envio', 'rc_contraent', 'sc', 'total_inversion_publicitaria'
+ 'rc_contraent', 'sc', 'total_inversion_publicitaria'
];
if (in_array($columna, $allowed_columns)) {
+
+
+
-
-
-
-
+
-
+
-
-
-
-
-
- Sin Asignar
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+ ; ?>)
+
+
+
+
+
+
+
+
+
+
+
+
+