Fix conflict resolve leftovers, fix variable name

Author: rajumsys

admin.widget.class.php

@@ -308,7 +308,7 @@ public function render_transactional_field()
       {
           printf('<label><input type="checkbox" id="transactional" name="sp_settings[transactional]" value="1" %s />Mark emails as transactional</label>
           <br/><small>Upon checked, by default, it\'ll set mark all emails as transactional. It should be set false (using hooks) for non-transactional emails.</small>',
-           $this->options['transactional'] ? 'checked' : '');
+           $this->settings['transactional'] ? 'checked' : '');
 
       }
 }

mailer.http.class.php

@@ -83,7 +83,7 @@ protected function get_request_body()
         $body['options'] = array(
             'open_tracking' => (bool) apply_filters('wpsp_open_tracking', $tracking_enabled),
             'click_tracking' => (bool) apply_filters('wpsp_click_tracking', $tracking_enabled),
-            'transactional' => apply_filters('wpsp_transactional', $this->options['transactional'])
+            'transactional' => (bool) apply_filters('wpsp_transactional', $this->settings['transactional'])
         );
 
         // pass through either stored template or inline content

mailer.smtp.class.php

@@ -25,29 +25,16 @@ public function configure_phpmailer($phpmailer) {
         $tracking_enabled = (bool) $settings['enable_tracking'];
         $x_msys_api = array(
             'options' => array (
-<<<<<<< 23ff7110c4c175f7b92f47caf3662175c6fb88de
                 'open_tracking' => (bool) apply_filters('wpsp_open_tracking', $tracking_enabled),
-                'click_tracking' => (bool) apply_filters('wpsp_click_tracking', $tracking_enabled)
-=======
-                'open_tracking' => $tracking_enabled,
-                'click_tracking' => $tracking_enabled,
-<<<<<<< 8afed5dc7c524a0f928b57a5579f50e65216f704
-                'transactional' => true
->>>>>>> Add transaction option
-=======
-                'transactional' => apply_filters('wpsp_transactional', $options['transactional'])
->>>>>>> Add transactional support
+                'click_tracking' => (bool) apply_filters('wpsp_click_tracking', $tracking_enabled),
+                'transactional' => (bool) apply_filters('wpsp_transactional', $settings['transactional'])
             )
         );
 
         $phpmailer->isSMTP();
         $phpmailer->SMTPSecure = 'tls';
         $phpmailer->Port = !empty($settings['port']) ? intval($settings['port']) : 587;
         $phpmailer->Host = 'smtp.sparkpostmail.com';
-<<<<<<< 23ff7110c4c175f7b92f47caf3662175c6fb88de
-=======
-
->>>>>>> Add transaction option
         $phpmailer->SMTPAuth = true;
         $phpmailer->Username = 'SMTP_Injection';
         $phpmailer->Password = apply_filters('wpsp_api_key', $settings['password']);