Produits tournants

backend/views/rotating/index.php

@@ -38,6 +38,7 @@
 
 use common\components\View;
 use domain\Product\Rotating\Rotating;
+use domain\Product\RotatingProduct\RotatingProduct;
 use yii\helpers\Html;
 use yii\grid\GridView;
 
@@ -68,9 +69,7 @@ $this->addButton(['label' => 'Nouveau produit tournant <span class="glyphicon gl
                 'label' => 'Produits',
                 'format' => 'raw',
                 'value' => function(Rotating $rotating) {
-                    return implode(' ', array_map(function($rotatingProduct) {
-                        return '<span class="label label-default">'.$rotatingProduct->getProduct()->name.'</span>';
-                    }, $rotating->getRotatingProducts()));
+                    return $rotating->getRotatingProductsListAsString(true);
                 }
             ],
             [

backend/views/subscription/index.php

@@ -85,29 +85,9 @@ $this->addButton(['label' => 'Nouvel abonnement <span class="glyphicon glyphicon
                 'headerOptions' => ['class' => 'column-hide-on-mobile'],
                 'filterOptions' => ['class' => 'column-hide-on-mobile'],
                 'contentOptions' => ['class' => 'column-hide-on-mobile'],
-                'value' => function($model) {
-                    $productModule = ProductModule::getInstance();
-                    $html = '' ;
-                    foreach($model->productSubscription as $productSubscription)
-                    {
-                        if($productSubscription->getProduct()) {
-                            $html .= Html::encode($productSubscription->getProduct()->name).' ('.($productSubscription->getQuantity() *  Product::$unitsArray[$productSubscription->getProduct()->unit]['coefficient']).'&nbsp;'. $productModule->getSolver()->strUnit($productSubscription->getProduct(), 'wording_short').')<br />' ;
-                        }
-                        elseif($productSubscription->getRotating()) {
-                            $html .= Html::encode($productSubscription->getRotating()->getName()).' ('.($productSubscription->getQuantity()).'&nbsp;p.)<br />' ;
-                        }
-                        else {
-                            $html .= 'Produit non défini<br />'  ;
-                        }
-                    }
-                    
-                    // aucun produit
-                    if(!count($model->productSubscription))
-                    {
-                        $html .= '<span class="glyphicon glyphicon-warning-sign"></span> Aucun produit<br />' ;
-                    }
+                'value' => function($model) use ($subscriptionModule) {
 
-                    return $html ;
+                    return $subscriptionModule->getSolver()->getProductsListAsHtml($model);
                 }
             ],
             [

domain/Order/Order/OrderBuilder.php

@@ -184,47 +184,6 @@ class OrderBuilder extends AbstractBuilder
         $order->date_update = date('Y-m-d H:i:s');;
     }
 
-    public function addProductOrdersFromSubscription(Order $order, Subscription $subscription): bool
-    {
-        $productsAdd = false;
-        $user = $subscription->user ?? null;
-        foreach ($subscription->productSubscription as $productSubscription) {
-
-            if($productSubscription->getProduct()) {
-                $product = $productSubscription->getProduct();
-            }
-            elseif($productSubscription->getRotating()) {
-                $product = RotatingResolver::getInstance()->getProductOfRotatingInDistribution(
-                    $productSubscription->getRotating(),
-                    $order->distribution
-                );
-            }
-
-            $this->productOrderBuilder->createProductOrder(
-                $order,
-                $product,
-                $productSubscription->getQuantity(),
-                (float) $this->productSolver->getPrice($product, [
-                    'user' => $user,
-                    'point_sale' => $subscription->pointSale,
-                    'quantity' => $productSubscription->getQuantity()
-                ])
-            );
-            $productsAdd = true;
-        }
-
-        return $productsAdd;
-    }
-
-    public function updateOrderFromSubscription(Order $order, Subscription $subscription): void
-    {
-        $this->initOrderBaseFromSubscription($order, $subscription);
-        $this->initOrderAutoPaymentFromSubscription($order, $subscription);
-        $this->addProductOrdersFromSubscription($order, $subscription);
-
-        $this->update($order);
-    }
-
     public function initOrderBaseFromSubscription(Order $order, Subscription $subscription): void
     {
         $order->origin = Order::ORIGIN_AUTO;

domain/Order/Order/OrderManager.php

@@ -10,8 +10,11 @@ use domain\Order\Order\Event\OrderDeleteEvent;
 use domain\Order\OrderStatus\OrderStatus;
 use domain\Order\OrderStatus\OrderStatusRepository;
 use domain\Order\OrderStatusHistory\OrderStatusHistoryManager;
+use domain\Order\ProductOrder\ProductOrderBuilder;
 use domain\Producer\Producer\Producer;
 use domain\Producer\Producer\ProducerSolver;
+use domain\Product\Product\ProductSolver;
+use domain\Product\Rotating\RotatingResolver;
 use domain\Subscription\Subscription\Subscription;
 use domain\Subscription\Subscription\SubscriptionRepository;
 use domain\Subscription\Subscription\SubscriptionSolver;
@@ -30,6 +33,9 @@ class OrderManager extends AbstractService implements ManagerInterface
     protected OrderSolver $orderSolver;
     protected SubscriptionSolver $subscriptionSolver;
     protected SubscriptionRepository $subscriptionRepository;
+    protected ProductOrderBuilder $productOrderBuilder;
+    protected ProductSolver $productSolver;
+    protected RotatingResolver $rotatingResolver;
 
     public function loadDependencies(): void
     {
@@ -44,6 +50,9 @@ class OrderManager extends AbstractService implements ManagerInterface
         $this->orderSolver = $this->loadService(OrderSolver::class);
         $this->subscriptionSolver = $this->loadService(SubscriptionSolver::class);
         $this->subscriptionRepository = $this->loadService(SubscriptionRepository::class);
+        $this->productOrderBuilder = $this->loadService(ProductOrderBuilder::class);
+        $this->productSolver = $this->loadService(ProductSolver::class);
+        $this->rotatingResolver = $this->loadService(RotatingResolver::class);
     }
 
     public function changeOrderStatus(Order $order, string $orderStatusAlias, User $user, \DateTime $date = null)
@@ -93,6 +102,47 @@ class OrderManager extends AbstractService implements ManagerInterface
         return $return;
     }
 
+    public function addProductOrdersFromSubscription(Order $order, Subscription $subscription): bool
+    {
+        $productsAdd = false;
+        $user = $subscription->user ?? null;
+        foreach ($subscription->productSubscription as $productSubscription) {
+
+            if($productSubscription->getProduct()) {
+                $product = $productSubscription->getProduct();
+            }
+            elseif($productSubscription->getRotating()) {
+                $product = $this->rotatingResolver->getProductOfRotatingInDistribution(
+                    $productSubscription->getRotating(),
+                    $order->distribution
+                );
+            }
+
+            $this->productOrderBuilder->createProductOrder(
+                $order,
+                $product,
+                $productSubscription->getQuantity(),
+                (float) $this->productSolver->getPrice($product, [
+                    'user' => $user,
+                    'point_sale' => $subscription->pointSale,
+                    'quantity' => $productSubscription->getQuantity()
+                ])
+            );
+            $productsAdd = true;
+        }
+
+        return $productsAdd;
+    }
+
+    public function updateOrderFromSubscription(Order $order, Subscription $subscription): void
+    {
+        $this->orderBuilder->initOrderBaseFromSubscription($order, $subscription);
+        $this->orderBuilder->initOrderAutoPaymentFromSubscription($order, $subscription);
+        $this->addProductOrdersFromSubscription($order, $subscription);
+
+        $this->orderBuilder->update($order);
+    }
+
     public function updateOrdersIncomingDistributionsFromSubscription(Subscription $subscription, User $userAction, $update = false): array
     {
         $orderArray = [];
@@ -143,7 +193,7 @@ class OrderManager extends AbstractService implements ManagerInterface
             && $subscription->pointSale) {
 
             $order = $this->orderBuilder->createOrder($distribution);
-            $this->orderBuilder->updateOrderFromSubscription($order, $subscription);
+            $this->updateOrderFromSubscription($order, $subscription);
             $this->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $userAction);
 
             return $order;

domain/Product/Rotating/Rotating.php

@@ -8,6 +8,7 @@ use domain\Distribution\DistributionRotating\DistributionRotating;
 use domain\Producer\Producer\Producer;
 use domain\Product\RotatingProduct\RotatingProduct;
 use yii\db\ActiveQuery;
+use yii\helpers\Html;
 
 class Rotating extends ActiveRecordCommon
 {
@@ -49,6 +50,15 @@ class Rotating extends ActiveRecordCommon
         }
     }
 
+    /* Méthodes */
+
+    public function getRotatingProductsListAsString(bool $withHtmlLabel = true): string
+    {
+        return implode($withHtmlLabel ? ' ' : ', ', array_map(function(RotatingProduct $rotatingProduct) use ($withHtmlLabel) {
+            return ($withHtmlLabel ? '<span class="label label-default">' : '') . Html::encode($rotatingProduct->getProduct()->name) . ($withHtmlLabel ? '</span>' : '');
+        }, $this->getRotatingProducts()));
+    }
+
     /* Getters / Setters */
 
     public function getId(): ?int

domain/Subscription/Subscription/Subscription.php

@@ -41,6 +41,8 @@ namespace domain\Subscription\Subscription;
 use common\components\ActiveRecordCommon;
 use domain\PointSale\PointSale\PointSale;
 use domain\Producer\Producer\Producer;
+use domain\Product\Product\Product;
+use domain\Product\Rotating\Rotating;
 use domain\Subscription\ProductSubscription\ProductSubscription;
 use domain\User\User\User;
 
@@ -102,9 +104,11 @@ class Subscription extends ActiveRecordCommon
         ];
     }
 
-    /*
-     * Relations
-     */
+    /* Méthodes */
+
+    /* Getters / Setters */
+
+    /* Relations */
 
     public function getUser()
     {

domain/Subscription/Subscription/SubscriptionSolver.php

@@ -4,6 +4,7 @@ namespace domain\Subscription\Subscription;
 
 use domain\Product\Product\Product;
 use domain\Product\Product\ProductSolver;
+use domain\Product\Rotating\Rotating;
 use domain\User\User\UserSolver;
 use domain\_\AbstractService;
 use domain\_\SolverInterface;
@@ -80,7 +81,10 @@ class SubscriptionSolver extends AbstractService implements SolverInterface
         foreach($subscription->productSubscription as $productSubscription)
         {
             if($productSubscription->getProduct()) {
-                $html .= '<strong>'.($productSubscription->getQuantity() * Product::$unitsArray[$productSubscription->getProduct()->unit]['coefficient']) . '&nbsp'. $this->productSolver->strUnit($productSubscription->getProduct(), 'wording_short') . '</strong> ' . Html::encode($productSubscription->getProduct()->name). '<br />' ;
+                $html .= '<strong>'.($productSubscription->getQuantity() * Product::$unitsArray[$productSubscription->getProduct()->unit]['coefficient']) . '&nbsp;'. $this->productSolver->strUnit($productSubscription->getProduct(), 'wording_short') . '</strong> ' . Html::encode($productSubscription->getProduct()->name). '<br />' ;
+            }
+            elseif($productSubscription->getRotating()) {
+                $html .= '<strong>'.$productSubscription->getQuantity() . '&nbsp;p.</strong> ' . Html::encode($productSubscription->getRotating()->getName()). '<br />' ;
             }
             else {
                 $html .= 'Produit non défini<br />'  ;
@@ -180,4 +184,23 @@ class SubscriptionSolver extends AbstractService implements SolverInterface
             }, $subscriptionsArray)
         );
     }
+
+    public function getProductOrRotatingQuantity(Subscription $subscription, Product $product = null, Rotating $rotating = null): float
+    {
+        $quantity = 0;
+
+        if ($subscription->productSubscription && count($subscription->productSubscription)) {
+            foreach($subscription->productSubscription as $productSubscription) {
+                if ($product && $product->id == $productSubscription->id_product) {
+                    $coefficientUnit = $this->productSolver->getUnitCoefficient($productSubscription->getProduct());
+                    $quantity = $productSubscription->getQuantity() * $coefficientUnit;
+                }
+                if($rotating && $rotating->id == $productSubscription->id_rotating) {
+                    $quantity = $productSubscription->getQuantity();
+                }
+            }
+        }
+
+        return $quantity;
+    }
 }

producer/controllers/SubscriptionController.php

@@ -97,7 +97,7 @@ class SubscriptionController extends ProducerBaseController
 
         $posts = \Yii::$app->request->post();
 
-        $idSubscription = (int)$posts['idSubscription'];
+        $idSubscription = (int) $posts['idSubscription'];
         $isUpdate = false;
         if ($idSubscription) {
             $subscription = $subscriptionModule->findOneSubscriptionById($idSubscription);
@@ -250,7 +250,6 @@ class SubscriptionController extends ProducerBaseController
             $this->setFlash('error', 'Abonnement introuvable');
         }
 
-
         return $this->redirect(['subscription/index']);
     }
 
@@ -263,6 +262,7 @@ class SubscriptionController extends ProducerBaseController
         $user = $this->getUserCurrent();
         $userProducer = $this->getUserProducerModule()->findOneUserProducer($this->getUserCurrent());
         $pointSale = null;
+        $subscription = null;
 
         if ($idSubscription > 0) {
             $arrayProductsSubscription = ProductSubscription::searchAll([
@@ -279,17 +279,8 @@ class SubscriptionController extends ProducerBaseController
         $productsArray = $productModule->findProducts();
         $indexProduct = 0;
         foreach ($productsArray as &$product) {
-            $quantity = 0;
             $coefficientUnit = $productModule->getSolver()->getUnitCoefficient($product);
-            if (isset($arrayProductsSubscription) && count($arrayProductsSubscription)) {
-                foreach ($arrayProductsSubscription as $productSubscription) {
-                    if ($product->id == $productSubscription->id_product) {
-                        $coefficientUnit = $productModule->getSolver()->getUnitCoefficient($productSubscription->getProduct());
-                        $quantity = $productSubscription->getQuantity() * $coefficientUnit;
-                    }
-                }
-            }
-
+            $quantity = $subscription ? $subscriptionModule->getSolver()->getProductOrRotatingQuantity($subscription, $product) : 0;
             $productPointSaleArray = [];
             foreach($product->productPointSale as $productPointSale) {
                 $productPointSaleArray[] = $productPointSale->id_point_sale;
@@ -318,7 +309,23 @@ class SubscriptionController extends ProducerBaseController
         }
 
         $params['products'] = $productsArray;
-        
+
+        // Produits tournants
+        $rotatingsArray = $this->getRotatingModule()->getRepository()->findRotatings();
+        $rotatingsArrayReturn = [];
+        $indexRotating = 0;
+        foreach($rotatingsArray as $rotating) {
+            $indexRotating ++;
+            $quantity = $subscription ? $subscriptionModule->getSolver()->getProductOrRotatingQuantity($subscription, null, $rotating) : 0;
+            $rotatingsArrayReturn[$indexRotating] = array_merge($rotating->getAttributes(), [
+                'index' => $indexRotating,
+                'quantity_form' => $quantity,
+                'product_list_as_html' => $rotating->getRotatingProductsListAsString(false)
+            ]);
+        }
+        $params['rotatings'] = $rotatingsArrayReturn;
+
+        // Points de vente
         $pointsSaleArray = $this->getPointSaleModule()->findPointSalesByUserAccess($user);
         foreach ($pointsSaleArray as &$pointSale) {
             $pointSale = array_merge($pointSale->getAttributes(), [

producer/views/subscription/_form.php

@@ -220,7 +220,7 @@ $orderModule = OrderModule::getInstance();
                     <th>Nom</th>
                     <th>Prix unitaire</th>
                     <th>Quantité</th>
-                    <th>Total</th>
+                    <!--<th>Total</th>-->
                 </tr>
                 </thead>
                 <tbody>
@@ -253,16 +253,40 @@ $orderModule = OrderModule::getInstance();
                             </span>
                         </div>
                     </td>
-                    <td class="price-total">
+                    <!--<td class="price-total">
                         <template v-if="product.quantity_form">{{ formatPrice(product.price_with_tax * (product.quantity_form / product.coefficient_unit )) }}</template>
+                    </td>-->
+                </tr>
+                <tr v-for="rotating in rotatings">
+                    <td>
+                        <div class="name">{{ rotating.name }} (produit tournant)</div>
+                        <div class="description" v-html="rotating.product_list_as_html"></div>
+                    </td>
+                    <td class="price-unit"></td>
+                    <td class="quantity">
+                        <div class="input-group">
+                            <span class="input-group-btn">
+                                <button class="btn btn-secondary" type="button" @click="rotatingQuantityClick(rotating, -1)">
+                                    <span class="bi bi-dash-lg"></span>
+                                </button>
+                            </span>
+                            <input type="text" v-model="rotating.quantity_form"
+                                   :class="'form-control '+((rotating.quantity_form > 0) ? 'has-quantity' : '')">
+                            <span class="input-group-text">p.</span>
+                            <span class="input-group-btn">
+                                <button class="btn btn-secondary" type="button" @click="rotatingQuantityClick(rotating, 1)">
+                                    <span class="bi bi-plus-lg"></span>
+                                </button>
+                            </span>
+                        </div>
                     </td>
                 </tr>
-                <tr class="total">
+                <!--<tr class="total">
                     <td colspan="3"></td>
                     <td class="price-total">
                         <span>{{ priceTotal(true) }}</span>
                     </td>
-                </tr>
+                </tr>-->
                 </tbody>
             </table>
             <div v-if="!checkOneProductAvailable()" class="alert alert-warning">

producer/views/subscription/index.php

@@ -71,7 +71,7 @@ $columns = [
         'label' => 'Produits',
         'format' => 'raw',
         'value' => function ($subscription) use ($subscriptionModule) {
-            return $subscriptionModule->getProductsListAsHtml($subscription);
+            return $subscriptionModule->getSolver()->getProductsListAsHtml($subscription);
         }
     ],
     [

producer/web/js/vuejs/subscription-form.js

@@ -19,6 +19,7 @@ var app = new Vue({
         saturday: false,
         sunday: false,
         products: [],
+        rotatings: [],
         errors: [],
         disableSubmitButton: false,
         lastCountDays: 0,
@@ -35,12 +36,11 @@ var app = new Vue({
                 this.idSubscription = $('#subscription-id').val();
             }
 
-            //this.dateBegin = new Date();
-
             axios.get("ajax-infos", {params: {idSubscription: this.idSubscription}})
                 .then(function (response) {
 
                     app.products = response.data.products;
+                    app.rotatings = response.data.rotatings;
                     app.pointsSale = response.data.points_sale;
 
                     if (app.idSubscription > 0) {
@@ -163,12 +163,22 @@ var app = new Vue({
                 this.products[product.index].quantity_form += quantity;
             }
         },
+        rotatingQuantityClick: function (rotating, quantity) {
+            if (this.rotatings[rotating.index].quantity_form + quantity >= 0) {
+                this.rotatings[rotating.index].quantity_form += quantity;
+            }
+        },
         oneProductOrdered: function () {
             for (var key in this.products) {
                 if (this.products[key].quantity_form > 0) {
                     return true;
                 }
             }
+            for (var keyRotating in this.rotatings) {
+                if (this.rotatings[keyRotating].quantity_form > 0) {
+                    return true;
+                }
+            }
             return false;
         },
         formatPrice: formatPrice,
@@ -200,6 +210,14 @@ var app = new Vue({
                     }
                 }
 
+                var rotatingsArray = {};
+                for (var keyRotating in this.rotatings) {
+                    if (this.rotatings[keyRotating].quantity_form != null &&
+                        this.rotatings[keyRotating].quantity_form > 0) {
+                        rotatingsArray['rotating_' + this.rotatings[keyRotating].id] = this.rotatings[keyRotating].quantity_form;
+                    }
+                }
+
                 axios.post('ajax-process', {
                     idSubscription: this.idSubscription,
                     SubscriptionForm: {
@@ -216,6 +234,7 @@ var app = new Vue({
                         saturday: this.saturday == true ? 1 : 0,
                         sunday: this.sunday == true ? 1 : 0,
                         products: productsArray,
+                        rotatings: rotatingsArray,
                         comment: this.comment
                     }
                 }).then(function (response) {