ver5
This commit is contained in:
@@ -50,7 +50,7 @@ public class Event implements Serializable {
|
|||||||
private Set<Registration> registrations = new HashSet<>();
|
private Set<Registration> registrations = new HashSet<>();
|
||||||
|
|
||||||
@OneToMany(fetch = FetchType.LAZY, mappedBy = "event")
|
@OneToMany(fetch = FetchType.LAZY, mappedBy = "event")
|
||||||
@JsonIgnoreProperties(value = { "event", "transactionItems" }, allowSetters = true)
|
@JsonIgnoreProperties(value = { "event" }, allowSetters = true)
|
||||||
private Set<Transaction> transactions = new HashSet<>();
|
private Set<Transaction> transactions = new HashSet<>();
|
||||||
|
|
||||||
// jhipster-needle-entity-add-field - JHipster will add fields here
|
// jhipster-needle-entity-add-field - JHipster will add fields here
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="footer" class="footer">
|
<div id="footer" class="footer">
|
||||||
<p>This is your footer</p>
|
<p>Coś nie działa? napisz na FB Sąsiedzi</p>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -167,7 +167,8 @@
|
|||||||
v-if="(event.editable && hasAnyAuthority(['ROLE_COUNTER'])) || hasAnyAuthority(['ROLE_ADMIN'])"
|
v-if="(event.editable && hasAnyAuthority(['ROLE_COUNTER'])) || hasAnyAuthority(['ROLE_ADMIN'])"
|
||||||
@click="settle()"
|
@click="settle()"
|
||||||
>
|
>
|
||||||
<font-awesome-icon icon="sync"></font-awesome-icon> <span>Rozlicz wydarzenie</span>
|
<font-awesome-icon icon="sync"></font-awesome-icon> <span v-if="!event.charged">Rozlicz wydarzenie</span
|
||||||
|
><span v-if="event.charged">Przelicz ponownie zobowiązania</span>
|
||||||
</button>
|
</button>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="event.id && event.paid == false"
|
v-if="event.id && event.paid == false"
|
||||||
|
|||||||
Reference in New Issue
Block a user