Release v3.0.21

.htaccess

@@ -0,0 +1,14 @@
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+   <Files *.php>
+   order allow,deny
+   deny from all
+   </Files>
+</IfModule>
+
+# Apache 2.4
+<IfModule mod_authz_core.c>
+   <Files *.php>
+   Require all denied
+   </Files>
+</IfModule>

CHANGELOG.md

@@ -169,4 +169,9 @@
 ## [3.2.20]
 - One page checkout compatibility improvements
 - Multiple payment transaction and total price fix
-- Carriers error handling improvements
+
+## [3.2.21]
+- Fixed label printing error and 0 goods price displaying
+- Improved price calculation
+- Fixed issues with carrier shown as "Free" when it is not needed to display
+- Carriers error handling improvements

config/config.yml

@@ -16,6 +16,7 @@ imports:
   - { resource: command.yml }
   - { resource: presenter.yml }
   - { resource: templateRender.yml }
+  - { resource: verification.yml }
 
 services:
   _defaults:

config/verification.yml

@@ -0,0 +1,12 @@
+services:
+  _defaults:
+    public: true
+
+  invertus.dpdbaltics.verification.is_address_in_zone:
+    class: 'Invertus\dpdBaltics\Verification\IsAddressInZone'
+    arguments:
+      - '@invertus.dpdbaltics.repository.zone_range_repository'
+      - '@invertus.dpdbaltics.verification.is_address_in_range'
+
+  invertus.dpdbaltics.verification.is_address_in_range:
+    class: 'Invertus\dpdBaltics\Verification\IsAddressInRange'

controllers/admin/AdminDPDAjaxOnBoardController.php

@@ -19,6 +19,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDAjaxOnBoardController extends AbstractAdminController
 {
     /**

controllers/admin/AdminDPDBalticsAddressTemplateController.php

@@ -32,6 +32,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsAddressTemplateController extends AbstractAdminController
 {
 

controllers/admin/AdminDPDBalticsAjaxController.php

@@ -21,6 +21,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsAjaxController extends AbstractAdminController
 {
     public function ajaxProcessImportZones()

controllers/admin/AdminDPDBalticsAjaxShipmentsController.php

@@ -33,6 +33,10 @@
 
 require_once dirname(__DIR__) . '/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsAjaxShipmentsController extends AbstractAdminController
 {
     protected $ajaxActions = ['save', 'save_and_print', 'updateAddressBlock', 'getProductPriceByID', 'print'];

controllers/admin/AdminDPDBalticsCollectionRequestController.php

@@ -18,8 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
-
 use Invertus\dpdBaltics\Builder\Template\Admin\PhoneInputBuilder;
 use Invertus\dpdBaltics\Controller\AbstractAdminController;
 use Invertus\dpdBaltics\Converter\FormDataConverter;
@@ -34,6 +32,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsCollectionRequestController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsCourierRequestController.php

@@ -36,6 +36,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsCourierRequestController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsImportExportController.php

@@ -40,6 +40,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsImportExportController extends AbstractAdminController
 {
     public function init()

controllers/admin/AdminDPDBalticsLogsController.php

@@ -18,12 +18,14 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
-
 use Invertus\dpdBaltics\Controller\AbstractAdminController;
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsLogsController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsModuleController.php

@@ -18,11 +18,14 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 use Invertus\dpdBaltics\Infrastructure\Bootstrap\ModuleTabs;
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsModuleController extends ModuleAdminController
 {
     public function postProcess()

controllers/admin/AdminDPDBalticsOrderReturnController.php

@@ -18,12 +18,14 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
-
 use Invertus\dpdBaltics\Controller\AbstractAdminController;
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsOrderReturnController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsPriceRulesController.php

@@ -21,6 +21,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsPriceRulesController extends AbstractAdminController
 {
     /** @var  DPDPriceRule */

controllers/admin/AdminDPDBalticsProductsAvailabilityController.php

@@ -18,6 +18,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsProductsAvailabilityController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsProductsController.php

@@ -19,6 +19,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsProductsController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsPudoAjaxController.php

@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 use Invertus\dpdBaltics\Config\Config;
 use Invertus\dpdBaltics\Controller\AbstractAdminController;
 use Invertus\dpdBaltics\Provider\CurrentCountryProvider;
@@ -29,6 +28,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsPudoAjaxController extends AbstractAdminController
 {
     public function postProcess()

controllers/admin/AdminDPDBalticsRequestSupportController.php

@@ -17,6 +17,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsRequestSupportController extends AbstractAdminController
 {
     public function postProcess()

controllers/admin/AdminDPDBalticsSettingsController.php

@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 use Invertus\dpdBaltics\Builder\Template\Admin\InfoBlockBuilder;
 use Invertus\dpdBaltics\Collection\DPDProductInstallCollection;
 use Invertus\dpdBaltics\Config\Config;
@@ -37,6 +36,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsSettingsController extends AbstractAdminController
 {
     private const FILE_NAME = 'AdminDPDBalticsSettingsController';

controllers/admin/AdminDPDBalticsShipmentController.php

@@ -18,12 +18,14 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
-
 use Invertus\dpdBaltics\Controller\AbstractAdminController;
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsShipmentController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsShipmentSettingsController.php

@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 use Invertus\dpdBaltics\Config\Config;
 use Invertus\dpdBaltics\Controller\AbstractAdminController;
 use Invertus\dpdBaltics\Infrastructure\Bootstrap\ModuleTabs;
@@ -32,6 +31,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsShipmentSettingsController extends AbstractAdminController
 {
     public function __construct()

controllers/admin/AdminDPDBalticsZonesController.php

@@ -27,6 +27,10 @@
 
 require_once dirname(__DIR__).'/../vendor/autoload.php';
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminDPDBalticsZonesController extends AbstractAdminController
 {
     /**

controllers/front/Ajax.php

@@ -28,6 +28,10 @@
 use Invertus\dpdBalticsApi\Exception\DPDBalticsAPIException;
 use Symfony\Component\HttpFoundation\Response;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class DpdBalticsAjaxModuleFrontController extends ModuleFrontController
 {
     const FILENAME = 'Ajax';

controllers/front/CronJob.php

@@ -18,11 +18,14 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 use Invertus\dpdBaltics\Config\Config;
 use Invertus\dpdBaltics\Provider\ZoneRangeProvider;
 use Invertus\dpdBaltics\Service\Import\API\ParcelShopImport;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class DpdbalticsCronJobModuleFrontController extends ModuleFrontController
 {
     public function postProcess()

controllers/front/ShipmentReturn.php

@@ -18,14 +18,17 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 use Invertus\dpdBaltics\Config\Config;
 use Invertus\dpdBaltics\Repository\ShipmentRepository;
 use Invertus\dpdBaltics\Service\API\LabelApiService;
 use Invertus\dpdBaltics\Service\Exception\ExceptionService;
 use Invertus\dpdBaltics\Service\ShipmentService;
 use Invertus\dpdBalticsApi\Exception\DPDBalticsAPIException;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class DpdbalticsShipmentReturnModuleFrontController extends ModuleFrontController
 {
     const FILENAME = 'ShipmentReturn';