Skip to content

Max Mecklin / Moya

Go to a project
Commit 74a526ce by Tuukka Kivilahti
Options

merge failed previoliously

1 parent 5c881099
Inline Side-by-side
Showing with 2 additions and 2 deletions
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
......@@ -64,13 +64,13 @@
<f:facet name="header">
<h:outputText value="${i18n['foodWave.paid']}" />
</f:facet>
<h:outputText value="#{foodwave.accountEvents.size()}" />
<h:outputText value="#{foodwave.orderedCount}" />
</p:column>
<p:column styleClass="text-center">
<f:facet name="header">
<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
</f:facet>
<h:outputText value="#{foodwave.unpaidBillLineCount}" />
<h:outputText value="#{foodwave.unpaidCount}" />
</p:column>
<p:column>
<f:facet name="header">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!