Merge branch '567-adopt-branch-551' into 'master-fix'

Fix warranty update issue when serial changes from text to empty. #567

See merge request jankstudio/resq!675
This commit is contained in:
Kendrick Chan 2021-05-20 02:53:55 +00:00
commit 31b689210e

View file

@ -163,9 +163,14 @@ class WarrantyController extends Controller
$date_claim = DateTime::createFromFormat('d M Y', $req->request->get('date_claim'));
$date_expire = DateTime::createFromFormat('d M Y', $req->request->get('date_expire'));
// get serial. Set to null if empty
if (empty($req->request->get('serial')))
$obj->setSerial();
else
$obj->setSerial($req->request->get('serial'));
// set and save values
$obj->setSerial($req->request->get('serial'))
->setWarrantyClass($req->request->get('warranty_class'))
$obj->setWarrantyClass($req->request->get('warranty_class'))
->setFirstName($req->request->get('first_name'))
->setLastName($req->request->get('last_name'))
->setMobileNumber($req->request->get('mobile_number'))
@ -325,9 +330,14 @@ class WarrantyController extends Controller
$date_claim = DateTime::createFromFormat('d M Y', $req->request->get('date_claim'));
$date_expire = DateTime::createFromFormat('d M Y', $req->request->get('date_expire'));
// get serial. Set to null if empty
if (empty($req->request->get('serial')))
$obj->setSerial();
else
$obj->setSerial($req->request->get('serial'));
// set and save values
$obj->setSerial($req->request->get('serial'))
->setWarrantyClass($req->request->get('warranty_class'))
$obj->setWarrantyClass($req->request->get('warranty_class'))
->setFirstName($req->request->get('first_name'))
->setLastName($req->request->get('last_name'))
->setMobileNumber($req->request->get('mobile_number'))