From 36dd074dcc8f74ba5de1710401d402e457cd595b Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 4 Dec 2019 16:21:18 +0530
Subject: [PATCH] fix: added is_last_slide method in slides

---
 frappe/desk/doctype/onboarding_slide/onboarding_slide.js | 4 ++--
 frappe/public/js/frappe/ui/onboarding_dialog.js          | 6 +++---
 frappe/public/js/frappe/ui/slides.js                     | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.js b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js
index d9c210f249..dc91f42913 100644
--- a/frappe/desk/doctype/onboarding_slide/onboarding_slide.js
+++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js
@@ -3,8 +3,8 @@
 
 frappe.ui.form.on('Onboarding Slide', {
 	refresh: function(frm) {
-		frm.toggle_reqd('ref_doctype', frm.doc.slide_type!='Information');
-		frm.toggle_reqd('slide_module', frm.doc.slide_type=='Information');
+		frm.toggle_reqd('ref_doctype', (frm.doc.slide_type=='Create' || frm.doc.slide_type=='Settings'));
+		frm.toggle_reqd('slide_module', (frm.doc.slide_type=='Information' || frm.doc.slide_type=='Continue'));
 	},
 
 	ref_doctype: function(frm) {
diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js
index be6f0fc91b..a007784f58 100644
--- a/frappe/public/js/frappe/ui/onboarding_dialog.js
+++ b/frappe/public/js/frappe/ui/onboarding_dialog.js
@@ -26,7 +26,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide {
 		(this.id === 0) ?
 			this.$next_btn.text(__('Let\'s Start')) : this.$next_btn.text(__('Next'));
 		//last slide
-		if (this.id === this.parent[0].children.length-1) {
+		if (this.is_last_slide()) {
 			this.$complete_btn.removeClass('hide').addClass('action primary');
 			this.$next_btn.removeClass('action primary');
 			this.$action_button = this.$complete_btn;
@@ -48,7 +48,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide {
 					slide_type: me.slide_type
 				},
 				callback: function() {
-					if (me.id === me.parent[0].children.length-1) {
+					if (me.is_last_slide()) {
 						me.reset_is_first_startup();
 						$('.onboarding-dialog').modal('toggle');
 						frappe.msgprint({
@@ -86,7 +86,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide {
 	}
 
 	setup_action_button() {
-		if (this.slide_type === 'Create' || this.slide_type == 'Settings' || this.id === this.parent[0].children.length-1) {
+		if (this.slide_type === 'Create' || this.slide_type == 'Settings' || this.is_last_slide()) {
 			this.$action_button.addClass('primary');
 		} else {
 			this.$action_button.removeClass('primary');
diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js
index ceeadb09fa..d1c34faf6c 100644
--- a/frappe/public/js/frappe/ui/slides.js
+++ b/frappe/public/js/frappe/ui/slides.js
@@ -182,6 +182,13 @@ frappe.ui.Slide = class Slide {
 		});
 	}
 
+	is_last_slide() {
+		if (this.id === this.parent[0].children.length-1) {
+			return true;
+		}
+		return false;
+	}
+
 	before_show() { }
 
 	show_slide() {