donations: Remove organization step here because it makes everything so complicated

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

diff --git a/src/templates/donate/donate.html b/src/templates/donate/donate.html
index 844a030d4591ca28c31ef7c960868610f3917641..2ce0e948dcf497c4a4351ba006b5f32e6559644d 100644 (file)
--- a/src/templates/donate/donate.html
+++ b/src/templates/donate/donate.html
@@ -129,11 +129,6 @@
                                                                                        placeholder="{{ _("Email Address") }}" required>
                                                                        </div>
 
-                                                                       <div class="form-group">
-                                                                               <input type="text" class="form-control" name="company_name"
-                                                                                       placeholder="{{ _("Company Name (optional)") }}">
-                                                                       </div>
-
                                                                        <div class="form-group">
                                                                                <input type="text" class="form-control" name="street1"
                                                                                        placeholder="{{ _("Address Line 1") }}" required>

diff --git a/src/web/donate.py b/src/web/donate.py
index 3f54cbe8b6c4c715e3134f160383985fe9adc9da..1e31865dd2d8c675b5e172221818495fce1038b3 100644 (file)
--- a/src/web/donate.py
+++ b/src/web/donate.py
@@ -51,9 +51,6 @@ class DonateHandler(base.BaseHandler):
                        "last_name"    : self.get_argument("last_name"),
                }
 
-               # Collect company information
-               company_name = self.get_argument("company_name", None)
-
                # Collect address information
                address = {
                        "street1"      : self.get_argument("street1"),
@@ -78,35 +75,7 @@ class DonateHandler(base.BaseHandler):
 
                        person = response.get("number")
 
-                       # Fetch properties of this person
-                       response = await self.backend.zeiterfassung.send_request(
-                               "/api/v1/persons/%s/properties" % person,
-                       )
-
-                       # Does this person already have an organization?
-                       organization = response.get("organization", None)
-
-                       # Search for organization or create a new one
-                       if not organization and company_name:
-                               response = await self.backend.zeiterfassung.send_request(
-                                       "/api/v1/organizations/search", name=name,
-                               )
-
-                               # Create a new one if we could not find anything
-                               if not response:
-                                       response = await self.backend.zeiterfassung.send_request(
-                                               "/api/v1/organizations/create", name=name, **address,
-                                       )
-
-                               organization = response.get("number")
-
-                               # Connect organization and person
-                               await self.backend.zeiterfassung.send_request(
-                                       "/api/v1/organizations/%s/persons/add", person=person,
-                               )
-
                        donation = {
-                               "organization" : organization,
                                "person"       : person,
 
                                # $$$
@@ -125,7 +94,7 @@ class DonateHandler(base.BaseHandler):
 
                        # Create donation
                        response = await self.backend.zeiterfassung.send_request(
-                               "/api/v1/donations/create/ipfire-project", **donation)
+                               "/api/v1/donations/create/ipfire-project", **donation, **address)
 
                        # Redirect the user to the payment page
                        redirect_url = response.get("redirect_url")