kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Scenario fixes

Browse source
This commit is contained in:
Paweł Jędrzejewski 2015-05-21 22:29:19 +02:00
parent c01bb1d59d
commit 5f52f3aa40
5 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
behat.yml.dist
View file

@ -407,6 +407,7 @@ default:
- Sylius\Bundle\ResourceBundle\Behat\BaseContext
- Sylius\Bundle\WebBundle\Behat\WebContext
- Sylius\Bundle\MailerBundle\Behat\MailerContext
- Sylius\Bundle\ChannelBundle\Behat\ChannelContext
filters:
tags: "@emails && ~@javascript"
security:

1
features/reports/reports.feature
View file

@ -10,6 +10,7 @@ Feature: Reports
| TableReport | Lorem ipsum | table_report | table | Template:SyliusReportBundle:Table:default.html.twig | user_registration | Period:day,Start:2010-01-01,End:2010-04-01 |
| BarChartReport | Lorem ipsum | bar_chart_report | chart | Type:bar,Template:SyliusReportBundle:Chart:default.html.twig | user_registration | Period:month,Start:2010-01-01,End:2010-04-01 |
And there is default currency configured
And there is default channel configured
And there are following users:
| email | enabled | created at |
| beth@foo.com | yes | 2010-01-02 12:00:00 |

2
src/Sylius/Bundle/ChannelBundle/DependencyInjection/Configuration.php
View file

@ -90,7 +90,7 @@ class Configuration implements ConfigurationInterface
->addDefaultsIfNotSet()
->children()
->scalarNode('default')->defaultValue('Sylius\Bundle\ChannelBundle\Form\Type\ChannelType')->end()
->scalarNode('choice')->end()
->scalarNode('choice')->defaultValue('%sylius.form.type.resource_choice.class%')->end()
->end()
->end()
->end()

2
src/Sylius/Bundle/ChannelBundle/DependencyInjection/SyliusChannelExtension.php
View file

@ -26,6 +26,6 @@ class SyliusChannelExtension extends AbstractResourceExtension
*/
public function load(array $config, ContainerBuilder $container)
{
$this->configure($config, new Configuration(), $container, self::CONFIGURE_LOADER | self::CONFIGURE_DATABASE | self::CONFIGURE_PARAMETERS | self::CONFIGURE_VALIDATORS);
$this->configure($config, new Configuration(), $container, self::CONFIGURE_LOADER | self::CONFIGURE_DATABASE | self::CONFIGURE_PARAMETERS | self::CONFIGURE_VALIDATORS | self::CONFIGURE_FORMS);
}
}

2
src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/ShipmentType.php
View file

@ -43,7 +43,7 @@ class ShipmentType extends AbstractType
$criteria = $options['criteria'];
$channel = $options['channel'];
$notBlank = new NotBlank();
$notBlank = new NotBlank(array('groups' => array('sylius')));
$notBlank->message = $this->translator->trans('sylius.checkout.shipping_method.not_blank');
$builder