[bknr-cvs] r2127 - in trunk/projects/bos: m2 payment-website/templates/da worldpay-test

[bknr at bknr.net]

Author: hhubner
Date: 2007-03-04 05:25:03 -0500 (Sun, 04 Mar 2007)
New Revision: 2127

Modified:
   trunk/projects/bos/m2/packages.lisp
   trunk/projects/bos/payment-website/templates/da/ueberweisung.xml
   trunk/projects/bos/worldpay-test/tags.lisp
Log:
Set country for manual transfers so that the right office receives the mail.


Modified: trunk/projects/bos/m2/packages.lisp
===================================================================
--- trunk/projects/bos/m2/packages.lisp	2007-03-02 07:12:13 UTC (rev 2126)
+++ trunk/projects/bos/m2/packages.lisp	2007-03-04 10:25:03 UTC (rev 2127)
@@ -97,6 +97,7 @@
            #:get-contract
            #:contract-sponsor
            #:contract-paidp
+	   #:contract-download-only
            #:contract-date
            #:contract-m2s
 	   #:contract-bounding-box

Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml	2007-03-02 07:12:13 UTC (rev 2126)
+++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml	2007-03-04 10:25:03 UTC (rev 2127)
@@ -41,6 +41,7 @@
 						name="mailtransfer"
 						id="mailtransfer"
 						onsubmit="YY_checkform('mailtransfer','vorname','#q','0','Anuller venligst dette felt \'Fornavn\'.','name','#q','0','Anuller venligst dette felt \'Efternavn\'.','strasse','#q','0','Anuller venligst dette felt \'Gade/Nr.\'.','plz','#q','0','Anuller venligst dette felt \'Postnummer\'.','ort','#q','0','Anuller venligst dette felt \'Kommune\'.');return document.MM_returnValue">
+					<input type="hidden" name="country" value="DK" />
 					<input type="hidden" name="contract-id" value="$(contract-id)" />
 					<input type="hidden" name="donationcert-yearly" value="$(donationcert-yearly)" />
 					<table id="formTable" width="95%" border="0" cellspacing="0" cellpadding="0">

Modified: trunk/projects/bos/worldpay-test/tags.lisp
===================================================================
--- trunk/projects/bos/worldpay-test/tags.lisp	2007-03-02 07:12:13 UTC (rev 2126)
+++ trunk/projects/bos/worldpay-test/tags.lisp	2007-03-04 10:25:03 UTC (rev 2127)
@@ -110,11 +110,14 @@
 
 (define-bknr-tag mail-transfer ()
   (with-query-params ((get-template-var :request)
+		      country
 		      contract-id 
 		      name vorname strasse plz ort)
     (let* ((contract (store-object-with-id (parse-integer contract-id)))
 	   (download-only (< (contract-price contract) *mail-certificate-threshold*)))
-      (contract-set-download-only-p contract download-only)
+      (with-transaction (:prepare-before-mail)
+	(setf (contract-download-only contract) download-only)
+	(setf (sponsor-country (contract-sponsor contract)) country))
       (contract-issue-cert contract (format nil "~A ~A" vorname name)
 			   :address (format nil "~A ~A~%~A~%~A ~A"
 					    vorname name