19,20c19,20
<   $result = db_query("SELECT mid, title, label, base_rate, percent_rate, free_rate FROM {uc_minpercentrate_methods}", array());
<   foreach ($result as $method) {
---
>   $result = db_query("SELECT mid, title, label, base_rate, percent_rate, free_rate FROM {uc_minpercentrate_methods}");
>   while ($method = db_fetch_object($result)) {
28,30c28
< // l(t('conditions'), CA_UI_PATH .'/uc_minpercentrate_get_quote_'. $method->mid .'/edit/conditions')
< // D7: no condition
<     $row[] = 'conditin';
---
>     $row[] = l(t('conditions'), CA_UI_PATH .'/uc_minpercentrate_get_quote_'. $method->mid .'/edit/conditions');
45d42
< // D7: $mid - sent as array
49c46,47
<   if (is_numeric($mid) && ($method = db_query("SELECT * FROM {uc_minpercentrate_methods} WHERE mid = :mid", array(':mid' => $mid))->fetchAssoc())) {
---
> 
>   if (is_numeric($mid) && ($method = db_fetch_object(db_query("SELECT * FROM {uc_minpercentrate_methods} WHERE mid = %d", $mid)))) {
55c53
<     '#default_value' => $method['title'],
---
>     '#default_value' => $method->title,
60c58
<     '#default_value' => $method['label'],
---
>     '#default_value' => $method->label,
65c63
<     '#default_value' => $method['base_rate'],
---
>     '#default_value' => $method->base_rate,
72c70
<     '#default_value' => $method['percent_rate'],
---
>     '#default_value' => $method->percent_rate,
78c76
<     '#default_value' => $method['free_rate'],
---
>     '#default_value' => $method->free_rate,
117,126c115,116
<      db_update('uc_minpercentrate_methods')
<   	->fields(array(
<     	    'title' => $form_state['values']['title'],
< 	    'label' => $form_state['values']['label'],
< 	    'base_rate' => $form_state['values']['base_rate'],
< 	    'percent_rate' => $form_state['values']['percent_rate'],
< 	    'free_rate' => $form_state['values']['free_rate'],
<     ))
<     ->condition('mid', $form_state['values']['mid'])
<     ->execute();
---
>     db_query("UPDATE {uc_minpercentrate_methods} SET title = '%s', label = '%s', base_rate = %f, percent_rate = %f, free_rate = %f WHERE mid = %d",
>       $form_state['values']['title'], $form_state['values']['label'], $form_state['values']['base_rate'], $form_state['values']['percent_rate'], $form_state['values']['free_rate'], $form_state['values']['mid']);
130,138c120,122
<     $mid = db_insert('uc_minpercentrate_methods')
<   	->fields(array(
<     	    'title' => $form_state['values']['title'],
< 	    'label' => $form_state['values']['label'],
< 	    'base_rate' => $form_state['values']['base_rate'],
< 	    'percent_rate' => $form_state['values']['percent_rate'],
< 	    'free_rate' => $form_state['values']['free_rate'],
<     ))
<     ->execute();
---
>     db_query("INSERT INTO {uc_minpercentrate_methods} (title, label, base_rate, percent_rate, free_rate) VALUES ('%s', '%s', %f, %f, %f)",
>       $form_state['values']['title'], $form_state['values']['label'], $form_state['values']['base_rate'], $form_state['values']['percent_rate'], $form_state['values']['free_rate']);
>     $mid = db_last_insert_id('uc_minpercentrate_methods', 'mid');
160c144,145
<     t('This will remove the shipping method and the product-specific overrides (if applicable). This action can not be undone.'),
---
>     t('This will remove the shipping method, Conditional Action predicate, and the
>       product-specific overrides (if applicable). This action can not be undone.'),
165,170c150,152
<   db_delete('uc_minpercentrate_methods')
<   ->condition('mid', $form_state['values']['mid'])
<   ->execute();
<   db_delete('uc_minpercentrate_products')
<   ->condition('mid', $form_state['values']['mid'])
<   ->execute();
---
>   db_query("DELETE FROM {uc_minpercentrate_methods} WHERE mid = %d", $form_state['values']['mid']);
>   db_query("DELETE FROM {uc_minpercentrate_products} WHERE mid = %d", $form_state['values']['mid']);
>   ca_delete_predicate('uc_minpercentrate_get_quote_'. $form_state['values']['mid']);