浏览代码

[Administration] Exports : ajout colonne poids dans "Totaux produits"

feature/rotating_product
Guillaume Bourgeois 7 个月前
父节点
当前提交
4f210f0d5b
共有 5 个文件被更改,包括 78 次插入2161 次删除
  1. +2
    -2
      backend/controllers/DevelopmentController.php
  2. +1
    -1
      common/helpers/Souke.php
  3. +8
    -1
      domain/Distribution/Distribution/Export/DistributionReportTotalProductCsvGenerator.php
  4. +2
    -2
      domain/Producer/Producer/ProducerBuilder.php
  5. +65
    -2155
      producer/web/css/screen.css

+ 2
- 2
backend/controllers/DevelopmentController.php 查看文件

@@ -38,7 +38,7 @@

namespace backend\controllers;

use common\helpers\Opendistrib;
use common\helpers\Souke;
use yii\filters\AccessControl;

/**
@@ -75,7 +75,7 @@ class DevelopmentController extends BackendController
public function actionIndex()
{
$producerModule = $this->getProducerModule();
$versionsArray = Opendistrib::getVersions();
$versionsArray = Souke::getVersions();
$versionsRenderArray = [];
foreach ($versionsArray as $version) {
$versionsRenderArray[$version] = [

common/helpers/Opendistrib.php → common/helpers/Souke.php 查看文件

@@ -38,7 +38,7 @@

namespace common\helpers;

class Opendistrib
class Souke
{
public static function getVersions()
{

+ 8
- 1
domain/Distribution/Distribution/Export/DistributionReportTotalProductCsvGenerator.php 查看文件

@@ -31,10 +31,17 @@ class DistributionReportTotalProductCsvGenerator extends AbstractGenerator imple
$productsArray = $this->productRepository->findProductsByDistribution($distribution, true,'product.order ASC');
$ordersArray = $this->orderRepository->findOrdersByDistribution($distribution);

$datas[] = [
'Produit',
'Quantité (pièces)',
'Poids'
];

foreach($productsArray as $product) {
$datas[] = [
$this->productSolver->getNameExport($product),
$this->orderSolver->getProductQuantityPiecesByOrders($product, $ordersArray)
$this->orderSolver->getProductQuantityPiecesByOrders($product, $ordersArray),
$this->productSolver->getWeightAsString($product)
];
}


+ 2
- 2
domain/Producer/Producer/ProducerBuilder.php 查看文件

@@ -2,7 +2,7 @@

namespace domain\Producer\Producer;

use common\helpers\Opendistrib;
use common\helpers\Souke;
use common\helpers\Password;
use common\helpers\Upload;
use common\helpers\Url;
@@ -78,7 +78,7 @@ class ProducerBuilder extends AbstractBuilder

public function updateOpendistribVersion(Producer $producer): void
{
$versionsArray = Opendistrib::getVersions();
$versionsArray = Souke::getVersions();
$producer->latest_version_opendistrib = reset($versionsArray);

$this->update($producer);

+ 65
- 2155
producer/web/css/screen.css
文件差异内容过多而无法显示
查看文件


正在加载...
取消
保存