October 2008 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 30 Oct '08

30 Oct '08

Revision: 4023 Author: hans URL: http://bknr.net/trac/changeset/4023 Convert numsqm to integer before using it for calculations. U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-30 15:31:22 UTC (rev 4022) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-30 16:12:57 UTC (rev 4023) @@ -109,7 +109,8 @@ (defmethod handle-object-form ((handler edit-sponsor-handler) (action (eql :create)) (sponsor (eql nil))) (with-query-params (numsqm country email name address date language want-print) (let* ((sponsor (make-sponsor :email email :country country :language language)) - (contract (make-contract sponsor (parse-integer numsqm) + (numsqm (parse-integer numsqm)) + (contract (make-contract sponsor numsqm :paidp (format nil "~A: manually created by ~A" (format-date-time (get-universal-time)) (user-login (bknr.web:bknr-session-user)))

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 30 Oct '08

30 Oct '08

Revision: 4022 Author: hans URL: http://bknr.net/trac/changeset/4022 Set download-only flag in contracts when creating, don't compare price after it has been created. U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/web/sponsor-handlers.lisp U trunk/projects/bos/web/tags.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-10-28 10:24:22 UTC (rev 4021) +++ trunk/projects/bos/m2/m2.lisp 2008-10-30 15:31:22 UTC (rev 4022) @@ -325,8 +325,7 @@ (* (length (contract-m2s contract)) +price-per-m2+)) (defmethod contract-download-only-p ((contract contract)) - (or (contract-download-only contract) - (< (contract-price contract) *mail-amount*))) + (contract-download-only contract)) (deftransaction contract-set-download-only-p (contract newval) (setf (contract-download-only contract) newval)) Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-28 10:24:22 UTC (rev 4021) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-30 15:31:22 UTC (rev 4022) @@ -114,7 +114,8 @@ (format-date-time (get-universal-time)) (user-login (bknr.web:bknr-session-user))) :date (date-to-universal date) - :download-only (not want-print)))) + :download-only (or (< (* +price-per-m2+ numsqm) *mail-amount*) + (not want-print))))) (contract-issue-cert contract name :address address :language language) (send-to-postmaster #'mail-backoffice-sponsor-data contract numsqm country email name address language (all-request-params)) (when (and email Modified: trunk/projects/bos/web/tags.lisp =================================================================== --- trunk/projects/bos/web/tags.lisp 2008-10-28 10:24:22 UTC (rev 4021) +++ trunk/projects/bos/web/tags.lisp 2008-10-30 15:31:22 UTC (rev 4022) @@ -81,7 +81,8 @@ (language (request-language)) (sponsor (make-sponsor :language language)) (contract (make-contract sponsor numsqm - :download-only download-only + :download-only (or (< (* +price-per-m2+ numsqm) *mail-amount*) + download-only) :expires (+ (if manual-transfer bos.m2::*manual-contract-expiry-time* bos.m2::*online-contract-expiry-time*)

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 28 Oct '08

28 Oct '08

Revision: 4021 Author: hans URL: http://bknr.net/trac/changeset/4021 Only send email if email address has been provided. U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-27 10:03:56 UTC (rev 4020) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-28 10:24:22 UTC (rev 4021) @@ -117,7 +117,9 @@ :download-only (not want-print)))) (contract-issue-cert contract name :address address :language language) (send-to-postmaster #'mail-backoffice-sponsor-data contract numsqm country email name address language (all-request-params)) - (mail-instructions-to-sponsor contract email) + (when (and email + (length email)) + (mail-instructions-to-sponsor contract email)) (redirect (format nil "/edit-sponsor/~D" (store-object-id sponsor)))))) (defun contract-checkbox-name (contract)

1 0

[bknr-cvs] hans changed trunk/thirdparty/cl+ssl/
by BKNR Commits 27 Oct '08

27 Oct '08

Revision: 4020 Author: hans URL: http://bknr.net/trac/changeset/4020 update from upstream U trunk/thirdparty/cl+ssl/CVS/Entries U trunk/thirdparty/cl+ssl/streams.lisp Modified: trunk/thirdparty/cl+ssl/CVS/Entries =================================================================== --- trunk/thirdparty/cl+ssl/CVS/Entries 2008-10-27 06:26:46 UTC (rev 4019) +++ trunk/thirdparty/cl+ssl/CVS/Entries 2008-10-27 10:03:56 UTC (rev 4020) @@ -1,17 +1,17 @@ -/LICENSE/1.4/Tue Mar 11 05:01:27 2008// -/Makefile/1.1.1.1/Tue Mar 11 05:01:27 2008// -/bio.lisp/1.3/Tue Mar 11 05:01:27 2008// -/cl+ssl.asd/1.6/Tue Mar 11 05:01:27 2008// -/example.lisp/1.1/Tue Mar 11 05:01:27 2008// -/ffi-buffer-all.lisp/1.1/Tue Mar 11 05:01:27 2008// -/ffi-buffer-clisp.lisp/1.1/Tue Mar 11 05:01:27 2008// -/ffi-buffer.lisp/1.1/Tue Mar 11 05:01:27 2008// -/index.css/1.2/Tue Mar 11 05:01:27 2008// -/index.html/1.15/Tue Mar 11 05:01:27 2008// -/package.lisp/1.3/Tue Mar 11 05:01:27 2008// -/reload.lisp/1.5/Tue Mar 11 05:01:27 2008// -/test.lisp/1.4/Tue Mar 11 05:01:27 2008// -/conditions.lisp/1.3/Thu Apr 17 19:35:29 2008// -/ffi.lisp/1.8/Thu Apr 17 19:45:21 2008// -/streams.lisp/1.12/Thu Apr 17 19:45:19 2008// +/LICENSE/1.4/Mon Jun 23 13:16:26 2008// +/Makefile/1.1.1.1/Mon Jun 23 13:16:26 2008// +/bio.lisp/1.3/Mon Jun 23 13:16:26 2008// +/cl+ssl.asd/1.6/Mon Jun 23 13:16:26 2008// +/conditions.lisp/1.3/Mon Jun 23 13:16:26 2008// +/example.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi-buffer-all.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi-buffer-clisp.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi-buffer.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi.lisp/1.8/Mon Jun 23 13:16:26 2008// +/index.css/1.2/Mon Jun 23 13:16:26 2008// +/index.html/1.15/Mon Jun 23 13:16:26 2008// +/package.lisp/1.3/Mon Jun 23 13:16:26 2008// +/reload.lisp/1.5/Mon Jun 23 13:16:26 2008// +/test.lisp/1.4/Mon Jun 23 13:16:26 2008// +/streams.lisp/1.13/Mon Oct 27 10:03:01 2008// D Modified: trunk/thirdparty/cl+ssl/streams.lisp =================================================================== --- trunk/thirdparty/cl+ssl/streams.lisp 2008-10-27 06:26:46 UTC (rev 4019) +++ trunk/thirdparty/cl+ssl/streams.lisp 2008-10-27 10:03:56 UTC (rev 4020) @@ -167,14 +167,14 @@ (defun install-nonblock-flag (fd) (ccl::fd-set-flags fd (logior (ccl::fd-get-flags fd) #$O_NONBLOCK))) -#+sbcl +#+(and sbcl (not win32)) (defun install-nonblock-flag (fd) (sb-posix:fcntl fd sb-posix::f-setfl (logior (sb-posix:fcntl fd sb-posix::f-getfl) sb-posix::o-nonblock))) -#-(or clozure-common-lisp sbcl) +#-(or clozure-common-lisp (and sbcl (not win32))) (defun install-nonblock-flag (fd) (declare (ignore fd)))

1 0

[bknr-cvs] hans changed ediware/
by BKNR Commits 27 Oct '08

27 Oct '08

1 0

[bknr-cvs] hans changed trunk/projects/bos/m2/m2.lisp
by BKNR Commits 27 Oct '08

27 Oct '08

Revision: 4018 Author: hans URL: http://bknr.net/trac/changeset/4018 Don't consider unpaid contracts in contract statistics. U trunk/projects/bos/m2/m2.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-10-26 22:49:23 UTC (rev 4017) +++ trunk/projects/bos/m2/m2.lisp 2008-10-26 23:02:29 UTC (rev 4018) @@ -621,7 +621,7 @@ (defun initialize-contract-stats () (setq *contract-stats* (make-contract-stats)) - (dolist (contract (class-instances 'contract)) + (dolist (contract (remove-if-not #'contract-paidp (class-instances 'contract))) (add-to-contract-stats contract))) (defun add-to-contract-stats (contract)

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/news-tags.lisp
by BKNR Commits 26 Oct '08

26 Oct '08

Revision: 4017 Author: hans URL: http://bknr.net/trac/changeset/4017 Fix news links. U trunk/projects/bos/web/news-tags.lisp Modified: trunk/projects/bos/web/news-tags.lisp =================================================================== --- trunk/projects/bos/web/news-tags.lisp 2008-10-24 13:32:33 UTC (rev 4016) +++ trunk/projects/bos/web/news-tags.lisp 2008-10-26 22:49:23 UTC (rev 4017) @@ -19,7 +19,7 @@ :key #'news-item-time))) (subseq items 0 (min (length items) 3)))))) (labels ((show-news-entry (news-item) - (html ((:a :href (format nil "javascript:window_news('/~a/news/~a')" language (store-object-id news-item)) + (html ((:a :href "#" :onclick (format nil "return window_news('/~a/news/~a')" language (store-object-id news-item)) :class "more") (:strong (:princ-safe (format-date-time (news-item-time news-item) :show-time nil)) :br

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 24 Oct '08

24 Oct '08

Revision: 4016 Author: hans URL: http://bknr.net/trac/changeset/4016 Send instruction email for manually created sponsors. U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-24 12:54:11 UTC (rev 4015) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-24 13:32:33 UTC (rev 4016) @@ -117,6 +117,7 @@ :download-only (not want-print)))) (contract-issue-cert contract name :address address :language language) (send-to-postmaster #'mail-backoffice-sponsor-data contract numsqm country email name address language (all-request-params)) + (mail-instructions-to-sponsor contract email) (redirect (format nil "/edit-sponsor/~D" (store-object-id sponsor)))))) (defun contract-checkbox-name (contract)

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/ge/
by BKNR Commits 24 Oct '08

24 Oct '08

Revision: 4015 Author: hans URL: http://bknr.net/trac/changeset/4015 Remove directory which will not be kept in svn D trunk/projects/bos/payment-website/ge/

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/templates/de/bestellung.xml
by BKNR Commits 23 Oct '08

23 Oct '08

Revision: 4014 Author: hans URL: http://bknr.net/trac/changeset/4014 Verbesserte dynamische "verschenken"-Option U trunk/projects/bos/payment-website/templates/de/bestellung.xml Modified: trunk/projects/bos/payment-website/templates/de/bestellung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/bestellung.xml 2008-10-23 13:53:56 UTC (rev 4013) +++ trunk/projects/bos/payment-website/templates/de/bestellung.xml 2008-10-23 14:01:32 UTC (rev 4014) @@ -75,29 +75,35 @@ <tr> <td colspan="3" height="5"> </td> </tr> + <script type="text/javascript"> + function verschenken(state) { + document.bestellformular.gift.disabled = !state; + document.bestellformular.gift.checked = false; + } + </script> <tr> <td colspan="3"> <input type="radio" name="numsqm" value="1" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)" /> 1 m² Regenwald [3 Euro], <br /> <input type="radio" name="numsqm" value="5" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)" /> 5 m² Regenwald [15 Euro], <br /> <input type="radio" name="numsqm" value="10" checked="checked" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)" /> 10 m² Regenwald [30 Euro], <br /> <input type="radio" name="numsqm" value="30" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'visible'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(true)" /> 30 m² Regenwald [90 Euro] <br /> - <input type="radio" name="numsqm" value="" onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'"/> + <input type="radio" name="numsqm" value="" onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)"/> oder <input type="text" name="numsqm1" size="5" value="" - onfocus="document.bestellformular.numsqm[4].click(); document.getElementById('verschenken-info').style.visibility = 'hidden'" - onkeyup="document.getElementById('verschenken-info').style.visibility = (document.bestellformular.numsqm1.value >= 30) ? 'visible' : 'hidden';"/> + onfocus="document.bestellformular.numsqm[4].click(); verschenken(false)" + onkeyup="verschenken(document.bestellformular.numsqm1.value >= 30)"/> Quadratmeter [zu je 3 Euro]. <br /> </td> @@ -106,9 +112,9 @@ <td colspan="3" height="8"> </td> </tr> - <tr id="verschenken-info" style="visibility: hidden"> + <tr> <td colspan="3"> - <input type="checkbox" name="gift" value="1" /> + <input type="checkbox" name="gift" value="1" disabled="1"/> Ich möchte die m² symbolisch verschenken. <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" /> <a href="#" onclick="window_extra('verschenken')" class="more">

1 0