Merge branch 'master' into plugin-system-fresh

This commit is contained in:
objecttothis authored and GitHub committed 2026-08-31 16:18:59 +04:00
commit 459610cded
90 files changed
+4225 -2824

No files matched your search

+11 -9
View File
@@ -25,6 +25,7 @@ use App\Models\Reports\Summary_sales;
use App\Models\Reports\Summary_sales_taxes;
use App\Models\Reports\Summary_suppliers;
use App\Models\Reports\Summary_taxes;
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\HTTP\ResponseInterface;
use Config\OSPOS;
use Config\Services;
@@ -55,8 +56,8 @@ class Reports extends Secure_Controller
{
parent::__construct('reports');
$request = Services::request();
$method_name = $request->getUri()->getSegment(2);
$exploder = explode('_', $method_name);
$methodName = urldecode($request->getUri()->getSegment(2));
$exploder = explode('_', $methodName);
$this->attribute = config(Attribute::class);
$this->config = config(OSPOS::class)->settings;
@@ -79,15 +80,16 @@ class Reports extends Secure_Controller
$this->inventory_summary = model(Inventory_summary::class);
if (sizeof($exploder) > 1) {
preg_match('/(?:inventory)|([^_.]*)(?:_graph|_row)?$/', $method_name, $matches);
preg_match('/(?:inventory)|([^_.]*)(?:_graph|_row)?$/', $methodName, $matches);
preg_match('/^(.*?)([sy])?$/', array_pop($matches), $matches);
$submodule_id = $matches[1] . ((count($matches) > 2) ? $matches[2] : 's');
$submoduleId = $matches[1] . ((count($matches) > 2) ? $matches[2] : 's');
} else {
$submoduleId = null;
}
// Check access to report submodule
if (!$this->employee->has_grant('reports_' . $submodule_id, $this->employee->get_logged_in_employee_info()->person_id)) {
header('Location: ' . base_url('no_access/reports/reports_' . $submodule_id));
exit();
}
// Check access to report submodule
if ($submoduleId !== null && !$this->employee->has_grant('reports_' . $submoduleId, $this->employee->get_logged_in_employee_info()->person_id)) {
throw new RedirectException('no_access/reports/reports_' . $submoduleId);
}
helper('report');