Refactoring services #885

backend/controllers/AccessController.php

@@ -64,7 +64,7 @@ class AccessController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/CommunicateController.php

@@ -59,7 +59,7 @@ class CommunicateController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/CronController.php

@@ -81,8 +81,8 @@ class CronController extends BackendController
     public function actionInitDemo($key = '')
     {
         if ($key == '45432df6e842ac71aa0b5bb6b9f25d44') {
-            $producerRepository = $this->getLogic()->getProducerContainer()->getRepository();
-            $producer = $producerRepository->getOneDemoAccount();
+            $producerManager = $this->getProducerManager();
+            $producer = $producerManager->findOneProducerDemoAccount();
 
             if ($producer) {
                 // initialisation de la distribution à J+7

backend/controllers/DeliveryNoteController.php

@@ -58,7 +58,7 @@ class DeliveryNoteController extends DocumentController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/DevelopmentController.php

@@ -63,7 +63,7 @@ class DevelopmentController extends Controller
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/DistributionController.php

@@ -96,8 +96,6 @@ class DistributionController extends BackendController
     {
         \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
 
-        $creditHistoryService = \Yii::$app->logic->getCreditHistoryContainer()->getService();
-
         $json = [
             'distribution' => [],
             'products' => []

backend/controllers/DocumentController.php

@@ -69,7 +69,7 @@ class DocumentController extends BackendController
                                         'allow' => true,
                                         'roles' => ['@'],
                                         'matchCallback' => function ($rule, $action) {
-                                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                                            return $this->getUserManager()->hasAccessBackend();
                                         }
                                 ]
                         ],

backend/controllers/OrderController.php

@@ -1042,7 +1042,7 @@ class OrderController extends BackendController
      */
     public function actionPaymentStatus($idOrder)
     {
-        $creditHistoryService = \Yii::$app->logic->getCreditHistoryContainer()->getService();
+        $creditHistoryManager = $this->getCreditHistoryManager();
         $order = Order::searchOne(['id' => $idOrder]);
 
         if ($order) {
@@ -1089,11 +1089,11 @@ class OrderController extends BackendController
                 if ($history && is_array($history) && count($history)) {
                     foreach ($history as $creditHistory) {
                         $html .= '<tr>'
-                            . '<td>' . date('d/m/Y H:i:s', strtotime($creditHistoryService->getDate($creditHistory))) . '</td>'
-                            . '<td>' . Html::encode($creditHistoryService->getStrUserAction($creditHistory)) . '</td>'
-                            . '<td>' . $creditHistoryService->getStrWording($creditHistory) . '</td>'
-                            . '<td>' . ($creditHistoryService->isTypeDebit($creditHistory) ? '- ' . $creditHistoryService->getAmountWithTax($creditHistory, Order::AMOUNT_TOTAL, true) : '') . '</td>'
-                            . '<td>' . ($creditHistoryService->isTypeCredit($creditHistory) ? '+ ' . $creditHistoryService->getAmountWithTax($creditHistory, Order::AMOUNT_TOTAL, true) : '') . '</td>'
+                            . '<td>' . date('d/m/Y H:i:s', strtotime($creditHistoryManager->getDate($creditHistory))) . '</td>'
+                            . '<td>' . Html::encode($creditHistoryManager->getStrUserAction($creditHistory)) . '</td>'
+                            . '<td>' . $creditHistoryManager->getStrWording($creditHistory) . '</td>'
+                            . '<td>' . ($creditHistoryManager->isTypeDebit($creditHistory) ? '- ' . $creditHistoryManager->getAmountWithTax($creditHistory, Order::AMOUNT_TOTAL, true) : '') . '</td>'
+                            . '<td>' . ($creditHistoryManager->isTypeCredit($creditHistory) ? '+ ' . $creditHistoryManager->getAmountWithTax($creditHistory, Order::AMOUNT_TOTAL, true) : '') . '</td>'
                             . '</tr>';
                     }
                 } else {

backend/controllers/PointSaleController.php

@@ -65,7 +65,7 @@ class PointSaleController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ],
                 ],

backend/controllers/ProducerController.php

@@ -70,7 +70,7 @@ class ProducerController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/ProductCategoryController.php

@@ -65,7 +65,7 @@ class ProductCategoryController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ],
                 ],

backend/controllers/ProductController.php

@@ -79,7 +79,7 @@ class ProductController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/QuotationController.php

@@ -60,7 +60,7 @@ class QuotationController extends DocumentController
                                                 'allow' => true,
                                                 'roles' => ['@'],
                                                 'matchCallback' => function ($rule, $action) {
-                                                    return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                                                    return $this->getUserManager()->hasAccessBackend();
                                                 }
                                         ]
                                 ],

backend/controllers/ReportController.php

@@ -56,7 +56,7 @@ class ReportController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/SiteController.php

@@ -68,7 +68,7 @@ class SiteController extends BackendController
                                                 'allow' => true,
                                                 'roles' => ['@'],
                                                 'matchCallback' => function ($rule, $action) {
-                                                    return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                                                    return $this->getUserManager()->hasAccessBackend();
                                                 }
                                         ],
                                         [

backend/controllers/StatsController.php

@@ -58,7 +58,7 @@ class StatsController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/SubscriptionController.php

@@ -53,7 +53,7 @@ class SubscriptionController extends BackendController
                         'allow' => true,
                         'roles' => ['@'],
                         'matchCallback' => function ($rule, $action) {
-                            return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                            return $this->getUserManager()->hasAccessBackend();
                         }
                     ]
                 ],

backend/controllers/UserGroupController.php

@@ -66,7 +66,7 @@ class UserGroupController extends BackendController
                                                 'allow' => true,
                                                 'roles' => ['@'],
                                                 'matchCallback' => function ($rule, $action) {
-                                                    return $this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend();
+                                                    return $this->getUserManager()->hasAccessBackend();
                                                 }
                                         ],
                                 ],

backend/models/CreditForm.php

@@ -96,7 +96,7 @@ class CreditForm extends Model
      */
     public function save() 
     {
-        $creditHistoryService = Yii::$app->logic->getCreditHistoryContainer()->getService();
+        $creditHistoryManager = $this->getCreditHistoryManager();
 
         if ($this->validate()) {
             $creditHistory = new CreditHistory;
@@ -108,7 +108,7 @@ class CreditForm extends Model
             $creditHistory->amount = $this->amount ;
             $creditHistory->mean_payment = $this->mean_payment ;
 
-            $creditHistoryService->save($creditHistory);
+            $creditHistoryManager->save($creditHistory);
             
             // on prévient l'utilisateur que son compte vient d'être crédité
             if($this->send_mail) {

backend/views/development/development.php

@@ -126,7 +126,7 @@ $this->addBreadcrumb($this->getTitle());
         ];
 
 
-        if ($this->getLogic()->getUserContainer()->getSolver()->hasAccessBackend()) {
+        if ($this->getUserManager()->hasAccessBackend()) {
 
                 $columns[] = [
                         'header' => 'Priorité',

backend/views/document/download.php

@@ -138,7 +138,7 @@ $documentPriceDecimals = (int) Producer::getConfig('option_document_price_decima
                         </tr>
 
                         <?php
-                        $taxRateArray = $this->getLogic()->getTaxRateContainer()->getRepository()->getAsArray();
+                        $taxRateArray = $this->getTaxRateManager()->findTaxRatesAsArray();
                         foreach ($document->getTotalVatArray($typeAmount) as $idTaxRate => $totalVat): ?>
                             <tr>
                                 <td class="align-right" colspan="5">

backend/views/user/credit.php

@@ -40,7 +40,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use common\helpers\GlobalParam;
 
-$creditHistoryService = $this->getLogic()->getCreditHistoryContainer()->getService();
+$creditHistoryManager = $this->getCreditHistoryManager();
 
 $this->setTitle('Créditer <small>'.Html::encode($user->lastname.' '.$user->name).'</small>', 'Créditer '.Html::encode($user->lastname.' '.$user->name)) ;
 $this->addBreadcrumb(['label' => 'Utilisateurs', 'url' => ['index']]) ;
@@ -128,21 +128,21 @@ $this->addBreadcrumb('Créditer') ;
                     <?php foreach($history as $creditHistory): ?>
 
                         <tr>
-                            <td><?= $creditHistoryService->getDate($creditHistory, true) ; ?></td>
-                            <td><?= Html::encode($creditHistoryService->getStrUserAction($creditHistory)); ?></td>
-                            <td><?= $creditHistoryService->getStrWording($creditHistory); ?></td>
+                            <td><?= $creditHistoryManager->getDate($creditHistory, true) ; ?></td>
+                            <td><?= Html::encode($creditHistoryManager->getStrUserAction($creditHistory)); ?></td>
+                            <td><?= $creditHistoryManager->getStrWording($creditHistory); ?></td>
                             <td>
-                                <?php if($creditHistoryService->isTypeDebit($creditHistory)): ?>
-                                    - <?= $creditHistoryService->getAmount($creditHistory, true); ?>
+                                <?php if($creditHistoryManager->isTypeDebit($creditHistory)): ?>
+                                    - <?= $creditHistoryManager->getAmount($creditHistory, true); ?>
                                 <?php endif; ?>
                             </td>
                             <td>
-                                <?php if($creditHistoryService->isTypeCredit($creditHistory)): ?>
-                                    + <?= $creditHistoryService->getAmount($creditHistory, true); ?>
+                                <?php if($creditHistoryManager->isTypeCredit($creditHistory)): ?>
+                                    + <?= $creditHistoryManager->getAmount($creditHistory, true); ?>
                                 <?php endif; ?>
                             </td>
                             <td>
-                                <?= $creditHistoryService->getStrMeanPayment($creditHistory) ?>
+                                <?= $creditHistoryManager->getStrMeanPayment($creditHistory) ?>
                             </td>
                             <td>
                                 <?php if(strlen($creditHistory->getComment())): ?>

common/components/ActiveRecordCommon.php

@@ -172,7 +172,7 @@ class ActiveRecordCommon extends \yii\db\ActiveRecord
             return $records->count();
         }
 
-        return false;
+        return null;
     }
 
     public static function groupByPrimaryKey($class, $records)

common/components/View.php

@@ -40,6 +40,8 @@ namespace common\components ;
 
 class View extends \yii\web\View
 {
+    use BusinessLogicContainerTrait;
+
     var $title ;
     var $page_title ;
     var $buttons ;

common/controllers/CommonController.php

@@ -50,7 +50,7 @@ class CommonController extends \yii\web\Controller
     public function beforeAction($event) 
     {
         if (!Yii::$app->user->isGuest) {
-            $this->getUserContainer()->getBuilder()->updateLastConnection(Yii::$app->user->identity);
+            $this->getUserManager()->updateUserLastConnection(Yii::$app->user->identity);
         }
 
         return parent::beforeAction($event);
@@ -83,7 +83,7 @@ class CommonController extends \yii\web\Controller
 
     public function isUserCurrentAdmin()
     {
-        return $this->getUserContainer()->getSolver()->isAdmin($this->getUserCurrent());
+        return $this->getUserManager()->isAdmin($this->getUserCurrent());
     }
 
     public function getRequest()

common/logic/Order/Order/OrderBuilder.php

@@ -74,19 +74,19 @@ class OrderBuilder extends BaseBuilder implements BuilderInterface
         $this->subscriptionSolver = $this->loadService(SubscriptionSolver::class);
     }
 
-    public function instanciateOrder(Distribution $distribution): Order
+    public function instanciateOrder(): Order
     {
         $order = new Order();
-        $order->populateDistribution($distribution);
+        //$order->populateDistribution($distribution);
         $order->date = date('Y-m-d H:i:s');
         $order->status = 'tmp-order';
 
         return $order;
     }
 
-    public function createOrder(Distribution $distribution): Order
+    public function createOrder(): Order
     {
-        $order = $this->instanciateOrder($distribution);
+        $order = $this->instanciateOrder();
 
         $this->createUserPointSale($order);
         $this->initOrderCommentPointSale($order);

common/logic/Product/Product/ProductRepository.php

@@ -36,6 +36,11 @@ class ProductRepository extends BaseService implements RepositoryInterface
         ];
     }
 
+    public function findOneProductById(int $id): ?Product
+    {
+        return Product::searchOne(['id' => $id]);
+    }
+
     public function findProducts(): array
     {
         return Product::searchAll();

common/logic/Product/Product/ProductSolver.php

@@ -18,7 +18,7 @@ class ProductSolver extends BaseService implements SolverInterface
         $this->productPriceSolver = $this->loadService(ProductPriceSolver::class);
     }
 
-    public function getPrice(Product $product, array $params = []): float
+    public function getPrice(Product $product, array $params = []): ?float
     {
         $specificPriceArray = $product->productPrice;
 

common/logic/Product/ProductCategory/ProductCategoryRepository.php

@@ -14,7 +14,7 @@ class ProductCategoryRepository extends BaseService implements RepositoryInterfa
             'with' => [],
             'join_with' => [],
             'orderby' => '',
-            'attribute_id_producer' => ''
+            'attribute_id_producer' => 'id_producer'
         ];
     }
 

common/logic/Subscription/Subscription/SubscriptionSearch.php

@@ -56,8 +56,9 @@ class SubscriptionSearch extends Subscription
     }
     
     public function search($params) {
-        
-        $optionsSearch = self::getDefaultOptionsSearch() ;
+
+        $subscriptionManager = new SubscriptionManager();
+        $optionsSearch = $subscriptionManager->getDefaultOptionsSearch() ;
         
         $query = Subscription::find()
             ->with($optionsSearch['with'])

common/logic/User/CreditHistory/CreditHistorySearch.php

@@ -56,7 +56,8 @@ class CreditHistorySearch extends CreditHistory
     
     public function search($params) 
     {
-        $optionsSearch = CreditHistoryRepository::getDefaultOptionsSearch() ;
+        $creditHistoryManager = new CreditHistoryManager();
+        $optionsSearch = $creditHistoryManager->getDefaultOptionsSearch() ;
         
         $query = CreditHistory::find()
             ->with($optionsSearch['with'])

producer/controllers/CreditController.php

@@ -215,9 +215,9 @@ class CreditController extends ProducerBaseController
         $idProducer = $paymentIntentMetadata->producer_id;
 
         if (isset($paymentIntentMetadata->order_id)) {
-            $order = $this->getOrderManager()->findOneById($paymentIntentMetadata->order_id);
+            $order = $this->getOrderManager()->findOneOrderById($paymentIntentMetadata->order_id);
             $pointSale = $this->getPointSaleManager()->findOnePointSaleById($order->id_point_sale);
-            $distribution = $this->getDistributionManager()->getOneById($order->id_distribution);
+            $distribution = $this->getDistributionManager()->findOneDistributionById($order->id_distribution);
         }
 
         // Handle the event

producer/controllers/OrderController.php

@@ -40,10 +40,13 @@ namespace producer\controllers;
 
 use common\helpers\GlobalParam;
 use common\helpers\Mailjet;
+use common\helpers\Password;
 use common\logic\Distribution\Distribution\Distribution;
 use common\logic\Order\Order\Order;
+use common\logic\Order\ProductOrder\ProductOrder;
 use common\logic\PointSale\PointSale\PointSale;
 use common\logic\Producer\Producer\Producer;
+use common\logic\Product\Product\Product;
 use common\logic\User\CreditHistory\CreditHistory;
 use common\logic\User\User\User;
 use common\logic\User\UserProducer\UserProducer;
@@ -72,7 +75,7 @@ class OrderController extends ProducerBaseController
             );
         }
 
-        $order = $this->getOrderManager()->findOneById($id);
+        $order = $this->getOrderManager()->findOneOrderById($id);
         if ($order && $this->getOrderManager()->isOrderStateOpen($order)) {
             $params['order'] = $order;
         }
@@ -90,7 +93,7 @@ class OrderController extends ProducerBaseController
     public function actionHistory($type = 'incoming')
     {
         $queryHistoryArray = $this->getOrderManager()
-            ->queryHistory($this->getProducer(), $this->getUserCurrent(), $type);
+            ->queryOrdersHistory($this->getProducer(), $this->getUserCurrent(), $type);
         $queryHistoryIncoming = $queryHistoryArray['incoming'];
         $queryHistoryPassed = $queryHistoryArray['passed'];
 
@@ -111,14 +114,11 @@ class OrderController extends ProducerBaseController
         ]);
     }
 
-    /**
-     * Supprime un producteur.
-     */
     public function actionRemoveProducer(int $id = 0)
     {
-        $producer = $this->getProducerContainer()->getRepository()->getOneById($id);
+        $producer = $this->getProducerManager()->findOneProducerById($id);
 
-        $this->getUserProducerContainer()->getBuilder()->updateActive(
+        $this->getUserProducerManager()->updateActive(
             $this->getUserCurrent(),
             $producer,
             false
@@ -133,12 +133,14 @@ class OrderController extends ProducerBaseController
     public function actionAjaxProcess()
     {
         \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $posts = \Yii::$app->request->post();
+
+        $orderManager = $this->getOrderManager();
+        $producerManager = $this->getProducerManager();
         $redirect = null;
-        $order = new Order;
         $producer = $this->getProducer();
         $idProducer = $producer->id;
-
-        $posts = \Yii::$app->request->post();
+        $order = $orderManager->instanciateOrder();
 
         if ($idProducer) {
             $this->_verifyProducerActive($idProducer);
@@ -204,7 +206,7 @@ class OrderController extends ProducerBaseController
                 }
 
                 $order = new Order;
-                $order->load(Yii::$app->request->post());
+                $order->load(\Yii::$app->request->post());
                 $order->id_user = $user ? $user->id : null;
                 $order->status = 'tmp-order';
                 $order->date = date('Y-m-d H:i:s');
@@ -217,13 +219,10 @@ class OrderController extends ProducerBaseController
                 return ['status' => 'error', 'errors' => $errors];
             }
 
-            if ($producer->isOnlinePaymentActiveAndTypeOrder()) {
-                $order = Order::searchOne([
-                    'id' => $order->id
-                ]);
-
+            if ($producerManager->isOnlinePaymentActiveAndTypeOrder($producer)) {
+                $order = $orderManager->findOneOrderById($order->id);
                 \Stripe\Stripe::setApiKey(
-                    $producer->getPrivateKeyApiStripe()
+                    $producerManager->getPrivateKeyApiStripe($producer)
                 );
 
                 $lineItems = [];
@@ -233,7 +232,7 @@ class OrderController extends ProducerBaseController
                         'price_data' => [
                             'currency' => 'eur',
                             'product_data' => [
-                                'name' => $product->name . ' (' . $productOrder->quantity . ' ' . Product::strUnit(
+                                'name' => $product->name . ' (' . $productOrder->quantity . ' ' . $this->getProductManager()->strUnit(
                                         $product->unit,
                                         'wording_short',
                                         true
@@ -258,14 +257,14 @@ class OrderController extends ProducerBaseController
                             'order_id' => $order->id
                         ],
                     ],
-                    'success_url' => \Yii::$app->urlManagerProducer->createAbsoluteUrl(
+                    'success_url' => $this->getUrlManagerProducer()->createAbsoluteUrl(
                         [
                             'order/confirm',
                             'idOrder' => $order->id,
                             'returnPayment' => 'success'
                         ]
                     ),
-                    'cancel_url' => \Yii::$app->urlManagerProducer->createAbsoluteUrl(
+                    'cancel_url' => $this->getUrlManagerProducer()->createAbsoluteUrl(
                         [
                             'order/confirm',
                             'idOrder' => $order->id,
@@ -288,7 +287,7 @@ class OrderController extends ProducerBaseController
      */
     public function _verifyProducerActive($idProducer)
     {
-        $producer = Producer::findOne($idProducer);
+        $producer = $this->getProducerManager()->findOneProducerById($idProducer);
         if ($producer && !$producer->active) {
             throw new NotFoundHttpException('Ce producteur est actuellement hors ligne.');
         }
@@ -299,6 +298,18 @@ class OrderController extends ProducerBaseController
      */
     public function processForm($order, $user)
     {
+        $productManager = $this->getProductManager();
+        $distributionManager = $this->getDistributionManager();
+        $pointSaleDistributionManager = $this->getPointSaleDistributionManager();
+        $pointSaleManager = $this->getPointSaleManager();
+        $userPointSaleManager = $this->getUserPointSaleManager();
+        $userProducerManager = $this->getUserProducerManager();
+        $orderManager = $this->getOrderManager();
+        $producerManager = $this->getProducerManager();
+        $productOrderManager = $this->getProductOrderManager();
+        $userManager = $this->getUserManager();
+        $creditHistoryManager = $this->getCreditHistoryManager();
+
         $posts = \Yii::$app->request->post();
         $productsArray = [];
         $totalQuantity = 0;
@@ -310,51 +321,40 @@ class OrderController extends ProducerBaseController
         }
 
         foreach ($posts['products'] as $key => $quantity) {
-            $product = Product::find()->where(['id' => (int)$key])->one();
+            $product = $productManager->findOneProductById((int)$key);
+
             $totalQuantity += $quantity;
             if ($product && $quantity) {
                 $productsArray[] = $product;
             }
         }
 
-        // date
         $errorDate = false;
         if (isset($order->id_distribution)) {
-            // date de commande
-            $distribution = DistributionModel::find()->where(['id' => $order->id_distribution])->one();
-
+            $distribution = $distributionManager->findOneDistributionById($order->id_distribution);
             if ($order->getState() != Order::STATE_OPEN) {
                 $errorDate = true;
             }
         }
 
-        // point de vente
         $errorPointSale = false;
         if (isset($distribution) && $distribution) {
-            $pointSaleDistribution = PointSaleDistributionModel::searchOne([
-                'id_distribution' => $distribution->id,
-                'id_point_sale' => $posts['Order']['id_point_sale']
-            ]);
+            $pointSale = $pointSaleManager->findOnePointSaleById($posts['Order']['id_point_sale']);
+            $pointSaleDistribution = $pointSaleDistributionManager->findOnePointSaleDistribution($distribution, $pointSale);
 
             if (!$pointSaleDistribution || !$pointSaleDistribution->delivery) {
                 $errorPointSale = true;
             }
 
-            $pointSale = PointSale::findOne($posts['Order']['id_point_sale']);
-
             if ($pointSale) {
-                if (strlen($pointSale->code) && !$pointSale->validateCode($posts['code_point_sale'])) {
+                if (strlen($pointSale->code) && !$pointSaleManager->validateCode($pointSale, $posts['code_point_sale'])) {
                     $errorPointSale = true;
                 }
             } else {
                 $errorPointSale = true;
             }
 
-            $userPointSale = UserPointSale::searchOne([
-                'id_user' => GlobalParam::getCurrentUserId(),
-                'id_point_sale' => $pointSale->id
-            ]);
-
+            $userPointSale = $userPointSaleManager->findOneUserPointSale(GlobalParam::getCurrentUser(), $pointSale);
             if ($pointSale->restricted_access && !$userPointSale) {
                 $errorPointSale = true;
             }
@@ -363,15 +363,8 @@ class OrderController extends ProducerBaseController
         $errors = [];
 
         if ($order->validate() && count($productsArray) && !$errorDate && !$errorPointSale) {
-            $userProducer = UserProducer::searchOne([
-                'id_producer' => $order->distribution->id_producer,
-                'id_user' => $user->id
-            ]);
-
-            // gestion point de vente
-            $pointSale = PointSale::searchOne([
-                'id' => $order->id_point_sale
-            ]);
+            $userProducer = $userProducerManager->findOneUserProducer($user, $producer);
+            $pointSale = $pointSaleManager->findOnePointSaleById($order->id_point_sale);
 
             // commentaire point de vente
             $order->comment_point_sale = ($pointSale && strlen($pointSale->getComment())) ?
@@ -390,18 +383,14 @@ class OrderController extends ProducerBaseController
             // sauvegarde de la commande
             $order->save();
 
-            $order->initReference();
-
-            $order->changeOrderStatus('new-order', 'user');
-
-            // ajout de l'utilisateur à l'établissement
-            Producer::addUser($user->id, $distribution->id_producer);
+            $orderManager->generateOrderReference($order);
+            $orderManager->changeOrderStatus($order, 'new-order', 'user');
+            $producerManager->addUser($user, $producer);
 
             // suppression de tous les enregistrements ProductOrder
             if (!is_null($order)) {
-                ProductOrder::deleteAll(['id_order' => $order->id]);
+                $productOrderManager->deleteProductOrdersByOrder($order);
 
-                $stepsArray = [];
                 if (isset($order->productOrder)) {
                     foreach ($order->productOrder as $productOrder) {
                         $unitsArray[$productOrder->id_product] = $productOrder->unit;
@@ -409,10 +398,7 @@ class OrderController extends ProducerBaseController
                 }
             }
 
-            // produits dispos
-            $availableProducts = ProductDistributionModel::searchByDistribution($distribution->id);
-
-            // sauvegarde des produits
+            $availableProducts = $productManager->findProductsByDistribution($distribution);
             foreach ($productsArray as $product) {
                 if (isset($availableProducts[$product->id])) {
                     $productOrder = new ProductOrder();
@@ -429,7 +415,7 @@ class OrderController extends ProducerBaseController
                     }
                     $productOrder->quantity = $quantity;
                     $productOrder->price = $product->getPrice([
-                        'user' => User::getCurrent(),
+                        'user' => GlobalParam::getCurrentUser(),
                         'user_producer' => $userProducer,
                         'point_sale' => $pointSale,
                         'quantity' => $quantity
@@ -441,64 +427,61 @@ class OrderController extends ProducerBaseController
             }
 
             // lien utilisateur / point de vente
-            $pointSale->linkUser($user->id);
+            $pointSaleManager->addUser($user, $pointSale);
 
             // credit
-            $credit = Producer::getConfig('credit');
-            $creditLimit = Producer::getConfig('credit_limit');
-            $creditFunctioning = $pointSale->getCreditFunctioning();
-            $creditUser = $user->getCredit($distribution->id_producer);
-            $order = Order::searchOne([
-                'id' => $order->id
-            ]);
-            $amountPaid = $order->getAmount(Order::AMOUNT_PAID);
-            $amountRemaining = $order->getAmount(Order::AMOUNT_REMAINING);
+            $credit = $producerManager->getConfig('credit');
+            $creditLimit = $producerManager->getConfig('credit_limit');
+            $creditFunctioning = $pointSaleManager->getPointSaleCreditFunctioning($pointSale);
+            $creditUser = $userManager->getCredit($user, $producer);
+            $order = $orderManager->findOneOrderById($order->id);
+            $amountRemaining = $orderManager->getAmount($order, Order::AMOUNT_REMAINING);
 
             if ($credit && $pointSale->credit &&
                 (($creditFunctioning == Producer::CREDIT_FUNCTIONING_OPTIONAL && $posts['use_credit']) ||
                     $creditFunctioning == Producer::CREDIT_FUNCTIONING_MANDATORY ||
                     ($creditFunctioning == Producer::CREDIT_FUNCTIONING_USER && $userProducer->credit_active)
                 )) {
-                $order->changeOrderStatus('waiting-paiement-by-credit', 'user');
+                $orderManager->changeOrderStatus($order, 'waiting-paiement-by-credit', 'user');
 
                 // à payer
-                if ($order->getPaymentStatus() == Order::PAYMENT_UNPAID) {
+                if ($orderManager->getPaymentStatus($order) == Order::PAYMENT_UNPAID) {
                     if (!is_null($creditLimit) && $amountRemaining > $creditUser - $creditLimit) {
                         $amountRemaining = $creditUser - $creditLimit;
                     }
 
                     if ($amountRemaining > 0) {
-                        $order->saveCreditHistory(
+                        $creditHistoryManager->createCreditHistory(
                             CreditHistory::TYPE_PAYMENT,
                             $amountRemaining,
-                            $distribution->id_producer,
-                            GlobalParam::getCurrentUserId(),
-                            GlobalParam::getCurrentUserId()
+                            $producer,
+                            GlobalParam::getCurrentUser(),
+                            GlobalParam::getCurrentUser()
                         );
-                        $order->changeOrderStatus('paid-by-credit', 'user');
+                        $orderManager->changeOrderStatus($order, 'paid-by-credit', 'user');
                     } else {
-                        $order->changeOrderStatus('waiting-paiement-on-delivery', 'user');
+                        $orderManager->changeOrderStatus($order, 'waiting-paiement-on-delivery', 'user');
                     }
                 } // surplus à rembourser
                 elseif ($order->getPaymentStatus() == Order::PAYMENT_SURPLUS) {
-                    $amountSurplus = $order->getAmount(Order::AMOUNT_SURPLUS);
-                    $order->saveCreditHistory(
+                    $amountSurplus = $orderManager->getAmount($order, Order::AMOUNT_SURPLUS);
+                    $creditHistoryManager->createCreditHistory(
                         CreditHistory::TYPE_REFUND,
                         $amountSurplus,
-                        $distribution->id_producer,
-                        GlobalParam::getCurrentUserId(),
-                        GlobalParam::getCurrentUserId()
+                        $producer,
+                        GlobalParam::getCurrentUser(),
+                        GlobalParam::getCurrentUser()
                     );
                 }
             } else {
-                $order->changeOrderStatus('waiting-paiement-on-delivery', 'user');
+                $orderManager->changeOrderStatus($order, 'waiting-paiement-on-delivery', 'user');
             }
 
             $paramsEmail = [
-                'from_email' => $producer->getEmailOpendistrib(),
+                'from_email' => $producerManager->getEmailOpendistrib($producer),
                 'from_name' => $producer->name,
                 'to_email' => $user->email,
-                'to_name' => $user->getUsername(),
+                'to_name' => $userManager->getUsername($user),
                 'subject' => '[' . $producer->name . '] Confirmation de commande',
                 'content_view_text' => '@common/mail/orderConfirm-text.php',
                 'content_view_html' => '@common/mail/orderConfirm-html.php',
@@ -516,13 +499,13 @@ class OrderController extends ProducerBaseController
              */
             if ($isNewOrder) {
                 // au client
-                if (Producer::getConfig('option_email_confirm')) {
+                if ($producerManager->getConfig('option_email_confirm')) {
                     Mailjet::sendMail($paramsEmail);
                 }
 
                 // au producteur
-                $contactProducer = $producer->getMainContact();
-                if (Producer::getConfig('option_email_confirm_producer') && $contactProducer && strlen(
+                $contactProducer = $producerManager->getMainContact($producer);
+                if ($producerManager->getConfig('option_email_confirm_producer') && $contactProducer && strlen(
                         $contactProducer->email
                     )) {
                     $paramsEmail['to_email'] = $contactProducer->email;
@@ -533,7 +516,7 @@ class OrderController extends ProducerBaseController
                 }
             }
 
-            $order->setTillerSynchronization();
+            $orderManager->setTillerSynchronization($order);
         }
 
 
@@ -555,22 +538,23 @@ class OrderController extends ProducerBaseController
      */
     public function actionCancel(int $id)
     {
-        $order = $this->getOrderManager()->findOneById($id);
+        $orderManager = $this->getOrderManager();
+        $order = $this->getOrderManager()->findOneOrderById($id);
 
         if (!$order) {
             throw new \yii\web\NotFoundHttpException('Commande introuvable');
         }
 
-        if ($this->getOrderManager()->isOrderStateOpen($order)) {
+        if ($orderManager->isOrderStateOpen($order)) {
             throw new UserException('Vous ne pouvez plus annuler cette commande.');
         }
 
-        if ($this->getOrderManager()->isOrderbelongsToUser($order, GlobalParam::getCurrentUser())) {
-            $orderContainer->getBuilder()->delete($order);
-            \Yii::$app->session->setFlash('success', 'Votre commande a bien été annulée.');
+        if ($orderManager->isOrderbelongsToUser($order, GlobalParam::getCurrentUser())) {
+            $orderManager->deleteOrder($order);
+            $this->setFlash('success', 'Votre commande a bien été annulée.');
         }
 
-        $this->redirect(\Yii::$app->urlManager->createUrl(['order/history']));
+        return $this->redirect($this->getUrlManagerProducer()->createUrl(['order/history']));
     }
 
     /**
@@ -578,10 +562,11 @@ class OrderController extends ProducerBaseController
      */
     public function actionConfirm(int $idOrder, string $returnPayment = '')
     {
-        $order = $this->getOrderManager()->findOneById($idOrder);
+        $orderManager = $this->getOrderManager();
+        $order = $orderManager->findOneOrderById($idOrder);
         $producer = $this->getProducer();
 
-        if (!$order || (!$this->getOrderManager()->isOrderBelongsToUser($order, GlobalParam::getCurrentUser()) && !$producer->option_allow_order_guest)) {
+        if (!$order || (!$orderManager->isOrderBelongsToUser($order, GlobalParam::getCurrentUser()) && !$producer->option_allow_order_guest)) {
             throw new \yii\base\UserException('Commande introuvable.');
         }
 
@@ -597,10 +582,10 @@ class OrderController extends ProducerBaseController
     public function actionAjaxValidateCodePointSale(int $idPointSale, string $code)
     {
         \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-        $pointSaleContainer = $this->getPointSaleContainer();
-        $pointSale = $pointSaleContainer->getRepository()->getOneById($idPointSale);
+        $pointSaleManager = $this->getPointSaleManager();
+        $pointSale = $pointSaleManager->findOnePointSaleById($idPointSale);
 
-        if ($pointSale && $pointSaleContainer->getSolver()->validateCode($pointSale, $code)) {
+        if ($pointSale && $pointSaleManager->validateCode($pointSale, $code)) {
             return 1;
         }
 
@@ -612,7 +597,7 @@ class OrderController extends ProducerBaseController
         \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
         $user = GlobalParam::getCurrentUser();
         $producer = $this->getProducer();
-        $pointSale = $this->getPointSaleContainer()->getRepository()->getOneById($pointSaleId);
+        $pointSale = $this->getPointSaleManager()->findOnePointSaleById($pointSaleId);
         $order = $this->getOrderUser($date, $pointSale);
 
         return $this->buildJsonAjaxInfos($date, $producer, $pointSale, $user, $order);
@@ -665,9 +650,10 @@ class OrderController extends ProducerBaseController
 
     public function ajaxInfosDistributions(Producer $producer, PointSale $pointSaleCurrent = null)
     {
+        $distributionManager = $this->getDistributionManager();
         $dateMini = date('Y-m-d');
 
-        $distributionsArray = DistributionModel::searchAll([
+        $distributionsArray = Distribution::searchAll([
             'active' => 1,
             'id_producer' => $producer->id
         ], [
@@ -675,17 +661,17 @@ class OrderController extends ProducerBaseController
             'params' => [':date' => $dateMini],
             'join_with' => ['pointSaleDistribution'],
         ]);
-        $distributionsArray = DistributionModel::filterDistributionsByDateDelay($distributionsArray);
+        $distributionsArray = $distributionManager->filterDistributionsByDateDelay($distributionsArray);
 
         // Filtre par point de vente
-        if ($pointSaleId && $producer->option_order_entry_point == Producer::ORDER_ENTRY_POINT_POINT_SALE) {
+        if ($pointSaleCurrent && $producer->option_order_entry_point == Producer::ORDER_ENTRY_POINT_POINT_SALE) {
             $distributionsArrayFilterPointSale = [];
             for ($i = 0; $i < count($distributionsArray); $i++) {
                 $distribution = $distributionsArray[$i];
-                if (Distribution::isPointSaleActive($distribution, $pointSaleId)) {
-                    $countOrders = (int)Order::searchCount([
+                if ($distributionManager->isPointSaleActive($distribution, $pointSaleCurrent)) {
+                    $countOrders = Order::searchCount([
                         'id_distribution' => $distribution->id,
-                        'id_point_sale' => $pointSaleId
+                        'id_point_sale' => $pointSaleCurrent->id
                     ]);
                     $orderUserPointSale = $this->_getOrderUser($distribution->date, $pointSaleId);
 
@@ -704,10 +690,14 @@ class OrderController extends ProducerBaseController
         }
     }
 
-    public function ajaxInfosOrders(Producer $producer): array
+    public function ajaxInfosOrders(Producer $producer, PointSale $pointSaleCurrent = null): array
     {
+        $producerManager = $this->getProducerManager();
+        $orderManager = $this->getOrderManager();
+
+        $dateMini = date('Y-m-d');
         $ordersUserArray = [];
-        if (GlobalParam::getCurrentUserId() && !$producer->isOnlinePaymentActiveAndTypeOrder()) {
+        if (GlobalParam::getCurrentUserId() && !$producerManager->isOnlinePaymentActiveAndTypeOrder($producer)) {
             $conditionsOrdersUser = [
                 'distribution.date > :date'
             ];
@@ -715,9 +705,9 @@ class OrderController extends ProducerBaseController
                 ':date' => $dateMini
             ];
 
-            if ($pointSaleId && $producer->option_order_entry_point == Producer::ORDER_ENTRY_POINT_POINT_SALE) {
+            if ($pointSaleCurrent && $producer->option_order_entry_point == Producer::ORDER_ENTRY_POINT_POINT_SALE) {
                 $conditionsOrdersUser[] = 'order.id_point_sale = :id_point_sale';
-                $paramsOrdersUser[':id_point_sale'] = $pointSaleId;
+                $paramsOrdersUser[':id_point_sale'] = $pointSaleCurrent->id;
             }
 
             $ordersUserArray = Order::searchAll([
@@ -731,7 +721,7 @@ class OrderController extends ProducerBaseController
         if (is_array($ordersUserArray) && count($ordersUserArray)) {
             foreach ($ordersUserArray as &$order) {
                 $order = array_merge($order->getAttributes(), [
-                    'amount_total' => $order->getAmountWithTax(Order::AMOUNT_TOTAL),
+                    'amount_total' => $orderManager->getAmountWithTax($order, Order::AMOUNT_TOTAL),
                     'date_distribution' => $order->distribution->date,
                     'pointSale' => $order->pointSale->getAttributes()
                 ]);
@@ -743,13 +733,14 @@ class OrderController extends ProducerBaseController
 
     public function ajaxInfosUser(Producer $producer)
     {
-        $userProducer = UserProducer::searchOne([
-            'id_producer' => $producer->id,
-            'id_user' => GlobalParam::getCurrentUserId()
-        ]);
+        $userProducerManager = $this->getUserProducerManager();
+        $producerManager = $this->getProducerManager();
+
+        $user = GlobalParam::getCurrentUser();
+        $userProducer = $userProducerManager->findOneUserProducer($user, $producer);
 
         if ($user && !$userProducer) {
-            $userProducer = Producer::addUser($user->id, $producer->id);
+            $userProducer = $producerManager->addUser($user, $producer);
         }
 
         $jsonUser = false;
@@ -766,6 +757,10 @@ class OrderController extends ProducerBaseController
 
     private function ajaxInfosPointsSale($idProducer, $distribution = false)
     {
+        $userManager = $this->getUserManager();
+        $producerManager = $this->getProducerManager();
+
+        $user = GlobalParam::getCurrentUser();
         $pointsSaleArray = PointSale::find();
 
         if ($distribution) {
@@ -801,7 +796,7 @@ class OrderController extends ProducerBaseController
             ->orderBy('code ASC, restricted_access ASC, is_bread_box ASC, `default` DESC, name ASC')
             ->all();
 
-        $creditFunctioningProducer = Producer::getConfig('credit_functioning');
+        $creditFunctioningProducer = $producerManager->getConfig('credit_functioning');
         $position = 0;
 
         foreach ($pointsSaleArray as &$pointSale) {
@@ -832,8 +827,8 @@ class OrderController extends ProducerBaseController
         }
 
         $favoritePointSale = false;
-        if (User::getCurrent()) {
-            $favoritePointSale = User::getCurrent()->getFavoritePointSale();
+        if ($user) {
+            $favoritePointSale = $userManager->getUserFavoritePointSale($user);
         }
 
         if ($favoritePointSale) {
@@ -856,10 +851,8 @@ class OrderController extends ProducerBaseController
 
     public function ajaxInfosProductCategories(Producer $producer)
     {
-        $categoriesArray = $this->getProductCategoryContainer()->getRepository()
-            ->getAsArray();
-        $countProductsWithoutCategory = $this->getProductContainer()->getRepository()
-            ->countProductsWithoutCategory($producer);
+        $categoriesArray = $this->getProductCategoryManager()->findProductCategoriesAsArray();
+        $countProductsWithoutCategory = $this->getProductManager()->countProductsWithoutCategory($producer);
 
         if ($countProductsWithoutCategory) {
             array_unshift($categoriesArray, ['id' => null, 'name' => 'Catégorie par défaut']);
@@ -876,7 +869,9 @@ class OrderController extends ProducerBaseController
         Order $order = null
     )
     {
-        $ordersArray = $this->getOrderManager()->findByDistribution($distribution);
+        $productManager = $this->getProductManager();
+        $orderManager = $this->getOrderManager();
+        $ordersArray = $this->getOrderManager()->findOrdersByDistribution($distribution);
 
         $productsArray = Product::find()
             ->where([
@@ -901,18 +896,19 @@ class OrderController extends ProducerBaseController
 
         // filtre sur les points de vente
         foreach ($productsArray as $product) {
-            if ($product->isAvailableOnPointSale($pointSale)) {
+            if ($productManager->isAvailableOnPointSale($product, $pointSale)) {
                 $productsArrayFilter[] = $product;
             }
         }
 
         $indexProduct = 0;
         foreach ($productsArrayFilter as $key => &$product) {
+            $productObject = $product;
             $product = array_merge(
                 $product->getAttributes(),
                 [
                     'unit_coefficient' => Product::$unitsArray[$product->unit]['coefficient'],
-                    'prices' => $product->getPriceArray($user, $pointSale),
+                    'prices' => $productManager->getPriceArray($product, $user, $pointSale),
                     'productDistribution' => $product['productDistribution'],
                     'productPointSale' => $product['productPointSale'],
                 ]
@@ -925,26 +921,26 @@ class OrderController extends ProducerBaseController
             }
 
             $product['quantity_max'] = $product['productDistribution'][0]['quantity_max'];
-            $quantityOrder = Order::getProductQuantity($product['id'], $ordersArray);
+            $quantityOrder = $orderManager->getProductQuantity($productObject, $ordersArray);
             $product['quantity_ordered'] = $quantityOrder;
             $product['quantity_remaining'] = $product['quantity_max'] - $quantityOrder;
-            $product['wording_unit'] = Product::strUnit($product['unit'], 'wording_unit', true);
-            $product['wording_unit_ref'] = Product::strUnit($product['unit'], 'wording_short', true);
+            $product['wording_unit'] = $productManager->strUnit($product['unit'], 'wording_unit', true);
+            $product['wording_unit_ref'] = $productManager->strUnit($product['unit'], 'wording_short', true);
 
             if ($order) {
-                $quantityOrderUser = Order::getProductQuantity($product['id'], [$order], true);
+                $quantityOrderUser = $orderManager->getProductQuantity($productObject, [$order], true);
                 $product['quantity_ordered'] = $quantityOrder;
                 $product['quantity_remaining'] = $product['quantity_max'] - $quantityOrder + $quantityOrderUser;
                 $product['quantity_form'] = $quantityOrderUser * $coefficient_unit;
                 foreach ($order->productOrder as $productOrder) {
                     if ($productOrder->id_product == $product['id']) {
-                        $product['wording_unit'] = Product::strUnit($productOrder->unit, 'wording_unit', true);
+                        $product['wording_unit'] = $productManager->strUnit($productOrder->unit, 'wording_unit', true);
                         $product['step'] = $productOrder->step;
                     }
                 }
             } else {
                 $product['quantity_form'] = 0;
-                $product['wording_unit'] = Product::strUnit($product['unit'], 'wording_unit', true);
+                $product['wording_unit'] = $productManager->strUnit($product['unit'], 'wording_unit', true);
             }
             $product['coefficient_unit'] = $coefficient_unit;
 
@@ -959,6 +955,8 @@ class OrderController extends ProducerBaseController
 
     private function getOrderUser(string $date, PointSale $pointSale = null)
     {
+        $orderManager = $this->getOrderManager();
+
         $orderUser = false;
         if (GlobalParam::getCurrentUserId()) {
             $conditionOrderUser = [
@@ -966,8 +964,8 @@ class OrderController extends ProducerBaseController
                 'id_user' => GlobalParam::getCurrentUserId(),
             ];
 
-            if ($pointSaleId) {
-                $conditionOrderUser['id_point_sale'] = $pointSaleId;
+            if ($pointSale) {
+                $conditionOrderUser['id_point_sale'] = $pointSale;
             }
 
             $orderUser = Order::searchOne($conditionOrderUser);
@@ -979,8 +977,8 @@ class OrderController extends ProducerBaseController
 
         if ($orderUser) {
             $json['order'] = array_merge($orderUser->getAttributes(), [
-                'amount_total' => $orderUser->getAmountWithTax(Order::AMOUNT_TOTAL),
-                'amount_paid' => $orderUser->getAmount(Order::AMOUNT_PAID),
+                'amount_total' => $orderManager->getAmountWithTax($orderUser, Order::AMOUNT_TOTAL),
+                'amount_paid' => $orderManager->getAmount($orderUser, Order::AMOUNT_PAID),
             ]);
         }
 

producer/controllers/SiteController.php

@@ -90,18 +90,18 @@ class SiteController extends ProducerBaseController
     public function actionIndex()
     {
         $dataProviderPointsSale = new ActiveDataProvider([
-            'query' => $this->getPointSaleContainer()->getRepostory()->queryPublic($this->getProducer()),
+            'query' => $this->getPointSaleManager()->queryPointSalesPublic($this->getProducer()),
             'pagination' => [
                 'pageSize' => 50,
             ],
             'sort' => false,
         ]);
 
-        $productCategoryArray = $this->getProductCategoryContainer()->getRepository()->get();
+        $productCategoryArray = $this->getProductCategoryManager()->findProductCategories();
         $dataProviderProductsByCategories = [];
         foreach ($productCategoryArray as $productCategory) {
             $dataProviderProductsByCategories[$productCategory->id] = new ActiveDataProvider([
-                'query' => $this->getProductContainer()->getRepository()->queryByProductCategory($productCategory),
+                'query' => $this->getProductManager()->queryProductsByProductCategory($productCategory),
                 'pagination' => [
                     'pageSize' => 500,
                 ],
@@ -166,7 +166,7 @@ class SiteController extends ProducerBaseController
         if ($model->load(\Yii::$app->request->post()) && $model->validate()) {
             $isSent = false;
             if (is_array($producer->contact)) {
-                $email = $this->getLogic()->getProducerContainer()->getSolver()->getMainContactEmail($producer);
+                $email = $this->getProducerManager()->getMainContactEmail($producer);
                 if (strlen($email) && $model->sendEmail($email)) {
                     $isSent = true;
                 }
@@ -193,8 +193,8 @@ class SiteController extends ProducerBaseController
     public function actionBookmarks(string $action)
     {
         $producer = $this->getProducer();
-        $userProducer = $this->getLogic()->getUserProducerContainer()
-            ->getBuilder()->createIfNotExist(GlobalParam::getCurrentUser(), $producer);
+        $userProducer = $this->getUserProducerManager()
+            ->createUserProducerIfNotExist(GlobalParam::getCurrentUser(), $producer);
 
         if ($action == 'add') {
             $userProducer->bookmark = 1;

producer/views/credit/add.php

@@ -40,6 +40,9 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use common\logic\Producer\Producer\Producer;
 
+$producerManager = $this->getProducerManager();
+$producer = $this->context->getProducer();
+
 $this->setTitle('Créditer mon compte');
 $this->setPageTitle('Crédit mon compte');
 
@@ -63,7 +66,7 @@ $this->addButton(
             'template' => '{label}<div class="input-group input-group-lg">{input}<span class="input-group-addon"><span class="glyphicon glyphicon-euro"></span></span></div>{hint}',
     ])
             ->label('Quel montant souhaitez-vous créditer ?')
-            ->hint('Montant minimum : '.Producer::getOnlinePaymentMinimumAmount().' €'); ?>
+            ->hint('Montant minimum : '.$producerManager->getOnlinePaymentMinimumAmount($producer).' €'); ?>
 
     <div class="form-group">
         <?= Html::submitButton('<span class="glyphicon glyphicon-lock"></span> Payer', ['class' => 'btn btn-primary']

producer/views/credit/history.php

@@ -38,7 +38,7 @@
 
 use yii\grid\GridView;
 
-$creditHistorySolver = \Yii::$app->logic->getCreditHistoryContainer()->getSolver();
+$creditHistoryManager = $this->getCreditHistoryManager();
 $producer = $this->context->getProducer();
 $this->setTitle('Crédit : <span id="credit-user">' . number_format($creditUser, 2) . ' €</span>');
 $this->setPageTitle('Crédit');
@@ -60,35 +60,35 @@ if ($this->context->getProducer()->online_payment) {
     'columns' => [
         [
             'attribute' => 'date',
-            'value' => function ($model) use ($creditHistorySolver) {
-                return $creditHistorySolver->getDate($model, true);
+            'value' => function ($model) use ($creditHistoryManager) {
+                return $creditHistoryManager->getDate($model, true);
             }
         ],
         [
             'attribute' => 'id_user_action',
-            'value' => function ($model) use ($creditHistorySolver) {
-                return $creditHistorySolver->getStrUserAction($model);
+            'value' => function ($model) use ($creditHistoryManager) {
+                return $creditHistoryManager->getStrUserAction($model);
             }
         ],
         [
             'label' => 'Type',
             'format' => 'raw',
-            'value' => function ($model) use ($creditHistorySolver) {
-                return $creditHistorySolver->getStrWording($model);
+            'value' => function ($model) use ($creditHistoryManager) {
+                return $creditHistoryManager->getStrWording($model);
             }
         ],
         [
             'attribute' => 'mean_payment',
-            'value' => function ($model) use ($creditHistorySolver) {
-                return $creditHistorySolver->getStrMeanPayment($model);
+            'value' => function ($model) use ($creditHistoryManager) {
+                return $creditHistoryManager->getStrMeanPayment($model);
             }
         ],
         [
             'label' => '- Débit',
             'format' => 'raw',
-            'value' => function ($model) use ($creditHistorySolver) {
-                if ($creditHistorySolver->isTypeDebit($model)) {
-                    return '-&nbsp;' . $creditHistorySolver->getAmount($model, true);
+            'value' => function ($model) use ($creditHistoryManager) {
+                if ($creditHistoryManager->isTypeDebit($model)) {
+                    return '-&nbsp;' . $creditHistoryManager->getAmount($model, true);
                 }
                 return '';
             }
@@ -96,9 +96,9 @@ if ($this->context->getProducer()->online_payment) {
         [
             'label' => '+ Crédit',
             'format' => 'raw',
-            'value' => function ($model) use ($creditHistorySolver) {
-                if ($creditHistorySolver->isTypeCredit($model)) {
-                    return '+&nbsp;' . $creditHistorySolver->getAmount($model, true);
+            'value' => function ($model) use ($creditHistoryManager) {
+                if ($creditHistoryManager->isTypeCredit($model)) {
+                    return '+&nbsp;' . $creditHistoryManager->getAmount($model, true);
                 }
                 return '';
             }

producer/views/layouts/main.php

@@ -148,7 +148,7 @@ if (!Yii::$app->user->isGuest) {
                             $credit = ' <span class="label label-' . $labelType . '">' . number_format($userProducer->credit, 2) . ' €</span>';
                     }
 
-                    $countSubcriptions = $this->getLogic()->getSubscriptionContainer()->getRepository()->count(
+                    $countSubcriptions = $this->getSubscriptionManager()->countSubscriptionsByUser(
                             GlobalParam::getCurrentUser(),
                             GlobalParam::getCurrentProducer()
                     );
@@ -213,7 +213,7 @@ if (!Yii::$app->user->isGuest) {
                                     [
                                             'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
                                             'url' => $this->getUrlManagerBackend()->createAbsoluteUrl(['site/index']),
-                                            'visible' => isset(Yii::$app->user->identity) && $this->getLogic()->getUserContainer()->getSolver()->isProducer(\Yii::$app->user->identity),
+                                            'visible' => isset(Yii::$app->user->identity) && $this->getUserManager()->isProducer(\Yii::$app->user->identity),
                                             'options' => ['id' => 'btn-administration']
                                     ],
                             ],
@@ -231,7 +231,7 @@ if (!Yii::$app->user->isGuest) {
                 </div>
             <?php endif; ?>
         <div id="infos-producer">
-                <?php if(!$this->getLogic()->getProducerContainer()->getSolver()->hasSpecificDelays($producer) && $producer->order_deadline && $producer->order_delay): ?>
+                <?php if(!$this->getProducerManager()->hasSpecificDelays($producer) && $producer->order_deadline && $producer->order_delay): ?>
                         <span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
                             <span class="glyphicon glyphicon-time"></span> Commande avant
                             <strong><?php echo Html::encode($producer->order_deadline) ?> h</strong></span>,

producer/views/order/confirm.php

@@ -40,13 +40,14 @@ use common\helpers\GlobalParam ;
 
 $this->setTitle('Confirmation de commande') ;
 $producer = GlobalParam::getCurrentProducer() ;
+$producerManager = $this->getProducerManager();
 
 ?>
 
 <div id="order-success">
 
 
-    <?php if($producer->isOnlinePaymentActiveAndTypeOrder() && $returnPayment != 'success'): ?>
+    <?php if($producerManager->isOnlinePaymentActiveAndTypeOrder($producer) && $returnPayment != 'success'): ?>
         <div class="alert alert-danger">
             <h5>Le paiement en ligne a échoué.</h5>
             <strong>Attention</strong>, votre commande ne sera effective qu'à la réception du paiement.<br />

producer/views/order/order.php

@@ -42,8 +42,8 @@ use common\logic\Producer\Producer\Producer;
 \producer\assets\VuejsOrderOrderAsset::register($this);
 
 $this->setTitle('Commander') ;
-
 $producer = $this->context->getProducer();
+$producerManager = $this->getProducerManager();
 
 ?>
 
@@ -436,7 +436,7 @@ $producer = $this->context->getProducer();
                                 </div>
                                 <div v-else>
                                         <span class="glyphicon glyphicon-chevron-right"></span>
-                                        <?php if($producer->isOnlinePaymentActiveAndTypeOrder()): ?>
+                                        <?php if($producerManager->isOnlinePaymentActiveAndTypeOrder($producer)): ?>
                                                 La commande est à payer en ligne lors de l'étape suivante.
                                         <?php elseif($producer->option_payment_info && strlen($producer->option_payment_info) > 0): ?>
                                                 Confirmez votre commande et retrouvez les informations liées au paiement sur la page suivante.
@@ -510,7 +510,7 @@ $producer = $this->context->getProducer();
 
         <?php
         $producer = GlobalParam::getCurrentProducer() ;
-        if($producer->hasSpecificDelays()): ?>
+        if($producerManager->hasSpecificDelays($producer)): ?>
             <div id="specific-delays" class="panel panel-default">
                     <div class="panel-heading">
                             Délais de commande spécifiques

producer/views/site/index.php

@@ -42,7 +42,7 @@ use yii\grid\GridView;
 use common\helpers\Price;
 
 $producer = $this->context->getProducer() ;
-$productSolver = $this->getLogic()->getProductContainer()->getSolver();
+$productManager = $this->getProductManager();
 $this->setTitle('Accueil');
 $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
 
@@ -187,9 +187,9 @@ $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
 
         $columnsProducts[] = [
                 'attribute' => 'price',
-                'value' => function($model) use ($productSolver) {
+                'value' => function($model) use ($productManager) {
                         if($model->price) {
-                                return Price::format($productSolver->getPriceWithTax($model)).' ('. $productSolver->strUnit($model->unit, 'wording_unit', true).')' ;
+                                return Price::format($productManager->getPriceWithTax($model)).' ('. $productManager->strUnit($model->unit, 'wording_unit', true).')' ;
                         }
                         return '' ;
                 }

producer/views/subscription/_form.php

@@ -40,6 +40,8 @@ use common\logic\Producer\Producer\Producer;
 
 \producer\assets\VuejsSubscriptionFormAsset::register($this) ;
 
+$producerManager = $this->getProducerManager();
+
 ?>
 
 <div class="subscription-form" id="app-subscription-form" :class="{'loaded': !loading}">
@@ -130,7 +132,7 @@ use common\logic\Producer\Producer\Producer;
     
     <h3><span>Paiement</span></h3>
 
-    <?php if(Producer::getConfig('credit')): ?>
+    <?php if($producerManager->getConfig('credit')): ?>
     <div class="form-group field-subscriptionform-auto_payment">
         <label><input type="checkbox" id="subscriptionform-auto_payment" name="SubscriptionForm[auto_payment]" v-model="autoPayment"> Paiement automatique</label> 
         <div class="hint-block">Cochez cette case si vous souhaitez que votre Crédit soit automatiquement débité.</div> 

producer/views/subscription/index.php

@@ -40,6 +40,10 @@ use yii\helpers\Html;
 use yii\grid\GridView;
 use common\helpers\GlobalParam;
 use common\logic\Producer\Producer\Producer;
+use yii\helpers\ArrayHelper;
+use common\logic\PointSale\PointSale\PointSale;
+
+$producerManager = $this->getProducerManager();
 
 $this->setTitle('Abonnements') ;
 $this->addButton(['label' => '<span class="glyphicon glyphicon-plus"></span> Ajouter', 'url' => 'subscription/form', 'class' => 'btn btn-primary']) ;
@@ -152,7 +156,7 @@ $columns = [
     ],
 ] ;
     
-if(Producer::getConfig('credit')) {
+if($producerManager->getConfig('credit')) {
     $columns[] = [
         'format' => 'raw',
         'label' => 'Paiement automatique',