Merge branch '472-cmb-release' of gitlab.com:jankstudio/resq into 484-cmb-cmb-changes
This commit is contained in:
commit
dacd9efe01
3 changed files with 21 additions and 2 deletions
|
|
@ -346,7 +346,7 @@ class HubController extends Controller
|
||||||
$riders = [];
|
$riders = [];
|
||||||
|
|
||||||
// TODO: remove this later when we don't get all available riders
|
// TODO: remove this later when we don't get all available riders
|
||||||
$riders_limit = 5;
|
$riders_limit = 50;
|
||||||
$num_riders = 0;
|
$num_riders = 0;
|
||||||
|
|
||||||
foreach ($available_riders as $rider)
|
foreach ($available_riders as $rider)
|
||||||
|
|
|
||||||
|
|
@ -1086,7 +1086,8 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
|
||||||
|
|
||||||
// notification
|
// notification
|
||||||
$notif_url = $this->router->generate('jo_onestep_edit_form', ['id' => $jo->getID()]);
|
$notif_url = $this->router->generate('jo_onestep_edit_form', ['id' => $jo->getID()]);
|
||||||
$this->nm->sendNotification(0, 'Job order #' . $jo->getID() . ' has been cancelled by rider. Reason: ' . $jo->getCancelReason() . '.', $notif_url);
|
$cancel_reason = CMBCancelReason::getName($jo->getCancelReason());
|
||||||
|
$this->nm->sendNotification(0, 'Job order #' . $jo->getID() . ' has been cancelled by rider. Reason: ' . $cancel_reason . '.', $notif_url);
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
18
utils/delete_selected_hub_riders.sql
Normal file
18
utils/delete_selected_hub_riders.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
delete from rider_session where rider_id=12;
|
||||||
|
delete from rider_session where rider_id=2;
|
||||||
|
delete from rider_session where rider_id=13;
|
||||||
|
delete from rider_session where rider_id=11;
|
||||||
|
|
||||||
|
delete from rider_schedule where rider_id=12;
|
||||||
|
delete from rider_schedule where rider_id=2;
|
||||||
|
delete from rider_schedule where rider_id=13;
|
||||||
|
delete from rider_schedule where rider_id=11;
|
||||||
|
|
||||||
|
delete from rider where id=12;
|
||||||
|
delete from rider where id=2;
|
||||||
|
delete from rider where id=13;
|
||||||
|
delete from rider where id=11;
|
||||||
|
|
||||||
|
delete from hub where id=1;
|
||||||
|
delete from hub where id=2;
|
||||||
|
delete from hub where id=4;
|
||||||
Loading…
Reference in a new issue