Skip to content

Commit

Permalink
Merge pull request #314 from Wojdylak/SYL-4163-sylius-demo
Browse files Browse the repository at this point in the history
[Maintenance] Add sylius/paypal-plugin
  • Loading branch information
GSadee authored Nov 27, 2024
2 parents eda1dde + fc0aea6 commit 6be3fc2
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 13 deletions.
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@
}
],
"require": {
"bugsnag/bugsnag-symfony": "^1.7",
"nyholm/psr7": "^1.8",
"php": "^8.2",
"sylius/sylius": "2.0.x-dev",
"symfony/flex": "^2.4",
"sylius/invoicing-plugin": "2.0.x-dev",
"bugsnag/bugsnag-symfony": "^1.7",
"nyholm/psr7": "^1.8"
"sylius/paypal-plugin": "2.0.x-dev",
"sylius/sylius": "2.0.x-dev",
"symfony/flex": "^2.4"
},
"require-dev": {
"behat/behat": "^3.14",
Expand Down
2 changes: 2 additions & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,6 @@
Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true],
Sylius\TwigExtra\Symfony\SyliusTwigExtraBundle::class => ['all' => true],
FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true],
FOS\RestBundle\FOSRestBundle::class => ['all' => true],
Sylius\PayPalPlugin\SyliusPayPalPlugin::class => ['all' => true],
];
1 change: 1 addition & 0 deletions config/packages/_sylius.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ imports:
- { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
- { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
- { resource: "@SyliusPayumBundle/Resources/config/app/config.yaml" }
- { resource: "@SyliusPayPalPlugin/config/config.yaml" }

parameters:
fixtures_dir: "%kernel.project_dir%/src/Resources/fixtures"
Expand Down
11 changes: 11 additions & 0 deletions config/packages/fos_rest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
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 }
3 changes: 2 additions & 1 deletion config/routes.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

sylius_paypal_webhook:
resource: "@SyliusPayPalPlugin/config/webhook_routing.yaml"
6 changes: 3 additions & 3 deletions config/routes/sylius_admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ sylius_admin:
resource: "@SyliusAdminBundle/Resources/config/routing.yml"
prefix: /admin

#sylius_paypal_admin:
# resource: "@SyliusPayPalPlugin/Resources/config/admin_routing.yml"
# prefix: /admin
sylius_paypal_admin:
resource: "@SyliusPayPalPlugin/config/admin_routing.yml"
prefix: '/%sylius_admin.path_name%'
10 changes: 5 additions & 5 deletions config/routes/sylius_shop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ sylius_shop_payum:
sylius_payment_notify:
resource: "@SyliusPaymentBundle/Resources/config/routing/integrations/sylius.yaml"

#sylius_paypal:
# 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_shop:
resource: "@SyliusPayPalPlugin/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}))?$
15 changes: 15 additions & 0 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,18 @@
"friendsofphp/proxy-manager-lts": {
"version": "v1.0.12"
},
"friendsofsymfony/rest-bundle": {
"version": "3.7",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
"branch": "main",
"version": "3.0",
"ref": "3762cc4e4f2d6faabeca5a151b41c8c791bd96e5"
},
"files": [
"config/packages/fos_rest.yaml"
]
},
"gedmo/doctrine-extensions": {
"version": "v2.4.36"
},
Expand Down Expand Up @@ -531,6 +543,9 @@
"sylius/mailer-bundle": {
"version": "v1.7.1"
},
"sylius/paypal-plugin": {
"version": "2.0.x-dev"
},
"sylius/registry": {
"version": "v1.4.1"
},
Expand Down

0 comments on commit 6be3fc2

Please sign in to comment.