浏览代码

Merge branch 'develop'

master
Guillaume Bourgeois 1 个月前
父节点
当前提交
0792af3da0
共有 4 个文件被更改,包括 45 次插入5 次删除
  1. +2
    -0
      backend/views/producer/update.php
  2. +26
    -0
      console/migrations/m240912_071102_add_column_producer_export_shopping_cart_labels_pdf_in_cart_label_specific_format.php
  3. +15
    -5
      domain/Distribution/Distribution/Export/DistributionShoppingCartLabelsPdfGenerator.php
  4. +2
    -0
      domain/Producer/Producer/Producer.php

+ 2
- 0
backend/views/producer/update.php 查看文件

<?php if($featureChecker->isEnabled(Feature::ALIAS_EXPORT_SHOPPING_CART_LABELS_ADVANCED)): ?> <?php if($featureChecker->isEnabled(Feature::ALIAS_EXPORT_SHOPPING_CART_LABELS_ADVANCED)): ?>
<?= $form->field($model, 'export_shopping_cart_labels_format') <?= $form->field($model, 'export_shopping_cart_labels_format')
->dropDownList($distributionExportManager->getGenerator(ExportManager::SHOPPING_CART_LABELS_PDF)->populateDropdownSpecificFormats()); ?> ->dropDownList($distributionExportManager->getGenerator(ExportManager::SHOPPING_CART_LABELS_PDF)->populateDropdownSpecificFormats()); ?>
<?= $form->field($model, 'export_shopping_cart_labels_pdf_in_cart_label_specific_format')
->dropDownList(Dropdown::noYesChoices()); ?>
<?php else: ?> <?php else: ?>
<?= $form->field($model, 'export_shopping_cart_labels_number_per_column') <?= $form->field($model, 'export_shopping_cart_labels_number_per_column')
->dropDownList(Dropdown::numberChoices(1, 20)); ?> ->dropDownList(Dropdown::numberChoices(1, 20)); ?>

+ 26
- 0
console/migrations/m240912_071102_add_column_producer_export_shopping_cart_labels_pdf_in_cart_label_specific_format.php 查看文件

<?php

use yii\db\Migration;
use yii\db\Schema;

/**
* Class m240912_071102_add_column_producer_export_shopping_cart_labels_pdf_in_cart_label_specific_format
*/
class m240912_071102_add_column_producer_export_shopping_cart_labels_pdf_in_cart_label_specific_format extends Migration
{
/**
* {@inheritdoc}
*/
public function safeUp()
{
$this->addColumn('producer', 'export_shopping_cart_labels_pdf_in_cart_label_specific_format', Schema::TYPE_BOOLEAN);
}

/**
* {@inheritdoc}
*/
public function safeDown()
{
$this->dropColumn('producer', 'export_shopping_cart_labels_pdf_in_cart_label_specific_format');
}
}

+ 15
- 5
domain/Distribution/Distribution/Export/DistributionShoppingCartLabelsPdfGenerator.php 查看文件

class DistributionShoppingCartLabelsPdfGenerator extends AbstractGenerator implements DistributionExportGeneratorInterface class DistributionShoppingCartLabelsPdfGenerator extends AbstractGenerator implements DistributionExportGeneratorInterface
{ {
const FORMAT_70_42 = '70x42'; const FORMAT_70_42 = '70x42';
const FORMAT_100_150 = '100x150';


protected ProducerSolver $producerSolver; protected ProducerSolver $producerSolver;
protected OrderRepository $orderRepository; protected OrderRepository $orderRepository;
public function getSpecificFormatDetailsArray(): array public function getSpecificFormatDetailsArray(): array
{ {
return [ return [
self::FORMAT_70_42 => [70, 42]
self::FORMAT_70_42 => [70, 42],
self::FORMAT_100_150 => [100, 150],
]; ];
} }


]); ]);


if($isSpecificFormat) { if($isSpecificFormat) {
$pdf = $this->getPdf($distribution, $content, true, $specificFormatWidth, $specificFormatHeight);
$pdfInCartLabelSpecificFormat = $this->producerSolver->getConfig('export_shopping_cart_labels_pdf_in_cart_label_specific_format');
$pdf = $this->getPdf($distribution, $content, $pdfInCartLabelSpecificFormat, true, $specificFormatWidth, $specificFormatHeight);
} }
else { else {
$pdf = $this->getPdf($distribution, $content, false);
$pdf = $this->getPdf($distribution, $content, false, false);
$pdf->getApi()->SetColumns(4); $pdf->getApi()->SetColumns(4);
$pdf->getApi()->keepColumns = true; $pdf->getApi()->keepColumns = true;
} }
return $pdf->render(); return $pdf->render();
} }


public function getPdf(Distribution $distribution, string $content, bool $isSpecificFormat, float $specificFormatWidth = 0, float $specificFormatHeight = 0)
public function getPdf(Distribution $distribution, string $content, bool $pdfInCartLabelSpecificFormat, bool $isSpecificFormat, float $specificFormatWidth = 0, float $specificFormatHeight = 0)
{ {
if($pdfInCartLabelSpecificFormat) {
$format = [$specificFormatWidth, $specificFormatHeight];
}
else {
$format = Pdf::FORMAT_A4;
}

return new Pdf([ return new Pdf([
'mode' => Pdf::MODE_UTF8, 'mode' => Pdf::MODE_UTF8,
'format' => Pdf::FORMAT_A4,
'format' => $format,
'orientation' => Pdf::ORIENT_PORTRAIT, 'orientation' => Pdf::ORIENT_PORTRAIT,
'destination' => Pdf::DEST_BROWSER, 'destination' => Pdf::DEST_BROWSER,
'filename' => \Yii::getAlias( 'filename' => \Yii::getAlias(

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

'option_leave_period_message_display', 'option_leave_period_message_display',
'sponsorship_sponsor_reward', 'sponsorship_sponsor_reward',
'sponsorship_godson_reward', 'sponsorship_godson_reward',
'export_shopping_cart_labels_pdf_in_cart_label_specific_format'
], ],
'boolean' 'boolean'
], ],
'option_document_width_logo' => 'Largeur du logo dans les documents', 'option_document_width_logo' => 'Largeur du logo dans les documents',
'export_shopping_cart_labels_number_per_column' => "Étiquettes (PDF) : nombre d'étiquettes par colonne", 'export_shopping_cart_labels_number_per_column' => "Étiquettes (PDF) : nombre d'étiquettes par colonne",
'export_shopping_cart_labels_format' => 'Étiquettes (PDF) : format', 'export_shopping_cart_labels_format' => 'Étiquettes (PDF) : format',
'export_shopping_cart_labels_pdf_in_cart_label_specific_format' => 'Étiquettes (PDF) : PDF au format d\'étiquette spécifique',
'option_document_display_price_unit_reference' => "Afficher les prix au kilogramme", 'option_document_display_price_unit_reference' => "Afficher les prix au kilogramme",
'id_user_group_default' => "Groupe utilisateur par défaut attribué à l'inscription", 'id_user_group_default' => "Groupe utilisateur par défaut attribué à l'inscription",
'option_check_by_default_prevent_user_credit' => "Par défaut, prévenir l'utilisateur quand on crédite sa cagnotte", 'option_check_by_default_prevent_user_credit' => "Par défaut, prévenir l'utilisateur quand on crédite sa cagnotte",

正在加载...
取消
保存