Core: Update stamp price

TYPE: Feature
LINK: None

src/onegov/form/core.py

@@ -123,7 +123,7 @@ class MyForm(Form):
             stamps = IntegerRangeField(
             'No. Stamps',
             range=range(0, 30),
-            pricing={range(0, 30): (0.85, 'CHF')}
+            pricing={range(0, 30): (1.00, 'CHF')}
         )
 
             delivery = RadioField('Delivery', choices=[

src/onegov/form/parser/core.py

@@ -231,9 +231,9 @@
 Integer fields optionally can have a price attached to them which will be
 multiplied by the supplied integer::
 
-    Number of stamps to include = 0..30 (0.85 CHF)
+    Number of stamps to include = 0..30 (1.00 CHF)
 
-This will result in a price of 0.85 CHF per stamp.
+This will result in a price of 1.00 CHF per stamp.
 
 Code
 ~~~~

tests/onegov/form/test_grammar.py

@@ -370,10 +370,10 @@ def test_prices():
     assert f.pricing.credit_card_payment
 
     field = integer_range_field()
-    f = field.parseString("0..30 (0.85 CHF)")
+    f = field.parseString("0..30 (1.00 CHF)")
     assert f.type == 'integer_range'
     assert f[0] == range(0, 30)
-    assert f.pricing.amount == Decimal('0.85')
+    assert f.pricing.amount == Decimal('1.00')
     assert f.pricing.currency == 'CHF'
     assert not f.pricing.credit_card_payment
 

tests/onegov/form/test_parser.py

@@ -851,14 +851,14 @@ def test_integer_range():
 
 def test_integer_range_with_pricing():
 
-    form_class = parse_form("Stamps = 0..20 (0.85 CHF)")
+    form_class = parse_form("Stamps = 0..20 (1.00 CHF)")
     form = form_class(MultiDict([
         ('stamps', '')
     ]))
     form.validate()
     assert not form.errors
     assert form.stamps.pricing.rules == {
-        range(0, 20): Price(Decimal('0.85'), 'CHF'),
+        range(0, 20): Price(Decimal('1.00'), 'CHF'),
     }
     assert not form.stamps.pricing.has_payment_rule
     assert form.stamps.pricing.price(form.stamps) is None
@@ -877,20 +877,20 @@ def test_integer_range_with_pricing():
     ]))
     form.validate()
     assert not form.errors
-    assert form.stamps.pricing.price(form.stamps) == Price(8.5, 'CHF')
+    assert form.stamps.pricing.price(form.stamps) == Price(10.00, 'CHF')
 
-    form_class = parse_form("Stamps *= 0..20 (0.85 CHF!)")
+    form_class = parse_form("Stamps *= 0..20 (1.00 CHF!)")
     form = form_class(MultiDict([
         ('stamps', '20')
     ]))
     form.validate()
     assert not form.errors
     assert form.stamps.pricing.rules == {
-        range(0, 20): Price(Decimal('0.85'), 'CHF', credit_card_payment=True),
+        range(0, 20): Price(Decimal('1.00'), 'CHF', credit_card_payment=True),
     }
     assert form.stamps.pricing.has_payment_rule
     assert form.stamps.pricing.price(form.stamps) == Price(
-        17, 'CHF', credit_card_payment=True
+        20.00, 'CHF', credit_card_payment=True
     )
 
 

tests/onegov/org/test_views_forms.py

@@ -266,11 +266,11 @@ def test_add_custom_form_minimum_price_validation(client):
     form_page.form['definition'] = textwrap.dedent("""
         E-Mail *= @@@
 
-        Stamp A = 0..20 (1.10 CHF)
-        Stamp B = 0..20 (0.85 CHF)
+        Stamp A = 0..20 (1.20 CHF)
+        Stamp B = 0..20 (1.00 CHF)
 
         Discount *=
-            (x) First four B stamps free (-3.40 CHF)
+            (x) First four B stamps free (-4.00 CHF)
     """)
     form_page.form['minimum_price_total'] = '5.00'
     form_page = form_page.form.submit().follow()
@@ -281,14 +281,14 @@ def test_add_custom_form_minimum_price_validation(client):
     form_page = form_page.form.submit().follow()
 
     assert "Der Totalbetrag für Ihre Eingaben" in form_page
-    assert "beläuft sich auf 1.70 CHF" in form_page
+    assert "beläuft sich auf 2.00 CHF" in form_page
     assert "allerdings ist der Minimalbetrag 5.00 CHF" in form_page
 
     # now that we reached the minimum price we should succeed
     form_page.form['stamp_a'] = '3'
     form_page = form_page.form.submit()
     assert "Totalbetrag" in form_page
-    assert "5.00 CHF" in form_page
+    assert "5.60 CHF" in form_page
     assert "Minimalbetrag" not in form_page