Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mhieta committed Dec 7, 2023
2 parents e696cbe + d292ea0 commit a479678
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions parking_permits/schema/parking_permit.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ type PermitNode {
primaryVehicle: Boolean
monthsLeft: Int
currentPeriodEndTime: String
canBeRefunded: Boolean
canEndImmediately: Boolean
canEndAfterCurrentPeriod: Boolean
hasRefund: Boolean
Expand Down
4 changes: 2 additions & 2 deletions parking_permits/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def test_resolve_price_view_for_normal_emission_vehicle(self):

def test_resolve_price_view_for_low_emission_vehicle(self):
unit_price = Decimal(60)
low_emission_discount = Decimal(0.5)
low_emission_discount = Decimal(0.25)
permit, product = self.prepare_test_data(
self.permit_id, unit_price, low_emission_discount
)
Expand Down Expand Up @@ -413,7 +413,7 @@ def test_resolve_price_view_for_secondary_normal_emission_vehicle(self):
def test_resolve_price_view_for_secondary_low_emission_vehicle(self):
secondary_vehicle_increase_rate = Decimal(0.5)
unit_price = Decimal(60)
low_emission_discount = Decimal(0.5)
low_emission_discount = Decimal(0.25)
permit, product = self.prepare_test_data(
self.permit_id, unit_price, low_emission_discount, primary_permit=False
)
Expand Down

0 comments on commit a479678

Please sign in to comment.