Added support for discount codes in bookings

Chris Gårdenberg · Chris Gårdenberg · commit 251e445de983 · 2017-01-17T15:23:23.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@
 - Added `__bookSingleParticipant.php` and `__bookMultipleParticipants.php` to handle different settings.
 - Fixing `frontend.js` to work with single participant-settings.
 
+## [0.9.12]
+### Added
+- Added option `eduadmin-allowDiscountCode`, to enable the customers to enter a discount code when they book participants for a event.
+- Bugfix: When copying contact to participant, correct field is now copied, instead of surname.
+- Added backend-api file to handle checking coupon codes
+- Added support to validate coupon codes against the api
+- Added support to recalculate the price and post the coupon with the Booking
+
+
 ## [0.9.11]
 ### Added
 - Removed `margin-top: 1.0em; vertical-align: top;` from `.inputLabel` and replaced with `vertical-align: middle;`.
@@ -77,7 +86,8 @@
 - Added inquiry support in course
 
 
-[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.11...HEAD
+[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.12...HEAD
+[0.9.12]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.11...v0.9.12
 [0.9.11]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.10...v0.9.11
 [0.9.10]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.9.2.40...v0.9.10
 [0.9.9.2.40]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.9.9.2.39...v0.9.9.2.40
diff --git a/backend/modules/edu.api.coupon.php b/backend/modules/edu.api.coupon.php
@@ -0,0 +1,25 @@
+<?php
+date_default_timezone_set('UTC');
+
+if(!function_exists('edu_api_check_coupon_code'))
+{
+	function edu_api_check_coupon_code($request) {
+		header("Content-type: application/json; charset=UTF-8");
+		global $eduapi;
+
+		$edutoken = edu_decrypt("edu_js_token_crypto", getallheaders()["Edu-Auth-Token"]);
+
+		$objectID = $request['objectId'];
+		$categoryID = $request['categoryId'];
+		$code = $request['code'];
+		$eduapi->debug = true;
+		$vcode = $eduapi->CheckCouponCode($edutoken, $objectID, $categoryID, $code);
+		$eduapi->debug = false;
+		return json_encode($vcode);
+	}
+}
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] == "check_coupon_code")
+{
+	echo edu_api_check_coupon_code($_REQUEST);
+}
diff --git a/content/script/educlient/edu.apiclient.js b/content/script/educlient/edu.apiclient.js
@@ -209,6 +209,25 @@ edu.apiclient = {
 			}
 		});
 	},
+	CheckCouponCode: function(code, objectId, categoryId, onData) {
+		jQuery.ajax({
+			beforeSend: function(xhr) {
+				xhr.setRequestHeader('Edu-Auth-Token', edu.apiclient.authToken);
+			},
+			url: edu.apiclient.baseUrl + '?module=check_coupon_code',
+			type: 'POST',
+			data: {
+				code: code,
+				objectId: objectId,
+				categoryId: categoryId
+			},
+			success: function(d) {
+				if(onData && typeof onData == 'function') {
+					onData(d);
+				}
+			}
+		});
+	},
 	GetCookie: function (name) {
         try {
             var cookie = document.cookie;
diff --git a/content/script/frontendjs.js b/content/script/frontendjs.js
@@ -5,6 +5,7 @@ var eduBookingView = {
 	SingleParticipant: false,
 	MaxParticipants: 0,
 	CurrentParticipants: 0,
+	DiscountPercent: 0,
 	AddParticipant: function() {
 		if(!eduBookingView.SingleParticipant) {
 			if(eduBookingView.MaxParticipants == -1 || eduBookingView.CurrentParticipants < eduBookingView.MaxParticipants)
@@ -171,8 +172,8 @@ var eduBookingView = {
 				}
 			}
 
-			if(totalPriceDiscountPercent != 0) {
-				var disc = (totalPriceDiscountPercent / 100) * newPrice;
+			if(totalPriceDiscountPercent != 0 || eduBookingView.DiscountPercent != 0) {
+				var disc = ((totalPriceDiscountPercent + eduBookingView.DiscountPercent) / 100) * newPrice;
 				newPrice = newPrice - disc;
 			}
 
@@ -215,7 +216,7 @@ var eduBookingView = {
 			var tCivReg = document.querySelector('.contactCivReg')
 			if(tCivReg) {
 				var cCivReg = document.getElementById('edu-contactCivReg').value;
-				tCivReg.value = cLastName;
+				tCivReg.value = cCivReg;
 			}
 
 			if(contact == 1 && !this.AddedContactPerson) {
@@ -235,6 +236,30 @@ var eduBookingView = {
 		}
 	},
 	AddedContactPerson: false,
+	ValidateDiscountCode: function() {
+		edu.apiclient.CheckCouponCode(
+			jQuery('#edu-discountCode').val(),
+			jQuery('.validateDiscount').data('objectid'),
+			jQuery('.validateDiscount').data('categoryid'),
+			function(data) {
+				if(data) {
+					jQuery('#edu-discountCodeID').val(data.CouponID);
+					eduBookingView.DiscountPercent = data.DiscountPercent;
+					eduBookingView.UpdatePrice();
+				} else {
+					// Invalid code
+					var codeWarning = document.getElementById('edu-warning-discount');
+					if(codeWarning) {
+						codeWarning.style.display = 'block';
+						setTimeout(function() {
+							var codeWarning = document.getElementById('edu-warning-discount');
+							codeWarning.style.display = '';
+						}, 5000);
+					}
+				}
+			}
+		);
+	},
 	CheckValidation: function() {
 		var terms = document.getElementById('confirmTerms');
 		if(terms) {
diff --git a/content/template/bookingTemplate/__bookMultipleParticipants.php b/content/template/bookingTemplate/__bookMultipleParticipants.php
@@ -369,6 +369,10 @@
 		$bi->OccasionPriceNameLnkID = $_POST['edu-pricename'];
 	}
 
+	if(isset($_POST['edu-discountCodeID']) && $_POST['edu-discountCodeID'] != "0") {
+		$bi->CouponID = $_POST['edu-discountCodeID'];
+	}
+
 	$bi->CustomerReference = (!empty($_POST['invoiceReference']) ? trim($_POST['invoiceReference']) : trim(str_replace(';', ' ', $contact->ContactName)));
 	$eventCustomerLnkID = $eduapi->CreateSubEventBooking(
 		$edutoken,
diff --git a/content/template/bookingTemplate/template_A.php b/content/template/bookingTemplate/template_A.php
@@ -289,6 +289,29 @@
 		}
 		?>
 		<?php include_once("questionView.php"); ?>
+		<?php
+		if(get_option('eduadmin-allowDiscountCode', false)) {
+		?>
+		<label>
+			<div class="inputLabel">
+				<?php edu_e("Discount code"); ?>
+			</div>
+			<div class="inputHolder">
+				<input type="text" name="edu-discountCode" id="edu-discountCode" style="width: 78%;" placeholder="<?php edu_e("Discount code"); ?>" />
+				<button class="validateDiscount"
+					style="width: 20%;"
+					data-categoryid="<?php echo @esc_attr($selectedCourse->CategoryID); ?>"
+					data-objectid="<?php echo @esc_attr($selectedCourse->ObjectID); ?>"
+					onclick="eduBookingView.ValidateDiscountCode(); return false;">
+					<?php edu_e("Validate"); ?>
+				</button>
+				<input type="hidden" name="edu-discountCodeID" id="edu-discountCodeID" />
+			</div>
+		</label>
+		<div class="edu-modal warning" id="edu-warning-discount">
+			<?php edu_e("Invalid discount code, please check your code and try again."); ?>
+		</div>
+		<?php } ?>
 		<div class="sumTotal"><?php edu_e('Total sum:'); ?> <span id="sumValue" class="sumValue"></span></div>
 
 		<?php
diff --git a/eduadmin.php b/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.11
+ * Version:	0.9.12
  * Requires at least: 3.0
  * Tested up to: 4.7
  * 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.11'
+        'pluginVersion' => '0.9.12'
     );
 
     $callHomeUrl = 'http://ws10.multinet.se/edu-plugin/wp_phone_home.php';
diff --git a/includes/_options.php b/includes/_options.php
@@ -40,6 +40,7 @@ function eduadmin_settings_init()
 	register_setting('eduadmin-booking', 'eduadmin-allowInterestRegObject');
 	register_setting('eduadmin-booking', 'eduadmin-allowInterestRegEvent');
 	register_setting('eduadmin-booking', 'eduadmin-hideSubEventDateTime');
+	register_setting('eduadmin-booking', 'eduadmin-allowDiscountCode');
 
 	/* Phrase settings */
 	register_setting('eduadmin-phrases', 'eduadmin-phrases');
diff --git a/includes/bookingSettings.php b/includes/bookingSettings.php
@@ -99,6 +99,13 @@ function edu_writeOptions($g, $array, $depth, $selectedOption)
 				<?php _e("Participant is also customer and contact (Only allow a single participant)", "eduadmin"); ?>
 			</label>
 			<br />-->
+			<?php
+			$allowDiscountCode = get_option('eduadmin-allowDiscountCode', false);
+			?>
+			<label>
+				<input type="checkbox" name="eduadmin-allowDiscountCode"<?php echo ($allowDiscountCode === "true" ? " checked=\"checked\"" : ""); ?> value="true" />
+				<?php _e("Allow end customers to use discount codes", "eduadmin"); ?>
+			</label>
 			<h4><?php _e("Field order", "eduadmin"); ?></h4>
 			<?php
 			$fieldOrder = get_option('eduadmin-fieldOrder', 'contact_customer');
diff --git a/includes/loApiClient.php b/includes/loApiClient.php
@@ -5,7 +5,7 @@ class EduAdminClient
   {
     protected $__server;
     public $debug = false;
-    public $timers;
+    protected $timers;
 
       public function __construct()
       {
@@ -14,7 +14,7 @@ public function __construct()
       $this->__server = new SoapClient(
         ServiceUrl,
         array(
-          'trace' => 1,
+          'trace' => 0,
           'cache_wsdl' => WSDL_CACHE_BOTH
         )
       );
@@ -458,6 +458,14 @@ public function GetCompanyAttributeXml($authToken, $sort, $filter) {
       return $this->__callServer($param, 'GetCompanyAttributeXml');
     }
 
+    public function GetCompanyLogoUrl($authToken) {
+      $param = array(
+        'authToken' => $authToken
+      );
+
+      return $this->__callServer($param, 'GetCompanyLogoUrl');
+    }
+
     public function GetConfirmationEmailMessage($authToken, $eclID, $documentID) {
       $param = array(
         'authToken' => $authToken,
@@ -1231,6 +1239,16 @@ public function GetEventXml($authToken, $sort, $filter) {
       return $this->__callServer($param, 'GetEventXml');
     }
 
+    public function GetGetUserLocationXml($authToken, $sort, $filter) {
+      $param = array(
+        'authToken' => $authToken,
+        'sort' => $sort,
+        'filter' => $filter
+      );
+
+      return $this->__callServer($param, 'GetGetUserLocationXml');
+    }
+
     public function GetGrade($authToken, $sort, $filter) {
       $param = array(
         'authToken' => $authToken,
@@ -1753,6 +1771,16 @@ public function GetUserAttributeXml($authToken, $sort, $filter) {
       return $this->__callServer($param, 'GetUserAttributeXml');
     }
 
+    public function GetUserLocation($authToken, $sort, $filter) {
+      $param = array(
+        'authToken' => $authToken,
+        'sort' => $sort,
+        'filter' => $filter
+      );
+
+      return $this->__getArray('UserLocation', $this->__callServer($param, 'GetUserLocation'))->UserLocation;
+    }
+
     public function GetValidCoupons($authToken, $objectID, $categoryID) {
       $param = array(
         'authToken' => $authToken,
@@ -2396,7 +2424,9 @@ private function __callServer($params, $methodName)
       if($this->debug)
         $this->__debug();
       $this->timers[$methodName . '__callServer'] = microtime(true) - $this->timers[$methodName . '__callServer'];
-      return $result->{$methodName/*$d*/ . 'Result'};
+      if(isset($result->{$methodName/*$d*/ . 'Result'}))
+        return $result->{$methodName/*$d*/ . 'Result'};
+      return null;
     }
 
     private function __debug($result = null)
@@ -2707,6 +2737,8 @@ class CertificatePersonV2 {
     var $CertificateFromEventIDs;
     var $CertificateFromPersonCertificateIDs;
     var $Subjects;
+    var $CertificateAfterRetest;
+    var $CertificatePersonComment;
     var $PersonID;
     var $PersonFirstName;
     var $PersonLastName;
@@ -2727,6 +2759,7 @@ function __construct() {
       $this->CertificateFromEventIDs = array();
       $this->CertificateFromPersonCertificateIDs = array();
       $this->Subjects = array();
+      $this->CertificateAfterRetest = null;
       $this->PersonID = 0;
       $this->CustomerID = 0;
       $this->CertificateID = 0;
@@ -2803,6 +2836,7 @@ function __construct() {
 class Coupon {
     var $CouponID;
     var $Code;
+
     var $DiscountPercent;
     var $CouponDescription;
     var $ValidFrom;
@@ -2853,7 +2887,6 @@ function __construct() {
   }
 }
 
-
 class CustomerAttribute {
     var $CustomerID;
     var $CustomerAttributeID;
@@ -3077,7 +3110,7 @@ function __construct() {
       $this->CanLogin = null;
       $this->DiscountPercent = null;
       $this->ParticipantDiscountPercent = null;
-      $this->NotCreditworthy = false;
+      $this->NotCreditworthy = null;
       $this->CustomerID = 0;
       $this->CustomerGroupID = null;
       $this->VatFree = null;
@@ -4465,6 +4498,17 @@ function __construct() {
   }
 }
 
+class UserLocation {
+    var $UserID;
+    var $LocationID;
+
+  function __construct() {
+      $this->UserID = 0;
+      $this->LocationID = 0;
+  }
+}
+
+
 class XFilter
 {
     var $FilterName = '';
