3d Secure message fixes

davidteal · Mar 27, 2015 · 3b1c653 · 3b1c653
1 parent 3b2961d
commit 3b1c653
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 8 deletions.
diff --git a/upload/catalog/controller/payment/globalpay.php b/upload/catalog/controller/payment/globalpay.php
@@ -134,12 +134,37 @@ public function notify() {
 				$message .= '<br /><strong>' . $this->language->get('text_avs_address') . ':</strong> ' . $this->request->post['AVSADDRESSRESULT'];
 			}
 
-			if (isset($this->request->post['ECI']) && !empty($this->request->post['ECI'])) {
-				if ($this->request->post['ECI'] == 6 && (!isset($this->request->post['CAVV']) || empty($this->request->post['CAVV'])) && (!isset($this->request->post['XID']) || empty($this->request->post['CAVV']))) {
-					$this->request->post['ECI'] = 1;
+            //3D Secure message
+			if (isset($this->request->post['ECI']) && isset($this->request->post['CAVV']) && isset($this->request->post['XID'])) {
+                $eci = $this->request->post['ECI'];
+
+				if (($this->request->post['ECI'] == 6 || $this->request->post['ECI'] == 1) && empty($this->request->post['CAVV']) && empty($this->request->post['XID'])) {
+					$scenario_id = 1;
 				}
 
-				$message .= '<br /><strong>' . $this->language->get('text_eci') . ':</strong> (' . $this->request->post['ECI'] . ') ' . $this->language->get('text_3d_s' . $this->request->post['ECI']);
+                if (($this->request->post['ECI'] == 5 || $this->request->post['ECI'] == 0) && !empty($this->request->post['CAVV']) && !empty($this->request->post['XID'])) {
+                    $scenario_id = 5;
+                }
+
+                if (($this->request->post['ECI'] == 6 || $this->request->post['ECI'] == 1) && !empty($this->request->post['CAVV']) && !empty($this->request->post['XID'])) {
+                    $scenario_id = 6;
+                }
+
+                if (isset($scenario_id)) {
+                    $scenario_message = $this->language->get('text_3d_s' . $scenario_id);
+                } else {
+                    if (isset($this->request->post['CARDTYPE'])) {
+                        if ($this->request->post['CARDTYPE'] == 'VISA') {
+                            $eci = 7;
+                        } else {
+                            $eci = 2;
+                        }
+                    }
+
+                    $scenario_message = $this->language->get('text_3d_liability');
+                }
+
+				$message .= '<br /><strong>' . $this->language->get('text_eci') . ':</strong> (' . $eci . ') ' . $scenario_message;
 			}
 
 			if ($tss == 1 && isset($this->request->post['TSS'])) {

diff --git a/upload/catalog/controller/payment/realex.php b/upload/catalog/controller/payment/realex.php
@@ -134,12 +134,37 @@ public function notify() {
 				$message .= '<br /><strong>' . $this->language->get('text_avs_address') . ':</strong> ' . $this->request->post['AVSADDRESSRESULT'];
 			}
 
-			if (isset($this->request->post['ECI']) && !empty($this->request->post['ECI'])) {
-				if ($this->request->post['ECI'] == 6 && (!isset($this->request->post['CAVV']) || empty($this->request->post['CAVV'])) && (!isset($this->request->post['XID']) || empty($this->request->post['CAVV']))) {
-					$this->request->post['ECI'] = 1;
+            //3D Secure message
+			if (isset($this->request->post['ECI']) && isset($this->request->post['CAVV']) && isset($this->request->post['XID'])) {
+                $eci = $this->request->post['ECI'];
+
+				if (($this->request->post['ECI'] == 6 || $this->request->post['ECI'] == 1) && empty($this->request->post['CAVV']) && empty($this->request->post['XID'])) {
+					$scenario_id = 1;
 				}
 
-				$message .= '<br /><strong>' . $this->language->get('text_eci') . ':</strong> (' . $this->request->post['ECI'] . ') ' . $this->language->get('text_3d_s' . $this->request->post['ECI']);
+                if (($this->request->post['ECI'] == 5 || $this->request->post['ECI'] == 0) && !empty($this->request->post['CAVV']) && !empty($this->request->post['XID'])) {
+                    $scenario_id = 5;
+                }
+
+                if (($this->request->post['ECI'] == 6 || $this->request->post['ECI'] == 1) && !empty($this->request->post['CAVV']) && !empty($this->request->post['XID'])) {
+                    $scenario_id = 6;
+                }
+
+                if (isset($scenario_id)) {
+                    $scenario_message = $this->language->get('text_3d_s' . $scenario_id);
+                } else {
+                    if (isset($this->request->post['CARDTYPE'])) {
+                        if ($this->request->post['CARDTYPE'] == 'VISA') {
+                            $eci = 7;
+                        } else {
+                            $eci = 2;
+                        }
+                    }
+
+                    $scenario_message = $this->language->get('text_3d_liability');
+                }
+
+				$message .= '<br /><strong>' . $this->language->get('text_eci') . ':</strong> (' . $eci . ') ' . $scenario_message;
 			}
 
 			if ($tss == 1 && isset($this->request->post['TSS'])) {