Index: uc_turkish_banks.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/uc_turkish_banks/uc_turkish_banks.module,v retrieving revision 1.4 diff -u -r1.4 uc_turkish_banks.module --- uc_turkish_banks.module 22 Jun 2008 19:19:30 -0000 1.4 +++ uc_turkish_banks.module 22 Jun 2008 20:06:00 -0000 @@ -85,7 +85,7 @@ } else { $items[] = array( - 'path' => 'admin/store/settings/banks/'. arg(4) . '/edit', + 'path' => 'admin/store/settings/banks/'. arg(4) .'/edit', 'title' => t('Edit Banks'), 'description' => t('Edit an available bank'), 'callback' => 'drupal_get_form', @@ -94,7 +94,7 @@ 'type' => MENU_DYNAMIC_ITEM, ); $items[] = array( - 'path' => 'admin/store/settings/banks/'. arg(4) . '/delete', + 'path' => 'admin/store/settings/banks/'. arg(4) .'/delete', 'title' => t('Delete Bank'), 'description' => t('Delete a bank'), 'callback' => 'drupal_get_form', @@ -103,11 +103,11 @@ 'type' => MENU_DYNAMIC_ITEM, ); $items[] = array( - 'path' => 'admin/store/settings/banks/instalments/'. arg(5).'/'.arg(6).'/delete', + 'path' => 'admin/store/settings/banks/instalments/'. arg(5) .'/'. arg(6) .'/delete', 'title' => t('Delete instalment'), 'description' => t('Delete an instalment'), 'callback' => 'drupal_get_form', - 'callback arguments' => array('uc_turkish_banks_instalments_delete_confirm', arg(5),arg(6)), + 'callback arguments' => array('uc_turkish_banks_instalments_delete_confirm', arg(5), arg(6)), 'access' => user_access('manage banks'), 'type' => MENU_DYNAMIC_ITEM, ); @@ -121,32 +121,32 @@ } function uc_turkish_banks_instalments_display() { - $cid=arg(5); + $cid = arg(5); $result = db_query("SELECT cid, instalment, instalment_ratio, valid_until FROM {uc_turkish_banks_instalments} where cid = %d ORDER BY instalment", $cid); $rows = array(); while ($row = db_fetch_object($result)) { if ($row->type == 'percentage') { - $value = $row->value . '%'; + $value = $row->value .'%'; } else { - $value = '$' . $row->value; + $value = '$'. $row->value; } $rows[] = array( $row->cid, $row->instalment, $row->instalment_ratio, format_date($row->valid_until, 'custom', 'd/m/Y'), - l(t('delete'),"admin/store/settings/banks/instalments/$row->cid/$row->instalment/delete")); + l(t('delete'), "admin/store/settings/banks/instalments/$row->cid/$row->instalment/delete")); } - $header = array(array('data' => 'Instalment', 'width' => '10'), 'Ratio','Valid Until','Ops'); - $output .= theme('table',$header, $rows, array('width' => '100%')); - if ($output == null) { + $header = array(array('data' => 'Instalment', 'width' => '10'), 'Ratio', 'Valid Until', 'Ops'); + $output .= theme('table', $header, $rows, array('width' => '100%')); + if ($output == NULL) { $output = "

There are currently no instalments in the system.

"; } $output .= l(t('Add a new instalment'), "admin/store/settings/banks/instalments/add/$cid"); $output .= "
"; - $output .= l(t('Back to Banks'),"admin/store/settings/banks"); + $output .= l(t('Back to Banks'), "admin/store/settings/banks"); return $output; } @@ -176,7 +176,7 @@ '#required' => true, ); $valid_until = getdate($value['valid_until']); - $default_valid_until= array( + $default_valid_until = array( 'month' => $valid_until['mon'], 'day' => $valid_until['mday'], 'year' => $valid_until['year'], @@ -190,7 +190,7 @@ ); $form['cancel'] = array('#type' => 'item', - '#value' => l(t('Cancel and return to instalments listing'), 'admin/store/settings/banks/instalments/'.arg(0)), + '#value' => l(t('Cancel and return to instalments listing'), 'admin/store/settings/banks/instalments/'. arg(0)), '#weight' => 20, ); $form['op'] = array('#type' => 'submit', @@ -214,7 +214,7 @@ * Insert instalment */ function uc_turkish_banks_instalments_add_form_submit($form_id, $form) { - $valid_until = mktime(23,59,59, + $valid_until = mktime(23, 59, 59, $form['valid_until']['month'], $form['valid_until']['day'], $form['valid_until']['year'] @@ -228,7 +228,7 @@ $message = "Sorry instalment could not be added. Try again."; } drupal_set_message($message); - drupal_goto('admin/store/settings/banks/instalments/'.$form['cid']); + drupal_goto('admin/store/settings/banks/instalments/'. $form['cid']); } /** @@ -239,7 +239,7 @@ $form['instalment'] = array('#type' => 'value', '#value' => $instalment); return confirm_form($form, t('Confirm Deletion of instalment %instalment', array('%instalment' => $instalment)), - 'admin/store/settings/banks/instalments/'.$cid, + 'admin/store/settings/banks/instalments/'. $cid, t('Are you sure ?'), t('Delete'), t('Cancel') @@ -258,7 +258,7 @@ else { drupal_set_message("Error deleting instalment"); } - drupal_goto('admin/store/settings/banks/instalments/'.$form['cid']); + drupal_goto('admin/store/settings/banks/instalments/'. $form['cid']); } @@ -270,17 +270,17 @@ $rows = array(); while ($row = db_fetch_object($result)) { if ($row->type == 'percentage') { - $value = $row->value . '%'; + $value = $row->value .'%'; } else { $value = '$'. $row->value; } - $rows[] = array($row->bankname, $row->cardname, format_date($row->valid_until, 'custom', 'd/m/Y'),l(t('Instalments'), "admin/store/settings/banks/instalments/$row->cid") . '|' . l(t('edit'), "admin/store/settings/banks/$row->cid/edit") . '|' . l(t('delete'),"admin/store/settings/banks/$row->cid/delete")); + $rows[] = array($row->bankname, $row->cardname, format_date($row->valid_until, 'custom', 'd/m/Y'), l(t('Instalments'), "admin/store/settings/banks/instalments/$row->cid") .'|'. l(t('edit'), "admin/store/settings/banks/$row->cid/edit") .'|'. l(t('delete'), "admin/store/settings/banks/$row->cid/delete")); } - $header = array(array('data' => 'Bank Name', 'width' => '100'), 'Card Name','Valid Until','Ops'); - $output .= theme('table',$header, $rows, array('width' => '100%')); - if ($output == null) { + $header = array(array('data' => 'Bank Name', 'width' => '100'), 'Card Name', 'Valid Until', 'Ops'); + $output .= theme('table', $header, $rows, array('width' => '100%')); + if ($output == NULL) { $output = "

There are currently no bank in the system.

"; } return $output; @@ -290,7 +290,6 @@ * Form builder for product attributes. */ function uc_turkish_banks_add_form($action, $cid = null) { - if ($action == 'edit') { // If the action is edit, we load the coupon from the database with default values $value = uc_turkish_banks_load($cid); @@ -299,7 +298,7 @@ '#value' => $value['cid'], ); $valid_until = getdate($value['valid_until']); - $default_valid_until= array( + $default_valid_until = array( 'month' => $valid_until['mon'], 'day' => $valid_until['mday'], 'year' => $valid_until['year'], @@ -412,17 +411,16 @@ * Insert/Update coupon */ function uc_turkish_banks_add_form_submit($form_id, $form) { - $valid_until = mktime(23,59,59, + $valid_until = mktime(23, 59, 59, $form['valid_until']['month'], $form['valid_until']['day'], $form['valid_until']['year'] ); if (!isset($form['cid'])) { - - if (db_query("INSERT INTO {uc_turkish_banks} (bankname,clientid,username,password,bankurl,storekey,processtype,cardname,valid_until) - VALUES ('%s','%s','%s','%s','%s','%s','%s','%s', '%d')", - $form['bankname'],$form['clientid'],$form['username'],$form['password'],$form['bankurl'],$form['storekey'],$form['processtype'],$form['cardname'],$valid_until + if (db_query("INSERT INTO {uc_turkish_banks} (bankname, clientid, username, password, bankurl, storekey, processtype, cardname, valid_until) + VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d')", + $form['bankname'], $form['clientid'], $form['username'], $form['password'], $form['bankurl'], $form['storekey'], $form['processtype'], $form['cardname'], $valid_until )) { $message = "New bank {$form['name']} added succesfully"; } @@ -432,8 +430,8 @@ } else { // Otherwise we try to update the coupon with matching coupon id - if (db_query("UPDATE {uc_turkish_banks} SET bankname = '%s', clientid = '%s',username = '%s',password = '%s',bankurl = '%s',storekey = '%s',processtype = '%s',cardname = '%s',valid_until = %d WHERE cid = %d", - $form['bankname'],$form['clientid'],$form['username'],$form['password'],$form['bankurl'],$form['storekey'],$form['processtype'],$form['cardname'],$valid_until,$form['cid'])) { + if (db_query("UPDATE {uc_turkish_banks} SET bankname = '%s', clientid = '%s', username = '%s', password = '%s', bankurl = '%s', storekey = '%s', processtype = '%s', cardname = '%s', valid_until = %d WHERE cid = %d", + $form['bankname'], $form['clientid'], $form['username'], $form['password'], $form['bankurl'], $form['storekey'], $form['processtype'], $form['cardname'], $valid_until, $form['cid'])) { $message = "Bank updated succssfully"; } else { @@ -488,11 +486,11 @@ function uc_turkish_banks_order($op, $arg1, $arg2) { switch ($op) { case 'save': - list($bank_temp,$amount_temp,$bank_cid,$taksit)=explode('|', $_SESSION['taksit']); + list($bank_temp, $amount_temp, $bank_cid, $taksit)=explode('|', $_SESSION['taksit']); //print "TEST:".$_SESSION['bank_cid'].' '. $bank.' '.$amount ; - db_query("UPDATE {uc_order_line_items} SET title = '%s', amount = %f, weight = 0 WHERE order_id = %d AND type ='instalment'",$bank_temp, $amount_temp, $arg1->order_id); + db_query("UPDATE {uc_order_line_items} SET title = '%s', amount = %f, weight = 0 WHERE order_id = %d AND type ='instalment'", $bank_temp, $amount_temp, $arg1->order_id); if (db_affected_rows() == 0) { - db_query("INSERT INTO {uc_order_line_items} (order_id, type, title, amount, weight) VALUES (%d, 'instalment', '%s', %f, 0)", $arg1->order_id,$bank_temp, $amount_temp); + db_query("INSERT INTO {uc_order_line_items} (order_id, type, title, amount, weight) VALUES (%d, 'instalment', '%s', %f, 0)", $arg1->order_id, $bank_temp, $amount_temp); } break; /* @@ -613,26 +611,26 @@ } $result = db_query("SELECT * FROM {uc_turkish_banks} where valid_until > CURDATE() ORDER BY bankname"); if (db_affected_rows() > 0) { - $options = array(); - $select2='' .'' .''; - $select1=''; + $select1 .= ''; + $outer = 1; while ($row = db_fetch_array($result)) { - $select1.= '' ; - $select2Opt.= 'group[0]['.$outer.']=new Option("option'.$outer.'");'; - $inner=0; - $select3OptLst .= 'group['.$outer.']['.$inner++.']=new Option("Taksitler");'; + $select1 .= '' ; + $select2Opt .= 'group[0]['. $outer .']=new Option("option'. $outer .'");'; + $inner = 0; + $select3OptLst .= 'group['. $outer .']['. $inner++ .']=new Option("Taksitler");'; $cid_ins = $row['cid']; $result_ins = db_query("SELECT * FROM {uc_turkish_banks_instalments} where cid = %d and valid_until > CURDATE() ORDER BY instalment", $cid_ins); while ($row_ins = db_fetch_array($result_ins)) { - $new= $row_ins['instalment_ratio'] * $subtotal; - $select_text = $row_ins['instalment']. " taksit +". uc_currency_format($new); - $select_value= $row['cardname']. ' ile '.$row_ins['instalment'] .' taksit'. '|'. $new.'|'.$row['cid'].'|'.$i; - $select3OptLst .= 'group['.$outer.']['.$inner++.']=new Option("'.$select_text.'","'.$select_value.'");'; + $new = $row_ins['instalment_ratio'] * $subtotal; + $select_text = $row_ins['instalment'] ." taksit +". uc_currency_format($new); + $select_value = $row['cardname'] .' ile '. $row_ins['instalment'] .' taksit|'. $new .'|'. $row['cid'] .'|'. $i; + $select3OptLst .= 'group['. $outer .']['. $inner++ .']=new Option("'. $select_text .'","'. $select_value .'");'; } /* for ($i=2;$i<=18;$i++) @@ -648,9 +646,9 @@ */ $outer++; } - $select1.=''; + $select1 .= ''; - $details = '
'. t('Select instalment:'). '' + $details = '
'. t('Select instalment:') .'' . $select1 . $select2 .'