X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Forder.php;h=c491d0798318e46419fc67bebf4fd6e9ad05b8a0;hb=974dd694b40d82627829ef19c69a631abffab70d;hp=fda6bbc7d1612270e661fd8949c485dc1879d19a;hpb=1e38f6d41e6eac45cc8c80da7ace0d82b25259a3;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index fda6bbc7d1..c491d07983 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,7 +40,7 @@ $url = '';
 if (!defined('__SECURITY')) {
 	die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
 	return;
 } elseif (!isMember()) {
 	// Sorry, no guest access!
@@ -83,27 +83,31 @@ if (empty($url)) {
 		SQL_FREERESULT($result);
 
 		// Fix empty subject line
-		if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+		if (empty($content['subject'])) {
+			$content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+		} // END - if
 
 		// Calculate used points
-		$usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
+		$content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+		subtractPoints('order', getMemberId(), $content['payed_points']);
 
 		// Update used points
 		$add = '';
-		if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
-		subtractPoints('order', getMemberId(), $usedPoints);
+		if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
+			$add = ', `mail_orders`=`mail_orders`+1';
+		} // END - if
 
 		// Send an email to the user
-		$message_mem = loadEmailTemplate('order-member', $content, getMemberId());
+		$message_mem = loadEmailTemplate('member_order_normal', $content, getMemberId());
 		sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
 		// Notify admins about this
-		sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId());
+		sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'admin_order_normal', $content, getMemberId());
 
 		// Create new task (we ignore the task id here)
 		createNewTask(
 			'{--ADMIN_NEW_QUEUE--}',
-			'<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',
+			'<pre>' . loadEmailTemplate('admin_order_normal', $content, getMemberId()) . '</pre>',
 			'MEMBER_ORDER',
 			getMemberId(),
 			0,