diff --git a/dotpay.css b/dotpay.css
index 1d1c0a9..7f56d22 100644
--- a/dotpay.css
+++ b/dotpay.css
@@ -1,8 +1,8 @@
 /**
  * @package Dotpay Payment Plugin module for VirtueMart v3 for Joomla! 3.4
  * @version $1.0.1: dotpay.css 2015-08-24
- * @author Dotpay SA  < tech@dotpay.pl >
- * @copyright (C) 2015 - Dotpay SA
+ * @author PayPro S.A.  < tech@dotpay.pl >
+ * @copyright (C) 2021 - PayPro S.A.
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
 **/
 
diff --git a/dotpay.php b/dotpay.php
index 8af7dc1..66badf2 100644
--- a/dotpay.php
+++ b/dotpay.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * @package Dotpay Payment Plugin module for VirtueMart v3 for Joomla! 3.4
- * @version $1.0.6: dotpay.php 2021-03-26
- * @author Dotpay sp. z o.o. < tech@dotpay.pl >
- * @copyright (C) 2021 - Dotpay sp. z o.o.
+ * @package Dotpay Payment Plugin module for VirtueMart v3 for Joomla! >= 3.4
+ * @version $1.1.0: dotpay.php 2021-09-13
+ * @author PayPro S.A.. < tech@dotpay.pl >
+ * @copyright (C) 2021 - PayPro S.A.
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
 **/
 
@@ -18,13 +18,26 @@
 class plgVmPaymentDotpay extends vmPSPlugin {
 
 	/** Version information */
-    const DP_RELDATE = '2021-03-26';
-    const DOTPAY_MODULE_VERSION = '1.0.6';
+    const DP_RELDATE = '2021-09-13';
+    const DOTPAY_MODULE_VERSION = '1.1.0';
 
 
 
 	/** Dotpay IP allowed */    
-    const DOTPAY_IP = '195.150.9.37';
+    //const DOTPAY_IP = '195.150.9.37';
+
+    const DOTPAY_IP_WHITE_LIST = array(
+        '195.150.9.37',
+        '91.216.191.181',
+        '91.216.191.182',
+        '91.216.191.183',
+        '91.216.191.184',
+        '91.216.191.185',
+        '5.252.202.255',
+      );
+
+
+
     const DP_SUPPORT_IP = '77.79.195.34';
 
 
@@ -120,10 +133,11 @@ public function renderPluginName($payment_plugin)
 			return
 				'<span class="vmCartPaymentLogo" style="width:130px; display: inline-block; text-align: center;">' .
 				'<img align="middle" src="' . JURI::root() . '/plugins/vmpayment/dotpay/'.'dp_logo_alpha_110_47.png' .
-				'"  alt="' . $name . '" /></span> ' .
+				'"  alt="' . $name . '" /></span>'.
 				parent::renderPluginName($payment_plugin);
 		}
-	
+
+
 		
     /**
      * Zwraca dane do formularza ktory przesyla je pozniej do dotpay
@@ -540,9 +554,33 @@ public function plgVmOnPaymentNotification() {
             exit('plugin error');
         }
 
+
+        $dotpay_office = false;
+        $proxy_desc ='';
+
+        if( (int)$this->getDPConf('dotpay_nonproxy') == 1) {
+            $clientIp = $_SERVER['REMOTE_ADDR'];
+            $proxy_desc = 'FALSE';
+        }else{
+            $clientIp = $this->getClientIp();
+            $proxy_desc = 'TRUE';
+        }
+
+
+
+
 // diagnostic only for customer service dotpay :
 
-        if(($_SERVER["REMOTE_ADDR"] == self::DP_SUPPORT_IP || $this->getClientIp() == self::DP_SUPPORT_IP) && strtoupper($_SERVER['REQUEST_METHOD']) == 'GET') {
+
+        if( ($clientIp == self::DP_SUPPORT_IP) && (strtoupper($_SERVER['REQUEST_METHOD']) == 'GET')) 
+        {
+                $dotpay_office = true;
+        }else{
+                $dotpay_office = false;
+        }
+
+
+        if($dotpay_office == true) {
 
 
 
@@ -556,7 +594,10 @@ public function plgVmOnPaymentNotification() {
 
                 "<br> * Dotpay module ver: ".self::DOTPAY_MODULE_VERSION.", release date: ".self::DP_RELDATE.
 				"<br>&nbsp;&nbsp;  - ID: ". $paymentMethod->dotpay_id.
-                "<br>&nbsp;&nbsp;  - Test mode: ".(bool)$this->getDPConf('fake_real').
+                "<br>&nbsp;&nbsp;  - Test mode: ".(int)$this->getDPConf('fake_real').
+                "<br />Server does not use a proxy: ".(int)$this->getDPConf('dotpay_nonproxy').
+                "<br /> REMOTE ADDRESS: ".$_SERVER['REMOTE_ADDR'].
+                
                 "<br>&nbsp;&nbsp;  - Automatyczne przekierowanie: ".$this->getDPConf('autoredirect').
                 "<br>&nbsp;&nbsp;  - Opłata dodatkowa wyboru płatności (stała): ".$this->getDPConf('cost_per_transaction').
                 "<br>&nbsp;&nbsp;  - Opłata dodatkowa zależna od wartości zamówienia (procent od zamówienia): ".$this->getDPConf('cost_percent_total')
@@ -566,11 +607,13 @@ public function plgVmOnPaymentNotification() {
    //  ---- . 
 
 
-
-        if(!$this->isIpValidated($paymentMethod)){
-            exit('Virtuemart - untrusted ip: '.$_SERVER["REMOTE_ADDR"].' ('.$this->getClientIp().')' );
+        if (!$this->isAllowedIp($clientIp, self::DOTPAY_IP_WHITE_LIST))  
+        {
+                die("Virtuemart - ERROR (REMOTE ADDRESS: ".$this->getClientIp(true)."/".$_SERVER["REMOTE_ADDR"].", PROXY:".$proxy_desc.")");
         }
 
+
+
         if (strtoupper($_SERVER['REQUEST_METHOD']) != 'POST') {
             exit("Virtuemart - ERROR (METHOD <> POST)");
         }
@@ -975,69 +1018,29 @@ private function isSingnatureValidated($post, $paymentMethod,$debug=false)
                 }
 
 
-    }
- 
- 
-     private function isSingnatureValidated2($post, $paymentMethod)
-    {
-        $string = $paymentMethod->dotpay_pin .
-            $post->get('id', '', 'STRING') .
-            $post->get('operation_number', '', 'STRING') .
-            $post->get('operation_type', '', 'STRING') .
-            $post->get('operation_status', '', 'STRING') .
-            $post->get('operation_amount', '', 'STRING') .
-            $post->get('operation_currency', '', 'STRING') .
-            $post->get('operation_withdrawal_amount', '', 'STRING') .
-            $post->get('operation_commission_amount', '', 'STRING') .
-            $post->get('is_completed', '', 'STRING') .
-            $post->get('operation_original_amount', '', 'STRING') .
-            $post->get('operation_original_currency', '', 'STRING') .
-            $post->get('operation_datetime', '', 'STRING') .
-            $post->get('operation_related_number', '', 'STRING') .
-            $post->get('control', '', 'STRING') .
-            $post->get('description', '', 'STRING') .
-            $post->get('email', '', 'STRING') .
-            $post->get('p_info', '', 'STRING') .
-            $post->get('p_email', '', 'STRING') .
-            $post->get('credit_card_issuer_identification_number', '', 'STRING') .
-            $post->get('credit_card_masked_number', '', 'STRING') .
-            $post->get('credit_card_expiration_year', '', 'STRING') .
-            $post->get('credit_card_expiration_month', '', 'STRING') .
-            $post->get('credit_card_brand_codename', '', 'STRING') .
-            $post->get('credit_card_brand_code', '', 'STRING') .
-            $post->get('credit_card_unique_identifier', '', 'STRING') .
-            $post->get('credit_card_id', '', 'STRING') .
-            $post->get('channel', '', 'STRING') .
-            $post->get('channel_country', '', 'STRING') .
-            $post->get('geoip_country', '', 'STRING') .
-            $post->get('payer_bank_account_name', '', 'STRING') .
-            $post->get('payer_bank_account', '', 'STRING') .
-            $post->get('payer_transfer_title', '', 'STRING') .
-            $post->get('blik_voucher_pin', '', 'STRING') .
-            $post->get('blik_voucher_amount', '', 'STRING') .
-            $post->get('blik_voucher_amount_used', '', 'STRING') ;
-
-
-        if($post->get('signature') == hash('sha256', $string)){
-            return true;
-        }
     }
 
+
     /**
-     * Sprawdza czy ip jest z dotpaya
-     *
-     * @param $paymentMethod
-     * @return bool
+         * Returns if the given ip is on the given whitelist.
+         *
+         * @param string $ip        The ip to check.
+         * @param array  $whitelist The ip whitelist. An array of strings.
+         *
+         * @return bool
      */
-    private function isIpValidated($paymentMethod)
+    public function isAllowedIp($ip, array $whitelist)
     {
-        if($_SERVER['REMOTE_ADDR'] == self::DOTPAY_IP || $this->getClientIp() == self::DOTPAY_IP ){
+        $ip = (string)$ip;
+        if (in_array($ip, $whitelist, true)) {
             return true;
         }
 
         return false;
     }
 
+
+
     /**
      * zapisuje order na podstawie danych z arraya
      *
@@ -1304,35 +1307,61 @@ private function geShoptHost()
     private function getInputsForm($orderData)
     {
         if (null !== $this->getPhoneDP($orderData['phone_2']) ) {
-            $phone = $this->getPhoneDP($orderData['phone_2']);
+            $phone = (string) $this->getPhoneDP($orderData['phone_2']);
         } else {
-            $phone = $this->getPhoneDP($orderData['phone_1']);
+            $phone = (string) $this->getPhoneDP($orderData['phone_1']);
         }
 
         $data = array(
-            'id'            => $orderData['dotpay_id'],
-            'amount'        => $orderData['amount'],
-            'currency'      => $orderData['currency'],
-            'control'       => $orderData['dotpay_control'].'|domain:'.$this->geShoptHost().'|VirtueMart:v'.vmVersion::$RELEASE.'|Dotpay module v:'.self::DOTPAY_MODULE_VERSION,
-            'description'   => $orderData['description'],
-            'lang'          => $orderData['lang'],
+            'id'            => (string) $orderData['dotpay_id'],
+            'amount'        => (string) $orderData['amount'],
+            'currency'      => (string)$orderData['currency'],
+            'control'       => (string) $orderData['dotpay_control'].'|domain:'.$this->geShoptHost().'|VirtueMart:v'.vmVersion::$RELEASE.'|Dotpay module v:'.self::DOTPAY_MODULE_VERSION,
+            'description'   => (string)$orderData['description'],
+            'lang'          => (string) $orderData['lang'],
             'type'          => '0',
-            'url'           => $orderData['url'],
-            'urlc'          => $orderData['urlc'],
-            'firstname'     => $this->getFirstnameDP($orderData['first_name']),
-            'lastname'      => $this->getLastnameDP($orderData['last_name']),
-            'email'         => $orderData['email'],
-            'city'          => $this->getCityDP($orderData['city']),
-            'street'        => $this->getStreetDP($orderData['address_1']),
-            'street_n1'     => $this->getStreet2DP($orderData['address_2']),            
-            'postcode'      => $this->getPostcodeDP($orderData['postcode'],$orderData['lang']),
-            'phone'         => $phone,
-            'country'       => $this->getCountryDP($orderData['country']),
-            'api_version'   => 'dev'
+            'url'           => (string) $orderData['url'],
+            'urlc'          => (string) $orderData['urlc'],
+            'firstname'     => (string) $this->getFirstnameDP($orderData['first_name']),
+            'lastname'      => (string) $this->getLastnameDP($orderData['last_name']),
+            'email'         => (string) $orderData['email'],    
+            'api_version'   => 'next',
+            'ignore_last_payment_channel' => '1'
+
         );
-    
+
+        if( null != trim($phone))
+        {
+            $data["phone"] = (string) $phone;
+        }
+        if( null != trim($this->getCountryDP($orderData['country'])))
+        {
+            $data["country"] = (string)$this->getCountryDP($orderData['country']);
+        }
+        if( null != trim($this->getPostcodeDP($orderData['postcode'],$orderData['lang'])))
+        {
+            $data["postcode"] = (string) $this->getPostcodeDP($orderData['postcode'],$orderData['lang']);
+        }
+
+        if( null != trim($this->getStreet2DP($orderData['address_2'])))
+        {
+            $data["street_n1"] = (string)$this->getStreet2DP($orderData['address_2']);
+        }
+
+        if( null != trim($this->getStreetDP($orderData['address_1'])))
+        {
+            $data["street"] = (string) $this->getStreetDP($orderData['address_1']);
+        }
+
+        if( null != trim($this->getCityDP($orderData['city'])))
+        {
+            $data["city"] = (string) $this->getCityDP($orderData['city']);
+        }
+
+
         return $data;
 
+
     }
 
 
@@ -1366,6 +1395,14 @@ private function getDPConf($what){
                 return false;
             }
         }
+        else if($what == 'dotpay_nonproxy') {
+            preg_match('/\|dotpay_nonproxy="(\d+)"\|/', $params, $get_param1);
+            if (isset($get_param1[1])){
+                return trim($get_param1[1]);
+            }else{
+                return false;
+            }
+        }
         else if($what == 'cost_per_transaction') {
             preg_match('/\|cost_per_transaction="([\d\.]+)"\|/', $params, $get_param1);
             if (isset($get_param1[1])){
@@ -1405,59 +1442,48 @@ private function getDPConf($what){
         return false;
     }
 
-
     /**
      * Generate CHK for seller and payment data
      * @param type $DotpayPin Dotpay seller PIN
      * @param array $orderData parameters of payment
      * @return string
      */
-    protected function generateCHK($orderData) {
-
-        $getinputForm = $this->getInputsForm($orderData);
-
-     $DotpayPin = $this->getDPConf('dotpay_pin');
-
-        $ChkParametersChain =
-                            $DotpayPin.
-                            (isset($getinputForm['api_version']) ? $getinputForm['api_version'] : null).
-                            (isset($getinputForm['lang']) ? $getinputForm['lang'] : null).
-                            (isset($getinputForm['id']) ? $getinputForm['id'] : null).
-                            (isset($getinputForm['amount']) ? $getinputForm['amount'] : null).
-                            (isset($getinputForm['currency']) ? $getinputForm['currency'] : null).
-                            (isset($getinputForm['description']) ? $getinputForm['description'] : null).
-                            (isset($getinputForm['control']) ? $getinputForm['control'] : null).
-                            (isset($getinputForm['channel']) ? $getinputForm['channel'] : null).
-                            (isset($getinputForm['ch_lock']) ? $getinputForm['ch_lock'] : null).
-                            (isset($getinputForm['channel_groups']) ? $getinputForm['channel_groups'] : null).
-                            (isset($getinputForm['url']) ? $getinputForm['url'] : null).
-                            (isset($getinputForm['type']) ? $getinputForm['type'] : null).
-                            (isset($getinputForm['buttontext']) ? $getinputForm['buttontext'] : null).
-                            (isset($getinputForm['urlc']) ? $getinputForm['urlc'] : null).
-                            (isset($getinputForm['firstname']) ? $getinputForm['firstname'] : null).
-                            (isset($getinputForm['lastname']) ? $getinputForm['lastname'] : null).
-                            (isset($getinputForm['email']) ? $getinputForm['email'] : null).
-                            (isset($getinputForm['street']) ? $getinputForm['street'] : null).
-                            (isset($getinputForm['street_n1']) ? $getinputForm['street_n1'] : null).
-                            (isset($getinputForm['street_n2']) ? $getinputForm['street_n2'] : null).
-                            (isset($getinputForm['state']) ? $getinputForm['state'] : null).
-                            (isset($getinputForm['addr3']) ? $getinputForm['addr3'] : null).
-                            (isset($getinputForm['city']) ? $getinputForm['city'] : null).
-                            (isset($getinputForm['postcode']) ? $getinputForm['postcode'] : null).
-                            (isset($getinputForm['phone']) ? $getinputForm['phone'] : null).
-                            (isset($getinputForm['country']) ? $getinputForm['country'] : null).
-                            (isset($getinputForm['p_info']) ? $getinputForm['p_info'] : null).
-                            (isset($getinputForm['p_email']) ? $getinputForm['p_email'] : null).
-                            (isset($getinputForm['bylaw']) ? $getinputForm['bylaw'] : null).
-                            (isset($getinputForm['personal_data']) ? $getinputForm['personal_data'] : null).
-                            (isset($getinputForm['blik_code']) ? $getinputForm['blik_code'] : null).
-                            (isset($getinputForm['ignore_last_payment_channel']) ? $getinputForm['ignore_last_payment_channel'] : null);
-
-
-        return hash('sha256',$ChkParametersChain);
-        
+    
+    
+    ## function: counts the checksum from the defined array of all parameters
+
+    public static function generateCHK($ParametersArray, $DotpayPin)
+    {
+
+        if(isset($ParametersArray['chk']))
+        {
+            unset($ParametersArray['chk']);
+        }
+
+            //sorting the parameter list
+            ksort($ParametersArray);
+            
+            // Display the semicolon separated list
+            $paramList = implode(';', array_keys($ParametersArray));
+            
+            //adding the parameter 'paramList' with sorted list of parameters to the array
+            $ParametersArray['paramsList'] = $paramList;
+            
+            //re-sorting the parameter list
+            ksort($ParametersArray);
+            
+            //json encoding  
+            $json = json_encode($ParametersArray, JSON_UNESCAPED_SLASHES);
+
+ 
+        return hash_hmac('sha256', $json, $DotpayPin, false);
+   
+       
     }
 
+
+
+
     /**
      * Na podstawie przygotowanego arraya beda renderowane inputy do formularza
      *
@@ -1467,36 +1493,16 @@ protected function generateCHK($orderData) {
  
     private function getHtmlInputs($orderData)
     {
-        $getinputForm = $this->getInputsForm($orderData);
-        $chk = $this->generateCHK($orderData);
+        $data = $this->getInputsForm($orderData);
+        $pin =  trim($this->getDPConf('dotpay_pin'));
 
-        $data = array(
-            'id'            => $orderData['dotpay_id'],
-            'amount'        => $getinputForm['amount'],
-            'currency'      => $getinputForm['currency'],
-            'control'       => $getinputForm['control'],
-            'description'   => $getinputForm['description'],
-            'lang'          => $getinputForm['lang'],
-            'type'          => 0,
-            'url'           => $getinputForm['url'],
-            'urlc'          => $getinputForm['urlc'],
-            'firstname'     => $getinputForm['firstname'],
-            'lastname'      => $getinputForm['lastname'],
-            'email'         => $getinputForm['email'],
-            'city'          => $getinputForm['city'],
-            'street'        => $getinputForm['street'],
-            'street_n1'     => $getinputForm['street_n1'],
-            'postcode'      => $getinputForm['postcode'],
-            'phone'         => $getinputForm['phone'],
-            'country'       => $getinputForm['country'],
-            'api_version'   => 'dev'
-        );
+        $chk =  $this->generateCHK($data, $pin);
 
         $html = '';
         foreach($data as $key => $value){
             $html .= '<input type="hidden" name="'.$key.'" value="'.$value.'" />';
         }
-        if(null !== $this->getDPConf('dotpay_pin')){
+        if(null !== $pin){
             $html .= '<input type="hidden" name="chk" value="'.$chk.'" />';
         }
 
@@ -1515,15 +1521,24 @@ private function getHtmlFormEnd()
         $src = JURI::root().'plugins/vmpayment/dotpay/'.'dp_logo_alpha_110_47.png';
 
         
-        $html = "<br /><b>".vmText::_('PLG_DOTPAY_REDIRECT_IMG_CLICK')."</b> <br /><br /> ".vmText::_('PLG_DOTPAY_REDIRECT_IMG_WAIT')."<br /><br />";
+        $html = "<br /><b>".vmText::_('PLG_DOTPAY_REDIRECT_IMG_CLICK')."</b> <br />";
+        if((int)$this->getDPConf('autoredirect') != 1) {
+            $html .= "<br /><br /> ".vmText::_('PLG_DOTPAY_REDIRECT_IMG_CLICK_DESCR')."<br /><br />";
+        }else{
+            $html .= "<br /><br /> ".vmText::_('PLG_DOTPAY_REDIRECT_IMG_WAIT')."<br /><br />";
+        }
+
         $html .='<input type="submit" value="" style="border: 0; background: url(\''.$src.'\') no-repeat; width: 200px; height: 100px;padding-top:10px" /> <br /><br /><br />';
         $html .='</form>';
         $html .='</div>';
 
+        if((int)$this->getDPConf('autoredirect') == 1) {
+            $html .= "<br /><br /> ".vmText::_('PLG_DOTPAY_REDIRECT_IMG_WAIT')."<br /><br />";
+            $html .= '<script type="text/javascript">';
+            $html .=    'setTimeout(function(){document.getElementsByClassName("platnosc_dotpay")[0].submit();}, 10);';
+            $html .= '</script>';
+        }
 
-        $html .= '<script type="text/javascript">';
-        $html .=    'setTimeout(function(){document.getElementsByClassName("platnosc_dotpay")[0].submit();}, 10);';
-        $html .= '</script>';
         return $html;
     }
 
diff --git a/dotpay.xml b/dotpay.xml
index 776335d..223e3d2 100644
--- a/dotpay.xml
+++ b/dotpay.xml
@@ -15,13 +15,13 @@
 			<folder>language</folder>
 	</files>
 	<name>VM Payment - Dotpay</name>
-	<creationDate>26.03.2021</creationDate>
-	<author>Dotpay sp. z o.o.</author>
-	<copyright>Copyright (C) 2021 Dotpay sp. z o.o. . All rights reserved.</copyright>
+	<creationDate>13.09.2021</creationDate>
+	<author>PayPro S.A..</author>
+	<copyright>Copyright (C) 2021 PayPro S.A.. . All rights reserved.</copyright>
 	<license>GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html</license>
 	<authorEmail>tech@dotpay.pl</authorEmail>
 	<authorUrl>http://www.dotpay.pl</authorUrl>
-	<version>1.0.6</version>
+	<version>1.1.0</version>
 	<description>PLG_DOTPAY_CONF_DESCRIPTION</description>
 
 
@@ -34,11 +34,15 @@
 		<field type="spacer" name="spacer" label="PLG_DOTPAY_CONF_SETTINGS" level="level1" />
 		<field type="spacer" />
 		<field name="dotpay_id" type="text"  label="PLG_DOTPAY_CONF_ID" description="PLG_DOTPAY_CONF_ID_DESCR" />
-		<field name="dotpay_pin" type="text"  label="PIN" description="PLG_DOTPAY_CONF_PIN_DESCR" />
-		<field name="fake_real" type="radio" default="1" label="PLG_DOTPAY_CONF_MODE" description="PLG_DOTPAY_CONF_MODE_DESCR" >
+		<field name="dotpay_pin" type="text"  label="PLG_DOTPAY_CONF_PIN" description="PLG_DOTPAY_CONF_PIN_DESCR" />
+		<field name="fake_real" type="radio" default="0" label="PLG_DOTPAY_CONF_MODE" description="PLG_DOTPAY_CONF_MODE_DESCR" >
 			<option value="0">PLG_DOTPAY_CONF_MODE_PROD</option>  
 			<option value="1">PLG_DOTPAY_CONF_MODE_TEST</option>
 		</field>
+		<field name="dotpay_nonproxy" type="radio" default="1" label="PLG_DOTPAY_CONF_NONPROXY" description="PLG_DOTPAY_CONF_NONPROXY_DESCR" >
+			<option value="0">PLG_DOTPAY_CONF_NONPROXY_YES</option>  
+			<option value="1">PLG_DOTPAY_CONF_NONPROXY_NO</option>
+		</field>
 		<field name="payment_currency" type="vmacceptedcurrency" default="" label="PLG_DOTPAY_CONF_OTHER_CURRENCY" description="PLG_DOTPAY_CONF_OTHER_CURRENCY_DESCR"/>
 		<field type="spacer" />
 		<field type="spacer" label = "PLG_DOTPAY_CONF_OTHER" default="PLG_DOTPAY_CONF_OTHER_URLC" />        
diff --git a/fields/dotpaylogo.php b/fields/dotpaylogo.php
index 25bcba5..c27f878 100644
--- a/fields/dotpaylogo.php
+++ b/fields/dotpaylogo.php
@@ -2,8 +2,8 @@
 /**
  * @package Dotpay Payment Plugin module for VirtueMart v3 for Joomla! 3.4
  * @version $1.2: dotpaylogo.php 2021-03-26
- * @author Dotpay sp. z o.o.  < tech@dotpay.pl >
- * @copyright (C) 2021 - Dotpay sp. z o.o.
+ * @author PayPro S.A..  < tech@dotpay.pl >
+ * @copyright (C) 2021 - PayPro S.A..
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
 **/
 
@@ -22,7 +22,8 @@ class JFormFieldDotpayLogo extends JFormField {
 	function getInput() {
         $src = JURI::root() . "plugins/vmpayment/dotpay/"."dp_logo_alpha_175_50.png";
 		$register_link_dotpay = '';
-        return "<a href='http://www.dotpay.pl' target='_blank'><img src=$src /></a> $register_link_dotpay 
+
+        return "<a href='http://www.dotpay.pl' target='_blank'><img src=$src /></a><div style='text-align:center;'><a href='https://github.com/dotpay/VirtueMart/releases/latest' target='_new' title='check latest version...' >version: 1.1.0 &#10162;</a></div> $register_link_dotpay 
 		<script type='text/javascript'>jQuery(document).ready(function() {jQuery('#params_dotpay_urlc_info-lbl').parents().css({'width': 'auto', 'max-width': '1000px','padding': '5px'}); jQuery('input#params_dotpay_id').attr('pattern', '[0-9]{6}');jQuery('input#params_dotpay_id').attr('maxlength', '6'); 
 		jQuery('input#params_dotpay_id').bind('keyup paste keydown', function(e) {
 			if (/\D/g.test(this.value)) {
diff --git a/language/en-GB/en-GB.plg_vmpayment_dotpay.ini b/language/en-GB/en-GB.plg_vmpayment_dotpay.ini
index 670f2b5..944ca7e 100644
--- a/language/en-GB/en-GB.plg_vmpayment_dotpay.ini
+++ b/language/en-GB/en-GB.plg_vmpayment_dotpay.ini
@@ -1,6 +1,7 @@
 PLG_DOTPAY_REDIRECT_IMG_CLICK="Pay by Dotpay:"
 PLG_DOTPAY_REDIRECT_IMG_WAIT="Redirecting to the payment page, please wait..."
 PLG_DOTPAY_REDIRECT_IMG="Pay by Dotpay"
+PLG_DOTPAY_REDIRECT_IMG_CLICK_DESCR="Click on the logo below to continue with the payment"
 PLG_DOTPAY_REDIRECT_SUCCESS="<br><b>Payment successful!</b><br>Thank you for paying by Dotpay."
 PLG_DOTPAY_REDIRECT_FAIL="<br><b>Payment didn’t succeed!</b><br>Transaction by Dotpay hasn’t been made correctly.<br>If your account has been debited you should inform merchant giving your order and transaction numbers."
 
@@ -12,14 +13,21 @@ PLG_DOTPAY_INVALID_ID="Incorrect shop ID. ID has to have 6 digits."
 PLG_DOTPAY_INVALID_PIN="Incorrect PIN. PIN has to have minimum 16 and maximum 32 characters."
 
 PLG_DOTPAY_CONF_SETTINGS="<b> Basic DOTPAY settings</b>"
-PLG_DOTPAY_CONF_ID="Shop ID"
+PLG_DOTPAY_CONF_ID="&#127380; Shop ID"
 PLG_DOTPAY_CONF_ID_DESCR="<br> <br>Dotpay shop ID which is receiver of the payment. <br> Your ID should have 6 digits, if there is less you have older account type which doesn’t support this version of plugin."
-PLG_DOTPAY_CONF_PIN="PIN"
+PLG_DOTPAY_CONF_PIN="&#128273; PIN"
 PLG_DOTPAY_CONF_PIN_DESCR=" <br> <br> Dotpay test environment is separate from production. Please enter proper account data for this environment (ID and PIN are different from those from production environment)."
-PLG_DOTPAY_CONF_MODE="Plugin mode"
+PLG_DOTPAY_CONF_MODE="&#9969; Plugin mode"
 PLG_DOTPAY_CONF_MODE_DESCR=" <br> <br> Dotpay test environment is separate from production. Please enter proper account data for this environment (ID and PIN are different from those from production environment). If you don’t have test account write an email to: administracja@dotpay.pl  "
 PLG_DOTPAY_CONF_MODE_PROD="Production mode"
 PLG_DOTPAY_CONF_MODE_TEST="Test mode (sandbox)"
+
+PLG_DOTPAY_CONF_NONPROXY="&#128187; My server does not use a proxy"
+PLG_DOTPAY_CONF_NONPROXY_DESCR="By default, we recommend that you set it on (no proxy). <br/>If you are sure otherwise or you have problems receiving confirmations about the completed payment - set it to off."
+PLG_DOTPAY_CONF_NONPROXY_YES="NO PROXY or I receive notifications"
+PLG_DOTPAY_CONF_NONPROXY_NO="WITH PROXY or notifications do not come"
+
+
 PLG_DOTPAY_CONF_OTHER="<b>Other settings </b>"
 PLG_DOTPAY_CONF_OTHER_URLC="<b>URLC settings</b>"
 PLG_DOTPAY_CONF_OTHER_CURRENCY="Available payment methods:"
diff --git a/language/pl-PL/pl-PL.plg_vmpayment_dotpay.ini b/language/pl-PL/pl-PL.plg_vmpayment_dotpay.ini
index 203cfd0..e5704b8 100644
--- a/language/pl-PL/pl-PL.plg_vmpayment_dotpay.ini
+++ b/language/pl-PL/pl-PL.plg_vmpayment_dotpay.ini
@@ -4,6 +4,7 @@ PLG_DOTPAY_CONF_DESCRIPTION="<div style='text-align:left;font-size:14px;font-wei
 PLG_DOTPAY_REDIRECT_IMG_CLICK="Opłać zamówienie poprzez Dotpay:"
 PLG_DOTPAY_REDIRECT_IMG_WAIT="Trwa przekierowanie do operatora płatności, proszę czekać..."
 PLG_DOTPAY_REDIRECT_IMG="Zapłać poprzez Dotpay"
+PLG_DOTPAY_REDIRECT_IMG_CLICK_DESCR="Kliknij w poniższe logo aby kontynuowac płatność"
 PLG_DOTPAY_REDIRECT_SUCCESS="<br><b>Płatność przebiegła pomyślnie !</b><br>Dziękujemy za dokonanie płatności za pośrednictwem Dotpay."
 PLG_DOTPAY_REDIRECT_FAIL="<br><b>Płatność nie doszła do skutku !</b><br>Transakcja za pośrednictwem Dotpay nie została przeprowadzona poprawnie.<br>Jeżeli doszło do obciążenia Twojego rachunku bankowego, prosimy o zgłoszenie tego faktu do właściciela sklepu z podaniem numeru zamówienia oraz transakcji."
 
@@ -15,14 +16,20 @@ PLG_DOTPAY_INVALID_ID="Niepoprawne ID Sklepu. ID musi posiadać 6 cyfr."
 PLG_DOTPAY_INVALID_PIN="Nieprawidłowy PIN. PIN musi posiadać minimum 16 i maksymalnie 32 znaki."
 
 PLG_DOTPAY_CONF_SETTINGS="<b> Podstawowe ustawienia DOTPAY </b>"
-PLG_DOTPAY_CONF_ID="ID sklepu Sprzedawcy"
+PLG_DOTPAY_CONF_ID="&#127380; ID sklepu Sprzedawcy"
 PLG_DOTPAY_CONF_ID_DESCR="<br> <br> ID sklepu w systemie Dotpay, na rzecz którego dokonywana jest płatność. <br> Twoje ID powinno zawierać 6 cyfr, jeśli ma  mniej znaków - oznacza to, że posiadasz stare konto, które nie jest wspierane z tą wersją wtyczki."
-PLG_DOTPAY_CONF_PIN="PIN"
+PLG_DOTPAY_CONF_PIN="&#128273; PIN"
 PLG_DOTPAY_CONF_PIN_DESCR=" <br> <br> Środowisko testowe w Dotpay jest odrębnym środowiskiem w stosunku do produkcyjnego. Wpisz zatem właściwe dane dla tego środowiska (ID oraz PIN są różne niż dla produkcyjnego)."
-PLG_DOTPAY_CONF_MODE="Tryb pracy wtyczki"
+PLG_DOTPAY_CONF_MODE="&#9969; Tryb pracy wtyczki"
 PLG_DOTPAY_CONF_MODE_DESCR=" <br> <br>Konto testowe w Dotpay jest odrębnym kontem w stosunku do konta produkcyjnego. Wpisz zatem właściwe dane dla tego konta (ID oraz PIN są różne niż dla konta produkcyjnego). Jeśli nie masz jeszcze konta testowego, napisz do nas w tej sprawie na adres: administracja@dotpay.pl  "
 PLG_DOTPAY_CONF_MODE_PROD="Tryb produkcyjny"
 PLG_DOTPAY_CONF_MODE_TEST="Tryb testowy (sandbox)"
+
+PLG_DOTPAY_CONF_NONPROXY="&#128187; Mój serwer nie korzysta z proxy"
+PLG_DOTPAY_CONF_NONPROXY_DESCR="Domyślnie zalecamy ustawić włączone (bez proxy).<br/>Jeśli jesteś pewien że Twój serwer korzysta z proxy, lub masz problemy z odbiorem potwierdzeń o dokończonej płatności - wyłącz to."
+PLG_DOTPAY_CONF_NONPROXY_YES="BEZ PROXY lub odbieram potwierdzenia płatności"
+PLG_DOTPAY_CONF_NONPROXY_NO="Z PROXY lub nie odbieram potwierdzeń"
+
 PLG_DOTPAY_CONF_OTHER="<b>Inne ustawienia </b>"
 PLG_DOTPAY_CONF_OTHER_URLC="<b>Ustawienia URLC </b>"
 PLG_DOTPAY_CONF_OTHER_CURRENCY="Akceptowalne waluty płatności:"