fix(Booking page): Fixed so that price recalculation will be done when you click a Discount Card.

Chris Gårdenberg · Chris Gårdenberg · commit 7847bda74101 · 2023-05-05T14:52:22.000+02:00
fixes #479
diff --git a/PLUGIN-CHECKSUM b/PLUGIN-CHECKSUM
@@ -1 +1 @@
-7aa718b0dc544ce119e56f705a764880
+8cb9d57b0c0acede024cd8c7cc7e3776
diff --git a/content/style/compiled/frontend/bookingPage.css b/content/style/compiled/frontend/bookingPage.css
@@ -22,16 +22,16 @@
 }
 .eduadmin.booking-page form .title .notUserCheck {
   text-align: center;
-  color: hsl(0deg, 0%, 40%);
+  color: hsl(0, 0%, 40%);
   margin: 0 0 56px;
   font-size: 0.95rem;
 }
 .eduadmin.booking-page form .title .notUserCheck a {
   margin: 0 0 0 8px;
-  color: hsl(0deg, 0%, 40%);
+  color: hsl(0, 0%, 40%);
 }
 .eduadmin.booking-page form h2 {
-  color: hsl(0deg, 0%, 20%);
+  color: hsl(0, 0%, 20%);
   font-weight: 600;
   margin: 0 0 24px 0;
 }
@@ -57,7 +57,7 @@
 .eduadmin.booking-page form div.fakeLabel .inputLabel {
   display: none;
   margin: 0 0 8px;
-  color: hsl(0deg, 0%, 20%);
+  color: hsl(0, 0%, 20%);
 }
 .eduadmin.booking-page form label .inputLabel.noHide,
 .eduadmin.booking-page form div.fakeLabel .inputLabel.noHide {
@@ -120,10 +120,10 @@
   display: flex;
   justify-content: space-between;
   align-items: baseline;
-  color: hsl(0deg, 0%, 20%);
+  color: hsl(0, 0%, 20%);
 }
 .eduadmin.booking-page form .participantView h3 .removeParticipant {
-  color: hsl(0deg, 0%, 40%);
+  color: hsl(0, 0%, 40%);
   font-size: 1rem;
 }
 .eduadmin.booking-page form .participantView h3 .removeParticipant:hover {
@@ -164,13 +164,13 @@
   display: block;
   margin: unset;
   padding: 10px 20px;
-  border: 1px solid hsl(0deg, 0%, 67%);
+  border: 1px solid hsl(0, 0%, 67%);
   border-radius: 5px;
   cursor: pointer;
   text-align: center;
 }
 .eduadmin.booking-page form .paymentMethodsView li input[type=radio]:checked + label {
-  background-color: hsl(0deg, 0%, 95%);
+  background-color: hsl(0, 0%, 95%);
 }
 .eduadmin.booking-page form .recaptchaView {
   margin: 0 0 48px 0;
@@ -192,10 +192,10 @@
   display: none;
   width: 100%;
   padding: 8px 16px;
-  color: hsl(5deg, 80%, 50%);
+  color: hsl(5, 80%, 50%);
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.08);
   order: -1;
-  background: hsl(6deg, 100%, 94%);
+  background: hsl(6, 100%, 94%);
   margin: 0 0 16px 0;
   border-radius: 3px;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.18);
@@ -247,13 +247,13 @@
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 5px;
     border-right: 0;
-    border-bottom: 1px solid hsl(0deg, 0%, 67%);
+    border-bottom: 1px solid hsl(0, 0%, 67%);
   }
   .eduadmin.booking-page form .paymentMethodsView li:last-child label {
     border-top-left-radius: 0;
     border-top-right-radius: 5px;
     border-bottom-left-radius: 0;
     border-left: 0;
-    border-top: 1px solid hsl(0deg, 0%, 67%);
+    border-top: 1px solid hsl(0, 0%, 67%);
   }
 }
diff --git a/content/style/compiled/frontend/detailView.css b/content/style/compiled/frontend/detailView.css
@@ -4,7 +4,7 @@
   padding: 16px 0;
 }
 .eduadmin div.title .courseTitle {
-  color: hsl(0deg, 0%, 30%);
+  color: hsl(0, 0%, 30%);
   font-weight: 600;
   margin: 0;
   padding: 0;
@@ -15,11 +15,11 @@
   margin: 0 16px 0 0;
 }
 .eduadmin .textblock {
-  color: hsl(0deg, 0%, 35%);
+  color: hsl(0, 0%, 35%);
 }
 .eduadmin .eventInformation {
   margin: 0 0 48px 0;
-  color: hsl(0deg, 0%, 35%);
+  color: hsl(0, 0%, 35%);
 }
 .eduadmin .event-table.eventDays .eventSeparator {
   margin-top: 1rem;
@@ -28,10 +28,10 @@
 }
 .eduadmin .eventItem {
   padding: 16px 0;
-  border-bottom: 1px solid hsl(0deg, 0%, 95%);
+  border-bottom: 1px solid hsl(0, 0%, 95%);
 }
 .eduadmin .eventItem:first-child {
-  border-top: 1px solid hsl(0deg, 0%, 95%);
+  border-top: 1px solid hsl(0, 0%, 95%);
 }
 .eduadmin .eventItem:last-child {
   border: none;
@@ -51,8 +51,8 @@
     align-items: center;
   }
   .eduadmin .eventItem .eventStatus,
-.eduadmin .eventItem .eventDate,
-.eduadmin .eventItem .eventCity {
+  .eduadmin .eventItem .eventDate,
+  .eduadmin .eventItem .eventCity {
     margin: 0;
     flex: auto;
   }
diff --git a/content/style/compiled/frontend/global.css b/content/style/compiled/frontend/global.css
@@ -15,7 +15,7 @@
   max-width: 100%;
 }
 .eduadmin h3 {
-  color: hsl(0deg, 0%, 35%);
+  color: hsl(0, 0%, 35%);
   font-weight: 600;
 }
 .eduadmin h1.courseTitle,
@@ -38,31 +38,31 @@
   display: inline-block;
   box-sizing: border-box;
   border-radius: 3px;
-  border: 1px solid hsl(116deg, 33%, 55%);
-  background: hsl(120deg, 33%, 50%);
-  color: hsl(0deg, 0%, 100%);
+  border: 1px solid hsl(116, 33%, 55%);
+  background: hsl(120, 33%, 50%);
+  color: hsl(0, 0%, 100%);
 }
 .eduadmin .cta-btn:hover {
-  color: hsl(0deg, 0%, 100%);
-  background: hsl(116deg, 33%, 55%);
+  color: hsl(0, 0%, 100%);
+  background: hsl(116, 33%, 55%);
 }
 .eduadmin .neutral-btn {
   padding: 8px 16px;
   display: inline-block;
   box-sizing: border-box;
   border-radius: 3px;
-  color: hsl(0deg, 0%, 44%);
+  color: hsl(0, 0%, 44%);
   font-weight: 400;
-  border: 1px solid hsl(0deg, 0%, 67%);
+  border: 1px solid hsl(0, 0%, 67%);
   background: transparent;
   box-shadow: unset;
 }
 .eduadmin .neutral-btn:hover {
-  background: hsla(0deg, 0%, 95%, 0.88);
+  background: hsla(0, 0%, 95%, 0.88);
   box-shadow: unset;
 }
 .eduadmin .neutral-btn.active {
-  background: hsla(0deg, 0%, 95%, 0.88);
+  background: hsla(0, 0%, 95%, 0.88);
   box-shadow: unset;
 }
 .eduadmin .search-form {
@@ -130,9 +130,9 @@
 .eduadmin .edu-modal.warning {
   width: 100%;
   padding: 8px 16px;
-  color: hsl(5deg, 80%, 50%);
+  color: hsl(5, 80%, 50%);
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.08);
-  background: hsl(6deg, 100%, 94%);
+  background: hsl(6, 100%, 94%);
   margin: 0 0 16px 0;
   border-radius: 3px;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.18);
@@ -234,7 +234,7 @@
 .eduadmin div.fakeLabel .inputLabel {
   display: none;
   margin: 0 0 8px;
-  color: hsl(0deg, 0%, 20%);
+  color: hsl(0, 0%, 20%);
 }
 .eduadmin label .inputLabel.noHide,
 .eduadmin div.fakeLabel .inputLabel.noHide {
@@ -264,13 +264,13 @@
 }
 @media (min-width: 800px) {
   .eduadmin label .inputLabel,
-.eduadmin div.fakeLabel .inputLabel {
+  .eduadmin div.fakeLabel .inputLabel {
     display: inherit;
     margin: 0;
     flex: auto;
   }
   .eduadmin label .inputHolder,
-.eduadmin div.fakeLabel .inputHolder {
+  .eduadmin div.fakeLabel .inputHolder {
     width: 100%;
     max-width: 400px;
   }
@@ -302,7 +302,7 @@
 }
 .eduadmin.loginForm form .title .checkEmailForm h3 {
   font-weight: normal;
-  color: hsl(0deg, 0%, 40%);
+  color: hsl(0, 0%, 40%);
   font-style: italic;
   font-size: 16px;
   margin: 0 0 16px 0;
diff --git a/content/style/compiled/frontend/listProgrammeView.css b/content/style/compiled/frontend/listProgrammeView.css
@@ -16,14 +16,14 @@
 
 @media (min-width: 800px) {
   .eduadmin .programme-list-item,
-.eduadmin .programme-header {
+  .eduadmin .programme-header {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
   }
   .eduadmin .programme-list-item > div,
-.eduadmin .programme-header > div {
+  .eduadmin .programme-header > div {
     min-width: 25%;
   }
 }
diff --git a/content/style/compiled/frontend/listView.css b/content/style/compiled/frontend/listView.css
@@ -10,7 +10,7 @@
 }
 .eduadmin .objectItem {
   padding: 24px 8px;
-  border-bottom: 1px solid hsl(0deg, 0%, 95%);
+  border-bottom: 1px solid hsl(0, 0%, 95%);
 }
 .eduadmin .objectItem:last-child .objectInfoHolder {
   border-bottom: none;
@@ -28,10 +28,10 @@
   margin: 0 0 16px 0;
 }
 .eduadmin .objectItem .objectName a {
-  color: hsl(0deg, 0%, 30%);
+  color: hsl(0, 0%, 30%);
 }
 .eduadmin .objectItem .objectDescription {
-  color: hsl(0deg, 0%, 35%);
+  color: hsl(0, 0%, 35%);
   margin: 0 0 16px 0;
 }
 .eduadmin .objectItem .objectDescription .eduadmin-dateText,
@@ -52,11 +52,11 @@
   margin: 0 16px 0 0;
 }
 .eduadmin .objectItem .objectBook a.readMoreButton:not(.cta-btn) {
-  color: hsl(0deg, 0%, 40%);
+  color: hsl(0, 0%, 40%);
   font-style: italic;
 }
 .eduadmin .objectItem .objectBook a.readMoreButton:not(.cta-btn):hover {
-  color: hsl(0deg, 0%, 15%);
+  color: hsl(0, 0%, 15%);
 }
 .eduadmin .objectBlock.brick {
   width: 100%;
@@ -66,7 +66,7 @@
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.18);
   padding: 16px;
   border-radius: 3px;
-  background: hsl(0deg, 0%, 99.5%);
+  background: hsl(0, 0%, 99.5%);
   display: inline-flex;
   flex-direction: column;
   justify-content: space-between;
@@ -84,10 +84,10 @@
   margin: 0 0 16px 0;
 }
 .eduadmin .objectBlock.brick .objectName a {
-  color: hsl(0deg, 0%, 30%);
+  color: hsl(0, 0%, 30%);
 }
 .eduadmin .objectBlock.brick .objectDescription {
-  color: hsl(0deg, 0%, 35%);
+  color: hsl(0, 0%, 35%);
 }
 .eduadmin .objectBlock.brick .objectDescription .spotsLeft {
   display: none;
@@ -135,7 +135,6 @@
   .eduadmin .objectItem .readMoreButton {
     width: 100%;
   }
-
   .eduadmin .course-holder.tmpl_A .objectItem {
     align-items: center;
   }
diff --git a/content/style/compiled/frontend/profilePage.css b/content/style/compiled/frontend/profilePage.css
@@ -1,5 +1,5 @@
 .eduadmin .tab_container.tabhead {
-  border-bottom: 1px solid hsl(0deg, 0%, 82%);
+  border-bottom: 1px solid hsl(0, 0%, 82%);
 }
 .eduadmin .tab_container .tab_item {
   padding: 5px 10px 4px 10px;
@@ -9,13 +9,13 @@
   border: 1px solid rgba(0, 0, 0, 0);
 }
 .eduadmin .tab_container .tab_item:hover {
-  border: 1px solid hsl(0deg, 0%, 72%);
+  border: 1px solid hsl(0, 0%, 72%);
   border-bottom: 0;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
 }
 .eduadmin .tab_container .tab_item.active {
-  border: 1px solid hsl(0deg, 0%, 82%);
+  border: 1px solid hsl(0, 0%, 82%);
   border-bottom: 0;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
diff --git a/content/template/bookingTemplate/limited-discount-view.php b/content/template/bookingTemplate/limited-discount-view.php
@@ -13,7 +13,6 @@
 				if ( 0 !== count( $c_cards ) ) {
 					?>
 					<h2><?php echo esc_html_x( 'Discount cards', 'frontend', 'eduadmin-booking' ); ?></h2>
-
 					<?php
 					foreach ( $c_cards as $card ) {
 						if ( $card['ValidForNumberOfParticipants'] > 0 ) {
@@ -25,7 +24,7 @@
 										disabled readonly title="<?php echo esc_attr_x( 'Not enough uses left on this card.', 'frontend', 'eduadmin-booking' ); ?>"
 									<?php endif; ?>
 									   value="<?php echo esc_attr( $card['VoucherId'] ); ?>"
-									   onchange="eduBookingView.UpdatePrice();" />
+									   onclick="eduBookingView.UpdatePrice();" />
 								<?php echo esc_html( $card['Description'] ); ?>&nbsp;
 								<i>(<?php echo esc_html( sprintf( _n( 'Valid for %s participant', 'Valid for %s participants', $card['ValidForNumberOfParticipants'], 'eduadmin-booking' ), $card['ValidForNumberOfParticipants'] ) ); ?>)</i>
 							</label>
diff --git a/eduadmin.php b/eduadmin.php
@@ -13,7 +13,7 @@
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 5.8
- * Tested up to: 6.0.0
+ * Tested up to: 6.3.0
  * Requires PHP: 7.0
  * Author:	Chris Gårdenberg, MultiNet Interactive AB
  * Author URI:	https://www.multinet.com
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
 	},
 	"devDependencies": {
 		"@types/jquery": "^3.5.14",
+		"@types/node": "^20.0.0",
 		"concurrently": "^8.0.1",
 		"sass": "^1.60.0",
 		"standard-version": "^9.5.0",
diff --git a/readme.md b/readme.md
@@ -2,7 +2,7 @@
 Contributors: mnchga
 Tags: booking, participants, courses, events, eduadmin, lega online
 Requires at least: 5.8
-Tested up to: 6.0.0
+Tested up to: 6.3.0
 Stable tag: 3.6.1
 Requires PHP: 7.0
 License: GPL3

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-7aa718b0dc544ce119e56f705a764880`
	`1`	`+8cb9d57b0c0acede024cd8c7cc7e3776`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`padding: 16px 0;`
`5`	`5`	`}`
`6`	`6`	`.eduadmin div.title .courseTitle {`
`7`		`- color: hsl(0deg, 0%, 30%);`
	`7`	`+ color: hsl(0, 0%, 30%);`
`8`	`8`	`font-weight: 600;`
`9`	`9`	`margin: 0;`
`10`	`10`	`padding: 0;`
`@@ -15,11 +15,11 @@`
`15`	`15`	`margin: 0 16px 0 0;`
`16`	`16`	`}`
`17`	`17`	`.eduadmin .textblock {`
`18`		`- color: hsl(0deg, 0%, 35%);`
	`18`	`+ color: hsl(0, 0%, 35%);`
`19`	`19`	`}`
`20`	`20`	`.eduadmin .eventInformation {`
`21`	`21`	`margin: 0 0 48px 0;`
`22`		`- color: hsl(0deg, 0%, 35%);`
	`22`	`+ color: hsl(0, 0%, 35%);`
`23`	`23`	`}`
`24`	`24`	`.eduadmin .event-table.eventDays .eventSeparator {`
`25`	`25`	`margin-top: 1rem;`
`@@ -28,10 +28,10 @@`
`28`	`28`	`}`
`29`	`29`	`.eduadmin .eventItem {`
`30`	`30`	`padding: 16px 0;`
`31`		`- border-bottom: 1px solid hsl(0deg, 0%, 95%);`
	`31`	`+ border-bottom: 1px solid hsl(0, 0%, 95%);`
`32`	`32`	`}`
`33`	`33`	`.eduadmin .eventItem:first-child {`
`34`		`- border-top: 1px solid hsl(0deg, 0%, 95%);`
	`34`	`+ border-top: 1px solid hsl(0, 0%, 95%);`
`35`	`35`	`}`
`36`	`36`	`.eduadmin .eventItem:last-child {`
`37`	`37`	`border: none;`
`@@ -51,8 +51,8 @@`
`51`	`51`	`align-items: center;`
`52`	`52`	`}`
`53`	`53`	`.eduadmin .eventItem .eventStatus,`
`54`		`-.eduadmin .eventItem .eventDate,`
`55`		`-.eduadmin .eventItem .eventCity {`
	`54`	`+ .eduadmin .eventItem .eventDate,`
	`55`	`+ .eduadmin .eventItem .eventCity {`
`56`	`56`	`margin: 0;`
`57`	`57`	`flex: auto;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@`
`16`	`16`
`17`	`17`	`@media (min-width: 800px) {`
`18`	`18`	`.eduadmin .programme-list-item,`
`19`		`-.eduadmin .programme-header {`
	`19`	`+ .eduadmin .programme-header {`
`20`	`20`	`display: flex;`
`21`	`21`	`flex-direction: row;`
`22`	`22`	`justify-content: space-between;`
`23`	`23`	`align-items: center;`
`24`	`24`	`}`
`25`	`25`	`.eduadmin .programme-list-item > div,`
`26`		`-.eduadmin .programme-header > div {`
	`26`	`+ .eduadmin .programme-header > div {`
`27`	`27`	`min-width: 25%;`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`.eduadmin .objectItem {`
`12`	`12`	`padding: 24px 8px;`
`13`		`- border-bottom: 1px solid hsl(0deg, 0%, 95%);`
	`13`	`+ border-bottom: 1px solid hsl(0, 0%, 95%);`
`14`	`14`	`}`
`15`	`15`	`.eduadmin .objectItem:last-child .objectInfoHolder {`
`16`	`16`	`border-bottom: none;`
`@@ -28,10 +28,10 @@`
`28`	`28`	`margin: 0 0 16px 0;`
`29`	`29`	`}`
`30`	`30`	`.eduadmin .objectItem .objectName a {`
`31`		`- color: hsl(0deg, 0%, 30%);`
	`31`	`+ color: hsl(0, 0%, 30%);`
`32`	`32`	`}`
`33`	`33`	`.eduadmin .objectItem .objectDescription {`
`34`		`- color: hsl(0deg, 0%, 35%);`
	`34`	`+ color: hsl(0, 0%, 35%);`
`35`	`35`	`margin: 0 0 16px 0;`
`36`	`36`	`}`
`37`	`37`	`.eduadmin .objectItem .objectDescription .eduadmin-dateText,`
`@@ -52,11 +52,11 @@`
`52`	`52`	`margin: 0 16px 0 0;`
`53`	`53`	`}`
`54`	`54`	`.eduadmin .objectItem .objectBook a.readMoreButton:not(.cta-btn) {`
`55`		`- color: hsl(0deg, 0%, 40%);`
	`55`	`+ color: hsl(0, 0%, 40%);`
`56`	`56`	`font-style: italic;`
`57`	`57`	`}`
`58`	`58`	`.eduadmin .objectItem .objectBook a.readMoreButton:not(.cta-btn):hover {`
`59`		`- color: hsl(0deg, 0%, 15%);`
	`59`	`+ color: hsl(0, 0%, 15%);`
`60`	`60`	`}`
`61`	`61`	`.eduadmin .objectBlock.brick {`
`62`	`62`	`width: 100%;`
`@@ -66,7 +66,7 @@`
`66`	`66`	`box-shadow: 0 2px 4px rgba(0, 0, 0, 0.18);`
`67`	`67`	`padding: 16px;`
`68`	`68`	`border-radius: 3px;`
`69`		`- background: hsl(0deg, 0%, 99.5%);`
	`69`	`+ background: hsl(0, 0%, 99.5%);`
`70`	`70`	`display: inline-flex;`
`71`	`71`	`flex-direction: column;`
`72`	`72`	`justify-content: space-between;`
`@@ -84,10 +84,10 @@`
`84`	`84`	`margin: 0 0 16px 0;`
`85`	`85`	`}`
`86`	`86`	`.eduadmin .objectBlock.brick .objectName a {`
`87`		`- color: hsl(0deg, 0%, 30%);`
	`87`	`+ color: hsl(0, 0%, 30%);`
`88`	`88`	`}`
`89`	`89`	`.eduadmin .objectBlock.brick .objectDescription {`
`90`		`- color: hsl(0deg, 0%, 35%);`
	`90`	`+ color: hsl(0, 0%, 35%);`
`91`	`91`	`}`
`92`	`92`	`.eduadmin .objectBlock.brick .objectDescription .spotsLeft {`
`93`	`93`	`display: none;`
`@@ -135,7 +135,6 @@`
`135`	`135`	`.eduadmin .objectItem .readMoreButton {`
`136`	`136`	`width: 100%;`
`137`	`137`	`}`
`138`		`-`
`139`	`138`	`.eduadmin .course-holder.tmpl_A .objectItem {`
`140`	`139`	`align-items: center;`
`141`	`140`	`}`