Merge branch 'develop'

backend/controllers/CronController.php

@@ -40,8 +40,6 @@ namespace backend\controllers;
 
 use common\helpers\MeanPayment;
 use common\logic\Order\Order\Model\Order;
-use common\logic\PointSale\PointSale\Model\PointSale;
-use common\logic\User\CreditHistory\Model\CreditHistory;
 use common\logic\User\User\Model\User;
 use Yii;
 use yii\filters\VerbFilter;
@@ -112,7 +110,7 @@ class CronController extends BackendController
         $producerManager = $this->getProducerManager();
         $distributionManager = $this->getDistributionManager();
         $orderManager = $this->getOrderManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
         $userManager = $this->getUserManager();
 
         if ($key == '64ac0bdab7e9f5e48c4d991ec5201d57') {
@@ -164,8 +162,8 @@ class CronController extends BackendController
                             foreach ($arrayOrders as $order) {
                                 $orderManager->initOrder($order);
                                 if ($order->auto_payment && $configCredit) {
-                                    if ($orderManager->getOrderAmount($order, Order::AMOUNT_REMAINING) > 0) {
-                                        $creditHistoryManager->payOrder($order, $userManager->findOneUserById(User::ID_USER_SYSTEM), false);
+                                    if ($orderManager->isCreditAutoPayment($order) && $orderManager->getOrderAmount($order, Order::AMOUNT_REMAINING) > 0) {
+                                        $paymentManager->payOrder($order, MeanPayment::CREDIT, $userManager->findOneUserById(User::ID_USER_SYSTEM), false);
                                         $countOrders++;
                                     }
                                 }

backend/controllers/DistributionController.php

@@ -132,9 +132,9 @@ class DistributionController extends BackendController
             $distribution = $distributionManager->createDistributionIfNotExist($date);
             $ordersArray = $orderManager->findOrdersByDistribution($distribution);
             $ordersArrayObject = $ordersArray;
-            $productsArray = $productManager->findProductsByDistributionAsArray($distribution);
+            $productsArray = $productManager->findProductsByDistribution($distribution);
 
-            $json['products'] = $this->buildAjaxInfosResponseProducts($producer, $distribution, $productsArray, $ordersArray);
+            $json['products'] = $this->buildAjaxInfosResponseProducts($distribution, $productsArray, $ordersArray);
             $json['distribution'] = $this->buildAjaxInfosResponseDistribution($distribution, $ordersArrayObject, $productsArray);
             $json['orders'] = $this->buildAjaxInfosResponseOrders($ordersArray, $productsArray);
             $json['points_sale'] = $this->buildAjaxInfosResponsePointsSale($distribution);
@@ -151,6 +151,7 @@ class DistributionController extends BackendController
 
     public function buildAjaxInfosResponsePointsSale(Distribution $distribution)
     {
+        $producerManager = $this->getProducerManager();
         $pointSaleManager = $this->getPointSaleManager();
         $pointSaleDistributionManager = $this->getPointSaleDistributionManager();
 
@@ -170,40 +171,51 @@ class DistributionController extends BackendController
                     ]
                 ];
             }
+
+            $pointSaleArray['credit_functioning'] = $producerManager->getPointSaleCreditFunctioning($pointSale);
         }
 
         return $pointsSaleArray;
     }
 
-    public function buildAjaxInfosResponseProducts(Producer $producer, Distribution $distribution, array &$productsArray, array $ordersArray)
+    public function buildAjaxInfosResponseProducts(Distribution $distribution, array $productsArray, array $ordersArray)
     {
         $distributionManager = $this->getDistributionManager();
         $orderManager = $this->getOrderManager();
-        $productManager = $this->getProductManager();
-
-        foreach ($productsArray as &$theProduct) {
-            $productObject = $productManager->findOneProductById($theProduct['id']);
-            $quantityOrder = $orderManager->getProductQuantity($productObject, $ordersArray);
-            $theProduct['quantity_ordered'] = $quantityOrder;
+        $jsonProductsArray = [];
 
-            if (!isset($theProduct['productDistribution'][0])) {
-                $theProduct['productDistribution'][0] = $distributionManager->addProduct($distribution, $productObject);
+        foreach ($productsArray as $product) {
+            $jsonProduct = $product->getAttributes();
+            $quantityOrder = $orderManager->getProductQuantity($product, $ordersArray);
+            $jsonProduct['quantity_ordered'] = $quantityOrder;
+
+            if (!isset($product->productDistribution[0])) {
+                $productDistributionAdd = $distributionManager->addProduct($distribution, $product);
+                $jsonProduct['productDistribution'][0] = $productDistributionAdd->getAttributes();
+                $product->populateRelation('productDistribution', [$productDistributionAdd]);
+            }
+            else {
+                foreach($product->productDistribution as $key => $productDistribution) {
+                    $jsonProduct['productDistribution'][$key] = $productDistribution->getAttributes();
+                }
             }
 
-            if (!is_numeric($theProduct['productDistribution'][0]['quantity_max'])) {
-                $theProduct['quantity_remaining'] = null;
+            if (!is_numeric($product->productDistribution[0]->quantity_max)) {
+                $jsonProduct['quantity_remaining'] = null;
             } else {
-                $theProduct['quantity_remaining'] = $theProduct['productDistribution'][0]['quantity_max'] - $quantityOrder;
+                $jsonProduct['quantity_remaining'] = $product->productDistribution[0]->quantity_max - $quantityOrder;
             }
 
-            $theProduct['quantity_form'] = 0;
+            $jsonProduct['quantity_form'] = 0;
 
-            if (!isset($theProduct['taxRate'])) {
-                $theProduct['taxRate'] = $producer->taxRate;
+            if (!$product->taxRate) {
+                $jsonProduct['taxRate'] = $this->getProducerCurrent()->taxRate;
             }
+
+            $jsonProductsArray[] = $jsonProduct;
         }
 
-        return $productsArray;
+        return $jsonProductsArray;
     }
 
     public function buildAjaxInfosResponseProducer($producer)
@@ -286,7 +298,7 @@ class DistributionController extends BackendController
     {
         $userManager = $this->getUserManager();
         $orderManager = $this->getOrderManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
 
         if ($ordersArray) {
             foreach ($ordersArray as &$order) {
@@ -315,30 +327,25 @@ class DistributionController extends BackendController
                     }
                 }
 
-                $creditHistoryArray = [];
-
-                foreach ($order->creditHistory as $creditHistory) {
-                    $creditHistoryArray[] = [
-                        'date' => date('d/m/Y H:i:s', strtotime($creditHistory->date)),
-                        'user' => $userManager->getUsername($creditHistory->getUserObject()),
-                        'user_action' => $creditHistoryManager->getStrUserAction($creditHistory),
-                        'wording' => $creditHistoryManager->getStrWording($creditHistory),
-                        'debit' => ($creditHistoryManager->isTypeDebit($creditHistory) ? '- ' . $creditHistoryManager->getAmount(
-                                $creditHistory,
-                                Order::AMOUNT_TOTAL,
-                                true
-                            ) : ''),
-                        'credit' => ($creditHistoryManager->isTypeCredit($creditHistory) ? '+ ' . $creditHistoryManager->getAmount(
-                                $creditHistory,
-                                Order::AMOUNT_TOTAL,
-                                true
-                            ) : '')
+                $paymentArray = [];
+
+                foreach ($order->payment as $payment) {
+                    $paymentArray[] = [
+                        'type' => $payment->type,
+                        'wording_type' => $paymentManager->getStrType($payment),
+                        'mean_payment' => $payment->mean_payment,
+                        'wording_mean_payment' => $paymentManager->getStrMeanPayment($payment),
+                        'date' => date('d/m/Y H:i:s', strtotime($payment->date)),
+                        'user' => $payment->getUserObject() ? $userManager->getUsername($payment->getUserObject()) : '',
+                        'user_action' => $paymentManager->getStrUserAction($payment),
+                        'wording' => $paymentManager->getStrWording($payment, $order),
+                        'amount' => $paymentManager->getAmount($payment, Order::AMOUNT_TOTAL, true),
                     ];
                 }
 
                 $arrayCreditUser = [];
-                if (isset($order->user) && isset($order->user->userProducer) && isset($order->user->userProducer[0])) {
-                    $arrayCreditUser['credit'] = $order->user->userProducer[0]->credit;
+                if(isset($order->user)) {
+                    $arrayCreditUser['credit'] = $userManager->getCredit($order->user);
                 }
 
                 $oneProductUnactivated = false;
@@ -363,9 +370,16 @@ class DistributionController extends BackendController
                     ) : null,
                     'pointSale' => $order->pointSale ? ['id' => $order->pointSale->id, 'name' => $order->pointSale->name] : null,
                     'productOrder' => $productOrderArray,
-                    'creditHistory' => $creditHistoryArray,
+                    'paymentsArray' => $paymentArray,
                     'oneProductUnactivated' => $oneProductUnactivated,
                     'isLinkedToValidDocument' => $orderManager->isLinkedToValidDocument($order),
+                    'isCreditAutoPayment' => $orderManager->isCreditAutoPayment($order),
+                    'isCreditContext' => $orderManager->isCreditContext($order),
+                    'isPaid' => $orderManager->isOrderPaid($order),
+                    'isPaidViaInvoice' => $orderManager->isOrderPaidViaInvoice($order),
+                    'paymentLabelShort' => $orderManager->getPaymentLabelShort($order),
+                    'isCreditFunctioningMandatory' => $orderManager->isOrderCreditFunctioningMandatory($order),
+                    'isCreditFunctioningUser' => $orderManager->isOrderCreditFunctioningUser($order),
                 ]);
             }
         }

backend/controllers/DocumentController.php

@@ -41,6 +41,7 @@ namespace backend\controllers;
 use common\helpers\Ajax;
 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;
@@ -56,6 +57,7 @@ use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use yii\web\NotFoundHttpException;
 use yii\helpers\Html;
+use common\logic\Payment\Model\Payment;
 
 class DocumentController extends BackendController
 {
@@ -161,20 +163,53 @@ class DocumentController extends BackendController
 
     public function actionUpdate($id)
     {
-        $model = $this->findModel($id);
+        $documentManager = $this->getDocumentManager();
+        $paymentManager = $this->getPaymentManager();
+        $document = $this->findModel($id);
 
-        if (!$model) {
+        if (!$document) {
             throw new yii\web\NotFoundHttpException('Le document n\'a pas été trouvé.');
         }
 
-        if ($model && $model->load(\Yii::$app->request->post()) && $model->save()) {
-            $this->setFlash('success', $this->getFlashMessage('update', $model));
+        if ($document && $document->load(\Yii::$app->request->post()) && $document->save()) {
+            $this->setFlash('success', $this->getFlashMessage('update', $document));
+        }
+
+        $payment = null;
+        if($documentManager->isDocumentInvoice($document) && $documentManager->isStatusValid($document)) {
+            $payment = $paymentManager->instanciatePayment(
+                Payment::TYPE_PAYMENT,
+                number_format($documentManager->getAmountWithTax($document), 3),
+                $this->getProducerCurrent(),
+                null,
+                null,
+                MeanPayment::TRANSFER,
+                null,
+                $document
+            );
+            $payment->amount = number_format($payment->amount, 2);
+
+            $posts = \Yii::$app->request->post();
+            if(isset($posts['Payment']['date_transaction']) && $posts['Payment']['date_transaction']) {
+                $posts['Payment']['date_transaction'] = date('Y-m-d', strtotime(str_replace('/', '-', $posts['Payment']['date_transaction'])));
+            }
+
+            if ($payment->load($posts) && $payment->save()) {
+                $this->setFlash('success', 'Le règlement a bien été ajouté.');
+                return $this->redirect(['invoice/update', 'id' => $document->id]);
+            }
+            else {
+                if($payment->date_transaction) {
+                    $payment->date_transaction = date('d/m/Y', strtotime($payment->date_transaction));
+                }
+            }
         }
 
         return $this->render('/document/update', [
             'title' => $this->getTitle('Modifier'),
             'typeDocument' => $this->getDocumentType(),
-            'model' => $model,
+            'model' => $document,
+            'payment' => $payment
         ]);
     }
 

backend/controllers/OrderController.php

@@ -41,7 +41,6 @@ namespace backend\controllers;
 use common\forms\SubscriptionForm;
 use common\helpers\CSV;
 use common\helpers\GlobalParam;
-use common\helpers\MeanPayment;
 use common\helpers\Price;
 use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
@@ -50,7 +49,7 @@ 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\User\CreditHistory\Model\CreditHistory;
+use common\logic\Payment\Model\Payment;
 use common\logic\User\User\Model\User;
 use common\logic\User\UserProducer\Model\UserProducer;
 use yii\filters\AccessControl;
@@ -889,7 +888,7 @@ class OrderController extends BackendController
         $userManager = $this->getUserManager();
         $pointSaleManager = $this->getPointSaleManager();
         $userPointSaleManager = $this->getUserPointSaleManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
         $productManager = $this->getProductManager();
 
         $request = \Yii::$app->request;
@@ -915,7 +914,7 @@ class OrderController extends BackendController
             $oldIdUser = $order->id_user;
             $amountPaid = $orderManager->getOrderAmountWithTax($order, Order::AMOUNT_PAID);
             if ($oldIdUser != $idUser && $amountPaid > 0) {
-                $creditHistoryManager->refundOrder($order, $this->getUserCurrent());
+                $paymentManager->refundOrderCredit($order, $this->getUserCurrent());
                 $order = $orderManager->findOneOrderById($idOrder);
                 $orderManager->initOrder($order);
             }
@@ -1016,7 +1015,7 @@ class OrderController extends BackendController
     public function actionPaymentStatus(int $idOrder)
     {
         $orderManager = $this->getOrderManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
 
         $order = $orderManager->findOneOrderById($idOrder);
 
@@ -1052,7 +1051,7 @@ class OrderController extends BackendController
                     . '</span>';
 
                 // historique
-                $history = CreditHistory::find()
+                $history = Payment::find()
                     ->with('userAction')
                     ->where(['id_order' => $idOrder])
                     ->all();
@@ -1064,11 +1063,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($creditHistoryManager->getDate($creditHistory))) . '</td>'
-                            . '<td>' . Html::encode($creditHistoryManager->getStrUserAction($creditHistory)) . '</td>'
-                            . '<td>' . $creditHistoryManager->getStrWording($creditHistory) . '</td>'
-                            . '<td>' . ($creditHistoryManager->isTypeDebit($creditHistory) ? '- ' . Price::getPriceWithTax($creditHistory->amount) : '') . '</td>'
-                            . '<td>' . ($creditHistoryManager->isTypeCredit($creditHistory) ? '+ ' . Price::getPriceWithTax($creditHistory->amount) : '') . '</td>'
+                            . '<td>' . date('d/m/Y H:i:s', strtotime($paymentManager->getDate($creditHistory))) . '</td>'
+                            . '<td>' . Html::encode($paymentManager->getStrUserAction($creditHistory)) . '</td>'
+                            . '<td>' . $paymentManager->getStrWording($creditHistory) . '</td>'
+                            . '<td>' . ($paymentManager->isTypeDebit($creditHistory) ? '- ' . Price::getPriceWithTax($creditHistory->amount) : '') . '</td>'
+                            . '<td>' . ($paymentManager->isTypeCredit($creditHistory) ? '+ ' . Price::getPriceWithTax($creditHistory->amount) : '') . '</td>'
                             . '</tr>';
                     }
                 } else {
@@ -1092,17 +1091,17 @@ class OrderController extends BackendController
     /**
      * Effectue le paiement/remboursement d'une commande.
      */
-    public function actionAjaxPayment(int $idOrder, string $type, float $amount): array
+    public function actionAjaxPayment(int $idOrder, string $type, string $meanPayment): array
     {
         \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
 
         $orderManager = $this->getOrderManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
         $order = $orderManager->findOneOrderById($idOrder);
         $orderManager->initOrder($order);
 
         if ($order) {
-            $creditHistoryManager->payOrRefundOrder($type, $order, $this->getUserCurrent());
+            $paymentManager->payOrRefundOrder($type, $order, $meanPayment, $this->getUserCurrent());
         }
 
         return ['success'];

backend/controllers/ProducerController.php

@@ -194,7 +194,7 @@ class ProducerController extends BackendController
     public function actionUpdateOpendistribVersion()
     {
         $producerManager = $this->getProducerManager();
-        $producerManager->updateOpendistribVersion(GlobalParam::getCurrentProducer());
+        $producerManager->updateOpendistribVersion($this->getProducerCurrent());
 
         return $this->redirect(\Yii::$app->request->referrer);
     }

backend/controllers/UserController.php

@@ -40,21 +40,19 @@ namespace backend\controllers;
 
 use backend\models\CreditForm;
 use common\helpers\GlobalParam;
-use common\helpers\Mailjet;
 use backend\models\MailForm;
+use common\helpers\MeanPayment;
 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\CreditHistory\Model\CreditHistory;
+use common\logic\Payment\Model\Payment;
 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 Faker\Provider\HtmlLorem;
 use yii\base\UserException;
 use yii\filters\AccessControl;
-use yii\filters\VerbFilter;
 use \Yii;
 use yii\helpers\Html;
 use yii\web\NotFoundHttpException;
@@ -405,11 +403,12 @@ class UserController extends BackendController
                 $creditForm = new CreditForm;
             }
 
-            $history = CreditHistory::find()
+            $history = Payment::find()
                 ->with(['order', 'userAction'])
                 ->where([
                     'id_user' => $user->id,
                     'id_producer' => GlobalParam::getCurrentProducerId(),
+                    'mean_payment' => MeanPayment::CREDIT
                 ])
                 ->orderBy('date DESC')
                 ->all();

backend/models/CreditForm.php

@@ -39,15 +39,9 @@ termes.
 namespace backend\models;
 
 use common\helpers\GlobalParam;
-use common\helpers\Mailjet;
-use common\logic\Producer\Producer\Wrapper\ProducerManager;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\CreditHistory\Wrapper\CreditHistoryManager;
-use common\logic\User\User\Model\User;
+use common\logic\Payment\Wrapper\PaymentManager;
 use common\logic\User\User\Wrapper\UserManager;
-use common\logic\User\UserProducer\Model\UserProducer;
 use common\logic\User\UserProducer\Wrapper\UserProducerManager;
-use Yii;
 use yii\base\Model;
 
 /**
@@ -105,12 +99,11 @@ class CreditForm extends Model
     {
         $userManager = UserManager::getInstance();
         $userProducerManager = UserProducerManager::getInstance();
-        $creditHistoryManager = CreditHistoryManager::getInstance();
-        $producerManager = ProducerManager::getInstance();
+        $paymentManager = PaymentManager::getInstance();
 
         if ($this->validate()) {
             $user = $userManager->findOneUserById($this->id_user);
-            $creditHistoryManager->creditOrDebitUser($this->type, $user, $this->amount, $this->mean_payment, $userManager->getCurrent());
+            $paymentManager->creditOrDebitUser($this->type, $user, $this->amount, $this->mean_payment, $userManager->getCurrent());
             
             // on prévient l'utilisateur que son compte vient d'être crédité
             if($this->send_mail) {

backend/views/distribution/index.php

@@ -240,6 +240,7 @@ $this->setPageTitle('Distributions') ;
             <div class="panel-body">
                 <order-form
                     v-if="showModalFormOrderCreate"
+                    create="1"
                     :date="date"
                     :order="orderCreate"
                     :points-sale="pointsSale"
@@ -248,6 +249,7 @@ $this->setPageTitle('Distributions') ;
                     :users="users"
                     :products="products"
                     :producer="producer"
+                    :orders="ordersUpdate"
                     :loading-update-product-order="loadingUpdateProductOrder"
                     @close="showModalFormOrderCreate = false"
                     @ordercreatedupdated="orderCreatedUpdated"
@@ -295,11 +297,12 @@ $this->setPageTitle('Distributions') ;
                             <div class="clr"></div>
                     </div>
 
-                <div class="alert alert-danger" v-if="missingSubscriptions && missingSubscriptions.length > 0">
+                <div class="alert alert-info" v-if="missingSubscriptions && missingSubscriptions.length > 0">
+                    <span class="glyphicon glyphicon-info-sign"></span>
                     {{ missingSubscriptions.length }} abonnement<template v-if="missingSubscriptions.length > 1">s</template> manquant<template v-if="missingSubscriptions.length > 1">s</template> :
-                    <ul>
-                        <li v-for="subscription in missingSubscriptions">{{ subscription.username }}</li>
-                    </ul>
+                    <span v-for="(subscription, index) in missingSubscriptions">
+                        {{ subscription.username }}<template v-if="index != missingSubscriptions.length - 1">, </template><template v-else>.</template>
+                    </span>
                 </div>
 
                 <div class="alert alert-danger" v-if="distribution && !distribution.active && orders && orders.length > 0">
@@ -307,8 +310,19 @@ $this->setPageTitle('Distributions') ;
                 </div>
 
                 <div v-if="idActivePointSale > 0 && (totalActivePointSale() > 0 || weightActivePointSale() > 0)" class="point-sale-totals">
-                    <span class="title">Totaux</span>
-                    CA TTC : <strong>{{ totalActivePointSale() }} €</strong> / Poids : <strong>{{ weightActivePointSale() }} kg</strong>
+                    <div>
+                        <span class="title">Totaux</span>
+                        CA TTC : <strong>{{ totalActivePointSale() }} €</strong> / Poids : <strong>{{ weightActivePointSale() }} kg</strong>
+                    </div>
+                    <div v-if="producer.credit && pointSaleActive">
+                        <span class="title">Crédit</span>
+                        <template v-if="pointSaleActive.credit && pointSaleActive.credit == 1">
+                            <template v-if="pointSaleActive.credit_functioning == 'mandatory'">Obligatoire</template>
+                            <template v-else-if="pointSaleActive.credit_functioning == 'user'">Basé sur l'utilisateur</template>
+                            <template v-else-if="pointSaleActive.credit_functioning == 'optional'">Optionnel</template>
+                        </template>
+                        <template v-else>Désactivé</template>
+                    </div>
                 </div>
 
                 <table class="table table-condensed table-bordered table-hover" v-if="countOrdersByPointSale[idActivePointSale] > 0 || (idActivePointSale == 0 && orders.length > 0)">
@@ -322,11 +336,10 @@ $this->setPageTitle('Distributions') ;
                                         <th class="column-user">Utilisateur</th>
                                         <th class="column-point-sale" v-if="idActivePointSale == 0">Point de vente</th>
                                         <th class="column-amount">Montant</th>
-                                        <th class="column-state-payment">Crédit</th>
-                                        <th class="column-payment"></th>
+                                        <th class="column-state-payment">Paiement</th>
+                                        <th class="column-credit" v-if="!idActivePointSale || (pointSaleActive && pointSaleActive.credit == 1)">Crédit</th>
+                                        <th class="column-actions">Actions</th>
                                         <th class="column-tiller" v-if="producer && producer.tiller">Tiller</th>
-                                        <th class="column-actions"></th>
-                                        <th class="column-delivery-note"></th>
                                 </tr>
                         </thead>
                     <tbody>
@@ -359,7 +372,7 @@ $this->setPageTitle('Distributions') ;
                                                 <a class="btn btn-default btn-sm" :href="baseUrl+'/user/orders?id='+order.id_user" data-toggle="popover" data-trigger="hover" data-placement="bottom" data-content="Voir les commandes"><span class="glyphicon glyphicon-eye-open"></span></a>
                                             </span>
                                     </span>
-                                    <span v-else>{{ order.username }}</span>
+                                    <span v-else class="no-user">{{ order.username }}</span>
                                     <span v-if="order.comment && order.comment.length > 0" class="glyphicon glyphicon-comment"></span>
                                     <span v-if="order.delivery_home && order.delivery_address && order.delivery_address.length > 0" class="glyphicon glyphicon-home"></span>
                                 </td>
@@ -370,16 +383,25 @@ $this->setPageTitle('Distributions') ;
                                 </td>
                                 <td class="column-amount">
                                     {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}
-
                                     <div class="state-payment-mobile">
                                         <order-state-payment :order="order" :producer="producer"></order-state-payment>
                                     </div>
                                 </td>
                                 <td class="column-state-payment">
-                                    <order-state-payment :order="order" :producer="producer"></order-state-payment>
+                                    <a href="javascript:void(0);" @click="orderPaymentModalClick" :data-id-order="order.id">
+                                        <order-state-payment :order="order" :producer="producer"></order-state-payment>
+                                    </a>
+                                    <span class="glyphicon glyphicon-time" title="Débit automatique du crédit la veille de la distribution" v-if="order.auto_payment && (order.amount_paid == 0 || order.amount_paid < order.amount)"></span>
+                                </td>
+                                <td class="column-credit" v-if="!idActivePointSale || (pointSaleActive && pointSaleActive.credit == 1)">
+                                    <template v-if="order.isCreditContext">
+                                        <a :href="baseUrl+'/user/credit?id='+order.id_user" :class="order.user.credit >= 0 ? 'positive' : 'negative'">
+                                            {{ order.user.credit.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}
+                                        </a>
+                                    </template>
                                 </td>
-                                <td class="column-payment" v-if="producer && producer.credit">
-                                    <div class="btn-group" v-if="order.user && !order.date_delete">
+                                <td class="column-payment" v-if="false && producer && producer.credit">
+                                    <!--<div class="btn-group" v-if="order.user && !order.date_delete">
                                         <button class="btn btn-xs btn-default" v-if="order.amount_paid == order.amount" @click="orderPaymentClick" :data-id-order="order.id" data-type="refund" :data-amount="order.amount">
                                             <span class="glyphicon glyphicon-euro"></span> Recréditer
                                         </button>
@@ -400,30 +422,101 @@ $this->setPageTitle('Distributions') ;
                                         <ul class="dropdown-menu">
                                           <li><a href="javascript:void(0);" @click="orderPaymentModalClick" :data-id-order="order.id">Historique</a></li>
                                         </ul>
-                                    </div>
-                                </td>
-                                <td v-if="producer && producer.tiller" class="tiller column-tiller">
-                                    <input v-if="order.tiller_synchronization == true" type="checkbox" checked="checked" :id="'checkbox-tiller-synchronization-'+order.id" :data-id-order="order.id" @change="changeSynchroTiller" />
-                                    <input v-else type="checkbox" :id="'checkbox-tiller-synchronization-'+order.id" :data-id-order="order.id" @change="changeSynchroTiller" />
-                                    <label :for="'checkbox-tiller-synchronization-'+order.id">Tiller</label>
+                                    </div>-->
                                 </td>
+
                                 <td class="column-actions">
-                                    <span v-if="order.oneProductUnactivated" class="glyphicon glyphicon-warning-sign" title="Contient un produit non activé"></span>
+                                    <span v-if="false && order.oneProductUnactivated" class="glyphicon glyphicon-warning-sign" title="Contient un produit non activé"></span>
+
+                                    <a href="javascript:void(0);" class="btn btn-default btn-xs" :data-id-order="order.id" @click="orderViewClick"><span :class="'glyphicon ' + ((showViewProduct && idOrderView == order.id) ? 'glyphicon-eye-close' : 'glyphicon-eye-open')"></span></a>
+                                    <a href="javascript:void(0);" class="btn btn-default btn-xs" :data-id-order="order.id" @click="updateOrderClick"><span class="glyphicon glyphicon-pencil"></span></a>
+
+                                    <div class="wrapper-button-dropdown">
+                                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            € <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <template v-if="!order.isPaidViaInvoice">
+                                                <li v-if="order.isCreditContext">
+                                                    <a href="javascript:void(0);" @click="orderPaymentClick" :data-id-order="order.id" :data-type="getTypePayment(order)" data-mean-payment="credit">
+                                                        <span class="glyphicon glyphicon-piggy-bank"></span> {{ getLabelPaymentRefund(order, 'Débiter', 'Recréditer', 'le crédit') }}
+                                                    </a>
+                                                </li>
+                                                <template v-if="(!order.isCreditFunctioningMandatory && !order.isCreditFunctioningUser) || !order.id_user">
+                                                    <li>
+                                                        <a href="javascript:void(0);" @click="orderPaymentClick" :data-id-order="order.id" :data-type="getTypePayment(order)" data-mean-payment="money">
+                                                            <span class="glyphicon glyphicon-euro"></span> {{ getLabelPaymentRefund(order, 'Payer', 'Rembourser', 'en espèce') }}
+                                                        </a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="javascript:void(0);" @click="orderPaymentClick" :data-id-order="order.id" :data-type="getTypePayment(order)" data-mean-payment="cheque">
+                                                            <span class="glyphicon glyphicon-euro"></span> {{ getLabelPaymentRefund(order, 'Payer', 'Rembourser', 'par chèque') }}
+                                                        </a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="javascript:void(0);" @click="orderPaymentClick" :data-id-order="order.id" :data-type="getTypePayment(order)" data-mean-payment="transfer">
+                                                            <span class="glyphicon glyphicon-euro"></span> {{ getLabelPaymentRefund(order, 'Payer', 'Rembourser', 'par virement') }}
+                                                        </a>
+                                                    </li>
+                                                </template>
+                                            </template>
+                                            <!--<li>
+                                                <a href="javascript:void(0);" @click="orderPaymentClick" :data-id-order="order.id" :data-type="getTypePayment(order)" data-mean-payment="credit-card">
+                                                    {{ getLabelPaymentRefund(order, 'Payer', 'Rembourser', 'par carte bancaire') }}
+                                                </a>
+                                            </li>-->
+                                            <li>
+                                                <a href="javascript:void(0);" @click="orderPaymentModalClick" :data-id-order="order.id">
+                                                    <span class="glyphicon glyphicon-th-list"></span> Historique
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </div>
+
+                                    <div class="wrapper-button-dropdown">
+                                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <span class="glyphicon glyphicon-file"></span> <template v-if="countDocuments(order)">{{ countDocuments(order) }}</template> <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <li v-if="!order.id_delivery_note">
+                                                <a href="javascript:void(0);" class="" :data-id-order="order.id" @click="generateDeliveryNote">
+                                                    <span class="glyphicon glyphicon-plus"></span> Générer un bon de livraison
+                                                </a>
+                                            </li>
+                                            <li v-if="order.id_quotation">
+                                                <a :href="UrlManager.getBaseUrl()+'quotation/update?id='+order.id_quotation">
+                                                    <span class="glyphicon glyphicon-file"></span> Devis
+                                                </a>
+                                            </li>
+                                            <li v-if="order.id_delivery_note">
+                                                <a :href="UrlManager.getBaseUrl()+'delivery-note/update?id='+order.id_delivery_note">
+                                                    <span class="glyphicon glyphicon-file"></span> Bon de livraison
+                                                </a>
+                                            </li>
+                                            <li v-if="order.id_invoice">
+                                                <a :href="UrlManager.getBaseUrl()+'invoice/update?id='+order.id_invoice">
+                                                    <span class="glyphicon glyphicon-file"></span> Facture
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </div>
 
+                                    <div class="wrapper-button-dropdown">
                                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                Action <span class="caret"></span>
+                                                <span class="caret"></span>
                                         </button>
                                         <ul class="dropdown-menu">
-                                                <li><a href="javascript:void(0);" class="" :data-id-order="order.id" @click="orderViewClick"><span :class="'glyphicon ' + ((showViewProduct && idOrderView == order.id) ? 'glyphicon-eye-close' : 'glyphicon-eye-open')"></span> Voir</a></li>
-                                                <li><a href="javascript:void(0);" class="" :data-id-order="order.id" @click="updateOrderClick"><span class="glyphicon glyphicon-pencil"></span> Modifier</a></li>
+                                                <!--<li><a href="javascript:void(0);" class="" :data-id-order="order.id" @click="orderViewClick"><span :class="'glyphicon ' + ((showViewProduct && idOrderView == order.id) ? 'glyphicon-eye-close' : 'glyphicon-eye-open')"></span> Voir</a></li>
+                                                <li><a href="javascript:void(0);" class="" :data-id-order="order.id" @click="updateOrderClick"><span class="glyphicon glyphicon-pencil"></span> Modifier</a></li>-->
                                                 <li><a href="javascript:void(0);" class="" :data-id-order="order.id" @click="deleteOrderClick"><span class="glyphicon glyphicon-trash"></span> Supprimer</a></li>
-                                                <li><a href="javascript:void(0);" class="" :data-id-order="order.id" @click="generateDeliveryNote"><span class="glyphicon glyphicon-file"></span> Générer un bon de livraison</a></li>
-                                                <li v-if="order.id_subscription > 0"><a class="" :href="baseUrl+'/subscription/update?id='+order.id_subscription"><span class="glyphicon glyphicon-repeat"></span> Modifier l'abonnement associé</a></li>
-                                                <li v-else><a class="add-subscription" :href="baseUrl+'/subscription/create?idOrder='+order.id"><span class="glyphicon glyphicon-plus"></span><span class="glyphicon glyphicon-repeat"></span>Créer un abonnement sur cette base</a></li>
+                                                <li v-if="order.id_subscription > 0"><a class="" :href="baseUrl+'/subscription/update?id='+order.id_subscription"><span class="glyphicon glyphicon-repeat"></span> Modifier l'abonnement lié</a></li>
+                                                <li v-else><a class="add-subscription" :href="baseUrl+'/subscription/create?idOrder='+order.id"><span class="glyphicon glyphicon-plus"></span><span class="glyphicon glyphicon-repeat"></span>Créer un abonnement</a></li>
                                         </ul>
+                                    </div>
 
                                     <order-form
                                         v-if="showModalFormOrderUpdate && idOrderUpdate == order.id"
+                                        create="0"
                                         :date="date"
                                         :date-format="dateFormat"
                                         :points-sale="pointsSale"
@@ -448,101 +541,74 @@ $this->setPageTitle('Distributions') ;
                                             <span v-else>{{ order.username }}</span></strong>
                                         </h3>
                                         <div slot="body">
-                                            <div class="col-md-4">
-                                                <div class="info-box">
-                                                    <span :class="'info-box-icon ' +((order.amount_paid == order.amount) ? 'bg-green' : 'bg-red')"><i class="fa fa-check"></i></span>
-                                                    <div class="info-box-content">
-                                                        <span class="info-box-text">Montant</span>
-                                                        <span class="info-box-number">{{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}</span>
-                                                        <span class="info-box-text">
-                                                            Statut<br />
-                                                            <span class="label label-success" v-if="order.amount_paid == order.amount">débité</span>
-                                                            <span class="label label-default" v-else-if="order.amount_paid == 0">non débité</span>
-                                                            <span class="label label-default" v-else-if="order.amount_paid > order.amount">surplus</span>
-                                                            <span class="label label-warning" v-else-if="order.amount_paid < order.amount">reste à débiter</span>
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="info-box">
+                                                        <span :class="'info-box-icon ' +((order.isPaid) ? 'bg-green' : 'bg-red')"><i class="fa fa-check"></i></span>
+                                                        <div class="info-box-content">
+                                                            <span class="info-box-text">Montant</span>
+                                                            <span class="info-box-number">
+                                                            {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
                                                         </span>
+                                                        </div>
                                                     </div>
                                                 </div>
-
-                                                <div class="info-box">
-                                                    <span :class="'info-box-icon ' +((order.user.credit > 0) ? 'bg-green' : 'bg-red')"><i class="fa fa-user"></i></span>
-                                                    <div class="info-box-content">
-                                                        <span class="info-box-text">Crédit utilisateur</span>
-                                                        <span class="info-box-number">{{ order.user.credit.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}</span>
+                                                <div class="col-md-6" v-if="order.isCreditContext">
+                                                    <div class="info-box">
+                                                        <span :class="'info-box-icon ' +((order.user.credit > 0) ? 'bg-green' : 'bg-red')"><i class="fa fa-user"></i></span>
+                                                        <div class="info-box-content">
+                                                            <span class="info-box-text">Crédit utilisateur</span>
+                                                            <span class="info-box-number">
+                                                            {{ order.user.credit.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
+                                                        </span>
+                                                        </div>
                                                     </div>
                                                 </div>
-
-                                                <button v-if="order.amount_paid == order.amount"
-                                                    class="btn btn-default"
-                                                    :data-amount="order.amount"
-                                                    data-type="refund"
-                                                    @click="orderPaymentClick" >
-                                                    <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Recréditer {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
-                                                </button>
-
-                                                <button v-else-if="order.amount_paid == 0"
-                                                    class="btn btn-default"
-                                                    :data-amount="order.amount"
-                                                    data-type="payment"
-                                                    @click="orderPaymentClick">
-                                                    <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Débiter {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
-                                                </button>
-
-                                                <button v-else-if="order.amount_paid > order.amount"
-                                                    class="btn btn-default"
-                                                    :data-amount="order.amount_surplus"
-                                                    data-type="refund"
-                                                    @click="orderPaymentClick">
-                                                    <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Recréditer {{ order.amount_surplus.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
-                                                </button>
-
-                                                <button v-else-if="order.amount_paid < order.amount"
-                                                    class="btn btn-default"
-                                                    :data-amount="order.amount_remaining"
-                                                    data-type="payment"
-                                                    @click="orderPaymentClick">
-                                                    <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Débiter le restant {{ order.amount_remaining.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
-                                                </button>
                                             </div>
 
-                                            <div class="col-md-8">
-                                                <h4>Historique paiement</h4>
-                                                <table class="table table-condensed table-bordered table-hover">
-                                                    <thead>
-                                                        <tr>
-                                                            <td>Date</td>
-                                                            <td>Utilisateur</td>
-                                                            <td>Action</td>
-                                                            <td>Origine action</td>
-                                                            <td>- Débit</td>
-                                                            <td>+ Crédit</td>
-                                                        </tr>
-                                                    </thead>
-                                                    <tbody>
-                                                        <tr v-for="creditHistory in order.creditHistory">
-                                                            <td>{{ creditHistory.date }}</td>
-                                                            <td>{{ creditHistory.user }}</td>
-                                                            <td v-html="creditHistory.wording"></td>
-                                                            <td>{{ creditHistory.user_action }}</td>
-                                                            <td v-html="creditHistory.debit"></td>
-                                                            <td v-html="creditHistory.credit"></td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <h4>Historique paiements</h4>
+                                                    <table class="table table-condensed table-bordered table-hover" v-if="order.paymentsArray && order.paymentsArray.length > 0">
+                                                        <thead>
+                                                            <tr>
+                                                                <!--<td>Utilisateur</td>
+                                                                <td>Action</td>
+                                                                <td>Origine action</td>-->
+                                                                <td>Date</td>
+                                                                <td>Type</td>
+                                                                <td>Moyen</td>
+                                                                <td>Montant</td>
+                                                            </tr>
+                                                        </thead>
+                                                        <tbody>
+                                                            <tr v-for="payment in order.paymentsArray">
+                                                                <!--<td>{{ payment.user }}</td>
+                                                                <td v-html="payment.wording"></td>
+                                                                <td>{{ payment.user_action }}</td>-->
+                                                                <td>{{ payment.date }}</td>
+                                                                <td>{{ payment.wording_type }}</td>
+                                                                <td>{{ payment.wording_mean_payment }}</td>
+                                                                <td v-html="payment.amount"></td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                    <div class="alert alert-info" v-else>
+                                                        Aucun paiement rattaché à commande.
+                                                    </div>
+                                                    <div class="alert alert-success" v-if="order.isPaidViaInvoice">
+                                                        La commande est payée via la <a :href="UrlManager.getBaseUrl()+'invoice/update?id='+order.id_invoice">facture</a> à laquelle elle est rattachée.
+                                                    </div>
+                                                </div>
                                             </div>
 
                                         </div>
                                     </modal>
-
                                 </td>
-                                <td class="column-delivery-note">
-                                        <a v-if="order.id_delivery_note" class="btn btn-default btn-xs" :href="UrlManager.getBaseUrl()+'delivery-note/update?id='+order.id_delivery_note">
-                                                <span class="glyphicon glyphicon-file"></span> BL #{{ order.id_delivery_note }}
-                                        </a>
+                                <td v-if="producer && producer.tiller" class="tiller column-tiller">
+                                    <input v-if="order.tiller_synchronization == true" type="checkbox" checked="checked" :id="'checkbox-tiller-synchronization-'+order.id" :data-id-order="order.id" @change="changeSynchroTiller" />
+                                    <input v-else type="checkbox" :id="'checkbox-tiller-synchronization-'+order.id" :data-id-order="order.id" @change="changeSynchroTiller" />
+                                    <label :for="'checkbox-tiller-synchronization-'+order.id">Tiller</label>
                                 </td>
                             </tr>
                             <tr class="view" v-if="showViewProduct && idOrderView == order.id">
@@ -565,11 +631,6 @@ $this->setPageTitle('Distributions') ;
                                 </td>
                             </tr>
                         </template>
-                        <!--<tr v-if="idActivePointSale > 0">
-                                <td colspan="4"><strong>Total (TTC)</strong></td>
-                                <td><strong>{{ totalActivePointSale() }}</strong></td>
-                                <td colspan="3"></td>
-                        </tr>-->
                     </tbody>
                 </table>
                 <div class="alert alert-warning" v-else>
@@ -581,14 +642,19 @@ $this->setPageTitle('Distributions') ;
 </div>
 
 <script type="text/x-template" id="order-state-payment">
-    <div class="input-group">
-        <span class="label label-success input-group-addon" v-if="order.amount_paid == order.amount">débité</span>
-        <span class="label label-default input-group-addon" v-else-if="order.amount_paid == 0">non débité</span>
-        <span class="label label-default input-group-addon" v-else-if="order.amount_paid > order.amount">surplus</span>
-        <span class="label label-warning input-group-addon" v-else-if="order.amount_paid < order.amount">reste à débiter</span>
 
-        <span class="glyphicon glyphicon-time" title="Débit automatique du crédit" v-if="order.auto_payment && producer && producer.credit && (order.amount_paid == 0 || order.amount_paid < order.amount)"></span>
-    </div>
+
+    <span v-html="order.paymentLabelShort"></span>
+
+    <!--<span class="glyphicon glyphicon-signal" title="Paiement partiel ou surplus" v-if="order.amount_paid > order.amount || order.amount_paid < order.amount"></span>-->
+
+    <!--<span class="label label-success" v-if="order.amount_paid == order.amount">&nbsp;</span>
+    <span class="label label-default" v-else-if="order.amount_paid == 0">&nbsp;</span>-->
+
+    <!--<span class="label label-success input-group-addon" v-if="order.amount_paid == order.amount">débité</span>
+    <span class="label label-default input-group-addon" v-else-if="order.amount_paid == 0">non débité</span>
+    <span class="label label-default input-group-addon" v-else-if="order.amount_paid > order.amount">surplus</span>
+    <span class="label label-warning input-group-addon" v-else-if="order.amount_paid < order.amount">reste à débiter</span>-->
 </script>
 
 <!-- template for the order-form component -->
@@ -632,11 +698,11 @@ $this->setPageTitle('Distributions') ;
                     </select>
                 </div>
                 <div class="form-group">
-                    <label class="control-label" for="select-mean-payment">Moyen de paiement</label>
+                    <!--<label class="control-label" for="select-mean-payment">Moyen de paiement</label>
                     <select class="form-control" id="select-mean-payment" v-model="order.mean_payment">
                         <option value="0">--</option>
                         <option v-for="(wordingMeanPayment, keyMeanPayment) in meansPayment" :value="keyMeanPayment">{{ wordingMeanPayment }}</option>
-                    </select>
+                    </select>-->
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="textarea-comment">Commentaire</label>
@@ -731,9 +797,7 @@ $this->setPageTitle('Distributions') ;
         <span class="label label-default input-group-addon" v-else-if="order.amount_paid == 0">non réglé</span>
         <span class="label label-default input-group-addon" v-else-if="order.amount_paid > order.amount">surplus</span>
         <span class="label label-warning input-group-addon" v-else-if="order.amount_paid < order.amount">reste à débiter</span>
-
-        <span class="glyphicon glyphicon-time" title="Débit automatique du crédit" v-if="order.auto_payment && producer && producer.credit && (order.amount_paid == 0 || order.amount_paid < order.amount)"></span>
-</div>
+    </div>
 </script>
 
 <!-- template for the modal component -->

backend/views/document/_form.php

@@ -36,8 +36,8 @@
  * termes.
  */
 
-use common\logic\Document\Document\Wrapper\DocumentManager;
-use common\logic\Producer\Producer\Wrapper\ProducerManager;
+use common\helpers\MeanPayment;use common\helpers\Price;use common\logic\Document\Document\Wrapper\DocumentManager;
+use common\logic\Document\Invoice\Wrapper\InvoiceManager;use common\logic\Payment\Wrapper\PaymentManager;use common\logic\Producer\Producer\Wrapper\ProducerManager;
 use common\logic\User\User\Wrapper\UserManager;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
@@ -46,7 +46,9 @@ use yii\widgets\ActiveForm;
 
 $producerManager = ProducerManager::getInstance();
 $documentManager = DocumentManager::getInstance();
+$invoiceManager = InvoiceManager::getInstance();
 $userManager = UserManager::getInstance();
+$paymentManager = PaymentManager::getInstance();
 
 $documentClass = $documentManager->getClass($model);
 
@@ -171,7 +173,12 @@ $documentClass = $documentManager->getClass($model);
         <div id="" class="info-box">
             <span class="info-box-icon bg-yellow"><i class="fa fa-euro"></i></span>
             <div class="info-box-content">
-                <span class="info-box-text">Total<span v-if="taxRateProducer != 0"> (TTC)</span></span>
+                <span class="info-box-text">
+                    Total<span v-if="taxRateProducer != 0"> (TTC)</span>
+                    <?php if($invoiceManager->isDocumentInvoice($model) && $invoiceManager->isInvoicePaid($model)): ?>
+                        <span class="label label-success">PAYÉE</span>
+                    <?php endif; ?>
+                </span>
                 <span class="info-box-number">{{ formatPrice(total_with_tax) }}</span>
                 <p v-if="invoiceUrl">
                     <a class="btn btn-sm btn-default" :href="invoiceUrl">
@@ -234,6 +241,65 @@ $documentClass = $documentManager->getClass($model);
     <div class="clr"></div>
 
     <?php if ($action == 'update' && $documentClass == 'Invoice'): ?>
+
+        <?php if($documentManager->isStatusValid($model)): ?>
+            <div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        Règlement
+                    </div>
+                    <div class="panel-body">
+                        <?php if($model->payments && count($model->payments) > 0): ?>
+                            <table class="table table-bordered">
+                                <thead>
+                                    <tr>
+                                        <th>Moyen de paiement</th>
+                                        <th>Date transaction</th>
+                                        <th>Montant</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <?php foreach($model->payments as $payment): ?>
+                                    <tr>
+                                        <td><?= $paymentManager->getStrMeanPayment($payment); ?></td>
+                                        <td><?= $payment->date_transaction ? date('d/m/Y', strtotime($payment->date_transaction)) : '' ?></td>
+                                        <td><?= Price::format($payment->amount); ?></td>
+                                    </tr>
+                                    <?php endforeach; ?>
+                                </tbody>
+                            </table>
+                        <?php endif; ?>
+
+                        <?php if($invoiceManager->isDocumentInvoice($model) && !$invoiceManager->isInvoicePaid($model)): ?>
+                            <div class="row">
+                                <?php $form = ActiveForm::begin(); ?>
+                                <div class="col-md-3">
+                                    <?= $form->field($payment, 'mean_payment')->dropDownList(MeanPayment::getAll()); ?>
+                                </div>
+                                <div class="col-md-3">
+                                    <?= $form->field($payment, 'date_transaction')->textInput([
+                                            'class' => 'datepicker form-control'
+                                        ]); ?>
+                                </div>
+                                <div class="col-md-3">
+                                    <?= $form->field($payment, 'amount', [
+                                        'template' => '{label}<div class="input-group">{input}<span class="input-group-addon"><span class="glyphicon glyphicon-euro"></span></span></div>{hint}',
+                                    ])->textInput(); ?>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <br>
+                                        <?= Html::submitButton('Ajouter', ['class' => 'btn btn-primary']) ?>
+                                    </div>
+                                </div>
+                                <?php ActiveForm::end(); ?>
+                            </div>
+                        <?php endif; ?>
+                    </div>
+                </div>
+            </div>
+        <?php endif; ?>
+
         <div v-if="(deliveryNoteUpdateArray && deliveryNoteUpdateArray.length > 0) || (deliveryNoteCreateArray && deliveryNoteCreateArray.length > 0)">
             <div class="panel panel-default">
                 <div class="panel-heading">

backend/views/document/update.php

@@ -50,5 +50,6 @@ $this->addBreadcrumb('Modifier') ;
         'action' => 'update',
         'model' => $model,
         'typeDocument' => $typeDocument,
+        'payment' => $payment
     ]) ?>
 </div>

backend/views/invoice/index.php

@@ -104,13 +104,30 @@ $this->addButton(['label' => 'Nouvelle facture <span class="glyphicon glyphicon-
                 [
                     'attribute' => 'amount',
                     'header' => 'Montant',
+                    'format' => 'raw',
                     'value' => function ($invoice) use ($invoiceManager) {
+                        $amountWithTax = $invoiceManager->getAmountWithTax($invoice, Order::INVOICE_AMOUNT_TOTAL);
                         return $invoiceManager->getAmountWithTax($invoice, Order::INVOICE_AMOUNT_TOTAL, true);
                     }
                 ],
+                [
+                    'header' => 'Payée',
+                    'format' => 'raw',
+                    'headerOptions' => ['class' => 'column-hide-on-mobile'],
+                    'filterOptions' => ['class' => 'column-hide-on-mobile'],
+                    'contentOptions' => ['class' => 'column-hide-on-mobile'],
+                    'value' => function ($invoice) use ($invoiceManager) {
+                        $amountWithTax = $invoiceManager->getAmountWithTax($invoice, Order::INVOICE_AMOUNT_TOTAL);
+                        if($amountWithTax && $invoiceManager->isInvoicePaid($invoice)) {
+                            return '<span class="label label-success">Oui</span>';
+                        }
+
+                        return '<span class="label label-default">Non</span>';
+                    }
+                ],
                 [
                     'attribute' => 'is_sent',
-                    'header' => 'Envoyé',
+                    'header' => 'Envoyée',
                     'format' => 'raw',
                     'headerOptions' => ['class' => 'column-hide-on-mobile'],
                     'filterOptions' => ['class' => 'column-hide-on-mobile'],
@@ -119,7 +136,7 @@ $this->addButton(['label' => 'Nouvelle facture <span class="glyphicon glyphicon-
                         if ($model->is_sent) {
                             return '<span class="label label-success">Oui</span>';
                         } else {
-                            return '<span class="label label-danger">Non</span>';
+                            return '<span class="label label-default">Non</span>';
                         }
                     }
                 ],

backend/views/user/credit.php

@@ -39,10 +39,10 @@ termes.
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use common\helpers\GlobalParam;
-use common\logic\User\CreditHistory\Model\CreditHistory;
+use common\logic\Payment\Model\Payment;
 use common\helpers\MeanPayment;
 
-$creditHistoryManager = $this->getCreditHistoryManager();
+$paymentManager = $this->getPaymentManager();
 $producerManager = $this->getProducerManager();
 $userManager = $this->getUserManager();
 
@@ -89,8 +89,8 @@ $this->addBreadcrumb('Créditer') ;
             <div class="panel-body">
                 <?php $form = ActiveForm::begin(); ?>
                 <?= $form->field($creditForm, 'type')->dropDownList([
-                     CreditHistory::TYPE_CREDIT => 'Crédit',
-                     CreditHistory::TYPE_DEBIT => 'Débit',
+                     Payment::TYPE_CREDIT => 'Crédit',
+                    Payment::TYPE_DEBIT => 'Débit',
                 ]) ?>
                 <?= $form->field($creditForm, 'amount')->textInput() ?>
                 <?= $form->field($creditForm, 'mean_payment')->dropDownList([
@@ -130,21 +130,21 @@ $this->addBreadcrumb('Créditer') ;
                     <?php foreach($history as $creditHistory): ?>
 
                         <tr>
-                            <td><?= $creditHistoryManager->getDate($creditHistory, true) ; ?></td>
-                            <td><?= Html::encode($creditHistoryManager->getStrUserAction($creditHistory)); ?></td>
-                            <td><?= $creditHistoryManager->getStrWording($creditHistory); ?></td>
+                            <td><?= $paymentManager->getDate($creditHistory, true) ; ?></td>
+                            <td><?= Html::encode($paymentManager->getStrUserAction($creditHistory)); ?></td>
+                            <td><?= $paymentManager->getStrWording($creditHistory); ?></td>
                             <td>
-                                <?php if($creditHistoryManager->isTypeDebit($creditHistory)): ?>
-                                    - <?= $creditHistoryManager->getAmount($creditHistory, true); ?>
+                                <?php if($paymentManager->isTypeDebit($creditHistory)): ?>
+                                    - <?= $paymentManager->getAmount($creditHistory, true); ?>
                                 <?php endif; ?>
                             </td>
                             <td>
-                                <?php if($creditHistoryManager->isTypeCredit($creditHistory)): ?>
-                                    + <?= $creditHistoryManager->getAmount($creditHistory, true); ?>
+                                <?php if($paymentManager->isTypeCredit($creditHistory)): ?>
+                                    + <?= $paymentManager->getAmount($creditHistory, true); ?>
                                 <?php endif; ?>
                             </td>
                             <td>
-                                <?= $creditHistoryManager->getStrMeanPayment($creditHistory) ?>
+                                <?= $paymentManager->getStrMeanPayment($creditHistory) ?>
                             </td>
                             <td>
                                 <?php if(strlen($creditHistory->getComment())): ?>

backend/web/css/screen.css

@@ -1798,7 +1798,7 @@ body.skin-black .content-wrapper .table th {
 }
 /* line 279, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .table th.column-actions, body.skin-black .content-wrapper .table td.column-actions {
-  width: 150px;
+  width: 172px;
   text-align: right;
 }
 /* line 283, ../sass/_adminlte.scss */
@@ -2264,11 +2264,20 @@ termes.
   top: 1px;
   right: 1px;
 }
-/* line 273, ../sass/distribution/_index.scss */
+/* line 272, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-user .no-user {
+  color: gray;
+  font-style: italic;
+}
+/* line 278, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-delivery-note {
+  position: relative;
+}
+/* line 282, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller {
   width: 60px;
 }
-/* line 276, ../sass/distribution/_index.scss */
+/* line 285, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller label {
   font-size: 12px;
   cursor: pointer;
@@ -2276,72 +2285,88 @@ termes.
   top: -2px;
   font-weight: normal;
 }
-/* line 285, ../sass/distribution/_index.scss */
+/* line 294, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions {
   position: relative;
   text-align: right;
 }
-/* line 289, ../sass/distribution/_index.scss */
+/* line 298, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-actions .wrapper-button-dropdown {
+  display: inline-block;
+}
+/* line 302, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .dropdown-menu {
-  top: 0px;
-  right: 0px;
+  left: -70px;
+  width: 227px;
 }
-/* line 294, ../sass/distribution/_index.scss */
+/* line 307, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .modal-form-order,
 .distribution-index #orders table td.column-actions .modal-payment {
   text-align: left;
 }
-/* line 299, ../sass/distribution/_index.scss */
+/* line 312, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription {
   position: relative;
 }
-/* line 302, ../sass/distribution/_index.scss */
+/* line 315, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription .glyphicon-plus {
   position: absolute;
   top: 4px;
   right: 4px;
   font-size: 7px;
 }
-/* line 311, ../sass/distribution/_index.scss */
+/* line 324, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-state-payment {
-  width: 120px;
+  width: 133px;
 }
-/* line 315, ../sass/distribution/_index.scss */
+/* line 330, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-credit a.positive {
+  color: green;
+}
+/* line 333, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-credit a.negative {
+  color: red;
+}
+/* line 339, ../sass/distribution/_index.scss */
 .distribution-index #orders table .state-payment-mobile {
   display: none;
 }
-/* line 320, ../sass/distribution/_index.scss */
+/* line 343, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-payment {
+  position: relative;
+}
+/* line 346, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-payment div.btn-group {
   width: 125px;
 }
-/* line 326, ../sass/distribution/_index.scss */
+/* line 352, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 336, ../sass/distribution/_index.scss */
+/* line 362, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .comment {
   margin-top: 20px;
 }
-/* line 340, ../sass/distribution/_index.scss */
+/* line 366, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .delivery {
   margin-top: 20px;
 }
-/* line 349, ../sass/distribution/_index.scss */
+/* line 375, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container {
   width: 100%;
   padding: 0px;
 }
-/* line 353, ../sass/distribution/_index.scss */
+/* line 379, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body {
   padding-right: 15px;
 }
-/* line 356, ../sass/distribution/_index.scss */
+/* line 382, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body table {
   margin-bottom: 150px;
 }
-/* line 361, ../sass/distribution/_index.scss */
+/* line 387, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer {
   border-top-color: #f4f4f4;
   position: fixed;
@@ -2353,64 +2378,64 @@ termes.
   text-align: center;
   border-top: solid 1px #e0e0e0;
 }
-/* line 373, ../sass/distribution/_index.scss */
+/* line 399, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form button {
   float: none;
 }
-/* line 377, ../sass/distribution/_index.scss */
+/* line 403, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form div.right {
   float: right;
 }
-/* line 384, ../sass/distribution/_index.scss */
+/* line 410, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .btn-credit {
   float: right;
 }
-/* line 390, ../sass/distribution/_index.scss */
+/* line 416, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 394, ../sass/distribution/_index.scss */
+/* line 420, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input.input-quantity {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 400, ../sass/distribution/_index.scss */
+/* line 426, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price {
   width: 150px;
 }
-/* line 403, ../sass/distribution/_index.scss */
+/* line 429, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price input {
   text-align: center;
 }
-/* line 407, ../sass/distribution/_index.scss */
+/* line 433, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .input-group-addon {
   background-color: #eee;
 }
-/* line 411, ../sass/distribution/_index.scss */
+/* line 437, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .invoice-price {
   margin-top: 8px;
 }
-/* line 413, ../sass/distribution/_index.scss */
+/* line 439, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .invoice-price .label-invoice-price {
   font-size: 11px;
   font-weight: bold;
   color: gray;
 }
-/* line 421, ../sass/distribution/_index.scss */
+/* line 447, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 165px;
 }
-/* line 424, ../sass/distribution/_index.scss */
+/* line 450, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: black;
 }
-/* line 429, ../sass/distribution/_index.scss */
+/* line 455, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .form-control {
   border-right: 0px none;
   padding-right: 4px;
 }
-/* line 434, ../sass/distribution/_index.scss */
+/* line 460, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -2418,35 +2443,35 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 443, ../sass/distribution/_index.scss */
+/* line 469, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 446, ../sass/distribution/_index.scss */
+/* line 472, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.quantity-remaining, .distribution-index .modal-form-order table.table-products td.quantity-remaining.infinite {
   color: #00A65A;
 }
-/* line 450, ../sass/distribution/_index.scss */
+/* line 476, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.negative {
   color: #DD4B39;
 }
-/* line 454, ../sass/distribution/_index.scss */
+/* line 480, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.infinite, .distribution-index .modal-form-order table.table-products td.quantity-remaining.empty {
   font-size: 18px;
 }
-/* line 461, ../sass/distribution/_index.scss */
+/* line 487, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 469, ../sass/distribution/_index.scss */
+/* line 495, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 472, ../sass/distribution/_index.scss */
+/* line 498, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 477, ../sass/distribution/_index.scss */
+/* line 503, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }

backend/web/js/vuejs/distribution-index.js

@@ -55,6 +55,7 @@ var app = new Vue({
                 pointsSale: [],
                 meansPayment: [],
                 idActivePointSale: 0,
+                pointSaleActive: null,
                 idDefaultPointSale: 0,
                 countActivePointsSale: 0,
                 countOrdersByPointSale: [],
@@ -418,11 +419,19 @@ var app = new Vue({
         },
         setIdActivePointSale: function (id) {
             this.idActivePointSale = id;
+
+            for(key in this.pointsSale) {
+                if(this.pointsSale[key].id == id) {
+                    this.pointSaleActive = this.pointsSale[key];
+                }
+            }
+
             if (!id) {
                 this.orderCreate.id_point_sale = this.idDefaultPointSale;
             } else {
                 this.orderCreate.id_point_sale = id;
             }
+            setTimeout("opendistrib_popover(); opendistrib_dropdown_tooltip();", 500);
         },
         orderCreatedUpdated: function () {
             this.showModalFormOrderCreate = false;
@@ -499,6 +508,31 @@ var app = new Vue({
             this.idOrderPayment = idOrder;
             this.showModalPayment = true;
         },
+        getTypePayment: function(order) {
+            if(order.amount_paid < order.amount) {
+                return 'payment';
+            }
+            else {
+                return 'refund';
+            }
+        },
+        isTypePayment: function(order) {
+            return this.getTypePayment(order) == 'payment';
+        },
+        getLabelPaymentRefund: function(order, labelPay, labelRefund, labelMeanPayment) {
+            var str = '';
+
+            if(this.isTypePayment(order)) {
+                str += labelPay;
+            }
+            else {
+                str += labelRefund;
+            }
+
+            str += ' '+labelMeanPayment;
+
+            return str;
+        },
         orderPaymentClick: function (event) {
             var app = this;
             var idOrder = event.currentTarget.getAttribute('data-id-order');
@@ -509,7 +543,8 @@ var app = new Vue({
                 params: {
                     idOrder: idOrder,
                     type: event.currentTarget.getAttribute('data-type'),
-                    amount: event.currentTarget.getAttribute('data-amount')
+                    meanPayment: event.currentTarget.getAttribute('data-mean-payment')
+                    //amount: event.currentTarget.getAttribute('data-amount')
                 }
             })
                 .then(function (response) {
@@ -858,6 +893,23 @@ var app = new Vue({
 
             return false;
         },
+        countDocuments: function(order) {
+            var count = 0;
+
+            if(order.id_delivery_note) {
+                count ++;
+            }
+
+            if(order.id_quotation) {
+                count ++;
+            }
+
+            if(order.id_invoice) {
+                count ++;
+            }
+
+            return count;
+        }
     },
 });
 
@@ -871,7 +923,7 @@ Vue.component('modal', {
 });
 
 Vue.component('order-form', {
-    props: ['date', 'dateFormat', 'pointsSale', 'idActivePointSale', 'meansPayment', 'users', 'products', 'order', 'orders', 'producer', 'loadingUpdateProductOrder'],
+    props: ['date', 'dateFormat', 'pointsSale', 'idActivePointSale', 'meansPayment', 'users', 'products', 'order', 'orders', 'producer', 'loadingUpdateProductOrder', 'create'],
     emits: ['updateProductPrice', 'updateInvoicePrices'],
     data: function () {
         return {
@@ -1080,13 +1132,19 @@ Vue.component('order-form', {
             }
         },
         getProductQuantityRemaining: function(product) {
+            var order = null;
             var app = this;
             var productQuantityOrder = 0;
 
             for(key in app.orders) {
-                var order = app.orders[key];
+                order = app.orders[key];
                 productQuantityOrder += order.productOrder[product.id].quantity;
             }
+
+            if(app.create == 1) {
+                productQuantityOrder += app.order.productOrder[product.id].quantity;
+            }
+
             return product.productDistribution[0].quantity_max - productQuantityOrder;
         }
     }

backend/web/sass/_adminlte.scss

@@ -277,7 +277,7 @@ body.skin-black {
                 font-size: 13px ;
             }
             th.column-actions, td.column-actions {
-                width: 150px ;
+                width: 172px;
                 text-align: right ;
             }
             td.text-small, th.text-small {

backend/web/sass/distribution/_index.scss

@@ -268,6 +268,15 @@ termes.
           top: 1px;
           right: 1px;
         }
+
+        .no-user {
+          color: gray;
+          font-style: italic;
+        }
+      }
+
+      td.column-delivery-note {
+        position: relative;
       }
 
       td.tiller {
@@ -286,9 +295,13 @@ termes.
         position: relative;
         text-align: right;
 
+        .wrapper-button-dropdown {
+          display: inline-block;
+        }
+
         .dropdown-menu {
-          top: 0px;
-          right: 0px;
+          left: -70px;
+          width: 227px;
         }
 
         .modal-form-order,
@@ -309,7 +322,18 @@ termes.
       }
 
       td.column-state-payment {
-        width: 120px;
+        width: 133px;
+      }
+
+      td.column-credit {
+        a {
+          &.positive {
+            color: green;
+          }
+          &.negative {
+            color: red;
+          }
+        }
       }
 
       .state-payment-mobile {
@@ -317,6 +341,8 @@ termes.
       }
 
       td.column-payment {
+        position: relative;
+
         div.btn-group {
           width: 125px;
         }

common/components/BusinessLogic.php

@@ -15,7 +15,7 @@ class BusinessLogic
             $this->getTaxRateContainer(),
             $this->getUserUserGroupContainer(),
             $this->getUserGroupContainer(),
-            $this->getCreditHistoryContainer(),
+            $this->getPaymentContainer(),
             $this->getProducerPriceRangeContainer(),
             $this->getUserProducerContainer(),
             $this->getUserPointSaleContainer(),

common/components/BusinessLogicTrait.php

@@ -23,6 +23,8 @@ use common\logic\Order\Order\Wrapper\OrderContainer;
 use common\logic\Order\Order\Wrapper\OrderManager;
 use common\logic\Order\ProductOrder\Wrapper\ProductOrderContainer;
 use common\logic\Order\ProductOrder\Wrapper\ProductOrderManager;
+use common\logic\Payment\Wrapper\PaymentContainer;
+use common\logic\Payment\Wrapper\PaymentManager;
 use common\logic\PointSale\PointSale\Wrapper\PointSaleContainer;
 use common\logic\PointSale\PointSale\Wrapper\PointSaleManager;
 use common\logic\PointSale\UserPointSale\Wrapper\UserPointSaleContainer;
@@ -49,8 +51,6 @@ use common\logic\Ticket\TicketMessage\Wrapper\TicketMessageContainer;
 use common\logic\Ticket\TicketMessage\Wrapper\TicketMessageManager;
 use common\logic\Ticket\TicketUser\Wrapper\TicketUserContainer;
 use common\logic\Ticket\TicketUser\Wrapper\TicketUserManager;
-use common\logic\User\CreditHistory\Wrapper\CreditHistoryContainer;
-use common\logic\User\CreditHistory\Wrapper\CreditHistoryManager;
 use common\logic\User\User\Wrapper\UserContainer;
 use common\logic\User\User\Wrapper\UserManager;
 use common\logic\User\UserGroup\Wrapper\UserGroupContainer;
@@ -172,9 +172,9 @@ trait BusinessLogicTrait
         return SubscriptionManager::getInstance();
     }
 
-    public function getCreditHistoryManager(): CreditHistoryManager
+    public function getPaymentManager(): PaymentManager
     {
-        return CreditHistoryManager::getInstance();
+        return PaymentManager::getInstance();
     }
 
     public function getUserManager(): UserManager
@@ -227,9 +227,9 @@ trait BusinessLogicTrait
         return UserProducerContainer::getInstance();
     }
 
-    public function getCreditHistoryContainer(): CreditHistoryContainer
+    public function getPaymentContainer(): PaymentContainer
     {
-        return CreditHistoryContainer::getInstance();
+        return PaymentContainer::getInstance();
     }
 
     public function getDocumentContainer(): DocumentContainer

common/config/main.php

@@ -42,7 +42,7 @@ 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\User\CreditHistory\Model\CreditHistory;
+use common\logic\Payment\Model\Payment;
 
 $serverName = isset($_SERVER['SERVER_NAME']) ?? '';
 
@@ -161,12 +161,12 @@ return [
             'listeners' => [],
             'observers' => [
                 Order::class => [
-                    // CreditHistory : remboursement commande
-                    common\logic\User\CreditHistory\Event\OrderObserver::class
+                    // Payment : remboursement commande
+                    common\logic\Payment\Event\OrderObserver::class
                 ],
-                CreditHistory::class => [
+                Payment::class => [
                     // UserProducer : mise à jour du crédit
-                    common\logic\User\UserProducer\Event\CreditHistoryObserver::class
+                    common\logic\User\UserProducer\Event\PaymentObserver::class
                 ],
                 Distribution::class => [
                     // Subscription : génération des commandes sur base des abonnements

common/config/params.php

@@ -37,7 +37,7 @@
  */
 
 return [
-        'version' => '23.9.C',
+        'version' => '23.9.D',
         'siteName' => 'Opendistrib',
         'adminEmail' => 'contact@opendistrib.net',
         'supportEmail' => 'contact@opendistrib.net',

common/helpers/GlobalParam.php

@@ -39,6 +39,7 @@
 namespace common\helpers;
 
 use common\logic\Producer\Producer\Model\Producer;
+use common\logic\Producer\Producer\Wrapper\ProducerManager;
 use common\logic\User\User\Service\UserSolver;
 
 class GlobalParam
@@ -60,8 +61,9 @@ class GlobalParam
 
     public static function getCurrentProducer()
     {
+        $producerManager = ProducerManager::getInstance();
         if(!\Yii::$app->parameterBag->has('producer') || !\Yii::$app->parameterBag->get('producer')) {
-            \Yii::$app->parameterBag->set('producer', Producer::searchOne());
+            \Yii::$app->parameterBag->set('producer', $producerManager->findOneProducerById(self::getCurrentProducerId()));
         }
 
         return \Yii::$app->parameterBag->get('producer');

common/helpers/MeanPayment.php

@@ -56,7 +56,7 @@ class MeanPayment {
     public static function getStrBy($meanPayment) 
     {
         switch($meanPayment) {
-            case self::CREDIT_CARD : return 'Paiement en ligne' ;
+            case self::CREDIT_CARD : return 'Carte bancaire' ;
             case self::MONEY : return 'Espèces' ;
             case self::CHEQUE : return 'Chèque' ;
             case self::TRANSFER : return 'Virement' ;    

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

@@ -100,6 +100,21 @@ class DocumentSolver extends AbstractService implements SolverInterface
         return null;
     }
 
+    public function isDocumentDeliveryNote(DocumentInterface $document): bool
+    {
+        return $this->getClass($document) == 'DeliveryNote';
+    }
+
+    public function isDocumentInvoice(DocumentInterface $document): bool
+    {
+        return $this->getClass($document) == 'Invoice';
+    }
+
+    public function isDocumentQuotation(DocumentInterface $document): bool
+    {
+        return $this->getClass($document) == 'Quotation';
+    }
+
     public function getClass(DocumentInterface $document, bool $pathComplete = false): string
     {
         $classDocument = get_class($document);

common/logic/Document/Invoice/Model/Invoice.php

@@ -39,6 +39,7 @@
 namespace common\logic\Document\Invoice\Model;
 
 use common\logic\Document\Document\Model\Document;
+use common\logic\Payment\Model\Payment;
 
 /**
  * This is the model class for table "invoice".
@@ -64,4 +65,10 @@ class Invoice extends Document
     {
         return $this->relationOrders('id_invoice');
     }
+
+    public function getPayments()
+    {
+        return $this->hasMany(Payment::class, ['id_invoice' => 'id'])
+            ->orderBy(['payment.id' => SORT_DESC]);
+    }
 }

common/logic/Document/Invoice/Repository/InvoiceRepository.php

@@ -17,7 +17,7 @@ class InvoiceRepository extends AbstractRepository
     public function getDefaultOptionsSearch(): array
     {
         return [
-            self::WITH => [],
+            self::WITH => ['payments'],
             self::JOIN_WITH => ['user AS user_invoice', 'producer'],
             self::ORDER_BY => 'date ASC',
             self::ATTRIBUTE_ID_PRODUCER => 'invoice.id_producer'

common/logic/Document/Invoice/Service/InvoiceSolver.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace common\logic\Document\Invoice\Service;
+
+use common\helpers\Price;
+use common\logic\Document\Document\Service\DocumentSolver;
+use common\logic\Document\Invoice\Model\Invoice;
+
+class InvoiceSolver extends DocumentSolver
+{
+    public function getInvoiceAmountPaid(Invoice $invoice): float
+    {
+        $amountPaid = 0;
+
+        foreach($invoice->payments as $payment) {
+            $amountPaid += $payment->amount;
+        }
+
+        return $amountPaid;
+    }
+
+    public function isInvoicePaid(Invoice $invoice): bool
+    {
+        return $this->getInvoiceAmountPaid($invoice) >= Price::numberTwoDecimals($this->getAmountWithTax($invoice));
+    }
+}

common/logic/Document/Invoice/Wrapper/InvoiceContainer.php

@@ -3,10 +3,10 @@
 namespace common\logic\Document\Invoice\Wrapper;
 
 use common\logic\AbstractContainer;
-use common\logic\Document\Document\Service\DocumentSolver;
 use common\logic\Document\Invoice\Repository\InvoiceRepository;
 use common\logic\Document\Invoice\Service\InvoiceBuilder;
 use common\logic\Document\Invoice\Service\InvoiceDefinition;
+use common\logic\Document\Invoice\Service\InvoiceSolver;
 
 class InvoiceContainer extends AbstractContainer
 {
@@ -14,7 +14,7 @@ class InvoiceContainer extends AbstractContainer
     {
         return [
             InvoiceDefinition::class,
-            DocumentSolver::class,
+            InvoiceSolver::class,
             InvoiceRepository::class,
             InvoiceBuilder::class,
         ];
@@ -25,9 +25,9 @@ class InvoiceContainer extends AbstractContainer
         return InvoiceDefinition::getInstance();
     }
 
-    public function getSolver(): DocumentSolver
+    public function getSolver(): InvoiceSolver
     {
-        return DocumentSolver::getInstance();
+        return InvoiceSolver::getInstance();
     }
 
     public function getRepository(): InvoiceRepository

common/logic/Document/Invoice/Wrapper/InvoiceManager.php

@@ -6,9 +6,11 @@ use common\logic\Document\Document\Wrapper\DocumentManager;
 use common\logic\Document\Invoice\Repository\InvoiceRepository;
 use common\logic\Document\Invoice\Service\InvoiceBuilder;
 use common\logic\Document\Invoice\Service\InvoiceDefinition;
+use common\logic\Document\Invoice\Service\InvoiceSolver;
 
 /**
  * @mixin InvoiceDefinition
+ * @mixin InvoiceSolver
  * @mixin InvoiceRepository
  * @mixin InvoiceBuilder
  */

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

@@ -43,9 +43,9 @@ use common\logic\Document\DeliveryNote\Model\DeliveryNote;
 use common\logic\Document\Invoice\Model\Invoice;
 use common\logic\Document\Quotation\Model\Quotation;
 use common\logic\Order\ProductOrder\Model\ProductOrder;
+use common\logic\Payment\Model\Payment;
 use common\logic\PointSale\PointSale\Model\PointSale;
 use common\logic\Subscription\Subscription\Model\Subscription;
-use common\logic\User\CreditHistory\Model\CreditHistory;
 use common\logic\User\User\Model\User;
 use common\components\ActiveRecordCommon;
 
@@ -185,9 +185,10 @@ class Order extends ActiveRecordCommon
         $this->populateFieldObject('id_point_sale', 'point_sale', $pointSale);
     }
 
-    public function getCreditHistory()
+    public function getPayment()
     {
-        return $this->hasMany(CreditHistory::class, ['id_order' => 'id']);
+        return $this->hasMany(Payment::class, ['id_order' => 'id'])
+            ->orderBy(['payment.id' => SORT_DESC]);
     }
 
     public function getSubscription()

common/logic/Order/Order/Repository/OrderRepository.php

@@ -9,9 +9,13 @@ use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\Distribution\Repository\DistributionRepository;
 use common\logic\Distribution\ProductDistribution\Repository\ProductDistributionRepository;
 use common\logic\Document\Invoice\Model\Invoice;
+use common\logic\Document\Invoice\Repository\InvoiceRepository;
+use common\logic\Document\Invoice\Service\InvoiceSolver;
 use common\logic\Order\Order\Model\Order;
 use common\logic\Order\Order\Service\OrderSolver;
 use common\logic\Order\ProductOrder\Repository\ProductOrderRepository;
+use common\logic\Payment\Model\Payment;
+use common\logic\Payment\Service\PaymentSolver;
 use common\logic\PointSale\PointSale\Model\PointSale;
 use common\logic\PointSale\PointSale\Repository\PointSaleRepository;
 use common\logic\PointSale\UserPointSale\Repository\UserPointSaleRepository;
@@ -35,6 +39,9 @@ class OrderRepository extends AbstractRepository
     protected DistributionRepository $distributionRepository;
     protected PointSaleRepository $pointSaleRepository;
     protected UserPointSaleRepository $userPointSaleRepository;
+    protected InvoiceRepository $invoiceRepository;
+    protected InvoiceSolver $invoiceSolver;
+    protected PaymentSolver $paymentSolver;
 
     public function loadDependencies(): void
     {
@@ -48,6 +55,9 @@ class OrderRepository extends AbstractRepository
         $this->distributionRepository = $this->loadService(DistributionRepository::class);
         $this->pointSaleRepository = $this->loadService(PointSaleRepository::class);
         $this->userPointSaleRepository = $this->loadService(UserPointSaleRepository::class);
+        $this->invoiceRepository = $this->loadService(InvoiceRepository::class);
+        $this->invoiceSolver = $this->loadService(InvoiceSolver::class);
+        $this->paymentSolver = $this->loadService(PaymentSolver::class);
     }
 
     public function getDefaultOptionsSearch(): array
@@ -56,14 +66,19 @@ class OrderRepository extends AbstractRepository
             self::WITH => [
                 'productOrder',
                 'productOrder.product',
-                'creditHistory',
-                'creditHistory.userAction',
+                'productOrder.taxRate',
                 'pointSale',
+                'payment',
+                'payment.user',
+                'payment.userAction',
+                'deliveryNote',
+                'invoice',
+                'quotation'
             ],
             self::JOIN_WITH => [
                 'distribution',
                 'user',
-                'user.userProducer'
+                'user.userProducer',
             ],
             self::ORDER_BY => 'order.date ASC',
             self::ATTRIBUTE_ID_PRODUCER => 'distribution.id_producer'
@@ -135,6 +150,7 @@ class OrderRepository extends AbstractRepository
             ->filterIsValid()
             ->filterIsNotIgnoreWhenInvoicing()
             ->orderByDistributionDate('ASC')
+            ->limit(20)
             ->find();
     }
 
@@ -317,18 +333,18 @@ class OrderRepository extends AbstractRepository
 
     public function isCreditAutoPayment(Order $order)
     {
-        $pointSale = $this->pointSaleRepository->findOnePointSaleById($order->id_point_sale);
-        $distribution = $this->distributionRepository->findOneDistributionById($order->id_distribution);
+        //$pointSale = $this->pointSaleRepository->findOnePointSaleById($order->id_point_sale);
+        $pointSale = $order->pointSale;
 
         if($pointSale) {
             $creditFunctioning = $this->producerRepository->getPointSaleCreditFunctioning($pointSale);
 
             if ($order->id_user && $this->producerRepository->getConfig('credit') && $pointSale->credit) {
                 if($order->mean_payment == MeanPayment::CREDIT || $creditFunctioning == Producer::CREDIT_FUNCTIONING_MANDATORY) {
-                    return 1;
+                    return true;
                 }
                 elseif ($creditFunctioning == Producer::CREDIT_FUNCTIONING_OPTIONAL) {
-                    return 0;
+                    return false;
                 }
                 elseif ($creditFunctioning == Producer::CREDIT_FUNCTIONING_USER) {
                     $userProducer = $this->userProducerRepository->findOneUserProducer($order->user);
@@ -339,7 +355,37 @@ class OrderRepository extends AbstractRepository
             }
         }
 
-        return 0;
+        return false;
+    }
+
+    public function isCreditContext(Order $order)
+    {
+        if(!$this->producerRepository->getConfig('credit')) {
+            return false;
+        }
+
+        //$pointSale = $this->pointSaleRepository->findOnePointSaleById($order->id_point_sale);
+        $pointSale = $order->pointSale;
+
+        if($pointSale) {
+            $creditFunctioning = $this->producerRepository->getPointSaleCreditFunctioning($pointSale);
+            if ($order->id_user && $this->producerRepository->getConfig('credit') && $pointSale->credit) {
+                if($order->mean_payment == MeanPayment::CREDIT
+                    || $creditFunctioning == Producer::CREDIT_FUNCTIONING_MANDATORY
+                    || $creditFunctioning == Producer::CREDIT_FUNCTIONING_OPTIONAL) {
+
+                    return true;
+                }
+                elseif ($creditFunctioning == Producer::CREDIT_FUNCTIONING_USER) {
+                    $userProducer = $this->userProducerRepository->findOneUserProducer($order->user);
+                    if ($userProducer) {
+                        return $userProducer->credit_active;
+                    }
+                }
+            }
+        }
+
+        return false;
     }
 
     public function findOneOrderLastByUser(User $user)
@@ -433,4 +479,122 @@ class OrderRepository extends AbstractRepository
 
         return $orders->all();
     }
+
+
+    public function isOrderPaid(Order $order): bool
+    {
+        $amountPaid = $this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID);
+        $amountTotal = $this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_TOTAL);
+
+        if(abs($amountPaid - $amountTotal) < 0.00001
+            || $amountPaid >= $amountTotal) {
+            return true;
+        }
+
+        return $this->isOrderPaidViaInvoice($order);
+    }
+
+    public function isOrderPaidViaInvoice(Order $order): bool
+    {
+        if($order->invoice) {
+            $invoice = $this->invoiceRepository->findOneInvoiceById($order->id_invoice);
+            if($invoice && $this->invoiceSolver->isInvoicePaid($invoice)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function getMainPayment(Order $order): ?Payment
+    {
+        foreach($order->payment as $payment) {
+            if($this->paymentSolver->isTypeDebit($payment)) {
+                return $payment;
+            }
+        }
+
+        return null;
+    }
+
+    public function getPaymentLabelShort(Order $order): string
+    {
+        $isOrderPaid = $this->isOrderPaid($order);
+        $amountPaid = $this->orderSolver->getOrderAmountPaid($order);
+        $amountTotal = $this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_TOTAL);
+        $label = '&nbsp;';
+        $classLabel = 'default';
+        $titleLabel = '';
+
+        if(!$amountPaid) {
+            if($isOrderPaid) {
+                $label = 'Facture payée';
+            }
+            elseif($this->isCreditAutoPayment($order)) {
+                if($order->subscription && $order->subscription->auto_payment == 0) {
+                    $label = 'Crédit désactivé';
+                }
+                else {
+                    $label = 'Crédit non débité';
+                }
+            }
+            else {
+                $label = 'Non réglé';
+            }
+        }
+        else {
+            $mainPayment = $this->getMainPayment($order);
+            if($mainPayment) {
+                if($this->paymentSolver->isMeanPaymentCredit($mainPayment)) {
+                    $label = 'Crédit débité';
+                }
+                else {
+                    $label = MeanPayment::getStrBy($mainPayment->mean_payment);
+                }
+            }
+        }
+
+        $orderPaymentStatus = $this->orderSolver->getPaymentStatus($order);
+        if($amountPaid == 0 && !$isOrderPaid) {
+            $classLabel = 'default';
+        }
+        elseif($orderPaymentStatus == Order::PAYMENT_SURPLUS) {
+            $classLabel = 'warning';
+            $titleLabel = 'Paiement en surplus';
+        }
+        elseif($isOrderPaid) {
+            $classLabel = 'success';
+        }
+        elseif($orderPaymentStatus == Order::PAYMENT_UNPAID) {
+            $classLabel = 'warning';
+            $titleLabel = 'Paiement partiel';
+        }
+
+        return '<span class="label label-'.$classLabel.'" title="'.$titleLabel.'">'.$label.'</span>';
+    }
+
+    public function isOrderCreditFunctioningMandatory(Order $order): bool
+    {
+        $pointSale = $order->pointSale;
+        return $pointSale && $pointSale->credit && $pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_MANDATORY;
+    }
+
+    public function isOrderCreditFunctioningUser(Order $order): bool
+    {
+        if($order->user) {
+
+            $pointSale = $order->pointSale;
+
+            // @TODO : à optimiser
+            $userProducer = $this->userProducerRepository->findOneUserProducer($order->user);
+
+            return $pointSale
+                && $pointSale->credit
+                && $pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_USER
+                && $userProducer
+                && $userProducer->credit_active;
+        }
+
+        return false;
+    }
 }

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

@@ -20,6 +20,9 @@ use common\logic\Order\Order\Repository\OrderRepository;
 use common\logic\Order\ProductOrder\Model\ProductOrder;
 use common\logic\Order\ProductOrder\Service\ProductOrderBuilder;
 use common\logic\Order\ProductOrder\Service\ProductOrderSolver;
+use common\logic\Payment\Model\Payment;
+use common\logic\Payment\Repository\PaymentRepository;
+use common\logic\Payment\Service\PaymentBuilder;
 use common\logic\PointSale\PointSale\Model\PointSale;
 use common\logic\PointSale\PointSale\Service\PointSaleBuilder;
 use common\logic\PointSale\PointSale\Repository\PointSaleRepository;
@@ -31,9 +34,6 @@ use common\logic\Subscription\Subscription\Model\Subscription;
 use common\logic\Subscription\Subscription\Service\SubscriptionBuilder;
 use common\logic\Subscription\Subscription\Repository\SubscriptionRepository;
 use common\logic\Subscription\Subscription\Service\SubscriptionSolver;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\CreditHistory\Service\CreditHistoryBuilder;
-use common\logic\User\CreditHistory\Repository\CreditHistoryRepository;
 use common\logic\User\User\Repository\UserRepository;
 use common\logic\User\User\Service\UserSolver;
 use common\logic\User\UserProducer\Repository\UserProducerRepository;
@@ -43,9 +43,9 @@ class OrderBuilder extends AbstractBuilder
 {
     protected UserSolver $userSolver;
     protected OrderSolver $orderSolver;
-    protected CreditHistoryRepository $creditHistoryRepository;
+    protected PaymentRepository $paymentRepository;
     protected ProducerRepository $producerRepository;
-    protected CreditHistoryBuilder $creditHistoryBuilder;
+    protected PaymentBuilder $paymentBuilder;
     protected ProductOrderBuilder $productOrderBuilder;
     protected OrderRepository $orderRepository;
     protected DistributionRepository $distributionRepository;
@@ -66,9 +66,9 @@ class OrderBuilder extends AbstractBuilder
     {
         $this->userSolver = $this->loadService(UserSolver::class);
         $this->orderSolver = $this->loadService(OrderSolver::class);
-        $this->creditHistoryRepository = $this->loadService(CreditHistoryRepository::class);
+        $this->paymentRepository = $this->loadService(PaymentRepository::class);
         $this->producerRepository = $this->loadService(ProducerRepository::class);
-        $this->creditHistoryBuilder = $this->loadService(CreditHistoryBuilder::class);
+        $this->paymentBuilder = $this->loadService(PaymentBuilder::class);
         $this->productOrderBuilder = $this->loadService(ProductOrderBuilder::class);
         $this->orderRepository = $this->loadService(OrderRepository::class);
         $this->distributionRepository = $this->loadService(DistributionRepository::class);
@@ -179,9 +179,8 @@ class OrderBuilder extends AbstractBuilder
     public function deleteOrdersIncomingDistributionsFromSubscription(Subscription $subscription, bool $deleteAfterDateEnd = false): int
     {
         $ordersArray = $this->orderRepository->findOrdersIncomingBySubscription($subscription, !$deleteAfterDateEnd);
-
-
         $countOrdersDeleted = 0;
+
         if ($ordersArray && count($ordersArray)) {
             foreach ($ordersArray as $order) {
                 if ($this->distributionSolver->isDistributionAvailable($order->distribution)) {
@@ -377,22 +376,14 @@ class OrderBuilder extends AbstractBuilder
      */
     public function initOrderPaidAmount(Order $order): void
     {
-        // Attention : $order->creditHistory pas à jour si un paiement vient d'avoir lieu
-        /*if (isset($order->creditHistory)) {
-            $history = $order->creditHistory;
-        } else {
-            $history = $this->creditHistoryRepository->getByOrder($order);
-        }*/
-
-        $history = $this->creditHistoryRepository->getByOrder($order);
-
+        $history = $order->payment;
         $order->paid_amount = 0;
 
-        if (count($history)) {
-            foreach ($history as $ch) {
-                if ($ch->type == CreditHistory::TYPE_PAYMENT) {
+        if ($history && count($history)) {
+            foreach ($order->payment as $ch) {
+                if ($ch->type == Payment::TYPE_PAYMENT) {
                     $order->paid_amount += $ch->amount;
-                } elseif ($ch->type == CreditHistory::TYPE_REFUND) {
+                } elseif ($ch->type == Payment::TYPE_REFUND) {
                     $order->paid_amount -= $ch->amount;
                 }
             }
@@ -439,14 +430,14 @@ class OrderBuilder extends AbstractBuilder
             if ($paymentStatus == Order::PAYMENT_PAID) {
                 return;
             } elseif ($paymentStatus == Order::PAYMENT_SURPLUS) {
-                $type = CreditHistory::TYPE_REFUND;
+                $type = Payment::TYPE_REFUND;
                 $amount = $this->orderSolver->getOrderAmount($order, Order::AMOUNT_SURPLUS);
             } elseif ($paymentStatus == Order::PAYMENT_UNPAID) {
-                $type = CreditHistory::TYPE_PAYMENT;
+                $type = Payment::TYPE_PAYMENT;
                 $amount = $this->orderSolver->getOrderAmount($order, Order::AMOUNT_REMAINING);
             }
 
-            $this->creditHistoryBuilder->createCreditHistory(
+            $this->paymentBuilder->createPayment(
                 $type,
                 $amount,
                 GlobalParam::getCurrentProducer(),

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

@@ -7,11 +7,13 @@ use common\logic\AbstractService;
 use common\logic\Document\Document\Model\Document;
 use common\logic\Document\Document\Service\DocumentSolver;
 use common\logic\Order\Order\Model\Order;
+use common\logic\Payment\Model\Payment;
+use common\logic\Payment\Service\PaymentSolver;
+use common\logic\PointSale\PointSale\Model\PointSale;
+use common\logic\Producer\Producer\Model\Producer;
 use common\logic\Producer\Producer\Service\ProducerSolver;
 use common\logic\Product\Product\Model\Product;
 use common\logic\SolverInterface;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\CreditHistory\Service\CreditHistorySolver;
 use common\logic\User\User\Model\User;
 use common\logic\User\User\Service\UserSolver;
 use yii\helpers\Html;
@@ -20,14 +22,14 @@ class OrderSolver extends AbstractService implements SolverInterface
 {
     protected UserSolver $userSolver;
     protected DocumentSolver $documentSolver;
-    protected CreditHistorySolver $creditHistorySolver;
+    protected PaymentSolver $paymentSolver;
     protected ProducerSolver $producerSolver;
 
     public function loadDependencies(): void
     {
         $this->documentSolver = $this->loadService(DocumentSolver::class);
         $this->userSolver = $this->loadService(UserSolver::class);
-        $this->creditHistorySolver = $this->loadService(CreditHistorySolver::class);
+        $this->paymentSolver = $this->loadService(PaymentSolver::class);
         $this->producerSolver = $this->loadService(ProducerSolver::class);
     }
 
@@ -330,6 +332,30 @@ class OrderSolver extends AbstractService implements SolverInterface
         }
     }
 
+    public function getOrderAmountPaidByCredit(Order $order): float
+    {
+        $amount = 0;
+
+        foreach($order->payment as $payment) {
+            if($this->paymentSolver->isMeanPaymentCredit($payment)) {
+                $amount = $this->paymentSolver->sumAmountPaid($payment, $amount);
+            }
+        }
+
+        return $amount;
+    }
+
+    public function getOrderAmountPaid(Order $order): float
+    {
+        $amount = 0;
+
+        foreach($order->payment as $payment) {
+            $amount = $this->paymentSolver->sumAmountPaid($payment, $amount);
+        }
+
+        return $amount;
+    }
+
     /**
      * Retourne le montant de la commande (total, payé, restant, ou en surplus).
      */
@@ -350,6 +376,8 @@ class OrderSolver extends AbstractService implements SolverInterface
             $amount = $order->invoice_amount + $this->getOrderTotalVat($order, $type);
         }
 
+        $amount = round($amount, 2);
+
         return $this->_getAmountGeneric($order, $type, $amount, $format);
     }
 
@@ -422,31 +450,30 @@ class OrderSolver extends AbstractService implements SolverInterface
      * (libellé, montant, client, action) au format HTML.
      *
      */
-    public function getCreditHistoryComment(CreditHistory $creditHistory): string
+    public function getPaymentComment(Payment $payment): string
     {
         $str = '';
-        if (strlen($creditHistory->getComment())) {
+        if (strlen($payment->getComment())) {
             $str .= '<br />';
         }
 
-        $str .= $this->creditHistorySolver->getStrWording($creditHistory);
+        $str .= $this->paymentSolver->getStrWording($payment);
 
-        $order = $creditHistory->getOrderObject();
+        $order = $payment->getOrderObject();
         if ($order) {
             $str .= '<br />Montant de la commande : ' . $this->getOrderAmountWithTax($order, Order::AMOUNT_TOTAL, true);
         }
 
-        $user = $creditHistory->getUserObject();
+        $user = $payment->getUserObject();
         if ($user) {
             $str .= '<br />Client : ' . Html::encode($user->getName() . ' ' . $user->getLastname());
         }
 
-        $userAction = $creditHistory->getUserActionObject();
+        $userAction = $payment->getUserActionObject();
         if ($userAction) {
             $str .= '<br />Action : ' . Html::encode($userAction->getName() . ' ' . $userAction->getLastname());
         }
 
         return $str;
     }
-
 }

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

@@ -126,9 +126,10 @@ class ProductOrder extends ActiveRecordCommon
 
     public function afterFind()
     {
-        if ($this->taxRate == null) {
+        if(!$this->id_tax_rate) {
             $this->populateRelation('taxRate', GlobalParam::getCurrentProducer()->taxRate);
         }
+
         parent::afterFind();
     }
 

common/logic/User/CreditHistory/Event/OrderObserver.php → common/logic/Payment/Event/OrderObserver.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace common\logic\User\CreditHistory\Event;
+namespace common\logic\Payment\Event;
 
 use common\logic\Order\Order\Event\OrderDeleteEvent;
 use common\logic\Order\Order\Model\Order;
-use common\logic\User\CreditHistory\Wrapper\CreditHistoryManager;
+use common\logic\Payment\Wrapper\PaymentManager;
 use common\logic\User\User\Wrapper\UserManager;
 use justcoded\yii2\eventlistener\observers\Observer;
 
@@ -20,9 +20,9 @@ class OrderObserver extends Observer
     public function onOrderDelete(OrderDeleteEvent $event)
     {
         $order = $event->order;
-        $creditHistoryManager = CreditHistoryManager::getInstance();
+        $paymentManager = PaymentManager::getInstance();
         $userManager = UserManager::getInstance();
 
-        $creditHistoryManager->refundOrder($order, $userManager->getCurrent());
+        $paymentManager->refundOrderCredit($order, $userManager->getCurrent());
     }
 }

common/logic/User/CreditHistory/Model/CreditHistorySearch.php → common/logic/Payment/Model/CreditHistorySearch.php

@@ -36,13 +36,14 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-namespace common\logic\User\CreditHistory\Model;
+namespace common\logic\Payment\Model;
 
 use common\helpers\GlobalParam;
-use common\logic\User\CreditHistory\Repository\CreditHistoryRepository;
+use common\helpers\MeanPayment;
+use common\logic\Payment\Repository\PaymentRepository;
 use yii\data\ActiveDataProvider;
 
-class CreditHistorySearch extends CreditHistory
+class CreditHistorySearch extends Payment
 {
     
     public function rules(): array
@@ -57,13 +58,16 @@ class CreditHistorySearch extends CreditHistory
     
     public function search($params) 
     {
-        $creditHistoryRepository = CreditHistoryRepository::getInstance();
-        $optionsSearch = $creditHistoryRepository->getDefaultOptionsSearch() ;
+        $paymentRepository = PaymentRepository::getInstance();
+        $optionsSearch = $paymentRepository->getDefaultOptionsSearch() ;
         
-        $query = CreditHistory::find()
+        $query = Payment::find()
             ->with($optionsSearch['with'])
             ->innerJoinWith($optionsSearch['join_with'], true)
-            ->where(['credit_history.id_producer' => GlobalParam::getCurrentProducerId()])
+            ->where([
+                'payment.id_producer' => GlobalParam::getCurrentProducerId(),
+                'payment.mean_payment' => MeanPayment::CREDIT
+            ])
             ->orderBy('id DESC')
             ;
         
@@ -82,7 +86,7 @@ class CreditHistorySearch extends CreditHistory
         
         if(isset($this->id_user) && is_numeric($this->id_user)) {
             $query->andWhere([
-                'credit_history.id_user' => $this->id_user
+                'payment.id_user' => $this->id_user
             ]) ;    
         }
 

common/logic/User/CreditHistory/Model/CreditHistory.php → common/logic/Payment/Model/Payment.php

@@ -36,16 +36,16 @@
  * termes.
  */
 
-namespace common\logic\User\CreditHistory\Model;
+namespace common\logic\Payment\Model;
 
 use common\components\ActiveRecordCommon;
+use common\logic\Document\Invoice\Model\Invoice;
 use common\logic\Order\Order\Model\Order;
 use common\logic\Producer\Producer\Model\Producer;
 use common\logic\User\User\Model\User;
-use common\logic\User\UserProducer\Event\UserProducerEventSubscriber;
 use yii\db\ActiveQuery;
 
-class CreditHistory extends ActiveRecordCommon
+class Payment extends ActiveRecordCommon
 {
     const TYPE_INITIAL_CREDIT = 'initial-credit';
     const TYPE_CREDIT = 'credit';
@@ -58,7 +58,7 @@ class CreditHistory extends ActiveRecordCommon
      */
     public static function tableName(): string
     {
-        return 'credit_history';
+        return 'payment';
     }
 
     /**
@@ -68,9 +68,10 @@ class CreditHistory extends ActiveRecordCommon
     {
         return [
             [['amount'], 'required'],
-            [['id_user', 'id_user_action', 'id_order', 'id_producer'], 'integer'],
+            [['id_user', 'id_user_action', 'id_order', 'id_invoice', 'id_producer'], 'integer'],
             [['date'], 'safe'],
             [['amount'], 'double'],
+            [['date_transaction'], 'date', 'format' => 'php:Y-m-d'],
             [['type', 'mean_payment'], 'string', 'max' => 255],
             [['comment'], 'string', 'max' => 2048],
         ];
@@ -86,12 +87,14 @@ class CreditHistory extends ActiveRecordCommon
             'id_user' => 'Utilisateur',
             'id_user_action' => 'Utilisateur',
             'id_order' => 'Commande',
+            'id_invoice' => 'Facture',
             'date' => 'Date',
             'amount' => 'Montant',
             'type' => 'Type',
             'id_producer' => 'Producteur',
             'mean_payment' => 'Moyen de paiement',
             'comment' => 'Commentaire',
+            'date_transaction' => 'Date transaction'
         ];
     }
 
@@ -154,6 +157,21 @@ class CreditHistory extends ActiveRecordCommon
         return $this->order;
     }
 
+    public function getInvoice(): ActiveQuery
+    {
+        return $this->hasOne(Invoice::class, ['id' => 'id_invoice']);
+    }
+
+    public function populateInvoice(Invoice $invoice): void
+    {
+        $this->populateFieldObject('id_invoice', 'invoice', $invoice);
+    }
+
+    public function getInvoiceObject(): ?Invoice
+    {
+        return $this->invoice;
+    }
+
     /*
      * Getters / setters
      */

common/logic/Payment/Repository/PaymentRepository.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace common\logic\Payment\Repository;
+
+use common\logic\AbstractRepository;
+use common\logic\Order\Order\Model\Order;
+use common\logic\Payment\Model\Payment;
+
+class PaymentRepository extends AbstractRepository
+{
+    protected PaymentRepositoryQuery $query;
+
+    public function loadDependencies(): void
+    {
+        $this->loadQuery(PaymentRepositoryQuery::class);
+    }
+
+    public function getDefaultOptionsSearch(): array
+    {
+        return [
+            self::WITH => [
+                'user'
+            ],
+            self::JOIN_WITH => [],
+            self::ORDER_BY => Payment::tableName() . '.date ASc',
+            self::ATTRIBUTE_ID_PRODUCER => Payment::tableName() . '.id_producer'
+        ];
+    }
+
+    public function getByOrder(Order $order)
+    {
+        return $this->createDefaultQuery()
+            ->filterByOrder($order)
+            ->find();
+    }
+}

common/logic/Payment/Repository/PaymentRepositoryQuery.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace common\logic\Payment\Repository;
+
+use common\logic\AbstractRepositoryQuery;
+use common\logic\Order\Order\Model\Order;
+use common\logic\Payment\Service\PaymentDefinition;
+
+class PaymentRepositoryQuery extends AbstractRepositoryQuery
+{
+    protected PaymentDefinition $definition;
+
+    public function loadDependencies(): void
+    {
+        $this->loadDefinition(PaymentDefinition::class);
+    }
+
+    public function filterByOrder(Order $order): self
+    {
+        $this->andWhere(['id_order' => $order->id]);
+        return $this;
+    }
+}

common/logic/Payment/Service/PaymentBuilder.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace common\logic\Payment\Service;
+
+use common\logic\AbstractBuilder;
+use common\logic\Document\Invoice\Model\Invoice;
+use common\logic\Order\Order\Model\Order;
+use common\logic\Order\Order\Service\OrderSolver;
+use common\logic\Payment\Model\Payment;
+use common\logic\Producer\Producer\Model\Producer;
+use common\logic\User\User\Model\User;
+
+class PaymentBuilder extends AbstractBuilder
+{
+    protected PaymentSolver $paymentSolver;
+    protected OrderSolver $orderSolver;
+
+    public function loadDependencies(): void
+    {
+        $this->paymentSolver = $this->loadService(PaymentSolver::class);
+        $this->orderSolver = $this->loadService(OrderSolver::class);
+    }
+
+    public function instanciatePayment(
+        string $type,
+        float $amount,
+        Producer $producer,
+        User $user = null,
+        User $userAction = null,
+        string $meanPayment = null,
+        Order $order = null,
+        Invoice $invoice = null
+    ): Payment
+    {
+        $payment = new Payment;
+
+        $payment->type = $type;
+        $payment->amount = round($amount, 2);
+        $payment->populateProducer($producer);
+
+        if($user) {
+            $payment->populateUser($user);
+        }
+
+        if($userAction) {
+            $payment->populateUserAction($userAction);
+        }
+
+        if($order) {
+            $payment->populateOrder($order);
+        }
+
+        if($invoice) {
+            $payment->populateInvoice($invoice);
+        }
+
+        if($meanPayment) {
+            $payment->mean_payment = $meanPayment;
+        }
+
+        return $payment;
+    }
+
+    public function createPayment(
+        string $type,
+        float $amount,
+        Producer $producer,
+        User $user = null,
+        User $userAction = null,
+        string $meanPayment = null,
+        Order $order = null,
+        Invoice $invoice = null
+    ): ?Payment
+    {
+        if ($amount > -0.01 && $amount < 0.01) {
+            return null;
+        }
+
+        $payment = $this->instanciatePayment($type, $amount, $producer, $user, $userAction, $meanPayment, $order, $invoice);
+        $payment->setComment($payment->getComment() . $this->orderSolver->getPaymentComment($payment));
+        $this->create($payment);
+
+        return $payment;
+    }
+}

common/logic/Payment/Service/PaymentDefinition.php

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

common/logic/Payment/Service/PaymentSolver.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace common\logic\Payment\Service;
+
+use common\helpers\MeanPayment;
+use common\logic\AbstractService;
+use common\logic\Order\Order\Model\Order;
+use common\logic\Payment\Model\Payment;
+use common\logic\SolverInterface;
+
+class PaymentSolver extends AbstractService implements SolverInterface
+{
+    public function isTypeDebit(Payment $payment): bool
+    {
+        return in_array($payment->getType(), [
+            Payment::TYPE_DEBIT,
+            Payment::TYPE_PAYMENT,
+        ]);
+    }
+
+    public function isTypeCredit(Payment $payment): bool
+    {
+        return in_array($payment->getType(), [
+            Payment::TYPE_CREDIT,
+            Payment::TYPE_INITIAL_CREDIT,
+            Payment::TYPE_REFUND
+        ]);
+    }
+
+    public function sumAmountPaid(Payment $payment, float $amount = 0)
+    {
+        if($this->isTypeDebit($payment)) {
+            $amount += $payment->amount;
+        }
+        else {
+            $amount -= $payment->amount;
+        }
+
+        return $amount;
+    }
+
+    public function getAmount(Payment $payment, bool $format = false): string
+    {
+        if ($format) {
+            return number_format($payment->getAmount(), 2) . '&nbsp;€';
+        } else {
+            return $payment->getAmount();
+        }
+    }
+
+    /**
+     * Retourne le libellé du CreditHistory informant de son type et
+     * éventuellement de la date de sa commande associée.
+     *
+     */
+    public function getStrWording(Payment $payment, Order $order = null): string
+    {
+        $str = '';
+        $type = $payment->getType();
+
+        if (Payment::TYPE_INITIAL_CREDIT == $type) {
+            $str = 'Crédit initial';
+        } elseif (Payment::TYPE_CREDIT == $type) {
+            $str = 'Crédit';
+        } elseif (Payment::TYPE_PAYMENT == $type) {
+            $str = 'Débit';
+        } elseif (Payment::TYPE_REFUND == $type) {
+            $str = 'Recrédit';
+        } elseif (Payment::TYPE_DEBIT == $type) {
+            $str = 'Débit';
+        }
+
+        if (Payment::TYPE_PAYMENT == $type || Payment::TYPE_REFUND == $type) {
+
+            // Optimisation
+            if(!$order) {
+                $order = $payment->order;
+            }
+
+            if ($order && $order->distribution) {
+                $str .= '<br />Commande : ' . date('d/m/Y', strtotime($order->distribution->date));
+            } else {
+                $str .= '<br />Commande supprimée';
+            }
+        }
+
+        return $str;
+    }
+
+    public function getDate(Payment $payment, bool $format = false): string
+    {
+        $date = $payment->getDate();
+
+        if ($format) {
+            return date('d/m/Y à H:i:s', strtotime($date));
+        } else {
+            return $date;
+        }
+    }
+
+    public function isMeanPaymentCredit(Payment $payment): bool
+    {
+        return $payment->mean_payment == MeanPayment::CREDIT;
+    }
+
+    public function getStrMeanPayment(Payment $payment): string
+    {
+        return MeanPayment::getStrBy($payment->getMeanPayment());
+    }
+
+    public function getStrType(Payment $payment): string
+    {
+        switch($payment->type) {
+            case Payment::TYPE_PAYMENT:
+                return 'Paiement';
+            case Payment::TYPE_DEBIT:
+                return 'Débit';
+            case Payment::TYPE_CREDIT:
+                return 'Crédit';
+            case Payment::TYPE_REFUND:
+                return 'Remboursement';
+            case Payment::TYPE_INITIAL_CREDIT:
+                return 'Crédit initial';
+        }
+
+        return 'Type de paiement inconnu';
+    }
+
+    public function getStrUserAction(Payment $payment): string
+    {
+        $userAction = $payment->getUserActionObject();
+
+        if ($userAction) {
+            return $userAction->getName() . ' ' . $userAction->getlastname();
+        } else {
+            return 'Système';
+        }
+    }
+}

common/logic/Payment/Service/PaymentUtils.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace common\logic\Payment\Service;
+
+use common\helpers\MeanPayment;
+use common\logic\AbstractService;
+use common\logic\Order\Order\Model\Order;
+use common\logic\Order\Order\Service\OrderSolver;
+use common\logic\Payment\Model\Payment;
+use common\logic\Producer\Producer\Repository\ProducerRepository;
+use common\logic\User\User\Model\User;
+use common\logic\User\User\Repository\UserRepository;
+use common\logic\UtilsInterface;
+use yii\base\ErrorException;
+
+class PaymentUtils extends AbstractService implements UtilsInterface
+{
+    protected PaymentBuilder $paymentBuilder;
+    protected OrderSolver $orderSolver;
+    protected ProducerRepository $producerRepository;
+    protected UserRepository $userRepository;
+
+    public function loadDependencies(): void
+    {
+        $this->paymentBuilder = $this->loadService(PaymentBuilder::class);
+        $this->orderSolver = $this->loadService(OrderSolver::class);
+        $this->producerRepository = $this->loadService(ProducerRepository::class);
+        $this->userRepository = $this->loadService(UserRepository::class);
+    }
+
+    public function creditUser(User $user, float $amount, string $meanPayment, User $userAction): void
+    {
+        $this->paymentBuilder->createPayment(
+            Payment::TYPE_CREDIT,
+            $amount,
+            $this->getProducerContext(),
+            $user,
+            $userAction,
+            $meanPayment
+        );
+    }
+
+    public function debitUser(User $user, float $amount, string $meanPayment, User $userAction): void
+    {
+        $this->paymentBuilder->createPayment(
+            Payment::TYPE_DEBIT,
+            $amount,
+            $this->getProducerContext(),
+            $user,
+            $userAction,
+            $meanPayment
+        );
+    }
+
+    public function creditOrDebitUser(string $type, User $user, float $amount, string $meanPayment, User $userAction): void
+    {
+        if($type == Payment::TYPE_CREDIT) {
+            $this->creditUser($user, $amount, $meanPayment, $userAction);
+        }
+        elseif($type == Payment::TYPE_DEBIT) {
+            $this->debitUser($user, $amount, $meanPayment, $userAction);
+        }
+        else {
+            throw new ErrorException('$type a une valeur incorrect');
+        }
+    }
+
+    public function payOrder(Order $order, string $meanPayment, User $userAction, bool $checkCreditLimit)
+    {
+        if($meanPayment == MeanPayment::CREDIT) {
+            $this->payOrderByCredit($order, $userAction, $checkCreditLimit);
+        }
+        elseif(key_exists($meanPayment, MeanPayment::getAll())) {
+            $this->paymentBuilder->createPayment(
+                Payment::TYPE_PAYMENT,
+                $this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_REMAINING),
+                $this->getProducerContext(),
+                $order->user,
+                $userAction,
+                $meanPayment,
+                $order
+            );
+        }
+        else {
+            throw new ErrorException('Moyen de paiement inconnu : '.$meanPayment);
+        }
+    }
+
+    public function payOrderByCredit(Order $order, User $userAction, bool $checkCreditLimit): void
+    {
+        $amountRemaining = round($this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_REMAINING), 2);
+
+        if($checkCreditLimit) {
+            $creditLimit = $this->producerRepository->getConfig('credit_limit');
+            $creditUser = $this->userRepository->getCredit($order->user);
+
+            if (!is_null($creditLimit) && $amountRemaining > $creditUser - $creditLimit) {
+                $amountRemaining = $creditUser - $creditLimit;
+            }
+        }
+
+        if($amountRemaining > 0) {
+            $this->paymentBuilder->createPayment(
+                Payment::TYPE_PAYMENT,
+                $amountRemaining,
+                $this->getProducerContext(),
+                $order->user,
+                $userAction,
+                MeanPayment::CREDIT,
+                $order
+            );
+        }
+    }
+
+    public function refundOrder(Order $order, string $meanPayment, User $userAction): void
+    {
+        $amountPaid = round($this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID), 2);
+
+        if ($amountPaid >= 0.01 && $order->id_user) {
+            $this->paymentBuilder->createPayment(
+                Payment::TYPE_REFUND,
+                $this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID),
+                $this->getProducerContext(),
+                $order->user,
+                $userAction,
+                $meanPayment,
+                $order
+            );
+        }
+    }
+
+    public function refundOrderCredit(Order $order, User $userAction): void
+    {
+        $amountPaidByCredit = $this->orderSolver->getOrderAmountPaidByCredit($order);
+        if($amountPaidByCredit >= 0.01 && $order->id_user) {
+            $this->paymentBuilder->createPayment(
+                Payment::TYPE_REFUND,
+                $amountPaidByCredit,
+                $this->getProducerContext(),
+                $order->user,
+                $userAction,
+                MeanPayment::CREDIT,
+                $order
+            );
+        }
+    }
+
+    public function refundSurplusOrderCredit(Order $order, User $userAction): void
+    {
+        $amountPaidByCredit = $this->orderSolver->getOrderAmountPaidByCredit($order);
+        $amount = $this->orderSolver->getOrderAmountWithTax($order);
+
+        if($amountPaidByCredit > $amount) {
+            $this->paymentBuilder->createPayment(
+                Payment::TYPE_REFUND,
+                $amountPaidByCredit - $amount,
+                $this->getProducerContext(),
+                $order->user,
+                $userAction,
+                MeanPayment::CREDIT,
+                $order
+            );
+        }
+    }
+
+    public function payOrRefundOrder(string $type, Order $order, string $meanPayment, User $userAction, bool $checkCreditLimit = false): void
+    {
+        if($type == Payment::TYPE_PAYMENT) {
+            $this->payOrder($order, $meanPayment, $userAction, $checkCreditLimit);
+        }
+        elseif($type == Payment::TYPE_REFUND) {
+            $this->refundOrder($order, $meanPayment, $userAction);
+        }
+        else {
+            throw new ErrorException('$type a une valeur incorrect');
+        }
+    }
+}

common/logic/Payment/Wrapper/PaymentContainer.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace common\logic\Payment\Wrapper;
+
+use common\logic\AbstractContainer;
+use common\logic\Payment\Repository\PaymentRepository;
+use common\logic\Payment\Service\PaymentUtils;
+use common\logic\Payment\Service\PaymentBuilder;
+use common\logic\Payment\Service\PaymentDefinition;
+use common\logic\Payment\Service\PaymentSolver;
+
+class PaymentContainer extends AbstractContainer
+{
+    public function getServices(): array
+    {
+        return [
+            PaymentDefinition::class,
+            PaymentSolver::class,
+            PaymentBuilder::class,
+            PaymentRepository::class,
+            PaymentUtils::class,
+        ];
+    }
+
+    public function getDefinition(): PaymentDefinition
+    {
+        return PaymentDefinition::getInstance();
+    }
+
+    public function getSolver(): PaymentSolver
+    {
+        return PaymentSolver::getInstance();
+    }
+
+    public function getBuilder(): PaymentBuilder
+    {
+        return PaymentBuilder::getInstance();
+    }
+
+    public function getRepository(): PaymentRepository
+    {
+        return PaymentRepository::getInstance();
+    }
+
+    public function getPaymentUtils(): PaymentUtils
+    {
+        return PaymentUtils::getInstance();
+    }
+}

common/logic/Payment/Wrapper/PaymentManager.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace common\logic\Payment\Wrapper;
+
+use common\logic\AbstractManager;
+use common\logic\Payment\Repository\PaymentRepository;
+use common\logic\Payment\Service\PaymentUtils;
+use common\logic\Payment\Service\PaymentBuilder;
+use common\logic\Payment\Service\PaymentDefinition;
+use common\logic\Payment\Service\PaymentSolver;
+
+/**
+ * @mixin PaymentDefinition
+ * @mixin PaymentSolver
+ * @mixin PaymentRepository
+ * @mixin PaymentBuilder
+ * @mixin PaymentUtils
+ */
+class PaymentManager extends AbstractManager
+{
+    public function getContainerFqcn(): string
+    {
+        return PaymentContainer::class;
+    }
+}

common/logic/Producer/Producer/Repository/ProducerRepository.php

@@ -247,10 +247,12 @@ class ProducerRepository extends AbstractRepository
     {
         if (strlen($config)) {
             if (!$idProducer) {
-                $idProducer = $this->getProducerContextId();
+                $producer = $this->getProducerContext();
+            }
+            else {
+                $producer = $this->findOneProducerById($idProducer);
             }
 
-            $producer = $this->findOneProducerById($idProducer);
             if ($producer) {
                 return $producer->$config;
             }

common/logic/Producer/Producer/Service/ProducerBuilder.php

@@ -82,7 +82,7 @@ class ProducerBuilder extends AbstractBuilder
         $versionsArray = Opendistrib::getVersions();
         $producer->latest_version_opendistrib = reset($versionsArray);
 
-        $this->saveUpdate($producer);
+        $this->update($producer);
     }
 
     public function savePrivateKeyStripe($filename, $value)

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

@@ -178,17 +178,23 @@ class Product extends ActiveRecordCommon
     public function afterFind()
     {
         if ($this->taxRate == null) {
-            $producer = Producer::searchOne(['id' => $this->id_producer]);
+            if($this->id_producer == GlobalParam::getCurrentProducerId()) {
+                $producer = GlobalParam::getCurrentProducer();
+            }
+            else {
+                $producer = Producer::searchOne(['id' => $this->id_producer]);
+            }
+
             if ($producer) {
                 $this->populateRelation('taxRate', $producer->taxRate);
             }
         }
 
+        parent::afterFind();
+
         $productSolver = ProductSolver::getInstance();
         $this->wording_unit = $productSolver->strUnit($this->unit);
         $this->price_with_tax = $productSolver->getPriceWithTax($this);
-
-        parent::afterFind();
     }
 
     public function getProductDistribution()

common/logic/Product/Product/Repository/ProductRepository.php

@@ -33,7 +33,7 @@ class ProductRepository extends AbstractRepository
     {
         return [
             self::WITH => ['taxRate', 'productPointSale'],
-            self::JOIN_WITH => [],
+            self::JOIN_WITH => ['productPrice'],
             self::ORDER_BY => 'product.order ASC',
             self::ATTRIBUTE_ID_PRODUCER => 'product.id_producer'
         ];

common/logic/User/CreditHistory/Repository/CreditHistoryRepository.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Repository;
-
-use common\logic\AbstractRepository;
-use common\logic\Order\Order\Model\Order;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-
-class CreditHistoryRepository extends AbstractRepository
-{
-    protected CreditHistoryRepositoryQuery $query;
-
-    public function loadDependencies(): void
-    {
-        $this->loadQuery(CreditHistoryRepositoryQuery::class);
-    }
-
-    public function getDefaultOptionsSearch(): array
-    {
-        return [
-            self::WITH => [],
-            self::JOIN_WITH => [],
-            self::ORDER_BY => CreditHistory::tableName() . '.date ASc',
-            self::ATTRIBUTE_ID_PRODUCER => CreditHistory::tableName() . '.id_producer'
-        ];
-    }
-
-    public function getByOrder(Order $order)
-    {
-        return $this->createDefaultQuery()
-            ->filterByOrder($order)
-            ->find();
-    }
-}

common/logic/User/CreditHistory/Repository/CreditHistoryRepositoryQuery.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Repository;
-
-use common\logic\AbstractRepositoryQuery;
-use common\logic\Order\Order\Model\Order;
-use common\logic\User\CreditHistory\Service\CreditHistoryDefinition;
-
-class CreditHistoryRepositoryQuery extends AbstractRepositoryQuery
-{
-    protected CreditHistoryDefinition $definition;
-
-    public function loadDependencies(): void
-    {
-        $this->loadDefinition(CreditHistoryDefinition::class);
-    }
-
-    public function filterByOrder(Order $order): self
-    {
-        $this->andWhere(['id_order' => $order->id]);
-        return $this;
-    }
-}

common/logic/User/CreditHistory/Service/CreditHistoryBuilder.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Service;
-
-use common\logic\AbstractBuilder;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\Order\Service\OrderSolver;
-use common\logic\Producer\Producer\Model\Producer;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\User\Model\User;
-use yii\base\Event;
-
-class CreditHistoryBuilder extends AbstractBuilder
-{
-    protected CreditHistorySolver $creditHistorySolver;
-    protected OrderSolver $orderSolver;
-
-    public function loadDependencies(): void
-    {
-        $this->creditHistorySolver = $this->loadService(CreditHistorySolver::class);
-        $this->orderSolver = $this->loadService(OrderSolver::class);
-    }
-
-    public function instanciateCreditHistory(
-        string $type,
-        float $amount,
-        Producer $producer,
-        User $user,
-        User $userAction,
-        string $meanPayment = null,
-        Order $order = null
-    ): CreditHistory
-    {
-        $creditHistory = new CreditHistory;
-
-        $creditHistory->type = $type;
-        $creditHistory->amount = round($amount, 2);
-        $creditHistory->populateProducer($producer);
-        $creditHistory->populateUser($user);
-        $creditHistory->populateUserAction($userAction);
-
-        if($order) {
-            $creditHistory->populateOrder($order);
-        }
-
-        if($meanPayment) {
-            $creditHistory->mean_payment = $meanPayment;
-        }
-
-        return $creditHistory;
-    }
-
-    // saveCreditHistory
-    public function createCreditHistory(
-        string $type,
-        float $amount,
-        Producer $producer,
-        User $user,
-        User $userAction,
-        string $meanPayment = null,
-        Order $order = null
-    ): ?CreditHistory
-    {
-        if ($amount > -0.01 && $amount < 0.01) {
-            return null;
-        }
-
-        $creditHistory = $this->instanciateCreditHistory($type, $amount, $producer, $user, $userAction, $meanPayment, $order);
-        $creditHistory->setComment($creditHistory->getComment() . $this->orderSolver->getCreditHistoryComment($creditHistory));
-        $this->create($creditHistory);
-
-        return $creditHistory;
-    }
-}

common/logic/User/CreditHistory/Service/CreditHistoryDefinition.php

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

common/logic/User/CreditHistory/Service/CreditHistorySolver.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Service;
-
-use common\helpers\MeanPayment;
-use common\logic\AbstractService;
-use common\logic\SolverInterface;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use yii\helpers\Html;
-
-class CreditHistorySolver extends AbstractService implements SolverInterface
-{
-    public function isTypeDebit(CreditHistory $creditHistory): bool
-    {
-        return in_array($creditHistory->getType(), [
-            CreditHistory::TYPE_DEBIT,
-            CreditHistory::TYPE_PAYMENT,
-        ]);
-    }
-
-    public function isTypeCredit(CreditHistory $creditHistory): bool
-    {
-        return in_array($creditHistory->getType(), [
-            CreditHistory::TYPE_CREDIT,
-            CreditHistory::TYPE_INITIAL_CREDIT,
-            CreditHistory::TYPE_REFUND
-        ]);
-    }
-
-    public function getAmount(CreditHistory $creditHistory, bool $format = false): string
-    {
-        if ($format) {
-            return number_format($creditHistory->getAmount(), 2) . '&nbsp;€';
-        } else {
-            return $creditHistory->getAmount();
-        }
-    }
-
-    /**
-     * Retourne le libellé du CreditHistory informant de son type et
-     * éventuellement de la date de sa commande associée.
-     *
-     */
-    public function getStrWording(CreditHistory $creditHistory): string
-    {
-        $str = '';
-        $type = $creditHistory->getType();
-
-        if (CreditHistory::TYPE_INITIAL_CREDIT == $type) {
-            $str = 'Crédit initial';
-        } elseif (CreditHistory::TYPE_CREDIT == $type) {
-            $str = 'Crédit';
-        } elseif (CreditHistory::TYPE_PAYMENT == $type) {
-            $str = 'Débit';
-        } elseif (CreditHistory::TYPE_REFUND == $type) {
-            $str = 'Recrédit';
-        } elseif (CreditHistory::TYPE_DEBIT == $type) {
-            $str = 'Débit';
-        }
-
-        if (CreditHistory::TYPE_PAYMENT == $type || CreditHistory::TYPE_REFUND == $type) {
-            $order = $creditHistory->getOrderObject();
-            if ($order && $order->distribution) {
-                $str .= '<br />Commande : ' . date('d/m/Y', strtotime($order->distribution->date));
-            } else {
-                $str .= '<br />Commande supprimée';
-            }
-        }
-
-        return $str;
-    }
-
-    public function getDate(CreditHistory $creditHistory, bool $format = false): string
-    {
-        $date = $creditHistory->getDate();
-
-        if ($format) {
-            return date('d/m/Y à H:i:s', strtotime($date));
-        } else {
-            return $date;
-        }
-    }
-
-    public function getStrMeanPayment(CreditHistory $creditHistory): string
-    {
-        return MeanPayment::getStrBy($creditHistory->getMeanPayment());
-    }
-
-    // strUserAction
-    public function getStrUserAction(CreditHistory $creditHistory): string
-    {
-        $userAction = $creditHistory->getUserActionObject();
-
-        if ($userAction) {
-            return $userAction->getName() . ' ' . $userAction->getlastname();
-        } else {
-            return 'Système';
-        }
-    }
-}

common/logic/User/CreditHistory/Service/CreditUtils.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Service;
-
-use common\helpers\MeanPayment;
-use common\logic\AbstractService;
-use common\logic\Order\Order\Model\Order;
-use common\logic\Order\Order\Service\OrderSolver;
-use common\logic\Producer\Producer\Repository\ProducerRepository;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\User\Model\User;
-use common\logic\User\User\Repository\UserRepository;
-use common\logic\UtilsInterface;
-use yii\base\ErrorException;
-
-class CreditUtils extends AbstractService implements UtilsInterface
-{
-    protected CreditHistoryBuilder $creditHistoryBuilder;
-    protected OrderSolver $orderSolver;
-    protected ProducerRepository $producerRepository;
-    protected UserRepository $userRepository;
-
-    public function loadDependencies(): void
-    {
-        $this->creditHistoryBuilder = $this->loadService(CreditHistoryBuilder::class);
-        $this->orderSolver = $this->loadService(OrderSolver::class);
-        $this->producerRepository = $this->loadService(ProducerRepository::class);
-        $this->userRepository = $this->loadService(UserRepository::class);
-    }
-
-    public function creditUser(User $user, float $amount, string $meanPayment, User $userAction): void
-    {
-        $this->creditHistoryBuilder->createCreditHistory(
-            CreditHistory::TYPE_CREDIT,
-            $amount,
-            $this->getProducerContext(),
-            $user,
-            $userAction,
-            $meanPayment
-        );
-    }
-
-    public function debitUser(User $user, float $amount, string $meanPayment, User $userAction): void
-    {
-        $this->creditHistoryBuilder->createCreditHistory(
-            CreditHistory::TYPE_DEBIT,
-            $amount,
-            $this->getProducerContext(),
-            $user,
-            $userAction,
-            $meanPayment
-        );
-    }
-
-    public function creditOrDebitUser(string $type, User $user, float $amount, string $meanPayment, User $userAction): void
-    {
-        if($type == CreditHistory::TYPE_CREDIT) {
-            $this->creditUser($user, $amount, $meanPayment, $userAction);
-        }
-        elseif($type == CreditHistory::TYPE_DEBIT) {
-            $this->debitUser($user, $amount, $meanPayment, $userAction);
-        }
-        else {
-            throw new ErrorException('$type a une valeur incorrect');
-        }
-    }
-
-    public function payOrder(Order $order, User $userAction, bool $checkCreditLimit): void
-    {
-        $amountRemaining = round($this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_REMAINING), 2);
-
-        if($checkCreditLimit) {
-            $creditLimit = $this->producerRepository->getConfig('credit_limit');
-            $creditUser = $this->userRepository->getCredit($order->user);
-
-            if (!is_null($creditLimit) && $amountRemaining > $creditUser - $creditLimit) {
-                $amountRemaining = $creditUser - $creditLimit;
-            }
-        }
-
-        if($amountRemaining > 0) {
-            $this->creditHistoryBuilder->createCreditHistory(
-                CreditHistory::TYPE_PAYMENT,
-                $amountRemaining,
-                $this->getProducerContext(),
-                $order->user,
-                $userAction,
-                MeanPayment::CREDIT,
-                $order
-            );
-        }
-    }
-
-    public function refundOrder(Order $order, User $userAction): void
-    {
-        $amountPaid = round($this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID), 2);
-
-        if ($amountPaid >= 0.01 && $order->id_user) {
-            $this->creditHistoryBuilder->createCreditHistory(
-                CreditHistory::TYPE_REFUND,
-                $this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID),
-                $this->getProducerContext(),
-                $order->user,
-                $userAction,
-                MeanPayment::CREDIT,
-                $order
-            );
-        }
-    }
-
-    public function refundSurplusOrder(Order $order, User $userAction): void
-    {
-        $this->creditHistoryBuilder->createCreditHistory(
-            CreditHistory::TYPE_REFUND,
-            $this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_SURPLUS),
-            $this->getProducerContext(),
-            $order->user,
-            $userAction,
-            MeanPayment::CREDIT,
-            $order
-        );
-    }
-
-    public function payOrRefundOrder(string $type, Order $order, User $userAction, bool $checkCreditLimit = false): void
-    {
-        if($type == CreditHistory::TYPE_PAYMENT) {
-            $this->payOrder($order, $userAction, $checkCreditLimit);
-        }
-        elseif($type == CreditHistory::TYPE_REFUND) {
-            $this->refundOrder($order, $userAction);
-        }
-        else {
-            throw new ErrorException('$type a une valeur incorrect');
-        }
-    }
-}

common/logic/User/CreditHistory/Wrapper/CreditHistoryContainer.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Wrapper;
-
-use common\logic\AbstractContainer;
-use common\logic\User\CreditHistory\Repository\CreditHistoryRepository;
-use common\logic\User\CreditHistory\Service\CreditHistoryBuilder;
-use common\logic\User\CreditHistory\Service\CreditHistoryDefinition;
-use common\logic\User\CreditHistory\Service\CreditHistorySolver;
-use common\logic\User\CreditHistory\Service\CreditUtils;
-
-class CreditHistoryContainer extends AbstractContainer
-{
-    public function getServices(): array
-    {
-        return [
-            CreditHistoryDefinition::class,
-            CreditHistorySolver::class,
-            CreditHistoryBuilder::class,
-            CreditHistoryRepository::class,
-            CreditUtils::class,
-        ];
-    }
-
-    public function getDefinition(): CreditHistoryDefinition
-    {
-        return CreditHistoryDefinition::getInstance();
-    }
-
-    public function getSolver(): CreditHistorySolver
-    {
-        return CreditHistorySolver::getInstance();
-    }
-
-    public function getBuilder(): CreditHistoryBuilder
-    {
-        return CreditHistoryBuilder::getInstance();
-    }
-
-    public function getRepository(): CreditHistoryRepository
-    {
-        return CreditHistoryRepository::getInstance();
-    }
-
-    public function getCreditUtils(): CreditUtils
-    {
-        return CreditUtils::getInstance();
-    }
-}

common/logic/User/CreditHistory/Wrapper/CreditHistoryManager.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace common\logic\User\CreditHistory\Wrapper;
-
-use common\logic\AbstractManager;
-use common\logic\User\CreditHistory\Repository\CreditHistoryRepository;
-use common\logic\User\CreditHistory\Service\CreditHistoryBuilder;
-use common\logic\User\CreditHistory\Service\CreditHistoryDefinition;
-use common\logic\User\CreditHistory\Service\CreditHistorySolver;
-use common\logic\User\CreditHistory\Service\CreditUtils;
-
-/**
- * @mixin CreditHistoryDefinition
- * @mixin CreditHistorySolver
- * @mixin CreditHistoryRepository
- * @mixin CreditHistoryBuilder
- * @mixin CreditUtils
- */
-class CreditHistoryManager extends AbstractManager
-{
-    public function getContainerFqcn(): string
-    {
-        return CreditHistoryContainer::class;
-    }
-}

common/logic/User/User/Repository/UserRepository.php

@@ -69,7 +69,19 @@ class UserRepository extends AbstractRepository
      */
     public function getCredit(User $user): float
     {
-        $userProducer = $this->userProducerRepository->findOneUserProducer($user);
+        // @TODO : optimisation à  refactorer
+        $userProducer = null;
+        $producerId = $this->getProducerContextId();
+        foreach($user->userProducer as $userProducerRelation) {
+            if($userProducerRelation->id_producer == $producerId) {
+                $userProducer = $userProducerRelation;
+            }
+        }
+
+        if(!$userProducer) {
+            $userProducer = $this->userProducerRepository->findOneUserProducer($user);
+        }
+
         return $userProducer ? $userProducer->credit : 0;
     }
 

common/logic/User/UserProducer/Event/CreditHistoryObserver.php → common/logic/User/UserProducer/Event/PaymentObserver.php

@@ -6,13 +6,13 @@ use common\logic\User\UserProducer\Wrapper\UserProducerManager;
 use justcoded\yii2\eventlistener\observers\ActiveRecordObserver;
 use yii\db\AfterSaveEvent;
 
-class CreditHistoryObserver extends ActiveRecordObserver
+class PaymentObserver extends ActiveRecordObserver
 {
     public function inserted(AfterSaveEvent $event)
     {
-        $creditHistory = $event->sender;
+        $payment = $event->sender;
         $userProducerManager = UserProducerManager::getInstance();
 
-        $userProducerManager->updateCredit($creditHistory);
+        $userProducerManager->updateCredit($payment);
     }
 }

common/logic/User/UserProducer/Service/UserProducerBuilder.php

@@ -7,29 +7,32 @@ use common\logic\AbstractBuilder;
 use common\logic\Order\Order\Model\Order;
 use common\logic\Order\Order\Repository\OrderRepository;
 use common\logic\Order\Order\Service\OrderSolver;
+use common\logic\Payment\Model\Payment;
+use common\logic\Payment\Service\PaymentSolver;
 use common\logic\Producer\Producer\Model\Producer;
 use common\logic\Producer\Producer\Repository\ProducerRepository;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\CreditHistory\Service\CreditHistorySolver;
 use common\logic\User\User\Model\User;
+use common\logic\User\User\Repository\UserRepository;
 use common\logic\User\UserProducer\Model\UserProducer;
 use common\logic\User\UserProducer\Repository\UserProducerRepository;
 
 class UserProducerBuilder extends AbstractBuilder
 {
-    protected CreditHistorySolver $creditHistorySolver;
+    protected PaymentSolver $paymentSolver;
     protected UserProducerRepository $userProducerRepository;
     protected OrderRepository $orderRepository;
     protected ProducerRepository $producerRepository;
     protected OrderSolver $orderSolver;
+    protected UserRepository $userRepository;
 
     public function loadDependencies(): void
     {
-        $this->creditHistorySolver = $this->loadService(CreditHistorySolver::class);
+        $this->paymentSolver = $this->loadService(PaymentSolver::class);
         $this->userProducerRepository = $this->loadService(UserProducerRepository::class);
         $this->orderRepository = $this->loadService(OrderRepository::class);
         $this->producerRepository = $this->loadService(ProducerRepository::class);
         $this->orderSolver = $this->loadService(OrderSolver::class);
+        $this->userRepository = $this->loadService(UserRepository::class);
     }
 
     public function instanciateUserProducer(User $user, Producer $producer, bool $bookmark = true, bool $newsletter = true)
@@ -59,34 +62,36 @@ class UserProducerBuilder extends AbstractBuilder
             ?? $this->createUserProducer($user, $producer, $bookmark, $newsletter);
     }
 
-    public function updateCredit(CreditHistory $creditHistory): void
+    public function updateCredit(Payment $payment): void
     {
-        $userProducer = $this->userProducerRepository->findOneUserProducer($creditHistory->user);
+        if($this->paymentSolver->isMeanPaymentCredit($payment) && $payment->user) {
+            $userProducer = $this->userProducerRepository->findOneUserProducer($payment->user);
 
-        if ($userProducer) {
-            $oldCredit = $userProducer->getCredit();
+            if ($userProducer) {
+                $oldCredit = $userProducer->getCredit();
 
-            $this->deductCredit($userProducer, $creditHistory);
-            $this->initMeanPaymentOrder($creditHistory);
-            $this->sendCreditLimitReminder($userProducer, $creditHistory, $oldCredit);
+                $this->deductCredit($userProducer, $payment);
+                //$this->initMeanPaymentOrder($payment);
+                $this->sendCreditLimitReminder($userProducer, $payment, $oldCredit);
+            }
         }
     }
 
-    public function deductCredit(UserProducer $userProducer, CreditHistory $creditHistory)
+    public function deductCredit(UserProducer $userProducer, Payment $payment)
     {
-        if ($this->creditHistorySolver->isTypeCredit($creditHistory)) {
-            $userProducer->setCredit($userProducer->getCredit() + $creditHistory->getAmount());
-        } elseif ($this->creditHistorySolver->isTypeDebit($creditHistory)) {
-            $userProducer->setCredit($userProducer->getCredit() - $creditHistory->getAmount());
+        if ($this->paymentSolver->isTypeCredit($payment)) {
+            $userProducer->setCredit($userProducer->getCredit() + $payment->getAmount());
+        } elseif ($this->paymentSolver->isTypeDebit($payment)) {
+            $userProducer->setCredit($userProducer->getCredit() - $payment->getAmount());
         }
 
         $this->update($userProducer);
     }
 
-    public function initMeanPaymentOrder($creditHistory)
+    public function initMeanPaymentOrder(Payment $payment)
     {
-        if ($creditHistory->id_order && $creditHistory->id_order > 0) {
-            $order = $this->orderRepository->findOneOrderById((int) $creditHistory->id_order);
+        if ($payment->id_order && $payment->id_order > 0) {
+            $order = $this->orderRepository->findOneOrderById((int) $payment->id_order);
 
             if ($order) {
                 $paymentStatus = $this->orderSolver->getPaymentStatus($order);
@@ -101,16 +106,14 @@ class UserProducerBuilder extends AbstractBuilder
         }
     }
 
-    public function sendCreditLimitReminder($userProducer, $creditHistory, $oldCredit)
+    public function sendCreditLimitReminder($userProducer, $payment, $oldCredit)
     {
-        $userRepository = \Yii::$app->logic->getUserContainer()->getRepository();
-        $producerRepository = \Yii::$app->logic->getProducerContainer()->getRepository();
         $newCredit = $userProducer->credit;
 
         if ($this->isCreditLimitCrossed($oldCredit, $newCredit)) {
 
-            $user = $userRepository->findOneUserById($creditHistory->id_user);
-            $producer = $producerRepository->findOneProducerById($creditHistory->id_producer);
+            $user = $this->userRepository->findOneUserById($payment->id_user);
+            $producer = $this->producerRepository->findOneProducerById($payment->id_producer);
 
             if($user && $user->email && strlen($user->email) > 0) {
                 \Yii::$app->mailer->compose(

common/mail/creditUser-html.php

@@ -36,16 +36,16 @@ 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 common\logic\User\CreditHistory\Model\CreditHistory;
 
 ?>
 
 <p>Bonjour <?= Html::encode($user->name); ?>,</p>
 
 <p>Votre producteur <strong><?= Html::encode($producer->name); ?></strong> vient
-    de <?php if($creditForm->type == CreditHistory::TYPE_CREDIT): ?>créditer<?php else: ?>débiter<?php endif; ?> votre compte de <strong><?= Price::format($creditForm->amount); ?></strong> sur le site <a href="http://www.opendistrib.net/">Opendistrib</a>.</p>
+    de <?php if($creditForm->type == Payment::TYPE_CREDIT): ?>créditer<?php else: ?>débiter<?php endif; ?> votre compte de <strong><?= Price::format($creditForm->amount); ?></strong> sur le site <a href="http://www.opendistrib.net/">Opendistrib</a>.</p>
 
 <p>Votre compte est désormais à <strong><?= Price::format($userProducer->credit); ?></strong><br />
 <a href="<?= Yii::$app->urlManagerProducer->createAbsoluteUrl(['credit/history','slug_producer' => $producer->slug]) ?>">Cliquez ici</a> pour voir l'historique de votre crédit.</p>

common/mail/creditUser-text.php

@@ -37,13 +37,13 @@ termes.
 */
 
 use common\helpers\Price ;
-use common\logic\User\CreditHistory\Model\CreditHistory;
+use common\logic\Payment\Model\Payment;
 
 ?>
 
 Bonjour <?= $user->name; ?>,</p>
 
-Votre producteur <?= $producer->name; ?> vient de <?php if($creditForm->type ==  CreditHistory::TYPE_CREDIT): ?>créditer<?php else: ?>débiter<?php endif; ?> votre compte de <?= Price::format($creditForm->amount); ?> sur le site http://www.opendistrib.net/
+Votre producteur <?= $producer->name; ?> vient de <?php if($creditForm->type ==  Payment::TYPE_CREDIT): ?>créditer<?php else: ?>débiter<?php endif; ?> votre compte de <?= Price::format($creditForm->amount); ?> sur le site http://www.opendistrib.net/
 
 Votre compte est désormais à  : <?= Price::format($userProducer->credit); ?>.
 Suivez ce lien pour voir l'historique de votre crédit : <?= Yii::$app->urlManagerProducer->createAbsoluteUrl(['credit/history','slug_producer' => $producer->slug]) ?>">

common/versions/23.9.D.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once dirname(__FILE__).'/_macros.php';
+
+version(
+    '25/09/2023',
+    [
+        [
+            "[Administration] Documents > Factures : gestion des paiements",
+            "[Administration] Distributions : nouvelle mise en page de la liste des commandes (paiement, crédit, boutons d'action)"
+        ],
+        [
+            "[Administration] Distributions > Nouvelle commande : correctif bug affichage quantités restantes"
+        ]
+    ],
+    [
+        [],
+        []
+    ],
+);
+
+?>

composer.json

@@ -41,7 +41,7 @@
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
-        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-debug": "^2.1",
         "yiisoft/yii2-gii": "*",
         "yiisoft/yii2-faker": "*",
         "codeception/codeception": "^2.3",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1d287231533b2d1fef1047dd81b0e4d5",
+    "content-hash": "a8cbf9ba6bfa2f0b47fba2344732ac95",
     "packages": [
         {
             "name": "2amigos/yii2-chartjs-widget",
@@ -6410,16 +6410,16 @@
         },
         {
             "name": "yiisoft/yii2-debug",
-            "version": "2.1.22",
+            "version": "2.1.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-debug.git",
-                "reference": "c0fa388c56b64edfb92987fdcc37d7a0243170d7"
+                "reference": "e15e954d0beb82b0b532f998f55e7275083de592"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/c0fa388c56b64edfb92987fdcc37d7a0243170d7",
-                "reference": "c0fa388c56b64edfb92987fdcc37d7a0243170d7",
+                "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/e15e954d0beb82b0b532f998f55e7275083de592",
+                "reference": "e15e954d0beb82b0b532f998f55e7275083de592",
                 "shasum": ""
             },
             "require": {
@@ -6496,7 +6496,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-18T17:29:27+00:00"
+            "time": "2023-07-10T06:07:43+00:00"
         },
         {
             "name": "yiisoft/yii2-faker",

console/migrations/m230913_071815_alter_table_credit_history_rename_payment.php

@@ -0,0 +1,28 @@
+<?php
+
+use yii\db\Migration;
+use yii\db\Schema;
+
+/**
+ * Class m230913_071815_alter_table_credit_history_rename_payment
+ */
+class m230913_071815_alter_table_credit_history_rename_payment extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->renameTable('credit_history', 'payment');
+        $this->addColumn('payment', 'id_invoice', Schema::TYPE_INTEGER);
+        $this->alterColumn('payment', 'id_user', Schema::TYPE_INTEGER.' DEFAULT NULL');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->renameTable('payment', 'credit_history');
+    }
+}

console/migrations/m230920_081923_add_column_payment_date_transaction.php

@@ -0,0 +1,26 @@
+<?php
+
+use yii\db\Migration;
+use yii\db\Schema;
+
+/**
+ * Class m230920_081923_add_column_payment_date_transaction
+ */
+class m230920_081923_add_column_payment_date_transaction extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('payment', 'date_transaction', Schema::TYPE_DATE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('payment', 'date_transaction');
+    }
+}

producer/controllers/CreditController.php

@@ -39,10 +39,9 @@
 namespace producer\controllers;
 
 use common\helpers\GlobalParam;
-use common\helpers\Mailjet;
 use common\helpers\MeanPayment;
-use common\logic\User\CreditHistory\Model\CreditHistory;
-use common\logic\User\CreditHistory\Model\CreditHistorySearch;
+use common\logic\Payment\Model\Payment;
+use common\logic\Payment\Model\CreditHistorySearch;
 use producer\models\CreditForm;
 use yii\filters\VerbFilter;
 
@@ -181,7 +180,7 @@ class CreditController extends ProducerBaseController
     public function actionStripeVerification()
     {
         $orderManager = $this->getOrderManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
         $producerManager = $this->getProducerManager();
         $userManager = $this->getUserManager();
         $producer = $this->getProducerCurrent();
@@ -225,7 +224,7 @@ class CreditController extends ProducerBaseController
             switch ($event->type) {
                 case 'charge.succeeded':
 
-                    $creditHistoryExist = CreditHistory::searchOne([
+                    $paymentExist = Payment::searchOne([
                         'id_user' => $idUser,
                         'amount' => $amount,
                     ], [
@@ -234,13 +233,13 @@ class CreditController extends ProducerBaseController
                         ]
                     ]);
 
-                    if (!$creditHistoryExist) {
+                    if (!$paymentExist) {
 
-                        $creditHistoryManager->creditUser($user, $amount, MeanPayment::CREDIT_CARD, $user);
+                        $paymentManager->creditUser($user, $amount, MeanPayment::CREDIT_CARD, $user);
 
                         if (isset($order) && $order) {
 
-                            $creditHistoryManager->payOrder($order, $user, true);
+                            $paymentManager->payOrder($order, MeanPayment::CREDIT_CARD, $user, true);
 
 
                             // client : envoi d'un email de confirmation de paiement

producer/controllers/OrderController.php

@@ -329,7 +329,7 @@ class OrderController extends ProducerBaseController
         $producerManager = $this->getProducerManager();
         $productOrderManager = $this->getProductOrderManager();
         $userManager = $this->getUserManager();
-        $creditHistoryManager = $this->getCreditHistoryManager();
+        $paymentManager = $this->getPaymentManager();
 
         $posts = \Yii::$app->request->post();
         $productsArray = [];
@@ -455,10 +455,10 @@ class OrderController extends ProducerBaseController
                 )) {
                 // à payer
                 if ($orderManager->getPaymentStatus($order) == Order::PAYMENT_UNPAID) {
-                    $creditHistoryManager->payOrder($order, $this->getUserCurrent(), true);
+                    $paymentManager->payOrderByCredit($order, $this->getUserCurrent(), true);
                 } // surplus à rembourser
                 elseif ($orderManager->getPaymentStatus($order) == Order::PAYMENT_SURPLUS) {
-                    $creditHistoryManager->refundSurplusOrder($order, $this->getUserCurrent());
+                    $paymentManager->refundSurplusOrderCredit($order, $this->getUserCurrent());
                 }
             }
 
@@ -626,7 +626,7 @@ class OrderController extends ProducerBaseController
             if ($order) {
                 $json['order'] = array_merge($order->getAttributes(), [
                     'amount_total' => $orderManager->getOrderAmountWithTax($order, Order::AMOUNT_TOTAL),
-                    'amount_paid' => $orderManager->getOrderAmount($order, Order::AMOUNT_PAID),
+                    'amount_paid' => $orderManager->getOrderAmountPaidByCredit($order),
                 ]);
             }
         }

producer/views/credit/history.php

@@ -36,10 +36,10 @@
  * termes.
  */
 
-use common\logic\User\CreditHistory\Wrapper\CreditHistoryManager;
+use common\logic\Payment\Wrapper\PaymentManager;
 use yii\grid\GridView;
 
-$creditHistoryManager = CreditHistoryManager::getInstance();
+$paymentManager = PaymentManager::getInstance();
 $producer = $this->context->getProducerCurrent();
 $this->setTitle('Crédit : <span id="credit-user">' . number_format($creditUser, 2) . ' €</span>');
 $this->setPageTitle('Crédit');
@@ -61,35 +61,35 @@ if ($this->context->getProducerCurrent()->online_payment) {
     'columns' => [
         [
             'attribute' => 'date',
-            'value' => function ($model) use ($creditHistoryManager) {
-                return $creditHistoryManager->getDate($model, true);
+            'value' => function ($model) use ($paymentManager) {
+                return $paymentManager->getDate($model, true);
             }
         ],
         [
             'attribute' => 'id_user_action',
-            'value' => function ($model) use ($creditHistoryManager) {
-                return $creditHistoryManager->getStrUserAction($model);
+            'value' => function ($model) use ($paymentManager) {
+                return $paymentManager->getStrUserAction($model);
             }
         ],
         [
             'label' => 'Type',
             'format' => 'raw',
-            'value' => function ($model) use ($creditHistoryManager) {
-                return $creditHistoryManager->getStrWording($model);
+            'value' => function ($model) use ($paymentManager) {
+                return $paymentManager->getStrWording($model);
             }
         ],
         [
             'attribute' => 'mean_payment',
-            'value' => function ($model) use ($creditHistoryManager) {
-                return $creditHistoryManager->getStrMeanPayment($model);
+            'value' => function ($model) use ($paymentManager) {
+                return $paymentManager->getStrMeanPayment($model);
             }
         ],
         [
             'label' => '- Débit',
             'format' => 'raw',
-            'value' => function ($model) use ($creditHistoryManager) {
-                if ($creditHistoryManager->isTypeDebit($model)) {
-                    return '-&nbsp;' . $creditHistoryManager->getAmount($model, true);
+            'value' => function ($model) use ($paymentManager) {
+                if ($paymentManager->isTypeDebit($model)) {
+                    return '-&nbsp;' . $paymentManager->getAmount($model, true);
                 }
                 return '';
             }
@@ -97,9 +97,9 @@ if ($this->context->getProducerCurrent()->online_payment) {
         [
             'label' => '+ Crédit',
             'format' => 'raw',
-            'value' => function ($model) use ($creditHistoryManager) {
-                if ($creditHistoryManager->isTypeCredit($model)) {
-                    return '+&nbsp;' . $creditHistoryManager->getAmount($model, true);
+            'value' => function ($model) use ($paymentManager) {
+                if ($paymentManager->isTypeCredit($model)) {
+                    return '+&nbsp;' . $paymentManager->getAmount($model, true);
                 }
                 return '';
             }

producer/web/js/vuejs/order-order.js

@@ -228,38 +228,17 @@ var app = new Vue({
                     }
 
                     if(updateOrder) {
-
-                        if(response.data.products) {
-                            app.products = response.data.products;
-                        }
-
-                        app.order = null ;
-                        if(response.data.order) {
-                            app.order = response.data.order ;
-                            app.comment = app.order.comment ;
-                            app.delivery = app.order.delivery_home ;
-                            if(app.order.delivery_address && app.order.delivery_address.length > 0) {
-                                app.deliveryAddress = app.order.delivery_address ;
-                            }
-                            app.pointSaleActive = app.getPointSale(response.data.order.id_point_sale) ;
-                        }
-                        else {
-                            app.comment = null ;
-                            app.delivery = false ;
-                            app.deliveryAddress = null ;
-                            if(app.user.address && app.user.address.length > 0) {
-                                app.deliveryAddress = app.user.address ;
-                            }
-                        }
+                        app.updateOrder(response);
                     }
 
                     if(type == 'first') {
                         if(app.getDate() && app.pointSaleActive) {
                             app.step = 'products' ;
-
                             if(response.data.products) {
                                 app.products = response.data.products;
                             }
+
+                            app.updateOrder(response);
                         }
                         else if(app.producer.option_order_entry_point == 'point-sale') {
                             app.step = 'point-sale' ;
@@ -281,7 +260,31 @@ var app = new Vue({
                     app.loadingInit = false ;
                 });
         },
+        updateOrder: function(response) {
+            var app = this;
+            if(response.data.products) {
+                app.products = response.data.products;
+            }
 
+            app.order = null ;
+            if(response.data.order) {
+                app.order = response.data.order ;
+                app.comment = app.order.comment ;
+                app.delivery = app.order.delivery_home ;
+                if(app.order.delivery_address && app.order.delivery_address.length > 0) {
+                    app.deliveryAddress = app.order.delivery_address ;
+                }
+                app.pointSaleActive = app.getPointSale(response.data.order.id_point_sale) ;
+            }
+            else {
+                app.comment = null ;
+                app.delivery = false ;
+                app.deliveryAddress = null ;
+                if(app.user.address && app.user.address.length > 0) {
+                    app.deliveryAddress = app.user.address ;
+                }
+            }
+        },
         isMobile: function() {
             var width_window = parseInt($(window).width());
             return width_window <= 768;