Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEAT_COND_COMMISION_UPLOAD_DEL_FLAG

Browse Source
This commit is contained in:
velz 2025-11-19 14:18:53 +05:30
parent f9d6b761ab
commit 4121fee9aa
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/InsuranceCommissionController.php
View File

@ -13,7 +13,7 @@ class InsuranceCommissionController extends AdminController
public function __construct() public function __construct()
{ {
set_session_context('Client'); set_session_context('InsuranceCommissionController');
$this->myLogger = \Config\Services::mylogger(); $this->myLogger = \Config\Services::mylogger();
// Load rules file if present in writable config path // Load rules file if present in writable config path
// $rulesPath = WRITEPATH . 'config/insurance_rules.json'; // $rulesPath = WRITEPATH . 'config/insurance_rules.json';
@ -122,7 +122,10 @@ class InsuranceCommissionController extends AdminController
// Normalise department keys to lowercase for consistent lookups // Normalise department keys to lowercase for consistent lookups
$this->rules = []; $this->rules = [];
foreach ($parsed as $dept => $rules) { foreach ($parsed as $dept => $rules) {
$this->rules[strtolower($dept)] = $rules; if($rules['is_deleted'] === false)
{
$this->rules[strtolower($dept)] = $rules;
}
} }
// print_r($this->rules);die(); // print_r($this->rules);die();

21
app/Libraries/RuleImportService.php
View File

@ -62,6 +62,7 @@ class RuleImportService
protected array $expectedColumns; protected array $expectedColumns;
protected array $columnValidators; protected array $columnValidators;
protected array $incomingData;
protected string $annotatedDir; protected string $annotatedDir;
protected string $department; protected string $department;
protected string $uploadedCommissionFileID; protected string $uploadedCommissionFileID;
@ -148,7 +149,7 @@ class RuleImportService
{ {
// dd($params); // dd($params);
$startTime = microtime(true); $startTime = microtime(true);
$this->incomingData = $params;
try { try {
$this->department = $params['department']; $this->department = $params['department'];
$this->uploadedCommissionFileID = $params['id']; $this->uploadedCommissionFileID = $params['id'];
@ -898,13 +899,25 @@ class RuleImportService
*/ */
protected function convertRowToRule(array $rowData): array protected function convertRowToRule(array $rowData): array
{ {
$temp_rule_id = $this->generateRuleId($rowData);
//rule_e07f52d4366a2_32_oct2025_3_com
$conditions = $this->buildConditions($rowData);
$temp_rule_id .= '_'.$this->incomingData['id'].'_'. strtolower(date('MY')).'_'.(count($conditions));
$calculation = $this->buildCalculation($rowData);
$temp_rule_id .= '_'.substr($calculation['type'], 0, 3);
$rule = [ $rule = [
'id' => $this->generateRuleId($rowData), 'id' => $temp_rule_id,
'name' => $this->sanitize($rowData[self::COL_RULE_NAME] ?? ''), 'name' => $this->sanitize($rowData[self::COL_RULE_NAME] ?? ''),
'department' => $this->department, 'department' => $this->department,
'is_deleted' => false,
'file_id' => $this->uploadedCommissionFileID, 'file_id' => $this->uploadedCommissionFileID,
'conditions' => $this->buildConditions($rowData), 'conditions' => $conditions,
'calculation' => $this->buildCalculation($rowData) 'calculation' => $calculation
]; ];
return $rule; return $rule;