--- hotel_booking_admin.inc	2010-01-05 15:44:40.000000000 +0000
+++ hotel_booking_adminNew.inc	2010-01-11 15:32:16.000000000 +0000
@@ -263,9 +263,14 @@ function hotel_booking_rate_modifiers_ta
   );
 
   $rows = array();
-  $modifier_list = hotel_booking_get_rate_modifiers();
+  $modifier_list = hotel_booking_get_rate_modifiers();
+  
+  // Set currency sign
+  $cur_sign_prefix = (variable_get('uc_sign_after_amount', FALSE)) ? '' : variable_get('uc_currency_sign', '$');
+  $cur_sign_suffix = (variable_get('uc_sign_after_amount', FALSE)) ? variable_get('uc_currency_sign', '$') : '';
+  
   foreach ($modifier_list as $modifier) {
-    $amount = (check_plain($modifier->method) == 'percent') ? '  '. number_format(check_plain($modifier->value), 2, '.', ',') .' %' : '$ '. number_format(check_plain($modifier->value), 2, '.', ',');
+    $amount = (check_plain($modifier->method) == 'percent') ? '  '. number_format(check_plain($modifier->value), 2, '.', ',') .'%' : '  '.$cur_sign_prefix. number_format(check_plain($modifier->value), 2, '.', ',').$cur_sign_suffix;
     $rows[] = array(
       $amount,
       l(t('Edit'), 'admin/store/hotel_booking/rate_modifiers/'. $modifier->hrmid),
@@ -302,7 +307,12 @@ function hotel_booking_occupancy_modifie
   );
 
   $rows = array();
-  $modifier_list = hotel_booking_get_occupancy_modifiers();
+  $modifier_list = hotel_booking_get_occupancy_modifiers();
+  
+  // Set currency sign
+  $cur_sign_prefix = (variable_get('uc_sign_after_amount', FALSE)) ? '' : variable_get('uc_currency_sign', '$');
+  $cur_sign_suffix = (variable_get('uc_sign_after_amount', FALSE)) ? variable_get('uc_currency_sign', '$') : '';
+  
   foreach ($modifier_list as $modifier) {
     $criteria = check_plain($modifier->threshold);
     if (check_plain($modifier->adult_child) == "adult") {
@@ -316,7 +326,7 @@ function hotel_booking_occupancy_modifie
     }
     $rows[] = array(
       $criteria,
-      '$ '. number_format(check_plain($modifier->value), 2, '.', ','),
+      $cur_sign_prefix. number_format(check_plain($modifier->value), 2, '.', ',').$cur_sign_suffix,
       l(t('Edit'), 'admin/store/hotel_booking/occupancy_modifiers/'. $modifier->hoid),
       l(t('Delete'), 'admin/store/hotel_booking/occupancy_modifiers/'. $modifier->hoid .'/delete'),
     );
@@ -351,8 +361,8 @@ function hotel_booking_rate_modifiers_fo
   $form['method'] = array(
     '#type'          => 'radios',
     '#title'         => 'Method',
-    '#description'   => 'Which method will be used to apply this modifier, dollar value or percentage of base rate',
-    '#options'       => array('percent' => 'Percentage', 'value' => 'Dollar Value'),
+    '#description'   => 'Which method will be used to apply this modifier, amount or percentage of base rate',
+    '#options'       => array('percent' => 'Percentage', 'value' => 'Amount ('.variable_get('uc_currency_sign', '$').')'),
     '#default_value' => isset($modifier->method) ? check_plain($modifier->method) : 'value',
   );
   $form['value'] = array(
@@ -414,12 +424,14 @@ function hotel_booking_occupancy_modifie
     '#required'    => TRUE,
     '#default_value' => $modifier->threshold,
     '#description' => 'Each guest over this threshold will be charged the additional adjustment amount per night.',
-  );
+  );
+    
   $form['value'] = array(
     '#type'          => 'textfield',
     '#title'         => 'Adjustment Amount',
     '#required'      => TRUE,
-    '#field_prefix'  => '$ ',
+    '#field_prefix'  => (variable_get('uc_sign_after_amount', FALSE)) ? '' : variable_get('uc_currency_sign', '$'),
+    '#field_suffix'  => (variable_get('uc_sign_after_amount', FALSE)) ? variable_get('uc_currency_sign', '$') : '',
     '#default_value' => number_format($modifier->value, 2, '.', ','),
   );
 
@@ -460,7 +472,6 @@ function hotel_booking_rates_form($form_
   }
 
   $sign_flag = variable_get('uc_sign_after_amount', FALSE);
-  $currency_sign = variable_get('uc_currency_sign', '$');
 
   $form['rate_id'] = array(
     '#type'          => 'value',
@@ -845,13 +856,16 @@ function hotel_booking_rate_calendar($mo
     $day_count++;
   }
 
-  $day_num = 1;
-
+  $day_num = 1;
+  
+  // Set currency sign
+  $cur_sign_prefix = (variable_get('uc_sign_after_amount', FALSE)) ? '' : variable_get('uc_currency_sign', '$');
+  $cur_sign_suffix = (variable_get('uc_sign_after_amount', FALSE)) ? variable_get('uc_currency_sign', '$') : '';
+  
   while ($day_num <= $days_in_month) {
     $output = '<div style="text-align:center">'. $day_num .'</div>';
-    $output .= '$ <input class="form-text uc_hotel_rate'. $group .'" type="text" size = "12" name="price['. $year .'-'. hotel_booking_pad_with_zeros($month, 2) .'-'. hotel_booking_pad_with_zeros($day_num, 2) .']" value="';
-    $output .= (isset($day_prices[$day_num]['rate']) && is_numeric($day_prices[$day_num]['rate'])) ? number_format($day_prices[$day_num]['rate'], 2, '.', '') : '0.00';
-    $output .= '" />';
+    $output .= $cur_sign_prefix.' <input class="form-text uc_hotel_rate'. $group .'" type="text" size = "12" name="price['. $year .'-'. hotel_booking_pad_with_zeros($month, 2) .'-'. hotel_booking_pad_with_zeros($day_num, 2) .']" value="';    $output .= (isset($day_prices[$day_num]['rate']) && is_numeric($day_prices[$day_num]['rate'])) ? number_format($day_prices[$day_num]['rate'], 2, '.', '') : '0.00';
+    $output .= '" /> '.$cur_sign_suffix;
 
     $rows[($week - 1)][($day_count - 1)] = $output;