Skip to content

Codecrew / Moya

Go to a project
Commit da3b7b36 by Antti Tönkyrä
Options

Merge branch 'billextrainfo' into 'master' 

Billextrainfo

Palautetaan infokentät laskuihin. ( Näkyvät vain jos enabloitu tapahtuman asetuksista)
2 parents 827a0e4f 03cb4366
Inline Side-by-side
Showing with 65 additions and 65 deletions
code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml
...@@ -93,19 +93,20 @@ ...@@ -93,19 +93,20 @@
<br /> <br />
<h:panelGrid columns="3"> <h:panelGrid columns="3" rendered="#{productShopView.checkAllowStats}">
<h:outputText for="allowStats" value="#{i18n['bill.allowStatistics']}" /> <h:outputText for="allowStats" value="#{i18n['bill.allowStatistics']}" />
<h:selectBooleanCheckbox id="allowStats" value="#{productShopView.allowStatistics}" /> <h:selectBooleanCheckbox id="allowStats" value="#{productShopView.allowStatistics}" />
<h:message for="allowStats" /> <h:message for="allowStats" />
</h:panelGrid> </h:panelGrid>
<br /> <br />
<p:commandButton onerror="location.reload(true);" action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
<p:inputTextarea cols="50" rendered="#{productShopView.gatherBillInfo}" value="#{productShopView.otherInfo}" label="#{i18n['otherInfo']}" />
<br />
<p:commandButton onerror="location.reload(true);" action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
<!-- <p:inputTextarea cols="50" rendered="#{productShopView.gatherBillInfo}" value="#{productShopView.otherInfo}" label="#{i18n['otherInfo']}" /> -->
<br />
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -61,6 +61,7 @@ bill.addr3 = Address 3 ...@@ -61,6 +61,7 @@ bill.addr3 = Address 3
bill.addr4 = Address 4 bill.addr4 = Address 4
bill.addr5 = Address 5 bill.addr5 = Address 5
bill.address = Payers address bill.address = Payers address
bill.allowStatistics = My information can be used in statistics
bill.billAmount = Bill amount (inc. vat) bill.billAmount = Bill amount (inc. vat)
bill.billIsPaid = Bill is paid bill.billIsPaid = Bill is paid
bill.billLines = Products bill.billLines = Products
...@@ -189,7 +190,20 @@ bortalApplication.user.VITUTTAAKO = Can send feedback ...@@ -189,7 +190,20 @@ bortalApplication.user.VITUTTAAKO = Can send feedback
bortalApplication.user.WRITE_ORGROLES = Modify organization roles bortalApplication.user.WRITE_ORGROLES = Modify organization roles
bortalApplication.user.WRITE_ROLES = Modify roles bortalApplication.user.WRITE_ROLES = Modify roles
card.massprint.title = Print all card.massprint.title = Print all
cardObjectData.create = Add object data
cardObjectData.edit = Edit
cardObjectData.save = Save
cardObjectData.size = Width (px)
cardObjectData.type = Type
cardObjectData.type.CARDS_BARCODE = Card's barcode
cardObjectData.type.UNKNOWN = Unknown
cardObjectData.type.USERS_BARCODE = User's barcode
cardObjectData.type.USERS_PICTURE = User's picture
cardObjectData.x = X coordinate
cardObjectData.y = Y coordinate
cardObjectData.zindex = Z index
cardTemplate.create = Create cardTemplate.create = Create
cardTemplate.edit = Edit cardTemplate.edit = Edit
...@@ -201,51 +215,37 @@ cardTemplate.roles = Associated roles ...@@ -201,51 +215,37 @@ cardTemplate.roles = Associated roles
cardTemplate.save = Save cardTemplate.save = Save
cardTemplate.sendImage = Upload Image cardTemplate.sendImage = Upload Image
cardTemplateData.list = List datas cardTemplateData.list = List datas
cardObjectData.create = Add object data cardTextData.create = Add text data
cardObjectData.save = Save cardTextData.edit = Edit
cardObjectData.edit = Edit cardTextData.fontcolor = Font color
cardObjectData.x = X coordinate cardTextData.fontname = Font name
cardObjectData.y = Y coordinate cardTextData.fontstyle = Font style
cardObjectData.size = Width (px) cardTextData.fontstyle.BOLD = Bold
cardObjectData.zindex = Z index cardTextData.fontstyle.BOLDITALIC = Bold and Italic
cardObjectData.type = Type cardTextData.fontstyle.ITALIC = Italic
cardObjectData.type.UNKNOWN = Unknown cardTextData.fontstyle.PLAIN = Plain
cardObjectData.type.USERS_PICTURE = User's picture cardTextData.save = Save
cardObjectData.type.USERS_BARCODE = User's barcode cardTextData.size = Size of text (px)
cardObjectData.type.CARDS_BARCODE = Card's barcode cardTextData.text = Static text
cardTextData.textalignment = Font alignment
cardTextData.create = Add text data cardTextData.textalignment.CENTER = Center
cardTextData.save = Save cardTextData.textalignment.LEFT = Left
cardTextData.edit = Edit cardTextData.textalignment.RIGHT = Right
cardTextData.x = X coordinate cardTextData.type = Type
cardTextData.y = Y coordinate cardTextData.type.AGE = Age
cardTextData.size = Size of text (px) cardTextData.type.AUTHCODE = MoyaAuth code
cardTextData.zindex = Z index cardTextData.type.FIRSTNAME = Firstname
cardTextData.fontname = Font name cardTextData.type.LASTNAME = Lastname
cardTextData.fontcolor = Font color cardTextData.type.NICK = Nick
cardTextData.fontstyle = Font style cardTextData.type.ROLE = Role
cardTextData.fontstyle.PLAIN = Plain cardTextData.type.STATIC = Static
cardTextData.fontstyle.BOLD = Bold cardTextData.type.UNKNOWN = Unknown
cardTextData.fontstyle.ITALIC = Italic cardTextData.type.WHOLENAME = Wholename
cardTextData.fontstyle.BOLDITALIC = Bold and Italic cardTextData.x = X coordinate
cardTextData.textalignment = Font alignment cardTextData.y = Y coordinate
cardTextData.textalignment.LEFT = Left cardTextData.zindex = Z index
cardTextData.textalignment.CENTER = Center
cardTextData.textalignment.RIGHT = Right
cardTextData.text = Static text
cardTextData.type = Type
cardTextData.type.UNKNOWN = Unknown
cardTextData.type.NICK = Nick
cardTextData.type.WHOLENAME = Wholename
cardTextData.type.FIRSTNAME = Firstname
cardTextData.type.LASTNAME = Lastname
cardTextData.type.STATIC = Static
cardTextData.type.AGE = Age
cardTextData.type.ROLE = Role
cardTextData.type.AUTHCODE = MoyaAuth code
cart.item = Item cart.item = Item
cart.item_quantity = Quantity cart.item_quantity = Quantity
...@@ -795,11 +795,11 @@ poll.save = Send answers ...@@ -795,11 +795,11 @@ poll.save = Send answers
print = Print print = Print
printedCard.template = Template printedCard.cardState = Card state
printedCard.cardState = Card state printedCard.cardState.PENDING_VALIDATION = Pending validation
printedCard.cardState.PENDING_VALIDATION = Pending validation printedCard.cardState.REJECTED = Rejected
printedCard.cardState.VALIDATED = Validated printedCard.cardState.VALIDATED = Validated
printedCard.cardState.REJECTED = Rejected printedCard.template = Template
product.barcode = Barcode product.barcode = Barcode
product.billed = Billed product.billed = Billed
...@@ -875,15 +875,15 @@ readerview.cards = Card ( printcount ) ...@@ -875,15 +875,15 @@ readerview.cards = Card ( printcount )
registerleaflet.title = Register leaflet registerleaflet.title = Register leaflet
rejectcard.mailSubject = Profile picture rejected rejectcard.body = Body
rejectcard.mailBody = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and can be easily recognized. \n\n rejectcard.mailBody = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and can be easily recognized. \n\n
rejectcard.toAddr = Email address rejectcard.mailSubject = Profile picture rejected
rejectcard.toName = Name rejectcard.reject = Reject
rejectcard.body = Body rejectcard.sendAndReject = Send and reject
rejectcard.subject = Subject rejectcard.sendRejectionMail = Send mail
rejectcard.sendRejectionMail = Send mail rejectcard.subject = Subject
rejectcard.sendAndReject = Send and reject rejectcard.toAddr = Email address
rejectcard.reject = Reject rejectcard.toName = Name
resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that. resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
resetMail.email = Email address resetMail.email = Email address
...@@ -891,7 +891,6 @@ resetMail.header = Reset lost password ...@@ -891,7 +891,6 @@ resetMail.header = Reset lost password
resetMail.send = Send resetMail.send = Send
resetMail.username = Username resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password. resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent resetmailSent.header = Email sent
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!