rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Resq - message prompt for non-serviceable area" #1353

Merged
korina.cordero merged 176 commits from 463-resq-message-prompt-for-non-serviceable-area into 465-resq-august-13-release 2020-08-12 05:41:57 +00:00
Conversation 3 Commits 176 Files changed 3 +13 -13
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0f5bf2e8d6 - Show all commits

24
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -558,6 +558,18 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
} }
} }
// get discount and set to meta
$discount = $req->request->get('invoice_discount', []);
// check if discount is greater than 50 or negative number
if (($discount > 50) || ($discount < 0))
$error_array['invoice_discount'] = 'Invalid discount specified';
// get list of service charges
$service_charges = $req->request->get('service_charges', []);
if (empty($error_array))
{
// set priority based on rider's existing open job orders // set priority based on rider's existing open job orders
$rider_jos = $rider->getOpenJobOrders(); $rider_jos = $rider->getOpenJobOrders();
@ -571,18 +583,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$priority = $rider_jo->getPriority() + 1; $priority = $rider_jo->getPriority() + 1;
} }
// get discount and set to meta
$discount = $req->request->get('invoice_discount', []);
// check if discount is greater than 50 or negative number
if (($discount > 50) || ($discount < 0))
$error_array['invoice_discount'] = 'Invalid discount specified';
// get list of service charges
$service_charges = $req->request->get('service_charges', []);
if (empty($error_array))
{
// get current user // get current user
$user = $this->security->getUser(); $user = $this->security->getUser();