X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fbasket.xhtml;h=92e49ab8ea07de1d4aaa57e2a998aa4e63e01b66;hb=8a39d893b5c1ddeeff6c77fa05e6f2ef356edc8a;hp=ffe36a049dbc73f151999612fda0d012a5734ba6;hpb=8ed95f6af6858cb7711cd55141a1abb7cfb11a69;p=pizzaservice-war.git

diff --git a/web/basket.xhtml b/web/basket.xhtml
index ffe36a04..92e49ab8 100644
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 	  xmlns:ui="http://java.sun.com/jsf/facelets"
 	  xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -6,43 +7,41 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">Warenkorb anzeigen</ui:define>
-
-		<ui:define name="menu">
-			<ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-		</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_BASKET}</ui:define>
 
 		<ui:define name="content_header">
-			Alle im Warenkorb befindlichen Artikel:
+			#{msg.CONTENT_TITLE_INDEX_SHOW_BASKET}
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable var="item" value="#{basketController.allItems()}" headerClass="table_header_column" class="table" rendered="#{basketController.hasItems()}">
+			<h:dataTable id="table_show_basket" var="item" value="#{basketController.allItems()}" styleClass="table" summary="#{msg.TABLE_SUMMARY_SHOW_BASKET}" rendered="#{basketController.hasItems()}">
 				<h:column>
-					<f:facet name="header">Artikel:</f:facet>
+					<f:facet name="header">#{msg.GUEST_ITEM_TITLE}</f:facet>
 
 					<ui:fragment rendered="#{item.isProductType()}">
-						#{item.product.title}
+						#{item.itemProduct.productTitle}
 					</ui:fragment>
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">Einzelpreis:</f:facet>
+					<f:facet name="header">#{msg.SINGLE_ITEM_PRICE}</f:facet>
 
-					<ui:fragment rendered="#{item.isProductType()}">
-						<h:outputText class="price" value="#{item.product.price}">
-							<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
-						</h:outputText>
-					</ui:fragment>
+					<div class="item_price">
+						<ui:fragment rendered="#{item.isProductType()}">
+							<h:outputText class="price" value="#{item.itemProduct.productPrice}">
+								<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
+							</h:outputText>
+						</ui:fragment>
+					</div>
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">Anzahl Ã¤ndern:</f:facet>
+					<f:facet name="header">#{msg.CHANGE_ITEM_AMOUNT}</f:facet>
 
-					<h:form acceptcharset="utf-8" id="add_item">
-						<h:commandButton class="submit" id="add" value="Ãndern" action="#{basketController.changeItem(item)}" title="#{msg.BUTTON_TITLE_CHANGE_ITEM_AMOUNT}" />
+					<h:form id="add_item">
+						<h:commandButton class="submit" id="add" value="#{msg.BUTTON_CHANGE_ITEM_AMOUNT}" action="#{basketController.doChangeItem(item)}" title="#{msg.BUTTON_TITLE_CHANGE_ITEM_AMOUNT}" />
 
-						<h:inputText class="input" id="amount" size="3" maxlength="20" value="#{item.amount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
+						<h:inputText class="input" id="amount" size="3" maxlength="20" value="#{item.orderedAmount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
 							<!--
 							If the customer wants to order more, he need to call in.
 							//-->
@@ -52,19 +51,21 @@
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">Zwischensumme:</f:facet>
+					<f:facet name="header">#{msg.TOTAL_ITEM_PRICE}</f:facet>
 
-					<h:outputText id="item_price" value="#{basketController.calculateItemPrice(item)}" rendered="#{item.isProductType()}">
-						<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
-					</h:outputText>
+					<div class="item_total_price">
+						<h:outputText class="price" id="item_price" value="#{basketController.calculateItemPrice(item)}" rendered="#{item.isProductType()}">
+							<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
+						</h:outputText>
+					</div>
 				</h:column>
 			</h:dataTable>
 
-			<h:outputText class="empty_basket" value="Es befinden sich derzeit keine Artikel im Warenkorb." rendered="#{basketController.isEmpty()}" />
-		</ui:define>
+			<ui:include src="/WEB-INF/templates/basket/total_sum.tpl" />
 
-		<ui:define name="footer">
-			<ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+			<div class="continue_checkout">
+				<h:link class="checkout_link" id="checkout" value="#{msg.LINK_CONTINUE_TO_CHECKOUT}" outcome="checkout" />
+			</div>
 		</ui:define>
 	</ui:composition>
 </html>
