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

Merge branch '23-change-mobile-number-to-contact-number' into 'master'

Browse source 
Resolve "Change mobile number to contact number"

Closes #23

See merge request jankstudio/resq!21
This commit is contained in:
Ramon Gutierrez 2018-02-26 10:48:13 +00:00
commit 730f18c813
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
templates/customer/form.html.twig
View file

@ -85,7 +85,7 @@
<div class="m-form__section">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Mobile Numbers
Contact Numbers
</h3>
</div>
<div class="form-group m-form__group row">
@ -95,12 +95,12 @@
</div>
<div class="form-group m-form__group row">
<div class="col-lg-4">
<input type="text" class="form-control m-input" placeholder="Mobile number" id="mobile-number">
<input type="number" class="form-control m-input" placeholder="Contact number" step="1" min="0" id="mobile-number">
<div class="form-control-feedback hide" data-field="mobile-number"></div>
<span class="m-form__help">Use the format <span class="text-info">63xxxxxxxxxx</span></span>
<!--<span class="m-form__help">Use the format <span class="text-info">63xxxxxxxxxx</span></span>-->
</div>
<div class="col-lg-4">
<button type="button" class="btn btn-primary" id="btn-add-mobile-number">Add to List</button>
<button type="button" class="btn btn-primary" id="btn-add-mobile-number" maxlength="12">Add to List</button>
</div>
</div>
</div>
@ -579,7 +579,7 @@
});
return true;
} else if (id.toString().length != 12) {
} else if (id.toString().length > 12) {
swal({
title: 'Whoops',
text: 'Invalid mobile number specified.',
@ -917,7 +917,7 @@
columns: [
{
field: 'id',
title: 'Mobile Number',
title: 'Contact Number',
template: function (row, index, datatable) {
return row.id + '<div class="form-control-feedback hide" data-field="id"></div>';
}

2
templates/customer/list.html.twig
View file

@ -97,7 +97,7 @@
},
{
field: 'mobile_numbers',
title: 'Mobile Numbers',
title: 'Contact Numbers',
sortable: false
},
{

2
templates/job-order/form.html.twig
View file

@ -70,7 +70,7 @@
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="customer_mobile_numbers">Mobile Numbers</label>
<label data-field="customer_mobile_numbers">Contact Numbers</label>
<textarea name="customer_mobile_numbers" id="customer-mobile-numbers" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" rows="4" disabled>{{ obj.getCustomer ? obj.getCustomer.getMobileNumberList|join("\r\n") }}</textarea>
<div class="form-control-feedback hide" data-field="customer_mobile_numbers"></div>
</div>