Skip to content

Riina Antikainen / Moya

Go to a project
Commit 7e1c24f2 by Tuukka Kivilahti
Options

and littlebit moar foodstuff

1 parent 3dee93f4
Inline Side-by-side
Showing with 11 additions and 14 deletions
code/moya-web/WebContent/foodadmin/editTemplate.xhtml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<h:message for="desc" /> <h:message for="desc" />
<h:outputLabel for="overtime" value="#{i18n['foodwave.template.waitPaymentsMinutes']}" /> <h:outputLabel for="overtime" value="#{i18n['foodwave.template.waitPaymentsMinutes']}" />
<p:spinner id="overtime" value="#{foodWaveView.template.waitPaymentsMinutes}" suffix="#{i18n['suffix.minutes']}" min="0" /> <p:spinner id="overtime" value="#{foodWaveView.template.waitPaymentsMinutes}" suffix=" #{i18n['suffix.minutes']}" min="0" />
<h:message for="overtime" /> <h:message for="overtime" />
<h:outputText value=" " /> <h:outputText value=" " />
......
code/moya-web/WebContent/foodmanager/listOrders.xhtml
...@@ -129,35 +129,32 @@ ...@@ -129,35 +129,32 @@
</p:dataTable> </p:dataTable>
</h:form> </h:form>
<br /><br /><br />
<h2>#{i18n['foodwave.summaryView']}</h2> <h2>#{i18n['foodwave.summaryView']}</h2>
<div> <p:panelGrid columns="2">
<h:outputLabel value="#{i18n['foodwave.price']}: " /> <h:outputLabel value="#{i18n['foodwave.price']}: " />
<h:outputText value="#{foodWaveView.foodwavePrice}" > <h:outputText value="#{foodWaveView.foodwavePrice}" style="font-weight: bold" >
<f:convertNumber minFractionDigits="0"/> <f:convertNumber minFractionDigits="0"/>
</h:outputText> </h:outputText>
</div>
<div>
<h:outputLabel value="#{i18n['foodwave.foodwaveBuyInPrice']}: " /> <h:outputLabel value="#{i18n['foodwave.foodwaveBuyInPrice']}: " />
<h:outputText value="#{foodWaveView.foodwaveBuyInPrice}" > <h:outputText value="#{foodWaveView.foodwaveBuyInPrice}" style="font-weight: bold" >
<f:convertNumber minFractionDigits="0"/> <f:convertNumber minFractionDigits="0"/>
</h:outputText> </h:outputText>
</div>
<div>
<h:outputLabel value="#{i18n['foodwave.ordersBefore']}: " /> <h:outputLabel value="#{i18n['foodwave.ordersBefore']}: " />
<h:outputText value="#{foodWaveView.selectedFoodWave.time}" > <h:outputText value="#{foodWaveView.selectedFoodWave.time}" style="font-weight: bold" >
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
</h:outputText> </h:outputText>
</div>
<div>
<h:outputLabel value="#{i18n['foodwave.foodwaveLastBillPayTime']}: " /> <h:outputLabel value="#{i18n['foodwave.foodwaveLastBillPayTime']}: " />
<h:outputText value="#{foodWaveView.selectedFoodWave.lastPaymentTime}" > <h:outputText value="#{foodWaveView.selectedFoodWave.lastPaymentTime}" style="font-weight: bold" >
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
</h:outputText> </h:outputText>
</div> </p:panelGrid>
<p:dataTable var="summ" value="#{foodWaveView.productSummaries}"> <p:dataTable var="summ" value="#{foodWaveView.productSummaries}">
<p:column> <p:column>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!