Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 330-entity-logging-service-bundle

2020-02-26 00:54:40 +00:00 · 2020-02-26 00:54:40 +00:00 · 3231aad154
commit 3231aad154
parent c2d109ae0a 5b19302752
10 changed files with 68 additions and 39 deletions
--- a/.env.dist
+++ b/.env.dist
@ -15,7 +15,7 @@ APP_SECRET=b344cd6cd151ae1d61403ed55806c5ce
 # Configure your db driver and server_version in config/packages/doctrine.yaml
 DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
 ###< doctrine/doctrine-bundle ###
-GMAPS_API_KEY=insertgmapsapikeyhere
+GMAPS_API_KEY=insert_gmapsapikey_here

 # rising tide sms gateway
 RT_USER=rt_user
@ -28,7 +28,7 @@ RT_SHORTCODE=1234
 MQTT_IP_ADDRESS=localhost
 MQTT_PORT=8883
 MQTT_CERT=/location/of/cert/file.crt
-MQTT_WS_HOST=insertiphere
+MQTT_WS_HOST=insert_ip_here
 MQTT_WS_PORT=8083

 # redis client
@ -38,20 +38,22 @@ REDIS_CLIENT_PORT=6379
 REDIS_CLIENT_PASSWORD=foobared

 # privacy policy ids
-POLICY_PROMO=insertpromopolicyidhere
-POLICY_THIRD_PARTY=insertthirdpartypolicyidhere
-POLICY_MOBILE=insertmobilepolicyidhere
+POLICY_PROMO=insert_promopolicyid_here
+POLICY_THIRD_PARTY=insert_thirdpartypolicyid_here
+POLICY_MOBILE=insert_mobilepolicyid_here

 # OTP
-OTP_MODE=settotestorrandom
+OTP_MODE=set_to_test_or_random

 # geofence
-GEOFENCE_ENABLE=settotrueorfalse
+GEOFENCE_ENABLE=set_to_true_or_false

 # unknown manufacturer and vehicle ids
-CVU_MFG_ID=insertmfgidforunknownvehicles
-CVU_BRAND_ID=insertbrandidforunknownvehicles
+CVU_MFG_ID=insert_mfgid_for_unknown_vehicles
+CVU_BRAND_ID=insert_brandid_for_unknown_vehicles

 # country code prefix
-COUNTRY_CODE=+insertcountrycodehere
+COUNTRY_CODE=+insert_country_code_here

+# dashboard
+DASHBOARD_ENABLE=set_to_true_or_false
--- a/config/cmb.menu.yaml
+++ b/config/cmb.menu.yaml
@ -110,10 +110,6 @@ main_menu:
      acl: jo_walkin.form
      label: Walk-in
      parent: joborder
-    - id: jo_fulfill
-      acl: jo_fulfill.list
-      label: Fulfillment
-      parent: joborder
    - id: jo_open
      acl: jo_open.list
      label: Open
--- a/config/menu.yaml
+++ b/config/menu.yaml
@ -110,10 +110,6 @@ main_menu:
      acl: jo_walkin.form
      label: Walk-in
      parent: joborder
-    - id: jo_fulfill
-      acl: jo_fulfill.list
-      label: Fulfillment
-      parent: joborder
    - id: jo_open
      acl: jo_open.list
      label: Open
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@ -6,3 +6,4 @@ twig:
        gmaps_api_key: "%env(GMAPS_API_KEY)%"
        mqtt_host: "%env(MQTT_WS_HOST)%"
        mqtt_port: "%env(MQTT_WS_PORT)%"
+        dashboard_enable: "%env(DASHBOARD_ENABLE)%"
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@ -276,13 +276,15 @@ class JobOrderController extends Controller
            {
                $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]);
                $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]);
-                $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]);
+                // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]);
+                $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]);
                $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
            }
            else
            {
-                $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]);
-                $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]);
+                // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]);
+                $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]);
+                $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
                $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]);
            }
            
@ -1028,12 +1030,12 @@ class JobOrderController extends Controller
        return $this->render($template, $params);
    }

-    public function walkInEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler)
+    public function walkInEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler, $id)
    {
        $this->denyAccessUnlessGranted('jo_walkin.edit', null, 'No access.');

        $error_array = [];
-        $error_array = $jo_handler->processOneStepJobOrder($req, $id);
+        $error_array = $jo_handler->processWalkinJobOrder($req, $id);

        // check if any errors were found
        if (!empty($error_array)) {
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@ -1383,6 +1383,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
    {
        $params['obj'] = new JobOrder();
        $params['mode'] = 'onestep';
+        $params['jo_service_charges'] = [];

        $this->fillDropdownParameters($params);
        $this->fillFormTags($params);
@ -1403,7 +1404,22 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
        $params['mode'] = 'onestep-edit';
        $params['cvid'] = $obj->getCustomerVehicle()->getID();
        $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
-        $params['jo_service_charges'] = $obj->getMeta('service_charges');
+
+        // get service charges
+        $sc_array = [];
+        $jo_service_charges = $obj->getMeta('service_charges');
+        if (!(empty($jo_service_charges)))
+        {
+            foreach ($jo_service_charges as $jo_sc_id)
+            {
+                // find service charge
+                $sc_obj = $em->getRepository(ServiceCharge::class)->find($jo_sc_id);
+
+                $sc_array[] = $sc_obj;
+            }
+        }
+
+        $params['jo_service_charges'] = $sc_array;

        $this->fillDropdownParameters($params);
        $this->fillFormTags($params);
@ -2976,4 +2992,17 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                    ->setParameter('status', $status);
        }
    }
+
+    public function getEditRoute($jo_id)
+    {
+        $jo = $this->em->getRepository(JobOrder::class)->find($jo_id);
+        if (empty($jo))
+            throw new NotFoundHttpException('The item does not exist');
+
+        // check transaction origin
+        if ($jo->getSource() == TransactionOrigin::WALK_IN)
+            return 'jo_walkin_edit_form';
+        else
+            return 'jo_onestep_edit_form';
+    }
 }
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@ -2584,4 +2584,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
                    ->setParameter('status', $status);
        }
    }
+
+    public function getEditRoute()
+    {
+    }
 }
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@ -15,7 +15,9 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.min.js" type="text/javascript"></script>
 <script src="{{ asset('assets/js/dashboard_map.js') }}"></script>
 <script src="{{ asset('assets/js/map_mqtt.js') }}"></script>
-{{ include('map/' ~ map_js_file) }}
+{% if dashboard_enable == 'true' %}
+    {{ include('map/' ~ map_js_file) }}
+{% endif %}
 <script>

 function initMap(r_markers, c_markers, icons) {
@ -58,6 +60,7 @@ function initEventHandler(dashmap) {
    event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
 }

+{% if dashboard_enable == 'true' %}
 // create icons
 var icons = {
    'rider_active_jo': L.divIcon({
@ -80,11 +83,12 @@ var icons = {
    })
 };

-var r_markers = {};
-var c_markers = {};
+    var r_markers = {};
+    var c_markers = {};

-var dashmap = initMap(r_markers, c_markers, icons);
-initEventHandler(dashmap, icons);
+    var dashmap = initMap(r_markers, c_markers, icons);
+    initEventHandler(dashmap, icons);
+{% endif %}

 </script>
 {% endblock %}
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@ -508,19 +508,19 @@
                                    {% endif %}
                                </div>
                                <!-- loop through existing service charges for job order -->
-                                {% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %}
+                                {% for jo_sc in jo_service_charges %}
                                    <div class="form-group m-form__group row">
                                        <div class="col-lg-6">
                                            <div class="col-lg-12 form-group-inner">
                                                <select class="form-control m-input sc-select" name="service_charges">
                                                    {% for key, sc in service_charges %}
-                                                        <option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.id == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
+                                                        <option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.getID == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
                                                    {% endfor %}
                                                </select>
                                            </div>
                                        </div>
                                        <div class="col-lg-5">
-                                            <input class="form-control sc-amount" type="text" value="0" disabled>
+                                            <input class="form-control sc-amount" type="text" value="{{ jo_sc.getAmount }}" disabled>
                                        </div>
                                        <div class="col-lg-1">
                                            <button class="btn btn-danger btn-sc-remove">X</button>
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@ -347,7 +347,7 @@
                                            </label>
                                        {% endif %}
                                        <div class="form-control-feedback hide" data-field="hub"></div>
-                                        <input type="hidden" id="hub-field" name="hub_id" value="">
+                                        <input type="hidden" id="hub-field" name="hub_id" value="{{ obj.getHub ? obj.getHub.getID : "" }}">
                                        <div class="table-frame" data-name="hub">
                                            <table id="hubs-table" class="table table-compact table-hover table-clickable m-table">
                                                <thead>
@ -557,7 +557,7 @@ function get_vehicle_makes(mfg_id, vid = 0) {

 $(function() {
    var form_in_process = false;
-    var selected_hub = '';
+    var selected_hub = '{{ obj.getHub ? obj.getHub.getID : "" }}';

    $(function() {
        $('#hubs-table').on('click', 'tr', function() {
@ -592,11 +592,6 @@ $(function() {
    // add invoice items to data
    fields['invoice_items'] = invoiceItems;

-    {% if mode in ['update-processing', 'update-reassign-hub'] %}
-    // add selected hub to data
-        fields['hub'] = selectedHub;
-    {% endif %}
-
    e.preventDefault();

    $.ajax({