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

Merge branch 'master' of gitlab.com:jankstudio/resq into 229-create-test-scripts

Browse source
This commit is contained in:
Korina Cordero 2019-08-08 03:30:14 +00:00
commit 5797238a4d
4 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Controller/APIController.php
View file

@ -245,6 +245,17 @@ class APIController extends Controller
$otp_mode = $_ENV['OTP_MODE']; $otp_mode = $_ENV['OTP_MODE'];
// check for hardcoded phone number for app store testing
if ($phone_number == '639991112233')
{
$code = '123456';
$this->session->setConfirmCode($code)
->setPhoneNumber($phone_number);
$em->flush();
return $res->getReturnResponse();
}
// check if otp_mode is test // check if otp_mode is test
if ($otp_mode == 'test') if ($otp_mode == 'test')
{ {
@ -1966,10 +1977,10 @@ class APIController extends Controller
$sap_batt = $warranty->getSAPBattery()->getID(); $sap_batt = $warranty->getSAPBattery()->getID();
} }
if (!(is_null($warranty->getDateClaim()))) { if (!(is_null($warranty->getDateClaim()))) {
$claim_date = $warranty->getDateClaim()->format("d M Y g:i A"); $claim_date = $warranty->getDateClaim()->format("d M Y");
} }
if (!(is_null($warranty->getDateExpire()))) { if (!(is_null($warranty->getDateExpire()))) {
$expiry_date = $warranty->getDateExpire()->format("d M Y g:i A"); $expiry_date = $warranty->getDateExpire()->format("d M Y");
} }
$warr[] = [ $warr[] = [
@ -1985,7 +1996,7 @@ class APIController extends Controller
'sap_battery' => $sap_batt, 'sap_battery' => $sap_batt,
'status' => $warranty->getStatus(), 'status' => $warranty->getStatus(),
'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"), 'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"),
'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"), 'date_purchase' => $warranty->getDatePurchase()->format("d M Y"),
'date_expire' => $expiry_date, 'date_expire' => $expiry_date,
'date_claim' => $claim_date, 'date_claim' => $claim_date,
'claim_from' => $warranty->getClaimedFrom(), 'claim_from' => $warranty->getClaimedFrom(),

2
src/Controller/ReviewController.php
View file

@ -87,7 +87,7 @@ class ReviewController extends Controller
$row['partner'] = $orow->getPartner()->getName(); $row['partner'] = $orow->getPartner()->getName();
$row['rating'] = $orow->getRating(); $row['rating'] = $orow->getRating();
$row['message'] = $orow->getMessage(); $row['message'] = $orow->getMessage();
$row['mobile_session'] = $orow->getMobileSession()->getID(); $row['mobile_number'] = $orow->getMobileSession()->getPhoneNumber();
// add row metadata // add row metadata
$row['meta'] = [ $row['meta'] = [

8
templates/review/form.html.twig
View file

@ -54,11 +54,11 @@
</div> </div>
<div class="form-group m-form__group row no-border"> <div class="form-group m-form__group row no-border">
<div class="col-lg-6"> <div class="col-lg-6">
<label for="mobile_session" data-field="mobile_session"> <label for="mobile_number" data-field="mobile_number">
Mobile Session Mobile Number
</label> </label>
<input type="text" name="mobile_session" class="form-control m-input" value="{{ obj.getMobileSession.getID|default('') }}" disabled> <input type="text" name="mobile_number" class="form-control m-input" value="{{ obj.getMobileSession.getPhoneNumber|default('') }}" disabled>
<div class="form-control-feedback hide" data-field="mobile_session"></div> <div class="form-control-feedback hide" data-field="mobile_number"></div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<label for="date_create" data-field="date_create"> <label for="date_create" data-field="date_create">

4
templates/review/list.html.twig
View file

@ -84,8 +84,8 @@
title: 'Message' title: 'Message'
}, },
{ {
field: 'mobile_session', field: 'mobile_number',
title: 'Mobile' title: 'Mobile Number'
}, },
{ {
field: 'Actions', field: 'Actions',