From bknr at bknr.net Tue Jan 2 11:24:23 2007 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 2 Jan 2007 06:24:23 -0500 (EST) Subject: [bknr-cvs] r2121 - trunk/projects/bos/m2 Message-ID: <20070102112423.53F0B47005@common-lisp.net> Author: hhubner Date: 2007-01-02 06:24:22 -0500 (Tue, 02 Jan 2007) New Revision: 2121 Modified: trunk/projects/bos/m2/cert-daemon.lisp trunk/projects/bos/m2/m2.lisp Log: Catch error message if certificate cannot be generated. Time out if certificate generator hangs, generating an error message to the sponsor. Modified: trunk/projects/bos/m2/cert-daemon.lisp =================================================================== --- trunk/projects/bos/m2/cert-daemon.lisp 2006-12-19 05:35:36 UTC (rev 2120) +++ trunk/projects/bos/m2/cert-daemon.lisp 2007-01-02 11:24:22 UTC (rev 2121) @@ -31,14 +31,17 @@ (dolist (fdf-pathname (remove "fdf" (directory directory) :test (complement #'string-equal) :key #'pathname-type)) - (destructuring-bind (id &optional (country "en")) (split "-" (pathname-name fdf-pathname)) - (let ((language-specific-template-pathname (merge-pathnames (make-pathname :name (format nil "~A-~A" (pathname-name template-pathname) country)) - template-pathname)) - (output-pathname (merge-pathnames (make-pathname :name id :type "pdf") fdf-pathname))) - (fill-form fdf-pathname (if (probe-file language-specific-template-pathname) - language-specific-template-pathname - template-pathname) - output-pathname))))) + (handler-case + (destructuring-bind (id &optional (country "en")) (split "-" (pathname-name fdf-pathname)) + (let ((language-specific-template-pathname (merge-pathnames (make-pathname :name (format nil "~A-~A" (pathname-name template-pathname) country)) + template-pathname)) + (output-pathname (merge-pathnames (make-pathname :name id :type "pdf") fdf-pathname))) + (fill-form fdf-pathname (if (probe-file language-specific-template-pathname) + language-specific-template-pathname + template-pathname) + output-pathname))) + (error (e) + (format "Error generating certificate from file ~A: ~A~%" fdf-pathname e))))) (defun generate-certs () (fill-forms *cert-mail-directory* *cert-mail-template*) Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2006-12-19 05:35:36 UTC (rev 2120) +++ trunk/projects/bos/m2/m2.lisp 2007-01-02 11:24:22 UTC (rev 2121) @@ -266,12 +266,13 @@ (make-certificate contract name :address address :language language) (unless (contract-download-only-p contract) (make-certificate contract name :address address :language language :print t)) - (loop - do (progn - (format t "~&; waiting for generation of certificate, contract-id ~A" (store-object-id contract)) - (sleep 2)) - until (probe-file (contract-pdf-pathname contract))) - (change-slot-values contract 'cert-issued t)))) + (dotimes (i 10) + (when (probe-file (contract-pdf-pathname contract)) + (return)) + (sleep 1)) + (if (probe-file (contract-pdf-pathname contract)) + (change-slot-values contract 'cert-issued t) + (error "Cannot generate certificate"))))) (defmethod contract-image-tiles ((contract contract)) (let (image-tiles) From bknr at bknr.net Mon Jan 8 14:43:37 2007 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 8 Jan 2007 09:43:37 -0500 (EST) Subject: [bknr-cvs] r2122 - trunk/projects/bos/worldpay-test Message-ID: <20070108144337.23D0339078@common-lisp.net> Author: hhubner Date: 2007-01-08 09:43:36 -0500 (Mon, 08 Jan 2007) New Revision: 2122 Modified: trunk/projects/bos/worldpay-test/reports-xml-handler.lisp Log: Add new XML report handler all-contracts-m2s that includes sqm coordinates for the contracts. Modified: trunk/projects/bos/worldpay-test/reports-xml-handler.lisp =================================================================== --- trunk/projects/bos/worldpay-test/reports-xml-handler.lisp 2007-01-02 11:24:22 UTC (rev 2121) +++ trunk/projects/bos/worldpay-test/reports-xml-handler.lisp 2007-01-08 14:43:36 UTC (rev 2122) @@ -34,8 +34,7 @@ (error "invalid report name ~A" name)) arguments))))) - -(defreport all-contracts () +(defun all-contracts/internal (&key include-coords) (dolist (contract *contracts-to-process*) (with-element "contract" (attribute "id" (store-object-id contract)) @@ -44,8 +43,19 @@ (attribute "paid" (contract-paidp contract)) (attribute "date-time" (format-date-time (contract-date contract) :xml-style t)) (attribute "country" (sponsor-country (contract-sponsor contract))) - (attribute "sqm-count" (length (contract-m2s contract)))))) + (attribute "sqm-count" (length (contract-m2s contract))) + (when include-coords + (dolist (m2 (contract-m2s contract)) + (with-element "m2" + (attribute "utm-x" (m2-x m2)) + (attribute "utm-y" (m2-y m2)))))))) +(defreport all-contracts () + (all-contracts/internal)) + +(defreport all-contracts-m2s () + (all-contracts/internal :include-coords t)) + (defun week-of-contract (contract) "Return Week key (YYYY-WW) for given contract." (multiple-value-bind (second minute hour date month year day-of-week is-dst tz) (decode-universal-time (contract-date contract)) From bknr at bknr.net Mon Jan 15 10:04:25 2007 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 15 Jan 2007 05:04:25 -0500 (EST) Subject: [bknr-cvs] r2123 - trunk/projects/bos/payment-website/templates/da Message-ID: <20070115100425.7ABF23E054@common-lisp.net> Author: hhubner Date: 2007-01-15 05:04:19 -0500 (Mon, 15 Jan 2007) New Revision: 2123 Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml Log: Manual transfer data corrected. Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-01-08 14:43:36 UTC (rev 2122) +++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-01-15 10:04:19 UTC (rev 2123) @@ -2,7 +2,7 @@ + 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"> - + @@ -70,22 +70,22 @@ - + - + - + - +
Ich m?chte meine Spende ?berweisen.Jeg vil overf?re mit bidrag til BOS Danmark via min bank!
-Ich habe mich dazu entschieden einen Betrag von $(amount) Euro auf das Spendenkonto "Samboja Lestari" von BOS Deutschland e.V. zu ?berweisen. +Jeg har besluttet mig for at overf?re et bidrag p? $(amount) kroner til Samboja Lestari via BOS Danmark. - - - + + +
Kontonummer:32 10 100
Bank:Bank f?r Sozialwirtschaft
BLZ:100 205 00
Kontonummer:0001718891
Bank:Merkur Bank
Reg.Nr.: 8401
- Bitte unbedingt den Verwendungszweck "SL ID $(contract-id)" auf dem ?berweisungsformular angeben! + Vigtigt! Du skal anf?re "SL ID $(contract-id)" p? bankoverf?rslen, s? vi kan genkende din betaling.

- Meine ?berweisung muss ich bei meiner Bank eigenst?ndig veranlassen! + Meine Husk, at du selv st?r for overf?rslen via din bank til BOS Danmarks konto.
Vorname:Fornavn:
Name:Efternavn:
Stra?e/Nr.:Gade/Nr.:
PLZ/OrtKommune: @@ -107,7 +107,7 @@
- +
@@ -116,31 +116,29 @@
- [Pers?nliche Daten] + [Personlige oplysninger]
-Wir reservieren gerne die von Ihnen gew?nschten m?. F?r die Zusendung -der entsprechenden Informationen (Regenwaldurkunde, Sponsorenprofil, -Geokoordinaten, Spendenbescheinigung) ben?tigen wir unbedingt die -Angabe Ihrer Daten. Nach erfolgter ?berweisung erhalten Sie diese -Informationen schriftlich oder per E-Mail von uns. +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.


- [Dieses Formular] + [Denne formular]
- Bitte senden Sie dieses Formular per E-Mail direkt an uns. Sie k?nnen es auch + Send os venligst denne formular direkte per e-mail, eller - ausdrucken + udskriv - und per Fax oder Post an unsere - Kontaktadresse schicken: + den og send den til os per fax eller post:

- BOS Deutschland e.V. + BOS Danmark
- Sch?neberger Ufer 69 + ?kologihuset,
+ Blegdamsvej 4b
- 10785 Berlin + 2200 K?benhavn N

- Fax: (030) 2636 7815 + Fax: +45 3537 3636
From bknr at bknr.net Mon Jan 15 11:36:39 2007 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 15 Jan 2007 06:36:39 -0500 (EST) Subject: [bknr-cvs] r2124 - trunk/projects/bos/payment-website/templates/da Message-ID: <20070115113639.8ED8059088@common-lisp.net> Author: hhubner Date: 2007-01-15 06:36:38 -0500 (Mon, 15 Jan 2007) New Revision: 2124 Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml trunk/projects/bos/payment-website/templates/da/quittung.xml trunk/projects/bos/payment-website/templates/da/toplevel.xml trunk/projects/bos/payment-website/templates/da/toplevel_main.xml Log: Recent changes Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -19,7 +19,7 @@ Plant regnskov -

for kun 3,- Euro/24,- Kroner per m? +

for kun 3,- Euro/24,- kroner per m?



@@ -30,7 +30,7 @@ Vi takker for din beslutning om st?tte til Indonesiens folk, natur og dyreliv.



- Din st?tte er et vigtig bidrag i kampen hen mod at sikre et holdbart projektarbejde i Samboja Lestari.

+ Din st?tte er et vigtigt bidrag i kampen hen mod at sikre et holdbart projektarbejde i Samboja Lestari.

... mere @@ -71,21 +71,21 @@ - 1 m? regnskov [3 Euro/24 Kroner], + 1 m? regnskov [3 Euro/24 kroner],

- 5 m? regnskov [15 Euro/120 Kroner], + 5 m? regnskov [15 Euro/120 kroner],

- 10 m? regnskov [30 Euro/240 Kroner], + 10 m? regnskov [30 Euro/240 kroner],

- 30 m? regnskov [90 Euro/720 Kroner], + 30 m? regnskov [90 Euro/720 kroner],

or - m? [3 Euro/24 Kroner stk]. + m? [3 Euro/24 kroner stk].

@@ -159,7 +159,7 @@ - + @@ -175,7 +175,7 @@ Startende med bare 1 m?, modtager du vores regnskovs diplom - som en pdf-fil fra din personlige sponsor-profil. + som en pdf-fil p? din personlige sponsor-profil.





[Donations kvittering]

Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/quittung.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -47,7 +47,7 @@ - for din st?tte og for din tilld til BOS. + for din st?tte og for din tillid til BOS.



Kvardratmeterne du har sponseret er i gode h?nder. @@ -107,7 +107,7 @@ - Vi acceptere det intastede navn i dette felt. V?r venlig at ?ndre navnet om n?dvendigt. + Vi accepterer det indtastede navn i dette felt. V?r venlig at ?ndre navnet om n?dvendigt. @@ -134,9 +134,9 @@




- [Betalings-bekr?ftigelse] + [Betalingsbekr?ftigelse]

- Denne betalings-bekr?ftigelse fra WorldPay er allerede undervejs til din indbox. I den uventede situation at du ikke skulle modtage nogen besked, venligst kontakt: + Denne betalingsbekr?ftigelse fra WorldPay er allerede undervejs til din indboks. I den uventede situation at du ikke skulle modtage nogen besked, venligst kontakt:

@@ -152,7 +152,7 @@ Regnskovs diplom - som et pdf-download fra din personlige sponsor profil. + som et pdf-download p? din personlige sponsor profil.





Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -36,7 +36,7 @@
l
- donation + don?r
l
@@ -48,7 +48,7 @@
l
- satellit kort + satellitkort
l
Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -44,7 +44,7 @@
l
- satellit kort + satellitkort
l
@@ -112,7 +112,7 @@ - Satelit Kort + Satellitkort

From bknr at bknr.net Mon Jan 15 11:43:49 2007 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 15 Jan 2007 06:43:49 -0500 (EST) Subject: [bknr-cvs] r2125 - trunk/projects/bos/worldpay-test Message-ID: <20070115114349.0B2816003D@common-lisp.net> Author: hhubner Date: 2007-01-15 06:43:49 -0500 (Mon, 15 Jan 2007) New Revision: 2125 Modified: trunk/projects/bos/worldpay-test/tags.lisp Log: Change order text for danish sqm Modified: trunk/projects/bos/worldpay-test/tags.lisp =================================================================== --- trunk/projects/bos/worldpay-test/tags.lisp 2007-01-15 11:36:38 UTC (rev 2124) +++ trunk/projects/bos/worldpay-test/tags.lisp 2007-01-15 11:43:49 UTC (rev 2125) @@ -99,7 +99,7 @@ numsqm (case (make-keyword-from-string language) (:de "qm Regenwald in") - (:da "sqm Regnskov i") + (:da "m2 Regnskov i") (t "sqm rain forest in")))) (store-object-id sponsor) (sponsor-master-code sponsor)