[bknr-cvs] r2050 - trunk/projects/bos/worldpay-test

[bknr at bknr.net]

Author: hhubner
Date: 2006-11-04 00:52:49 -0500 (Sat, 04 Nov 2006)
New Revision: 2050

Modified:
   trunk/projects/bos/worldpay-test/sponsor-handlers.lisp
   trunk/projects/bos/worldpay-test/tags.lisp
Log:
Umstellung f?\195?\188r Print-Urkunde per Mail


Modified: trunk/projects/bos/worldpay-test/sponsor-handlers.lisp
===================================================================
--- trunk/projects/bos/worldpay-test/sponsor-handlers.lisp	2006-11-04 05:49:54 UTC (rev 2049)
+++ trunk/projects/bos/worldpay-test/sponsor-handlers.lisp	2006-11-04 05:52:49 UTC (rev 2050)
@@ -201,18 +201,12 @@
                         (loop
                            for (language-symbol language-name) in (website-languages)
                            do (html ((:option :value language-symbol) (:princ-safe language-name)))))))
-	     (:tr (:td "Name for certificate")
-		  (:td (text-field "name" :size 50)))
 	     (:tr (:td "Email-Address")
 		  (:td (text-field "email" :size 20)))
-	     (unless (contract-download-only-p contract)
-	       (html
-		(:tr (:td "Postal address for certificate"
-			  (:td (textarea-field "postaladdress" :rows 5 :cols 40))))))
 	     (:tr (:td (submit-button "process" "process" :formcheck "javascript:return check_complete_sale()"))))))))))
 
 (defmethod handle-object-form ((handler complete-transfer-handler) (action (eql :process)) contract req)
-  (with-query-params (req email name postaladdress country language)
+  (with-query-params (req email country language)
     (with-bos-cms-page (req :title "Square meter sale completion")
       (if (contract-paidp contract)
 	  (html (:h2 "This sale has already been completed"))
@@ -221,7 +215,6 @@
 	    (sponsor-set-country (contract-sponsor contract) country)
 	    (contract-set-paidp contract (format nil "~A: wire transfer processed by ~A"
 						 (format-date-time) (user-login (bknr-request-user req))))
-	    (contract-issue-cert contract name :address postaladdress :language language)
 	    (when email
 	      (html (:p "Sending instruction email to " (:princ-safe email)))
 	      (mail-instructions-to-sponsor contract email))))

Modified: trunk/projects/bos/worldpay-test/tags.lisp
===================================================================
--- trunk/projects/bos/worldpay-test/tags.lisp	2006-11-04 05:49:54 UTC (rev 2049)
+++ trunk/projects/bos/worldpay-test/tags.lisp	2006-11-04 05:52:49 UTC (rev 2050)
@@ -100,11 +100,22 @@
   (mapc #'emit-template-node children))
 
 (define-bknr-tag mail-transfer ()
-  (with-query-params ((get-template-var :request) contract-id mail-certificate)
+  (with-query-params ((get-template-var :request)
+		      contract-id mail-certificate
+		      name vorname strasse plz ort)
     (let* ((contract (store-object-with-id (parse-integer contract-id)))
 	   (download-only (or (< (contract-price contract) *mail-certificate-threshold*)
 			      (not mail-certificate))))
       (contract-set-download-only-p contract download-only)
+      (contract-issue-cert contract (format nil "~A ~A" vorname name)
+			   :address (format nil "~A ~A~%~A~%~A ~A"
+					    vorname name
+					    strasse
+					    plz ort)
+			   :language (session-variable :language))
+      (loop
+	 do (sleep 1)
+	 until (probe-file (contract-pdf-pathname contract)))
       (mail-manual-sponsor-data (get-template-var :request)))))
 
 (define-bknr-tag when-certificate (&key children)