X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Forder.php;h=469590e29407d473973b2fdf5f35ff80b58e6151;hb=449003a0cf1cf2434ef63e4b7d39685ba3804786;hp=b7a46520a8862e1dbc1f4c6b8d1d0c1d0b24b4a6;hpb=80c4d572aeea86286b6e1db8b845f46813b478c5;p=mailer.git diff --git a/inc/modules/order.php b/inc/modules/order.php index b7a46520a8..469590e294 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -54,18 +54,18 @@ if (!defined('__SECURITY')) { // When URL is empty nothing bad happend here if (empty($url)) { + // Auto-send is inactive + $content['admin_autosend'] = '{--ADMIN_AUTOSEND_INACTIVE--}'; + $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}'; + $type = 'ADMIN'; + // Is the auto-send mechanism active or inactive? if (getConfig('autosend_active') == 'Y') { // Auto-send is active $content['admin_autosend'] = '{--ADMIN_AUTOSEND_ACTIVE--}'; $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}'; $type = 'NEW'; - } else { - // Auto-send is inactive - $content['admin_autosend'] = '{--ADMIN_AUTOSEND_INACTIVE--}'; - $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}'; - $type = 'ADMIN'; - } + } // END - if // Update sending pool SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='%s' WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1", @@ -95,18 +95,14 @@ if (empty($url)) { if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1'; subtractPoints('order', getMemberId(), $usedPoints); - // Compile content - $content['payment'] = getPaymentTitlePrice($content['payment_id']); - $content['category'] = getCategory($content['cat_id']); - // Send an email to the user $message_mem = loadEmailTemplate('order-member', $content, getMemberId()); - sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem); + sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem); // Notify admins about this - sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId()); + sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId()); - // Create new task + // Create new task (we ignore the task id here) createNewTask( '{--ADMIN_NEW_QUEUE--}', '
'.loadEmailTemplate('order-admin', $content, getMemberId()).'',