Skip to content

Commit 2f8aeb8

Browse files
authored
Bugfix/vue not loading (#1110)
* replace minor? with minor * copilot fix * revert? * edit migration
1 parent 04a5d73 commit 2f8aeb8

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

app/controllers/activities_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def users_hash
168168
users_credits = User.calculate_credits
169169
User.active.order(:name).map do |user|
170170
user.current_activity = @activity
171-
user.as_json(methods: %i[avatar_thumb_or_default_url minor? insufficient_credit can_order])
171+
user.as_json(methods: %i[avatar_thumb_or_default_url minor insufficient_credit can_order])
172172
.merge(credit: users_credits.fetch(user.id, 0))
173173
end
174174
end

app/models/user.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def age
3838
age
3939
end
4040

41-
def minor?
41+
def minor
4242
return false unless age
4343

4444
age < 18
@@ -126,7 +126,7 @@ def self.calculate_spendings(from: '01-01-1970', to: Time.zone.now)
126126
end
127127

128128
def self.orderscreen_json_includes
129-
%i[credit avatar_thumb_or_default_url minor? insufficient_credit can_order]
129+
%i[credit avatar_thumb_or_default_url minor insufficient_credit can_order]
130130
end
131131

132132
private

app/views/activities/order_screen.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@
162162
</div>
163163
<div class="product-grid" v-if="selectedUser || payWithCash || payWithPin">
164164
<div @click="selectProduct(productPrice)" class="product-grid-product"
165-
:class="{ 'product-requires-age' : (selectedUser && selectedUser.minor? && productPrice.product.requires_age) }"
165+
:class="{ 'product-requires-age' : (selectedUser && selectedUser.minor && productPrice.product.requires_age) }"
166166
v-for="productPrice in productPrices">
167-
<span class="product-grid-product-requires-age mb-2 fa-stack" v-if="selectedUser && selectedUser.minor? && productPrice.product.requires_age">
167+
<span class="product-grid-product-requires-age mb-2 fa-stack" v-if="selectedUser && selectedUser.minor && productPrice.product.requires_age">
168168
<i class="fa fa-circle fa-circle-lighter fa-stack-2x">
169169
</i>
170170
<span class="fa fa-stack-1x fa-inverse fa-plus18">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class RemoveOrderTotalFromOrders < ActiveRecord::Migration[7.2]
22
def change
3-
remove_column :orders, :order_total, :decimal
3+
remove_column :orders, :order_total, :decimal, precision: 8, scale: 2
44
end
55
end

spec/models/user_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,21 +164,21 @@
164164
end
165165
end
166166

167-
describe '#minor?' do
167+
describe '#minor' do
168168
context 'when without age' do
169-
it { expect(user.minor?).to be false }
169+
it { expect(user.minor).to be false }
170170
end
171171

172172
context 'when 18 or older' do
173173
let(:user) { build(:user, birthday: 18.years.ago - 1.day) }
174174

175-
it { expect(user.minor?).to be false }
175+
it { expect(user.minor).to be false }
176176
end
177177

178178
context 'when younger than 18' do
179179
let(:user) { build(:user, birthday: (18.years.ago + 1.day)) }
180180

181-
it { expect(user.minor?).to be true }
181+
it { expect(user.minor).to be true }
182182
end
183183
end
184184

0 commit comments

Comments
 (0)