Skip to content

Commit c24e5dd

Browse files
authored
make deposit button env configurabliable (#1171)
* make deposit button env configurabliable * Fix small bug
1 parent 63cabec commit c24e5dd

6 files changed

Lines changed: 12 additions & 4 deletions

File tree

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@ CODE_CASH=1000
4949
CODE_PIN=2060
5050

5151
MIN_PAYMENT_AMOUNT=21.8
52+
DEPOSIT_BUTTON_ENABLED=true
5253

5354
DOCKER_PASSWORD=somethingsomething

app/javascript/components/orderscreen/UserSelection.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{{doubleToCurrency(selectedUser.credit)}}
2424
</h3>
2525

26-
<button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#credit-mutation-modal">
26+
<button v-if="depositButtonEnabled" type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#credit-mutation-modal">
2727
<i class="fa fa-money-bill me-1"></i>
2828
Geld inleggen
2929
</button>
@@ -104,6 +104,10 @@ export default {
104104
selectedUser: Object,
105105
payWithCash: Boolean,
106106
payWithPin: Boolean,
107+
depositButtonEnabled: {
108+
type: Boolean,
109+
default: true
110+
},
107111
users: {
108112
type: Array,
109113
required: true

app/javascript/order_screen.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ document.addEventListener('turbo:load', () => {
1919
const productPrices = JSON.parse(element.dataset.productPrices);
2020
const activity = JSON.parse(element.dataset.activity);
2121
const flashes = JSON.parse(element.dataset.flashes);
22+
const depositButtonEnabled = element.dataset.depositButtonEnabled === 'true';
2223

2324
window.flash = function(message, actionText, type) {
2425
const event = new CustomEvent('flash', { detail: { message: message, actionText: actionText, type: type } } );
@@ -42,6 +43,7 @@ document.addEventListener('turbo:load', () => {
4243
payWithCash: false,
4344
payWithPin: false,
4445
keepUserSelected: false,
46+
depositButtonEnabled: depositButtonEnabled,
4547
orderRows: [],
4648
isSubmitting: false
4749
};

app/views/activities/order_screen.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<%= javascript_include_tag "order_screen", "data-turbo-track": "reload", defer: true %>
44
<% end %>
55
<%= content_tag :div, id: 'order-screen', class: 'order-screen',
6-
data: {users: @users_json, product_prices: @product_prices_json, activity: @activity_json, sumup_callback: sumup_callback_activity_url, sumup_key: @sumup_key, flashes: flash, site_name: Rails.application.config.x.site_short_name} do
6+
data: {users: @users_json, product_prices: @product_prices_json, activity: @activity_json, sumup_callback: sumup_callback_activity_url, sumup_key: @sumup_key, flashes: flash, site_name: Rails.application.config.x.site_short_name, deposit_button_enabled: Rails.application.config.x.deposit_button_enabled} do
77

88
%>
99

@@ -56,7 +56,7 @@
5656
</nav>
5757
<div class="side-panel">
5858
<user-selection :pay-with-cash="payWithCash" :pay-with-pin="payWithPin" :selected-user="selectedUser"
59-
:users="users" v-on:selectcash="selectCash" v-on:selectpin="selectPin" v-on:updateuser="setUser($event)">
59+
:users="users" :deposit-button-enabled="depositButtonEnabled" v-on:selectcash="selectCash" v-on:selectpin="selectPin" v-on:updateuser="setUser($event)">
6060
</user-selection>
6161
<div class="orders" v-if="selectedUser || payWithCash || payWithPin">
6262
<h4 class="orders-header py-4">

app/views/users/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
</div>
153153
<p class="card-text d-none d-md-block">
154154
<%= 'Rechten zijn afhankelijk van de rollen die een gebruiker in het streepsysteem heeft. ' %>
155-
<% if Rails.application.config.x.amber_api_url.present? %>
155+
<% if Rails.application.config.x.amber_api_host.present? %>
156156
<%= 'Rollen worden bepaald aan de hand van de groepen waar een gebruiker lid van is in de gekoppelde website.' %>
157157
<% else %>
158158
<%= 'Rollen kunnen geconfigureerd worden via de console van de serviceprovider.' %>

config/application.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class Application < Rails::Application
7575
config.x.site_short_name = ENV.fetch('SITE_SHORT_NAME', 'SOFIA')
7676
config.x.site_long_name = ENV.fetch('SITE_LONG_NAME', 'Streepsysteem voor de Ordentelijke Festiviteiten van Inleggend Alpha')
7777
config.x.site_association = ENV.fetch('SITE_ASSOCIATION', 'C.S.V. Alpha')
78+
config.x.deposit_button_enabled = ENV.fetch('DEPOSIT_BUTTON_ENABLED', 'true') == 'true'
7879

7980
config.x.min_payment_amount = [ENV.fetch('MIN_PAYMENT_AMOUNT', '21.8').to_f, 0.01].max
8081

0 commit comments

Comments
 (0)