v1.3.1

- improving exception handling
- minor fixes

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>dotpay</name>
     <displayName><![CDATA[Dotpay Payments]]></displayName>
-    <version><![CDATA[1.3.0]]></version>
+    <version><![CDATA[1.3.1]]></version>
     <description><![CDATA[This module allows to pay via Dotpay]]></description>
     <author><![CDATA[Dotpay]]></author>
     <tab><![CDATA[payments_gateways]]></tab>

config_pl.xml

@@ -2,7 +2,7 @@
 <module>
     <name>dotpay</name>
     <displayName><![CDATA[Płatności Dotpay]]></displayName>
-    <version><![CDATA[1.3.0]]></version>
+    <version><![CDATA[1.3.1]]></version>
     <description><![CDATA[Ten moduł pozwala dokonywać płatności przy pomocy bramki płatności Dotpay]]></description>
     <author><![CDATA[Dotpay]]></author>
     <tab><![CDATA[payments_gateways]]></tab>

controllers/front/confirm.php

@@ -192,7 +192,7 @@ function (Operation $operation) use ($config, $loader) {
         } catch (ConfirmationInfoException $ex) {
             die($ex->getMessage());
         } catch (RuntimeException $ex) {
-            die('EXCEPTION! '.get_class($ex).' '.$ex->getMessage());
+            die('EXCEPTION! '.get_class($ex).' : '.$ex->getMessage());
         }
     }
 

dotpay.php

@@ -84,7 +84,7 @@ public function __construct()
     {
         $this->name = 'dotpay';
         $this->tab = 'payments_gateways';
-        $this->version = '1.3.0';
+        $this->version = '1.3.1';
         $this->author = 'Dotpay';
         $this->need_instance = 1;
         $this->is_eu_compatible = 1;

sdk/Dotpay/Exception/BadParameter/AmountException.php

@@ -22,4 +22,9 @@
  */
 class AmountException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect amount: %1';
+
 }

sdk/Dotpay/Exception/BadParameter/ApiVersionException.php

@@ -22,4 +22,8 @@
  */
 class ApiVersionException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect api version: %1';
 }

sdk/Dotpay/Exception/BadParameter/BNumberException.php

@@ -22,4 +22,8 @@
  */
 class BNumberException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect building number: %1';
 }

sdk/Dotpay/Exception/BadParameter/BankNumberException.php

@@ -22,4 +22,8 @@
  */
 class BankNumberException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect bank account number: %1';
 }

sdk/Dotpay/Exception/BadParameter/BlikCodeException.php

@@ -23,4 +23,8 @@
  */
 class BlikCodeException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect Blik code: %1';
 }

sdk/Dotpay/Exception/BadParameter/CardMaskException.php

@@ -22,4 +22,8 @@
  */
 class CardMaskException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect card mask: %1';
 }

sdk/Dotpay/Exception/BadParameter/ChannelIdException.php

@@ -22,4 +22,8 @@
  */
 class ChannelIdException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect channel id: %1';
 }

sdk/Dotpay/Exception/BadParameter/CityException.php

@@ -22,4 +22,8 @@
  */
 class CityException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect city name: %1';
 }

sdk/Dotpay/Exception/BadParameter/CountryException.php

@@ -22,4 +22,8 @@
  */
 class CountryException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect country name: %1';
 }

sdk/Dotpay/Exception/BadParameter/CurrencyException.php

@@ -22,4 +22,8 @@
  */
 class CurrencyException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect currency: %1';
 }

sdk/Dotpay/Exception/BadParameter/EmailException.php

@@ -22,4 +22,8 @@
  */
 class EmailException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect email address: %1';
 }

sdk/Dotpay/Exception/BadParameter/FirstnameException.php

@@ -22,4 +22,8 @@
  */
 class FirstnameException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect first name: %1';    
 }

sdk/Dotpay/Exception/BadParameter/IdException.php

@@ -22,4 +22,8 @@
  */
 class IdException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect seller id: %1';
 }

sdk/Dotpay/Exception/BadParameter/LanguageException.php

@@ -22,4 +22,8 @@
  */
 class LanguageException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect language: %1';
 }

sdk/Dotpay/Exception/BadParameter/LastnameException.php

@@ -22,4 +22,8 @@
  */
 class LastnameException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect last name: %1';
 }

sdk/Dotpay/Exception/BadParameter/MccException.php

@@ -22,4 +22,8 @@
  */
 class MccException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect MCC number: %1';
 }

sdk/Dotpay/Exception/BadParameter/MethodException.php

@@ -22,4 +22,8 @@
  */
 class MethodException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect method: %1';
 }

sdk/Dotpay/Exception/BadParameter/OperationNumberException.php

@@ -22,4 +22,8 @@
  */
 class OperationNumberException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect operation number: %1';
 }

sdk/Dotpay/Exception/BadParameter/OperationStatusException.php

@@ -22,4 +22,8 @@
  */
 class OperationStatusException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect operation status: %1';
 }

sdk/Dotpay/Exception/BadParameter/OperationTypeException.php

@@ -22,4 +22,8 @@
  */
 class OperationTypeException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect operation type: %1';
 }

sdk/Dotpay/Exception/BadParameter/PasswordException.php

@@ -22,4 +22,8 @@
  */
 class PasswordException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect Dotpay password';
 }

sdk/Dotpay/Exception/BadParameter/PhoneException.php

@@ -22,4 +22,8 @@
  */
 class PhoneException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect phone number: %1';
 }

sdk/Dotpay/Exception/BadParameter/PinException.php

@@ -22,4 +22,8 @@
  */
 class PinException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect seller pin';
 }

sdk/Dotpay/Exception/BadParameter/PostCodeException.php

@@ -22,4 +22,8 @@
  */
 class PostCodeException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect post code: %1';
 }

sdk/Dotpay/Exception/BadParameter/StreetException.php

@@ -22,4 +22,8 @@
  */
 class StreetException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect street: %1';
 }

sdk/Dotpay/Exception/BadParameter/UrlException.php

@@ -22,4 +22,8 @@
  */
 class UrlException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect url address: %1';
 }

sdk/Dotpay/Exception/BadParameter/UsernameException.php

@@ -22,4 +22,8 @@
  */
 class UsernameException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Incorrect Dotpay username: %1';
 }

sdk/Dotpay/Exception/BadReturn/TypeNotCompatibleException.php

@@ -22,4 +22,8 @@
  */
 class TypeNotCompatibleException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Returned type is not compatible with an expected type. Details: %1';
 }

sdk/Dotpay/Exception/DotpayException.php

@@ -22,4 +22,21 @@
  */
 class DotpayException extends \RuntimeException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'An error with Dotpay translations has been occured. Details: %1';
+
+    /**
+     * Initialize locale exception.
+     *
+     * @param string     $message  Details of exception
+     * @param int        $code     Code of exception
+     * @param \Exception $previous The previous exception used for the exception chaining
+     */
+    public function __construct($message = '', $code = 0, $previous = null)
+    {
+        parent::__construct(str_replace('%1', $message, static::MESSAGE), $code, $previous);
+    }
+
 }

sdk/Dotpay/Exception/FileNotFoundException.php

@@ -22,4 +22,8 @@
  */
 class FileNotFoundException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = "File '%1' is not found";
 }

sdk/Dotpay/Exception/IncompleteDataException.php

@@ -22,4 +22,8 @@
  */
 class IncompleteDataException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Given data is incompleted';
 }

sdk/Dotpay/Exception/Loader/EmptyObjectNameException.php

@@ -22,4 +22,8 @@
  */
 class EmptyObjectNameException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception
+     */
+    const MESSAGE = "Name of the object '%1' is empty";
 }

sdk/Dotpay/Exception/Loader/ObjectNotFoundException.php

@@ -22,4 +22,8 @@
  */
 class ObjectNotFoundException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception
+     */
+    const MESSAGE = "Object '%1' is not found";
 }

sdk/Dotpay/Exception/Loader/ParamNotFoundException.php

@@ -22,4 +22,8 @@
  */
 class ParamNotFoundException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception
+     */
+    const MESSAGE = "Param '%1' is not found";
 }

sdk/Dotpay/Exception/Loader/XmlNotFoundException.php

@@ -24,4 +24,8 @@
  */
 class XmlNotFoundException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = "XML file  '%1' is not found";
 }

sdk/Dotpay/Exception/Processor/ConfirmationDataException.php

@@ -22,4 +22,8 @@
  */
 class ConfirmationDataException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Error with confirmation data from Dotpay server: %1';
 }

sdk/Dotpay/Exception/Processor/ConfirmationInfoException.php

@@ -22,4 +22,8 @@
  */
 class ConfirmationInfoException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Access denied: %1';
 }

sdk/Dotpay/Exception/Processor/IncorrectRequestException.php

@@ -22,4 +22,8 @@
  */
 class IncorrectRequestException extends \Dotpay\Exception\DotpayException
 {
+    /**
+     * Message of error thrown by the exception.
+     */
+    const MESSAGE = 'Error with confirmation data from Dotpay server: %1';
 }