Merge branch 'develop'

producer/controllers/OrderController.php

@@ -587,7 +587,8 @@ class OrderController extends ProducerBaseController
         $producer = $this->getProducerCurrent();
 
         if (!$order || (!$producer->option_allow_order_guest && !$orderManager->isOrderBelongsToUser($order, GlobalParam::getCurrentUser()))) {
-            throw new \yii\base\UserException('Commande introuvable.');
+            $this->setFlash('error', 'Commande introuvable');
+            return $this->redirect(['order/history']);
         }
 
         $orderManager->initOrder($order);

producer/views/order/order.php

@@ -576,7 +576,7 @@ $this->setTitle('Commander') ;
 <script type="text/x-template" id="template-step-point-sale">
     <li id="step-point-sale" :class="'col-md-3'+((step == 'point-sale') ? ' active ' : '')+(first ? ' first' : '')">
         <button @click="changeStep('point-sale')" :class="'btn '+ (step == 'point-sale' ? 'btn-primary' : 'btn-default')" :disabled="producer && (producer.option_order_entry_point == 'date' && step == 'date')">
-            <span class="button-content"><span class="glyphicon glyphicon-map-marker"></span> <?= $producer->getPointSaleWording(); ?></span>
+            <span class="button-content"><span class="glyphicon glyphicon-map-marker"></span> <?= $producerManager->getPointSaleWording($producer); ?></span>
         </button>
         <div class="info-step" v-if="pointSaleActive">
             {{ pointSaleActive.name }}