From 89ec286a9f382594fec3cb963feba5d8e1033951 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 20 Sep 2019 09:30:08 +0000 Subject: [PATCH] Rename processCriteria to generateInvoice. Added constants to invoice generator. #265 --- src/Controller/APIController.php | 4 +-- src/Controller/JobOrderController.php | 6 ++-- src/Controller/RAPIController.php | 2 +- .../InvoiceGenerator/ResqInvoiceGenerator.php | 30 ++++++++++++------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 99456ed6..5642dad7 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -973,7 +973,7 @@ class APIController extends Controller $icrit->addEntry($batt, $trade_in, 1); // send to invoice generator - $invoice = $ic->processCriteria($icrit); + $invoice = $ic->generateInvoice($icrit); $jo->setInvoice($invoice); $em->persist($jo); @@ -1120,7 +1120,7 @@ class APIController extends Controller $icrit->addEntry($batt, $trade_in, 1); // send to invoice generator - $invoice = $ic->processCriteria($icrit); + $invoice = $ic->generateInvoice($icrit); // make invoice json data $data = [ diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index c81a8694..3563b6b9 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -327,7 +327,7 @@ class JobOrderController extends Controller else { // generate the invoice - $iobj = $ic->processCriteria($criteria); + $iobj = $ic->generateInvoice($criteria); $iobj->setStatus(InvoiceStatus::DRAFT) ->setCreatedBy($this->getUser()); @@ -522,7 +522,7 @@ class JobOrderController extends Controller else { // generate the invoice - $iobj = $ic->processCriteria($criteria); + $iobj = $ic->generateInvoice($criteria); $iobj->setStatus(InvoiceStatus::DRAFT) ->setCreatedBy($this->getUser()); @@ -2548,7 +2548,7 @@ class JobOrderController extends Controller } // generate the invoice - $iobj = $ic->processCriteria($criteria); + $iobj = $ic->generateInvoice($criteria); // use invoice object values in a json friendly array $invoice = [ diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php index bc20fd4c..0c997435 100644 --- a/src/Controller/RAPIController.php +++ b/src/Controller/RAPIController.php @@ -839,7 +839,7 @@ class RAPIController extends Controller error_log('adding entry for battery - ' . $battery->getID()); } - $invoice = $ic->processCriteria($crit); + $invoice = $ic->generateInvoice($crit); $invoice->setStatus(InvoiceStatus::DRAFT); // remove previous invoice diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php index 9f66d5d3..456b0021 100644 --- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php +++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php @@ -21,6 +21,13 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface const TAX_RATE = 0.12; const SERVICE_FEE = 300; const RECHARGE_FEE = 300; + const TROUBLESHOOTING_FEE = 150; + const BATT_REPLACEMENT_FEE = 0; + const WARRANTY_FEE = 0; + const OTHER_SERVICES_FEE = 200; + const COOLANT_FEE = 1600; + const REFUEL_FEE_GAS = 260; + const REFUEL_FEE_DIESEL = 220; // creates invoice based on the criteria sent public function __construct() @@ -276,12 +283,12 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $item->setInvoice($invoice) ->setTitle('Troubleshooting fee') ->setQuantity(1) - ->setPrice(150.00); + ->setPrice(self::TROUBLESHOOTING_FEE); $invoice->addItem($item); - $total['sell_price'] = 150.00; - $total['vat_ex_price'] = 150.00; - $total['total_price'] = 150.00; + $total['sell_price'] = self::TROUBLESHOOTING_FEE; + $total['vat_ex_price'] = self::TROUBLESHOOTING_FEE; + $total['total_price'] = self::TROUBLESHOOTING_FEE; } protected function processJumpstartWarranty(&$total, $invoice) @@ -316,7 +323,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $item->setInvoice($invoice) ->setTitle('Battery replacement') ->setQuantity(1) - ->setPrice(0.00); + ->setPrice(self::BATT_REPLACEMENT_FEE); $invoice->addItem($item); } @@ -331,7 +338,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $item->setInvoice($invoice) ->setTitle($batt->getModel()->getName() . ' ' . $batt->getSize()->getName() . ' - Service Unit') ->setQuantity(1) - ->setPrice(0.00) + ->setPrice(self::WARRANTY_FEE) ->setBattery($batt); $invoice->addItem($item); } @@ -343,7 +350,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $item->setInvoice($invoice) ->setTitle('Service - ' . ServiceType::getName($stype)) ->setQuantity(1) - ->setPrice(200.00); + ->setPrice(self::OTHER_SERVICES_FEE); $invoice->addItem($item); $total['total_price'] = 200.00; @@ -372,10 +379,11 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $coolant->setInvoice($invoice) ->setTitle('4L Coolant') ->setQuantity(1) - ->setPrice(1600); + ->setPrice(self::COOLANT_FEE); $invoice->addItem($coolant); - $total_price += 1600; + $total_price += self::COOLANT_FEE; + //$total_price += 1600; } $vat_ex_price = $this->getTaxExclusivePrice($total_price); @@ -428,8 +436,8 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $total_price = $fee; // $total['total_price'] = 200.00; - $gas_price = 260; - $diesel_price = 220; + $gas_price = self::REFUEL_FEE_GAS; + $diesel_price = self::REFUEL_FEE_DIESEL; $fuel = new InvoiceItem(); error_log('fuel type - ' . $ftype);