Fixed problem with unconfigured module

PAYONE-GmbH · Nov 7, 2016 · b5a990c · b5a990c
1 parent a5b83a8
commit b5a990c
Show file tree

Hide file tree

Showing 7 changed files with 350 additions and 343 deletions.
diff --git a/Helper/HostedIframe.php b/Helper/HostedIframe.php
@@ -96,18 +96,20 @@ protected function getFieldConfigField($sName, $sParamPrefix)
         $aHostedParams = $this->getHostedParams();
 
         $aField = [];
-        $aField['selector'] = $sName;
-        $aField['type'] = $aHostedParams[$sParamPrefix.'_type'];
-        $aField['size'] = $aHostedParams[$sParamPrefix.'_count'];
-        $aField['maxlength'] = $aHostedParams[$sParamPrefix.'_max'];
-        if ($aHostedParams[$sParamPrefix.'_style'] == "custom") {
-            $aField['style'] = $aHostedParams[$sParamPrefix.'_css'];
-        }
-        if ($aHostedParams[$sParamPrefix.'_iframe'] == "custom") {
-            $aField['iframe'] = [
-                'width' => $aHostedParams[$sParamPrefix.'_width'],
-                'height' => $aHostedParams[$sParamPrefix.'_height'],
-            ];
+        if (!empty($aHostedParams)) {
+            $aField['selector'] = $sName;
+            $aField['type'] = $aHostedParams[$sParamPrefix.'_type'];
+            $aField['size'] = $aHostedParams[$sParamPrefix.'_count'];
+            $aField['maxlength'] = $aHostedParams[$sParamPrefix.'_max'];
+            if ($aHostedParams[$sParamPrefix.'_style'] == "custom") {
+                $aField['style'] = $aHostedParams[$sParamPrefix.'_css'];
+            }
+            if ($aHostedParams[$sParamPrefix.'_iframe'] == "custom") {
+                $aField['iframe'] = [
+                    'width' => $aHostedParams[$sParamPrefix.'_width'],
+                    'height' => $aHostedParams[$sParamPrefix.'_height'],
+                ];
+            }
         }
         return $aField;
     }
@@ -157,11 +159,13 @@ public function getHostedFieldConfig()
         $aHostedParams = $this->getHostedParams();// get hosted params from config
 
         $aFieldConfig = [];
-        $aFieldConfig['fields'] = $this->getFieldConfig();// generate config for all field types
-        $aFieldConfig['defaultStyle'] = $this->getDefaultStyles($aHostedParams);
-        if ($aHostedParams['Errors_active'] == "true") {
-            $aFieldConfig['error'] = 'errorOutput';// area to display error-messages (optional)
-            $aFieldConfig['language'] = $aHostedParams['Errors_lang'];// has to be defined in javascript
+        if (!empty($aHostedParams)) {
+            $aFieldConfig['fields'] = $this->getFieldConfig();// generate config for all field types
+            $aFieldConfig['defaultStyle'] = $this->getDefaultStyles($aHostedParams);
+            if ($aHostedParams['Errors_active'] == "true") {
+                $aFieldConfig['error'] = 'errorOutput';// area to display error-messages (optional)
+                $aFieldConfig['language'] = $aHostedParams['Errors_lang'];// has to be defined in javascript
+            }
         }
         return $aFieldConfig;
     }

diff --git a/Model/PayoneConfig.php b/Model/PayoneConfig.php
@@ -32,7 +32,7 @@
 abstract class PayoneConfig
 {
     /* Module version */
-    const MODULE_VERSION = '1.2.2';
+    const MODULE_VERSION = '%%VERSION%%';
 
     /* Authorization request types */
     const REQUEST_TYPE_PREAUTHORIZATION = 'preauthorization';

diff --git a/README.md b/README.md
@@ -1,75 +1,75 @@
-# PAYMENT FOR YOUR MAGENTO-SHOP
-
-Are you looking for the ideal payment solution for your online shop?
-With PAYONE, you process all of your payment transactions through a single partner - even international payments. From the acceptance of new payment methods through risk management to payment flow control, you get payment processing and all financial services with just one contract. At the same time, you benefit from the highest security standards since PAYONE, as a PCI DSS certified and BaFin regulated payment institution, processes all payment services via insolvency-proof escrow accounts. One solution. All the possibilities.
-
-##Payment with PAYONE convinces
-
-
-###Simple & efficient
-One Partner. One contract. One payment.
-
-* All payment methods: 
-All relevant payment methods through a central plattform. National and international.
-
-* Integrated risk management: 
-Minimise your payment defaults and prevent fraud. For more profitability.
-
-* Automation of all payment processes: 
-Automation of the entire payment process chain from payment processing through to all financial services.
-
-* Genuine plug'n pay: 
-Quick and seamless integration into your e-commerce system thanks to software as a service solution.
-
-* Modular solutions: 
-Thanks to the modular structure, the payment solution can be flexibly tailored to your business model.
-
-* Proficient customer service: 
-Our experts are there for you and support you with your e-commerce project.
-
-* Payment competence: 
-More than 12 years of know-how. More than 3,000 customers. More than 100 dedicated employees. 
-
-
-
-##Important functions for Magento
-
-* Seamless integration of Magento's OnePage Checkout
-* Very wide range of functions, simple and comprehensible supported by detailed online help
-* Central configuration and management options on the Magento Admin Panel
-* Export function of the configuration in XML format to facilitate the technical support
-* Optional multi-partial capture for partial deliveries
-* Supports the multi-shipping extension
-* Supports simplified PCI DSS conformity in accordance with SAQ A
-
-
-
-##More information
-
-Documentation for Magento: http://www.payone.de/uploads/media/PAYONE_Documentation_Magento-Payment-Extension.pdf
-
-Videoguide: Installation and configuration: https://www.youtube.com/playlist?list=PLlzKa20PSzukaPBvUhxxpo3oqNs0mUkpa
-
-More information about Magento on https://www.payone.de/magento
-
-##Contact
-
-PAYONE GmbH
-Fraunhoferstraße 2–4
-24118 Kiel, Germany
-
-Phone +49 431 25968-400
-Fax +49 431 25968-1400
-
-[email protected]
-www.payone.de/magento
-
-##License
-
-See our License Agreement at: https://www.payone.de/fileadmin/downloads/sonstiges/PAYONE_Haftungs_und_Lizenzvereinbarung_Extensions.pdf
-
-##About PAYONE
-
-PAYONE, with headquarters in Kiel, is one of the leading payment services providers in Europe and ranks among the 50 fastest-growing technology companies in Germany. With its modular platform, PAYONE offers a software-as-a-service solution (SaaS) to companies for fully automated and comprehensive processing of all payments in e-commerce. The range of services includes the processing of payments from over 30 national and international payment methods with integrated risk management to minimise defaults in payment and fraud. Additional product modules make it possible to outsource the management of accounts receivable, the issuing of invoices as well as the processing of subscriptions. Standardised interfaces allow for a straightforward integration into existing IT and mobile system environments. Extensions can also be easily integrated into e-commerce systems.
-
-PAYONE is a company of the Saving Banks Finance Group and ist registered as a Payment Institute. Its clients include over 3,000 e-commerce companies from a variety of sectors and countries, including well-known companies such as Immonet, Globetrotter Ausrüstung, HD PLUS, Fujitsu, Zalando, Hawesko, Sony Music and Hallhuber. PAYONE has more than 100 employees.
+# PAYMENT FOR YOUR MAGENTO-SHOP
+
+Are you looking for the ideal payment solution for your online shop?
+With PAYONE, you process all of your payment transactions through a single partner - even international payments. From the acceptance of new payment methods through risk management to payment flow control, you get payment processing and all financial services with just one contract. At the same time, you benefit from the highest security standards since PAYONE, as a PCI DSS certified and BaFin regulated payment institution, processes all payment services via insolvency-proof escrow accounts. One solution. All the possibilities.
+
+##Payment with PAYONE convinces
+
+
+###Simple & efficient
+One Partner. One contract. One payment.
+
+* All payment methods: 
+All relevant payment methods through a central plattform. National and international.
+
+* Integrated risk management: 
+Minimise your payment defaults and prevent fraud. For more profitability.
+
+* Automation of all payment processes: 
+Automation of the entire payment process chain from payment processing through to all financial services.
+
+* Genuine plug'n pay: 
+Quick and seamless integration into your e-commerce system thanks to software as a service solution.
+
+* Modular solutions: 
+Thanks to the modular structure, the payment solution can be flexibly tailored to your business model.
+
+* Proficient customer service: 
+Our experts are there for you and support you with your e-commerce project.
+
+* Payment competence: 
+More than 12 years of know-how. More than 3,000 customers. More than 100 dedicated employees. 
+
+
+
+##Important functions for Magento
+
+* Seamless integration of Magento's OnePage Checkout
+* Very wide range of functions, simple and comprehensible supported by detailed online help
+* Central configuration and management options on the Magento Admin Panel
+* Export function of the configuration in XML format to facilitate the technical support
+* Optional multi-partial capture for partial deliveries
+* Supports the multi-shipping extension
+* Supports simplified PCI DSS conformity in accordance with SAQ A
+
+
+
+##More information
+
+Documentation for Magento: http://www.payone.de/uploads/media/PAYONE_Documentation_Magento-Payment-Extension.pdf
+
+Videoguide: Installation and configuration: https://www.youtube.com/playlist?list=PLlzKa20PSzukaPBvUhxxpo3oqNs0mUkpa
+
+More information about Magento on https://www.payone.de/magento
+
+##Contact
+
+PAYONE GmbH
+Fraunhoferstraße 2–4
+24118 Kiel, Germany
+
+Phone +49 431 25968-400
+Fax +49 431 25968-1400
+
+[email protected]
+www.payone.de/magento
+
+##License
+
+See our License Agreement at: https://www.payone.de/fileadmin/downloads/sonstiges/PAYONE_Haftungs_und_Lizenzvereinbarung_Extensions.pdf
+
+##About PAYONE
+
+PAYONE, with headquarters in Kiel, is one of the leading payment services providers in Europe and ranks among the 50 fastest-growing technology companies in Germany. With its modular platform, PAYONE offers a software-as-a-service solution (SaaS) to companies for fully automated and comprehensive processing of all payments in e-commerce. The range of services includes the processing of payments from over 30 national and international payment methods with integrated risk management to minimise defaults in payment and fraud. Additional product modules make it possible to outsource the management of accounts receivable, the issuing of invoices as well as the processing of subscriptions. Standardised interfaces allow for a straightforward integration into existing IT and mobile system environments. Extensions can also be easily integrated into e-commerce systems.
+
+PAYONE is a company of the Saving Banks Finance Group and ist registered as a Payment Institute. Its clients include over 3,000 e-commerce companies from a variety of sectors and countries, including well-known companies such as Immonet, Globetrotter Ausrüstung, HD PLUS, Fujitsu, Zalando, Hawesko, Sony Music and Hallhuber. PAYONE has more than 100 employees.
diff --git a/composer.json b/composer.json
@@ -22,4 +22,4 @@
             "Payone\\Core\\": ""
         }
     }
-}
+}
diff --git a/etc/config.xml b/etc/config.xml
@@ -211,6 +211,9 @@
                 <payone_billsafe>a:1:{s:23:"_payone_status_mapping4";a:2:{s:8:"txaction";s:9:"appointed";s:12:"state_status";s:10:"processing";}}</payone_billsafe>
                 <payone_klarna>a:1:{s:23:"_payone_status_mapping2";a:2:{s:8:"txaction";s:9:"appointed";s:12:"state_status";s:10:"processing";}}</payone_klarna>
             </statusmapping>
+            <creditcard>
+                <cc_template>a:30:{s:11:"Number_type";s:3:"tel";s:12:"Number_count";s:2:"30";s:10:"Number_max";s:2:"16";s:13:"Number_iframe";s:8:"standard";s:12:"Number_style";s:8:"standard";s:8:"CVC_type";s:3:"tel";s:9:"CVC_count";s:2:"30";s:7:"CVC_max";s:1:"4";s:10:"CVC_iframe";s:8:"standard";s:9:"CVC_style";s:8:"standard";s:10:"Month_type";s:6:"select";s:11:"Month_count";s:1:"3";s:9:"Month_max";s:1:"2";s:12:"Month_iframe";s:6:"custom";s:11:"Month_width";s:5:"120px";s:12:"Month_height";s:4:"20px";s:11:"Month_style";s:8:"standard";s:9:"Year_type";s:6:"select";s:10:"Year_count";s:1:"5";s:8:"Year_max";s:1:"4";s:11:"Year_iframe";s:6:"custom";s:10:"Year_width";s:5:"120px";s:11:"Year_height";s:4:"20px";s:10:"Year_style";s:8:"standard";s:14:"Standard_input";s:108:"width:223px;height:30px;padding: 0 9px;font-size:14px;font-family:'Helvetica Neue',Verdana,Arial,sans-serif;";s:18:"Standard_selection";s:12:"width:100px;";s:12:"Iframe_width";s:5:"365px";s:13:"Iframe_height";s:4:"30px";s:13:"Errors_active";s:5:"false";s:11:"Errors_lang";s:2:"de";}</cc_template>
+            </creditcard>
         </payone_general>
         <payone_payment>
             <payone_cash_on_delivery>

diff --git a/etc/module.xml b/etc/module.xml
@@ -25,5 +25,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Payone_Core" setup_version="1.2.2" />
+    <module name="Payone_Core" setup_version="%%VERSION%%" />
 </config>
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ @@
                 "Payone\\Core\\": ""
             }
         }
-    }
+    }