Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

This commit is contained in:
VENKATESHWARAN 2025-11-20 11:14:40 +05:30
commit 103ba715d8

View File

@ -903,11 +903,15 @@ class RuleImportService
//rule_e07f52d4366a2_32_oct2025_3_com
$conditions = $this->buildConditions($rowData);
$temp_rule_id .= '_'.$this->incomingData['id'].'_'. strtolower(date('MY')).'_'.(count($conditions));
// $temp_rule_id .= '_'.$this->incomingData['id'].'_'. strtolower(date('MY')).'_'.(count($conditions));
$monthFormatted = strtoupper(date('M', strtotime($this->incomingData['commission_month'])))
. date('Y', strtotime($this->incomingData['commission_month']));
$temp_rule_id .= '_'.$this->incomingData['id'].'_'.$monthFormatted;
$calculation = $this->buildCalculation($rowData);
$temp_rule_id .= '_'.substr($calculation['type'], 0, 3);
// $temp_rule_id .= '_'.substr($calculation['type'], 0, 3);
$rule = [
'id' => $temp_rule_id,