From abd63731be52ffa8b8e7604116d5f1ea25e29d75 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 3 Jan 2016 13:46:16 +0000 Subject: [PATCH] Follow upgrade guideline Step 9 (#120) --- application/config/routes.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index 6ab6d6d61..4c0cd6272 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -39,25 +39,25 @@ */ $route['default_controller'] = "login"; -$route['no_access/(.+)'] = "no_access/index/$1"; -$route['no_access/(.+)/(.+)'] = "no_access/index/$1/$2"; -$route['sales/index/(.+)'] = "sales/manage/$1"; -$route['sales/index/(.+)/(.+)'] = "sales/manage/$1/$2"; -$route['sales/index/(.+)/(.+)/(.+)'] = "sales/manage/$1/$2/$3"; -$route['reports/(summary_:any)/(.+)/(.+)'] = "reports/$1/$2/$3"; +$route['no_access/([^/]+)'] = "no_access/index/$1"; +$route['no_access/([^/]+)/([^/]+)'] = "no_access/index/$1/$2"; +$route['sales/index/([^/]+)'] = "sales/manage/$1"; +$route['sales/index/([^/]+)/([^/]+)'] = "sales/manage/$1/$2"; +$route['sales/index/([^/]+)/([^/]+)/([^/]+)'] = "sales/manage/$1/$2/$3"; +$route['reports/(summary_:any)/([^/]+)/([^/]+)'] = "reports/$1/$2/$3"; $route['reports/summary_:any'] = "reports/date_input_excel_export"; -$route['reports/(graphical_:any)/(.+)/(.+)'] = "reports/$1/$2/$3"; +$route['reports/(graphical_:any)/([^/]+)/([^/]+)'] = "reports/$1/$2/$3"; $route['reports/graphical_:any'] = "reports/date_input"; -$route['reports/(inventory_:any)/(.+)'] = "reports/$1/$2"; +$route['reports/(inventory_:any)/([^/]+)'] = "reports/$1/$2"; $route['reports/inventory_:any'] = "reports/excel_export"; $route['reports/inventory_summary'] = "reports/inventory_summary_input"; -$route['reports/(inventory_summary)/(.+)/(.+)/(.+)'] = "reports/$1/$2/$3/$4"; +$route['reports/(inventory_summary)/([^/]+)/([^/]+)/([^/]+)'] = "reports/$1/$2/$3/$4"; -$route['reports/(detailed_sales)/(.+)/(.+)/(.+)'] = "reports/$1/$2/$3$/$4"; +$route['reports/(detailed_sales)/([^/]+)/([^/]+)/([^/]+)'] = "reports/$1/$2/$3$/$4"; $route['reports/detailed_sales'] = "reports/date_input_sales"; -$route['reports/(detailed_receivings)/(.+)/(.+)/(.+)'] = "reports/$1/$2/$3/$4"; +$route['reports/(detailed_receivings)/([^/]+)/([^/]+)/([^/]+)'] = "reports/$1/$2/$3/$4"; $route['reports/detailed_receivings'] = "reports/date_input_recv"; -$route['reports/(specific_:any)/(.+)/(.+)/(.+)'] = "reports/$1/$2/$3/$4"; +$route['reports/(specific_:any)/([^/]+)/([^/]+)/([^/]+)'] = "reports/$1/$2/$3/$4"; $route['reports/specific_customer'] = "reports/specific_customer_input"; $route['reports/specific_employee'] = "reports/specific_employee_input"; $route['reports/specific_discount'] = "reports/specific_discount_input";