+ class="far fa-square-plus order-history-item-count">
{{orderRow.product_count}}
+ class="far fa-square-minus order-history-item-count">
{{orderRow.product_count}}
@@ -33,8 +33,8 @@
{{doubleToCurrency(orderRow.product_count * orderRow.price_per_product)}}
-
-
+
+
@@ -73,21 +73,24 @@ export default {
},
saveOrderRow(orderRow) {
- const newOrder = {
+ const orderData = {
order_rows_attributes: [ {
id: orderRow.id,
product_count: orderRow.product_count,
} ]
};
- if (this.activity.id) newOrder.activity_id = this.activity.id;
+ const payload = {
+ order: orderData
+ };
- axios.patch(`/orders/${this.order.id}`, newOrder).then((response) => {
+ axios.patch(`/orders/${this.order.id}`, payload).then((response) => {
const updatedOrder = response.data;
this.$emit('updateordertotal', this.order, updatedOrder.order_total);
orderRow.editing = false;
+ this.$set(this.orderRowErrors, orderRow.id, null);
}, (error) => {
let errorMessage = 'Er is iets misgegaan bij het opslaan van deze rij';
if (error.response && error.response.data['order_rows.product_count']) {
diff --git a/app/javascript/components/UserInput.vue b/app/javascript/components/UserInput.vue
index 4e07be4f0..0994b93c1 100644
--- a/app/javascript/components/UserInput.vue
+++ b/app/javascript/components/UserInput.vue
@@ -19,6 +19,8 @@
<% end %>
-
-
- <%= csrf_meta_tags %>
-
<%= yield(:modal) %>
diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb
index f3459a9ea..a44767d54 100644
--- a/app/views/layouts/errors.html.erb
+++ b/app/views/layouts/errors.html.erb
@@ -3,8 +3,8 @@
- <%= link_to("Sign in with #{Rails.application.config.x.site_association}", user_amber_oauth2_omniauth_authorize_path, class: 'btn btn-primary', method: :post) %>
+ <%= link_to "Sign in with #{Rails.application.config.x.site_association}", user_amber_oauth2_omniauth_authorize_path, class: 'btn btn-primary', data: { turbo_method: :post } %>
diff --git a/app/views/partials/_navigation_bar.html.erb b/app/views/partials/_navigation_bar.html.erb
index e4ebdf08f..b9c3d5608 100644
--- a/app/views/partials/_navigation_bar.html.erb
+++ b/app/views/partials/_navigation_bar.html.erb
@@ -10,60 +10,60 @@
-
<%= nav_link root_path, class: 'nav-link' do %>
- <%= fa_icon 'home', class: 'me-2', text: 'Home' %>
+ Home
<% end %>
<% if policy(Activity).index? %>
-
<%= nav_link activities_path, class: 'nav-link' do %>
- <%= fa_icon 'calendar', class: 'me-2', text: 'Activiteiten' %>
+ Activiteiten
<% end %>
<% end %>
<% if current_user&.treasurer? || current_user&.renting_manager? %>
-
<%= nav_link users_path, class: 'nav-link' do %>
- <%= fa_icon 'users', class: 'me-2', text: 'Gebruikers' %>
+ Gebruikers
<% end %>
-
<%= nav_link price_lists_path, class: 'nav-link' do %>
- <%= fa_icon 'beer', class: 'me-2', text: 'Prijslijsten' %>
+ Prijslijsten
<% end %>
<% end %>
<% if current_user&.treasurer? %>
-
<%= nav_link credit_mutations_path, class: 'nav-link' do %>
- <%= fa_icon 'money', class: 'me-2', text: 'Inleg en saldocorrecties' %>
+ Inleg en saldocorrecties
<% end %>
<% end %>
<% if policy(:zatladder).index? %>
-
<%= nav_link zatladder_index_path, class: 'nav-link' do %>
- <%= fa_icon 'list', class: 'me-2', text: 'Zatladder' %>
+ Zatladder
<% end %>
<% end %>
<% if policy(Invoice).index? %>
-
<%= nav_link invoices_path, class: 'nav-link' do %>
- <%= fa_icon 'shopping-cart', class: 'me-2', text: 'Facturen' %>
+ Facturen
<% end %>
<% end %>
<% if policy(Payment).index? %>
-
<%= nav_link payments_path, class: 'nav-link' do %>
- <%= fa_icon 'credit-card', class: 'me-2', text: 'Betalingen' %>
+ Betalingen
<% end %>
<% end %>
<% if policy(:finance_overview).index? %>
-
<%= nav_link finance_overview_index_path, class: 'nav-link' do %>
- <%= fa_icon 'money', class: 'me-2', text: 'Financien' %>
+ Financien
<% end %>
<% end %>
@@ -72,14 +72,14 @@
<%= nav_link current_user, class: 'nav-item' do %>
- <%= fa_icon 'user-circle-o', class: 'me-2', text: current_user.name %>
+ <%= current_user.name %>
<% end %>
- <%= link_to '(uitloggen)', destroy_user_session_path, class: 'ms-1', method: :delete %>
+ <%= link_to '(uitloggen)', destroy_user_session_path, class: 'ms-1', data: { turbo_method: :delete }%>
<% end %>
-
+
\ No newline at end of file
diff --git a/app/views/payments/add.html.erb b/app/views/payments/add.html.erb
index 904e26e49..c1074cea0 100644
--- a/app/views/payments/add.html.erb
+++ b/app/views/payments/add.html.erb
@@ -1,5 +1,7 @@
<% content_for :title, "Saldo opwaarderen voor #{@user.name} - #{Rails.application.config.x.site_name}" %>
-
+<% content_for :head do %>
+ <%= javascript_include_tag "payment_add", "data-turbo-track": "reload", defer: true %>
+<% end %>
<%= content_tag :div, id: 'payment-add', class: 'container footer-padding', data: {user_credit: @user.credit, payment_amount: @payment.amount} do %>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 9617f796c..80ff06102 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,4 +1,7 @@
<% content_for :title, "Gebruikers - #{Rails.application.config.x.site_name}" %>
+<% content_for :head do %>
+ <%= javascript_include_tag "users", "data-turbo-track": "reload", defer: true %>
+<% end %>
<% content_for :modal do %>
<%= render 'modal' %>
<% end %>
@@ -11,7 +14,7 @@
Handmatig aangemaakte gebruikers
<% if policy(User).create? %>