Drive detectado: filas
- Extracción: desde fila
+ Agregados:
+ TUANI: último procesado · próxima desde Extracción: desde fila Auto actualización: cada 10 minVer vista previa Drive
diff --git a/db/migrations/088_add_store_key_and_drive_test_checkpoints.sql b/db/migrations/088_add_store_key_and_drive_test_checkpoints.sql
new file mode 100644
index 00000000..b833198a
--- /dev/null
+++ b/db/migrations/088_add_store_key_and_drive_test_checkpoints.sql
@@ -0,0 +1,16 @@
+-- 088_add_store_key_and_drive_test_checkpoints.sql
+-- Adds store_key to callcenter_test_orders (so we can filter per Drive store)
+-- and creates a checkpoint table to support incremental Drive imports for TUANI.
+
+ALTER TABLE callcenter_test_orders
+ ADD COLUMN IF NOT EXISTS store_key VARCHAR(50) NULL;
+
+CREATE TABLE IF NOT EXISTS drive_test_import_checkpoints (
+ store_key VARCHAR(50) NOT NULL,
+ last_processed_row INT NOT NULL DEFAULT 0,
+ last_sync_at DATETIME NULL,
+ updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (store_key)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE INDEX idx_callcenter_test_orders_store_key ON callcenter_test_orders (store_key);
\ No newline at end of file
diff --git a/db/migrations/089_expand_callcenter_test_orders_dni_drive.sql b/db/migrations/089_expand_callcenter_test_orders_dni_drive.sql
new file mode 100644
index 00000000..7d0ec647
--- /dev/null
+++ b/db/migrations/089_expand_callcenter_test_orders_dni_drive.sql
@@ -0,0 +1,3 @@
+-- 089_expand_callcenter_test_orders_dni_drive.sql
+ALTER TABLE callcenter_test_orders
+ MODIFY COLUMN dni_drive TEXT NULL;
diff --git a/db/migrations/090_expand_callcenter_test_orders_dni_drive_longtext.sql b/db/migrations/090_expand_callcenter_test_orders_dni_drive_longtext.sql
new file mode 100644
index 00000000..20e9ad1d
--- /dev/null
+++ b/db/migrations/090_expand_callcenter_test_orders_dni_drive_longtext.sql
@@ -0,0 +1,4 @@
+-- 090_expand_callcenter_test_orders_dni_drive_longtext.sql
+-- Ensures callcenter_test_orders.dni_drive can store very long values coming from Google Sheets.
+ALTER TABLE callcenter_test_orders
+ MODIFY COLUMN dni_drive LONGTEXT NULL;
diff --git a/download_agregados_pedidos_template.php b/download_agregados_pedidos_template.php
new file mode 100644
index 00000000..5844d506
--- /dev/null
+++ b/download_agregados_pedidos_template.php
@@ -0,0 +1,54 @@
+downloadAs($filename);
diff --git a/download_report.php b/download_report.php
index a48c0295..ec8166af 100644
--- a/download_report.php
+++ b/download_report.php
@@ -20,7 +20,7 @@ try {
p.producto,
p.cantidad
FROM pedidos p
- WHERE p.estado = 'ROTULADO 📦'
+ WHERE (p.estado = 'ROTULADO 📦' OR p.estado = 'PENDIENTE')
ORDER BY p.id DESC
";
$stmt = $pdo->prepare($query);
diff --git a/download_shalom.php b/download_shalom.php
index f69d1fbc..5b28fe75 100644
--- a/download_shalom.php
+++ b/download_shalom.php
@@ -13,11 +13,11 @@ try {
$pdo = db();
$type = $_GET['type'] ?? 'all';
- // Filtramos solo los pedidos que están en estado 'ROTULADO 📦' y son de la agencia 'SHALOM'
+ // Filtramos los pedidos ROTULADO 📦 y PENDIENTE (listados como 'Pedidos Rotulados') y de la agencia 'SHALOM'
$query = "
SELECT p.dni_cliente, p.celular, p.sede_envio, p.agencia, p.producto, p.cantidad
FROM pedidos p
- WHERE p.estado = 'ROTULADO 📦'
+ WHERE (p.estado = 'ROTULADO 📦' OR p.estado = 'PENDIENTE')
AND p.agencia LIKE '%SHALOM%'
";
diff --git a/gestiones_callcenter.php b/gestiones_callcenter.php
index 0f835212..51e11ae3 100644
--- a/gestiones_callcenter.php
+++ b/gestiones_callcenter.php
@@ -3,6 +3,7 @@ session_start();
require_once 'db/config.php';
require_once 'includes/callcenter_test_helpers.php';
require_once 'includes/drive_test_orders.php';
+require_once 'includes/agregados_excel_import.php';
require_once 'includes/contraentrega_cobertura.php';
$provinciasPorDepartamentoContraentrega = contraentregaProvinciasPorDepartamento();
@@ -73,6 +74,10 @@ function cc_test_display_value(?string $value, string $fallback = 'No registrado
function cc_test_order_label(array $order): string
{
+ if (!empty($order['is_agregado'])) {
+ return 'AGREGADOS';
+ }
+
$codigo = trim((string) ($order['codigo'] ?? ''));
if ($codigo !== '') {
return '#' . ltrim($codigo, '#');
@@ -98,16 +103,40 @@ function cc_test_badge_class(string $estado): string
function cc_test_order_time(array $order): int
{
- foreach (['proxima_llamada_at', 'numero_cuenta_enviado_at', 'ultima_gestion_at', 'seguimiento_actualizado', 'import_id'] as $field) {
+ foreach (['proxima_llamada_at', 'numero_cuenta_enviado_at', 'ultima_gestion_at', 'seguimiento_actualizado'] as $field) {
$date = cc_test_parse_datetime($order[$field] ?? null);
if ($date) {
return $date->getTimestamp();
}
}
- return 0;
+ // Fallback recency for Drive imports where import_id is not a datetime (e.g. "#35898").
+ return cc_test_import_time($order);
}
+function cc_test_import_time(array $order): int
+{
+ if (!empty($order['is_agregado'])) {
+ return (int) ($order['id'] ?? 0);
+ }
+
+ $importRaw = trim((string) ($order['import_id'] ?? ''));
+ if ($importRaw !== '') {
+ $date = cc_test_parse_datetime($importRaw);
+ if ($date) {
+ return $date->getTimestamp();
+ }
+
+ $digits = preg_replace('/\D+/', '', $importRaw);
+ if ($digits !== '') {
+ return (int) $digits;
+ }
+ }
+
+ $codigoRaw = trim((string) ($order['codigo'] ?? ''));
+ $digits = preg_replace('/\D+/', '', $codigoRaw);
+ return $digits !== '' ? (int) $digits : 0;
+}
function cc_test_followup_semaforo(array $order): ?array
{
if (cc_test_normalize_state((string) ($order['estado'] ?? '')) !== 'SE ENVIO NUMERO DE CUENTA') {
@@ -141,11 +170,14 @@ $storeConfig = $availableStores[$storeKey];
$errorMessage = null;
$noticeMessage = null;
+$uploadErrorMessage = null;
$assessors = [];
$orders = [];
$visibleOrders = [];
$modalsHtml = [];
$totalRows = 0;
+$agregadosCount = 0;
+$tuaniLastProcessedRow = null;
$loadLimit = $storeKey === 'otra_tienda' ? 0 : 100;
$cupoObjetivoPorAsesora = 10;
@@ -177,9 +209,52 @@ try {
$catalogoProductos = [];
}
- $preview = drive_test_fetch_orders($loadLimit, $startRow, $storeKey);
- $totalRows = (int) ($preview['total_rows'] ?? 0);
- $orders = $preview['orders'] ?? [];
+ if ($_SERVER['REQUEST_METHOD'] === 'POST' && ($_POST['action'] ?? '') === 'upload_agregados_excel') {
+ try {
+ $file = $_FILES['agregados_excel'] ?? null;
+ if (!is_array($file)) {
+ throw new RuntimeException('No se encontró el archivo de Excel.');
+ }
+ $maxSize = 10 * 1024 * 1024; // 10 MB
+ if ((int) ($file['size'] ?? 0) > $maxSize) {
+ throw new RuntimeException('El archivo es demasiado grande. Máximo 10 MB.');
+ }
+
+ $res = cc_agregados_import_from_uploaded_file($pdo, $storeKey, $file);
+ $inserted = (int) ($res['inserted'] ?? 0);
+ $skipped = (int) ($res['skipped'] ?? 0);
+ $noticeMessage = 'Importación completada: ' . $inserted . ' pedidos agregados.' . ($skipped > 0 ? ' Filas ignoradas: ' . $skipped . '.' : '');
+ $uploadErrorMessage = null;
+ } catch (Throwable $e) {
+ $uploadErrorMessage = $e->getMessage();
+ }
+ }
+
+ if ($storeKey === 'otra_tienda') {
+ $syncInfo = drive_test_sync_orders_incremental($pdo, $storeKey, 0);
+ $totalRows = (int) ($syncInfo['drive_rows_total'] ?? 0);
+ $tuaniLastProcessedRow = (int) ($syncInfo['last_processed_row'] ?? 0);
+ $startRow = (int) ($syncInfo['next_start_row'] ?? $startRow);
+
+ $orders = drive_test_fetch_orders_from_db($pdo, $storeKey);
+
+ $agregadosCount = 0;
+ foreach ($orders as $o) {
+ if (!empty($o['is_agregado'])) {
+ $agregadosCount++;
+ }
+ }
+ } else {
+ $preview = drive_test_fetch_orders($loadLimit, $startRow, $storeKey);
+ $totalRows = (int) ($preview['total_rows'] ?? 0);
+ $orders = $preview['orders'] ?? [];
+
+ $agregadosOrders = drive_test_fetch_orders_from_db($pdo, $storeKey, true);
+ $agregadosCount = count($agregadosOrders);
+ if (!empty($agregadosOrders)) {
+ $orders = array_merge($orders, $agregadosOrders);
+ }
+ }
$tracking = drive_test_fetch_tracking($pdo, array_column($orders, 'source_key'));
$orders = drive_test_merge_tracking($orders, $tracking);
@@ -465,9 +540,22 @@ try {
}));
usort($visibleOrders, static function (array $a, array $b) use ($view): int {
- if ($view === 'pendientes_hoy') {
- $aDue = cc_test_parse_datetime($a['proxima_llamada_at'] ?? null);
- $bDue = cc_test_parse_datetime($b['proxima_llamada_at'] ?? null);
+ $aAgregado = !empty($a['is_agregado']);
+ $bAgregado = !empty($b['is_agregado']);
+ if ($aAgregado !== $bAgregado) {
+ return $aAgregado ? 1 : -1;
+ }
+
+ $aImport = cc_test_import_time($a);
+ $bImport = cc_test_import_time($b);
+
+ if ($aImport !== $bImport) {
+ return $bImport <=> $aImport;
+ }
+
+ if ($view === "pendientes_hoy") {
+ $aDue = cc_test_parse_datetime($a["proxima_llamada_at"] ?? null);
+ $bDue = cc_test_parse_datetime($b["proxima_llamada_at"] ?? null);
if ($aDue && $bDue && $aDue != $bDue) {
return $aDue <=> $bDue;
}
@@ -508,7 +596,8 @@ require_once 'layout_header.php';
Drive detectado: filas
- Extracción: desde fila
+ Agregados:
+ TUANI: último procesado · próxima desde Extracción: desde fila Auto actualización: cada 10 minVer vista previa Drive