From 0a169fffc58450e76c86d55b079f1a74f21d0eaa Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 9 Mar 2019 23:21:29 +0100 Subject: [PATCH] Make app,localization in url optional+tld+subdomain --- Admin/Install/Navigation.install.json | 24 ++++++++++++------------ Admin/Routes/Web/Backend.php | 8 ++++---- info.json | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index b4d3f40..d250d2e 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1005104001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Billing", - "uri": "{/lang}/backend/sales/invoice/list?{?}", + "uri": "{/prefix}sales/invoice/list?{?}", "target": "self", "icon": null, "order": 5, @@ -15,11 +15,11 @@ "children": [ { "id": 1005104101, - "pid": "/backend/sales/invoice", + "pid": "/sales/invoice", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/sales/invoice/list?{?}", + "uri": "{/prefix}sales/invoice/list?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1005104301, - "pid": "/backend/sales/invoice", + "pid": "/sales/invoice", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/sales/invoice/create?{?}", + "uri": "{/prefix}sales/invoice/create?{?}", "target": "self", "icon": null, "order": 5, @@ -47,11 +47,11 @@ }, { "id": 1005105001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Invoice", - "uri": "{/lang}/backend/purchase/invoice/list?{?}", + "uri": "{/prefix}purchase/invoice/list?{?}", "target": "self", "icon": null, "order": 5, @@ -61,11 +61,11 @@ "children": [ { "id": 1005105101, - "pid": "/backend/purchase/invoice", + "pid": "/purchase/invoice", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/purchase/invoice/list?{?}", + "uri": "{/prefix}purchase/invoice/list?{?}", "target": "self", "icon": null, "order": 1, @@ -76,11 +76,11 @@ }, { "id": 1005105301, - "pid": "/backend/purchase/invoice", + "pid": "/purchase/invoice", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/purchase/invoice/create?{?}", + "uri": "{/prefix}purchase/invoice/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index a5a89ac..83f7a18 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/backend/sales/invoice/create.*$' => [ + '^.*/sales/invoice/create.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingInvoiceCreate', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/sales/invoice/list.*$' => [ + '^.*/sales/invoice/list.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingInvoiceList', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/purchase/invoice/create.*$' => [ + '^.*/purchase/invoice/create.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingPurchaseInvoiceCreate', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/purchase/invoice/list.*$' => [ + '^.*/purchase/invoice/list.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingPurchaInvoiceList', 'verb' => RouteVerb::GET, diff --git a/info.json b/info.json index c4983e2..06dc5ef 100644 --- a/info.json +++ b/info.json @@ -27,8 +27,8 @@ "load": [ { "pid": [ - "/backend/sales/billing", - "/backend/purchase/billing" + "/sales/billing", + "/purchase/billing" ], "type": 4, "for": 0, @@ -37,7 +37,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Billing",