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

Add battery to criteria for battery replacement warranty. #803

Browse source
This commit is contained in:
Korina Cordero 2024-06-20 05:26:23 -04:00
parent 4b5ad97225
commit 2f9ee4ec67
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Controller/CustomerAppAPI/JobOrderController.php
View file

@ -690,7 +690,8 @@ class JobOrderController extends ApiController
if (!empty($trade_in_type) && !empty($trade_in_batt)) { if (!empty($trade_in_type) && !empty($trade_in_batt)) {
$ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt); $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
if (!empty($ti_batt_obj)) { if (!empty($ti_batt_obj)) {
$icrit->addEntry($ti_batt_obj, $trade_in_type, 1); $battery_size = $ti_batt_obj->getSize();
$icrit->addTradeInEntry($battery_size, $trade_in_type, 1);
} }
} }
@ -1124,7 +1125,8 @@ class JobOrderController extends ApiController
if (!empty($trade_in_type) && !empty($trade_in_batt)) { if (!empty($trade_in_type) && !empty($trade_in_batt)) {
$ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt); $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
if (!empty($ti_batt_obj)) { if (!empty($ti_batt_obj)) {
$icrit->addEntry($ti_batt_obj, $trade_in_type, 1); $battery_size = $ti_batt_obj->getSize();
$icrit->addTradeInEntry($battery_size, $trade_in_type, 1);
} }
} }

8
src/InvoiceRule/BatteryReplacementWarranty.php
View file

@ -117,15 +117,13 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
if ($qty < 1) if ($qty < 1)
continue; continue;
// if this is a trade in, add trade in if (empty($item['trade_in']))
if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in'])) {
$trade_in = $item['trade_in'];
else
$trade_in = null; $trade_in = null;
$criteria->addEntry($battery, $trade_in, $qty); $criteria->addEntry($battery, $trade_in, $qty);
} }
} }
}
return null; return null;
} }

7
src/InvoiceRule/BatterySales.php
View file

@ -116,13 +116,6 @@ class BatterySales implements InvoiceRuleInterface
if ($qty < 1) if ($qty < 1)
continue; continue;
// if this is a trade in, add trade in
/*
if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
$trade_in = $item['trade_in'];
else
$trade_in = null; */
if (empty($item['trade_in'])) if (empty($item['trade_in']))
{ {
$trade_in = null; $trade_in = null;