Merge pull request #1 from PrestaShop/master

Merge with PrestaShop/pigmbhpaymill

Author: tschelabaumann

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.0 - 2015-07-21
+* add ssl support for the payment form page
+* Integration of PayFrame to enable use of SAQ A for easier PCI DSS 3.0 compliance
+* transaction description initially set
+
 ## 2.1.0 - 2014-10-01
 * added compatibility for EU-Legal(https://github.com/EU-Legal/modules)
 * added refund within shop-administration

components/configurationHandler.php

@@ -44,6 +44,8 @@ public function loadConfiguration()
 					'PIGMBH_PAYMILL_FASTCHECKOUT',
 					'PIGMBH_PAYMILL_ACCEPTED_BRANDS',
 					'PIGMBH_PAYMILL_CAPTURE',
+					'PIGMBH_PAYMILL_MODE',
+					'PIGMBH_PAYMILL_PCI',
 				)
 		);
 
@@ -56,6 +58,7 @@ public function loadConfiguration()
 		$config_model->setCreditcard(isset($config['PIGMBH_PAYMILL_CREDITCARD']) ? $config['PIGMBH_PAYMILL_CREDITCARD'] : false);
 		$config_model->setFastcheckout(isset($config['PIGMBH_PAYMILL_FASTCHECKOUT']) ? $config['PIGMBH_PAYMILL_FASTCHECKOUT'] : false);
 		$config_model->setCapture(isset($config['PIGMBH_PAYMILL_CAPTURE']) ? $config['PIGMBH_PAYMILL_CAPTURE'] : false);
+		$config_model->setPci(isset($config['PIGMBH_PAYMILL_PCI']) ? $config['PIGMBH_PAYMILL_PCI'] : 0);
 		$accepted_brands = false;
 		if (isset($config['PIGMBH_PAYMILL_ACCEPTED_BRANDS']))
 			$accepted_brands = Tools::jsonDecode($config['PIGMBH_PAYMILL_ACCEPTED_BRANDS'], true);
@@ -79,6 +82,7 @@ public function updateConfiguration(ConfigurationModel $model)
 		Configuration::updateValue('PIGMBH_PAYMILL_FASTCHECKOUT', $model->getFastcheckout());
 		Configuration::updateValue('PIGMBH_PAYMILL_CAPTURE', $model->getCapture());
 		Configuration::updateValue('PIGMBH_PAYMILL_ACCEPTED_BRANDS', Tools::jsonEncode($model->getAccpetedCreditCards()));
+                Configuration::updateValue('PIGMBH_PAYMILL_PCI', $model->getPci());
 	}
 
 	/**
@@ -112,6 +116,7 @@ public function setDefaultConfiguration()
 				)
 			)
 		);
+		Configuration::updateValue('PIGMBH_PAYMILL_PCI', 0);
 
 		return true; //needs to return true for installation
 	}

components/models/configurationModel.php

@@ -71,6 +71,27 @@ class ConfigurationModel {
 	 */
 	private $capture;
 
+        /**
+	 * @var string
+	 */
+	private $pci;
+
+    /**
+     * @return string
+     */
+    public function getPci()
+    {
+        return $this->pci;
+    }
+
+    /**
+     * @param string $pci
+     */
+    public function setPci($pci)
+    {
+        $this->pci = $pci;
+    }
+
 	/**
 	 * @return string
 	 */

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>pigmbhpaymill</name>
 	<displayName><![CDATA[PAYMILL]]></displayName>
-	<version><![CDATA[2.1.6]]></version>
+	<version><![CDATA[2.2.1]]></version>
 	<description><![CDATA[PAYMILL credit card payments &amp;amp; direct debit]]></description>
 	<author><![CDATA[PayIntelligent GmbH]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>

controllers/front/payment.php

@@ -42,7 +42,7 @@ public function initContent()
 			$valid_payments[] = 'creditcard';
 		if (!in_array(Tools::getValue('payment'), $valid_payments))
 			Tools::redirectLink($this->context->link->getPageLink('order', true, null, array('step'=>'1')));
-		
+
 		$db_data = $this->getPaymillUserData();
 
 		$this->updatePaymillClient($db_data);
@@ -78,7 +78,8 @@ public function initContent()
 			'customer' => $this->context->customer->firstname.' '.$this->context->customer->lastname,
 			'prefilledFormData' => $this->updatePaymillPayment($db_data),
 			'acceptedBrands' => Configuration::get('PIGMBH_PAYMILL_ACCEPTED_BRANDS'),
-			'acceptedBrandsDecoded' => $brands
+			'acceptedBrandsDecoded' => $brands,
+            'iframe_active' => (int)Configuration::get('PIGMBH_PAYMILL_PCI') == 0 // SAQ A -> iframe
 		);
 
 		$this->context->smarty->assign($data);

controllers/front/validation.php

@@ -188,7 +188,7 @@ private function processPayment()
 		$this->payment_processor->setCurrency(Tools::strtolower($this->iso_currency));
 		$this->payment_processor->setName($this->context->customer->lastname.', '.$this->context->customer->firstname);
 		$this->payment_processor->setEmail($this->context->customer->email);
-		$this->payment_processor->setDescription('');
+		$this->payment_processor->setDescription((string)time());
 		$this->payment_processor->setLogger($this);
 		$this->payment_processor->setSource(Configuration::get('PIGMBH_PAYMILL_VERSION').'_prestashop_core_'._PS_VERSION_);
 

css/paymill_styles.css

@@ -1,24 +1,56 @@
+#paymill-modul h4{
+    font-family: 'Open Sans', Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    line-height: 15.4px;
+    font-weight: 700;
+}
+
+#paymill_getstarted {
+    font-family: 'Open Sans', Arial, Helvetica, sans-serif;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: 400;
+}
+
+#paymill_getstarted .btn-primary {
+    color: #fff;
+    background-color: #f05000;
+    border-color: #f05000;
+    -webkit-box-shadow: 0 1px 0 #be4000;
+    box-shadow: 0 1px 0 #be4000;
+    -webkit-transition: color .2s linear, background .2s linear, border .2s linear;
+    -o-transition: color .2s linear, background .2s linear, border .2s linear;
+    transition: color .2s linear, background .2s linear, border .2s linear;
+}
+
+#paymill_getstarted .btn-primary:focus,
+#paymill_getstarted .btn-primary:hover,
+#paymill_getstarted .btn-primary:active {
+    border-color: #bd3f00;
+    background-color: #bd3f00;
+}
+
 div.row p.payment_module a.creditcard {
-      background: url('../img/icon-hook.png') 15px 15px no-repeat #fbfbfb; }
+    background: url('../img/icon-hook.png') 15px 15px no-repeat #fbfbfb; }
 div.row p.payment_module a.elv {
-      background: url('../img/icon-hook.png') 15px 15px no-repeat #fbfbfb; }
+    background: url('../img/icon-hook.png') 15px 15px no-repeat #fbfbfb; }
 div.row p.payment_module a.creditcard:after, p.payment_module a.elv:after {
-      display: block;
-      content: "\f054";
-      position: absolute;
-      right: 15px;
-      margin-top: -11px;
-      top: 50%;
-      font-family: "FontAwesome";
-      font-size: 25px;
-      height: 22px;
-      width: 14px;
-      color: #777777; }
+    display: block;
+    content: "\f054";
+    position: absolute;
+    right: 15px;
+    margin-top: -11px;
+    top: 50%;
+    font-family: "FontAwesome";
+    font-size: 25px;
+    height: 22px;
+    width: 14px;
+    color: #777777; }
 div.row p.payment_module a:hover {
-      background-color: #f6f6f6; }
+    background-color: #f6f6f6; }
 div.row p.payment_module a span {
-      font-weight: bold;
-      color: #777777; }
+    font-weight: bold;
+    color: #777777; }
 
 .paymill-tooltip {
     margin-left: 3px;
@@ -161,4 +193,4 @@ div.row p.payment_module a span {
 #paymill_adminpage fieldset{
     margin-top: 5px;
     margin-bottom: 5px;
-}
+}