diff --git a/uc_dineromail.info b/uc_dineromail.info index f738ae0..4cd811a 100644 --- a/uc_dineromail.info +++ b/uc_dineromail.info @@ -4,10 +4,3 @@ dependencies[] = uc_payment package = Ubercart - payment core = 6.x php = 5.0 - -; Information added by drupal.org packaging script on 2008-12-30 -version = "6.x-1.5" -core = "6.x" -project = "uc_dineromail" -datestamp = "1230655233" - diff --git a/uc_dineromail.module b/uc_dineromail.module index 40be56e..e680d00 100644 --- a/uc_dineromail.module +++ b/uc_dineromail.module @@ -71,11 +71,9 @@ function uc_dineromail_form_alter(&$form, $form_state, $form_id) { * Implementation of hook_payment_method(). */ function uc_dineromail_payment_method() { - $tx = _dineromail_tx(); - $path = base_path() . drupal_get_path('module', 'uc_dineromail'); - $title = variable_get('uc_dineromail_method_title', t('Payment through DineroMail') . ' ' . $tx[variable_get(uc_dineromail_server, 0)]['info']['payments'] . '.'); - $title .= '
'; + $title = variable_get('uc_dineromail_method_title', t('Payment through DineroMail')); + $title .= '
'; $methods[] = array( 'id' => 'dineromail', @@ -96,28 +94,19 @@ function uc_dineromail_payment_method() { // Adds DineroMail settings to the payment method settings form. function uc_payment_method_dineromail($op, &$arg1) { if ($op == 'settings') { - $tx = _dineromail_tx(); - - foreach (array_values($tx) as $v) { - $servers[] = $v['info']['name'] . ' (' . $v['info']['url'] . ' --- ' . strtoupper($v['info']['method']) . ')'; - } - - foreach (array_values($tx[variable_get('uc_dineromail_server', 0)]['currencies']) as $c) { - $currencies[] = $c['ISO'] . ' (' . $c['human'] . ')'; - } - $form['uc_dineromail_server'] = array( + $form['uc_dineromail_country'] = array( '#type' => 'select', - '#title' => t('Server'), - '#description' => t('Select the DineroMail.com server to use.'), - '#options' => $servers, - '#default_value' => variable_get('uc_dineromail_server', 0), + '#title' => t('DineroMail Country'), + '#description' => t('Select the DineroMail.com country to use.'), + '#options' => _uc_dineromail_country_array(), + '#default_value' => variable_get('uc_dineromail_country', ''), '#required' => TRUE ); $form['uc_dineromail_account'] = array( '#type' => 'textfield', - '#title' => t('Vendor account number'), - '#description' => t('Your DineroMail vendor account number, excluding the slash qualifier (ie. only the bold numbers in xxxxxxx/y).'), + '#title' => t('DineroMail account number'), + '#description' => t('Your DineroMail vendor account number. You can also use the email associated to the account.'), '#default_value' => variable_get('uc_dineromail_account', ''), '#size' => 19, '#maxlength' => 19, @@ -126,15 +115,15 @@ function uc_payment_method_dineromail($op, &$arg1) { $form['uc_dineromail_currency'] = array( '#type' => 'select', '#title' => t('Currency'), - '#description' => t('Adjust currency for DineroMail (NOTE: if you changed the server above you need to save the changes in order to filter currency options for the newly selected server).'), - '#options' => $currencies, + '#description' => t('Adjust currency for DineroMail.'), + '#options' => _uc_dineromail_currency_array(), '#default_value' => variable_get('uc_dineromail_currency', 0), '#required' => TRUE ); $form['uc_dineromail_vendor_logo'] = array( '#type' => 'textfield', '#title' => t('Vendor logo'), - '#description' => t('Path to the vendor logo to show, if any (NOTE: the file must have a "gif", "bmp", "jpg", or "png" extension; approximate dimensions 210×60).'), + '#description' => t('Path to the vendor logo to show, if any (NOTE: the file must have a "gif", "bmp", "jpg", or "png" extension; approximate dimensions 200×100).'), '#default_value' => variable_get('uc_dineromail_vendor_logo', ''), '#size' => 60 ); @@ -145,11 +134,6 @@ function uc_payment_method_dineromail($op, &$arg1) { '#collapsible' => TRUE, '#collapsed' => TRUE ); - $form['uc_dineromail_others']['uc_dineromail_others_address_form'] = array( - '#type' => 'checkbox', - '#title' => t("Show DineroMail's alternate address form on checkout."), - '#default_value' => variable_get('uc_dineromail_others_address_form', FALSE) - ); $form['uc_dineromail_others']['uc_dineromail_others_message_form'] = array( '#type' => 'checkbox', '#title' => t("Show DineroMail's additional messages form on checkout."), @@ -167,41 +151,29 @@ function uc_payment_method_dineromail($op, &$arg1) { // Form to build the submission to DineroMail.com. -function uc_dineromail_form($dummy, $order) { - $tx = _dineromail_tx(); +function uc_dineromail_form($form_state, $order) { + $item_name = t('Order:') . $order->order_id . ' - ' . variable_get('site_name', ''); + // info for this taken from: https://mx.dineromail.com/biblioteca $data = array( - 'item' => t('Order:') . $order->order_id . '---' . t('Site:') . str_replace(' ', '_', variable_get('site_name', '')), - 'currency' => $tx[variable_get('uc_dineromail_server', 0)]['currencies'][variable_get('uc_dineromail_currency', 0)]['code'], - 'price' => $order->order_total, - 'account' => variable_get('uc_dineromail_account', 0), - 'number' => '', - 'image' => variable_get('uc_dineromail_vendor_logo', ''), - 'success' => 'cart/dineromail/success/' . uc_cart_get_id(), - 'failure' => 'cart/dineromail/failure/' . uc_cart_get_id(), - 'address' => variable_get('uc_dineromail_others_address_form', FALSE), - 'message' => variable_get('uc_dineromail_others_message_form', FALSE) + 'item_name_1' => trim(substr($item_name, 0, 150)), + 'item_quantity_1' => 1, + // dinero mail expects not dot and last two numbers are the decimal part + 'item_ammount_1' => round($order->order_total * 100), + 'country_id' => variable_get('uc_dineromail_country', 0), + 'currency' => variable_get('uc_dineromail_currency', 0), + 'merchant' => variable_get('uc_dineromail_account', 0), + 'header_image' => variable_get('uc_dineromail_vendor_logo', ''), + 'ok_url' => 'cart/dineromail/success/' . uc_cart_get_id(), + 'error_url' => 'cart/dineromail/failure/' . uc_cart_get_id(), + 'buyer_message' => variable_get('uc_dineromail_others_address_form', FALSE), + 'payment_method_available' => 'all', ); - return _dineromail_build_url(variable_get('uc_dineromail_server', 0), $data); -} - - -// sumit form builder -function _dineromail_build_url($server, $data) { - $tx = _dineromail_tx(); - - $form['#action'] = $tx[$server]['info']['url']; - $form['#method'] = $tx[$server]['info']['method']; + $form['#action'] = 'https://checkout.dineromail.com/CheckOut'; foreach ($data as $name => $value) { - if ($name == 'item') { - // some cleanup needed for the 'item' attribute - $form[$tx[$server]['attributes']['item']] = array('#type' => 'hidden', '#value' => strtr(trim(substr(trim($value), 0, 150)), ' ', '+')); - } - else { - $form[$tx[$server]['attributes'][$name]] = array('#type' => 'hidden', '#value' => $value); - } + $form[$name] = array('#type' => 'hidden', '#value' => $value); } $form['submit'] = array( @@ -213,62 +185,11 @@ function _dineromail_build_url($server, $data) { return $form; } +function _uc_dineromail_country_array() { + return array(1 => t('Argentina'), t('Brazil'), t('Chile'), t('Mexico')); +} -// static info table for the different DineroMail server's standards -function _dineromail_tx() { - return array(array('info' => array('name' => 'Argentina', - 'logo' => 'images/dm_es.gif', - 'url' => 'https://argentina.dineromail.com/Shop/Shop_ingreso.asp', - 'method' => 'post', - 'payments' => t('(Credit Cards, Pago Fácil, RapiPago)')), - 'currencies' => array(array('ISO' => 'ARS', 'human' => t('Argentine peso'), 'code' => 1), - array('ISO' => 'CLP', 'human' => t('Chilean peso'), 'code' => 1), - array('ISO' => 'USD', 'human' => t('United States dollar'), 'code' => 2)), - 'attributes' => array('item' => 'NombreItem', - 'currency' => 'TipoMoneda', - 'price' => 'PrecioItem', - 'account' => 'E_Comercio', - 'number' => 'NroItem', - 'image' => 'image_url', - 'success' => 'DireccionExito', - 'failure' => 'DireccionFracaso', - 'address' => 'DireccionEnvio', - 'message' => 'Mensaje')), - array('info' => array('name' => 'Chile', - 'logo' => 'images/dm_es.gif', - 'url' => 'https://chile.dineromail.com/carrito/cart.asp', - 'method' => 'get', - 'payments' => t('(Credit Cards, Pago Fácil, RapiPago)')), - 'currencies' => array(array('ISO' => 'ARS', 'human' => t('Argentine peso'), 'code' => 1), - array('ISO' => 'CLP', 'human' => t('Chilean peso'), 'code' => 1), - array('ISO' => 'USD', 'human' => t('United States dollar'), 'code' => 2)), - 'attributes' => array('item' => 'NombreItem', - 'currency' => 'TipoMoneda', - 'price' => 'PrecioItem', - 'account' => 'Comercio', - 'number' => 'NroItem', - 'image' => 'image_url', - 'success' => 'DireccionExito', - 'failure' => 'DireccionFracaso', - 'address' => 'DireccionEnvio', - 'message' => 'Mensaje')), - array('info' => array('name' => 'Mexico', - 'logo' => 'images/dm_es.gif', - 'url' => 'https://mexico.dineromail.com/carrito/cart.asp', - 'method' => 'get', - 'payments' => t('(Credit Cards, Pago Fácil, RapiPago)')), - 'currencies' => array(array('ISO' => 'ARS', 'human' => t('Argentine peso'), 'code' => 1), - array('ISO' => 'CLP', 'human' => t('Chilean peso'), 'code' => 1), - array('ISO' => 'USD', 'human' => t('United States dollar'), 'code' => 2)), - 'attributes' => array('item' => 'NombreItem', - 'currency' => 'TipoMoneda', - 'price' => 'PrecioItem', - 'account' => 'Comercio', - 'number' => 'NroItem', - 'image' => 'image_url', - 'success' => 'DireccionExito', - 'failure' => 'DireccionFracaso', - 'address' => 'DireccionEnvio', - 'message' => 'Mensaje')) - ); +function _uc_dineromail_currency_array() { + return array('ars' => 'ARS', 'mxn' => 'MXN', 'clp' => 'CLP', 'usd' => 'USD', 'brl' => 'BRL'); } +