From db3f19770b1fde4c95a70adb4f9664fe20364ae5 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Wed, 6 Apr 2016 18:25:11 +0200
Subject: [PATCH] Set currcency symbol on correct site in bulk edit + giftcard
 forms (#451)

---
 application/views/giftcards/form.php  |  5 +++++
 application/views/items/form_bulk.php | 10 ++++++++++
 application/views/people/manage.php   |  1 -
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index 3df179b7a..e6f5c29d3 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -33,13 +33,18 @@
 			<?php echo form_label($this->lang->line('giftcards_card_value'), 'name', array('class'=>'required control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 				<div class="input-group input-group-sm">
+					<?php if (!$this->config->item('currency_side')): ?>
 					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+					<?php endif; ?>
 					<?php echo form_input(array(
 							'name'=>'value',
 							'id'=>'value',
 							'class'=>'form-control input-sm',
 							'value'=>to_currency_no_money($giftcard_info->value))
 							);?>
+					<?php if ($this->config->item('currency_side')): ?>
+					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+					<?php endif; ?>
 				</div>
 			</div>
 		</div>
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index 677b08832..a24a9c5ab 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -40,12 +40,17 @@
 			<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
+					<?php if (!$this->config->item('currency_side')): ?>
 					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+					<?php endif; ?>
 					<?php echo form_input(array(
 							'name'=>'cost_price',
 							'id'=>'cost_price',
 							'class'=>'form-control input-sm')
 					);?>
+					<?php if ($this->config->item('currency_side')): ?>
+					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+					<?php endif; ?>
 				</div>
 			</div>
 		</div>
@@ -54,12 +59,17 @@
 			<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
+					<?php if (!$this->config->item('currency_side')): ?>
 					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+					<?php endif; ?>
 					<?php echo form_input(array(
 							'name'=>'unit_price',
 							'id'=>'unit_price',
 							'class'=>'form-control input-sm')
 					);?>
+					<?php if ($this->config->item('currency_side')): ?>
+					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+					<?php endif; ?>
 				</div>
 			</div>
 		</div>
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index cce9c0e26..62ffe9674 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -42,7 +42,6 @@ function post_person_form_submit(response)
 		{
 			update_row(response.person_id,'<?php echo site_url("$controller_name/get_row")?>');
 			set_feedback(response.message, 'alert alert-dismissible alert-success', false);	
-			
 		}
 		else //refresh entire table
 		{