Refactoring services #885

common/components/BusinessLogicTrait.php

@@ -4,7 +4,7 @@ namespace common\components;
 
 use common\logic\Config\TaxRate\TaxRateContainer;
 use common\logic\Config\TaxRate\TaxRateManager;
-use common\logic\Distribution\Distribution\DistributionManager;
+use common\logic\Distribution\Distribution\Wrapper\DistributionManager;
 use common\logic\Distribution\Distribution\Wrapper\DistributionContainer;
 use common\logic\Distribution\PointSaleDistribution\Wrapper\PointSaleDistributionContainer;
 use common\logic\Distribution\PointSaleDistribution\Wrapper\PointSaleDistributionManager;

common/logic/Config/TaxRate/TaxRate.php → common/logic/Config/TaxRate/Model/TaxRate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace common\logic\Config\TaxRate;
+namespace common\logic\Config\TaxRate\Model;
 
 use common\components\ActiveRecordCommon;
 

common/logic/Config/TaxRate/TaxRateRepository.php → common/logic/Config/TaxRate/Repository/TaxRateRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace common\logic\Config\TaxRate;
+namespace common\logic\Config\TaxRate\Repository;
 
 use common\logic\AbstractRepository;
 

common/logic/Config/TaxRate/TaxRateRepositoryQuery.php → common/logic/Config/TaxRate/Repository/TaxRateRepositoryQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace common\logic\Config\TaxRate;
+namespace common\logic\Config\TaxRate\Repository;
 
 use common\logic\AbstractRepositoryQuery;
 

common/logic/Config/TaxRate/TaxRateBuilder.php → common/logic/Config/TaxRate/Service/TaxRateBuilder.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace common\logic\Config\TaxRate;
+namespace common\logic\Config\TaxRate\Service;
 
 use common\logic\AbstractBuilder;
+use common\logic\Config\TaxRate\Model\TaxRate;
 
 class TaxRateBuilder extends AbstractBuilder
 {

common/logic/Config/TaxRate/TaxRateContainer.php → common/logic/Config/TaxRate/Wrapper/TaxRateContainer.php

@@ -1,8 +1,11 @@
 <?php
 
-namespace common\logic\Config\TaxRate;
+namespace common\logic\Config\TaxRate\Wrapper;
 
 use common\logic\AbstractContainer;
+use common\logic\Config\TaxRate\Model\TaxRate;
+use common\logic\Config\TaxRate\Repository\TaxRateRepository;
+use common\logic\Config\TaxRate\Service\TaxRateBuilder;
 
 class TaxRateContainer extends AbstractContainer
 {

common/logic/Config/TaxRate/TaxRateManager.php → common/logic/Config/TaxRate/Wrapper/TaxRateManager.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace common\logic\Config\TaxRate;
+namespace common\logic\Config\TaxRate\Wrapper;
 
 use common\logic\AbstractManager;
+use common\logic\Config\TaxRate\Repository\TaxRateRepository;
+use common\logic\Config\TaxRate\Service\TaxRateBuilder;
 
 /**
  * @mixin TaxRateRepository

common/logic/Distribution/Distribution/Service/DistributionBuilder.php

@@ -6,12 +6,16 @@ use common\logic\AbstractBuilder;
 use common\logic\Distribution\Distribution\Event\DistributionActiveEvent;
 use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\Distribution\Repository\DistributionRepository;
+use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
 use common\logic\Distribution\PointSaleDistribution\Repository\PointSaleDistributionRepository;
 use common\logic\Distribution\PointSaleDistribution\Service\PointSaleDistributionBuilder;
+use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
 use common\logic\Distribution\ProductDistribution\Repository\ProductDistributionRepository;
 use common\logic\Distribution\ProductDistribution\Service\ProductDistributionBuilder;
 use common\logic\Order\Order\Repository\OrderRepository;
 use common\logic\Order\ProductOrder\Service\ProductOrderBuilder;
+use common\logic\PointSale\PointSale\Model\PointSale;
+use common\logic\Product\Product\Model\Product;
 use common\logic\Product\Product\Repository\ProductRepository;
 use common\logic\User\UserProducer\Repository\UserProducerRepository;
 

common/logic/Distribution/Distribution/Service/DistributionSolver.php

@@ -5,8 +5,8 @@ namespace common\logic\Distribution\Distribution\Service;
 use common\helpers\GlobalParam;
 use common\logic\AbstractService;
 use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\PointSale\PointSale\PointSale;
-use common\logic\Product\Product\Product;
+use common\logic\PointSale\PointSale\Model\PointSale;
+use common\logic\Product\Product\Model\Product;
 use common\logic\SolverInterface;
 
 class DistributionSolver extends AbstractService implements SolverInterface

common/logic/Distribution/Distribution/Wrapper/DistributionManager.php

@@ -1,12 +1,11 @@
 <?php
 
-namespace common\logic\Distribution\Distribution;
+namespace common\logic\Distribution\Distribution\Wrapper;
 
 use common\logic\AbstractManager;
 use common\logic\Distribution\Distribution\Repository\DistributionRepository;
 use common\logic\Distribution\Distribution\Service\DistributionBuilder;
 use common\logic\Distribution\Distribution\Service\DistributionSolver;
-use common\logic\Distribution\Distribution\Wrapper\DistributionContainer;
 
 /**
  * @mixin DistributionSolver

common/logic/Distribution/PointSaleDistribution/Model/PointSaleDistribution.php

@@ -40,7 +40,7 @@ namespace common\logic\Distribution\PointSaleDistribution\Model;
 
 use common\components\ActiveRecordCommon ;
 use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\PointSale\PointSale\PointSale;
+use common\logic\PointSale\PointSale\Model\PointSale;
 
 class PointSaleDistribution extends ActiveRecordCommon
 {

common/logic/Distribution/PointSaleDistribution/Repository/PointSaleDistributionRepository.php

@@ -5,7 +5,7 @@ namespace common\logic\Distribution\PointSaleDistribution\Repository;
 use common\logic\AbstractRepository;
 use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
-use common\logic\PointSale\PointSale\PointSale;
+use common\logic\PointSale\PointSale\Model\PointSale;
 
 class PointSaleDistributionRepository extends AbstractRepository
 {

common/logic/Distribution/PointSaleDistribution/Service/PointSaleDistributionBuilder.php

@@ -7,6 +7,7 @@ use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\Distribution\Repository\DistributionRepository;
 use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
 use common\logic\Distribution\PointSaleDistribution\Repository\PointSaleDistributionRepository;
+use common\logic\PointSale\PointSale\Model\PointSale;
 use common\logic\PointSale\PointSale\Repository\PointSaleRepository;
 
 class PointSaleDistributionBuilder extends AbstractBuilder

common/logic/Distribution/ProductDistribution/Model/ProductDistribution.php

@@ -40,7 +40,7 @@ namespace common\logic\Distribution\ProductDistribution\Model;
 
 use common\components\ActiveRecordCommon ;
 use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\Product\Product\Product;
+use common\logic\Product\Product\Model\Product;
 
 class ProductDistribution extends ActiveRecordCommon
 {

common/logic/Distribution/ProductDistribution/Repository/ProductDistributionRepository.php

@@ -5,7 +5,7 @@ namespace common\logic\Distribution\ProductDistribution\Repository;
 use common\logic\AbstractRepository;
 use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
-use common\logic\Product\Product\Product;
+use common\logic\Product\Product\Model\Product;
 
 class ProductDistributionRepository extends AbstractRepository
 {

common/logic/Document/DeliveryNote/Model/DeliveryNote.php

@@ -38,7 +38,7 @@
 
 namespace common\logic\Document\DeliveryNote\Model;
 
-use common\logic\Document\Document\Document;
+use common\logic\Document\Document\Model\Document;
 
 class DeliveryNote extends Document
 {

common/logic/Document/DeliveryNote/Service/DeliveryNoteBuilder.php

@@ -3,7 +3,7 @@
 namespace common\logic\Document\DeliveryNote\Service;
 
 use common\logic\Document\DeliveryNote\Model\DeliveryNote;
-use common\logic\Document\Document\DocumentBuilder;
+use common\logic\Document\Document\Service\DocumentBuilder;
 
 class DeliveryNoteBuilder extends DocumentBuilder
 {

common/logic/Document/DeliveryNote/Service/DeliveryNoteSolver.php

@@ -3,8 +3,8 @@
 namespace common\logic\Document\DeliveryNote\Service;
 
 use common\logic\Document\DeliveryNote\Model\DeliveryNote;
-use common\logic\Document\Document\DocumentSolver;
-use common\logic\Document\Invoice\Invoice;
+use common\logic\Document\Document\Service\DocumentSolver;
+use common\logic\Document\Invoice\Model\Invoice;
 use common\logic\SolverInterface;
 
 class DeliveryNoteSolver extends DocumentSolver implements SolverInterface

common/logic/Document/DeliveryNote/Wrapper/DeliveryNoteManager.php

@@ -5,7 +5,7 @@ namespace common\logic\Document\DeliveryNote\Wrapper;
 use common\logic\Document\DeliveryNote\Repository\DeliveryNoteRepository;
 use common\logic\Document\DeliveryNote\Service\DeliveryNoteBuilder;
 use common\logic\Document\DeliveryNote\Service\DeliveryNoteSolver;
-use common\logic\Document\Document\DocumentManager;
+use common\logic\Document\Document\Wrapper\DocumentManager;
 
 /**
  * @mixin DeliveryNoteSolver

common/logic/Document/Document/Service/DocumentSolver.php

@@ -6,8 +6,8 @@ use common\helpers\Price;
 use common\logic\AbstractService;
 use common\logic\Document\Document\Model\Document;
 use common\logic\Document\Document\Model\DocumentInterface;
-use common\logic\Order\Order\Order;
-use common\logic\PointSale\PointSale\PointSale;
+use common\logic\Order\Order\Model\Order;
+use common\logic\PointSale\PointSale\Model\PointSale;
 use common\logic\SolverInterface;
 
 class DocumentSolver extends AbstractService implements SolverInterface

common/logic/Document/Document/Wrapper/DocumentManager.php

@@ -3,6 +3,9 @@
 namespace common\logic\Document\Document\Wrapper;
 
 use common\logic\AbstractManager;
+use common\logic\Document\Document\Service\DocumentBuilder;
+use common\logic\Document\Document\Service\DocumentSolver;
+use common\logic\Document\Document\Service\DocumentUtils;
 
 /**
  * @mixin DocumentSolver

common/logic/Document/Quotation/Model/Quotation.php

@@ -45,7 +45,6 @@ use common\logic\Document\Document\Model\Document;
  */
 class Quotation extends Document
 {
-
     /**
      * @inheritdoc
      */

common/logic/Order/Order/Service/OrderBuilder.php

@@ -6,7 +6,7 @@ use common\helpers\GlobalParam;
 use common\helpers\MeanPayment;
 use common\helpers\Price;
 use common\logic\AbstractBuilder;
-use common\logic\Config\TaxRate\TaxRate;
+use common\logic\Config\TaxRate\Model\TaxRate;
 use common\logic\Distribution\Distribution\Repository\DistributionRepository;
 use common\logic\Document\Document\Model\Document;
 use common\logic\Order\Order\Model\Order;

common/logic/Order/Order/Service/OrderSolver.php

@@ -12,7 +12,6 @@ use common\logic\User\User\Model\User;
 use common\logic\User\User\Service\UserSolver;
 use yii\helpers\Html;
 
-
 class OrderSolver extends AbstractService implements SolverInterface
 {
     protected UserSolver $userSolver;

common/logic/Order/ProductOrder/Model/ProductOrder.php

@@ -40,9 +40,9 @@ namespace common\logic\Order\ProductOrder\Model;
 
 use common\helpers\GlobalParam;
 use common\components\ActiveRecordCommon;
-use common\logic\Config\TaxRate\TaxRate;
+use common\logic\Config\TaxRate\Model\TaxRate;
 use common\logic\Order\Order\Model\Order;
-use common\logic\Product\Product\Product;
+use common\logic\Product\Product\Model\Product;
 
 /**
  * This is the model class for table "product_order".

common/logic/PointSale/PointSale/Repository/PointSaleRepository.php

@@ -6,7 +6,7 @@ use common\helpers\GlobalParam;
 use common\logic\AbstractRepository;
 use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\Producer\Producer\Producer;
+use common\logic\Producer\Producer\Model\Producer;
 
 class PointSaleRepository extends AbstractRepository
 {

common/logic/Producer/Producer/Model/Producer.php

@@ -38,8 +38,8 @@
 
 namespace common\logic\Producer\Producer\Model;
 
+use common\logic\Config\TaxRate\Model\TaxRate;
 use common\logic\User\User\Model\User;
-use common\logic\Config\TaxRate\TaxRate;
 use common\logic\User\UserProducer\Model\UserProducer;
 use common\components\ActiveRecordCommon;
 

common/logic/Product/Product/Model/Product.php

@@ -39,15 +39,15 @@
 namespace common\logic\Product\Product\Model;
 
 use common\helpers\GlobalParam;
-use common\logic\Config\TaxRate\TaxRate;
+use common\logic\Config\TaxRate\Model\TaxRate;
 use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
 use common\logic\Producer\Producer\Model\Producer;
 use common\logic\Product\Product\Service\ProductSolver;
 use common\logic\Product\ProductCategory\Model\ProductCategory;
 use common\logic\Product\ProductPointSale\Model\ProductPointSale;
 use common\logic\Product\ProductPrice\Model\ProductPrice;
-use common\logic\Subscription\ProductSubscription\ProductSubscription;
 use common\components\ActiveRecordCommon;
+use common\logic\Subscription\ProductSubscription\Model\ProductSubscription;
 
 /**
  * This is the model class for table "product".

common/logic/Product/ProductCategory/Model/ProductCategory.php

@@ -42,7 +42,6 @@ use common\components\ActiveRecordCommon;
 
 /**
  * This is the model class for table "product_category".
- *
  */
 class ProductCategory extends ActiveRecordCommon
 {

common/logic/Product/ProductCategory/Model/ProductCategorySearch.php

@@ -44,7 +44,6 @@ use yii\data\ActiveDataProvider;
 
 class ProductCategorySearch extends ProductCategory
 {
-    
     public function rules() 
     {
         return [

common/logic/Subscription/ProductSubscription/Model/ProductSubscription.php

@@ -43,11 +43,9 @@ use common\logic\Product\Product\Model\Product;
 
 /**
  * This is the model class for table "commande_auto_produit".
- *
  */
 class ProductSubscription extends ActiveRecordCommon
 {
-
     /**
      * @inheritdoc
      */

common/logic/Subscription/Subscription/Event/SubscriptionEventSubscriber.php

@@ -7,10 +7,6 @@ use common\logic\Order\Order\Wrapper\OrderManager;
 
 class SubscriptionEventSubscriber
 {
-    /**
-     * @param Distribution $distribution
-     * @return void
-     */
     public static function onActiveDistribution(Distribution $distribution): void
     {
         $orderManager = OrderManager::getInstance();