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

Fix invoice data on open edit form #1729

Merged
korina.cordero merged 9 commits from 803-fix-invoice-data-disappearing-on-open-edit-form into master 2024-09-24 04:23:03 +00:00
Conversation 6 Commits 9 Files changed 11 +9 -16
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2f9ee4ec67 - Show all commits

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)) {
$ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
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)) {
$ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
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);
}
}

12
src/InvoiceRule/BatteryReplacementWarranty.php
View file

@ -116,14 +116,12 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
$qty = $item['quantity'];
if ($qty < 1)
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
if (empty($item['trade_in']))
{
$trade_in = null;
$criteria->addEntry($battery, $trade_in, $qty);
$criteria->addEntry($battery, $trade_in, $qty);
}
}
}

7
src/InvoiceRule/BatterySales.php
View file

@ -116,13 +116,6 @@ class BatterySales implements InvoiceRuleInterface
if ($qty < 1)
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']))
{
$trade_in = null;