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

Add checking for invoice change. #265

Browse source
This commit is contained in:
Korina Cordero 2019-09-25 03:52:14 +00:00
parent 7f973fd10a
commit f766965f81
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Controller/JobOrderController.php
View file

@ -296,10 +296,11 @@ class JobOrderController extends Controller
// did they change invoice? // did they change invoice?
$invoice_items = $req->request->get('invoice_items', []); $invoice_items = $req->request->get('invoice_items', []);
$invoice_change = $req->request->get('invoice_change', 0);
$promo_id = $req->request->get('invoice_promo'); $promo_id = $req->request->get('invoice_promo');
// call service to generate job order and invoice // call service to generate job order and invoice
$joc->generateJobOrder($obj, $promo_id, $invoice_items, $error_array); $joc->generateJobOrder($obj, $promo_id, $invoice_change, $invoice_items, $error_array);
} }
@ -425,8 +426,9 @@ class JobOrderController extends Controller
// call service to generate job order and invoice // call service to generate job order and invoice
$invoice_items = $req->request->get('invoice_items', []); $invoice_items = $req->request->get('invoice_items', []);
$promo_id = $req->request->get('invoice_promo'); $promo_id = $req->request->get('invoice_promo');
$invoice_change = true;
$joc->generateJobOrder($obj, $promo_id, $invoice_items, $error_array); $joc->generateJobOrder($obj, $promo_id, $invoice_change, $invoice_items, $error_array);
} }
// check if any errors were found // check if any errors were found

8
src/Service/JobOrderGenerator/ResqJobOrderGenerator.php
View file

@ -34,11 +34,15 @@ class ResqJobOrderGenerator implements JobOrderGeneratorInterface
$this->security = $security; $this->security = $security;
$this->validator = $validator; $this->validator = $validator;
} }
public function generateJobOrder(JobOrder $jo, $promo_id, $invoice_items, &$error_array) public function generateJobOrder(JobOrder $jo, $promo_id, $invoice_change, $invoice_items, &$error_array)
{ {
// TODO: data validation to be moved here // TODO: data validation to be moved here
$this->processInvoice($jo, $promo_id, $invoice_items, $error_array); // check if invoice changed
if ($invoice_change)
{
$this->processInvoice($jo, $promo_id, $invoice_items, $error_array);
}
// validate // validate
$errors = $this->validator->validate($jo); $errors = $this->validator->validate($jo);

3
src/Service/JobOrderGeneratorInterface.php
View file

@ -8,5 +8,6 @@ use App\Entity\InvoiceItem;
interface JobOrderGeneratorInterface interface JobOrderGeneratorInterface
{ {
// generate job order // generate job order
public function generateJobOrder(JobOrder $jo, int $promo_id, array $invoice_items, array &$error_array); public function generateJobOrder(JobOrder $jo, int $promo_id, bool $invoice_change,
array $invoice_items, array &$error_array);
} }