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

Add source to invoice criteria. Modify invoice rules to get service fees from... #1701

Merged
arcticzero merged 217 commits from 746-resq-2-0-final into master 2023-11-22 08:54:48 +00:00
Conversation 2 Commits 217 Files changed 179 +7 -7
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9bc9b13055 - Show all commits

6
src/Controller/ReportController.php
View file

@ -536,7 +536,7 @@ class ReportController extends Controller
'Mobile Number', 'Mobile Number',
'Landline Number', 'Landline Number',
'Office Number', 'Office Number',
'Fax Number', 'Alternative Phone Number',
'Plate Number', 'Plate Number',
'Date Mobile App Downloaded', 'Date Mobile App Downloaded',
'Mobile Number Using Mobile App', 'Mobile Number Using Mobile App',
@ -706,7 +706,7 @@ class ReportController extends Controller
'Customer Mobile Phone', 'Customer Mobile Phone',
'Customer Landline Phone', 'Customer Landline Phone',
'Customer Office Phone', 'Customer Office Phone',
'Customer Fax Phone', 'Customer Alternative Phone',
'Customer Email Address', 'Customer Email Address',
'Customer Notes', 'Customer Notes',
'Customer Has Third Party Privacy Policy?', 'Customer Has Third Party Privacy Policy?',
@ -1142,7 +1142,7 @@ class ReportController extends Controller
'Mobile Phone', 'Mobile Phone',
'Landline', 'Landline',
'Office Phone', 'Office Phone',
'Fax', 'Alternative Phone',
'Email Address', 'Email Address',
'Vehicle Manufacturer', 'Vehicle Manufacturer',
'Vehicle Make', 'Vehicle Make',

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

@ -219,7 +219,7 @@
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<label data-field="phone_fax"> <label data-field="phone_fax">
Fax Alternative Phone
</label> </label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>

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

@ -138,7 +138,7 @@
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_fax">Fax</label> <label data-field="customer_phone_fax">Alternative Phone</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled>

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

@ -138,7 +138,7 @@
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_fax">Fax</label> <label data-field="customer_phone_fax">Alternative Phone</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled>

2
translations/messages.en.yaml
View file

@ -39,7 +39,7 @@ label.pdf.mobile_phone: 'Mobile Phone:'
label.pdf.delivery_date: 'Delivery Date:' label.pdf.delivery_date: 'Delivery Date:'
label.pdf.landline: 'Landline:' label.pdf.landline: 'Landline:'
label.pdf.office_phone: 'Office Phone:' label.pdf.office_phone: 'Office Phone:'
label.pdf.fax: 'Fax:' label.pdf.fax: 'Alternative Phone:'
label.pdf.vehicle_details: 'Vehicle Details' label.pdf.vehicle_details: 'Vehicle Details'
label.pdf.plate_number: 'Plate Number:' label.pdf.plate_number: 'Plate Number:'
label.pdf.vehicle_color: 'Vehicle Color:' label.pdf.vehicle_color: 'Vehicle Color:'