last changes from peter

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@157 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/www/inc/classes/order.php b/www/inc/classes/order.php
index cf4ef41..d0afd56 100644 (file)
--- a/www/inc/classes/order.php
+++ b/www/inc/classes/order.php
@@ -102,7 +102,13 @@ class Order
                //TODO: get vouchers
                
                //get other fields
-               $this->deliveryaddress=$cart->getShippingAddress();
+               if (!isEmpty($cart->getShippingAddress()))
+                       $this->deliveryaddress=$cart->getShippingAddress();
+               else {
+                       $customer = new Customer($this->customerid);
+                       if ($customer->isValid())
+                               $this->deliveryaddress=$customer->getAddress();
+               }
                $this->comment=$cart->getOrderComments();
                return true;
        }

diff --git a/www/inc/rendering/submit.php b/www/inc/rendering/submit.php
index 158c01d..5f460e8 100644 (file)
--- a/www/inc/rendering/submit.php
+++ b/www/inc/rendering/submit.php
@@ -356,4 +356,13 @@ function orderTickets()
                }
        }
 }
+
+function sendOrderConfirmationMail($order)
+{
+       $p = new Parser("orderconfirmationmail.html");
+       
+       
+       
+       $p->setVar(
+}
 ?>
\ No newline at end of file

diff --git a/www/template/de/orderconfirmationmail.html b/www/template/de/orderconfirmationmail.html
new file mode 100644 (file)
index 0000000..c11873f
--- /dev/null
+++ b/www/template/de/orderconfirmationmail.html
@@ -0,0 +1,34 @@
+#set:SUBJECT:
+Bestellbestätigung
+#endset
+
+#set:BODY:
+Hallo,
+
+ihre Bestellung wurde aufgenommen.
+
+Ihre Bestellung beinhaltet folgende Posten:
+
+@ORDERLIST@
+
+Gesamtsumme: @TOTALSUM@
+
+Der Versand erfolgt an:
+
+@CUSTOMERADDRESS@
+
+Vielen Dank für Ihre Bestellung.
+
+Ihr Zauberschloss
+#endset
+
+#set:CUSTOMERADDRESS:
+@CUST_NAME@
+@CUST_SHIPPINGADDRESS@
+#endset
+
+#set:ORDERITEM:
+@EVENTNAME@ (@DATE@ @TIME@)
+@PRICE@
+Menge: @AMOUNT@ 
+#endset