Merge branch 'dev'

common/models/Product.php

@@ -175,7 +175,9 @@ class Product extends ActiveRecordCommon
 
         public function afterFind() {
                 if ($this->taxRate == null) {
-                        $this->populateRelation('taxRate', GlobalParam::getCurrentProducer()->taxRate);
+                        $producer = Producer::searchOne(['id' => GlobalParam::getCurrentProducerId()]) ;
+                        $this->populateRelation('taxRate', $producer->taxRate);
+                        //$this->populateRelation('taxRate', GlobalParam::getCurrentProducer()->taxRate);
                 }
 
                 $this->wording_unit = Product::strUnit($this->unit) ;

producer/views/order/order.php

@@ -152,7 +152,11 @@ $producer = GlobalParam::getCurrentProducer() ;
                                                                 if($pointSaleDistributions && count($pointSaleDistributions) > 0) {
                                                                         echo '<div class="point-sales">' ;
                                                                         foreach($pointSaleDistributions as $pointSaleDistribution) {
-                                                                                echo $pointSaleDistribution->pointSale->name.'<br />' ;
+                                                                                echo $pointSaleDistribution->pointSale->name.'' ;
+                                                                                if(strlen($pointSaleDistribution->pointSale->locality)) {
+                                                                                        echo ' ('.$pointSaleDistribution->pointSale->locality.')' ;
+                                                                                }
+                                                                                echo '<br />' ;
                                                                         }
                                                                         echo '</div>' ;
                                                                 }

producer/views/site/index.php

@@ -79,7 +79,7 @@ $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
                 'format' => 'raw',
                 'value' => function($model) {
 
-                        $producer = GlobalParam::getCurrentProducer() ;
+                        $producer = \Yii::$app->controller->getProducer() ;
 
                         if($producer->behavior_home_point_sale_day_list == Producer::BEHAVIOR_HOME_POINT_SALE_DAY_LIST_WEEK) {
                                 return $model->getStrDeliveryDays() ;