master
cody 5 months ago
parent 0f91646f76
commit 42b18fee88

@ -422,7 +422,7 @@ class OrdersController extends CommonController
$query->select("paramedic_level.id", "paramedic_level.name");
},
"project" => function ($query) {
$query->select("id", "name", "range_mobile", "complaint_mobile", "content");
$query->select("id", "name", "range_mobile", "complaint_mobile", "content","agreement");
},
"bed" => function ($query) {
$query->select("bed.id", "bed.name", "bed.building_id", "bed.area_id")

@ -35,7 +35,7 @@ class Orders extends SoftDeletesModel
if ($this->paramedic_id
&& $this->project->agreement == 1
&& strtotime($this->created_at) >= strtotime(Orders::AGREEMENT_START_DATE)
&& ($this->orderAgreements->isEmpty() || ($this->orderAgreements->isNotEmpty() && $this->orderAgreementByLast()->paramedic_id != $this->paramedic_id))) {
&& ($this->orderAgreements->isEmpty() || ($this->orderAgreements->isNotEmpty() && $this->orderAgreements[0]->paramedic_id != $this->paramedic_id))) {
return 1;
}
return 0;

Loading…
Cancel
Save