diff --git a/support_rates/support_rates.install b/support_rates/support_rates.install index 6ee5e00..a4b3384 100644 --- a/support_rates/support_rates.install +++ b/support_rates/support_rates.install @@ -24,6 +24,12 @@ function support_rates_schema() { 'not null' => TRUE, 'default' => '', ), + 'currency' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), 'period' => array( 'type' => 'int', 'size' => 'tiny', @@ -152,6 +158,7 @@ function support_rates_install() { // Add 'Not billable' default billing rate for all clients and all users. $query = db_insert('support_rate')->fields(array( 'description' => t('Not billable'), + 'currency' => '$', 'rate' => 0, 'period' => 0, 'hours' => 0, @@ -550,3 +557,18 @@ function support_rates_update_6004() { drupal_flush_all_caches(); menu_rebuild(); } + +/** + * Create currency field and allow currency selection from USD, GBP and Euro. + */ +function support_rates_update_6005() { + // Add currency selector (USD, GBP, Euro). + db_add_field('support_rate', 'currency', + array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ) + ); +} diff --git a/support_rates/support_rates.module b/support_rates/support_rates.module index b44ddd7..a4edffe 100644 --- a/support_rates/support_rates.module +++ b/support_rates/support_rates.module @@ -88,6 +88,14 @@ function support_rates_admin_form($form, &$form_state, $rate = array()) { '#default_value' => isset($rate->description) ? $rate->description : '', '#description' => t('A brief description of this billing rate. This description may appear on invoices.'), ); + + $form['currency'] = array( + '#title' => t('Currency'), + '#type' => 'select', + '#options' => array('$' => '$', '£' => '£', '€' => '€'), + '#default_value' => isset($rate->currency) ? $rate->currency : 0, + '#description' => t('The billing currency.'), + ); $form['rate'] = array( '#title' => t('Rate'), @@ -332,7 +340,7 @@ function support_rates_node_view($node, $view_mode, $langcode) { if ($node->type == 'support_ticket' && user_access('view rate description')) { if (isset($node->support_rate_description)) { $node->content['support-rates'] = array( - '#value' => "
Rate: " . check_plain($node->support_rate_description) . '
', + '#markup' => "
Rate: " . check_plain($node->support_rate_description) . '
', '#weight' => -1, ); } @@ -405,7 +413,7 @@ function support_rates_comment_load($comments) { */ function support_rates_comment_view($comment, $view_mode, $langcode) { if ($comment->node_type == 'comment_node_support_ticket' && user_access('view rate description')) { - if (!empty($comment->support_rate_description)) { + if (!empty($comment->support_rate_description)) { $comment->content['support']['rate'] = array( '#markup' => '
' . t('Rate') . ': ' . check_plain($comment->support_rate_description) . '
', ); @@ -487,6 +495,7 @@ function support_rates_admin_form_submit($form, &$form_state) { db_update('support_rate') ->fields(array( 'description' => $form_state['values']['description'], + 'currency' => $form_state['values']['currency'], 'rate' => $form_state['values']['rate'], 'hours' => $form_state['values']['hours'], 'start' => $form_state['values']['start'], @@ -526,6 +535,7 @@ function support_rates_admin_form_submit($form, &$form_state) { else { $query = db_insert('support_rate')->fields(array( 'description' => $form_state['values']['description'], + 'currency' => $form_state['values']['currency'], 'rate' => $form_state['values']['rate'], 'hours' => $form_state['values']['hours'], 'start' => $form_state['values']['start'], @@ -579,7 +589,7 @@ function support_rates_overview() { ->extend('PagerDefault') ->extend('TableSort') ->orderByHeader($header); - $query->fields('sr', array('subid', 'description', 'period', 'rate', 'hours', 'start', 'end', 'weight')); + $query->fields('sr', array('subid', 'description', 'period', 'currency', 'rate', 'hours', 'start', 'end', 'weight')); $query->limit(50); $result = $query->execute(); foreach ($result as $rate) { @@ -607,7 +617,7 @@ function support_rates_overview() { truncate_utf8(check_plain($rate->description), 52, TRUE, TRUE), implode(', ', $clients), implode(', ', $users), - '$' . number_format($rate->rate, 2), + $rate->currency . number_format($rate->rate, 2), _support_rates_period($rate->period), empty($rate->hours) ? ''. t('none') . '' : number_format($rate->hours, 1), empty($rate->start) ? ''. t('none') .'' : format_date(strtotime($rate->start), 'small'), @@ -697,7 +707,7 @@ function support_rates_submit($form, &$form_state) { * Load rate out of the database. */ function support_rates_load_rate($type, $id) { - $rate = db_query('SELECT sr.rate, sr.period FROM {support_rate_ticket} srt LEFT JOIN {support_rate} sr ON srt.subid = sr.subid WHERE srt.type = :type AND srt.id = :id', array(':type' => $type, ':id' => $id))->fetch(); + $rate = db_query('SELECT sr.currency, sr.rate, sr.period FROM {support_rate_ticket} srt LEFT JOIN {support_rate} sr ON srt.subid = sr.subid WHERE srt.type = :type AND srt.id = :id', array(':type' => $type, ':id' => $id))->fetch(); if (is_object($rate)) { switch ($rate->period) { case SUPPORT_RATES_HOURLY: diff --git a/support_timer.module b/support_timer.module index aeca965..94f68cb 100644 --- a/support_timer.module +++ b/support_timer.module @@ -548,15 +548,15 @@ function support_timer_client_report($path) { if (module_exists('support_rates')) { $month_viewed = date('Ym01', $month); - $result = db_query('SELECT sr.rate, sr.hours, sr.description from {support_rate} sr LEFT JOIN {support_rate_client} src ON sr.subid = src.subid WHERE sr.period = :period AND src.clid IN (:clients) AND (sr.start = 0 OR sr.start >= :timestamp) AND (sr.end = 0 OR sr.start <= :timestamp)', array(':period' => SUPPORT_RATES_MONTHLY, ':clients' => $clients, ':timestamp' => $month_viewed)); + $result = db_query('SELECT sr.currency sr.rate, sr.hours, sr.description from {support_rate} sr LEFT JOIN {support_rate_client} src ON sr.subid = src.subid WHERE sr.period = :period AND src.clid IN (:clients) AND (sr.start = 0 OR sr.start >= :timestamp) AND (sr.end = 0 OR sr.start <= :timestamp)', array(':period' => SUPPORT_RATES_MONTHLY, ':clients' => $clients, ':timestamp' => $month_viewed)); foreach ($result as $subscription) { $row = array(); $row[] = date('M', $month); // Day $row[] = t('Monthly'); // User $row[] = $subscription->description; // Summary $row[] = "($subscription->hours)"; // Hours - $row[] = t('$') . number_format($subscription->rate, 2); // Rate - $row[] = t('$') . number_format($subscription->rate, 2); // Billed + $row[] = $subscription->currency . number_format($subscription->rate, 2); // Rate + $row[] = $subscription->currency . number_format($subscription->rate, 2); // Billed $total['prebilled'] += $subscription->hours; $total['billed'] += $subscription->rate; $rows = array($row); @@ -712,8 +712,8 @@ function support_timer_client_report($path) { $prepend = $append = ''; } $row[] = $prepend . $time . $append; - $row[] = '$' . number_format($rate, 2); - $row[] = '$' . number_format($billed, 2); + $row[] = $currency . number_format($rate, 2); + $row[] = $currency . number_format($billed, 2); if (!isset($total['billed'])) { $total['billed'] = 0; } @@ -734,7 +734,8 @@ function support_timer_client_report($path) { $report->summary .= isset($total['time']) ? number_format($total['time'], 2) : '0.00'; $report->summary .= '
'; $report->summary .= '' . t('Total:') .' '; - $report->summary .= isset($total['billed']) ? '$' . number_format($total['billed'], 2) : '$0.00'; + $report->summary .= isset($total['currency']) ? $total['currency'] : ''; + $report->summary .= isset($total['billed']) ? number_format($total['billed'], 2) : '0.00'; if (isset($total['summary'])) { $report->summary .= $total['summary']; } @@ -751,7 +752,7 @@ function support_timer_client_report($path) { if (module_exists('support_rates')) { if (user_access('view billed rates')) { $row[] = ''; - $row[] = isset($total['billed']) ? '$' . number_format($total['billed'], 2) : '$0.00'; + $row[] = isset($total['billed']) ? $total['currency'] . number_format($total['billed'], 2) : '0.00'; } } $rows[] = $row; @@ -959,13 +960,13 @@ function support_timer_user_report($account) { if (module_exists('support_rates')) { if (user_access('view billed rates')) { $billed = $rate * $time; - $row[] = '$' . number_format($rate, 2); - $row[] = '$' . number_format($billed, 2); + $row[] = $currency . number_format($rate, 2); + $row[] = $currency . number_format($billed, 2); $total['billed'] += $billed; } if (user_access('view earning rates')) { $earned = support_rates_earned($account, $client, $rate, $time, $month); - $row[] = '$' . number_format($earned, 2); + $row[] = $currency . number_format($earned, 2); $total['earned'] += $earned; } } @@ -981,10 +982,10 @@ function support_timer_user_report($account) { if (module_exists('support_rates')) { if (user_access('view billed rates')) { $row[] = ''; - $row[] = isset($total['billed']) ? '$' . number_format($total['billed'], 2) : '$0.00'; + $row[] = isset($total['billed']) ? $total['currency'] . number_format($total['billed'], 2) : '0.00'; } if (user_access('view earning rates')) { - $row[] = isset($total['earned']) ? '$' . number_format($total['earned'], 2) : '$0.00'; + $row[] = isset($total['earned']) ? $total['currency'] . number_format($total['earned'], 2) : '0.00'; } } $rows[] = $row;