donation: Properly process address data

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/donate.html b/src/templates/donate.html
index 9caa667e9551780070e89aadf6b590c5f9ccba10..40359611bac1a90251d940cf847c3a0b2a35a26f 100644 (file)
--- a/src/templates/donate.html
+++ b/src/templates/donate.html
@@ -159,50 +159,50 @@
                                                                                                <div class="form-row">
                                                                                                        <div class="col-sm-6">
                                                                                                                <div class="form-group">
-                                                                                                                       <input type="text" class="form-control"
-                                                                                                                       placeholder="{{ _("First Name" )}}" required>
+                                                                                                                       <input type="text" class="form-control" name="first_name"
+                                                                                                                               placeholder="{{ _("First Name" )}}" required>
                                                                                                                </div>
                                                                                                        </div>
 
                                                                                                        <div class="col-sm-6">
                                                                                                                <div class="form-group">
-                                                                                                                       <input type="text" class="form-control"
+                                                                                                                       <input type="text" class="form-control" name="last_name"
                                                                                                                                placeholder="{{ _("Last Name" )}}" required>
                                                                                                                </div>
                                                                                                        </div>
                                                                                                </div>
 
                                                                                                <div class="form-group">
-                                                                                                       <input type="email" class="form-control"
+                                                                                                       <input type="email" class="form-control" name="email"
                                                                                                                placeholder="{{ _("Email Address") }}" required>
                                                                                                </div>
 
                                                                                                <div class="form-group">
-                                                                                                       <input type="text" class="form-control"
+                                                                                                       <input type="text" class="form-control" name="company_name"
                                                                                                                placeholder="{{ _("Company Name (optional)") }}">
                                                                                                </div>
 
                                                                                                <div class="form-group">
-                                                                                                       <input type="text" class="form-control"
+                                                                                                       <input type="text" class="form-control" name="street1"
                                                                                                                placeholder="{{ _("Address Line 1") }}" required>
                                                                                                </div>
 
                                                                                                <div class="form-group">
-                                                                                                       <input type="text" class="form-control"
+                                                                                                       <input type="text" class="form-control" name="street2"
                                                                                                                placeholder="{{ _("Address Line 2") }}">
                                                                                                </div>
 
                                                                                                <div class="form-row">
                                                                                                        <div class="col-sm-6">
                                                                                                                <div class="form-group">
-                                                                                                                       <input type="text" class="form-control"
+                                                                                                                       <input type="text" class="form-control" name="city"
                                                                                                                                placeholder="{{ _("City") }}" required>
                                                                                                                </div>
                                                                                                        </div>
 
                                                                                                        <div class="col-sm-6">
                                                                                                                <div class="form-group">
-                                                                                                                       <input type="text" class="form-control"
+                                                                                                                       <input type="text" class="form-control" name="post_code"
                                                                                                                                placeholder="{{ _("Post Code") }}" required>
                                                                                                                </div>
                                                                                                        </div>
@@ -211,7 +211,7 @@
                                                                                                <div class="form-row">
                                                                                                        <div class="col-sm-6">
                                                                                                                <div class="form-group">
-                                                                                                                       <select class="form-control" required>
+                                                                                                                       <select class="form-control" name="country_code" required>
                                                                                                                                <option value="">- {{ _("Country") }} -</option>
 
                                                                                                                                {% for c in countries %}
@@ -223,7 +223,7 @@
 
                                                                                                        <div class="col-sm-6">
                                                                                                                <div class="form-group">
-                                                                                                                       <input type="text" class="form-control"
+                                                                                                                       <input type="text" class="form-control" name="state"
                                                                                                                                placeholder="{{ _("State (optional)") }}">
                                                                                                                </div>
                                                                                                        </div>

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 15f3b3eab7b9e51169b90f5ddb87a7a14e54ab18..7c86d34c184e9a1a5c59be43d6165718d6ad07d8 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -114,16 +114,18 @@ class DonateHandler(BaseHandler):
                        # Is this a recurring donation?
                        "recurring"    : self.get_argument("frequency") == "monthly",
 
-                       # XXX Missing inputs
-                       "email"        : "john.doe@example.com",
-                       "first_name"   : "John",
-                       "last_name"    : "Doe",
-                       "street1"      : "Street 1",
-                       "street2"      : "Street 2",
-                       "post_code"    : "POST CODE",
-                       "city"         : "City",
-                       "state"        : "State",
-                       "country_code" : "DE",
+                       # Address
+                       "email"        : self.get_argument("email"),
+                       "title"        : self.get_argument("title"),
+                       "first_name"   : self.get_argument("first_name"),
+                       "last_name"    : self.get_argument("last_name"),
+                       "company_name" : self.get_argument("company_name", None),
+                       "street1"      : self.get_argument("street1"),
+                       "street2"      : self.get_argument("street2", None),
+                       "post_code"    : self.get_argument("post_code"),
+                       "city"         : self.get_argument("city"),
+                       "state"        : self.get_argument("state", None),
+                       "country_code" : self.get_argument("country_code"),
                }
 
                # Send request to Zeiterfassung