X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fbasket.xhtml;h=f90436fa27e296da1e1d6cb9301536e6c106145f;hb=71d8f732225b275a64b8ac9df6fdc893fcd17a27;hp=d8860243a52f651da1ef04378620d1ee2eba2929;hpb=f525a0998c47fd6e1fc28a184036e6a65d825fa8;p=pizzaservice-war.git

diff --git a/web/basket.xhtml b/web/basket.xhtml
index d8860243..f90436fa 100644
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://java.sun.com/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<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">#{msg.SINGLE_ITEM_PRICE}</f:facet>
+					<f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
 
 					<div class="item_price">
 						<ui:fragment rendered="#{item.isProductType()}">
-							<h:outputText class="price" value="#{item.product.price}">
+							<h:outputText styleClass="price" value="#{item.itemProduct.productPrice}">
 								<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 							</h:outputText>
 						</ui:fragment>
@@ -41,10 +40,10 @@
 				<h:column>
 					<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.
 							//-->
@@ -57,25 +56,18 @@
 					<f:facet name="header">#{msg.TOTAL_ITEM_PRICE}</f:facet>
 
 					<div class="item_total_price">
-						<h:outputText class="price" id="item_price" value="#{basketController.calculateItemPrice(item)}" rendered="#{item.isProductType()}">
+						<h:outputText styleClass="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>
 
-			<div class="totals_container">
-				#{msg.TOTAL_ORDER_PRICE}
-				<h:outputText class="price" id="total_sum" value="#{basketController.calculateTotalPrice()}">
-					<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
-				</h:outputText>
-			</div>
-
-			<h:outputText class="empty_basket" value="#{msg.NO_ITEMS_ADDED_TO_BASKET}" 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>
