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

Merge branch '753-resq-2-set-invoice-criteria-correctly-in-getestimate' into '746-resq-2-0-final'

Browse source 
Resolve "RESQ 2: Set invoice criteria correctly in getEstimate"

See merge request jankstudio/resq!868
This commit is contained in:
Ramon Gutierrez 2023-07-21 06:34:40 +00:00
commit 18c893cc6e
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Controller/APIController.php
View file

@ -1026,7 +1026,14 @@ class APIController extends Controller implements LoggedController
break;
}
$icrit->addEntry($batt, $trade_in, 1);
// right now, the app does not include trade-ins but this might change in the future
if (empty($trade_in))
$icrit->addEntry($batt, null, 1);
else
$icrit->addEntry($batt, $trade_in, 1);
// set if taxable
$icrit->setIsTaxable();
// send to invoice generator
$invoice = $ic->generateInvoice($icrit);
@ -1307,6 +1314,9 @@ class APIController extends Controller implements LoggedController
$icrit->addBattery($batt);
*/
// set taxable
$icrit->setIsTaxable(true);
// check trade-in
// only allow motolite, other, none
$trade_in = $req->request->get('trade_in');
@ -1321,7 +1331,11 @@ class APIController extends Controller implements LoggedController
break;
}
$icrit->addEntry($batt, $trade_in, 1);
// right now, the app does not include trade-ins but this might change in the future
if (empty($trade_in))
$icrit->addEntry($batt, null, 1);
else
$icrit->addEntry($batt, $trade_in, 1);
// send to invoice generator
$invoice = $ic->generateInvoice($icrit);

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

@ -92,7 +92,11 @@ class InvoiceController extends ApiController
break;
}
$icrit->addEntry($batt, $trade_in, 1);
// right now, the app does not include trade-ins but this might change in the future
if (empty($trade_in))
$icrit->addEntry($batt, null, 1);
else
$icrit->addEntry($batt, $trade_in, 1);
// set if taxable
$icrit->setIsTaxable();

7
src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
View file

@ -874,7 +874,12 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
if ($battery != null)
{
$crit->addEntry($battery, $trade_in, 1);
// right now, the app does not include trade-ins but this might change in the future
if ($trade_in == null)
$crit->addEntry($battery, null, 1);
else
$crit->addEntry($battery, $trade_in, 1);
// error_log('adding entry for battery - ' . $battery->getID());
}