diff --git a/LANG_www/agc_it/vicidial.php b/LANG_www/agc_it/vicidial.php index f5e3774b..6f51fcec 100644 --- a/LANG_www/agc_it/vicidial.php +++ b/LANG_www/agc_it/vicidial.php @@ -292,10 +292,11 @@ # 100420-1009 - Added scheduled_callbacks_count option # 100423-1156 - Added more user logging data and manual_dial_override, blind monitor warnings, uniqueid display and codec features # 100428-0544 - Added uniqueid display option for PRESERVE +# 100513-0714 - Added options.php option to hide the timeclock link # -$version = '2.4-270'; -$build = '100428-0544'; +$version = '2.4-271'; +$build = '100513-0714'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=66; $one_mysql_log=0; @@ -438,6 +439,7 @@ else $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT CHIAMA by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen + $hide_timeclock_link = '0'; # set to 1 to hide the timeclock link su the agent login screen $TEST_all_statuses = '0'; # TEST variable allows all statuses in dispo screen @@ -685,7 +687,8 @@ if ($relogin == 'YES') echo "Agent web client: Re-Login\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -725,7 +728,8 @@ if ($user_login_first == 1) echo "Agent web client: Login Campagna\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -768,40 +772,44 @@ echo "Agent web client: Login\n"; - echo "\n"; - echo "\n"; - echo " Orologio
\n"; - echo "\n"; - echo "\n"; -echo "\n";echo "\n"; echo "
English Italiano
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "


"; - echo ""; - echo ""; - echo "\n"; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
Login
 
Login Telefono:
Password Telefono:
Login Utente:
Password Utente:
Campagna: $camp_form_code
  \n"; - echo "

VERSIONE: $version       BUILD: $build
\n"; - echo "\n\n"; - echo "\n\n"; - echo "\n\n"; - exit; + if ( (strlen($phone_login) < 1) or (strlen($phone_pass) < 1) ) + { + echo "Agent web client: Login\n"; + echo "\n"; + echo "\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} + echo "\n"; + echo "\n"; +echo "\n";echo "\n"; echo "
English Italiano
\n"; + echo "
\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "


"; + echo ""; + echo ""; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
Login
 
Login Telefono:
Password Telefono:
Login Utente:
Password Utente:
Campagna: $camp_form_code
  \n"; + echo "

VERSIONE: $version       BUILD: $build
\n"; + echo "\n\n"; + echo "\n\n"; + echo "\n\n"; + exit; + } } } } @@ -811,7 +819,8 @@ if ( (strlen($phone_login)<2) or (strlen($phone_pass)<2) ) echo "Agent web client: Login Telefono\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -1074,7 +1083,8 @@ else echo "Agent web client: Login Campagna\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -1526,7 +1536,8 @@ echo "Agent web client: Login Campagna\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -1619,7 +1630,8 @@ echo "Agent web client: Login Telefono Error\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -2185,7 +2197,8 @@ echo "Agent web client: Login Campagna\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; @@ -2211,7 +2224,8 @@ echo "Agent web client: Login Campagna\n"; echo "\n"; echo "\n"; - echo " Orologio
\n"; + if ($hide_timeclock_link < 1) + {echo " Orologio
\n";} echo "\n"; echo "\n"; echo "\n";echo "\n"; echo "
English Italiano
\n"; diff --git a/UPGRADE b/UPGRADE index dabad681..a7669ef9 100644 --- a/UPGRADE +++ b/UPGRADE @@ -154,6 +154,8 @@ OTHER CHANGES: those two prompts be non-blocking and allow existing newer calls through to agents while the prompts are playing +36. Added utility in CallCard section to generate new card IDs and view by Run. + diff --git a/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt index 934eb0ba..2f8ddc1d 100644 --- a/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt +++ b/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt @@ -202,6 +202,7 @@ Hold Time Option Press No Block|| Setting this option to Y will allow calls in line behind a call where the Hold Time Option Press Filename prompt is playing to go to an agent if one becomes available while the message is playing. While the Hold Time Option Press Filename message is playing to a customer they cannot be sent to an agent. Default is N|| Hold Time Option Press Filename Seconds|| This field needs to be set to the number of seconds that the Hold Time Option Press Filename plays for. Default is 10|| +CallCard Generate New Numbers|| AST_VICIDIAL_ingrouplist.php diff --git a/www/vicidial/admin_header.php b/www/vicidial/admin_header.php index f469f120..fe02a194 100644 --- a/www/vicidial/admin_header.php +++ b/www/vicidial/admin_header.php @@ -1284,7 +1284,7 @@ $SScustom_fields_enabled = $row[3]; 1) and (strlen($admin_hh) > 1) ) { ?> - >   > CallCard Summary   |   > CallCard Batches   |   > CallCard Search   |   > CallCard Log Export + >   > CallCard Summary   |   > Runs   |   > Batches   |   > CallCard Search   |   > CallCard Log Export   |   > CallCard Generate New Numbers 1) and (strlen($admin_hh) > 1) ) { ?> diff --git a/www/vicidial/callcard_admin.php b/www/vicidial/callcard_admin.php index cf74d20d..2933413c 100644 --- a/www/vicidial/callcard_admin.php +++ b/www/vicidial/callcard_admin.php @@ -9,10 +9,11 @@ # # CHANGES # 100311-2325 - first build +# 100525-1824 - Added generate option # -$version = '2.4-1'; -$build = '100311-2325'; +$version = '2.4-2'; +$build = '100525-1824'; $MT[0]=''; @@ -27,6 +28,8 @@ if (isset($_GET["run"])) {$run=$_GET["run"];} elseif (isset($_POST["run"])) {$run=$_POST["run"];} if (isset($_GET["batch"])) {$batch=$_GET["batch"];} elseif (isset($_POST["batch"])) {$batch=$_POST["batch"];} +if (isset($_GET["starting_batch"])) {$starting_batch=$_GET["starting_batch"];} + elseif (isset($_POST["starting_batch"])) {$starting_batch=$_POST["starting_batch"];} if (isset($_GET["pack"])) {$pack=$_GET["pack"];} elseif (isset($_POST["pack"])) {$pack=$_POST["pack"];} if (isset($_GET["sequence"])) {$sequence=$_GET["sequence"];} @@ -39,7 +42,26 @@ if (isset($_GET["total"])) {$total=$_GET["total"];} elseif (isset($_POST["total"])) {$total=$_POST["total"];} if (isset($_GET["comment"])) {$comment=$_GET["comment"];} elseif (isset($_POST["comment"])) {$comment=$_POST["comment"];} - +if (isset($_GET["balance_minutes"])) {$balance_minutes=$_GET["balance_minutes"];} + elseif (isset($_POST["balance_minutes"])) {$balance_minutes=$_POST["balance_minutes"];} +if (isset($_GET["initial_value"])) {$initial_value=$_GET["initial_value"];} + elseif (isset($_POST["initial_value"])) {$initial_value=$_POST["initial_value"];} +if (isset($_GET["initial_minutes"])) {$initial_minutes=$_GET["initial_minutes"];} + elseif (isset($_POST["initial_minutes"])) {$initial_minutes=$_POST["initial_minutes"];} +if (isset($_GET["note_purchase_order"])) {$note_purchase_order=$_GET["note_purchase_order"];} + elseif (isset($_POST["note_purchase_order"])) {$note_purchase_order=$_POST["note_purchase_order"];} +if (isset($_GET["note_printer"])) {$note_printer=$_GET["note_printer"];} + elseif (isset($_POST["note_printer"])) {$note_printer=$_POST["note_printer"];} +if (isset($_GET["note_did"])) {$note_did=$_GET["note_did"];} + elseif (isset($_POST["note_did"])) {$note_did=$_POST["note_did"];} +if (isset($_GET["inbound_group_id"])) {$inbound_group_id=$_GET["inbound_group_id"];} + elseif (isset($_POST["inbound_group_id"])) {$inbound_group_id=$_POST["inbound_group_id"];} +if (isset($_GET["note_language"])) {$note_language=$_GET["note_language"];} + elseif (isset($_POST["note_language"])) {$note_language=$_POST["note_language"];} +if (isset($_GET["note_name"])) {$note_name=$_GET["note_name"];} + elseif (isset($_POST["note_name"])) {$note_name=$_POST["note_name"];} +if (isset($_GET["note_comments"])) {$note_comments=$_GET["note_comments"];} + elseif (isset($_POST["note_comments"])) {$note_comments=$_POST["note_comments"];} if (isset($_GET["user"])) {$user=$_GET["user"];} elseif (isset($_POST["user"])) {$user=$_POST["user"];} if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} @@ -494,6 +516,51 @@ if ($action == "CALLCARD_SUMMARY") +### BEGIN list runs +if ($action == "CALLCARD_RUNS") + { + echo "\n"; $i=0; - $Gbatch=1; + $Gbatch=$starting_batch; $Gbatch_count=0; - $Gsequence=0; + $Gsequence=$sequence; while ($i < $total) { $Gbatch_count++; @@ -611,7 +678,7 @@ if ($action == "GENERATE_RESULTS") $stmt="INSERT INTO callcard_accounts SET card_id='$Pcard_id',pin='$Ppin',status='GENERATE';"; $rslt=mysql_query($stmt, $link); - $stmt="INSERT INTO callcard_accounts_details SET card_id='$Pcard_id',pin='$Ppin',status='GENERATE';"; + $stmt="INSERT INTO callcard_accounts_details SET card_id='$Pcard_id',status='GENERATE',run='$run',pack='',batch='$Pbatch',sequence='$Psequence',balance_minutes='$balance_minutes',initial_value='$initial_value',initial_minutes='$initial_minutes',note_purchase_order='$note_purchase_order',note_printer='$note_printer',note_did='$note_did',inbound_group_id='$inbound_group_id',note_language='$note_language',note_name='$note_name',note_comments='$note_comments',create_time='$NOW_TIME',create_user='$USER';"; $rslt=mysql_query($stmt, $link); if (eregi("1$|3$|5$|7$|9$", $i)) @@ -649,16 +716,26 @@ if ($action == "GENERATE") { echo "
\n"; + echo ""; + echo "
CallCard Batches:\n"; + echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + + $stmt = "SELECT count(*),run FROM callcard_accounts_details group by run order by run;"; + $rslt=mysql_query($stmt, $link); + if ($DB) {echo "$stmt\n";} + $vt_ct = mysql_num_rows($rslt); + $i=0; + while ($vt_ct > $i) + { + $row=mysql_fetch_row($rslt); + $Lcount[$i] = $row[0]; + $Lrun[$i] = $row[1]; + + if (eregi("1$|3$|5$|7$|9$", $i)) + {$bgcolor='bgcolor="#9BB9FB"';} + else + {$bgcolor='bgcolor="#B9CBFD"';} + echo "\n"; + echo ""; + echo ""; + echo ""; + echo "\n"; + + $i++; + } + echo "
RUNCOUNTLIST
$Lrun[$i] $Lcount[$i] LIST


\n"; + + echo "\n"; + echo "
\n"; + } +### END list runs + + + ### BEGIN list batches if ($action == "CALLCARD_BATCHES") { @@ -542,7 +609,7 @@ if ($action == "CALLCARD_BATCHES") ### BEGIN generate results if ($action == "GENERATE_RESULTS") { - if ( (strlen($sequence) < 1) or (strlen($batch) < 1) or (strlen($run) < 1) or (strlen($total) < 1) ) + if ( (strlen($sequence) < 1) or (strlen($starting_batch) < 1) or (strlen($batch) < 1) or (strlen($run) < 1) or (strlen($total) < 1) ) { echo "you must enter in all fields

\n"; $action = 'GENERATE'; @@ -559,9 +626,9 @@ if ($action == "GENERATE_RESULTS") echo "
\n"; echo ""; - echo "
CallCard Generate IDs
\n"; echo "\n"; echo "\n"; echo "
\n"; - echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "
Generate Comment:
Run:
Batch:
Sequence:
Starting Batch:
IDs in Batch:
Starting Sequence:
Total:
Balance Minutes:
Initial Value:
Initial Minutes:
Purchase Order:
Printer:
DID:
In-Group:
Language:
Name:
Comment:
\n"; echo "\n";