From aafc1a234db92295bd593af4cce2d97ce07d837b Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Mon, 9 Dec 2024 13:14:40 +0100 Subject: [PATCH 1/6] Add sylius/paypal-plugin:1.7 recipe --- .../1.7/config/packages/sylius_paypal.yaml | 2 ++ .../1.7/config/routes/sylius_paypal.yaml | 12 ++++++++++++ sylius/paypal-plugin/1.7/manifest.json | 8 ++++++++ 3 files changed, 22 insertions(+) create mode 100644 sylius/paypal-plugin/1.7/config/packages/sylius_paypal.yaml create mode 100644 sylius/paypal-plugin/1.7/config/routes/sylius_paypal.yaml create mode 100644 sylius/paypal-plugin/1.7/manifest.json 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%/" + } +} From 03b59f275a38bab4f33681227a5efe1a779d4795 Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Mon, 9 Dec 2024 13:14:52 +0100 Subject: [PATCH 2/6] Revert "Remove sylius/refund-plugin:0.4 recipe" This reverts commit 4870325478a543dc44324170e601a63b2856e742. --- .../refund-plugin/0.4/config/packages/sylius_refund.yaml | 2 ++ sylius/refund-plugin/0.4/config/routes/sylius_refund.yaml | 2 ++ sylius/refund-plugin/0.4/manifest.json | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 100644 sylius/refund-plugin/0.4/config/packages/sylius_refund.yaml create mode 100644 sylius/refund-plugin/0.4/config/routes/sylius_refund.yaml create mode 100644 sylius/refund-plugin/0.4/manifest.json 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/0.4/manifest.json b/sylius/refund-plugin/0.4/manifest.json new file mode 100644 index 000000000..87516c747 --- /dev/null +++ b/sylius/refund-plugin/0.4/manifest.json @@ -0,0 +1,8 @@ +{ + "bundles": { + "Sylius\\RefundPlugin\\SyliusRefundPlugin": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From 28f764b3f2be66874d88efc9721c1b8ff4dab2a5 Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Wed, 11 Dec 2024 03:54:01 +0100 Subject: [PATCH 3/6] Correct sylius/invoicing-plugin:1.0 recipe --- .../1.0/config/routes/sylius_invoicing.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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" From 1d9cdadf5d5eedd2fefec9cf0dba223bb1387069 Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Wed, 11 Dec 2024 13:16:44 +0100 Subject: [PATCH 4/6] Correct sylius/paypal 2.0gs recipe --- .../2.0/config/packages/sylius_paypal.yaml | 14 +------------- .../2.0/config/routes/sylius_paypal.yaml | 14 ++------------ sylius/paypal-plugin/2.0/manifest.json | 13 +++++++++++-- 3 files changed, 14 insertions(+), 27 deletions(-) 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" + } + ] } From b38d6c2e55dc755ac15fce85a0eb926726135284 Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Wed, 11 Dec 2024 03:59:19 +0100 Subject: [PATCH 5/6] Correct sylius/refund-plugin:2.0 recipe --- .../2.0/config/routes/sylius_refund.yaml | 11 ++--------- sylius/refund-plugin/2.0/manifest.json | 10 +++++++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml b/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml index fc790e935..e7ea95e41 100644 --- a/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml +++ b/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml @@ -1,9 +1,2 @@ -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})?$ +sylius_refund: + resource: "@SyliusRefundPlugin/config/routes.yaml" diff --git a/sylius/refund-plugin/2.0/manifest.json b/sylius/refund-plugin/2.0/manifest.json index 87516c747..74d5366ff 100644 --- a/sylius/refund-plugin/2.0/manifest.json +++ b/sylius/refund-plugin/2.0/manifest.json @@ -4,5 +4,13 @@ }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" - } + }, + "add-lines": [ + { + "file": "assets/admin/entrypoint.js", + "content": "import '../../vendor/sylius/refund-plugin/assets/entrypoint';", + "position": "bottom", + "warn_if_missing": true + } + ] } From e41ef1b59a8b3a7cf4b61984fcd92593a91c1e1d Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Wed, 11 Dec 2024 20:46:10 +0100 Subject: [PATCH 6/6] Remove sylius/refund-plugin:2.0 recipe --- .../2.0/config/packages/sylius_refund.yaml | 2 -- .../2.0/config/routes/sylius_refund.yaml | 2 -- sylius/refund-plugin/2.0/manifest.json | 16 ---------------- 3 files changed, 20 deletions(-) delete mode 100644 sylius/refund-plugin/2.0/config/packages/sylius_refund.yaml delete mode 100644 sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml delete mode 100644 sylius/refund-plugin/2.0/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 e7ea95e41..000000000 --- a/sylius/refund-plugin/2.0/config/routes/sylius_refund.yaml +++ /dev/null @@ -1,2 +0,0 @@ -sylius_refund: - resource: "@SyliusRefundPlugin/config/routes.yaml" diff --git a/sylius/refund-plugin/2.0/manifest.json b/sylius/refund-plugin/2.0/manifest.json deleted file mode 100644 index 74d5366ff..000000000 --- a/sylius/refund-plugin/2.0/manifest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "bundles": { - "Sylius\\RefundPlugin\\SyliusRefundPlugin": ["all"] - }, - "copy-from-recipe": { - "config/": "%CONFIG_DIR%/" - }, - "add-lines": [ - { - "file": "assets/admin/entrypoint.js", - "content": "import '../../vendor/sylius/refund-plugin/assets/entrypoint';", - "position": "bottom", - "warn_if_missing": true - } - ] -}