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

Resolve "Fix invoice computation bug" #851

Merged
jankstudio merged 1 commit from 43-fix-invoice-computation-bug into master 2018-03-07 19:14:24 +00:00
Conversation 2 Commits 1 Files changed 2 +5 -1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Controller/APIController.php
View file

@ -735,6 +735,7 @@ class APIController extends Controller
// make invoice criteria // make invoice criteria
$icrit = new InvoiceCriteria(); $icrit = new InvoiceCriteria();
$icrit->setServiceType($stype);
// check promo // check promo
$promo_id = $req->request->get('promo_id'); $promo_id = $req->request->get('promo_id');

5
src/Controller/JobOrderController.php
View file

@ -178,12 +178,14 @@ class JobOrderController extends BaseController
// coordinates // coordinates
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
$stype = $req->request->get('service_type');
// set and save values // set and save values
$obj->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time'))) $obj->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time')))
->setCoordinates($point) ->setCoordinates($point)
->setAdvanceOrder($req->request->get('flag_advance') ?? false) ->setAdvanceOrder($req->request->get('flag_advance') ?? false)
->setCreatedBy($this->getUser()) ->setCreatedBy($this->getUser())
->setServiceType($req->request->get('service_type')) ->setServiceType($stype)
->setWarrantyClass($req->request->get('warranty_class')) ->setWarrantyClass($req->request->get('warranty_class'))
->setCustomer($cust_vehicle->getCustomer()) ->setCustomer($cust_vehicle->getCustomer())
->setCustomerVehicle($cust_vehicle) ->setCustomerVehicle($cust_vehicle)
@ -208,6 +210,7 @@ class JobOrderController extends BaseController
// instantiate invoice criteria // instantiate invoice criteria
$criteria = new InvoiceCriteria(); $criteria = new InvoiceCriteria();
$criteria->setServiceType($stype);
$ierror = $this->invoicePromo($em, $criteria, $req->request->get('invoice_promo')); $ierror = $this->invoicePromo($em, $criteria, $req->request->get('invoice_promo'));
$invoice_items = $req->request->get('invoice_items'); $invoice_items = $req->request->get('invoice_items');