';
rider_table += '';
}
@@ -1029,6 +1152,7 @@ $(function() {
{% endif %}
$("#row-form").submit(function(e) {
+ e.preventDefault();
if (form_in_process) {
alert("Cannot submit form twice. First submission still in progress.");
return false;
@@ -1191,6 +1315,7 @@ $(function() {
} else {
$("#current-battery, #warranty-expiration").val("No current battery").css('color', '#f4516c');
}
+ $("#or_name").val(vdata.customer.first_name + ' ' + vdata.customer.last_name);
})
}).focus();
{% endif %}
@@ -1414,7 +1539,8 @@ $(function() {
// update invoice when promo is changed
$("#invoice-discount").change(function() {
- generateInvoice();
+ console.log('discount ' + $("#invoice-discount").val());
+ generateInvoice();
});
// trigger update when service type is changed
@@ -1758,6 +1884,53 @@ $(function() {
generateInvoice();
});
+ $("#customer-first-name, #customer-last-name").change(function() {
+ // autopopulate OR name with customer name
+ var cust_name = $("#customer-first-name").val() + ' ' + $("#customer-last-name").val();
+ $("#or_name").val(cust_name);
+ });
+
+ $('.dp').on('changeDate', function() {
+ // check date schedule if it's earlier
+ // if so, show an alert to let user know
+ var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
+ var date_schedule = new Date(date_time);
+ var current_date = new Date('{{ current_date|date('Y-m-d g:i A') }}');
+
+ // check if date is earlier than current
+ if (date_schedule < current_date)
+ {
+ swal({
+ title: 'Warning!',
+ text: 'Schedule date and time is before today\'s date and time.',
+ type: 'warning',
+ });
+ }
+ });
+
+ $('.tp').on('changeTime.timepicker', function(e) {
+ // set the schedule time what the user selects
+ $('#date-schedule-time').val(e.time.value);
+ });
+
+ $('.tp').on('hide.timepicker', function(e) {
+ // check time schedule along with date if it's earlier than current date
+ var date_time = $('#date-schedule-date').val() + ' ' + $('#date-schedule-time').val()
+ var date_schedule = new Date(date_time);
+ var current_date = new Date('{{ current_date|date('Y-m-d g:i A') }}');
+
+ // check if date is earlier than current
+ if (date_schedule < current_date)
+ {
+ swal({
+ title: 'Warning!',
+ text: 'Schedule date and time is before today\'s date and time.',
+ type: 'warning',
+ });
+ }
+
+ });
+
});
{% endblock %}
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index e628d93b..f0769f18 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -92,57 +92,57 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
{% trans %}country_code_prefix{% endtrans %}
-
-
+
+
-
+
{% trans %}country_code_prefix{% endtrans %}
-
-
+
+
-
+
{% trans %}country_code_prefix{% endtrans %}
-
-
+
+
-
+
{% trans %}country_code_prefix{% endtrans %}
-
-
+
+
-
-
-
+
+
+
@@ -178,17 +178,26 @@
-
+
-
+
+
+
+
+ Job Orders (Behind Schedule)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
diff --git a/templates/job-order/cmb.list.open.html.twig b/templates/job-order/cmb.list.open.html.twig
index a575e645..4fa85c70 100644
--- a/templates/job-order/cmb.list.open.html.twig
+++ b/templates/job-order/cmb.list.open.html.twig
@@ -93,12 +93,12 @@
},
rows: {
beforeTemplate: function (row, data, index) {
- if (data.flag_advance) {
- $(row).addClass('m-table__row--danger');
+ if (data.status == 'In Progress') {
+ $(row).addClass('m-table__row--is_in_progress');
}
- if (data.is_mobile) {
- $(row).addClass('m-table__row--is_mobile');
+ if (data.status == 'Assigned') {
+ $(row).addClass('m-table__row--is_assigned');
}
}
},
@@ -131,6 +131,10 @@
field: 'type',
title: 'Schedule'
},
+ {
+ field: 'date_start',
+ title: 'Start Date'
+ },
{
field: 'date_schedule',
title: 'Scheduled Date'
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index c0fb8ca1..3e12543b 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -1,27 +1,27 @@
# text
-title_login: Motolite Res-Q | Login
-block_title: Motolite Res-Q
+title_login: Res-Q for CMB | Login
+block_title: Res-Q for CMB
control_panel_sign_in: Sign-in to Control Panel
-alt_image_logo_login: Res-Q
-alt_image_dashboard: Motolite
-copyright: Motolite Res-Q
+alt_image_logo_login: Res-Q for CMB
+alt_image_dashboard: Res-Q for CMB
+copyright: Res-Q for CMB
battery_size_tradein_brand: Trade-in Motolite
battery_size_tradein_premium: Trade-in Premium
battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
-jo_title_pdf: Motolite Res-Q Job Order
-country_code_prefix: '+63'
-delivery_instructions_label: Delivery Instructions
+jo_title_pdf: Res-Q for CMB Job Order
+country_code_prefix: '+60'
+delivery_instructions_label: 'CarFix Details'
# images
-image_logo_login: /assets/images/logo-resq.png
-icon_login: /assets/demo/default/media/img/logo/favicon.ico
-icon_base_32x32: /assets/images/favicon/favicon-32x32.png
-icon_base_16x16: /assets/images/favicon/favicon-16x16.png
-image_dashboard: /assets/images/logo-motolite.png
-image_jo_pdf: /public/assets/images/logo-resq.png
+image_logo_login: /assets/images/black-text-logo-01.png
+icon_login: /assets/images/battery-assist-bm-logo-32x32.png
+icon_base_32x32: /assets/images/black-text-logo-01-32x32.png
+icon_base_16x16: /assets/images/black-text-logo-01-16x16.png
+image_dashboard: /assets/images/century_logo.png
+image_jo_pdf: /public/assets/images/black-text-logo-01-115x115.png
# default point for maps
-default_lat: 14.6091
-default_long: 121.0223
-default_region: ph
+default_lat: 3.084216
+default_long: 101.6129996
+default_region: my