|
|
@@ -195,11 +195,16 @@ class RecordIN extends Component
|
|
|
|
|
|
public function refreshMembers()
|
|
|
{
|
|
|
- if($this->commercial){
|
|
|
- $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->orderBy('last_name')->orderBy('first_name')->get();
|
|
|
- } else {
|
|
|
- $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->where('current_status', 2)->orderBy('last_name')->orderBy('first_name')->get();
|
|
|
+ if ($this->add || $this->update)
|
|
|
+ {
|
|
|
+ if($this->commercial){
|
|
|
+ $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->orderBy('last_name')->orderBy('first_name')->get();
|
|
|
+ } else {
|
|
|
+ $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->where('current_status', 2)->orWhere('current_status', 1)->orderBy('last_name')->orderBy('first_name')->get();
|
|
|
+ }
|
|
|
}
|
|
|
+ else
|
|
|
+ $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->orderBy('last_name')->orderBy('first_name')->get();
|
|
|
}
|
|
|
|
|
|
public function setAmount()
|