|
@@ -76,13 +76,13 @@ class RoleController extends Curd
|
|
|
foreach ($items as &$item) {
|
|
|
if (!empty($item->member_role_rule_json)) {
|
|
|
$ruleJson = json_decode($item->member_role_rule_json, true);
|
|
|
- if (!empty($ruleJson['pricing'])){
|
|
|
+ if (!empty($ruleJson['pricing'])) {
|
|
|
$item->join_member_role_rule_pricing_id = $ruleJson['pricing'];
|
|
|
- $item->pricingName = RulePricing::where('rule_pricing_id',$ruleJson['pricing'])->value('rule_pricing_name');
|
|
|
+ $item->pricingName = RulePricing::where('rule_pricing_id', $ruleJson['pricing'])->value('rule_pricing_name');
|
|
|
}
|
|
|
- if(!empty($ruleJson['added'])){
|
|
|
+ if (!empty($ruleJson['added'])) {
|
|
|
$item->join_member_role_added_id = $ruleJson['added'];
|
|
|
- $item->addedName = RuleAdded::where('rule_added_id',$ruleJson['added'])->value('rule_added_name');
|
|
|
+ $item->addedName = RuleAdded::where('rule_added_id', $ruleJson['added'])->value('rule_added_name');
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -116,7 +116,7 @@ class RoleController extends Curd
|
|
|
}
|
|
|
|
|
|
if (!empty($model->member_role_rule_json)) {
|
|
|
- $ruleJson = json_encode($model->member_role_rule_json, true);
|
|
|
+ $ruleJson = json_decode($model->member_role_rule_json, true);
|
|
|
if (isset($params['join_member_role_rule_pricing_id'])) {
|
|
|
$ruleJson['pricing'] = $params['join_member_role_rule_pricing_id'];
|
|
|
}
|
|
@@ -124,10 +124,10 @@ class RoleController extends Curd
|
|
|
$ruleJson['added'] = $params['join_member_role_added_id'];
|
|
|
}
|
|
|
$data['member_role_rule_json'] = json_encode($ruleJson);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$data['member_role_rule_json'] = json_encode([
|
|
|
- 'pricing'=>$params['join_member_role_rule_pricing_id'] ?? '',
|
|
|
- 'added'=>$params['join_member_role_added_id'] ?? ''
|
|
|
+ 'pricing' => $params['join_member_role_rule_pricing_id'] ?? '',
|
|
|
+ 'added' => $params['join_member_role_added_id'] ?? ''
|
|
|
]);
|
|
|
}
|
|
|
|