Version bump 2.0.31

Author: Chris Gårdenberg

content/style/frontendstyle.css

@@ -839,6 +839,10 @@ h1.courseTitle:hover,
 	display: none;
 }
 
+.eduadmin .myReservationsTable th, .eduadmin .myReservationsTable td {
+	padding: 5px;
+}
+
 .edu-DayPopup.cloned .scrollable-full-height {
 	overflow: auto;
 	max-height: 400px;

content/template/bookingTemplate/participants/contact-participant.php

@@ -85,7 +85,7 @@
 			echo ' value="' . esc_attr( $sub_event['SessionId'] ) . '"> ';
 			echo esc_html( wp_strip_all_tags( $sub_event['SessionName'] ) );
 			echo esc_html( $hide_sub_event_date_info ? '' : ' (' . date( 'd/m H:i', strtotime( $sub_event['StartDate'] ) ) . ' - ' . date( 'd/m H:i', strtotime( $sub_event['EndDate'] ) ) . ') ' );
-			echo( intval( $s ) > 0 ? '&nbsp;<i class="priceLabel">' . esc_html( convert_to_money( $s ) ) . '</i>' : '' );
+			echo( intval( $s ) > 0 ? '&nbsp;<i class="priceLabel">' . esc_html( convert_to_money( $s ) . ' ' . ( $inc_vat ? __( 'inc vat', 'eduadmin-booking' ) : __( 'ex vat', 'eduadmin-booking' ) ) ) . '</i>' : '' );
 			echo "</label>\n";
 		}
 		echo '<br />';

content/template/myPagesTemplate/bookings.php

@@ -31,7 +31,8 @@
 
 	krsort( $bookings );
 
-	$currency = get_option( 'eduadmin-currency', 'SEK' );
+	$currency               = get_option( 'eduadmin-currency', 'SEK' );
+	$selected_price_setting = get_option( 'eduadmin-profile-priceType', 'IncVat' );
 	?>
 	<table class="myReservationsTable">
 		<tr>
@@ -61,7 +62,7 @@
 					<td><?php echo esc_html( $name ); ?></td>
 					<td><?php echo wp_kses_post( get_old_start_end_display_date( $book['Event']['StartDate'], $book['Event']['EndDate'], true ) ); ?></td>
 					<td align="right"><?php echo esc_html( $book['NumberOfParticipants'] ); ?></td>
-					<td align="right"><?php echo esc_html( convert_to_money( $book['TotalPriceIncVat'], $currency ) ); ?></td>
+					<td align="right"><?php echo esc_html( convert_to_money( ( 'IncVat' === $selected_price_setting ? $book['TotalPriceIncVat'] : $book['TotalPriceExVat'] ), $currency ) ); ?></td>
 				</tr>
 				<?php
 				if ( ! empty( $book['Participants'] ) ) {

eduadmin.php

@@ -9,7 +9,7 @@
  * Plugin URI:	https://www.eduadmin.se
  * Description:	EduAdmin plugin to allow visitors to book courses at your website
  * Tags:	booking, participants, courses, events, eduadmin, lega online
- * Version:	2.0.30
+ * Version:	2.0.31
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 4.7

includes/booking-settings.php

@@ -937,7 +937,7 @@ function edu_write_options( $g, $array, $depth, $selected_option ) {
 							</td>
 						</tr>
 					</table>
-					<br />                    <p class="submit">
+					<br />					<p class="submit">
 						<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php echo __( "Save settings", 'eduadmin-booking' ); ?>" />
 					</p>
 					<div id="edu-formSettings" class="eduWindow" style="display: none;">

includes/edu-options.php

@@ -8,6 +8,7 @@
 
 require_once 'detail-settings.php';
 require_once 'booking-settings.php';
+require_once 'profile-settings.php';
 require_once 'style-settings.php';
 
 add_action( 'admin_init', 'eduadmin_settings_init' );
@@ -159,6 +160,9 @@ function eduadmin_settings_init() {
 	/* Plugin settings */
 	register_setting( 'eduadmin-plugins', 'eduadmin-plugin-settings' );
 
+	/* Profile page settings */
+	register_setting( 'eduadmin-profile', 'eduadmin-profile-priceType' );
+
 	/* Global settings */
 	register_setting( 'eduadmin-rewrite', 'eduadmin-spotsLeft' );
 	register_setting( 'eduadmin-rewrite', 'eduadmin-spotsSettings' );
@@ -222,6 +226,7 @@ function eduadmin_backend_menu() {
 	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - List view', 'eduadmin-booking' ), __( 'List settings', 'eduadmin-booking' ), $level, 'eduadmin-settings-view', 'edu_render_list_settings_page' );
 	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - Detail view', 'eduadmin-booking' ), __( 'Detail settings', 'eduadmin-booking' ), $level, 'eduadmin-settings-detail', 'edu_render_detail_settings_page' );
 	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - Booking view', 'eduadmin-booking' ), __( 'Booking settings', 'eduadmin-booking' ), $level, 'eduadmin-settings-booking', 'edu_render_booking_settings_page' );
+	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - Profile view', 'eduadmin-booking' ), __( 'Profile settings', 'eduadmin-booking' ), $level, 'eduadmin-settings-profile', 'edu_render_profile_settings_page' );
 	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - Style', 'eduadmin-booking' ), __( 'Style settings', 'eduadmin-booking' ), $level, 'eduadmin-settings-style', 'edu_render_style_settings_page' );
 	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - Plugins', 'eduadmin-booking' ), __( 'Plugins', 'eduadmin-booking' ), $level, 'eduadmin-settings-plugins', 'edu_render_plugin_page' );
 	add_submenu_page( 'eduadmin-settings', __( 'EduAdmin - Api Authentication', 'eduadmin-booking' ), __( 'Api Authentication', 'eduadmin-booking' ), $level, 'eduadmin-settings-api', 'edu_render_settings_page' );

includes/profile-settings.php

@@ -0,0 +1,33 @@
+<?php
+// phpcs:disable WordPress.NamingConventions,Squiz,WordPress.WhiteSpace,Generic.WhiteSpace
+function edu_render_profile_settings_page() {
+	$t = EDU()->start_timer( __METHOD__ );
+	if ( empty( EDUAPI()->api_token ) ) {
+		add_action( 'admin_notices', array( 'EduAdmin', 'SetupWarning' ) );
+	}
+	?>
+	<div class="eduadmin wrap">
+		<h2><?php echo esc_html( sprintf( __( 'EduAdmin settings - %s', 'eduadmin-booking' ), __( 'Profile settings', 'eduadmin-booking' ) ) ); ?></h2>
+		<form method="post" action="options.php">
+			<?php settings_fields( 'eduadmin-profile' ); ?>
+			<?php do_settings_sections( 'eduadmin-profile' ); ?>
+			<div class="block">
+				<h3><?php _e( 'Price settings', 'eduadmin-booking' ); ?></h3>
+				<?php $selected_price_setting = get_option( 'eduadmin-profile-priceType', 'IncVat' ); ?>
+				<select name="eduadmin-profile-priceType">
+					<option<?php echo( 'IncVat' === $selected_price_setting ? ' selected="selected"' : '' ); ?>
+						value="IncVat"><?php esc_html_e( 'VAT Inclusive', 'eduadmin-booking' ); ?></option>
+					<option<?php echo( 'ExVat' === $selected_price_setting ? ' selected="selected"' : '' ); ?>
+						value="ExVat"><?php esc_html_e( 'VAT Excluded', 'eduadmin-booking' ); ?></option>
+				</select>
+				<i>Select how you want the logged in users to view the prices in their list of orders/bookings.</i>
+				<br />
+				<p class="submit">
+					<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php echo __( "Save settings", 'eduadmin-booking' ); ?>" />
+				</p>
+			</div>
+		</form>
+	</div>
+	<?php
+	EDU()->stop_timer( $t );
+}

readme.md

@@ -37,6 +37,10 @@ If you notice that your API key doesn't work any more, you have to contact us.
 
 == Changelog ==
 
+### 2.0.31
+- add: Settings page with settings for "My page" / User profiles (Fixes: [#213](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/214))
+- fix: Showing both incl. VAT and excl. VAT prices
+
 ### 2.0.30
 - fix: And actually checking the required-attribute in the validation would help.