X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fbasket.xhtml;h=3d3fb58f7419eb1d5704e8af221a667fc55ca1e4;hb=36e384061268a1f76cf6136378d1b50c128fc0e4;hp=a878d5634fa871d2151630c0ff95a2c3c27567ff;hpb=d6903b6b1fbd100dd9a22d65c517e8d5016f926b;p=pizzaservice-war.git

diff --git a/web/basket.xhtml b/web/basket.xhtml
index a878d563..3d3fb58f 100644
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -9,21 +9,17 @@
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_BASKET}</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="content_header">
-			#{msg.SUB_TITLE_INDEX_SHOW_BASKET}
+			#{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">#{msg.GUEST_ITEM_TITLE}</f:facet>
 
 					<ui:fragment rendered="#{item.isProductType()}">
-						#{item.product.title}
+						#{item.itemProduct.productTitle}
 					</ui:fragment>
 				</h:column>
 
@@ -32,7 +28,7 @@
 
 					<div class="item_price">
 						<ui:fragment rendered="#{item.isProductType()}">
-							<h:outputText class="price" value="#{item.product.price}">
+							<h:outputText class="price" value="#{item.itemProduct.productPrice}">
 								<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 							</h:outputText>
 						</ui:fragment>
@@ -42,10 +38,10 @@
 				<h:column>
 					<f:facet name="header">#{msg.CHANGE_ITEM_AMOUNT}</f:facet>
 
-					<h:form acceptcharset="utf-8" id="add_item">
+					<h:form id="add_item">
 						<h:commandButton class="submit" id="add" value="#{msg.BUTTON_CHANGE_ITEM_AMOUNT}" action="#{basketController.changeItem(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.
 							//-->
@@ -65,18 +61,11 @@
 				</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>