small logical fix for vacation travel form

cjmcdonald42 · Nov 25, 2018 · 0f73afa · 0f73afa
1 parent 0155839
commit 0f73afa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/local/mxschool/vacation_travel/vacation_form.php b/local/mxschool/vacation_travel/vacation_form.php
@@ -133,7 +133,7 @@ public function validation($data, $files) {
                         $errors['dep_details'] = get_string('vacation_travel_form_error_nodriver', 'local_mxschool');
                     } else if ($data['dep_type'] === 'Non-MX Bus') {
                         $errors['dep_details'] = get_string('vacation_travel_form_error_nodetails', 'local_mxschool');
-                    } else if ($data['dep_site'] === '0') {
+                    } else if ($data['dep_mxtransportation'] && $data['dep_site'] === '0') {
                         $errors['dep_details'] = get_string('vacation_travel_form_error_noother', 'local_mxschool');
                     }
                 }
@@ -175,7 +175,7 @@ public function validation($data, $files) {
                             $errors['ret_details'] = get_string('vacation_travel_form_error_nodriver', 'local_mxschool');
                         } else if ($data['ret_type'] === 'Non-MX Bus') {
                             $errors['ret_details'] = get_string('vacation_travel_form_error_nodetails', 'local_mxschool');
-                        } else if ($data['ret_site'] === '0') {
+                        } else if ($data['ret_mxtransportation'] && $data['ret_site'] === '0') {
                             $errors['ret_details'] = get_string('vacation_travel_form_error_noother', 'local_mxschool');
                         }
                     }

diff --git a/local/mxschool/version.php b/local/mxschool/version.php
@@ -27,7 +27,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'local_mxschool';
-$plugin->version = 2018110600;
+$plugin->version = 2018112500;
 $plugin->release = 'v3.0';
 $plugin->requires = 2017111300; // Moodle 3.4+.
 $plugin->maturity = MATURITY_RC; // Release Candidiate for v3.0