-
Pedidos
+
Pedidos
$childConfig): ?>
-
+
diff --git a/includes/callcenter_test_helpers.php b/includes/callcenter_test_helpers.php
index f39500b5..fb0f0f8c 100644
--- a/includes/callcenter_test_helpers.php
+++ b/includes/callcenter_test_helpers.php
@@ -253,7 +253,7 @@ function cc_test_default_assessor_keys(): array
function cc_test_is_tuani_store_key(string $storeKey): bool
{
$storeKey = trim(mb_strtolower($storeKey));
- return in_array($storeKey, ['flower', 'otra_tienda', 'tuani_recuperables'], true);
+ return in_array($storeKey, ['flower', 'otra_tienda', 'flower_recuperables', 'tuani_recuperables'], true);
}
function cc_test_is_tuani_main_store_key(string $storeKey): bool
@@ -262,10 +262,15 @@ function cc_test_is_tuani_main_store_key(string $storeKey): bool
return in_array($storeKey, ['flower', 'otra_tienda'], true);
}
-function cc_test_is_tuani_recoverables_store_key(string $storeKey): bool
+function cc_test_is_recoverables_store_key(string $storeKey): bool
{
$storeKey = trim(mb_strtolower($storeKey));
- return $storeKey === 'tuani_recuperables';
+ return in_array($storeKey, ['flower_recuperables', 'tuani_recuperables'], true);
+}
+
+function cc_test_is_tuani_recoverables_store_key(string $storeKey): bool
+{
+ return cc_test_is_recoverables_store_key($storeKey);
}
function cc_test_callcenter_pro_default_view_key(string $storeKey): string
@@ -274,8 +279,8 @@ function cc_test_callcenter_pro_default_view_key(string $storeKey): string
return 'ultimos_3_dias';
}
- if (cc_test_is_tuani_recoverables_store_key($storeKey)) {
- return 'nuevos_hoy';
+ if (cc_test_is_recoverables_store_key($storeKey)) {
+ return 'todos';
}
return 'pendientes_hoy';
@@ -358,14 +363,18 @@ if (!function_exists('cc_test_fetch_store_phone_index')) {
}
if (!function_exists('cc_test_mark_recoverables_duplicate_orders')) {
- function cc_test_mark_recoverables_duplicate_orders(PDO $pdo, array $orders, string $storeKey, string $mainStoreKey = 'otra_tienda'): array
+ function cc_test_mark_recoverables_duplicate_orders(PDO $pdo, array $orders, string $storeKey, string $mainStoreKey = ''): array
{
$storeKey = trim(mb_strtolower($storeKey));
- if ($storeKey !== 'tuani_recuperables' || empty($orders)) {
+ if (!cc_test_is_recoverables_store_key($storeKey) || empty($orders)) {
return $orders;
}
$mainStoreKey = trim(mb_strtolower($mainStoreKey));
+ if ($mainStoreKey === '') {
+ $mainStoreKey = $storeKey === 'flower_recuperables' ? 'flower' : 'otra_tienda';
+ }
+
if ($mainStoreKey === '') {
return $orders;
}
@@ -1484,6 +1493,30 @@ function cc_test_followup_tracking_states(): array
return ['POR LLAMAR', 'DEVOLVER LLAMADA', 'OBSERVADO', 'SE ENVIO NUMERO DE CUENTA'];
}
+function cc_test_recoverable_claimable_states(): array
+{
+ return cc_test_followup_tracking_states();
+}
+
+function cc_test_is_recoverable_claimable_state(string $estado): bool
+{
+ $estado = cc_test_normalize_state($estado);
+ if ($estado === '') {
+ return true;
+ }
+
+ return in_array($estado, cc_test_recoverable_claimable_states(), true);
+}
+
+function cc_test_can_claim_recoverable_order(?array $tracking): bool
+{
+ if ($tracking === null) {
+ return true;
+ }
+
+ return cc_test_is_recoverable_claimable_state((string) ($tracking['estado'] ?? ''));
+}
+
function cc_test_followup_parse_datetime(?string $value): ?DateTimeImmutable
{
$value = trim((string) $value);
diff --git a/includes/drive_test_orders.php b/includes/drive_test_orders.php
index 9433ca7b..8122a56e 100644
--- a/includes/drive_test_orders.php
+++ b/includes/drive_test_orders.php
@@ -26,6 +26,23 @@ function drive_test_available_stores(): array
'delivery_sync_start_row' => 8687,
'delivery_sync_column' => 'W',
'min_codigo_number' => 37431,
+ 'recoverables_store_key' => 'flower_recuperables',
+ 'enforce_db_start_row' => true,
+ 'incremental_sync' => true,
+ ],
+ // Nueva bandeja recuperable de Flower desde la pestaña compartida.
+ 'flower_recuperables' => [
+ 'label' => 'Carritos recuperables Flower',
+ 'sheet_title' => 'easysell_abandoneds',
+ 'spreadsheet_id' => '1SSmQuR9quxeQbMKNMDkRe8-n1gU7WuEfsFaJ3WKFO-c',
+ 'startRow' => 1503,
+ 'status_sync_start_row' => 1503,
+ 'status_sync_column' => 'V',
+ 'advisor_sync_start_row' => 1503,
+ 'advisor_sync_column' => 'X',
+ 'delivery_sync_start_row' => 1503,
+ 'delivery_sync_column' => 'W',
+ 'main_store_key' => 'flower',
'enforce_db_start_row' => true,
'incremental_sync' => true,
],
@@ -36,6 +53,7 @@ function drive_test_available_stores(): array
'spreadsheet_id' => '1QYKeBJIIqYm6yW6Ka-5gKdxhUHwXOAc0No7RjnimxTw',
'sheet_gid' => 1523126328,
'startRow' => 6804,
+ 'recoverables_store_key' => 'tuani_recuperables',
'enforce_db_start_row' => true,
'incremental_sync' => true,
'status_sync_start_row' => 7207,
@@ -45,9 +63,9 @@ function drive_test_available_stores(): array
'delivery_sync_start_row' => 7291,
'delivery_sync_column' => 'W',
],
- // Bandeja compartida de carritos recuperables/abandonados: misma estructura, pero desde la fila 2000.
+ // Bandeja compartida de carritos recuperables Tuani/abandonados: misma estructura, pero desde la fila 2000.
'tuani_recuperables' => [
- 'label' => 'Carritos recuperables',
+ 'label' => 'Carritos recuperables Tuani',
'sheet_title' => 'easysell_abandoneds',
'spreadsheet_id' => '1QYKeBJIIqYm6yW6Ka-5gKdxhUHwXOAc0No7RjnimxTw',
'sheet_gid' => 965530888,
@@ -58,6 +76,7 @@ function drive_test_available_stores(): array
'advisor_sync_column' => 'X',
'delivery_sync_start_row' => 2000,
'delivery_sync_column' => 'W',
+ 'main_store_key' => 'otra_tienda',
'enforce_db_start_row' => true,
'incremental_sync' => true,
],
@@ -348,6 +367,7 @@ function drive_test_sync_status_to_sheet(array $sourceOrder, string $estado, ?st
}
$storeConfig = drive_test_get_store_config($storeKey);
+ $sheetTitle = trim((string) ($storeConfig['sheet_title'] ?? ''));
$spreadsheetId = trim((string) ($storeConfig['spreadsheet_id'] ?? ''));
if ($spreadsheetId === '') {
throw new RuntimeException('Configuración de Drive para la tienda no válida.');
@@ -366,7 +386,7 @@ function drive_test_sync_status_to_sheet(array $sourceOrder, string $estado, ?st
$client->addScope(Google\Service\Sheets::SPREADSHEETS);
$service = new Google\Service\Sheets($client);
- $statusRange = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $statusColumn . $sourceRow);
+ $statusRange = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $statusColumn . $sourceRow, $sheetTitle);
$estadoNormalizado = cc_test_normalize_state(trim($estado));
$deliveryDate = trim((string) $deliveryDate);
@@ -389,7 +409,7 @@ function drive_test_sync_status_to_sheet(array $sourceOrder, string $estado, ?st
$deliveryStartRow = drive_test_delivery_sync_start_row($storeKey);
if ($deliveryStartRow !== null && $sourceRow >= $deliveryStartRow) {
$deliveryColumn = drive_test_delivery_sync_column($storeKey);
- $deliveryRange = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $deliveryColumn . $sourceRow);
+ $deliveryRange = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $deliveryColumn . $sourceRow, $sheetTitle);
$updates[] = new Google\Service\Sheets\ValueRange([
'range' => $deliveryRange,
'values' => [[ $deliveryLabel ]],
@@ -400,7 +420,7 @@ function drive_test_sync_status_to_sheet(array $sourceOrder, string $estado, ?st
$advisorStartRow = drive_test_advisor_sync_start_row($storeKey);
if ($advisorName !== '' && $advisorStartRow !== null && $sourceRow >= $advisorStartRow) {
$advisorColumn = drive_test_advisor_sync_column($storeKey);
- $advisorRange = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $advisorColumn . $sourceRow);
+ $advisorRange = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $advisorColumn . $sourceRow, $sheetTitle);
$updates[] = new Google\Service\Sheets\ValueRange([
'range' => $advisorRange,
'values' => [[ $advisorName ]],
@@ -428,9 +448,15 @@ function drive_test_sync_status_to_sheet(array $sourceOrder, string $estado, ?st
];
}
-function drive_test_resolve_sheet_a1_range($service, string $spreadsheetId, ?int $sheetGid, string $rangeA1): string
+function drive_test_resolve_sheet_a1_range($service, string $spreadsheetId, ?int $sheetGid, string $rangeA1, ?string $sheetTitle = null): string
{
+ $sheetTitle = trim((string) $sheetTitle);
if ($sheetGid === null) {
+ if ($sheetTitle !== '') {
+ $escapedTitle = str_replace("'", "''", $sheetTitle);
+ return "'{$escapedTitle}'!{$rangeA1}";
+ }
+
return $rangeA1;
}
@@ -502,6 +528,7 @@ function drive_test_extract_codigo_number(?string $codigo): ?int
function drive_test_fetch_orders(int $limit = 10, ?int $startRow = null, string $storeKey = 'flower'): array
{
$storeConfig = drive_test_get_store_config($storeKey);
+ $sheetTitle = trim((string) ($storeConfig['sheet_title'] ?? ''));
if ($startRow === null || $startRow <= 0) {
$startRow = (int) ($storeConfig['startRow'] ?? 0);
}
@@ -525,7 +552,7 @@ function drive_test_fetch_orders(int $limit = 10, ?int $startRow = null, string
$service = new Google\Service\Sheets($client);
- $range = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $rangeA1);
+ $range = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $rangeA1, $sheetTitle);
$response = $service->spreadsheets_values->get($spreadsheetId, $range);
$values = $response->getValues();
diff --git a/layout_header.php b/layout_header.php
index 2d195657..8322fc7a 100644
--- a/layout_header.php
+++ b/layout_header.php
@@ -46,6 +46,9 @@ if (in_array($currentAssessorFilter, cc_test_callcenter_assessor_filter_clear_va
}
$currentCallCenterStore = cc_test_normalize_context_key($_GET['store'] ?? ($_SESSION[cc_test_callcenter_store_session_key()] ?? ''));
$currentCallCenterView = cc_test_normalize_context_key($_GET['view'] ?? ($_SESSION[cc_test_callcenter_view_session_key()] ?? ''));
+if (cc_test_is_tuani_recoverables_store_key($currentCallCenterStore) && $currentCallCenterView === 'nuevos_hoy') {
+ $currentCallCenterView = 'todos';
+}
$shouldPersistAssessor = $currentAssessorFilter !== '';
$callCenterPersistentParams = [];
if ($shouldPersistAssessor) {
diff --git a/save_llamada.php b/save_llamada.php
index 32a6c32a..ce53415b 100644
--- a/save_llamada.php
+++ b/save_llamada.php
@@ -50,8 +50,9 @@ try {
$storeKey = '';
}
- $isRecoverablesQueue = $storeKey === 'tuani_recuperables';
- $canClaimRecoverable = $isRecoverablesQueue && $trackingUserId === null;
+ $isRecoverablesQueue = cc_test_is_recoverables_store_key($storeKey);
+ $canClaimRecoverable = $isRecoverablesQueue && cc_test_can_claim_recoverable_order($tracking);
+ $needsRecoverableClaim = $canClaimRecoverable && ($tracking === null || $trackingUserId !== $asesor_id);
if ($tracking === null) {
if (!$canClaimRecoverable) {
@@ -65,7 +66,7 @@ try {
exit;
}
- if ($canClaimRecoverable) {
+ if ($needsRecoverableClaim) {
cc_test_upsert_assignee($pdo, $pedido_id, $asesor_id);
}
}
diff --git a/test_importar_drive.php b/test_importar_drive.php
index 98584cd1..4e7f5a51 100644
--- a/test_importar_drive.php
+++ b/test_importar_drive.php
@@ -57,7 +57,7 @@ try {
$service = new Google\Service\Sheets($client);
- $range = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $rangeA1);
+ $range = drive_test_resolve_sheet_a1_range($service, $spreadsheetId, $sheetGid, $rangeA1, $sheetTitle);
$response = $service->spreadsheets_values->get($spreadsheetId, $range);
$values = $response->getValues();
diff --git a/update_callcenter_test_tracking.php b/update_callcenter_test_tracking.php
index 626a72c2..9012940f 100644
--- a/update_callcenter_test_tracking.php
+++ b/update_callcenter_test_tracking.php
@@ -824,7 +824,7 @@ try {
$sourceOrderForAuth = cc_test_fetch_source_order($pdo, $sourceKey);
$sourceStoreKeyForAuth = trim((string) ($sourceOrderForAuth['store_key'] ?? ''));
- $isRecoverablesQueue = $sourceStoreKeyForAuth === 'tuani_recuperables';
+ $isRecoverablesQueue = cc_test_is_recoverables_store_key($sourceStoreKeyForAuth);
if (!array_key_exists('numero_cuenta_sede_id', $_POST)) {
$numeroCuentaSedeIdCurrent = trim((string) ($currentTracking['numero_cuenta_sede_id'] ?? ''));
@@ -851,12 +851,12 @@ try {
$role = (string) ($_SESSION['user_role'] ?? '');
$isAdmin = in_array($role, ['Administrador', 'admin'], true);
+ $currentUserId = (int) ($_SESSION['user_id'] ?? 0);
+ $trackingUserId = $currentTracking ? (int) ($currentTracking['user_id'] ?? 0) : null;
+ // En carritos recuperables, los estados de seguimiento siguen siendo retomables por otra asesora.
+ // Solo los confirmados o cerrados quedan bloqueados para nuevas tomas.
+ $canClaimRecoverable = $isRecoverablesQueue && cc_test_can_claim_recoverable_order($currentTracking);
if (!$isAdmin) {
- $currentUserId = (int) ($_SESSION['user_id'] ?? 0);
- $trackingUserId = $currentTracking ? (int) ($currentTracking['user_id'] ?? 0) : null;
- // En la bandeja de carritos recuperables, cualquier pedido sin asignar
- // debe poder ser tomado por la asesora, sin importar el estado inicial.
- $canClaimRecoverable = $isRecoverablesQueue && $trackingUserId === null;
if ($currentTracking === null) {
if (!$canClaimRecoverable) {
http_response_code(403);
@@ -1101,6 +1101,10 @@ try {
$pdo->beginTransaction();
+ if (!$isAdmin && $canClaimRecoverable) {
+ cc_test_upsert_assignee($pdo, $sourceKey, $currentUserId);
+ }
+
$stmt = $pdo->prepare(
'INSERT INTO callcenter_test_tracking (
source_key,