From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 16 Jun 2015 19:39:12 +0000 (-0400)
Subject: Merge branch 'master' of cvs2.gaslightmedia.com:WP-Plugins/glm-woocommerce-merchant... 
X-Git-Tag: v1.0.1~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4b9c299ea9b6ac19f4ebc3a4e4331c3f99256365;p=WP-Plugins%2Fglm-woocommerce-merchant-e-solutions-gateway.git

Merge branch 'master' of cvs2.gaslightmedia.com:WP-Plugins/glm-woocommerce-merchant-e-solutions-gateway

Conflicts:
	classes/glmMesGateway.php
---

4b9c299ea9b6ac19f4ebc3a4e4331c3f99256365
diff --cc classes/glmMesGateway.php
index bb96ad8,43f2726..19e0dbe
--- a/classes/glmMesGateway.php
+++ b/classes/glmMesGateway.php
@@@ -255,13 -255,19 +255,15 @@@ class GlmMesGateway extends WC_Payment_
              $this->title = $this->settings['title'];
              $this->description = $this->settings['description'];
  
 -            $this->settings['address_verification'] == $this->settings['address_verification'];
 -            $this->settings['cvv_required'] = $this->settings['cvv_required'];
 -
              // Add credit cards available to the description
              $this->description .= '<h4>Credit Cards Accepted</h4><p>' . ($this->settings['visa'] ==
-                      'yes' ? 'VISA&nbsp;&nbsp;' : '') . ($this->settings['mastercard'] ==
-                      'yes' ? 'MASTERCARD&nbsp;&nbsp;' : '') . ($this->settings['amex'] ==
-                      'yes' ? 'AMEX&nbsp;&nbsp;' : '') . ($this->settings['discover'] ==
-                      'yes' ? 'DISCOVER&nbsp;&nbsp;' : '') . '</p>';
+                      'yes' ? '<img src="' . GLM_MES_ASSETS_URL . '/visa.png">' : '') . ($this->settings['mastercard'] ==
+                      'yes' ? '<img src="' . GLM_MES_ASSETS_URL .
+                      '/mastercard.png">' : '') . ($this->settings['amex'] ==
+                      'yes' ? '<img src="' . GLM_MES_ASSETS_URL . '/amex.png">' : '') . ($this->settings['discover'] ==
+                      'yes' ? '<img src="' . GLM_MES_ASSETS_URL .
+                      '/discover.png">' : '') . '</p>';
  
 -
              // Check for SSL
              add_action('admin_notices', array(
                      $this,