Author: hhubner Date: Wed Jan 23 11:46:10 2008 New Revision: 2395 Modified: branches/bos/projects/bos/web/webserver.lisp Log: Ooops! handle-sale was never checked properly, which made sqm sales fail. Modified: branches/bos/projects/bos/web/webserver.lisp ============================================================================== --- branches/bos/projects/bos/web/webserver.lisp (original) +++ branches/bos/projects/bos/web/webserver.lisp Wed Jan 23 11:46:10 2008 @@ -24,13 +24,6 @@ (defmethod find-template-pathname ((handler worldpay-template-handler) template-name &key request) (cond - ((and (not (scan "/" template-name)) - (not (probe-file (merge-pathnames (make-pathname :name template-name :type "xml") - (template-handler-destination handler))))) - (setf template-name (format nil "~A/~A" (or (find-browser-prefered-language request) - *default-language*) - (if (equal "" template-name) - "index" template-name)))) ((scan #?r"(^|.*/)handle-sale" template-name) (with-query-params (request cartId name address country transStatus lang MC_gift) (unless (website-supports-language lang) @@ -50,7 +43,14 @@ (t (when (<= *mail-fiscal-certificate-threshold* (contract-price contract)) (mail-fiscal-certificate-to-office contract name address country)) - (setf template-name (if (and MC_gift (equal MC_gift "1")) #?"/$(lang)/versand_geschenk" #?"/$(lang)/versand_info")))))))) + (setf template-name (if (and MC_gift (equal MC_gift "1")) #?"/$(lang)/versand_geschenk" #?"/$(lang)/versand_info"))))))) + ((and (not (scan "/" template-name)) + (not (probe-file (merge-pathnames (make-pathname :name template-name :type "xml") + (template-handler-destination handler))))) + (setf template-name (format nil "~A/~A" (or (find-browser-prefered-language request) + *default-language*) + (if (equal "" template-name) + "index" template-name))))) (call-next-method handler template-name)) (defmethod initial-template-environment ((expander worldpay-template-handler) req)