diff --git a/app/models/cost.rb b/app/models/cost.rb index 79ef5ee..ed460a2 100644 --- a/app/models/cost.rb +++ b/app/models/cost.rb @@ -175,10 +175,15 @@ class Cost # normaal_kwh * (0.23665 + 0.04452 + 0.03691) + dal_kwh * (0.19408 + 0.04452 + 0.03691) normaal_kwh_cost = 0.23665 dal_kwh_cost = 0.19408 - # From 8 Sept 2022 until 7 Dec 2022 - when 1662595200..1670457599 + # From 8 Sept 2022 until 31 December 2025 (may need to extend this) + when 1662595200..1767139200 normaal_kwh_cost = 0.60824 dal_kwh_cost = 0.43701 + else + # catch-all, incase 'formated_hour' is outside any of the cases + normaal_kwh_cost = 0.0 + dal_kwh_cost = 0.0 + end end normaal_cost = add_tax(formatted_hour, normaal_kwh,normaal_kwh_cost,0,0) # return_kwh already accounted for dal_cost = add_tax(formatted_hour, dal_kwh, dal_kwh_cost,0,0)