Index: uc_payflowpro.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_payflowpro/uc_payflowpro.install,v
retrieving revision 1.3
diff -r1.3 uc_payflowpro.install
172a173,192
>  * Implements hook_update_N().
>  */
> function uc_payflowpro_update_6100() {
>   // Set Ubercart payment gateway transaction type variable from the module's
>   // payment_action variable.
>   $txn_type = variable_get('uc_payflowpro_payment_action', 'Sale');
>   if ($txn_type == 'Sale') {
>     variable_set('uc_pg_payflowpro_cc_txn_type', 'auth_capture');
>   }
>   elseif ($txn_type == 'Authorization') {
>     variable_set('uc_pg_payflowpro_cc_txn_type', 'authorize');
>   }
> 
>   // Delete deprecated variables.
>   variable_del('uc_payflowpro_payment_action');
> 
>  return array();
> }
> 
> /**
198d217
<   variable_del('uc_payflowpro_payment_action');
Index: uc_payflowpro.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_payflowpro/uc_payflowpro.module,v
retrieving revision 1.3
diff -r1.3 uc_payflowpro.module
184a185
>     'credit_txn_types' => array(UC_CREDIT_AUTH_ONLY, UC_CREDIT_AUTH_CAPTURE),
306,315d306
<   $form['payflowpro_settings']['uc_payflowpro_payment_action'] = array(
<     '#type' => 'select',
<     '#title' => t('Payment action'),
<     '#description' => t('Complete Sale will authorize and capture the funds at the time the payment is processed.<br>Authorization will only reserve funds on the card to be captured later through your PayFlow account.'),
<     '#options' => array(
<       'Sale' => t('Complete Sale'),
<       'Authorization' => t('Authorization'),
<     ),
<     '#default_value' => variable_get('uc_payflowpro_payment_action', 'Sale'),
<   );
1084,1085c1075,1081
<    // Get payment action (Sale or Authorization)
<   $payment_action = variable_get('uc_payflowpro_payment_action', '');
---
>   // Get payment action (Sale or Authorization).
>   if ($data['txn_type'] == UC_CREDIT_AUTH_ONLY) {
>     $txn_type = 'Authorization';
>   }
>   elseif ($data['txn_type'] == UC_CREDIT_AUTH_CAPTURE) {
>     $txn_type = 'Sale';
>   }
1127,1128c1123,1130
<   // Get payment action (Sale or Authorization)
<   $payment_action = variable_get('uc_payflowpro_payment_action', '');
---
>   // Get payment action (Sale or Authorization).
>   $txn_type = variable_get('uc_pg_payflowpro_cc_txn_type', '');
>   if ($txn_type == UC_CREDIT_AUTH_ONLY) {
>     $txn_type = 'Authorization';
>   }
>   elseif ($txn_type == UC_CREDIT_AUTH_CAPTURE) {
>     $txn_type = 'Sale';
>   }
1131c1133
<           <' . $payment_action . '>
---
>           <' . $txn_type . '>
1143c1145
<           </' . $payment_action . '>
---
>           </' . $txn_type . '>
1151,1152c1153,1160
<   // Get payment action (Sale or Authorization)
<   $payment_action = variable_get('uc_payflowpro_payment_action', '');
---
>   // Get payment action (Sale or Authorization).
>   $txn_type = variable_get('uc_pg_payflowpro_cc_txn_type', '');
>   if ($txn_type == UC_CREDIT_AUTH_ONLY) {
>     $txn_type = 'Authorization';
>   }
>   elseif ($txn_type == UC_CREDIT_AUTH_CAPTURE) {
>     $txn_type = 'Sale';
>   }
1155c1163
<           <' . $payment_action . '>
---
>           <' . $txn_type . '>
1163c1171
<           </' . $payment_action . '>
---
>           </' . $txn_type . '>
1171,1172c1179,1186
<   // Get payment action (Sale or Authorization)
<   $payment_action = variable_get('uc_payflowpro_payment_action', '');
---
>   // Get payment action (Sale or Authorization).
>   $txn_type = variable_get('uc_pg_payflowpro_cc_txn_type', '');
>   if ($txn_type == UC_CREDIT_AUTH_ONLY) {
>     $txn_type = 'Authorization';
>   }
>   elseif ($txn_type == UC_CREDIT_AUTH_CAPTURE) {
>     $txn_type = 'Sale';
>   }
1175c1189
<           <' . $payment_action . '>
---
>           <' . $txn_type . '>
1186c1200
<           </' . $payment_action . '>
---
>           </' . $txn_type . '>