Browse Source

Merge branch 'develop'

master
Guillaume 4 years ago
parent
commit
139078ae99
3 changed files with 12 additions and 0 deletions
  1. +6
    -0
      ShopBundle/Form/Backend/Merchant/MerchantConfigType.php
  2. +1
    -0
      ShopBundle/Resources/translations/lcshop.fr.yaml
  3. +5
    -0
      ShopBundle/Resources/views/backend/merchant/panel_email.html.twig

+ 6
- 0
ShopBundle/Form/Backend/Merchant/MerchantConfigType.php View File

use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
'label' => $merchantConfig->getLabel(), 'label' => $merchantConfig->getLabel(),
]); ]);
} }
elseif($merchantConfig->getFieldType() == 'textarea') {
$form->add('value', TextareaType::class, [
'label' => $merchantConfig->getLabel(),
]);
}
else { else {
if($merchantConfig->getOption()) { if($merchantConfig->getOption()) {
$form->add('value', TextType::class, [ $form->add('value', TextType::class, [

+ 1
- 0
ShopBundle/Resources/translations/lcshop.fr.yaml View File

users: Utilisateurs users: Utilisateurs
total: Total total: Total
products: Produits products: Produits
purchaseOrderEmailContent: "Contenu par défaut de l'email envoyé aux producteurs"


PointSale: PointSale:
code: Code code: Code

+ 5
- 0
ShopBundle/Resources/views/backend/merchant/panel_email.html.twig View File

<div class="col-12"> <div class="col-12">
{{ form_row(form.merchantConfigs['email-from-purchase-order']) }} {{ form_row(form.merchantConfigs['email-from-purchase-order']) }}
</div> </div>
{% if form.merchantConfigs['purchase-order-email-content'] is defined %}
<div class="col-12">
{{ form_row(form.merchantConfigs['purchase-order-email-content']) }}
</div>
{% endif %}
{{ macros.card_end() }} {{ macros.card_end() }}
</div> </div>
</div> </div>

Loading…
Cancel
Save