Index: uc_turkish_banks.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/uc_turkish_banks/uc_turkish_banks.module,v retrieving revision 1.9 diff -u -r1.9 uc_turkish_banks.module --- uc_turkish_banks.module 11 Nov 2008 21:14:40 -0000 1.9 +++ uc_turkish_banks.module 16 Nov 2008 00:22:22 -0000 @@ -1,5 +1,5 @@ 'fieldset', - '#title' => t('Genel Tanimlar'), + '#title' => t('General Definitions'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#weight' => 0, @@ -364,7 +364,7 @@ $form['bank']['processtype'] = array('#type' => 'select', '#title' => t('Process Type'), '#default_value' => $value['processtype'], - '#description' => t('Auth: Satis PreAuth: On Otorizasyon.'), + '#description' => t('Auth: Authorize and capture immediately PreAuth: Only Authorize.'), '#options' => array( 'Auth' => t('Auth'), 'PreAuth' => t('PreAuth'), @@ -382,7 +382,7 @@ ); $form['bank']['valid_until'] = array('#type' => 'select', - '#title' => t('Experiation Date'), + '#title' => t('Expiration Date'), '#type' => 'date', '#default_value' => $default_valid_until, '#required' => TRUE, @@ -810,22 +810,22 @@ $hash = base64_encode(pack('H*', sha1($hashval))); if ($paramsval!=$hashparamsval || $hashparam!=$hash) { - uc_order_comment_save($order->order_id, 0, t('Güvenlik Uyarisi. Sayisal Imza Geçerli Degil'), 'admin'); + uc_order_comment_save($order->order_id, 0, t('Security Warning. Digital Signature Is Not Valid'), 'admin'); } $md_status = $_POST["mdStatus"]; $err_msg = $_POST["mdErrorMsg"]; if ($md_status == 1 || $md_status == 2 || $md_status == 3 || $md_status == 4) { - $comment = t('Ödeme alidi.'); + $comment = t('Payment Received.'); uc_payment_enter($order->order_id, 'Garanti Bank', $_POST["amount"], 0, NULL, $comment); uc_order_comment_save($order->order_id, 0, t('Order created through website.'), 'admin'); $_SESSION['do_complete'] = TRUE; drupal_goto('cart/checkout/complete'); } else { - $message = t('Odemeniz GERCEKLESEMEMISTIR. Lutfen sepetinizi kontrol ederek tekrar deneyiniz.'); - $message .= t('
Detay:'. $md_status .':'. $err_msg .'.'); + $message = t('Transaction is NOT SUCCESSFUL. Please check your details and try again.'); + $message .= t('
Detail:'. $md_status .':'. $err_msg .'.'); drupal_set_message($message); $_SESSION['do_review'] = TRUE; drupal_goto('cart/checkout/review'); @@ -839,8 +839,8 @@ function uc_turkish_banks_payment_gateway() { $gateways[] = array( 'id' => 'banks', - 'title' => t('Garanti Bank'), - 'description' => t('Process credit card payments using Garanti Bank Gateway'), + 'title' => t('A Turkish Bank'), + 'description' => t('Process credit card payments using a Turkish Bank Gateway'), 'settings' => 'uc_turkish_banks_settings_form', 'credit' => 'uc_turkish_banks_charge', ); @@ -926,56 +926,56 @@ drupal_set_message(t('The Bank Gateway service requires cURL. Please talk to your system administrator to get this configured.')); return array('success' => FALSE); } - // XML request schema + // XML request sablonu $request = "DATA=". - "". - "{NAME}". - "{PASSWORD}". - "{CLIENTID}". - "{IP}". - "{EMAIL}". - "P". - "{OID}". - "". - "". - "". - "{TYPE}". - "{CCNO}". - "{CCTAR}". - "{CV2}". - "{TUTAR}". - "949". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - "". - ""; +"". +"{NAME}". +"{PASSWORD}". +"{CLIENTID}". +"{IP}". +"{EMAIL}". +"P". +"{OID}". +"". +"". +"". +"{TYPE}". +"{CCNO}". +"{CCTAR}". +"{CV2}". +"{TUTAR}". +"949". +"". +"". +"{BName}". +"{BStreet1}". +"{BStreet2}". +"". +"{BCity}". +"". +"{BPostal}". +"{BCountry}". +"{BCompany}". +"{BTel}". +"". +"". +"{SName}". +"{SStreet1}". +"{SStreet2}". +"". +"{SCity}". +"". +"{SPostal}". +"{SCountry}". +"". +"". +""; $order = uc_order_load($order_id); $taksit = 0; - while (strlen($order->payment_details['cc_exp_month'])==1 ){ - $order->payment_details['cc_exp_month']= "0".$order->payment_details['cc_exp_month']; - } +while (strlen($order->payment_details['cc_exp_month'])==1 ){ +$order->payment_details['cc_exp_month']= "0".$order->payment_details['cc_exp_month']; +} $url = variable_get('bankurl', ''); $request = str_replace("{NAME}", variable_get('username', ''), $request); @@ -988,6 +988,21 @@ $request = str_replace("{CCTAR}", $order->payment_details['cc_exp_month'].substr($order->payment_details['cc_exp_year'],2), $request); $request = str_replace("{CV2}", $order->payment_details['cc_cvv'], $request); $request = str_replace("{TUTAR}", $amount, $request); + $request = str_replace("{BName}", $order->payment_details['billing_first_name'].' '.$order->payment_details['billing_last_name'], $request); + $request = str_replace("{BStreet1}", $order->payment_details['billing_street1'], $request); + $request = str_replace("{BStreet2}", $order->payment_details['billing_street2'], $request); + $request = str_replace("{BCity}", $order->payment_details['billing_city'], $request); + $request = str_replace("{BPostal}", $order->payment_details['billing_postal_code'], $request); + $request = str_replace("{BCountry}", $order->payment_details['billing_country'], $request); + $request = str_replace("{BCompany}", $order->payment_details['billing_company'], $request); + $request = str_replace("{BTel}", $order->payment_details['billing_phone'], $request); + $request = str_replace("{SName}", $order->payment_details['delivery_first_name'].' '.$order->payment_details['delivery_last_name'], $request); + $request = str_replace("{SStreet1}", $order->payment_details['delivery_street1'], $request); + $request = str_replace("{SStreet2}", $order->payment_details['delivery_street2'], $request); + $request = str_replace("{SCity}", $order->payment_details['delivery_city'], $request); + $request = str_replace("{SPostal}", $order->payment_details['delivery_postal_code'], $request); + $request = str_replace("{SCountry}", $order->payment_details['delivery_country'], $request); + //$request = str_replace("{TAKSIT}", $taksit, $request); $ch = curl_init(); // initialize curl handle @@ -1072,4 +1087,4 @@ } uc_order_comment_save($order_id, $user->uid, $message, 'admin'); return $result; -} \ No newline at end of file +}