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

Resolve "CAPI call for warranty serial" #1632

Merged
korina.cordero merged 18 commits from 704-capi-call-for-warranty-serial into master 2022-09-23 03:14:28 +00:00
Conversation 20 Commits 18 Files changed 13 -6
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0ffbf10879 - Show all commits

6
src/Controller/APIUserController.php
View file

@ -162,15 +162,9 @@ class APIUserController extends Controller
// set api user in rider // set api user in rider
$rider->setAPIUser($obj); $rider->setAPIUser($obj);
<<<<<<< HEAD
$obj->setRider($rider) $obj->setRider($rider)
->setMetadata($meta); ->setMetadata($meta);
} }
=======
// set api user in rider
if ($rider != null)
$rider->setAPIUser($obj);
>>>>>>> 7416be842559728bbb3743c0035a6d26605eb1be
// set and save values // set and save values
$obj->setName($req->request->get('name')) $obj->setName($req->request->get('name'))