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

Resolve "Fix items for iOS user app" #894

Merged
jankstudio merged 3 commits from 104-fix-items-for-ios-user-app into master 2018-04-24 12:10:27 +00:00
Conversation 2 Commits 3 Files changed 3 +1020 -2
2 changed files with 1020 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 14976361b9 - Show all commits

1016
sql/resq.backup.20180419.1710.sql Normal file
View file

File diff suppressed because one or more lines are too long

6
src/Controller/APIController.php
View file

@ -848,7 +848,7 @@ class APIController extends Controller
{
// check required parameters and api key
$required_params = [
'stype_id',
'service_type',
'cv_id',
'batt_id',
'trade_in',
@ -869,7 +869,7 @@ class APIController extends Controller
// make invoice criteria
$icrit = new InvoiceCriteria();
$icrit->setServiceType($req->request->get('stype_id'));
$icrit->setServiceType($req->request->get('service_type'));
// check promo
$promo_id = $req->request->get('promo_id');
@ -1266,6 +1266,8 @@ class APIController extends Controller
];
}
$jo_data['items'] = $items;
// dates depending on status
switch ($status)