diff --git a/src/Resources/config/app/routing.yml b/src/Resources/config/app/routing.yml index 8f3ca1a1..3a927626 100644 --- a/src/Resources/config/app/routing.yml +++ b/src/Resources/config/app/routing.yml @@ -1,98 +1,7 @@ -sylius_admin_order_creation_select_order_customer: - path: /admin/orders/new/select-customer - methods: [GET] - defaults: - _controller: Sylius\AdminOrderCreationPlugin\Controller\SelectNewOrderCustomerAction -sylius_admin_order_creation_customer_create: - path: /admin/orders/new/customer/{customerEmail}/{channelCode} - methods: [GET] - options: - expose: true - defaults: - _controller: Sylius\AdminOrderCreationPlugin\Controller\CustomerCreationAction - -sylius_admin_order_creation_order_create: - path: /admin/orders/new/{customerId}/{channelCode} - methods: [GET] - options: - expose: true - defaults: - _controller: sylius.controller.order::createAction - _sylius: - event: admin_create - section: admin - permission: true - template: '@SyliusAdminOrderCreationPlugin/Order/create.html.twig' - form: - type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType - factory: - method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createForCustomerAndChannel'] - arguments: [$customerId, $channelCode] - requirements: - customerId: \d+ - -sylius_admin_order_creation_order_preview: - path: /admin/orders/new/{customerId}/{channelCode}/preview - methods: [POST] - defaults: - _controller: Sylius\AdminOrderCreationPlugin\Controller\OrderPreviewAction - _sylius: - form: - type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType - factory: - method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createForCustomerAndChannel'] - arguments: [$customerId, $channelCode] - -sylius_admin_order_creation_order_create_from_preview: - path: /admin/orders/new/{customerId}/{channelCode}/create-from-preview - methods: [POST] - options: - expose: true - defaults: - _controller: sylius.controller.order::createAction - _sylius: - event: admin_create - section: admin - permission: true - template: '@SyliusAdminOrderCreationPlugin/Order/preview.html.twig' - form: - type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType - factory: - method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createForCustomerAndChannel'] - arguments: [$customerId, $channelCode] - -sylius_admin_order_creation_order_create_back: - path: /admin/orders/edit/{customerId}/{channelCode} - methods: [POST] - options: - expose: true - defaults: - _controller: Sylius\AdminOrderCreationPlugin\Controller\OrderCreateAction - requirements: - customerId: \d+ - -sylius_admin_order_creation_reorder: - path: /admin/orders/{id}/reorder - methods: [GET] - options: - expose: true - defaults: - _controller: sylius.controller.order::createAction - _sylius: - event: admin_create - section: admin - permission: true - template: '@SyliusAdminOrderCreationPlugin/Order/create.html.twig' - form: - type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType - factory: - method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createFromExistingOrder'] - arguments: ["expr:service('sylius.repository.order').find($id)"] - -sylius_admin_order_creation_ajax: - prefix: admin/ajax - resource: "@SyliusAdminOrderCreationPlugin/Resources/config/app/ajax.yml" +sylius_admin_order_creation: + prefix: "/%sylius_admin.path_name%" + resource: "@SyliusAdminOrderCreationPlugin/Resources/config/app/routing/admin.yml" fos_js_routing: resource: "@FOSJsRoutingBundle/Resources/config/routing/routing-sf4.xml" diff --git a/src/Resources/config/app/routing/admin.yml b/src/Resources/config/app/routing/admin.yml new file mode 100644 index 00000000..d38b6a2b --- /dev/null +++ b/src/Resources/config/app/routing/admin.yml @@ -0,0 +1,95 @@ +sylius_admin_order_creation_select_order_customer: + path: /orders/new/select-customer + methods: [GET] + defaults: + _controller: Sylius\AdminOrderCreationPlugin\Controller\SelectNewOrderCustomerAction + +sylius_admin_order_creation_customer_create: + path: /orders/new/customer/{customerEmail}/{channelCode} + methods: [GET] + options: + expose: true + defaults: + _controller: Sylius\AdminOrderCreationPlugin\Controller\CustomerCreationAction + +sylius_admin_order_creation_order_create: + path: /orders/new/{customerId}/{channelCode} + methods: [GET] + options: + expose: true + defaults: + _controller: sylius.controller.order::createAction + _sylius: + event: admin_create + section: admin + permission: true + template: '@SyliusAdminOrderCreationPlugin/Order/create.html.twig' + form: + type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType + factory: + method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createForCustomerAndChannel'] + arguments: [$customerId, $channelCode] + requirements: + customerId: \d+ + +sylius_admin_order_creation_order_preview: + path: /orders/new/{customerId}/{channelCode}/preview + methods: [POST] + defaults: + _controller: Sylius\AdminOrderCreationPlugin\Controller\OrderPreviewAction + _sylius: + form: + type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType + factory: + method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createForCustomerAndChannel'] + arguments: [$customerId, $channelCode] + +sylius_admin_order_creation_order_create_from_preview: + path: /orders/new/{customerId}/{channelCode}/create-from-preview + methods: [POST] + options: + expose: true + defaults: + _controller: sylius.controller.order::createAction + _sylius: + event: admin_create + section: admin + permission: true + template: '@SyliusAdminOrderCreationPlugin/Order/preview.html.twig' + form: + type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType + factory: + method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createForCustomerAndChannel'] + arguments: [$customerId, $channelCode] + +sylius_admin_order_creation_order_create_back: + path: /orders/edit/{customerId}/{channelCode} + methods: [POST] + options: + expose: true + defaults: + _controller: Sylius\AdminOrderCreationPlugin\Controller\OrderCreateAction + requirements: + customerId: \d+ + +sylius_admin_order_creation_reorder: + path: /orders/{id}/reorder + methods: [GET] + options: + expose: true + defaults: + _controller: sylius.controller.order::createAction + _sylius: + event: admin_create + section: admin + permission: true + template: '@SyliusAdminOrderCreationPlugin/Order/create.html.twig' + form: + type: Sylius\AdminOrderCreationPlugin\Form\Type\NewOrderType + factory: + method: ['expr:service("Sylius\\AdminOrderCreationPlugin\\Factory\\OrderFactory")', 'createFromExistingOrder'] + arguments: ["expr:service('sylius.repository.order').find($id)"] + +sylius_admin_order_creation_ajax: + prefix: "/ajax" + resource: "@SyliusAdminOrderCreationPlugin/Resources/config/app/routing/admin_ajax.yml" diff --git a/src/Resources/config/app/ajax.yml b/src/Resources/config/app/routing/admin_ajax.yml similarity index 95% rename from src/Resources/config/app/ajax.yml rename to src/Resources/config/app/routing/admin_ajax.yml index 49fd825b..1904b287 100644 --- a/src/Resources/config/app/ajax.yml +++ b/src/Resources/config/app/routing/admin_ajax.yml @@ -52,7 +52,7 @@ sylius_admin_order_creation_ajax_product_variant_by_codes: arguments: $code sylius_admin_order_creation_ajax_provide_available_shipping_methods: - path: /admin/orders/available-shipping-methods/{customerId}/{channelCode}/{shipmentNumber} + path: /orders/available-shipping-methods/{customerId}/{channelCode}/{shipmentNumber} methods: [GET] defaults: _controller: Sylius\AdminOrderCreationPlugin\Controller\ProvideAvailableShippingMethodsAction