[Backend] Distributions > crédit : problème "surplus" et "reste à payer" #367

backend/controllers/DistributionController.php

@@ -282,15 +282,15 @@ class DistributionController extends BackendController
 
                     $order = array_merge($order->getAttributes(), [
                             'selected' => false,
-                            'amount' => $order->getAmountWithTax(Order::AMOUNT_TOTAL),
-                            'amount_paid' => $order->getAmount(Order::AMOUNT_PAID),
-                            'amount_remaining' => $order->getAmount(Order::AMOUNT_REMAINING),
-                            'amount_surplus' => $order->getAmount(Order::AMOUNT_SURPLUS),
+                            'amount' => Price::numberTwoDecimals($order->getAmountWithTax(Order::AMOUNT_TOTAL)),
+                            'amount_paid' => Price::numberTwoDecimals($order->getAmount(Order::AMOUNT_PAID)),
+                            'amount_remaining' => Price::numberTwoDecimals($order->getAmount(Order::AMOUNT_REMAINING)),
+                            'amount_surplus' => Price::numberTwoDecimals($order->getAmount(Order::AMOUNT_SURPLUS)),
                             'user' => (isset($order->user)) ? array_merge(
                                     $order->user->getAttributes(),
                                     $arrayCreditUser
                             ) : null,
-                            'pointSale' => ['id' => $order->pointSale->id, 'name' => $order->pointSale->name],
+                            'pointSale' => $order->pointSale ? ['id' => $order->pointSale->id, 'name' => $order->pointSale->name] : null,
                             'productOrder' => $productOrderArray,
                             'creditHistory' => $creditHistoryArray,
                             'oneProductUnactivated' => $oneProductUnactivated

backend/views/distribution/index.php

@@ -336,9 +336,11 @@ $this->setPageTitle('Distributions') ;
                                     <span v-if="order.delivery_home && order.delivery_address && order.delivery_address.length > 0" class="glyphicon glyphicon-home"></span>
                                 </td>
                                 <td class="column-point-sale" v-if="idActivePointSale == 0">
-                                    {{ order.pointSale.name }}
+                                    <template v-if="order.pointSale">
+                                        {{ order.pointSale.name }}
+                                    </template>
                                 </td>
-                                <td class="column-amount">{{ order.amount.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}</td>
+                                <td class="column-amount">{{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}</td>
                                 <td class="column-state-payment">
                                     <div class="input-group">
                                         <span class="label label-success input-group-addon" v-if="order.amount_paid == order.amount">payé</span>
@@ -420,7 +422,7 @@ $this->setPageTitle('Distributions') ;
                                                     <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.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}</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">payé</span>
@@ -445,7 +447,7 @@ $this->setPageTitle('Distributions') ;
                                                     data-type="refund"
                                                     @click="orderPaymentClick" >
                                                     <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Rembourser {{ order.amount.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
+                                                    Rembourser {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
                                                 </button>
 
                                                 <button v-else-if="order.amount_paid == 0"
@@ -454,7 +456,7 @@ $this->setPageTitle('Distributions') ;
                                                     data-type="payment"
                                                     @click="orderPaymentClick">
                                                     <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Payer {{ order.amount.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
+                                                    Payer {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
                                                 </button>
 
                                                 <button v-else-if="order.amount_paid > order.amount"
@@ -463,7 +465,7 @@ $this->setPageTitle('Distributions') ;
                                                     data-type="refund"
                                                     @click="orderPaymentClick">
                                                     <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Rembourser {{ order.amount_surplus.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
+                                                    Rembourser {{ order.amount_surplus.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
                                                 </button>
 
                                                 <button v-else-if="order.amount_paid < order.amount"
@@ -472,7 +474,7 @@ $this->setPageTitle('Distributions') ;
                                                     data-type="payment"
                                                     @click="orderPaymentClick">
                                                     <span class="glyphicon glyphicon-chevron-right"></span>
-                                                    Payer le restant {{ order.amount_remaining.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
+                                                    Payer le restant {{ order.amount_remaining.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}
                                                 </button>
                                             </div>
 

common/models/Order.php

@@ -452,8 +452,6 @@ class Order extends ActiveRecordCommon
                 $amount = $this->getAmountWithTax(self::AMOUNT_PAID)
                         - $this->getAmountWithTax(self::AMOUNT_TOTAL);
                 break;
-            /*default:
-                    throw new NotFoundHttpException('Type de montant inconnu : '.$type) ;*/
         }
 
         if ($format) {