From bknr at bknr.net Fri Mar 2 07:12:15 2007
From: bknr at bknr.net (bknr at bknr.net)
Date: Fri, 2 Mar 2007 02:12:15 -0500 (EST)
Subject: [bknr-cvs] r2126 - trunk/projects/bos/payment-website/templates/da
Message-ID: <20070302071215.A99D25B068@common-lisp.net>
Author: hhubner
Date: 2007-03-02 02:12:13 -0500 (Fri, 02 Mar 2007)
New Revision: 2126
Modified:
trunk/projects/bos/payment-website/templates/da/bestellung.xml
trunk/projects/bos/payment-website/templates/da/ueberweisung.xml
Log:
Small textual fixes
Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-01-15 11:43:49 UTC (rev 2125)
+++ trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-03-02 07:12:13 UTC (rev 2126)
@@ -159,7 +159,7 @@
-
+
Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-01-15 11:43:49 UTC (rev 2125)
+++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-03-02 07:12:13 UTC (rev 2126)
@@ -60,7 +60,7 @@
Vigtigt! Du skal anf?re "SL ID $(contract-id)" p? bankoverf?rslen, s? vi kan genkende din betaling.
- Meine Husk, at du selv st?r for overf?rslen via din bank til BOS Danmarks konto.
+ Husk, at du selv st?r for overf?rslen via din bank til BOS Danmarks konto.
@@ -120,7 +120,7 @@
Vi reserverer gerne det ?nskede antal m??.
Vi har brug for nogle personlige oplysninger for at kunne sende dig informationer om (regnskovsbevis, sponsorprofil, geografisk koordinater, bidragskvittering).
-N?r vi har modtaget bidraget, sender vi dig alle ovenfor n?vnte informationer per brev eller e-mail.
+N?r vi har modtaget bidraget, sender vi dig alle ovenfor n?vnte informationer eller e-mail.
[Denne formular]
From bknr at bknr.net Sun Mar 4 10:25:04 2007
From: bknr at bknr.net (bknr at bknr.net)
Date: Sun, 4 Mar 2007 05:25:04 -0500 (EST)
Subject: [bknr-cvs] r2127 - in trunk/projects/bos: m2
payment-website/templates/da worldpay-test
Message-ID: <20070304102504.2CCF0710D2@common-lisp.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">
+
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
From bknr at bknr.net Fri Mar 16 16:24:20 2007
From: bknr at bknr.net (bknr at bknr.net)
Date: Fri, 16 Mar 2007 11:24:20 -0500 (EST)
Subject: [bknr-cvs] r2128 - trunk/projects/bos/worldpay-test
Message-ID: <20070316162420.45EEE481AB@common-lisp.net>
Author: hhubner
Date: 2007-03-16 11:24:19 -0500 (Fri, 16 Mar 2007)
New Revision: 2128
Modified:
trunk/projects/bos/worldpay-test/poi-handlers.lisp
Log:
Add content language chooser to POI image editor to help translators.
Modified: trunk/projects/bos/worldpay-test/poi-handlers.lisp
===================================================================
--- trunk/projects/bos/worldpay-test/poi-handlers.lisp 2007-03-04 10:25:03 UTC (rev 2127)
+++ trunk/projects/bos/worldpay-test/poi-handlers.lisp 2007-03-16 16:24:19 UTC (rev 2128)
@@ -287,6 +287,7 @@
(with-bos-cms-page (req :title "Edit POI Image")
(html
(cmslink (edit-object-url (poi-image-poi poi-image)) "Back to POI")
+ (content-language-chooser req)
((:form :method "post" :enctype "multipart/form-data")
((:input :type "hidden" :name "poi" :value poi))
(:table (:tr (:td "thumbnail")
From bknr at bknr.net Mon Mar 19 21:21:24 2007
From: bknr at bknr.net (bknr at bknr.net)
Date: Mon, 19 Mar 2007 16:21:24 -0500 (EST)
Subject: [bknr-cvs] r2129 - trunk/projects/lisp-ecoop/website/templates
Message-ID: <20070319212124.32B9F75093@common-lisp.net>
Author: hhubner
Date: 2007-03-19 16:21:22 -0500 (Mon, 19 Mar 2007)
New Revision: 2129
Modified:
trunk/projects/lisp-ecoop/website/templates/user-error.xml
Log:
Testing commit trigger
Modified: trunk/projects/lisp-ecoop/website/templates/user-error.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/user-error.xml 2007-03-16 16:24:19 UTC (rev 2128)
+++ trunk/projects/lisp-ecoop/website/templates/user-error.xml 2007-03-19 21:21:22 UTC (rev 2129)
@@ -12,11 +12,11 @@
-
- Your request could not be processed because an error occured:
-
+
+ Your request could not be processed because an error occured:
+