Refactoring architecture dossiers : dossier domain + suppression dossiers superflus

backend/controllers/AccessController.php

@@ -39,9 +39,8 @@
 namespace backend\controllers;
 
 use backend\models\AccessUserProducerForm;
-use common\logic\User\User\Model\UserSearch;
+use domain\User\User\UserSearch;
 use yii\filters\AccessControl;
-use yii\filters\VerbFilter;
 
 /**
  * UserController implements the CRUD actions for User model.

backend/controllers/BackendController.php

@@ -39,9 +39,9 @@
 namespace backend\controllers;
 
 use common\controllers\CommonController;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Product\Product\Model\Product;
+use domain\PointSale\PointSale\PointSale;
+use domain\Producer\Producer\Producer;
+use domain\Product\Product\Product;
 
 class BackendController extends CommonController
 {

backend/controllers/CommunicateAdminController.php

@@ -39,7 +39,7 @@
 namespace backend\controllers;
 
 use backend\models\MailForm;
-use common\logic\User\User\Model\User;
+use domain\User\User\User;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
 use yii\web\NotFoundHttpException;

backend/controllers/CommunicateController.php

@@ -40,8 +40,8 @@ namespace backend\controllers;
 
 use backend\models\MailForm;
 use common\helpers\GlobalParam;
-use common\logic\PointSale\PointSale\Model\PointSale;
 use kartik\mpdf\Pdf;
+use domain\PointSale\PointSale\PointSale;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
 

backend/controllers/CronController.php

@@ -38,14 +38,13 @@
 
 namespace backend\controllers;
 
-use common\helpers\GlobalParam;
 use common\helpers\MeanPayment;
-use common\logic\Distribution\Distribution\Service\ExportManager;
-use common\logic\Order\Order\Model\Order;
-use common\logic\User\User\Model\User;
+use domain\Distribution\Distribution\ExportManager;
+use domain\Order\Order\Order;
+use domain\User\User\User;
 use Yii;
-use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
+use yii\filters\VerbFilter;
 
 /**
  * UserController implements the CRUD actions for User model.

backend/controllers/DeliveryNoteController.php

@@ -38,10 +38,8 @@
 
 namespace backend\controllers;
 
-use common\logic\Document\DeliveryNote\Model\DeliveryNoteSearch;
-use Yii;
+use domain\Document\DeliveryNote\DeliveryNoteSearch;
 use yii\filters\AccessControl;
-use yii\filters\VerbFilter;
 
 class DeliveryNoteController extends DocumentController
 {

backend/controllers/DistributionController.php

@@ -42,13 +42,12 @@ use common\helpers\Ajax;
 use common\helpers\GlobalParam;
 use common\helpers\MeanPayment;
 use common\helpers\Price;
-use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\Distribution\Distribution\Service\ExportManager;
-use common\logic\Document\DeliveryNote\Model\DeliveryNote;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Product\Product\Model\Product;
+use domain\Distribution\Distribution\Distribution;
+use domain\Document\DeliveryNote\DeliveryNote;
+use domain\Order\Order\Order;
+use domain\Producer\Producer\Producer;
 use DateTime;
+use domain\Product\Product\Product;
 use yii\base\ErrorException;
 use yii\base\Exception;
 use yii\filters\AccessControl;

backend/controllers/DocumentController.php

@@ -43,21 +43,20 @@ use common\helpers\CSV;
 use common\helpers\GlobalParam;
 use common\helpers\MeanPayment;
 use common\helpers\Price;
-use common\logic\Document\DeliveryNote\Model\DeliveryNote;
-use common\logic\Document\Document\Model\Document;
-use common\logic\Document\Invoice\Model\Invoice;
-use common\logic\Document\Quotation\Model\Quotation;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\ProductOrder\Model\ProductOrder;
-use common\logic\Product\Product\Model\Product;
+use domain\Document\DeliveryNote\DeliveryNote;
+use domain\Document\Document\Document;
+use domain\Document\Invoice\Invoice;
+use domain\Document\Quotation\Quotation;
+use domain\Order\Order\Order;
+use domain\Order\ProductOrder\ProductOrder;
+use domain\Payment\Payment;
 use kartik\mpdf\Pdf;
-use yii\base\UserException;
+use domain\Product\Product\Product;
 use yii;
-use yii\filters\VerbFilter;
+use yii\base\UserException;
 use yii\filters\AccessControl;
-use yii\web\NotFoundHttpException;
 use yii\helpers\Html;
-use common\logic\Payment\Model\Payment;
+use yii\web\NotFoundHttpException;
 
 class DocumentController extends BackendController
 {

backend/controllers/InvoiceController.php

@@ -39,8 +39,7 @@
 namespace backend\controllers;
 
 use common\helpers\Ajax;
-use common\logic\Document\Invoice\Model\InvoiceSearch;
-use common\logic\Order\Order\Model\Order;
+use domain\Document\Invoice\InvoiceSearch;
 
 class InvoiceController extends DocumentController
 {

backend/controllers/OrderController.php

@@ -42,16 +42,16 @@ use common\forms\SubscriptionForm;
 use common\helpers\CSV;
 use common\helpers\GlobalParam;
 use common\helpers\Price;
-use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
-use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\ProductOrder\Model\ProductOrder;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\Product\Product\Model\Product;
-use common\logic\Payment\Model\Payment;
-use common\logic\User\User\Model\User;
-use common\logic\User\UserProducer\Model\UserProducer;
+use domain\Distribution\Distribution\Distribution;
+use domain\Distribution\PointSaleDistribution\PointSaleDistribution;
+use domain\Distribution\ProductDistribution\ProductDistribution;
+use domain\Order\Order\Order;
+use domain\Order\ProductOrder\ProductOrder;
+use domain\Payment\Payment;
+use domain\PointSale\PointSale\PointSale;
+use domain\Product\Product\Product;
+use domain\User\User\User;
+use domain\User\UserProducer\UserProducer;
 use yii\filters\AccessControl;
 use yii\helpers\Html;
 

backend/controllers/PointSaleController.php

@@ -39,16 +39,14 @@
 namespace backend\controllers;
 
 use common\helpers\GlobalParam;
-use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
-use common\logic\Order\Order\Model\Order;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\PointSale\PointSale\Model\PointSaleSearch;
-use common\logic\PointSale\UserPointSale\Model\UserPointSale;
-use Yii;
+use domain\Distribution\PointSaleDistribution\PointSaleDistribution;
+use domain\Order\Order\Order;
+use domain\PointSale\PointSale\PointSale;
+use domain\PointSale\PointSale\PointSaleSearch;
+use domain\PointSale\UserPointSale\UserPointSale;
 use yii\filters\AccessControl;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
 use yii\helpers\Html;
+use yii\web\NotFoundHttpException;
 
 class PointSaleController extends BackendController
 {

backend/controllers/ProducerAdminController.php

@@ -40,15 +40,15 @@ namespace backend\controllers;
 
 use common\helpers\Ajax;
 use common\helpers\Alwaysdata;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Product\Product\Model\Product;
+use domain\Order\Order\Order;
+use domain\Producer\Producer\Producer;
+use domain\Product\Product\Product;
 use Yii;
+use yii\data\ActiveDataProvider;
+use yii\filters\AccessControl;
+use yii\filters\VerbFilter;
 use yii\helpers\Html;
 use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
-use yii\data\ActiveDataProvider;
 
 class ProducerAdminController extends BackendController
 {

backend/controllers/ProducerController.php

@@ -39,14 +39,13 @@
 namespace backend\controllers;
 
 use common\helpers\GlobalParam;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Producer\ProducerPriceRange\Model\ProducerPriceRange;
+use domain\Producer\ProducerPriceRange\ProducerPriceRange;
+use domain\Producer\Producer\Producer;
 use Yii;
 use yii\data\ActiveDataProvider;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
-use common\helpers\Upload;
+use yii\filters\VerbFilter;
+use yii\web\NotFoundHttpException;
 use yii\web\UploadedFile;
 
 /**

backend/controllers/ProducerPriceRangeAdminController.php

@@ -38,12 +38,10 @@
 
 namespace backend\controllers;
 
-use common\logic\Producer\ProducerPriceRange\Model\ProducerPriceRange;
-use Yii;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
+use domain\Producer\ProducerPriceRange\ProducerPriceRange;
 use yii\data\ActiveDataProvider;
+use yii\filters\AccessControl;
+use yii\web\NotFoundHttpException;
 
 /**
  * ProducerPriceRangeAdminController implements the CRUD actions for ProducerPriceRange model.

backend/controllers/ProductCategoryController.php

@@ -39,13 +39,12 @@
 namespace backend\controllers;
 
 use common\helpers\GlobalParam;
-use common\logic\Product\Product\Model\Product;
-use common\logic\Product\ProductCategory\Model\ProductCategorySearch;
+use domain\Product\Product\Product;
+use domain\Product\ProductCategory\ProductCategorySearch;
 use Yii;
 use yii\filters\AccessControl;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
 use yii\helpers\Html;
+use yii\web\NotFoundHttpException;
 
 /**
  * ProductCategoryController implements the CRUD actions for ProductCategory model.

backend/controllers/ProductController.php

@@ -41,19 +41,19 @@ namespace backend\controllers;
 use backend\forms\ProductPriceUploadForm;
 use common\helpers\CSV;
 use common\helpers\GlobalParam;
-use common\logic\Feature\Feature\Feature;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\Product\Product\Model\Product;
-use common\logic\Product\Product\Model\ProductSearch;
-use common\logic\Product\ProductPointSale\Model\ProductPointSale;
-use common\logic\Product\ProductPrice\Model\ProductPrice;
-use common\logic\Product\ProductPrice\Model\ProductPriceSearch;
-use common\logic\User\UserProducer\Model\UserProducer;
+use common\helpers\Upload;
+use domain\Feature\Feature\Feature;
+use domain\PointSale\PointSale\PointSale;
+use domain\Product\Product\Product;
+use domain\Product\Product\ProductSearch;
+use domain\Product\ProductPointSale\ProductPointSale;
+use domain\Product\ProductPrice\Model\ProductPrice;
+use domain\Product\ProductPrice\Model\ProductPriceSearch;
+use domain\User\UserProducer\UserProducer;
 use Yii;
 use yii\filters\AccessControl;
 use yii\helpers\Html;
 use yii\web\NotFoundHttpException;
-use common\helpers\Upload;
 use yii\web\UploadedFile;
 
 /**

backend/controllers/QuotationController.php

@@ -39,8 +39,8 @@
 namespace backend\controllers;
 
 use common\helpers\GlobalParam;
-use common\logic\Document\Quotation\Model\QuotationSearch;
-use common\logic\Order\Order\Model\Order;
+use domain\Document\Quotation\QuotationSearch;
+use domain\Order\Order\Order;
 use yii\base\UserException;
 use yii\filters\AccessControl;
 use yii\helpers\Html;

backend/controllers/SiteController.php

@@ -38,10 +38,9 @@
 
 namespace backend\controllers;
 
-use common\logic\User\User\Model\User;
+use common\forms\LoginForm;
 use Yii;
 use yii\filters\AccessControl;
-use common\forms\LoginForm;
 use yii\filters\VerbFilter;
 
 /**

backend/controllers/SubscriptionController.php

@@ -39,9 +39,8 @@ namespace backend\controllers;
 
 use common\forms\SubscriptionForm;
 use common\helpers\GlobalParam;
-use common\logic\Config\Unit\Service\UnitDefinition;
-use common\logic\Product\Product\Model\Product;
-use common\logic\Subscription\Subscription\Model\SubscriptionSearch;
+use domain\Product\Product\Product;
+use domain\Subscription\Subscription\SubscriptionSearch;
 use yii\filters\AccessControl;
 use yii\web\NotFoundHttpException;
 

backend/controllers/SupportAdminController.php

@@ -38,9 +38,8 @@
 
 namespace backend\controllers;
 
-use common\logic\Ticket\Ticket\Model\Ticket;
-use common\logic\Ticket\Ticket\Model\TicketSearch;
-use yii\filters\VerbFilter;
+use domain\Ticket\Ticket\Ticket;
+use domain\Ticket\Ticket\TicketSearch;
 use yii\filters\AccessControl;
 
 /**

backend/controllers/SupportController.php

@@ -38,8 +38,8 @@
 
 namespace backend\controllers;
 
-use common\logic\Ticket\Ticket\Model\Ticket;
-use common\logic\Ticket\Ticket\Model\TicketSearch;
+use domain\Ticket\Ticket\Ticket;
+use domain\Ticket\Ticket\TicketSearch;
 use yii\filters\AccessControl;
 use yii\helpers\Html;
 use yii\web\NotFoundHttpException;

backend/controllers/TaxRateAdminController.php

@@ -38,11 +38,11 @@
 
 namespace backend\controllers;
 
-use common\logic\Config\TaxRate\Model\TaxRate;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
+use domain\Config\TaxRate\TaxRate;
 use yii\data\ActiveDataProvider;
+use yii\filters\AccessControl;
+use yii\filters\VerbFilter;
+use yii\web\NotFoundHttpException;
 
 /**
  * TaxRateAdminController implements the CRUD actions for TaxRate model.

backend/controllers/UserController.php

@@ -40,18 +40,17 @@ namespace backend\controllers;
 
 use backend\models\CreditForm;
 use common\helpers\GlobalParam;
-use backend\models\MailForm;
 use common\helpers\Password;
-use common\logic\Order\Order\Model\OrderSearch;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\PointSale\UserPointSale\Model\UserPointSale;
-use common\logic\User\User\Model\User;
-use common\logic\User\User\Model\UserSearch;
-use common\logic\User\UserProducer\Model\UserProducer;
-use common\logic\User\UserUserGroup\Model\UserUserGroup;
+use domain\Order\Order\OrderSearch;
+use domain\PointSale\PointSale\PointSale;
+use domain\PointSale\UserPointSale\UserPointSale;
+use domain\User\User\User;
+use domain\User\User\UserSearch;
+use domain\User\UserProducer\UserProducer;
+use domain\User\UserUserGroup\UserUserGroup;
+use Yii;
 use yii\base\UserException;
 use yii\filters\AccessControl;
-use \Yii;
 use yii\helpers\Html;
 use yii\web\NotFoundHttpException;
 

backend/controllers/UserGroupController.php

@@ -39,11 +39,11 @@
 namespace backend\controllers;
 
 use common\helpers\GlobalParam;
-use common\logic\User\UserGroup\Model\UserGroupSearch;
-use common\logic\User\UserUserGroup\Model\UserUserGroup;
+use domain\User\UserGroup\UserGroupSearch;
+use domain\User\UserUserGroup\UserUserGroup;
 use yii\filters\AccessControl;
-use yii\web\NotFoundHttpException;
 use yii\helpers\Html;
+use yii\web\NotFoundHttpException;
 
 /**
  * PointVenteController implements the CRUD actions for PointVente model.

backend/forms/AdminSettingsForm.php

@@ -2,7 +2,7 @@
 
 namespace backend\forms;
 
-use common\logic\Setting\SettingModule;
+use domain\Setting\SettingModule;
 use yii\base\Model;
 
 class AdminSettingsForm extends Model

backend/models/AccessUserProducerForm.php

@@ -39,7 +39,7 @@ termes.
 namespace backend\models;
 
 use common\helpers\GlobalParam;
-use common\logic\User\User\Model\User;
+use domain\User\User\User;
 use yii\base\Model;
 
 /**

backend/models/CreditForm.php

@@ -38,11 +38,6 @@ termes.
 
 namespace backend\models;
 
-use common\helpers\GlobalParam;
-use common\logic\Payment\Module\PaymentModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\User\User\Module\UserModule;
-use common\logic\User\UserProducer\Module\UserProducerModule;
 use yii\base\Model;
 
 /**

backend/models/MailForm.php

@@ -40,15 +40,15 @@ namespace backend\models;
 
 use common\helpers\GlobalParam;
 use common\helpers\Mailjet;
-use common\logic\Config\Unit\Service\UnitDefinition;
-use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\Distribution\Distribution\Module\DistributionModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\Product\Product\Model\Product;
-use common\logic\Product\Product\Module\ProductModule;
+use common\helpers\Price;
+use domain\Config\Unit\UnitDefinition;
+use domain\Distribution\Distribution\Distribution;
+use domain\Distribution\Distribution\DistributionModule;
+use domain\Producer\Producer\ProducerModule;
+use domain\Product\Product\Product;
+use domain\Product\Product\ProductModule;
 use Yii;
 use yii\base\Model;
-use common\helpers\Price ;
 use yii\helpers\Html;
 
 /**

backend/views/dashboard/index.php

@@ -36,15 +36,14 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use common\helpers\GlobalParam;
-use common\logic\Distribution\Distribution\Module\DistributionModule;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\Order\Module\OrderModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\Setting\SettingModule;
-use common\logic\Subscription\Subscription\Module\SubscriptionModule;
-use common\logic\User\User\Module\UserModule;
-use yii\helpers\Html ;
+use domain\Distribution\Distribution\DistributionModule;
+use domain\Order\Order\Order;
+use domain\Order\Order\OrderModule;
+use domain\Producer\Producer\ProducerModule;
+use domain\Setting\SettingModule;
+use domain\Subscription\Subscription\SubscriptionModule;
+use domain\User\User\UserModule;
+use yii\helpers\Html;
 
 $distributionModule = DistributionModule::getInstance();
 $userModule = UserModule::getInstance();

backend/views/delivery-note/index.php

@@ -36,13 +36,12 @@
  * termes.
  */
 
-use common\logic\Document\DeliveryNote\Model\DeliveryNote;
+use domain\Document\DeliveryNote\DeliveryNote;
+use domain\Order\Order\Order;
+use domain\PointSale\PointSale\PointSale;
 use yii\grid\GridView;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\Order\Order\Model\Order;
-use yii\helpers\Html;
 use yii\helpers\ArrayHelper;
-use common\logic\Document\DeliveryNote\Module\DeliveryNoteModule;
+use yii\helpers\Html;
 
 $deliveryNoteModule = $this->getDeliveryNoteModule();
 

backend/views/distribution/report-bourlingue.php

@@ -37,12 +37,12 @@ termes.
 */
 
 use common\helpers\Price;
-use common\logic\Config\Unit\Module\UnitModule;
-use common\logic\Config\Unit\Service\UnitDefinition;
-use common\logic\Order\Order\Module\OrderModule;
-use common\logic\Product\Product\Model\Product;
-use common\logic\Product\Product\Module\ProductModule;
-use common\logic\User\UserProducer\Model\UserProducer;
+use domain\Config\Unit\UnitDefinition;
+use domain\Config\Unit\UnitModule;
+use domain\Order\Order\OrderModule;
+use domain\Product\Product\Product;
+use domain\Product\Product\ProductModule;
+use domain\User\UserProducer\UserProducer;
 
 $unitModule = UnitModule::getInstance();
 $productModule = ProductModule::getInstance();

backend/views/distribution/report-grid.php

@@ -1,8 +1,8 @@
 <?php
 
-use common\logic\Order\Order\Module\OrderModule;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Product\Product\Module\ProductModule;
+use domain\Order\Order\OrderModule;
+use domain\Producer\Producer\Producer;
+use domain\Product\Product\ProductModule;
 
 $orderModule = OrderModule::getInstance();
 

backend/views/distribution/shopping-cart-labels.php

@@ -1,6 +1,6 @@
 <?php
 
-use common\logic\Distribution\Distribution\Export\DistributionShoppingCartLabelsPdfGenerator;
+use domain\Distribution\Distribution\Export\DistributionShoppingCartLabelsPdfGenerator;
 
 $distributionShoppingCartLabelsPdfGenerator = DistributionShoppingCartLabelsPdfGenerator::getInstance();
 $index = 0;

backend/views/document/_download_product_line.php

@@ -1,10 +1,10 @@
 <?php
 
 use common\helpers\Price;
-use common\logic\Config\Unit\Module\UnitModule;
-use common\logic\Order\ProductOrder\Module\ProductOrderModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\Product\Product\Model\Product;
+use domain\Config\Unit\UnitModule;
+use domain\Order\ProductOrder\ProductOrderModule;
+use domain\Producer\Producer\ProducerModule;
+use domain\Product\Product\Product;
 use yii\helpers\Html;
 
 $documentModule = $this->getDocumentModule();

backend/views/document/_form.php

@@ -36,14 +36,7 @@
  * termes.
  */
 
-use common\helpers\MeanPayment;use common\helpers\Price;
-use common\logic\Document\Document\Module\DocumentModule;
-use  common\logic\Document\Invoice\Module\InvoiceModule;
-use common\logic\Payment\Module\PaymentModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\User\User\Module\UserModule;
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use domain\Document\Document\DocumentModule;use domain\Document\Invoice\InvoiceModule;use domain\Payment\PaymentModule;use domain\Producer\Producer\ProducerModule;use domain\User\User\UserModule;use yii\helpers\Html;use yii\widgets\ActiveForm;
 
 \backend\assets\VuejsDocumentFormAsset::register($this);
 

backend/views/document/download.php

@@ -1,8 +1,8 @@
 <?php
 
-use yii\helpers\Html;
-use common\logic\Order\Order\Model\Order;
 use common\helpers\Price;
+use domain\Order\Order\Order;
+use yii\helpers\Html;
 
 $producerModule = $this->getProducerModule();
 $userModule = $this->getUserModule();

backend/views/document/form/_payment.php

@@ -2,9 +2,9 @@
 
 use common\helpers\MeanPayment;
 use common\helpers\Price;
-use common\logic\Document\Document\Module\DocumentModule;
-use  common\logic\Document\Invoice\Module\InvoiceModule;
-use common\logic\Payment\Module\PaymentModule;
+use domain\Document\Document\DocumentModule;
+use domain\Document\Invoice\InvoiceModule;
+use domain\Payment\PaymentModule;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 

backend/views/invoice/index.php

@@ -36,11 +36,10 @@
  * termes.
  */
 
-use yii\helpers\Html;
+use domain\Document\Invoice\Invoice;
+use domain\Order\Order\Order;
 use yii\grid\GridView;
-use common\helpers\Url;
-use common\logic\Document\Invoice\Model\Invoice;
-use common\logic\Order\Order\Model\Order;
+use yii\helpers\Html;
 
 $producerModule = $this->getProducerModule();
  $invoiceModule = $this-> getInvoiceModule();

backend/views/layouts/header.php

@@ -36,15 +36,14 @@
  * termes.
  */
 
+use common\helpers\GlobalParam;
 use common\helpers\Image;
 use common\helpers\Price;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\User\User\Module\UserModule;
+use domain\Distribution\Distribution\Distribution;
+use domain\Producer\Producer\Producer;
+use domain\Producer\Producer\ProducerModule;
+use domain\User\User\UserModule;
 use yii\helpers\Html;
-use common\helpers\GlobalParam;
-
-use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\Producer\Producer\Model\Producer;
 
 $userModule = UserModule::getInstance();
 $producerModule = ProducerModule::getInstance();

backend/views/layouts/left.php

@@ -37,8 +37,8 @@
  */
 
 use common\helpers\GlobalParam;
-use common\logic\Feature\Feature\Feature;
-use common\logic\User\User\Module\UserModule;
+use domain\Feature\Feature\Feature;
+use domain\User\User\UserModule;
 
 $producerModule = $this->getProducerModule();
 $userModule = UserModule::getInstance();

backend/views/online-admin/index.php

@@ -38,10 +38,6 @@
 
 use common\helpers\Image;
 use yii\helpers\Html;
-use yii\grid\GridView;
-use common\logic\User\User\Model\User;
-use common\logic\Producer\Producer\Model\Producer;
-use common\helpers\Price;
 
 $producerModule = $this->getProducerModule();
 $userModule = $this->getUserModule();

backend/views/order/report.php

@@ -36,8 +36,8 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\Order\Module\OrderModule;
+use domain\Order\Order\Order;
+use domain\Order\Order\OrderModule;
 
 $orderModule = OrderModule::getInstance();
 

backend/views/point-sale/_form.php

@@ -36,15 +36,15 @@
  * termes.
  */
 
-use common\logic\Distribution\Distribution\Module\DistributionModule;
-use common\logic\Distribution\Distribution\Service\ExportManager;
-use common\logic\Producer\Producer\Module\ProducerModule;
+use domain\Distribution\Distribution\DistributionModule;
+use domain\Distribution\Distribution\ExportManager;
+use domain\Producer\Producer\Producer;
+use domain\Producer\Producer\ProducerModule;
 use lo\widgets\Toggle;
+use domain\User\User\UserModule;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use yii\helpers\ArrayHelper;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\User\User\Module\UserModule;
 
 $producerModule = ProducerModule::getInstance();
 $userModule = UserModule::getInstance();

backend/views/point-sale/index.php

@@ -36,10 +36,10 @@
  * termes.
  */
 
-use yii\helpers\Html;
+use domain\PointSale\UserPointSale\UserPointSale;
+use domain\Producer\Producer\Producer;
 use yii\grid\GridView;
-use common\logic\PointSale\UserPointSale\Model\UserPointSale;
-use common\logic\Producer\Producer\Model\Producer;
+use yii\helpers\Html;
 
 $pointSaleModule = $this->getPointSaleModule();
 

backend/views/producer-admin/_form.php

@@ -36,9 +36,9 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
+use domain\Producer\Producer\Producer;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use common\logic\Producer\Producer\Model\Producer;
 
 ?>
 

backend/views/producer-admin/billing.php

@@ -36,7 +36,7 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\logic\Producer\Producer\Module\ProducerModule;
+use domain\Producer\Producer\ProducerModule;
 
 $this->setTitle('Facturation producteur ('.$producer->name.')') ;
 $this->addBreadcrumb(['label' => 'Producteurs', 'url' => ['index']]) ;

backend/views/producer-admin/index.php

@@ -36,11 +36,11 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use yii\helpers\Html;
-use yii\grid\GridView;
-use common\logic\User\User\Model\User;
-use common\logic\Producer\Producer\Model\Producer;
 use common\helpers\Price;
+use domain\Producer\Producer\Producer;
+use domain\User\User\User;
+use yii\grid\GridView;
+use yii\helpers\Html;
 
 $producerModule = $this->getProducerModule();
 

backend/views/producer/update.php

@@ -38,18 +38,18 @@
 
 use common\helpers\Dropdown;
 use common\helpers\GlobalParam;
-use common\logic\Distribution\Distribution\Module\DistributionModule;
-use common\logic\Distribution\Distribution\Service\ExportManager;
-use common\logic\Feature\Feature\Feature;
-use common\logic\Feature\Feature\FeatureModule;
-use common\logic\User\User\Module\UserModule;
-use common\logic\User\UserGroup\Module\UserGroupModule;
+use domain\Config\TaxRate\TaxRate;
+use domain\Distribution\Distribution\DistributionModule;
+use domain\Distribution\Distribution\ExportManager;
+use domain\Document\Document\Document;
+use domain\Feature\Feature\Feature;
+use domain\Feature\Feature\FeatureModule;
+use domain\Producer\Producer\Producer;
+use domain\User\User\UserModule;
+use domain\User\UserGroup\UserGroupModule;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Config\TaxRate\Model\TaxRate;
-use common\logic\Document\Document\Model\Document;
-use yii\helpers\ArrayHelper;
 
 \backend\assets\VuejsProducerUpdateAsset::register($this);
 

backend/views/product/_form.php

@@ -1,13 +1,13 @@
 <?php
 
+use common\helpers\GlobalParam;
 use common\helpers\Image;
+use domain\PointSale\PointSale\PointSale;
 use lo\widgets\Toggle;
-use yii\helpers\Html;
+use domain\Product\Product\Product;
 use yii\bootstrap\ActiveForm;
 use yii\helpers\ArrayHelper;
-use common\helpers\GlobalParam;
-use common\logic\Product\Product\Model\Product;
-use common\logic\PointSale\PointSale\Model\PointSale;
+use yii\helpers\Html;
 
 $producerModule = $this->getProducerModule();
 $productCategoryModule = $this->getProductCategoryModule();

backend/views/product/index.php

@@ -36,13 +36,12 @@
  * termes.
  */
 
-use common\helpers\Image;
-use yii\helpers\Html;
-use yii\grid\GridView;
 use common\helpers\GlobalParam;
-use \lo\widgets\Toggle;
+use common\helpers\Image;
 use common\helpers\Price;
-use common\logic\Product\Product\Model\Product;
+use lo\widgets\Toggle;
+use yii\grid\GridView;
+use yii\helpers\Html;
 
 $productModule = $this->getProductModule();
 

backend/views/product/update/prices/_form.php

@@ -1,10 +1,10 @@
 <?php
 
-use common\logic\Config\Unit\Module\UnitModule;
-use common\logic\Product\Product\Module\ProductModule;
-use yii\helpers\Html;
-use yii\bootstrap\ActiveForm;
 use common\helpers\GlobalParam;
+use domain\Config\Unit\UnitModule;
+use domain\Product\Product\ProductModule;
+use yii\bootstrap\ActiveForm;
+use yii\helpers\Html;
 
 $unitModule = UnitModule::getInstance();
 $userModule = $this->getUserModule();

backend/views/product/update/prices/list.php

@@ -36,11 +36,11 @@
  * termes.
  */
 
-use common\logic\User\User\Module\UserModule;
-use yii\helpers\Html;
 use common\helpers\Price;
+use domain\Product\Product\ProductModule;
+use domain\User\User\UserModule;
 use yii\grid\GridView;
-use common\logic\Product\Product\Module\ProductModule;
+use yii\helpers\Html;
 
 $productModule = ProductModule::getInstance();
 $userModule = UserModule::getInstance();

backend/views/quotation/index.php

@@ -36,9 +36,9 @@
  * termes.
  */
 
-use common\logic\Document\Quotation\Model\Quotation;
+use domain\Document\Quotation\Quotation;
+use domain\Order\Order\Order;
 use yii\grid\GridView;
-use common\logic\Order\Order\Model\Order;
 use yii\helpers\Html;
 
 $quotationModule = $this->getQuotationModule();

backend/views/setting-admin/index.php

@@ -36,7 +36,7 @@
  * termes.
  */
 
-use common\logic\Setting\SettingModule;
+use domain\Setting\SettingModule;
 use lo\widgets\Toggle;
 use yii\bootstrap\ActiveForm;
 use yii\helpers\Html;

backend/views/subscription/_form.php

@@ -36,10 +36,10 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
+use domain\Subscription\Subscription\Subscription;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use yii\helpers\ArrayHelper ;
-use common\logic\Subscription\Subscription\Model\Subscription;
 
 \backend\assets\VuejsSubscriptionFormAsset::register($this);
 

backend/views/subscription/index.php

@@ -36,15 +36,15 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use common\logic\Subscription\Subscription\Module\SubscriptionModule;
-use yii\helpers\Html;
+use common\helpers\GlobalParam;
+use domain\PointSale\PointSale\PointSale;
+use domain\Product\Product\Product;
+use domain\Product\Product\ProductModule;
+use domain\Subscription\Subscription\Subscription;
+use domain\Subscription\Subscription\SubscriptionModule;
 use yii\grid\GridView;
-use common\helpers\GlobalParam ;
-use common\logic\Subscription\Subscription\Model\Subscription;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\Product\Product\Module\ProductModule;
 use yii\helpers\ArrayHelper;
-use common\logic\Product\Product\Model\Product;
+use yii\helpers\Html;
 
 $subscriptionModule = SubscriptionModule::getInstance();
 

backend/views/support/index.php

@@ -36,11 +36,9 @@
  * termes.
  */
 
-use common\helpers\Image;
-use common\logic\Ticket\Ticket\Model\Ticket;
-use common\logic\Ticket\Ticket\Module\TicketModule;
-use yii\helpers\Html;
+use domain\Ticket\Ticket\TicketModule;
 use yii\grid\GridView;
+use yii\helpers\Html;
 
 /**
  * @var $this common\components\ViewBackend

backend/views/support/view.php

@@ -1,8 +1,8 @@
 <?php
 
 use common\helpers\GlobalParam;
-use common\logic\Ticket\Ticket\Module\TicketModule;
-use common\logic\User\User\Module\UserModule;
+use domain\Ticket\Ticket\TicketModule;
+use domain\User\User\UserModule;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 

backend/views/user/_form.php

@@ -36,14 +36,14 @@
  * termes.
  */
 
-use common\logic\Distribution\Distribution\Module\DistributionModule;
-use common\logic\Distribution\Distribution\Service\ExportManager;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\User\User\Module\UserModule;
+use domain\Distribution\Distribution\DistributionModule;
+use domain\Distribution\Distribution\ExportManager;
+use domain\Producer\Producer\ProducerModule;
 use lo\widgets\Toggle;
+use domain\User\User\UserModule;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use yii\helpers\ArrayHelper;
 
 \backend\assets\VuejsUserFormAsset::register($this);
 

backend/views/user/credit.php

@@ -36,12 +36,12 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
+use common\helpers\GlobalParam;
+use common\helpers\MeanPayment;
+use domain\Payment\Payment;
 use yii\grid\GridView;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use common\helpers\GlobalParam;
-use common\logic\Payment\Model\Payment;
-use common\helpers\MeanPayment;
 
 $paymentManager = $this->getPaymentModule();
 $producerModule = $this->getProducerModule();

backend/views/user/index.php

@@ -37,13 +37,13 @@
  */
 
 use common\helpers\GlobalParam;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\User\UserGroup\Module\UserGroupModule;
-use yii\helpers\Html;
+use domain\Order\Order\Order;
+use domain\Producer\Producer\ProducerModule;
+use domain\User\User\UserModule;
+use domain\User\UserProducer\UserProducer;
 use yii\grid\GridView;
-use common\logic\User\User\Module\UserModule;
-use common\logic\Order\Order\Model\Order;
-use common\logic\User\UserProducer\Model\UserProducer;
+use yii\helpers\Html;
+use domain\User\UserGroup\UserGroupModule;
 
 $userModule = UserModule::getInstance();
 $producerModule = ProducerModule::getInstance();

common/components/AlwaysdataClient.php

@@ -3,8 +3,8 @@
 namespace common\components;
 
 use common\helpers\Password;
-use common\logic\Producer\Producer\Model\Producer;
 use GuzzleHttp\Client;
+use domain\Producer\Producer\Producer;
 use yii\base\ErrorException;
 
 class AlwaysdataClient

common/components/BusinessLogic.php

@@ -2,8 +2,7 @@
 
 namespace common\components;
 
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\ProducerContextTrait;
+use domain\Producer\Producer\Producer;
 use yii\base\ErrorException;
 
 class BusinessLogic

common/components/BusinessLogicTrait.php

@@ -2,39 +2,39 @@
 
 namespace common\components;
 
-use  common\logic\Config\TaxRate\Module\TaxRateModule;
-use common\logic\Config\Unit\Module\UnitModule;
-use common\logic\Distribution\Distribution\Module\DistributionModule;
-use common\logic\Distribution\PointSaleDistribution\Module\PointSaleDistributionModule;
-use common\logic\Distribution\ProductDistribution\Module\ProductDistributionModule;
-use common\logic\Document\DeliveryNote\Module\DeliveryNoteModule;
-use common\logic\Document\Document\Module\DocumentModule;
-use common\logic\Document\Invoice\Module\InvoiceModule;
-use common\logic\Document\Quotation\Module\QuotationModule;
-use common\logic\Feature\Feature\FeatureModule;
-use common\logic\Feature\FeatureProducer\FeatureProducerModule;
-use common\logic\Opinion\Module\OpinionModule;
-use common\logic\Order\Order\Module\OrderModule;
-use common\logic\Order\ProductOrder\Module\ProductOrderModule;
-use common\logic\Payment\Module\PaymentModule;
-use common\logic\PointSale\PointSale\Module\PointSaleModule;
-use common\logic\PointSale\UserPointSale\Module\UserPointSaleModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\Producer\ProducerPriceRange\Module\ProducerPriceRangeModule;
-use common\logic\Product\Product\Module\ProductModule;
-use common\logic\Product\ProductCategory\Module\ProductCategoryModule;
-use common\logic\Product\ProductPointSale\Module\ProductPointSaleModule;
-use common\logic\Product\ProductPrice\Module\ProductPriceModule;
-use common\logic\Setting\SettingModule;
-use common\logic\Subscription\ProductSubscription\Module\ProductSubscriptionModule;
-use common\logic\Subscription\Subscription\Module\SubscriptionModule;
-use common\logic\Ticket\Ticket\Module\TicketModule;
-use common\logic\Ticket\TicketMessage\Module\TicketMessageModule;
-use common\logic\Ticket\TicketUser\Module\TicketUserModule;
-use common\logic\User\User\Module\UserModule;
-use common\logic\User\UserGroup\Module\UserGroupModule;
-use common\logic\User\UserProducer\Module\UserProducerModule;
-use common\logic\User\UserUserGroup\Module\UserUserGroupModule;
+use domain\Config\TaxRate\TaxRateModule;
+use domain\Config\Unit\UnitModule;
+use domain\Distribution\Distribution\DistributionModule;
+use domain\Distribution\PointSaleDistribution\PointSaleDistributionModule;
+use domain\Distribution\ProductDistribution\ProductDistributionModule;
+use domain\Document\DeliveryNote\DeliveryNoteModule;
+use domain\Document\Document\DocumentModule;
+use domain\Document\Invoice\InvoiceModule;
+use domain\Document\Quotation\QuotationModule;
+use domain\Feature\Feature\FeatureModule;
+use domain\Feature\FeatureProducer\FeatureProducerModule;
+use domain\Opinion\OpinionModule;
+use domain\Order\Order\OrderModule;
+use domain\Order\ProductOrder\ProductOrderModule;
+use domain\Payment\PaymentModule;
+use domain\PointSale\PointSale\PointSaleModule;
+use domain\PointSale\UserPointSale\UserPointSaleModule;
+use domain\Producer\Producer\ProducerModule;
+use domain\Producer\ProducerPriceRange\ProducerPriceRangeModule;
+use domain\Product\Product\ProductModule;
+use domain\Product\ProductCategory\ProductCategoryModule;
+use domain\Product\ProductPointSale\ProductPointSaleModule;
+use domain\Product\ProductPrice\Module\ProductPriceModule;
+use domain\Setting\SettingModule;
+use domain\Subscription\ProductSubscription\ProductSubscriptionModule;
+use domain\Subscription\Subscription\SubscriptionModule;
+use domain\Ticket\Ticket\TicketModule;
+use domain\Ticket\TicketMessage\TicketMessageModule;
+use domain\Ticket\TicketUser\TicketUserModule;
+use domain\User\User\UserModule;
+use domain\User\UserGroup\UserGroupModule;
+use domain\User\UserProducer\UserProducerModule;
+use domain\User\UserUserGroup\UserUserGroupModule;
 
 trait BusinessLogicTrait
 {

common/components/MailerService.php

@@ -2,7 +2,7 @@
 
 namespace common\components;
 
-use common\logic\Producer\Producer\Model\Producer;
+use domain\Producer\Producer\Producer;
 use yii\mail\MessageInterface;
 
 class MailerService

common/components/Tiller/TillerClientV2.php

@@ -54,7 +54,7 @@ class TillerClientV2 implements TillerClientInterface
         $this->restaurantToken = $restaurantToken;
     }
 
-    public function getUrlAuthorizeCode(string $clientId, string $redirectUri): string
+    public function getUrlAuthorizeCode(string $clientId = null, string $redirectUri = null): string
     {
         return "#";
     }

common/components/Tiller/TillerClientV3.php

@@ -60,9 +60,13 @@ class TillerClientV3 implements TillerClientInterface
         ];
     }
 
-    public function getUrlAuthorizeCode(string $clientId, string $redirectUri): string
+    public function getUrlAuthorizeCode(string $clientId = null, string $redirectUri = null): string
     {
-        return "https://oauth.api.tiller.systems/oauth2/authorize?client_id=$clientId&response_type=code&scope=&redirect_uri=$redirectUri";
+        if($clientId && $redirectUri) {
+            return "https://oauth.api.tiller.systems/oauth2/authorize?client_id=$clientId&response_type=code&scope=&redirect_uri=$redirectUri";
+        }
+
+        return '#';
     }
 
     public function isAuthenticated(): bool

common/components/View.php

@@ -38,7 +38,7 @@ termes.
 
 namespace common\components ;
 
-use common\logic\User\User\Model\User;
+use domain\User\User\User;
 
 class View extends \yii\web\View
 {

common/config/main.php

@@ -39,12 +39,12 @@
 use common\components\BusinessLogic;
 use common\components\DolibarrApi;
 use common\components\ForumFlarumClient;
-use common\logic\Distribution\Distribution\Model\Distribution;
-use common\logic\Document\DeliveryNote\Model\DeliveryNote;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Ticket\Ticket\Model\Ticket;
-use common\logic\Payment\Model\Payment;
-use common\logic\User\User\Model\User;
+use domain\Distribution\Distribution\Distribution;
+use domain\Document\DeliveryNote\DeliveryNote;
+use domain\Order\Order\Order;
+use domain\Payment\Payment;
+use domain\Ticket\Ticket\Ticket;
+use domain\User\User\User;
 
 $serverName = isset($_SERVER['SERVER_NAME']) ?? '' ;
 
@@ -99,7 +99,7 @@ return [
         ],
         'user' => [
             'class' => 'yii\web\User',
-            'identityClass' => 'common\logic\User\User\Model\User',
+            'identityClass' => 'domain\User\User\User',
             'enableAutoLogin' => true,
             'identityCookie' => [
                 'name' => 'distrib',
@@ -187,29 +187,29 @@ return [
             'observers' => [
                 User::class => [
                     // Producer : lien avec utilisateur
-                    common\logic\Producer\Producer\Event\UserObserver::class
+                    domain\Producer\Producer\Event\UserObserver::class
                 ],
                 Order::class => [
                     // Payment : remboursement commande
-                    common\logic\Payment\Event\OrderObserver::class
+                    domain\Payment\Event\OrderObserver::class
                 ],
                 Payment::class => [
                     // UserProducer : mise à jour du crédit
-                    common\logic\User\UserProducer\Event\PaymentObserver::class
+                    domain\User\UserProducer\Event\PaymentObserver::class
                 ],
                 Distribution::class => [
                     // Subscription : génération des commandes sur base des abonnements
-                    common\logic\Subscription\Subscription\Event\DistributionObserver::class
+                    domain\Subscription\Subscription\Event\DistributionObserver::class
                 ],
                 DeliveryNote::class => [
                     // Order : assignation du bon de livraison aux commandes
-                    common\logic\Order\Order\Event\DeliveryNoteObserver::class,
+                    domain\Order\Order\Event\DeliveryNoteObserver::class,
                     // DeliveryNote : validation automatique des bons de livraison
-                    common\logic\Document\DeliveryNote\Event\DeliveryNoteObserver::class
+                    domain\Document\DeliveryNote\Event\DeliveryNoteObserver::class
                 ],
                 Ticket::class => [
                     // User : envoi email nouveau ticket à l'administrateur
-                    common\logic\User\User\Event\TicketObserver::class,
+                    domain\User\User\Event\TicketObserver::class,
                 ],
             ],
         ],

common/controllers/CommonController.php

@@ -41,7 +41,7 @@ namespace common\controllers;
 use common\components\BusinessLogic;
 use common\components\BusinessLogicTrait;
 use common\components\ParameterBag;
-use common\logic\User\User\Model\User;
+use domain\User\User\User;
 use yii;
 use yii\web\Response;
 

common/forms/ContactForm.php

@@ -38,7 +38,7 @@ termes.
 
 namespace common\forms;
 
-use common\logic\Producer\Producer\Model\Producer;
+use domain\Producer\Producer\Producer;
 use Yii;
 use yii\base\Model;
 

common/forms/LoginForm.php

@@ -38,8 +38,8 @@ termes.
 
 namespace common\forms;
 
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\User\User\Model\User;
+use domain\Producer\Producer\Producer;
+use domain\User\User\User;
 use Yii;
 use yii\base\Model;
 

common/forms/SubscriptionForm.php

@@ -38,13 +38,12 @@ termes.
 
 namespace common\forms;
 
-use common\logic\Product\Product\Model\Product;
-use common\logic\Product\Product\Module\ProductModule;
-use common\logic\Subscription\ProductSubscription\Model\ProductSubscription;
-use common\logic\Subscription\Subscription\Model\Subscription;
-use common\logic\Subscription\Subscription\Module\SubscriptionModule;
-use common\logic\User\User\Module\UserModule;
-use Yii;
+use domain\Product\Product\Product;
+use domain\Product\Product\ProductModule;
+use domain\Subscription\ProductSubscription\ProductSubscription;
+use domain\Subscription\Subscription\Subscription;
+use domain\Subscription\Subscription\SubscriptionModule;
+use domain\User\User\UserModule;
 use yii\base\Model;
 
 class SubscriptionForm extends Model 

common/helpers/CSV.php

@@ -38,7 +38,7 @@
 
 namespace common\helpers;
 
-use common\logic\Producer\Producer\Module\ProducerModule;
+use domain\Producer\Producer\ProducerModule;
 
 class CSV
 {

common/helpers/GlobalParam.php

@@ -38,9 +38,8 @@
 
 namespace common\helpers;
 
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\User\User\Service\UserSolver;
+use domain\Producer\Producer\ProducerModule;
+use domain\User\User\UserSolver;
 
 class GlobalParam
 {

common/helpers/Price.php

@@ -38,7 +38,7 @@
 
 namespace common\helpers;
 
-use common\logic\Document\Document\Model\Document;
+use domain\Document\Document\Document;
 
 class Price
 {

common/logic/Distribution/Distribution/Event/DistributionActiveEvent.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace common\logic\Distribution\Distribution\Event;
-
-use common\logic\Distribution\Distribution\Model\Distribution;
-use yii\base\Event;
-
-class DistributionActiveEvent extends Event
-{
-    public Distribution $distribution;
-}

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

@@ -1,14 +0,0 @@
-<?php
-
-namespace common\logic\Distribution\PointSaleDistribution\Service;
-
-use common\logic\AbstractDefinition;
-use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
-
-class PointSaleDistributionDefinition extends AbstractDefinition
-{
-    public function getEntityFqcn(): string
-    {
-        return PointSaleDistribution::class;
-    }
-}

common/logic/Distribution/ProductDistribution/Service/ProductDistributionDefinition.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace common\logic\Distribution\ProductDistribution\Service;
-
-use common\logic\AbstractDefinition;
-use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
-
-class ProductDistributionDefinition extends AbstractDefinition
-{
-    public function getEntityFqcn(): string
-    {
-        return ProductDistribution::class;
-    }
-}

common/logic/Document/Document/Model/DocumentInterface.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace common\logic\Document\Document\Model;
-
-interface DocumentInterface
-{
-
-}

common/logic/Document/Quotation/Repository/QuotationRepositoryQuery.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace common\logic\Document\Quotation\Repository;
-
-use common\logic\AbstractRepositoryQuery;
-use common\logic\Document\Quotation\Model\Quotation;
-use common\logic\Document\Quotation\Service\QuotationDefinition;
-use yii\db\ActiveQuery;
-
-class QuotationRepositoryQuery extends AbstractRepositoryQuery
-{
-    protected QuotationDefinition $definition;
-
-    public function loadDependencies(): void
-    {
-        $this->loadDefinition(QuotationDefinition::class);
-    }
-}

common/logic/Order/Order/Service/OrderManager.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace common\logic\Order\Order\Service;
-
-use common\logic\AbstractService;
-use common\logic\ManagerInterface;
-
-class OrderManager extends AbstractService implements ManagerInterface
-{
-    
-}

common/logic/PointSale/UserPointSale/Service/UserPointSaleSolver.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace common\logic\PointSale\UserPointSale\Service;
-
-use common\logic\AbstractSolver;
-
-class UserPointSaleSolver extends AbstractSolver
-{
-
-}

common/logic/Producer/ProducerPriceRange/Repository/ProducerPriceRangeRepositoryQuery.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace common\logic\Producer\ProducerPriceRange\Repository;
-
-use common\logic\AbstractRepositoryQuery;
-use common\logic\Producer\ProducerPriceRange\Model\ProducerPriceRange;
-use common\logic\Producer\ProducerPriceRange\Service\ProducerPriceRangeDefinition;
-use yii\db\ActiveQuery;
-
-class ProducerPriceRangeRepositoryQuery extends AbstractRepositoryQuery
-{
-    protected ProducerPriceRangeDefinition $definition;
-
-    public function loadDependencies(): void
-    {
-        $this->loadDefinition(ProducerPriceRangeDefinition::class);
-    }
-}

common/logic/Product/ProductCategory/Repository/ProductCategoryRepositoryQuery.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace common\logic\Product\ProductCategory\Repository;
-
-use common\logic\AbstractRepositoryQuery;
-use common\logic\Product\ProductCategory\Model\ProductCategory;
-use common\logic\Product\ProductCategory\Service\ProductCategoryDefinition;
-use yii\db\ActiveQuery;
-
-class ProductCategoryRepositoryQuery extends AbstractRepositoryQuery
-{
-    protected ProductCategoryDefinition $definition;
-
-    public function loadDependencies(): void
-    {
-        $this->loadDefinition(ProductCategoryDefinition::class);
-    }
-}

common/logic/Product/ProductPointSale/Repository/ProductPointSaleRepositoryQuery.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace common\logic\Product\ProductPointSale\Repository;
-
-use common\logic\AbstractRepositoryQuery;
-use common\logic\Product\ProductPointSale\Model\ProductPointSale;
-use common\logic\Product\ProductPointSale\Service\ProductPointSaleDefinition;
-use yii\db\ActiveQuery;
-
-class ProductPointSaleRepositoryQuery extends AbstractRepositoryQuery
-{
-    protected ProductPointSaleDefinition $definition;
-
-    public function loadDependencies(): void
-    {
-        $this->loadDefinition(ProductPointSaleDefinition::class);
-    }
-}

common/logic/RepositoryQueryInterface.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace common\logic;
-
-use yii\db\ActiveQuery;
-
-interface RepositoryQueryInterface
-{
-
-}

common/logic/Subscription/ProductSubscription/Service/ProductSubscriptionDefinition.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace common\logic\Subscription\ProductSubscription\Service;
-
-use common\logic\AbstractDefinition;
-use common\logic\Subscription\ProductSubscription\Model\ProductSubscription;
-
-class ProductSubscriptionDefinition extends AbstractDefinition
-{
-    public function getEntityFqcn(): string
-    {
-        return ProductSubscription::class;
-    }
-}

common/mail/creditUser-html.php

@@ -36,9 +36,9 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use common\logic\Payment\Model\Payment;
-use yii\helpers\Html;
 use common\helpers\Price;
+use domain\Payment\Payment;
+use yii\helpers\Html;
 
 ?>
 

common/mail/creditUser-text.php

@@ -36,8 +36,8 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use common\helpers\Price ;
-use common\logic\Payment\Model\Payment;
+use common\helpers\Price;
+use domain\Payment\Payment;
 
 ?>
 

common/mail/orderConfirm-html.php

@@ -36,9 +36,9 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\Order\Module\OrderModule;
-use common\logic\Producer\Producer\Module\ProducerModule;
+use domain\Order\Order\Order;
+use domain\Order\Order\OrderModule;
+use domain\Producer\Producer\ProducerModule;
 use yii\helpers\Html;
 
 $producerModule = ProducerModule::getInstance();

common/mail/orderConfirm-text.php

@@ -36,11 +36,11 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\helpers\GlobalParam ;
-use common\logic\Order\Order\Model\Order;
+use common\helpers\GlobalParam;
+use domain\Order\Order\Order;
+use domain\Order\Order\OrderModule;
+use domain\Producer\Producer\ProducerModule;
 use yii\helpers\Html;
-use common\logic\Producer\Producer\Module\ProducerModule;
-use common\logic\Order\Order\Module\OrderModule;
 
 $producerModule = ProducerModule::getInstance();
 $orderModule = OrderModule::getInstance();

common/mail/orderConfirmProducer-html.php

@@ -36,9 +36,9 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\helpers\GlobalParam ;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\Order\Module\OrderModule;
+use common\helpers\GlobalParam;
+use domain\Order\Order\Order;
+use domain\Order\Order\OrderModule;
 use yii\helpers\Html;
 
 $orderModule = OrderModule::getInstance();

common/mail/orderConfirmProducer-text.php

@@ -36,9 +36,9 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\helpers\GlobalParam ;
-use common\logic\Order\Order\Module\OrderModule;
-use common\logic\Order\Order\Model\Order;
+use common\helpers\GlobalParam;
+use domain\Order\Order\Order;
+use domain\Order\Order\OrderModule;
 use yii\helpers\Html;
 
 $orderModule = OrderModule::getInstance();

common/mail/paymentError-html.php

@@ -36,7 +36,7 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\logic\Producer\Producer\Module\ProducerModule;
+use domain\Producer\Producer\ProducerModule;
 use yii\helpers\Html;
 
 $producerModule = ProducerModule::getInstance();

common/mail/paymentErrorProducer-html.php

@@ -36,7 +36,7 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\logic\User\User\Module\UserModule;
+use domain\User\User\UserModule;
 use yii\helpers\Html;
 
 $userModule = UserModule::getInstance();

common/mail/paymentErrorProducer-text.php

@@ -36,7 +36,7 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
  */
 
-use common\logic\User\User\Module\UserModule;
+use domain\User\User\UserModule;
 use yii\helpers\Html;
 
 $userModule = UserModule::getInstance();

common/mail/sendDocument-html.php

@@ -36,8 +36,8 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
+use domain\Document\Document\DocumentModule;
 use yii\helpers\Html;
-use common\logic\Document\Document\Module\DocumentModule;
 
 $documentModule = DocumentModule::getInstance();
 

common/mail/sendDocument-text.php

@@ -36,7 +36,7 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-use common\logic\Document\Document\Module\DocumentModule;
+use domain\Document\Document\DocumentModule;
 
 $documentModule = DocumentModule::getInstance();
 

common/mail/signup-html.php

@@ -36,8 +36,8 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
+use domain\User\User\User;
 use yii\helpers\Html;
-use common\logic\User\User\Model\User;
 
 ?>