--- sites/all/modules/uc_hotel/hotel_booking/hotel_booking.module.6.x-1.x-dev	2010-05-18 06:19:25.000000000 -0500
+++ sites/all/modules/uc_hotel/hotel_booking/hotel_booking.module	2010-05-18 06:19:19.000000000 -0500
@@ -595,7 +595,7 @@ function hotel_search_view($args) {
       $content .= '<form action="book_room" method="post"><div>';
       $content .= '<input type="hidden" name="nodeid[]" value="'. $node->nid .'" /></div>';
       $content .= '<h3 class="booking-title">'. l($node->title, drupal_get_path_alias('node/'. $node->nid)) .'</h3>';
-      $content .= '<h3 class="booking-price">$ ' . number_format($total, 2, '.', ',') .'</h3>';
+      $content .= '<h3 class="booking-price">'. uc_price($total, array('revision' => 'formatted')) .'</h3>';
        if (variable_get('hotel_booking_search_teaser_body', 'teaser') == 'teaser') {
         $content .= '<div class="hotel-roomdesc">'. check_markup($node->teaser, $node->format, FALSE)
          .' '. l(t('more'), drupal_get_path_alias('node/'. $node->nid)) 
@@ -609,9 +609,9 @@ function hotel_search_view($args) {
       $content .= t('Book This Room') .'" /></div>';
 
       $content .= '<fieldset class="clear collapsible collapsed"><legend><a href="#">'. t('Pricing Details') .'</a></legend>';
-      $content .= '<div class="hotel-total">Room Total:<br />$ '. number_format($total, 2, '.', ',') .'</div>';
-      $content .= '<div class="hotel-perperson-total">'. t('Total / Person:') .'<br />$ '. $pp .'</div>';
-      $content .= '<div class="hotel-avgpernight">'. t('Avg / Night:') .'<br />$ '. $avg .'</div>';
+      $content .= '<div class="hotel-total">Room Total:<br />'. uc_price($total, array('revision' => 'formatted')) .'</div>';
+      $content .= '<div class="hotel-perperson-total">'. t('Total / Person:') .'<br />'. uc_price($pp, array('revision' => 'formatted')) .'</div>';
+      $content .= '<div class="hotel-avgpernight">'. t('Avg / Night:') .'<br />'. uc_price($avg, array('revision' => 'formatted')) .'</div>';
       $content .= '<h5 class="clear">'. t('Nightly Breakdown:') .'</h5>';
       $content .= '<div class="hotel-result-days">';
       $content .= '<input type="hidden" name="roomtype" value="'. $node->nid .'" />';
@@ -620,7 +620,7 @@ function hotel_search_view($args) {
       $content .= '<input type="hidden" name="total" value="'. $total .'" />';
 
       for ($z = 0; $z < sizeof($rooms[$rtid]['nights']); $z++) {
-        $content .= '<div class="hotel-result-day">'. date('M j', strtotime("$checkin + $z day")) ."<br />$ " . number_format($rooms[$rtid]['nights'][date("Y-m-d", strtotime("$checkin + $z day"))]['price'], 2, '.', ',');
+        $content .= '<div class="hotel-result-day">'. date('M j', strtotime("$checkin + $z day")) ."<br />" . uc_price( $rooms[$rtid]['nights'][date("Y-m-d", strtotime("$checkin + $z day"))]['price'], array('revision' => 'formatted'));
         $content .= '<input type="hidden" name="date[]" value="'. date('Y-m-d', strtotime("$checkin + $z day")) .'" />';
         $content .= '<input type="hidden" name="price[]" value="'. number_format($rooms[$rtid]['nights'][date("Y-m-d", strtotime("$checkin + $z day"))]['price'], 2, '.', ',') .'" />';
         $content .= '</div>';
@@ -1030,7 +1030,7 @@ function hotel_booking_ca_predicate() {
   //uc_checkout_complete
   $configurations['hotel_booking_payment_received'] = array(
     '#title' => t('Reduce room availability status on full payment'),
-    '#description' => t('Only happens when a payment is entered and the balance is <= $0.00.'),
+    '#description' => t('Only happens when a payment is entered and the balance is less than or equal to') . '&nbsp;' . uc_price(0, array('revision' => 'formatted')) . '.',
     '#class' => 'payment',
     '#trigger' => 'uc_payment_entered',
     '#status' => 1,
@@ -1039,7 +1039,7 @@ function hotel_booking_ca_predicate() {
       '#conditions' => array(
         array(
           '#name' => 'uc_payment_condition_order_balance',
-          '#title' => t('If the balance is less than or equal to $0.00.'),
+          '#title' => t('If the balance is less than or equal to') . '&nbsp;' . uc_price(0, array('revision' => 'formatted')) . '.',
           '#argument_map' => array(
             'order' => 'order',
           ),
@@ -1077,7 +1077,7 @@ function hotel_booking_ca_predicate() {
 
   $configurations['hotel_booking_checkout_complete'] = array(
     '#title' => t('Reduce room availability status on checkout with full payment'),
-    '#description' => t('Only happens when checkout occurs and a payment is entered and the balance is <= $0.00.'),
+    '#description' => t('Only happens when checkout occurs and a payment is entered and the balance is less than or equal to') . '&nbsp;' . uc_price(0, array('revision' => 'formatted')) . '.',
     '#class' => 'payment',
     '#trigger' => 'uc_checkout_complete',
     '#status' => 0,
@@ -1086,7 +1086,7 @@ function hotel_booking_ca_predicate() {
       '#conditions' => array(
         array(
           '#name' => 'uc_payment_condition_order_balance',
-          '#title' => t('If the balance is less than or equal to $0.00.'),
+          '#title' => t('If the balance is less than or equal to') . '&nbsp;' . uc_price(0, array('revision' => 'formatted')) . '.',
           '#argument_map' => array(
             'order' => 'order',
           ),
@@ -1410,10 +1410,10 @@ function hotel_booking_order_details_tab
       $thisday = $item->data['nights'][$i];
       $foo = explode('-', $thisday);
       $today = date('l F j, Y', mktime(0, 0, 0, $foo[1], $foo[2], $foo[0]));
-      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => '$'. $item->data['prices'][$i], 'class' => 'price'));
+      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => uc_price($item->data['prices'][$i], array('revision' => 'formatted')), 'class' => 'price'));
       foreach ($addons as $nid => $info) {
         if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-          $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
+          $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => uc_price(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), array('revision' => 'formatted')), 'class' => 'price'));
         }
       }
     }
@@ -1422,7 +1422,7 @@ function hotel_booking_order_details_tab
     $rows[] = array($today, '', '', t('Check-Out'), '', '');
     foreach ($addons as $nid => $info) {
       if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-        $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => uc_price(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), array('revision' => 'formatted')), 'class' => 'price'));
       }
     }
 
@@ -1435,7 +1435,7 @@ function hotel_booking_order_details_tab
     $header = array(array('data' => t('Additional Add-On & Upgrade Items'), 'colspan' => 2, 'width' => '100%'), 'data' => t('Total'));
     foreach ($addons as $nid => $info) {
       if (!$addons[$nid]['daily']) {
-        $rows[] = array($addons[$nid]['order']->qty .'x', array('data' => l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => '$' . number_format(($addons[$nid]['order']->qty * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array($addons[$nid]['order']->qty .'x', array('data' => l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => uc_price(($addons[$nid]['order']->qty * $addons[$nid]['order']->price), array('revision' => 'formatted')), 'class' => 'price'));
       }
     }
 
@@ -1626,10 +1626,10 @@ function hotel_booking_cart_details_tabl
       $thisday = $item->data['nights'][$i];
       $foo = explode('-', $thisday);
       $today = date('l F j, Y', mktime(0, 0, 0, $foo[1], $foo[2], $foo[0]));
-      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => '$'. $item->data['prices'][$i], 'class' => 'price'));
+      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => uc_price($item->data['prices'][$i], array('revision' => 'formatted')), 'class' => 'price'));
       foreach ($addons as $nid => $info) {
         if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-          $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
+          $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => uc_price(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), array('revision' => 'formatted')), 'class' => 'price'));
         }
       }
     }
@@ -1638,7 +1638,7 @@ function hotel_booking_cart_details_tabl
     $rows[] = array($today, '', '', t('Check-Out'), '', '');
     foreach ($addons as $nid => $info) {
       if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-        $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => uc_price(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), array('revision' => 'formatted')), 'class' => 'price'));
       }
     }
 
@@ -1651,7 +1651,7 @@ function hotel_booking_cart_details_tabl
     $header = array(array('data' => t('Additional Add-On & Upgrade Items'), 'colspan' => 2, 'width' => '100%'), 'data' => t('Total'));
     foreach ($addons as $nid => $info) {
       if (!$addons[$nid]['daily']) {
-        $rows[] = array($addons[$nid]['cart']['qty'] .'x', array('data' => l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => '$' . number_format(($addons[$nid]['cart']['qty'] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array($addons[$nid]['cart']['qty'] .'x', array('data' => l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => uc_price(($addons[$nid]['cart']['qty'] * $addons[$nid]['node']->sell_price), array('revision' => 'formatted')), 'class' => 'price'));
       }
     }
     return theme('table', $header, $rows);