Skip to content

Commit

Permalink
Merge pull request #168 from codepointtku/develop
Browse files Browse the repository at this point in the history
Release tku-v1.2

Changes:
- added reservation products page
- reservation form billing fields are hidden when reservation doesn't contain any payments
- reservation and resource pages support displaying reservation duration in hours and minutes instead of only hours
- minor UI, accessibility and stability improvements
  • Loading branch information
SanttuA authored Oct 26, 2021
2 parents 1f31d4c + 40f5b46 commit 14f5b31
Show file tree
Hide file tree
Showing 79 changed files with 3,488 additions and 325 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist
node_modules
npm-debug.log
yarn-error.log
/.idea
9 changes: 9 additions & 0 deletions app/constants/AppConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ const constants = {
timeOut: 5000,
hidden: false,
},
PRODUCT_TYPES: {
MANDATORY: 'mandatory',
EXTRA: 'extra',
},
RECURRING_RESERVATIONS: {
maxRecurringReservations: 99,
},
Expand All @@ -52,6 +56,11 @@ const constants = {
'Content-Type': 'application/json',
},
REQUIRED_STAFF_EVENT_FIELDS: ['eventDescription', 'reserverName'],
RESERVATION_BILLING_FIELDS: [
'billing_first_name', 'billing_last_name', 'billing_phone_number',
'billing_email_address', 'billing_address_street', 'billing_address_zip',
'billing_address_city'
],
RESERVATION_SHOWONLY_FILTERS: {
FAVORITE: 'favorite',
CAN_MODIFY: 'can_modify',
Expand Down
22 changes: 22 additions & 0 deletions app/i18n/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,13 @@
"common.save": "Save",
"common.saving": "Saving...",
"common.select": "Select",
"common.taxesTotal": "Total taxes",
"common.taxlessTotal": "Tax-free total",
"common.total": "total",
"common.unit.time.hour": "h",
"common.unit.time.day": "day",
"common.unit.time.week": "week",
"common.unitPieces": "{unitPieces, plural, one {pc} other {pcs}}",
"common.userNameLabel": "Account name",
"common.userEmailLabel": "Account email",
"common.yes": "Yes",
Expand Down Expand Up @@ -264,6 +268,8 @@
"ReservationControls.deny": "Deny",
"ReservationControls.edit": "Edit",
"ReservationControls.info": "Information",
"ReservationDetails.resourceLabel": "Premise",
"ReservationDetails.unitLabel": "Premises",
"ReservationEditForm.cancelEdit": "Cancel editing",
"ReservationEditForm.saveChanges": "Save changes",
"ReservationEditForm.startEdit": "Edit reservation",
Expand Down Expand Up @@ -306,12 +312,28 @@
"ReservationPage.editReservationTitle": "Edit reservation",
"ReservationPage.newReservationTitle": "New reservation",
"ReservationPhase.timeTitle": "Reservation time",
"ReservationPhase.productsTitle": "Paid services",
"ReservationPhase.informationTitle": "Reservation details",
"ReservationPhase.confirmationTitle": "Ready",
"ReservationPhase.paymentTitle": "Payment",
"ReservationPopover.selectionInfoHeader": "Select the reservation's end time",
"ReservationPopover.minPeriod": "Reservation minimum length",
"ReservationPopover.maxPeriod": "Reservation maximum length",
"ReservationProducts.button.addOne": "Add one",
"ReservationProducts.button.removeOne": "Remove one",
"ReservationProducts.heading.extra": "Additional services",
"ReservationProducts.heading.mandatory": "Mandatory reservation fees",
"ReservationProducts.price.includesVat": "(incl. VAT {vat}%)",
"ReservationProducts.staffSkip.mandatory": "Skip mandatory fees with unit staff permissions",
"ReservationProducts.summary.heading": "Summary",
"ReservationProducts.summary.total": "Total: {total} €",
"ReservationProducts.summary.totalForTax": "VAT {vat}% total: {total} €",
"ReservationProducts.summary.totalTaxless": "Total tax-free price: {total} €",
"ReservationProducts.table.heading.name": "Name",
"ReservationProducts.table.heading.price": "Price",
"ReservationProducts.table.heading.quantity": "Quantity",
"ReservationProducts.table.heading.total": "Total",
"ReservationProducts.table.heading.unitPrice": "À price",
"ReservationSuccessModal.emailHelpText": "as well as on the reservation confirmation sent to the following e-mail address: <strong> {email}</strong>",
"ReservationSuccessModal.failedReservationsHeader": "We were not able to make the following reservations:",
"ReservationSuccessModal.ownReservationsPageHelpText": "In the future, you can find the PIN code on the ‘My reservations’ page",
Expand Down
22 changes: 22 additions & 0 deletions app/i18n/messages/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,13 @@
"common.save": "Tallenna",
"common.saving": "Tallennetaan...",
"common.select": "Valitse",
"common.taxesTotal": "Verot yhteensä",
"common.taxlessTotal": "Veroton yhteensä",
"common.total": "yhteensä",
"common.unit.time.hour": "h",
"common.unit.time.day": "päivä",
"common.unit.time.week": "viikko",
"common.unitPieces": "{unitPieces, plural, one {kpl} other {kpl}}",
"common.userNameLabel": "Tilin nimi",
"common.userEmailLabel": "Tilin sähköposti",
"common.yes": "Kyllä",
Expand Down Expand Up @@ -264,6 +268,8 @@
"ReservationControls.deny": "Hylkää",
"ReservationControls.edit": "Muokkaa",
"ReservationControls.info": "Tiedot",
"ReservationDetails.resourceLabel": "Tila",
"ReservationDetails.unitLabel": "Toimipiste",
"ReservationEditForm.cancelEdit": "Peruuta muokkaus",
"ReservationEditForm.saveChanges": "Tallenna muutokset",
"ReservationEditForm.startEdit": "Muokkaa tapahtumaa",
Expand Down Expand Up @@ -306,12 +312,28 @@
"ReservationPage.editReservationTitle": "Muokkaa varausta",
"ReservationPage.newReservationTitle": "Uusi varaus",
"ReservationPhase.timeTitle": "Varauksen ajankohta",
"ReservationPhase.productsTitle": "Maksulliset palvelut",
"ReservationPhase.informationTitle": "Varauksen lisätiedot",
"ReservationPhase.confirmationTitle": "Valmis",
"ReservationPhase.paymentTitle": "Maksu",
"ReservationPopover.selectionInfoHeader": "Valitse varauksen päättymisajankohta",
"ReservationPopover.minPeriod": "Varauksen kesto vähintään:",
"ReservationPopover.maxPeriod": "Varauksen kesto korkeintaan:",
"ReservationProducts.button.addOne": "Lisää yksi",
"ReservationProducts.button.removeOne": "Poista yksi",
"ReservationProducts.heading.extra": "Lisäpalvelut",
"ReservationProducts.heading.mandatory": "Varaukseen liittyvät pakolliset maksut",
"ReservationProducts.price.includesVat": "(sis. ALV {vat}%)",
"ReservationProducts.staffSkip.mandatory": "Ohita pakolliset maksut toimipisteen henkilökunnan oikeuksilla",
"ReservationProducts.summary.heading": "Yhteenveto",
"ReservationProducts.summary.total": "Yhteensä: {total} €",
"ReservationProducts.summary.totalForTax": "ALV {vat}% yhteensä: {total} €",
"ReservationProducts.summary.totalTaxless": "Veroton hinta yhteensä: {total} €",
"ReservationProducts.table.heading.name": "Nimi",
"ReservationProducts.table.heading.price": "Hinta",
"ReservationProducts.table.heading.quantity": "Määrä",
"ReservationProducts.table.heading.total": "Yhteensä",
"ReservationProducts.table.heading.unitPrice": "À hinta",
"ReservationSuccessModal.emailHelpText": "sekä varausvahvistuksesta, joka on lähetetty sähköpostiosoitteeseen: <strong> {email}</strong>",
"ReservationSuccessModal.failedReservationsHeader": "Seuraavien varausten tekeminen ei onnistunut:",
"ReservationSuccessModal.ownReservationsPageHelpText": "PIN-koodin voit tarkistaa jatkossa \"Omat varaukset\" -sivulta",
Expand Down
22 changes: 22 additions & 0 deletions app/i18n/messages/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,13 @@
"common.save": "Spara",
"common.saving": "Sparas...",
"common.select": "Välj",
"common.taxesTotal": "Totala skatter",
"common.taxlessTotal": "Skattefritt totalt",
"common.total": "totalt",
"common.unit.time.hour": "h",
"common.unit.time.day": "dag",
"common.unit.time.week": "vecka",
"common.unitPieces": "{unitPieces, plural, one {st} other {st}}",
"common.userNameLabel": "Konto namn",
"common.userEmailLabel": "Konto e-post",
"common.yes": "Ja",
Expand Down Expand Up @@ -266,6 +270,8 @@
"ReservationControls.deny": "Avvisa",
"ReservationControls.edit": "Redigera",
"ReservationControls.info": "Uppgifter",
"ReservationDetails.resourceLabel": "Utrymme",
"ReservationDetails.unitLabel": "Lokal",
"ReservationEditForm.cancelEdit": "Avbryta",
"ReservationEditForm.saveChanges": "Spara ändringar",
"ReservationEditForm.startEdit": "Ändra bokningstiden",
Expand Down Expand Up @@ -308,12 +314,28 @@
"ReservationPage.editReservationTitle": "Ändra din bokning",
"ReservationPage.newReservationTitle": "Ny bokning",
"ReservationPhase.timeTitle": "Bokningens tidpunkt",
"ReservationPhase.productsTitle": "Avgiftsbelagda tjänster",
"ReservationPhase.informationTitle": "Bokningens detaljer",
"ReservationPhase.confirmationTitle": "Färdig",
"ReservationPhase.paymentTitle": "Betalning",
"ReservationPopover.selectionInfoHeader": "Välj evenemangets sluttid",
"ReservationPopover.minPeriod": "Bokningens minimitid:",
"ReservationPopover.maxPeriod": "Bokningens maximitid:",
"ReservationProducts.button.addOne": "Lägg till ett",
"ReservationProducts.button.removeOne": "Ta bort en",
"ReservationProducts.heading.extra": "Tilläggstjänster",
"ReservationProducts.heading.mandatory": "Obligatoriska bokningsavgifter",
"ReservationProducts.price.includesVat": "(inkl. MOMS {vat}%)",
"ReservationProducts.staffSkip.mandatory": "Förbigå obligatoriska avgifter med filialpersonalens rättigheter",
"ReservationProducts.summary.heading": "Sammanfattning",
"ReservationProducts.summary.total": "Totalt: {total} €",
"ReservationProducts.summary.totalForTax": "MOMS {vat}% total: {total} €",
"ReservationProducts.summary.totalTaxless": "Totala skattefria priset: {total} €",
"ReservationProducts.table.heading.name": "Namn",
"ReservationProducts.table.heading.price": "Pris",
"ReservationProducts.table.heading.quantity": "Antal",
"ReservationProducts.table.heading.total": "Totalt",
"ReservationProducts.table.heading.unitPrice": "À pris",
"ReservationSuccessModal.emailHelpText": "samt på bokningsbekräftelsen som skickats till e-postadressen: <strong> {email}</strong>",
"ReservationSuccessModal.failedReservationsHeader": "Följande bokningar misslyckades:",
"ReservationSuccessModal.ownReservationsPageHelpText": "I fortsättningen kan du kontrollera PIN-koden via sidan Mina bokningar",
Expand Down
Loading

0 comments on commit 14f5b31

Please sign in to comment.