Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

[mailer.git] / inc / modules / order.php

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 071e4db443b648bc74db94c3c5e6bd83d0a5cdcf..915500d4d7aba0bf78abef0429f65ad1d269ac77 100644 (file)
--- 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 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,7 +38,7 @@
 // Some security stuff...
 $url = '';
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
@@ -95,7 +95,7 @@ if (empty($url)) {
                } // END - if
 
                // Calculate used points
-               $content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+               $content['payed_points'] = $content['target_send'] * getPaymentData($content['payment_id']);
 
                // Subtract them from the user's account and ignore return status
                subtractPoints('order', getMemberId(), $content['payed_points']);
@@ -103,7 +103,7 @@ if (empty($url)) {
                // Update used points
                $add = '';
                if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
-                       $add = ', `mail_orders`=`mail_orders`+1';
+                       $add = ',`mail_orders`=`mail_orders`+1';
                } // END - if
 
                // Send an email to the user
@@ -124,7 +124,7 @@ if (empty($url)) {
                );
 
                // Output back bottom
-               loadTemplate('member_order-back');
+               loadTemplate('member_order_thanks');
        } else {
                // Matching line not found or already 'placed' in send queue
                redirectToUrl('modules.php?module=login');