Merge branch 'develop'

backend/controllers/ProducerController.php

@@ -151,6 +151,7 @@ class ProducerController extends BackendController
         ]);
 
         return $this->render('billing', [
+            'paidFeaturesArray' => $this->getFeatureModule()->getRepository()->findPaidFeatures(),
             'dataProviderPrices' => $dataProviderPrices,
             'producer' => $producer,
             'alertFreePrice' => (isset($alertFreeprice)) ? true : false

backend/controllers/ProductController.php

@@ -41,8 +41,7 @@ namespace backend\controllers;
 use backend\forms\ProductPriceUploadForm;
 use common\helpers\CSV;
 use common\helpers\GlobalParam;
-use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
-use common\logic\Feature\Feature\Model\Feature;
+use common\logic\Feature\Feature\Feature;
 use common\logic\PointSale\PointSale\Model\PointSale;
 use common\logic\Product\Product\Model\Product;
 use common\logic\Product\Product\Model\ProductSearch;
@@ -52,10 +51,8 @@ use common\logic\Product\ProductPrice\Model\ProductPriceSearch;
 use common\logic\User\UserProducer\Model\UserProducer;
 use Yii;
 use yii\filters\AccessControl;
-use yii\helpers\BaseFileHelper;
 use yii\helpers\Html;
 use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
 use common\helpers\Upload;
 use yii\web\UploadedFile;
 
@@ -374,7 +371,7 @@ class ProductController extends BackendController
      */
     public function actionPriceImport()
     {
-        if($this->getFeatureModule()->getManager()->isDisabled(Feature::ALIAS_PRODUCT_PRICE_IMPORT)) {
+        if($this->getFeatureModule()->getChecker()->isDisabled(Feature::ALIAS_PRODUCT_PRICE_IMPORT)) {
             return $this->redirectDashboard();
         }
 
@@ -484,7 +481,7 @@ class ProductController extends BackendController
      */
     public function actionPriceExport()
     {
-        if($this->getFeatureModule()->getManager()->isDisabled(Feature::ALIAS_PRODUCT_PRICE_IMPORT)) {
+        if($this->getFeatureModule()->getChecker()->isDisabled(Feature::ALIAS_PRODUCT_PRICE_IMPORT)) {
             return $this->redirectDashboard();
         }
 

backend/views/distribution/index.php

@@ -215,7 +215,7 @@ $this->setPageTitle('Distributions') ;
                                     {{ countOrders }} Commande<span v-if="countOrders > 1">s</span><br />
 
                                     <template v-for="distributionExport in distribution.exports">
-                                        <a v-if="countOrders > 0" :href="distributionExport.url" class="btn btn-xs btn-default">{{ distributionExport.label }}</a><br />
+                                        <a v-if="countOrders > 0" :href="distributionExport.url" target="_blank" class="btn btn-xs btn-default">{{ distributionExport.label }}</a><br />
                                     </template>
                                     <!--<a :href="distribution.url_report+'&type=csv'" class="btn btn-xs btn-default" v-if="countOrders > 0">Tableau (CSV)</a>
                                     <a :href="distribution.url_report_csv2" class="btn btn-xs btn-default" v-if="countOrders > 0">Tableau 2 (CSV)</a>
@@ -694,7 +694,10 @@ $this->setPageTitle('Distributions') ;
                                 <span class="label label-success" v-if="loadingUpdateProductOrder || order.productOrder[product.id].active">Actif</span>
                                 <span class="label label-danger" v-else>Inactif</span>
                             </td>
-                            <td>{{ product.name }}</td>
+                            <td>
+                                {{ product.name }}
+                                <template v-if="product.weight">({{ product.weight }} g)</template>
+                            </td>
                             <td class="price">
                                     <div v-show="vatMode == 'all'" class="input-group">
                                         <input type="text" v-model="order.productOrder[product.id].price" class="form-control input-sm" @change="productPriceChange" :data-with-tax="false" :data-id-product="product.id" />

backend/views/producer/billing.php

@@ -72,6 +72,7 @@ elseif($producerModule->isBillingTypeClassic($producer)) {
 <?=
 
 $this->render('@frontend/views/site/_prices_producer', [
+    'paidFeaturesArray' => $paidFeaturesArray,
     'dataProviderPrices' => $dataProviderPrices
 ]);
 

common/config/params.php

@@ -37,7 +37,7 @@
  */
 
 return [
-        'version' => '23.11.B',
+        'version' => '23.11.C',
         'maintenanceMode' => false,
         'siteName' => 'Opendistrib',
         'adminEmail' => 'contact@opendistrib.net',

common/versions/23.11.C.php

@@ -0,0 +1,26 @@
+<?php
+
+require_once dirname(__FILE__).'/_macros.php';
+
+version(
+    '28/11/2023',
+    [
+        [
+        ],
+        [
+            "[Admin] Distributions > formulaire commande : ajout du poids au nom des produits",
+            "[Admin] Distribution > exports : ouverture dans un nouvel onglet",
+        ]
+    ],
+    [
+        [
+        ],
+        [
+            "[Admin] Tarifs : erreur vue modules payants",
+            "[Admin] Produits : import prix cassé"
+        ]
+    ],
+    $userCurrent
+);
+
+?>