+{% endblock %}
+
+{% block scripts %}
+{{ include('map/' ~ map_js_file) }}
+
+
+
+
+{% endblock %}
+
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 1914dfe9..05b36628 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -1,1674 +1,1710 @@
-{% extends 'base.html.twig' %}
-
-{% block body %}
-
-
-
-
- {% endif %}
-{% endblock %}
-
-{% block scripts %}
-
-
-
-
-
-{% endblock %}
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+ {% endif %}
+{% endblock %}
+
+{% block scripts %}
+{{ include('map/' ~ map_js_file) }}
+
+
+
+
+{% endblock %}
+
diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
new file mode 100644
index 00000000..c9e14254
--- /dev/null
+++ b/templates/job-order/form.onestep.html.twig
@@ -0,0 +1,1421 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ One-step Job Order
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+{{ include('map/' ~ map_js_file) }}
+
+
+
+
+{% endblock %}
+
diff --git a/templates/job-order/form.pdf.html.twig b/templates/job-order/form.pdf.html.twig
index 5499f1fb..4602b6e6 100644
--- a/templates/job-order/form.pdf.html.twig
+++ b/templates/job-order/form.pdf.html.twig
@@ -221,7 +221,7 @@
-
+
@@ -651,8 +651,8 @@ $(function() {
var map = new GMaps({
div: '#m_gmap',
- lat: 14.6091,
- lng: 121.0223,
+ lat: {% trans %}default_lat{% endtrans %},
+ lng: {% trans %}default_long{% endtrans %},
click: function(e) {
// handle click in map
selectPoint(map, e.latLng);
diff --git a/templates/job-order/list.fulfillment.html.twig b/templates/job-order/list.fulfillment.html.twig
index f38bd4a5..46210a9d 100644
--- a/templates/job-order/list.fulfillment.html.twig
+++ b/templates/job-order/list.fulfillment.html.twig
@@ -108,7 +108,7 @@
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
- var actions = '
';
+ var actions = '
' + '
';
return actions;
},
diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig
index cea8df51..62af1e3a 100644
--- a/templates/job-order/list.open.html.twig
+++ b/templates/job-order/list.open.html.twig
@@ -122,6 +122,9 @@
{% if is_granted('jo_open.edit') %}
actions += '
';
{% endif %}
+ {% if is_granted('jo_onestep.edit') %}
+ actions += '
';
+ {% endif %}
return actions;
},
diff --git a/templates/job-order/popup.html.twig b/templates/job-order/popup.html.twig
new file mode 100644
index 00000000..509c7296
--- /dev/null
+++ b/templates/job-order/popup.html.twig
@@ -0,0 +1,8 @@
+{% set cust = jo.getCustomer %}
+{% set cv = jo.getCustomerVehicle %}
+
{{ cust.getNameDisplay }}
+{{ cv.getPlateNumber }}
+
Job Order #{{ jo.getID }}
+{{ jo.getServiceTypeName }}
+{{ jo.getStatusText }}
+
diff --git a/templates/map/initBingMap.js b/templates/map/initBingMap.js
new file mode 100644
index 00000000..0183fe54
--- /dev/null
+++ b/templates/map/initBingMap.js
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/templates/map/initGoogleMap.js b/templates/map/initGoogleMap.js
new file mode 100644
index 00000000..51349ae2
--- /dev/null
+++ b/templates/map/initGoogleMap.js
@@ -0,0 +1,22 @@
+
+
+
diff --git a/templates/map/initOpenStreetMap.js b/templates/map/initOpenStreetMap.js
new file mode 100644
index 00000000..358b91d4
--- /dev/null
+++ b/templates/map/initOpenStreetMap.js
@@ -0,0 +1,143 @@
+
+
+
diff --git a/templates/map/joOpenStreetMap.js b/templates/map/joOpenStreetMap.js
new file mode 100644
index 00000000..3d92c330
--- /dev/null
+++ b/templates/map/joOpenStreetMap.js
@@ -0,0 +1,26 @@
+
+
+
diff --git a/templates/outlet/form.html.twig b/templates/outlet/form.html.twig
index b5abfd4b..89f94857 100644
--- a/templates/outlet/form.html.twig
+++ b/templates/outlet/form.html.twig
@@ -143,12 +143,34 @@
{% block scripts %}
-
+
+