diff --git a/donate/migrations/0010_auto_20200902_1744.py b/donate/migrations/0010_auto_20200902_1744.py new file mode 100644 index 0000000000000000000000000000000000000000..2953e455a2783a89fc5cae2fc70782a23af9e648 --- /dev/null +++ b/donate/migrations/0010_auto_20200902_1744.py @@ -0,0 +1,28 @@ +# Generated by Django 3.0.9 on 2020-09-02 15:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("donate", "0009_donateprojectpage_allow_periodic_donations"), + ] + + operations = [ + migrations.AddField( + model_name="donateprojectpage", + name="form_amount_1", + field=models.IntegerField(default=100, verbose_name="pevná částka 1"), + ), + migrations.AddField( + model_name="donateprojectpage", + name="form_amount_2", + field=models.IntegerField(default=200, verbose_name="pevná částka 2"), + ), + migrations.AddField( + model_name="donateprojectpage", + name="form_amount_3", + field=models.IntegerField(default=500, verbose_name="pevná částka 3"), + ), + ] diff --git a/donate/models.py b/donate/models.py index 056f6e098da5f4850c06b1fa24255fddbc6e1aa3..66f75c10d9a6a1e7a3ce2ff40df1febf6477d13b 100644 --- a/donate/models.py +++ b/donate/models.py @@ -369,6 +369,9 @@ class DonateProjectPage(DonateFormMixin, Page, SubpageMixin, MetadataPageMixin): ) expected_amount = models.IntegerField("očekávaná částka", blank=True, null=True) donated_amount = models.IntegerField("vybraná částka", blank=True, null=True) + form_amount_1 = models.IntegerField("pevná částka 1", default=100) + form_amount_2 = models.IntegerField("pevná částka 2", default=200) + form_amount_3 = models.IntegerField("pevná částka 3", default=500) # we will use photo as search image search_image = None @@ -406,7 +409,13 @@ class DonateProjectPage(DonateFormMixin, Page, SubpageMixin, MetadataPageMixin): settings_panels = Page.settings_panels + [ MultiFieldPanel( - [FieldPanel("portal_project_id"), FieldPanel("allow_periodic_donations"),], + [ + FieldPanel("portal_project_id"), + FieldPanel("allow_periodic_donations"), + FieldPanel("form_amount_1"), + FieldPanel("form_amount_2"), + FieldPanel("form_amount_3"), + ], "nastavení darů", ), ] diff --git a/donate/templates/donate/donate_home_page.html b/donate/templates/donate/donate_home_page.html index cdc64930027247bf5f69d8186067bdd4c333284a..dc86beb2545e4bd009ef088df600725575aa7e0d 100644 --- a/donate/templates/donate/donate_home_page.html +++ b/donate/templates/donate/donate_home_page.html @@ -77,7 +77,7 @@ <div class="form-group row mb-4 align-items-center" id="js-custom-amount-input" style="display: none;"> <div class="offset-md-4 col-md-8"> <div class="input-group input-group-lg mb-3 custom-amount"> - <input type="number" class="form-control" id="customamount" name="custom_amount" placeholder="1000" aria-describedby="customamount-currency"> + <input type="number" class="form-control" id="customamount" name="custom_amount" aria-describedby="customamount-currency"> <div class="input-group-append"> <span class="input-group-text" id="customamount-currency">Kč</span> </div> diff --git a/donate/templates/donate/donate_info_page.html b/donate/templates/donate/donate_info_page.html index 40cbefa019f857daaef4fd642c0a2c68f07d1081..94dbcee9b348f0fe3e0a7caeb6412b001996567d 100644 --- a/donate/templates/donate/donate_info_page.html +++ b/donate/templates/donate/donate_info_page.html @@ -58,7 +58,7 @@ <div class="form-group row mb-2 align-items-center" id="js-custom-amount-input" style="display: none;"> <div class="col-md-12"> <div class="input-group input-group-lg mb-3 custom-amount"> - <input type="number" class="form-control" id="customamount" name="custom_amount" placeholder="1000" aria-describedby="customamount-currency"> + <input type="number" class="form-control" id="customamount" name="custom_amount" aria-describedby="customamount-currency"> <div class="input-group-append"> <span class="input-group-text" id="customamount-currency">Kč</span> </div> diff --git a/donate/templates/donate/donate_project_page.html b/donate/templates/donate/donate_project_page.html index f80bed625f6b7c4821e446183fc2cefdaea71ec4..6c0f9dceee0f2537e3077312f125d749ea9008d6 100644 --- a/donate/templates/donate/donate_project_page.html +++ b/donate/templates/donate/donate_project_page.html @@ -81,16 +81,16 @@ <legend class="col-form-label col-md-12 col-form-label-lg">Částka</legend> <div class="col-md-12"> <div class="custom-control custom-radio custom-control-inline"> - <input type="radio" id="amount1" name="amount" value="100" class="custom-control-input" checked> - <label class="custom-control-label col-form-label-lg" for="amount1">100 Kč</label> + <input type="radio" id="amount1" name="amount" value="{{ page.form_amount_1 }}" class="custom-control-input" checked> + <label class="custom-control-label col-form-label-lg" for="amount1">{{ page.form_amount_1 }} Kč</label> </div> <div class="custom-control custom-radio custom-control-inline"> - <input type="radio" id="amount2" name="amount" value="200" class="custom-control-input"> - <label class="custom-control-label col-form-label-lg" for="amount2">200 Kč</label> + <input type="radio" id="amount2" name="amount" value="{{ page.form_amount_2 }}" class="custom-control-input"> + <label class="custom-control-label col-form-label-lg" for="amount2">{{ page.form_amount_2 }} Kč</label> </div> <div class="custom-control custom-radio custom-control-inline"> - <input type="radio" id="amount3" name="amount" value="500" class="custom-control-input"> - <label class="custom-control-label col-form-label-lg" for="amount3">500 Kč</label> + <input type="radio" id="amount3" name="amount" value="{{ page.form_amount_3 }}" class="custom-control-input"> + <label class="custom-control-label col-form-label-lg" for="amount3">{{ page.form_amount_3 }} Kč</label> </div> <div class="custom-control custom-radio custom-control-inline"> <input type="radio" id="amount4" name="amount" value="-1" class="custom-control-input"> @@ -101,7 +101,7 @@ <div class="form-group row mb-2 align-items-center" id="js-custom-amount-input" style="display: none;"> <div class="col-md-12"> <div class="input-group input-group-lg mb-3 custom-amount"> - <input type="number" class="form-control" id="customamount" name="custom_amount" placeholder="1000" aria-describedby="customamount-currency"> + <input type="number" class="form-control" id="customamount" name="custom_amount" aria-describedby="customamount-currency"> <div class="input-group-append"> <span class="input-group-text" id="customamount-currency">Kč</span> </div> diff --git a/donate/templates/donate/donate_region_page.html b/donate/templates/donate/donate_region_page.html index f542f0379d5e440ed2a937b6760a772556807215..f202fc539cf404cedbee1dda7c172b19d6e73aab 100644 --- a/donate/templates/donate/donate_region_page.html +++ b/donate/templates/donate/donate_region_page.html @@ -65,7 +65,7 @@ <div class="form-group row mb-2 align-items-center" id="js-custom-amount-input" style="display: none;"> <div class="col-md-12"> <div class="input-group input-group-lg mb-3 custom-amount"> - <input type="number" class="form-control" id="customamount" name="custom_amount" placeholder="1000" aria-describedby="customamount-currency"> + <input type="number" class="form-control" id="customamount" name="custom_amount" aria-describedby="customamount-currency"> <div class="input-group-append"> <span class="input-group-text" id="customamount-currency">Kč</span> </div> diff --git a/donate/templates/donate/donate_targeted_donations_page.html b/donate/templates/donate/donate_targeted_donations_page.html index fa24740563834eaa31292170e249a18011844e91..5529abaa19c8aa17c6f7e77ae365270184675374 100644 --- a/donate/templates/donate/donate_targeted_donations_page.html +++ b/donate/templates/donate/donate_targeted_donations_page.html @@ -56,7 +56,7 @@ <div class="form-group row mb-4 align-items-center" id="js-custom-amount-input" style="display: none;"> <div class="offset-md-3 col-md-9"> <div class="input-group input-group-lg mb-3 custom-amount"> - <input type="number" class="form-control" id="customamount" name="custom_amount" placeholder="1000" aria-describedby="customamount-currency"> + <input type="number" class="form-control" id="customamount" name="custom_amount" aria-describedby="customamount-currency"> <div class="input-group-append"> <span class="input-group-text" id="customamount-currency">Kč</span> </div>