Commit 9bc3c94b authored by notebook's avatar notebook
Browse files

Merge origin/master into skuska

Conflicts:
	composer.lock
	config/packages/security.yaml
	src/Controller/Admin/DashboardController.php
	symfony.lock
parent 9ca7b0c9
......@@ -18,14 +18,16 @@ class AddOrderItemFormType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('name',TextType::class, array( // typ Text, protože nebudeme zobrazovat políčka pro vybrání data. Načteme si 3rd party kalendář
'attr' => array(
->add('name',TextType::class, array( 'attr' => array(
'class' => 'form-control',
),
'label' => 'Názov tovaru',
'mapped' => false // nebudeme kontrolovat správnost tohoto pole přes databázi, protože jde o "TextType" a ne "DateTimeType"
))
->add('qty')
'mapped' => false ))
->add('qty',TextType::class, array( 'attr' => array(
'class' => 'form-control',
),
'label' => 'Názov tovaru',
'mapped' => false ))
->add('mu')
->add('unit_price')
->add('sum_total')
......
......@@ -22,11 +22,11 @@
</thead>
<tbody>
</table>
{% endfor %}
{% endif %}
<div class="panel-heading"><h3>Položky objednávky <a href="{{ path("addOrderItem") }}" class="btn btn-sm btn-danger"><span class="fas"></span>Pridať novú položku</a> </h3></div>
<div class="panel-heading"><h3>Položky objednávky <a href="{{ path("addOrderItem" , {'id': order.id }) }}" class="btn btn-sm btn-danger"><span class="fas"></span>Pridať novú položku</a> </h3></div>
{% endfor %}
{% endif %}
<table class="table table-striped table-hover table-light" >
<thead>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment