Small bump in functions

Author: Chris Gårdenberg

CHANGELOG.md

@@ -3,6 +3,11 @@
 ## [Unreleased]
 ### Added
 
+## [0.9.17]
+### Added
+- Option to hide invoice information when events are free
+- If the above option is used, hides invoice information from free events
+
 ## [0.9.16]
 ### Added
 - `edu.apiclient.AfterUpdate` can be used as a function in javascript to run after the page has loaded all EduAdmin-related things.
@@ -119,7 +124,8 @@
 - Added inquiry support in course
 
 
-[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.16...HEAD
+[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.17...HEAD
+[0.9.16]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.16...v0.9.17
 [0.9.16]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.15...v0.9.16
 [0.9.15]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.14...v0.9.15
 [0.9.14]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.13...v0.9.14

content/template/bookingTemplate/customerView.php

@@ -8,6 +8,10 @@
 					<input type="text" required name="customerName" placeholder="<?php edu_e("Customer name"); ?>" value="<?php echo @esc_attr($customer->CustomerName); ?>" />
 				</div>
 			</label>
+			<?php
+			$noInvoiceFreeEvents = get_option('eduadmin-noInvoiceFreeEvents', false);
+			if($noInvoiceFreeEvents && $firstPrice->Price > 0) {
+			?>
 			<label>
 				<div class="inputLabel">
 					<?php edu_e("Org.No."); ?>
@@ -124,7 +128,7 @@
 				</div>
 			</label>
 			<?php
-
+			}
 			$so = new XSorting();
 			$s = new XSort('SortIndex', 'ASC');
 			$so->AddItem($s);
@@ -169,7 +173,7 @@
 				}
 				renderAttribute($attr, false, "", $data);
 			}
-
+			if($noInvoiceFreeEvents && $firstPrice->Price > 0) {
 			?>
 			<label>
 				<div class="inputHolder alsoInvoiceCustomer">
@@ -178,4 +182,5 @@
 					<?php edu_e("Use other information for invoicing"); ?>
 				</div>
 			</label>
+			<?php } ?>
 		</div>

content/template/bookingTemplate/singlePersonBooking.php

@@ -58,7 +58,10 @@
 		<?php edu_e("You cannot add any more participants."); ?>
 	</div>
 </div>
-
+<?php
+$noInvoiceFreeEvents = get_option('eduadmin-noInvoiceFreeEvents', false);
+if($noInvoiceFreeEvents && $firstPrice->Price > 0) {
+?>
 <div class="customerView">
 	<label>
 		<div class="inputLabel">
@@ -155,7 +158,7 @@
 		</label>
 	</div>
 </div>
-
+<?php } ?>
 <div class="attributeView">
 <?php
 	$so = new XSorting();

content/template/bookingTemplate/template_A.php

@@ -212,8 +212,8 @@
 						<?php edu_e("Select the event you want to book"); ?>
 					</div>
 
-					<select name="eid" class="dateInfo" onchange="eduBookingView.SelectEvent(this);">
-						<option value="-1"><?php edu_e("Select event"); ?></option>
+					<select name="eid" required class="dateInfo" onchange="eduBookingView.SelectEvent(this);">
+						<option value=""><?php edu_e("Select event"); ?></option>
 						<?php foreach($events as $ev): ?>
 							<option value="<?php echo $ev->EventID; ?>">
 							<?php

eduadmin.php

@@ -12,7 +12,7 @@
  * Plugin URI:	http://www.eduadmin.se
  * Description:	EduAdmin plugin to allow visitors to book courses at your website
  * Tags:	booking, participants, courses, events, eduadmin, lega online
- * Version:	0.9.16
+ * Version:	0.9.17
  * Requires at least: 3.0
  * Tested up to: 4.7.1
  * Author:	Chris Gårdenberg, MultiNet Interactive AB
@@ -79,7 +79,7 @@ function edu_call_home()
         'wpVersion' => $wp_version,
         'token' => get_option('eduadmin-api-key'),
         'officialVersion' => file_exists(dirname(__FILE__) . "/.official.plugin.php"),
-        'pluginVersion' => '0.9.16'
+        'pluginVersion' => '0.9.17'
     );
 
     $callHomeUrl = 'http://ws10.multinet.se/edu-plugin/wp_phone_home.php';

includes/_options.php

@@ -41,6 +41,7 @@ function eduadmin_settings_init()
 	register_setting('eduadmin-booking', 'eduadmin-allowInterestRegEvent');
 	register_setting('eduadmin-booking', 'eduadmin-hideSubEventDateTime');
 	register_setting('eduadmin-booking', 'eduadmin-allowDiscountCode');
+	register_setting('eduadmin-booking', 'eduadmin-noInvoiceFreeEvents');
 
 	/* Phrase settings */
 	register_setting('eduadmin-phrases', 'eduadmin-phrases');

includes/bookingSettings.php

@@ -147,6 +147,12 @@ function edu_writeOptions($g, $array, $depth, $selectedOption)
 			<h4><?php _e("Form settings", "eduadmin"); ?></h4>
 			<button class="button" disabled onclick="showFormWindow(); return false;"><?php _e("Show settings", "eduadmin"); ?></button>
 			<br />
+			<br />
+			<?php $noInvoiceFreeEvents = get_option('eduadmin-noInvoiceFreeEvents', false); ?>
+			<label>
+				<input type="checkbox" name="eduadmin-noInvoiceFreeEvents"<?php echo ($noInvoiceFreeEvents === "true" ? " checked=\"checked\"" : ""); ?> value="true" />
+				<?php _e("Hide invoice information if the event is free", "eduadmin"); ?>
+			</label>
 			<h3><?php _e("Price name settings", "eduadmin"); ?></h3>
 			<?php
 			$priceNameSetting = get_option('eduadmin-selectPricename', 'firstPublic');