diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 8bf7b5c..5593ac9 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1004805001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Articles", - "uri": "{/lang}/backend/sales/item/list?{?}", + "uri": "{/prefix}sales/item/list?{?}", "target": "self", "icon": null, "order": 10, @@ -15,11 +15,11 @@ "children": [ { "id": 1004805101, - "pid": "/backend/sales/item", + "pid": "/sales/item", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/sales/item/list?{?}", + "uri": "{/prefix}sales/item/list?{?}", "target": "self", "icon": null, "order": 1, @@ -29,11 +29,11 @@ "children": [ { "id": 1004805301, - "pid": "/backend/sales/item", + "pid": "/sales/item", "type": 3, "subtype": 1, "name": "Article", - "uri": "{/lang}/backend/sales/item/single?{?}", + "uri": "{/prefix}sales/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -46,11 +46,11 @@ }, { "id": 1004805201, - "pid": "/backend/sales/item", + "pid": "/sales/item", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/sales/item/create?{?}", + "uri": "{/prefix}sales/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -63,11 +63,11 @@ }, { "id": 1004806001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Articles", - "uri": "{/lang}/backend/purchase/item/list?{?}", + "uri": "{/prefix}purchase/item/list?{?}", "target": "self", "icon": null, "order": 10, @@ -77,11 +77,11 @@ "children": [ { "id": 1004806101, - "pid": "/backend/purchase/item", + "pid": "/purchase/item", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/purchase/item/list?{?}", + "uri": "{/prefix}purchase/item/list?{?}", "target": "self", "icon": null, "order": 1, @@ -91,11 +91,11 @@ "children": [ { "id": 1004806301, - "pid": "/backend/purchase/item", + "pid": "/purchase/item", "type": 3, "subtype": 1, "name": "Article", - "uri": "{/lang}/backend/purchase/item/single?{?}", + "uri": "{/prefix}purchase/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -108,11 +108,11 @@ }, { "id": 1004806201, - "pid": "/backend/purchase/item", + "pid": "/purchase/item", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/purchase/item/create?{?}", + "uri": "{/prefix}purchase/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -125,11 +125,11 @@ }, { "id": 1004807001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Stock", - "uri": "{/lang}/backend/warehouse/stock/list?{?}", + "uri": "{/prefix}warehouse/stock/list?{?}", "target": "self", "icon": null, "order": 10, @@ -139,11 +139,11 @@ "children": [ { "id": 1004807101, - "pid": "/backend/warehouse/stock", + "pid": "/warehouse/stock", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/warehouse/stock/list?{?}", + "uri": "{/prefix}warehouse/stock/list?{?}", "target": "self", "icon": null, "order": 1, @@ -153,11 +153,11 @@ "children": [ { "id": 1004807301, - "pid": "/backend/warehouse/stock", + "pid": "/warehouse/stock", "type": 3, "subtype": 1, "name": "Article", - "uri": "{/lang}/backend/warehouse/stock/single?{?}", + "uri": "{/prefix}warehouse/stock/single?{?}", "target": "self", "icon": null, "order": 1, @@ -170,11 +170,11 @@ }, { "id": 1004807201, - "pid": "/backend/warehouse/stock", + "pid": "/warehouse/stock", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/warehouse/stock/create?{?}", + "uri": "{/prefix}warehouse/stock/create?{?}", "target": "self", "icon": null, "order": 5, @@ -187,11 +187,11 @@ }, { "id": 1004808001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Articles", - "uri": "{/lang}/backend/production/item/list?{?}", + "uri": "{/prefix}production/item/list?{?}", "target": "self", "icon": null, "order": 5, @@ -205,7 +205,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/production/item/list?{?}", + "uri": "{/prefix}production/item/list?{?}", "target": "self", "icon": null, "order": 1, @@ -219,7 +219,7 @@ "type": 3, "subtype": 1, "name": "Article", - "uri": "{/lang}/backend/production/item/single?{?}", + "uri": "{/prefix}production/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -236,7 +236,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/production/item/create?{?}", + "uri": "{/prefix}production/item/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 6f3454b..2600995 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/item/list.*$' => [ + '^.*/sales/item/list.*$' => [ [ 'dest' => '\Modules\ItemManagement\Controller\BackendController:viewItemManagementSalesList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/purchase/item/list.*$' => [ + '^.*/purchase/item/list.*$' => [ [ 'dest' => '\Modules\ItemManagement\Controller\BackendController:viewItemManagementPurchaseList', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/warehouse/stock/list.*$' => [ + '^.*/warehouse/stock/list.*$' => [ [ 'dest' => '\Modules\ItemManagement\Controller\BackendController:viewItemManagementWarehousingList', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/sales/item/create.*$' => [ + '^.*/sales/item/create.*$' => [ [ 'dest' => '\Modules\ItemManagement\Controller\BackendController:viewItemManagementSalesCreate', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/purchase/item/create.*$' => [ + '^.*/purchase/item/create.*$' => [ [ 'dest' => '\Modules\ItemManagement\Controller\BackendController:viewItemManagementPurchaseCreate', 'verb' => RouteVerb::GET, @@ -61,7 +61,7 @@ return [ ], ], ], - '.*/backend/warehouse/stock/create.*$' => [ + '.*/warehouse/stock/create.*$' => [ [ 'dest' => '\Modules\ItemManagement\Controller\BackendController:viewItemManagementWarehousingCreate', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/item-create.tpl.php b/Theme/Backend/item-create.tpl.php index 80003d9..479cb85 100644 --- a/Theme/Backend/item-create.tpl.php +++ b/Theme/Backend/item-create.tpl.php @@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Item'); ?>

-
+
@@ -68,7 +68,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Language'); ?>

- +
@@ -96,7 +96,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Property'); ?>

- +
@@ -115,7 +115,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Language'); ?>

- +
@@ -134,7 +134,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Language'); ?>

- +
@@ -154,7 +154,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Attribute'); ?>

- +
@@ -173,7 +173,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Language'); ?>

- +
@@ -192,7 +192,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Language'); ?>

- +
@@ -214,7 +214,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Sales'); ?>

- +
@@ -256,7 +256,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Price'); ?>

- +
@@ -292,7 +292,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Purchase'); ?>

- +
@@ -325,7 +325,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Price'); ?>

- +
@@ -349,7 +349,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Stock'); ?>

- +
@@ -373,7 +373,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Supplier'); ?>

- +
@@ -391,7 +391,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Accounting'); ?>

- +
@@ -412,7 +412,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Production'); ?>

- +
@@ -442,7 +442,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('StockList'); ?>

- +
@@ -460,7 +460,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('QM'); ?>

- +
@@ -473,7 +473,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Packaging'); ?>

- +
@@ -505,7 +505,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Media'); ?>

- +
@@ -521,7 +521,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Stock'); ?>

- +
@@ -534,7 +534,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Stock'); ?>

- +
@@ -558,7 +558,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Disposal'); ?>

- +
@@ -571,7 +571,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Files'); ?>

- + $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/sales/item/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}sales/item/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/business/department/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}business/department/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php index a97f2a1..55e0cae 100644 --- a/Theme/Backend/sales-item-list.tpl.php +++ b/Theme/Backend/sales-item-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getNumber()); ?> diff --git a/Theme/Backend/stock-list.tpl.php b/Theme/Backend/stock-list.tpl.php index 2b58553..f85b4f7 100644 --- a/Theme/Backend/stock-list.tpl.php +++ b/Theme/Backend/stock-list.tpl.php @@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/info.json b/info.json index ffeb50e..a9ebe15 100644 --- a/info.json +++ b/info.json @@ -25,9 +25,9 @@ "load": [ { "pid": [ - "/backend/sales/item", - "/backend/purchase/item", - "/backend/warehouse/item" + "/sales/item", + "/purchase/item", + "/warehouse/item" ], "type": 4, "for": 0, @@ -36,7 +36,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "ItemManagement",