diff --git a/sylius/invoicing-plugin/1.0/config/routes/sylius_invoicing.yaml b/sylius/invoicing-plugin/1.0/config/routes/sylius_invoicing.yaml index 44b42e1c7..912e9ac34 100644 --- a/sylius/invoicing-plugin/1.0/config/routes/sylius_invoicing.yaml +++ b/sylius/invoicing-plugin/1.0/config/routes/sylius_invoicing.yaml @@ -1,9 +1,2 @@ -sylius_invoicing_admin: - resource: "@SyliusInvoicingPlugin/config/admin_routes.yaml" - prefix: /admin - -sylius_invoicing_shop: - resource: "@SyliusInvoicingPlugin/config/shop_routes.yaml" - prefix: /{_locale} - requirements: - _locale: ^[a-z]{2}(?:_[A-Z]{2})?$ +sylius_invoicing: + resource: "@SyliusInvoicingPlugin/config/routes.yaml" diff --git a/sylius/paypal-plugin/1.7/config/packages/sylius_paypal.yaml b/sylius/paypal-plugin/1.7/config/packages/sylius_paypal.yaml new file mode 100644 index 000000000..c9d4372e3 --- /dev/null +++ b/sylius/paypal-plugin/1.7/config/packages/sylius_paypal.yaml @@ -0,0 +1,2 @@ +imports: + - { resource: "@SyliusPayPalPlugin/Resources/config/config.yaml" } diff --git a/sylius/paypal-plugin/1.7/config/routes/sylius_paypal.yaml b/sylius/paypal-plugin/1.7/config/routes/sylius_paypal.yaml new file mode 100644 index 000000000..910424469 --- /dev/null +++ b/sylius/paypal-plugin/1.7/config/routes/sylius_paypal.yaml @@ -0,0 +1,12 @@ +sylius_paypal_admin: + resource: "@SyliusPayPalPlugin/Resources/config/admin_routing.yml" + prefix: /%sylius_admin.path_name% + +sylius_paypal_shop: + resource: "@SyliusPayPalPlugin/Resources/config/shop_routing.yaml" + prefix: /{_locale} + requirements: + _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$ + +sylius_paypal_webhook: + resource: "@SyliusPayPalPlugin/Resources/config/webhook_routing.yaml" diff --git a/sylius/paypal-plugin/1.7/manifest.json b/sylius/paypal-plugin/1.7/manifest.json new file mode 100644 index 000000000..a991d8822 --- /dev/null +++ b/sylius/paypal-plugin/1.7/manifest.json @@ -0,0 +1,8 @@ +{ + "bundles": { + "Sylius\\PayPalPlugin\\SyliusPayPalPlugin": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} diff --git a/sylius/paypal-plugin/2.0/config/packages/sylius_paypal.yaml b/sylius/paypal-plugin/2.0/config/packages/sylius_paypal.yaml index e929f502e..9a0676b01 100644 --- a/sylius/paypal-plugin/2.0/config/packages/sylius_paypal.yaml +++ b/sylius/paypal-plugin/2.0/config/packages/sylius_paypal.yaml @@ -1,14 +1,2 @@ imports: - - { resource: "@SyliusInvoicingPlugin/config/config.yaml" } - -fos_rest: - exception: true - view: - formats: - json: true - xml: true - empty_content: 204 - format_listener: - rules: - - { path: '^/api/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true } - - { path: '^/', stop: true } + - { resource: "@SyliusPayPalPlugin/config/config.yaml" } diff --git a/sylius/paypal-plugin/2.0/config/routes/sylius_paypal.yaml b/sylius/paypal-plugin/2.0/config/routes/sylius_paypal.yaml index 002c573e6..a531c2f61 100644 --- a/sylius/paypal-plugin/2.0/config/routes/sylius_paypal.yaml +++ b/sylius/paypal-plugin/2.0/config/routes/sylius_paypal.yaml @@ -1,12 +1,2 @@ -sylius_paypal_admin: - resource: "@SyliusPayPalPlugin/config/admin_routes.yaml" - prefix: /admin - -sylius_paypal_shop: - resource: "@SyliusPayPalPlugin/config/shop_routes.yaml" - prefix: /{_locale} - requirements: - _locale: ^[a-z]{2}(?:_[A-Z]{2})?$ - -sylius_paypal_plugin_webhook_refund_order: - resource: "@SyliusPayPalPlugin/config/webhook_routes.yaml" +sylius_paypal: + resource: "@SyliusPayPalPlugin/config/routes.yaml" diff --git a/sylius/paypal-plugin/2.0/manifest.json b/sylius/paypal-plugin/2.0/manifest.json index 1749ec675..271c34fdf 100644 --- a/sylius/paypal-plugin/2.0/manifest.json +++ b/sylius/paypal-plugin/2.0/manifest.json @@ -1,8 +1,17 @@ { "bundles": { - "Sylius\\InvoicingPlugin\\SyliusInvoicingPlugin": ["all"] + "Sylius\\PayPalPlugin\\SyliusPayPalPlugin": ["all"] }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" - } + }, + "add-lines": [ + { + "file": "config/packages/fos_rest.yaml", + "position": "after_target", + "warn_if_missing": true, + "target": "fos_rest:", + "content": " ###> sylius/paypal-plugin ###\n exception: true\n view:\n formats:\n json: true\n xml: true\n empty_content: 204\n format_listener:\n rules:\n - { path: '^/api/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }\n - { path: '^/', stop: true }\n ###< sylius/paypal-plugin ###\n" + } + ] } diff --git a/sylius/refund-plugin/0.4/config/packages/sylius_refund.yaml b/sylius/refund-plugin/0.4/config/packages/sylius_refund.yaml new file mode 100644 index 000000000..ce7ff8aee --- /dev/null +++ b/sylius/refund-plugin/0.4/config/packages/sylius_refund.yaml @@ -0,0 +1,2 @@ +imports: + - { resource: "@SyliusRefundPlugin/Resources/config/app/config.yml" } diff --git a/sylius/refund-plugin/0.4/config/routes/sylius_refund.yaml b/sylius/refund-plugin/0.4/config/routes/sylius_refund.yaml new file mode 100644 index 000000000..46e99b160 --- /dev/null +++ b/sylius/refund-plugin/0.4/config/routes/sylius_refund.yaml @@ -0,0 +1,2 @@ +sylius_refund: + resource: "@SyliusRefundPlugin/Resources/config/routing.yml" diff --git a/sylius/refund-plugin/2.0/manifest.json b/sylius/refund-plugin/0.4/manifest.json similarity index 100% rename from sylius/refund-plugin/2.0/manifest.json rename to sylius/refund-plugin/0.4/manifest.json diff --git a/sylius/refund-plugin/2.0/config/packages/sylius_refund.yaml b/sylius/refund-plugin/2.0/config/packages/sylius_refund.yaml deleted file mode 100644 index 5107d4fb1..000000000 --- a/sylius/refund-plugin/2.0/config/packages/sylius_refund.yaml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: "@SyliusRefundPlugin/config/config.yaml" } diff --git a/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml b/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml deleted file mode 100644 index fc790e935..000000000 --- a/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml +++ /dev/null @@ -1,9 +0,0 @@ -sylius_refund_admin: - resource: "@SyliusRefundPlugin/config/admin_routes.yaml" - prefix: '/%sylius_admin.path_name%' - -sylius_refund_shop: - resource: "@SyliusRefundPlugin/config/shop_routes.yaml" - prefix: /{_locale} - requirements: - _locale: ^[a-z]{2}(?:_[A-Z]{2})?$