overdraft

ishmael · Nov 24, 2010 · 0c52e30 · 0c52e30
1 parent 4f5da39
commit 0c52e30
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/app/views/creditcardaccounts/_form.erb b/app/views/creditcardaccounts/_form.erb
@@ -16,3 +16,5 @@
 <dd><div id="currency_container"></div><%= form.select(:currency, [['Euro', 'EUR'], ['Dollar', 'USD'], ['Pound', 'GBP']] ,{},{:id => "account_currency"} )%></dd>
 <dt><%= form.label :color,I18n.t('layout.application.color') %></dt>
 <dd><%= form.hidden_field :color ,:id => "color_value"%>    <div id="color_container"></div></dd>
+<dt><%= form.label :overdraft,I18n.t('layout.creditcardaccounts.accountlimit') %></dt>
+<dd><%= form.text_field :overdraft , :class => 'txt'%></dd>
diff --git a/app/views/movements/index.html.erb b/app/views/movements/index.html.erb
@@ -129,8 +129,18 @@
 			  <dt><%= I18n.t('layout.bankaccounts.accountbank') %></dt>
 			  <dd><%=h @account.bank  %></dd>
 			  <dt><%= I18n.t('layout.bankaccounts.accountbalance') %></dt>
-			  <dd><%= @account.balance.format  %></dd>			
-
+			  <dd><%= @account.balance.format  %></dd>	
+        	  <% accounts_type = [Bankaccount,Creditcardaccount,Loanaccount] %>
+
+				<% if @account.class == accounts_type[0] %>
+			  		<dt><%= I18n.t('layout.bankaccounts.overdraft') %></dt>
+					<dd >	<%= @account.overdraft.format  %></dd>
+				<% elsif @account.class == accounts_type[1] %>
+			  		<dt><%= I18n.t('layout.creditcardaccounts.accountlimit') %></dt>
+					<dd >	<%= @account.overdraft.format  %></dd>
+				<% end %>
+
+
 			</dl>
 		</div>
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -69,6 +69,7 @@ en:
       total: "Total"
       notice_message: "The credit card with the name  <strong>%s</strong>, number  <strong>%s</strong> from  <strong>%s</strong> was sucessfully saved."
       delete_message: "The credit card with the name  <strong>%s</strong>, number  <strong>%s</strong> from  <strong>%s</strong> was sucessfully deleted."
+      accountlimit: "Limit"
     movements:
        name: "Movements"
        title: "Movement"

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -72,6 +72,7 @@ pt:
       total: "Total"
       notice_message: "O cartão de crédito <strong>%s</strong> com o número <strong>%s</strong> do banco <strong>%s</strong> foi gravado com sucesso."
       delete_message: "O cartão de crédito <strong>%s</strong> foi apagado com sucesso."
+      accountlimit: "Limite"
     movements:
        name: "Movimentos"
        title: "Movimento"

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
@@ -293,6 +293,22 @@ LOGO				 */
 		-o-text-overflow: ellipsis;
 }
 
+.maxValueContainer {
+	float:right;
+}
+
+.minValueContainer {
+	float:left;
+}
+
+.textContainers {
+	width:200px;
+}
+
+.progressBar {
+	width: 90% !important;
+}
+
 a.yuimenuitemlabel {
 	border:0px !important;
 	min-height:18px;