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

FIX_COMMISSION_UPLOAD

Browse Source
This commit is contained in:
velz 2025-11-26 15:09:10 +05:30
parent 04fc0cd2af
commit 6a69f8d071
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/RuleImportController.php
View File

@ -37,6 +37,7 @@ class RuleImportController extends AdminController
'motor' => [ 'motor' => [
'department', 'department',
'vehicle_type', 'vehicle_type',
'vehicle_sub_type',
'policy_type', 'policy_type',
'vehicle_age', 'vehicle_age',
'is_new_vehicle', 'is_new_vehicle',

20
app/Libraries/RuleImportService.php
View File

@ -1111,31 +1111,31 @@ class RuleImportService
if ($weightMin !== '' && $weightMax !== '') { if ($weightMin !== '' && $weightMax !== '') {
if ($weightMin === $weightMax) { if ($weightMin === $weightMax) {
$conditions[] = [ $conditions[] = [
'field' => 'vehicle_weight', 'field' => 'weight',
'operator' => '==', 'operator' => '==',
'value' => (float)$weightMin 'value' => (float)$weightMin
]; ];
} else { } else {
$conditions[] = [ $conditions[] = [
'field' => 'vehicle_weight', 'field' => 'weight',
'operator' => '>=', 'operator' => '>=',
'value' => (float)$weightMin 'value' => (float)$weightMin
]; ];
$conditions[] = [ $conditions[] = [
'field' => 'vehicle_weight', 'field' => 'weight',
'operator' => '<=', 'operator' => '<=',
'value' => (float)$weightMax 'value' => (float)$weightMax
]; ];
} }
} elseif ($weightMin !== '') { } elseif ($weightMin !== '') {
$conditions[] = [ $conditions[] = [
'field' => 'vehicle_weight', 'field' => 'weight',
'operator' => '>=', 'operator' => '>=',
'value' => (float)$weightMin 'value' => (float)$weightMin
]; ];
} elseif ($weightMax !== '') { } elseif ($weightMax !== '') {
$conditions[] = [ $conditions[] = [
'field' => 'vehicle_weight', 'field' => 'weight',
'operator' => '<=', 'operator' => '<=',
'value' => (float)$weightMax 'value' => (float)$weightMax
]; ];
@ -1147,13 +1147,13 @@ class RuleImportService
if (count($states) > 1) { if (count($states) > 1) {
$conditions[] = [ $conditions[] = [
'field' => 'rto_state', 'field' => 'geo_rto_state',
'operator' => 'in', 'operator' => 'in',
'value' => $states 'value' => $states
]; ];
} else { } else {
$conditions[] = [ $conditions[] = [
'field' => 'rto_state', 'field' => 'geo_rto_state',
'operator' => '==', 'operator' => '==',
'value' => $states[0] 'value' => $states[0]
]; ];
@ -1166,13 +1166,13 @@ class RuleImportService
if (count($cities) > 1) { if (count($cities) > 1) {
$conditions[] = [ $conditions[] = [
'field' => 'rto_city', 'field' => 'geo_rto_city',
'operator' => 'in', 'operator' => 'in',
'value' => $cities 'value' => $cities
]; ];
} else { } else {
$conditions[] = [ $conditions[] = [
'field' => 'rto_city', 'field' => 'geo_rto_city',
'operator' => '==', 'operator' => '==',
'value' => $cities[0] 'value' => $cities[0]
]; ];
@ -1191,7 +1191,7 @@ class RuleImportService
// Policy Name // Policy Name
if (!empty($rowData[self::COL_POLICY_NAME])) { if (!empty($rowData[self::COL_POLICY_NAME])) {
$conditions[] = [ $conditions[] = [
'field' => 'policy_name', 'field' => 'product',
'operator' => '==', 'operator' => '==',
'value' => $this->sanitize($rowData[self::COL_POLICY_NAME]) 'value' => $this->sanitize($rowData[self::COL_POLICY_NAME])
]; ];