Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit aafcc15f
authored
Jun 05, 2014
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
notes also for bill list
1 parent
2a671a13
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
1 deletions
code/MoyaWeb/WebContent/resources/cditools/bills/list.xhtml
code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
code/MoyaWeb/WebContent/resources/cditools/bills/list.xhtml
View file @
aafcc15
...
...
@@ -51,6 +51,11 @@
<f:converter
binding=
"#{referenceNumberConverter}"
/>
</h:outputText>
</p:column>
<p:column
headerText=
"#{i18n['bill.notes']}"
rendered=
"#{productShopView.gatherBillInfo}"
>
<h:outputText
value=
"#{bill.notes}"
/>
</p:column>
<p:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['bill.vat']}"
/>
...
...
code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml
View file @
aafcc15
...
...
@@ -100,7 +100,7 @@
</h:panelGrid>
<br
/>
<h2><p:outputLabel
value=
"#{i18n['bill.notes.title']}"
/>
</h2>
<p:inputTextarea
cols=
"50"
rendered=
"#{productShopView.gatherBillInfo}"
value=
"#{productShopView.otherInfo}"
label=
"#{i18n['otherInfo']}"
/>
<br
/>
...
...
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
View file @
aafcc15
...
...
@@ -30,6 +30,7 @@ bill.cancel = Cancel bill
bill.expires
=
Expires
bill.isExpired
=
Bill is expired
bill.markPaid.show
=
Show Mark paid -buttons
bill.notes.title
=
Lis
\u
00E4tietoja
bill.save
=
Save
bill.showPayButtons
=
Show pay buttons
...
...
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
View file @
aafcc15
...
...
@@ -79,6 +79,7 @@ bill.markPaid = Mark paid
bill.markPaid.show
=
Show Mark paid -buttons
bill.markedPaid
=
Bill marked paid
bill.notes
=
Notes
bill.notes.title
=
Huomioitavaa
bill.noticetime
=
Notice time
bill.ourReference
=
Our reference
bill.paidDate
=
Paid date
...
...
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
View file @
aafcc15
...
...
@@ -79,6 +79,7 @@ bill.markPaid = Maksettu
bill.markPaid.show
=
N
\u
00E4yt
\u
00E4 Maksettu -napit
bill.markedPaid
=
Lasku merkitty maksetuksi.
bill.notes
=
Huomioita
bill.notes.title
=
Lis
\u
00E4tietoja
bill.noticetime
=
Huomautusaika
bill.ourReference
=
Myyj
\u
00E4n viite
bill.paidDate
=
Maksup
\u
00E4iv
\u
00E4
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment