Merge branch 'master' into '782-invoice-and-jo-modifications-for-regional-pricing'

Master

See merge request jankstudio/resq!901

src/Controller/CustomerAppAPI/ApiController.php

@@ -162,6 +162,6 @@ class ApiController extends BaseApiController
 
     protected function getGeoErrorMessage()
     {
-        return 'Oops! Our service is limited to some areas in Metro Manila, Laguna, Cavite, Pampanga and Baguio only. We will update you as soon as we are able to cover your area';
+        return 'Our services are currently limited to some areas in Metro Manila, Baguio, Batangas, Laguna, Cavite, Pampanga, and Palawan. We will update you as soon as we are available in your area. Thank you for understanding. Keep safe!';
     }
 }

src/Ramcar/TransactionOrigin.php

@@ -17,13 +17,17 @@ class TransactionOrigin extends NameValue
     const YOKOHAMA_TWITTER     = 'yokohama_twitter';
     const YOKOHAMA_INSTAGRAM   = 'yokohama_instagram';
     const YOKOHAMA_CAROUSELL   = 'yokohama_carousell';
+    const HOTLINE_CEBU      = 'hotline_cebu';
+    const FACEBOOK_CEBU     = 'facebook_cebu';
 
     // TODO: for now, resq also gets the walk-in option
     // resq also gets new YOKOHAMA options
     const COLLECTION = [
-        'call' => 'Hotline',
+        'call' => 'Hotline Manila',
+        'hotline_cebu' => 'Hotline Cebu',
         'online' => 'Online',
-        'facebook' => 'Facebook',
+        'facebook' => 'Facebook Manila',
+        'facebook_cebu' => 'Facebook Cebu',
         'vip' => 'VIP',
         'mobile_app' => 'Mobile App',
         'walk_in' => 'Walk-in',
@@ -33,6 +37,6 @@ class TransactionOrigin extends NameValue
         'yokohama_op_facebook' => 'Yokohama OP Facebook',
         'yokohama_twitter' => 'Yokohama Twitter',
         'yokohama_instagram' => 'Yokohama Instagram',
-        'yokohama_carousell' => 'Yokohama Carousell',
+        'yokohama_carousell' => 'Yokohama Carousell'
     ];
 }

src/Service/JobOrderHandler/ResqJobOrderHandler.php

@@ -2919,6 +2919,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         $params['status_cancelled'] = JOStatus::CANCELLED;
         $params['hubs'] = [];
 
+        $branch_codes = [];
         // format duration and distance into friendly time
         foreach ($hubs as $hub) {
             // duration
@@ -4261,6 +4262,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         if ($rejection->getReason() == JORejectionReason::ADMINISTRATIVE)
             return null;
 
+        // check if reason is discount
+        if ($rejection->getReason() == JORejectionReason::DISCOUNT)
+            return null;
+
         // sms content
         // Job Order # - can get from jo
         // Order Date and Time - get from jo

templates/job-order/form.html.twig

@@ -1231,6 +1231,8 @@ $(function() {
     function selectPoint(lat, lng)
     {
         // check if point is in coverage area
+        // commenting out the geofence call for CRM
+        /*
         $.ajax({
             method: "GET",
             url: "{{ url('jo_geofence') }}",
@@ -1248,7 +1250,7 @@ $(function() {
                     type: 'warning',
                 });
             }
-        });
+        }); */
 
         // clear markers
         markerLayerGroup.clearLayers();

templates/job-order/form.view.html.twig

@@ -635,6 +635,8 @@ $(function() {
     function selectPoint(lat, lng)
     {
         // check if point is in coverage area
+        // commenting out the geofence call for CRM
+        /*
         $.ajax({
             method: "GET",
             url: "{{ url('jo_geofence') }}",
@@ -652,7 +654,7 @@ $(function() {
                     type: 'warning',
                 });
             }
-        });
+        }); */
 
         // clear markers
         markerLayerGroup.clearLayers();