From 5ef9b3cbe890d6a6d0ed83864831c3608d48d93f Mon Sep 17 00:00:00 2001
From: ManuelLR <ManuelLR@github.com>
Date: Wed, 17 Feb 2016 23:17:57 +0100
Subject: [PATCH] CreditCard working

---
 .../controllers/customer/CreditCardController.java   | 11 ++++-------
 .../src/main/webapp/WEB-INF/tags/textbox.tag         |  2 +-
 .../src/main/webapp/views/creditCard/display.jsp     |  2 +-
 .../src/main/webapp/views/creditCard/edit.jsp        | 11 ++++-------
 .../src/main/webapp/views/master-page/header.jsp     | 12 +++++++++++-
 .../webapp/views/master-page/messages.properties     |  1 +
 .../webapp/views/master-page/messages_es.properties  |  1 +
 7 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/WorkSpace/Acme-Six-Pack/src/main/java/controllers/customer/CreditCardController.java b/WorkSpace/Acme-Six-Pack/src/main/java/controllers/customer/CreditCardController.java
index 02e46be..32e7b26 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/java/controllers/customer/CreditCardController.java
+++ b/WorkSpace/Acme-Six-Pack/src/main/java/controllers/customer/CreditCardController.java
@@ -43,7 +43,7 @@ public ModelAndView display(){
 		
 		result = new ModelAndView("creditCard/display");
 		result.addObject("creditCard", creditCard);
-		result.addObject("idCustomer", customer.getId());
+		result.addObject("customer", "true");
 		
 		return result;
 	}
@@ -113,16 +113,13 @@ protected ModelAndView createEditModelAndView(CreditCard creditCard) {
 
 	protected ModelAndView createEditModelAndView(CreditCard creditCard, String message) {
 		ModelAndView result;
-		Customer custo;
-		
-		custo = customerService.findByPrincipal();
 
 		result = new ModelAndView("creditCard/edit");
 		result.addObject("creditCard", creditCard);
 		result.addObject("message", message);
-		result.addObject("idCustomer", custo.getId());
-		result.addObject("urlAction", "creditCard/consumer/edit.do");
-		result.addObject("urlReturn", "creditCard/consumer/display.do");
+		result.addObject("customer", "true");
+		result.addObject("urlAction", "creditCard/customer/edit.do");
+		result.addObject("urlReturn", "creditCard/customer/display.do");
 
 		return result;
 	}
diff --git a/WorkSpace/Acme-Six-Pack/src/main/webapp/WEB-INF/tags/textbox.tag b/WorkSpace/Acme-Six-Pack/src/main/webapp/WEB-INF/tags/textbox.tag
index 93e9282..350d2cd 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/webapp/WEB-INF/tags/textbox.tag
+++ b/WorkSpace/Acme-Six-Pack/src/main/webapp/WEB-INF/tags/textbox.tag
@@ -35,7 +35,7 @@
 
 <div>
 	<form:label path="${path}">
-		<spring:message code="${code}" />
+		<spring:message code="${code}" />: &nbsp;
 	</form:label>	
 	<form:input path="${path}" readonly="${readonly}" />	
 	<form:errors path="${path}" cssClass="error" />
diff --git a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/display.jsp b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/display.jsp
index 71ac95d..c9be372 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/display.jsp
+++ b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/display.jsp
@@ -49,7 +49,7 @@
 </jstl:if>
 	
 	<!-- Action links -->
-<jstl:if test="${idCustomer != null}">
+<jstl:if test="${customer != null}">
 	<div>
 		<b><a href="creditCard/customer/edit.do"> 
 			<spring:message code="creditCard.edit" />
diff --git a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/edit.jsp b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/edit.jsp
index eca5294..6277a00 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/edit.jsp
+++ b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/creditCard/edit.jsp
@@ -7,6 +7,8 @@
 <%@taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <%@taglib prefix="security"	uri="http://www.springframework.org/security/tags"%>
 <%@taglib prefix="display" uri="http://displaytag.sf.net"%>
+<%@ taglib prefix="acme" tagdir="/WEB-INF/tags" %>
+
 
 	<!-- Form -->
 	<form:form action="${urlAction}" modelAttribute="creditCard">
@@ -15,23 +17,18 @@
 		<!-- Editable Attributes -->
 
 		<acme:textbox code="creditCard.holderName" path="holderName" />
-		<br />
 		<acme:textbox code="creditCard.brandName" path="brandName" />
-		<br />
 		<acme:textbox code="creditCard.number" path="number" />
-		<br />
 		<acme:textbox code="creditCard.expirationMonth" path="expirationMonth" />
-		<br />
 		<acme:textbox code="creditCard.expirationYear" path="expirationYear" />
-		<br />		
 		<acme:textbox code="creditCard.cvvCode" path="cvvCode" />
-		<br />		
+		<br />
 		
 		<!-- Action buttons -->
 		<input type="submit" name="save"
 			value="<spring:message code="creditCard.save"/>"/>
 		&nbsp;
-		<jstl:if test="${idCustomer != null}">
+		<jstl:if test="${customer != null}">
 			<input type="submit" name="delete"
 				value="<spring:message code="creditCard.delete"/>"/>
 			&nbsp;
diff --git a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/header.jsp b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/header.jsp
index 5a8aecc..ba3a93c 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/header.jsp
+++ b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/header.jsp
@@ -56,7 +56,17 @@
 		</security:authorize>
 		
 		<security:authorize access="isAuthenticated()">
-			<li><a href="j_spring_security_logout"><spring:message code="master.page.logout" />(<security:authentication property="principal.username" />)</a></li>
+			<!-- <li><a href="j_spring_security_logout"><spring:message code="master.page.logout" />(<security:authentication property="principal.username" />)</a></li> -->
+			<li><a class="fNiv"><security:authentication property="principal.username" /></a>
+				<ul>
+					<li class="arrow"></li>
+					<li><a href="j_spring_security_logout"><spring:message code="master.page.logout" /></a></li>
+					
+					<security:authorize access="hasRole('CUSTOMER')">
+						<li><a href="customer/customer/display.do"><spring:message code="master.page.customer.info" /></a></li>
+					</security:authorize>
+				</ul>
+			</li>
 		</security:authorize>
 	</ul>
 </div>
diff --git a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages.properties b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages.properties
index 00b0296..06154d1 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages.properties
+++ b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages.properties
@@ -23,6 +23,7 @@ master.page.manage.service			= Service
 master.page.list					= List
 master.page.list.consumers			= Consumers
 master.page.list.orders				= Orders
+master.page.customer.info			= Profile info
 
 master.page.messages				= Message Boxs
 master.page.logout 					= Logout
diff --git a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages_es.properties b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages_es.properties
index 128de13..4b0b6f3 100644
--- a/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages_es.properties
+++ b/WorkSpace/Acme-Six-Pack/src/main/webapp/views/master-page/messages_es.properties
@@ -23,6 +23,7 @@ master.page.manage.service			= Servicio
 master.page.list					= Listar
 master.page.list.consumers			= Consumidores
 master.page.list.orders				= Pedidos
+master.page.customer.info			= Información de perfil
 
 master.page.messages				= Mensajes
 master.page.logout 					= Salir