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

Fixed some integration issues.

Browse source
This commit is contained in:
Mateusz Zalewski 2015-02-02 16:51:12 +01:00
parent 6cd5b7f9a7
commit dcfe7754c4
6 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
behat.yml.dist
View file

@ -217,6 +217,7 @@ default:
contexts:
- Sylius\Bundle\ReportBundle\Behat\ReportContext
- Behat\MinkExtension\Context\MinkContext
- Sylius\Bundle\CoreBundle\Behat\HookContext
- Sylius\Bundle\AddressingBundle\Behat\AddressingContext
- Sylius\Bundle\CoreBundle\Behat\CoreContext
- Sylius\Bundle\PaymentBundle\Behat\PaymentContext

3
src/Sylius/Bundle/ReportBundle/Resources/config/doctrine/model/Report.orm.xml
View file

@ -28,9 +28,6 @@
<field name="dataFetcher" column="data_fetcher" type="string" nullable="false" />
<field name="dataFetcherConfiguration" column="data_fetcher_configuration" type="array" />
<field name="renderer" column="renderer" type="string" nullable="false" />
<field name="rendererConfiguration" column="renderer_configuration" type="array" />
</mapped-superclass>
</doctrine-mapping>

11
src/Sylius/Bundle/ReportBundle/Resources/config/services.xml
View file

@ -15,6 +15,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="sylius.registry.report.class">Sylius\Component\Registry\ServiceRegistry</parameter>
@ -28,7 +29,6 @@
<parameter key="sylius.form.type.data_fetcher.number_of_orders.class">Sylius\Bundle\ReportBundle\Form\Type\DataFetcher\NumberOfOrdersType</parameter>
<parameter key="sylius.form.type.data_fetcher.sales_total.class">Sylius\Bundle\ReportBundle\Form\Type\DataFetcher\SalesTotalType</parameter>
<parameter key="sylius.form.type.data_fetcher.user_registration.class">Sylius\Bundle\ReportBundle\Form\Type\DataFetcher\UserRegistrationType</parameter>
<parameter key="sylius.form.type.data_fetcher.sales_total.class">Sylius\Bundle\ReportBundle\Form\Type\SalesTotalType</parameter>
<parameter key="sylius.form.type.data_fetcher_choice.class">Sylius\Bundle\ReportBundle\Form\Type\DataFetcher\DataFetcherChoiceType</parameter>
<parameter key="sylius.report.data_fetcher.class">Sylius\Component\Report\DataFetcher\DelegatingDataFetcher</parameter>
</parameters>
@ -41,19 +41,12 @@
<service id="sylius.report.renderer" class="%sylius.report.renderer.class%">
<argument type="service" id="sylius.registry.report.renderer" />
</service>
<service id="sylius.form.type.renderer_choice" class="%sylius.form.type.renderer_choice.class%">
<argument>%sylius.report.renderers%</argument>
<tag name="form.type" alias="sylius_renderer_choice" />
</service>
<service id="sylius.form.type.data_fetcher.user_registration" class="%sylius.form.type.data_fetcher.user_registration.class%">
<tag name="form.type" alias="sylius_data_fetcher_user_registration" />
</service>
<service id="sylius.data_fetcher.user_registration" class="%sylius.data_fetcher.user_registration.class%">
<argument type="service" id="sylius.repository.user" />
<tag name="sylius.report.data_fetcher" fetcher="user_registration" label="User registration" />
</service>
<service id="sylius.form.type.renderer.table" class="%sylius.form.type.renderer.table.class%">
<argument type="service" id="templating" />
<tag name="sylius.report.renderer" renderer="table" label="Table renderer" />

4
src/Sylius/Bundle/ReportBundle/SyliusReportBundle.php
View file

@ -11,7 +11,7 @@
namespace Sylius\Bundle\ReportBundle;
use Sylius\Bundle\TranslationBundle\AbstractTranslationBundle;
use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
use Sylius\Bundle\ReportBundle\DependencyInjection\Compiler\RegisterRenderersPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@ -25,7 +25,7 @@ use Sylius\Bundle\ReportBundle\DependencyInjection\Compiler\RegisterDataFetcherP
*
* @author Paweł Jędrzejewski <pawel@sylius.org>
*/
class SyliusReportBundle extends AbstractTranslationBundle
class SyliusReportBundle extends AbstractResourceBundle
{
/**
* {@inheritdoc}

2
src/Sylius/Bundle/WebBundle/Resources/views/Backend/Report/_forms.html.twig
View file

@ -1,4 +1,4 @@
{% extends 'SyliusWebBundle::forms.html.twig' %}
{% extends 'SyliusWebBundle:Common:forms.html.twig' %}
{% block _sylius_report_categoryRequirement_row %}
<div class="form-group">

2
src/Sylius/Component/Report/Model/Report.php
View file

@ -183,6 +183,7 @@ class Report implements ReportInterface
public function setDataFetcher($dataFetcher)
{
$this->dataFetcher = $dataFetcher;
}
/**
* Gets the Renderer name.
@ -228,6 +229,7 @@ class Report implements ReportInterface
public function setDataFetcherConfiguration(array $dataFetcherConfiguration)
{
$this->dataFetcherConfiguration = $dataFetcherConfiguration;
}
/**
* Gets the Renderers configuration.