Merge branch 'billextrainfo' into 'master'

Billextrainfo

Palautetaan infokentät laskuihin. ( Näkyvät vain jos enabloitu tapahtuman asetuksista)

code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml

@@ -93,19 +93,20 @@
 
 
 	<br />
-	<h:panelGrid columns="3">
+	<h:panelGrid columns="3" rendered="#{productShopView.checkAllowStats}">
 		<h:outputText for="allowStats" value="#{i18n['bill.allowStatistics']}" />
 		<h:selectBooleanCheckbox id="allowStats" value="#{productShopView.allowStatistics}" />
 		<h:message for="allowStats" />
 
 	</h:panelGrid>
 	<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
 bill.addr4                      = Address 4
 bill.addr5                      = Address 5
 bill.address                    = Payers address
+bill.allowStatistics            = My information can be used in statistics
 bill.billAmount                 = Bill amount (inc. vat)
 bill.billIsPaid                 = Bill is paid
 bill.billLines                  = Products
@@ -191,6 +192,19 @@ bortalApplication.user.WRITE_ROLES                = Modify roles
 
 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.edit        = Edit
 cardTemplate.id          = Id
@@ -203,49 +217,35 @@ cardTemplate.sendImage   = Upload Image
 
 cardTemplateData.list = List datas
 
-cardObjectData.create				= Add object data
-cardObjectData.save					= Save
-cardObjectData.edit					= Edit
-cardObjectData.x					= X coordinate
-cardObjectData.y					= Y coordinate
-cardObjectData.size					= Width (px)
-cardObjectData.zindex				= Z index
-cardObjectData.type					= Type
-cardObjectData.type.UNKNOWN			= Unknown
-cardObjectData.type.USERS_PICTURE	= User's picture
-cardObjectData.type.USERS_BARCODE	= User's barcode
-cardObjectData.type.CARDS_BARCODE	= Card's barcode
-
 cardTextData.create               = Add text data
-cardTextData.save					= Save
 cardTextData.edit                 = Edit
-cardTextData.x						= X coordinate
-cardTextData.y						= Y coordinate
-cardTextData.size					= Size of text (px)
-cardTextData.zindex					= Z index
-cardTextData.fontname				= Font name
 cardTextData.fontcolor            = Font color
+cardTextData.fontname             = Font name
 cardTextData.fontstyle            = Font style
-cardTextData.fontstyle.PLAIN		= Plain
 cardTextData.fontstyle.BOLD       = Bold
-cardTextData.fontstyle.ITALIC		= Italic
 cardTextData.fontstyle.BOLDITALIC = Bold and Italic
+cardTextData.fontstyle.ITALIC     = Italic
+cardTextData.fontstyle.PLAIN      = Plain
+cardTextData.save                 = Save
+cardTextData.size                 = Size of text (px)
+cardTextData.text                 = Static text
 cardTextData.textalignment        = Font alignment
-cardTextData.textalignment.LEFT		= Left
 cardTextData.textalignment.CENTER = Center
+cardTextData.textalignment.LEFT   = Left
 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.AGE             = Age
+cardTextData.type.AUTHCODE        = MoyaAuth code
 cardTextData.type.FIRSTNAME       = Firstname
 cardTextData.type.LASTNAME        = Lastname
-cardTextData.type.STATIC			= Static
-cardTextData.type.AGE				= Age
+cardTextData.type.NICK            = Nick
 cardTextData.type.ROLE            = Role
-cardTextData.type.AUTHCODE			= MoyaAuth code
-
+cardTextData.type.STATIC          = Static
+cardTextData.type.UNKNOWN         = Unknown
+cardTextData.type.WHOLENAME       = Wholename
+cardTextData.x                    = X coordinate
+cardTextData.y                    = Y coordinate
+cardTextData.zindex               = Z index
 
 cart.item           = Item
 cart.item_quantity  = Quantity
@@ -795,11 +795,11 @@ poll.save        = Send answers
 
 print = Print
 
-printedCard.template						= Template
 printedCard.cardState                    = Card state
 printedCard.cardState.PENDING_VALIDATION = Pending validation
-printedCard.cardState.VALIDATED				= Validated
 printedCard.cardState.REJECTED           = Rejected
+printedCard.cardState.VALIDATED          = Validated
+printedCard.template                     = Template
 
 product.barcode                          = Barcode
 product.billed                           = Billed
@@ -875,15 +875,15 @@ readerview.cards = Card ( printcount )
 
 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.mailSubject       = Profile picture rejected 
+rejectcard.reject            = Reject
+rejectcard.sendAndReject     = Send and reject
+rejectcard.sendRejectionMail = Send mail 
+rejectcard.subject           = Subject
 rejectcard.toAddr            = Email address
 rejectcard.toName            = Name
-rejectcard.body					= Body
-rejectcard.subject				= Subject
-rejectcard.sendRejectionMail	= Send mail 
-rejectcard.sendAndReject		= Send and reject
-rejectcard.reject				= Reject
 
 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
@@ -891,7 +891,6 @@ resetMail.header   = Reset lost password
 resetMail.send     = Send
 resetMail.username = Username
 
-
 resetmailSent.body   = Email has been sent containing a link where you can change the password.
 resetmailSent.header = Email sent