Skip to content

Commit d3c518c

Browse files
fix: display formatted amount
1 parent 192b454 commit d3c518c

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

app/models/medical_shift.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,8 @@ def title
3939
def recurring?
4040
medical_shift_recurrence_id.present?
4141
end
42+
43+
def formatted_amount
44+
amount.format(thousands_separator: ".", decimal_mark: ",")
45+
end
4246
end

app/serializers/event_procedure_serializer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def date
2929
end
3030

3131
def precedure_value
32-
object.procedure.amount.format
32+
object.procedure.amount.format(thousands_separator: ".", decimal_mark: ",")
3333
end
3434

3535
def precedure_description

app/serializers/medical_shift_serializer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def hour
1313
end
1414

1515
def amount_cents
16-
object.amount.format
16+
object.formatted_amount
1717
end
1818

1919
def workload

spec/requests/api/v1/event_procedures_request_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
"payment" => EventProcedures::Payments::HEALTH_INSURANCE,
204204
"urgency" => false,
205205
"paid" => true,
206-
"precedure_value" => "R$200.00",
206+
"precedure_value" => "R$200,00",
207207
"precedure_description" => "nice description"
208208
)
209209
end

spec/requests/api/v1/medical_shifts_request_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"workload" => medical_shifts.second.workload_humanize,
3939
"date" => medical_shifts.second.start_date.strftime("%d/%m/%Y"),
4040
"hour" => medical_shifts.second.start_hour.strftime("%H:%M"),
41-
"amount_cents" => medical_shifts.second.amount.format,
41+
"amount_cents" => medical_shifts.second.amount.format(thousands_separator: ".", decimal_mark: ","),
4242
"paid" => medical_shifts.second.paid,
4343
"shift" => medical_shifts.second.shift,
4444
"title" => "#{second_hospital_name} | #{second_workload} | #{second_shift}",
@@ -51,7 +51,7 @@
5151
"workload" => medical_shifts.first.workload_humanize,
5252
"date" => medical_shifts.first.start_date.strftime("%d/%m/%Y"),
5353
"hour" => medical_shifts.first.start_hour.strftime("%H:%M"),
54-
"amount_cents" => medical_shifts.first.amount.format,
54+
"amount_cents" => medical_shifts.first.formatted_amount,
5555
"paid" => medical_shifts.first.paid,
5656
"shift" => medical_shifts.first.shift,
5757
"title" => "#{first_hospital_name} | #{first_workload} | #{first_shift}",
@@ -134,7 +134,7 @@
134134
"workload" => paid_medical_shifts.second.workload_humanize,
135135
"date" => paid_medical_shifts.second.start_date.strftime("%d/%m/%Y"),
136136
"hour" => paid_medical_shifts.second.start_hour.strftime("%H:%M"),
137-
"amount_cents" => paid_medical_shifts.second.amount.format,
137+
"amount_cents" => paid_medical_shifts.second.formatted_amount,
138138
"paid" => paid_medical_shifts.second.paid,
139139
"shift" => paid_medical_shifts.second.shift,
140140
"title" => "#{second_hospital_name} | #{second_workload} | #{second_shift}",
@@ -147,7 +147,7 @@
147147
"workload" => paid_medical_shifts.first.workload_humanize,
148148
"date" => paid_medical_shifts.first.start_date.strftime("%d/%m/%Y"),
149149
"hour" => paid_medical_shifts.first.start_hour.strftime("%H:%M"),
150-
"amount_cents" => paid_medical_shifts.first.amount.format,
150+
"amount_cents" => paid_medical_shifts.first.formatted_amount,
151151
"paid" => paid_medical_shifts.first.paid,
152152
"shift" => paid_medical_shifts.first.shift,
153153
"title" => "#{first_hospital_name} | #{first_workload} | #{first_shift}",
@@ -177,7 +177,7 @@
177177
"workload" => unpaid_medical_shifts.second.workload_humanize,
178178
"date" => unpaid_medical_shifts.second.start_date.strftime("%d/%m/%Y"),
179179
"hour" => unpaid_medical_shifts.second.start_hour.strftime("%H:%M"),
180-
"amount_cents" => unpaid_medical_shifts.second.amount.format,
180+
"amount_cents" => unpaid_medical_shifts.second.formatted_amount,
181181
"paid" => unpaid_medical_shifts.second.paid,
182182
"shift" => unpaid_medical_shifts.second.shift,
183183
"title" => "#{second_hospital_name} | #{second_workload} | #{second_shift}",
@@ -190,7 +190,7 @@
190190
"workload" => unpaid_medical_shifts.first.workload_humanize,
191191
"date" => unpaid_medical_shifts.first.start_date.strftime("%d/%m/%Y"),
192192
"hour" => unpaid_medical_shifts.first.start_hour.strftime("%H:%M"),
193-
"amount_cents" => unpaid_medical_shifts.first.amount.format,
193+
"amount_cents" => unpaid_medical_shifts.first.formatted_amount,
194194
"paid" => unpaid_medical_shifts.first.paid,
195195
"shift" => unpaid_medical_shifts.first.shift,
196196
"title" => "#{first_hospital_name} | #{first_workload} | #{first_shift}",
@@ -277,7 +277,7 @@
277277
workload: MedicalShift.last.workload_humanize,
278278
date: MedicalShift.last.start_date.strftime("%d/%m/%Y"),
279279
hour: MedicalShift.last.start_hour.strftime("%H:%M"),
280-
amount_cents: MedicalShift.last.amount.format,
280+
amount_cents: MedicalShift.last.formatted_amount,
281281
paid: params[:paid],
282282
shift: MedicalShift.last.shift,
283283
title: "#{hospital_name} | #{workload} | #{shift}",
@@ -361,7 +361,7 @@
361361
workload: workload,
362362
date: medical_shift.start_date.strftime("%d/%m/%Y"),
363363
hour: medical_shift.start_hour.strftime("%H:%M"),
364-
amount_cents: medical_shift.amount.format,
364+
amount_cents: medical_shift.formatted_amount,
365365
paid: medical_shift.paid,
366366
shift: medical_shift.reload.shift,
367367
title: "#{hospital_name} | #{workload} | #{shift}"

0 commit comments

Comments
 (0)