diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index e5d9171b..da26c807 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -58,7 +58,7 @@ jobs:
           echo "127.0.0.1 lms.test" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index ed5c7968..9ed07f0b 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -37,6 +37,7 @@ Cypress.Commands.add("login", (email, password) => {
 		url: "/api/method/login",
 		method: "POST",
 		body: { usr: email, pwd: password },
+		timeout: 60000,
 	});
 });
 
diff --git a/frontend/src/components/CourseCard.vue b/frontend/src/components/CourseCard.vue
index 1f805d56..d26f5130 100644
--- a/frontend/src/components/CourseCard.vue
+++ b/frontend/src/components/CourseCard.vue
@@ -16,7 +16,8 @@
 					{{ __('Featured') }}
 				</Badge>
 				<div
-					v-for="tag in course.tags"
+					v-if="course.tags"
+					v-for="tag in course.tags?.split(', ')"
 					class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md"
 				>
 					{{ tag }}
diff --git a/frontend/src/components/Modals/LiveClassModal.vue b/frontend/src/components/Modals/LiveClassModal.vue
index 7d16acb7..7d260776 100644
--- a/frontend/src/components/Modals/LiveClassModal.vue
+++ b/frontend/src/components/Modals/LiveClassModal.vue
@@ -95,8 +95,8 @@ import {
 	FormControl,
 	Autocomplete,
 } from 'frappe-ui'
-import { reactive, inject } from 'vue'
-import { getTimezones, createToast } from '@/utils/'
+import { reactive, inject, onMounted } from 'vue'
+import { getTimezones, createToast, getUserTimezone } from '@/utils/'
 
 const liveClasses = defineModel('reloadLiveClasses')
 const show = defineModel()
@@ -122,6 +122,10 @@ let liveClass = reactive({
 	host: user.data.name,
 })
 
+onMounted(() => {
+	liveClass.timezone = getUserTimezone()
+})
+
 const getTimezoneOptions = () => {
 	return getTimezones().map((timezone) => {
 		return {
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index e8556db1..4512e820 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -1,316 +1,325 @@
 <template>
-	<div v-if="courses.data">
-		<header
-			class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
+	<header
+		class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+		<router-link
+			v-if="user.data?.is_moderator"
+			:to="{
+				name: 'CourseForm',
+				params: { courseName: 'new' },
+			}"
 		>
-			<Breadcrumbs
-				class="h-7"
-				:items="[{ label: __('Courses'), route: { name: 'Courses' } }]"
-			/>
-			<div class="flex space-x-2 justify-end">
-				<div class="w-40 md:w-44">
-					<FormControl
-						v-if="categories.data?.length"
-						type="select"
-						v-model="currentCategory"
-						:options="categories.data"
-						:placeholder="__('Category')"
-					/>
-				</div>
-				<div class="w-28 md:w-36">
+			<Button variant="solid">
+				<template #prefix>
+					<Plus class="h-4 w-4 stroke-1.5" />
+				</template>
+				{{ __('New') }}
+			</Button>
+		</router-link>
+	</header>
+	<div class="p-5 pb-10">
+		<div
+			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
+		>
+			<div class="text-lg font-semibold">
+				{{ __('All Courses') }}
+			</div>
+			<div
+				class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:items-center lg:space-x-4"
+			>
+				<TabButtons
+					v-if="user.data"
+					:buttons="courseTabs"
+					v-model="currentTab"
+				/>
+				<FormControl
+					v-model="certification"
+					:label="__('Certification')"
+					type="checkbox"
+					@change="updateCourses()"
+				/>
+				<div class="grid grid-cols-2 gap-2">
 					<FormControl
+						v-model="title"
+						:placeholder="__('Search by Title')"
 						type="text"
-						placeholder="Search"
-						v-model="searchQuery"
-						@input="courses.reload()"
-					>
-						<template #prefix>
-							<Search
-								class="w-4 h-4 stroke-1.5 text-ink-gray-5"
-								name="search"
-							/>
-						</template>
-					</FormControl>
-				</div>
-				<router-link
-					v-if="user.data?.is_moderator || user.data?.is_instructor"
-					:to="{
-						name: 'CourseForm',
-						params: {
-							courseName: 'new',
-						},
-					}"
-				>
-					<Button variant="solid">
-						<template #prefix>
-							<Plus class="h-4 w-4" />
-						</template>
-						{{ __('New') }}
-					</Button>
-				</router-link>
-			</div>
-		</header>
-		<div class="">
-			<Tabs
-				v-if="hasCourses"
-				as="div"
-				v-model="tabIndex"
-				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
-				:tabs="makeTabs"
-			>
-				<template #tab="{ tab, selected }">
-					<div>
-						<button
-							class="group -mb-px flex items-center gap-2 overflow-hidden border-b border-transparent py-2.5 text-base text-ink-gray-5 duration-300 ease-in-out hover:border-outline-gray-3 hover:text-ink-gray-9"
-							:class="{ 'text-ink-gray-9': selected }"
-						>
-							<component v-if="tab.icon" :is="tab.icon" class="h-5" />
-							{{ __(tab.label) }}
-							<Badge theme="gray">
-								{{ tab.count }}
-							</Badge>
-						</button>
+						class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
+						@input="updateCourses()"
+					/>
+					<div class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40">
+						<Select
+							v-if="categories.length"
+							v-model="currentCategory"
+							:options="categories"
+							:placeholder="__('Category')"
+							@change="updateCourses()"
+						/>
 					</div>
-				</template>
-				<template #tab-panel="{ tab }">
-					<div
-						v-if="tab.courses && tab.courses.value.length"
-						class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-7 my-5 mx-5"
-					>
-						<router-link
-							v-for="course in tab.courses.value"
-							:to="
-								course.membership && course.current_lesson
-									? {
-											name: 'Lesson',
-											params: {
-												courseName: course.name,
-												chapterNumber: course.current_lesson.split('-')[0],
-												lessonNumber: course.current_lesson.split('-')[1],
-											},
-									  }
-									: course.membership
-									? {
-											name: 'Lesson',
-											params: {
-												courseName: course.name,
-												chapterNumber: 1,
-												lessonNumber: 1,
-											},
-									  }
-									: {
-											name: 'CourseDetail',
-											params: { courseName: course.name },
-									  }
-							"
-						>
-							<CourseCard :course="course" />
-						</router-link>
-					</div>
-					<div v-else class="p-5 italic text-ink-gray-4">
-						{{ __('No {0} courses').format(tab.label.toLowerCase()) }}
-					</div>
-				</template>
-			</Tabs>
-			<div
-				v-else-if="
-					!courses.loading &&
-					(user.data?.is_moderator || user.data?.is_instructor)
-				"
-				class="grid grid-cols-3 p-5"
-			>
-				<router-link
-					:to="{
-						name: 'CourseForm',
-						params: {
-							courseName: 'new',
-						},
-					}"
-				>
-					<div class="bg-surface-menu-bar py-32 px-5 rounded-md">
-						<div class="flex flex-col items-center text-center space-y-2">
-							<Plus
-								class="size-10 stroke-1 text-ink-gray-8 p-1 rounded-full border bg-surface-white"
-							/>
-							<div class="font-medium">
-								{{ __('Create a Course') }}
-							</div>
-							<span class="text-ink-gray-7 text-sm leading-4">
-								{{ __('You can add chapters and lessons to it.') }}
-							</span>
-						</div>
-					</div>
-				</router-link>
-			</div>
-			<div
-				v-else-if="!courses.loading && !hasCourses"
-				class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-			>
-				<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-				<div class="text-xl font-medium">
-					{{ __('No courses found') }}
-				</div>
-				<div class="leading-5">
-					{{
-						__(
-							'There are no courses available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-						)
-					}}
 				</div>
 			</div>
 		</div>
+		<div
+			v-if="courses.data?.length"
+			class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-5"
+		>
+			<router-link
+				v-for="course in courses.data"
+				:to="{ name: 'CourseDetail', params: { courseName: course.name } }"
+			>
+				<CourseCard :course="course" />
+			</router-link>
+		</div>
+		<div
+			v-else-if="!courses.list.loading"
+			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
+		>
+			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
+			<div class="text-lg font-medium mb-1">
+				{{ __('No courses found') }}
+			</div>
+			<div class="leading-5 w-2/5 text-center">
+				{{
+					__(
+						'There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!'
+					)
+				}}
+			</div>
+		</div>
+		<div
+			v-if="!courses.list.loading && courses.hasNextPage"
+			class="flex justify-center mt-5"
+		>
+			<Button @click="courses.next()">
+				{{ __('Load More') }}
+			</Button>
+		</div>
 	</div>
 </template>
-
 <script setup>
 import {
-	Badge,
 	Breadcrumbs,
 	Button,
-	call,
-	createResource,
+	createListResource,
 	FormControl,
-	Tabs,
+	Select,
+	TabButtons,
 } from 'frappe-ui'
-import CourseCard from '@/components/CourseCard.vue'
-import { BookOpen, Plus, Search } from 'lucide-vue-next'
-import { ref, computed, inject, onMounted, watch } from 'vue'
+import { computed, inject, onMounted, ref, watch } from 'vue'
+import { BookOpen, Plus } from 'lucide-vue-next'
 import { updateDocumentTitle } from '@/utils'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
+import CourseCard from '@/components/CourseCard.vue'
 
 const user = inject('$user')
-const searchQuery = ref('')
+const dayjs = inject('$dayjs')
+const start = ref(0)
+const pageLength = ref(30)
+const categories = ref([])
 const currentCategory = ref(null)
-const hasCourses = ref(false)
-const router = useRouter()
-const settings = useSettings()
+const title = ref('')
+const certification = ref(false)
+const filters = ref({})
+const currentTab = ref('Live')
 
 onMounted(() => {
-	checkLearningPath()
-	let queries = new URLSearchParams(location.search)
-	if (queries.has('category')) {
-		currentCategory.value = queries.get('category')
-	}
+	setFiltersFromQuery()
+	updateCourses()
+	categories.value = [
+		{
+			label: '',
+			value: null,
+		},
+	]
 })
 
-const checkLearningPath = () => {
-	if (
-		settings.learningPaths.data &&
-		(!user.data?.is_moderator || !user.data?.is_instructor)
-	) {
-		router.push({ name: 'Programs' })
+const setFiltersFromQuery = () => {
+	let queries = new URLSearchParams(location.search)
+	title.value = queries.get('title') || ''
+	currentCategory.value = queries.get('category') || null
+	certification.value = queries.get('certification') || false
+}
+
+const courses = createListResource({
+	doctype: 'LMS Course',
+	url: 'lms.lms.utils.get_courses',
+	cache: ['courses', user.data?.name],
+	pageLength: pageLength.value,
+	start: start.value,
+	onSuccess(data) {
+		let allCategories = data.map((course) => course.category)
+		allCategories = allCategories.filter(
+			(category, index) => allCategories.indexOf(category) === index && category
+		)
+		if (categories.value.length <= allCategories.length) {
+			updateCategories(data)
+		}
+	},
+})
+
+const updateCourses = () => {
+	updateFilters()
+	courses.update({
+		filters: filters.value,
+	})
+	courses.reload()
+}
+
+const updateFilters = () => {
+	updateCategoryFilter()
+	updateTitleFilter()
+	updateCertificationFilter()
+	updateTabFilter()
+	updateStudentFilter()
+	setQueryParams()
+}
+
+const updateCategoryFilter = () => {
+	if (currentCategory.value) {
+		filters.value['category'] = currentCategory.value
+	} else {
+		delete filters.value['category']
 	}
 }
 
-const courses = createResource({
-	url: 'lms.lms.utils.get_courses',
-	cache: ['courses', user.data?.email],
-	auto: true,
+const updateTitleFilter = () => {
+	if (title.value) {
+		filters.value['title'] = ['like', `%${title.value}%`]
+	} else {
+		delete filters.value['title']
+	}
+}
+
+const updateCertificationFilter = () => {
+	if (certification.value) {
+		filters.value['certification'] = 1
+	} else {
+		delete filters.value['certification']
+	}
+}
+
+const updateTabFilter = () => {
+	if (!user.data) {
+		return
+	}
+
+	delete filters.value['live']
+	delete filters.value['created']
+	delete filters.value['published_on']
+	delete filters.value['upcoming']
+
+	if (currentTab.value == 'Enrolled' && user.data?.is_student) {
+		filters.value['enrolled'] = 1
+		delete filters.value['published']
+	} else {
+		delete filters.value['published']
+		delete filters.value['enrolled']
+
+		if (currentTab.value == 'Live') {
+			filters.value['published'] = 1
+			filters.value['upcoming'] = 0
+			filters.value['live'] = 1
+		} else if (currentTab.value == 'Upcoming') {
+			filters.value['upcoming'] = 1
+			filters.value['published'] = 1
+		} else if (currentTab.value == 'New') {
+			filters.value['published'] = 1
+			filters.value['published_on'] = [
+				'>=',
+				dayjs().add(-3, 'month').format('YYYY-MM-DD'),
+			]
+		} else if (currentTab.value == 'Created') {
+			filters.value['created'] = 1
+		}
+	}
+}
+
+const updateStudentFilter = () => {
+	if (!user.data || (user.data?.is_student && currentTab.value != 'Enrolled')) {
+		filters.value['published'] = 1
+	}
+}
+
+const setQueryParams = () => {
+	let queries = new URLSearchParams(location.search)
+	let filterKeys = {
+		title: title.value,
+		category: currentCategory.value,
+		certification: certification.value,
+	}
+
+	Object.keys(filterKeys).forEach((key) => {
+		if (filterKeys[key]) {
+			queries.set(key, filterKeys[key])
+		} else {
+			queries.delete(key)
+		}
+	})
+
+	history.replaceState({}, '', `${location.pathname}?${queries.toString()}`)
+}
+
+const updateCategories = (data) => {
+	data.forEach((course) => {
+		if (
+			course.category &&
+			!categories.value.find((category) => category.value === course.category)
+		)
+			categories.value.push({
+				label: course.category,
+				value: course.category,
+			})
+	})
+}
+
+watch(currentTab, () => {
+	updateCourses()
 })
 
-const tabIndex = ref(0)
-let tabs
+const courseType = computed(() => {
+	let types = [
+		{ label: __(''), value: null },
+		{ label: __('New'), value: 'New' },
+		{ label: __('Upcoming'), value: 'Upcoming' },
+	]
+	if (user.data?.is_student) {
+		types.push({ label: __('Enrolled'), value: 'Enrolled' })
+	} else {
+		types.push({ label: __('Created'), value: 'Created' })
+	}
+	return types
+})
 
-const makeTabs = computed(() => {
-	tabs = []
-	addToTabs('Live')
-	addToTabs('New')
-	addToTabs('Upcoming')
-
-	if (user.data) {
-		addToTabs('Enrolled')
-
-		if (
-			user.data.is_moderator ||
-			user.data.is_instructor ||
-			courses.data?.created?.length
-		) {
-			addToTabs('Created')
-		}
-
-		if (user.data.is_moderator) {
-			addToTabs('Under Review')
-		}
+const courseTabs = computed(() => {
+	let tabs = [
+		{
+			label: __('Live'),
+		},
+		{
+			label: __('New'),
+		},
+		{
+			label: __('Upcoming'),
+		},
+	]
+	if (user.data?.is_student) {
+		tabs.push({ label: __('Enrolled') })
+	} else {
+		tabs.push({ label: __('Created') })
 	}
 	return tabs
 })
 
-const addToTabs = (label) => {
-	let courses = getCourses(label.toLowerCase().split(' ').join('_'))
-	tabs.push({
-		label,
-		courses: computed(() => courses),
-		count: computed(() => courses.length),
-	})
-}
-
-const getCourses = (type) => {
-	let courseList = courses.data[type]
-	if (searchQuery.value) {
-		let query = searchQuery.value.toLowerCase()
-		courseList = courseList.filter(
-			(course) =>
-				course.title.toLowerCase().includes(query) ||
-				course.short_introduction.toLowerCase().includes(query) ||
-				course.tags.filter((tag) => tag.toLowerCase().includes(query)).length
-		)
-	}
-	if (currentCategory.value && currentCategory.value != '') {
-		courseList = courseList.filter(
-			(course) => course.category == currentCategory.value
-		)
-	}
-	return courseList
-}
-
-const categories = createResource({
-	url: 'lms.lms.api.get_categories',
-	makeParams() {
-		return {
-			doctype: 'LMS Course',
-			filters: {
-				published: 1,
-			},
-		}
+const breadcrumbs = computed(() => [
+	{
+		label: __('Courses'),
+		route: { name: 'Courses' },
 	},
-	cache: ['courseCategories'],
-	auto: true,
-	transform(data) {
-		data.unshift({
-			label: '',
-			value: null,
-		})
-	},
-})
-
-watch(courses, () => {
-	if (courses.data) {
-		Object.keys(courses.data).forEach((section) => {
-			if (courses.data[section].length) {
-				hasCourses.value = true
-			}
-		})
-	}
-})
-
-watch(
-	() => currentCategory.value,
-	() => {
-		let queries = new URLSearchParams(location.search)
-		if (currentCategory.value) {
-			queries.set('category', currentCategory.value)
-		} else {
-			queries.delete('category')
-		}
-		history.pushState(null, '', `${location.pathname}?${queries.toString()}`)
-	}
-)
+])
 
 const pageMeta = computed(() => {
 	return {
 		title: 'Courses',
-		description: 'All Courses divided by categories',
+		description: 'All published courses.',
 	}
 })
 
diff --git a/frontend/src/pages/ProfileRoles.vue b/frontend/src/pages/ProfileRoles.vue
index 20d1b345..0f3799a9 100644
--- a/frontend/src/pages/ProfileRoles.vue
+++ b/frontend/src/pages/ProfileRoles.vue
@@ -72,7 +72,7 @@ const roles = createResource({
 })
 
 const updateRole = createResource({
-	url: 'lms.overrides.user.save_role',
+	url: 'lms.lms.api.save_role',
 	makeParams(values) {
 		return {
 			user: props.profile.data?.name,
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 97b78e01..c6410c55 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -441,6 +441,22 @@ export function getTimezones() {
 	]
 }
 
+export function getUserTimezone() {
+	try {
+		const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+		const supportedTimezones = getTimezones()
+
+		if (supportedTimezones.includes(timezone)) {
+			return timezone // e.g., 'Asia/Calcutta', 'America/New_York', etc.
+		} else {
+			throw Error('unsupported timezone')
+		}
+	} catch (error) {
+		console.error('Error getting timezone:', error)
+		return null
+	}
+}
+
 export function getSidebarLinks() {
 	return [
 		{
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index edd8f9b5..0f6fe469 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -12,7 +12,7 @@ module.exports = {
 				1.5: '1.5',
 			},
 			screens: {
-				'2xl': '1536px',
+				'2xl': '1600px',
 				'3xl': '1920px',
 			},
 		},
diff --git a/lms/__init__.py b/lms/__init__.py
index 000408e0..ff147724 100644
--- a/lms/__init__.py
+++ b/lms/__init__.py
@@ -1 +1 @@
-__version__ = "2.24.0"
+__version__ = "2.25.0"
diff --git a/lms/hooks.py b/lms/hooks.py
index 999ba199..3fde3094 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -88,7 +88,6 @@ setup_wizard_requires = "assets/lms/js/setup_wizard.js"
 # Override standard doctype classes
 
 override_doctype_class = {
-	"User": "lms.overrides.user.CustomUser",
 	"Web Template": "lms.overrides.web_template.CustomWebTemplate",
 }
 
@@ -104,6 +103,10 @@ doc_events = {
 	},
 	"Discussion Reply": {"after_insert": "lms.lms.utils.handle_notifications"},
 	"Notification Log": {"on_change": "lms.lms.utils.publish_notifications"},
+	"User": {
+		"validate": "lms.lms.user.validate_username_duplicates",
+		"after_insert": "lms.lms.user.after_insert",
+	},
 }
 
 # Scheduled Tasks
@@ -112,6 +115,7 @@ scheduler_events = {
 	"hourly": [
 		"lms.lms.doctype.lms_certificate_request.lms_certificate_request.schedule_evals",
 		"lms.lms.api.update_course_statistics",
+		"lms.lms.doctype.lms_certificate_request.lms_certificate_request.mark_eval_as_completed",
 	],
 	"daily": [
 		"lms.job.doctype.job_opportunity.job_opportunity.update_job_openings",
@@ -190,8 +194,8 @@ jinja = {
 		"lms.lms.utils.get_lesson_index",
 		"lms.lms.utils.get_lesson_url",
 		"lms.page_renderers.get_profile_url",
-		"lms.overrides.user.get_palette",
 		"lms.lms.utils.is_instructor",
+		"lms.lms.utils.get_palette",
 	],
 	"filters": [],
 }
@@ -238,8 +242,6 @@ profile_url_prefix = "/users/"
 
 signup_form_template = "lms.plugins.show_custom_signup"
 
-on_session_creation = "lms.overrides.user.on_session_creation"
-
 add_to_apps_screen = [
 	{
 		"name": "lms",
diff --git a/lms/lms/api.py b/lms/lms/api.py
index c83b52c2..f1cf7fef 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -12,7 +12,6 @@ from frappe.translate import get_all_translations
 from frappe import _
 from frappe.utils import (
 	get_datetime,
-	getdate,
 	cint,
 	flt,
 	now,
@@ -1303,3 +1302,22 @@ def get_certification_details(course):
 	paid_certificate = frappe.db.get_value("LMS Course", course, "paid_certificate")
 
 	return {"membership": membership, "paid_certificate": paid_certificate}
+
+
+@frappe.whitelist()
+def save_role(user, role, value):
+	frappe.only_for("Moderator")
+	if cint(value):
+		doc = frappe.get_doc(
+			{
+				"doctype": "Has Role",
+				"parent": user,
+				"role": role,
+				"parenttype": "User",
+				"parentfield": "roles",
+			}
+		)
+		doc.save(ignore_permissions=True)
+	else:
+		frappe.db.delete("Has Role", {"parent": user, "role": role})
+	return True
diff --git a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js
index 5e93d55d..649f7b81 100644
--- a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js
+++ b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on("LMS Certificate Evaluation", {
 	refresh: function (frm) {
 		if (!frm.is_new() && frm.doc.status == "Pass") {
-			frm.add_custom_button(__("Create LMS Certificate"), () => {
+			frm.add_custom_button(__("Create Certificate"), () => {
 				frappe.model.open_mapped_doc({
 					method: "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.create_lms_certificate",
 					frm: frm,
diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
index f221d0c0..b4e20e60 100644
--- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
+++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
@@ -3,18 +3,15 @@
 
 frappe.ui.form.on("LMS Certificate Request", {
 	refresh: function (frm) {
-		if (!frm.is_new()) {
-			frm.add_custom_button(
-				__("Create LMS Certificate Evaluation"),
-				() => {
-					frappe.model.open_mapped_doc({
-						method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
-						frm: frm,
-					});
-				}
-			);
+		if (!frm.is_new() && frm.doc.status == "Upcoming") {
+			frm.add_custom_button(__("Conduct Evaluation"), () => {
+				frappe.model.open_mapped_doc({
+					method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
+					frm: frm,
+				});
+			});
 		}
-		if (!frm.doc.google_meet_link) {
+		if (!frm.doc.google_meet_link && frm.doc.status == "Upcoming") {
 			frm.add_custom_button(__("Generate Google Meet Link"), () => {
 				frappe.call({
 					method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.setup_calendar_event",
diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
index c172f2dc..49ef86e8 100644
--- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
+++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
@@ -77,6 +77,7 @@ class LMSCertificateRequest(Document):
 				"member": self.member,
 				"course": self.course,
 				"name": ["!=", self.name],
+				"status": "Upcoming",
 			},
 			["date", "start_time", "course"],
 		)
@@ -150,7 +151,11 @@ def schedule_evals():
 		timelapse = add_to_date(get_datetime(), hours=-5)
 		evals = frappe.get_all(
 			"LMS Certificate Request",
-			{"creation": [">=", timelapse], "google_meet_link": ["is", "not set"]},
+			{
+				"creation": [">=", timelapse],
+				"google_meet_link": ["is", "not set"],
+				"status": "Upcoming",
+			},
 			["name", "member", "member_name", "evaluator", "date", "start_time", "end_time"],
 		)
 		for eval in evals:
@@ -254,3 +259,20 @@ def create_lms_certificate_evaluation(source_name, target_doc=None):
 		target_doc,
 	)
 	return doc
+
+
+def mark_eval_as_completed():
+	requests = frappe.get_all(
+		"LMS Certificate Request",
+		{
+			"status": "Upcoming",
+			"date": ["<=", getdate()],
+		},
+		["name", "end_time", "date"],
+	)
+
+	for req in requests:
+		if req.date < getdate():
+			frappe.db.set_value("LMS Certificate Request", req.name, "status", "Completed")
+		elif req.date == getdate() and get_time(req.end_time) < get_time(nowtime()):
+			frappe.db.set_value("LMS Certificate Request", req.name, "status", "Completed")
diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json
index d43de922..90e900d0 100644
--- a/lms/lms/doctype/lms_course/lms_course.json
+++ b/lms/lms/doctype/lms_course/lms_course.json
@@ -242,14 +242,14 @@
   {
    "default": "0",
    "fieldname": "enrollments",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "label": "Enrollments",
    "read_only": 1
   },
   {
    "default": "0",
    "fieldname": "lessons",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "label": "Lessons",
    "read_only": 1
   },
@@ -298,7 +298,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2025-02-24 11:50:58.325804",
+ "modified": "2025-03-04 15:43:25.151554",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
diff --git a/lms/lms/doctype/lms_payment/lms_payment.py b/lms/lms/doctype/lms_payment/lms_payment.py
index 187c2a9a..1378f4e3 100644
--- a/lms/lms/doctype/lms_payment/lms_payment.py
+++ b/lms/lms/doctype/lms_payment/lms_payment.py
@@ -33,9 +33,24 @@ def send_payment_reminder():
 	)
 
 	for payment in incomplete_payments:
+		if has_paid_later(payment):
+			continue
+
 		send_mail(payment)
 
 
+def has_paid_later(payment):
+	return frappe.db.exists(
+		"LMS Payment",
+		{
+			"member": payment.member,
+			"payment_received": 1,
+			"payment_for_document": payment.payment_for_document,
+			"payment_for_document_type": payment.payment_for_document_type,
+		},
+	)
+
+
 def send_mail(payment):
 	subject = _("Complete Your Enrollment - Don't miss out!")
 	template = "payment_reminder"
diff --git a/lms/lms/user.py b/lms/lms/user.py
new file mode 100644
index 00000000..ade66c82
--- /dev/null
+++ b/lms/lms/user.py
@@ -0,0 +1,85 @@
+import frappe
+from frappe import _
+from frappe.model.naming import append_number_if_name_exists
+from frappe.website.utils import cleanup_page_name
+from frappe.website.utils import is_signup_disabled
+from frappe.utils import random_string, escape_html
+from lms.lms.utils import get_country_code
+
+
+def validate_username_duplicates(doc, method):
+	while not doc.username or doc.username_exists():
+		doc.username = append_number_if_name_exists(
+			doc.doctype, cleanup_page_name(doc.full_name), fieldname="username"
+		)
+	if " " in doc.username:
+		doc.username = doc.username.replace(" ", "")
+
+	if len(doc.username) < 4:
+		doc.username = doc.email.replace("@", "").replace(".", "")
+
+
+def after_insert(doc, method):
+	doc.add_roles("LMS Student")
+
+
+@frappe.whitelist(allow_guest=True)
+def sign_up(email, full_name, verify_terms, user_category):
+	if is_signup_disabled():
+		frappe.throw(_("Sign Up is disabled"), _("Not Allowed"))
+
+	user = frappe.db.get("User", {"email": email})
+	if user:
+		if user.enabled:
+			return 0, _("Already Registered")
+		else:
+			return 0, _("Registered but disabled")
+	else:
+		if frappe.db.get_creation_count("User", 60) > 300:
+			frappe.respond_as_web_page(
+				_("Temporarily Disabled"),
+				_(
+					"Too many users signed up recently, so the registration is disabled. Please try back in an hour"
+				),
+				http_status_code=429,
+			)
+
+	user = frappe.get_doc(
+		{
+			"doctype": "User",
+			"email": email,
+			"first_name": escape_html(full_name),
+			"verify_terms": verify_terms,
+			"user_category": user_category,
+			"country": "",
+			"enabled": 1,
+			"new_password": random_string(10),
+			"user_type": "Website User",
+		}
+	)
+	user.flags.ignore_permissions = True
+	user.flags.ignore_password_policy = True
+	user.insert()
+
+	# set default signup role as per Portal Settings
+	default_role = frappe.db.get_single_value("Portal Settings", "default_role")
+	if default_role:
+		user.add_roles(default_role)
+
+	user.add_roles("LMS Student")
+	set_country_from_ip(None, user.name)
+
+	if user.flags.email_sent:
+		return 1, _("Please check your email for verification")
+	else:
+		return 2, _("Please ask your administrator to verify your sign-up")
+
+
+def set_country_from_ip(login_manager=None, user=None):
+	if not user and login_manager:
+		user = login_manager.user
+	user_country = frappe.db.get_value("User", user, "country")
+	# if user_country:
+	#    return
+	frappe.db.set_value("User", user, "country", get_country_code())
+	return
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index b00c2f6b..b1a73e86 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1,6 +1,7 @@
 import re
 import string
 import frappe
+import hashlib
 import json
 import razorpay
 import requests
@@ -984,17 +985,145 @@ def change_currency(amount, currency, country=None):
 
 
 @frappe.whitelist(allow_guest=True)
-def get_courses():
+def get_courses(filters=None, start=0, page_length=20):
 	"""Returns the list of courses."""
-	courses = []
-	course_list = frappe.get_all("LMS Course", pluck="name")
-	for course in course_list:
-		courses.append(get_course_details(course))
 
-	courses = get_categorized_courses(courses)
+	if not filters:
+		filters = {}
+
+	filters, or_filters, show_featured = update_course_filters(filters)
+	fields = get_course_fields()
+
+	courses = frappe.get_all(
+		"LMS Course",
+		filters=filters,
+		fields=fields,
+		or_filters=or_filters,
+		order_by="enrollments desc",
+		start=start,
+		page_length=page_length,
+	)
+	if show_featured:
+		courses = get_featured_courses(filters, or_filters, fields) + courses
+
+	courses = get_enrollment_details(courses)
+	courses = get_course_card_details(courses)
 	return courses
 
 
+def get_course_card_details(courses):
+	for course in courses:
+		course.instructors = get_instructors(course.name)
+
+		if course.paid_course and course.published == 1:
+			course.amount, course.currency = check_multicurrency(
+				course.course_price, course.currency, None, course.amount_usd
+			)
+			course.price = fmt_money(course.amount, 0, course.currency)
+
+	return courses
+
+
+def get_course_or_filters(filters):
+	or_filters = {}
+	or_filters.update({"title": filters.get("title")})
+	or_filters.update({"short_introduction": filters.get("title")})
+	or_filters.update({"description": filters.get("title")})
+	or_filters.update({"tags": filters.get("title")})
+	return or_filters
+
+
+def update_course_filters(filters):
+	or_filters = {}
+	show_featured = False
+
+	if filters.get("title"):
+		or_filters = get_course_or_filters(filters)
+		del filters["title"]
+
+	if filters.get("enrolled"):
+		enrolled_courses = frappe.get_all(
+			"LMS Enrollment", {"member": frappe.session.user}, pluck="course"
+		)
+		filters.update({"name": ["in", enrolled_courses]})
+		del filters["enrolled"]
+
+	if filters.get("created"):
+		created_courses = frappe.get_all(
+			"Course Instructor", {"instructor": frappe.session.user}, pluck="parent"
+		)
+		filters.update({"name": ["in", created_courses]})
+		del filters["created"]
+
+	if filters.get("live"):
+		filters.update({"featured": 0})
+		show_featured = True
+		del filters["live"]
+
+	if filters.get("certification"):
+		or_filters.update({"enable_certification": 1})
+		or_filters.update({"paid_certificate": 1})
+		del filters["certification"]
+
+	return filters, or_filters, show_featured
+
+
+def get_enrollment_details(courses):
+	for course in courses:
+		filters = {
+			"course": course.name,
+			"member": frappe.session.user,
+		}
+
+		if frappe.db.exists("LMS Enrollment", filters):
+			course.membership = frappe.db.get_value(
+				"LMS Enrollment",
+				filters,
+				["name", "course", "current_lesson", "progress", "member"],
+				as_dict=1,
+			)
+
+	return courses
+
+
+def get_featured_courses(filters, or_filters, fields):
+	filters.update({"featured": 1})
+	featured_courses = frappe.get_all(
+		"LMS Course",
+		filters=filters,
+		fields=fields,
+		or_filters=or_filters,
+		order_by="enrollments desc",
+	)
+	return featured_courses
+
+
+def get_course_fields():
+	return [
+		"name",
+		"title",
+		"tags",
+		"image",
+		"short_introduction",
+		"published",
+		"upcoming",
+		"featured",
+		"disable_self_learning",
+		"published_on",
+		"category",
+		"status",
+		"paid_course",
+		"paid_certificate",
+		"course_price",
+		"currency",
+		"amount_usd",
+		"enable_certification",
+		"lessons",
+		"enrollments",
+		"rating",
+	]
+
+
 @frappe.whitelist(allow_guest=True)
 def get_course_details(course):
 	course_details = frappe.db.get_value(
@@ -2009,3 +2138,25 @@ def get_batch_card_details(batches):
 			batch.price = fmt_money(batch.amount, 0, batch.currency)
 
 	return batches
+
+
+def get_palette(full_name):
+	"""
+	Returns a color unique to each member for Avatar"""
+
+	palette = [
+		["--orange-avatar-bg", "--orange-avatar-color"],
+		["--pink-avatar-bg", "--pink-avatar-color"],
+		["--blue-avatar-bg", "--blue-avatar-color"],
+		["--green-avatar-bg", "--green-avatar-color"],
+		["--dark-green-avatar-bg", "--dark-green-avatar-color"],
+		["--red-avatar-bg", "--red-avatar-color"],
+		["--yellow-avatar-bg", "--yellow-avatar-color"],
+		["--purple-avatar-bg", "--purple-avatar-color"],
+		["--gray-avatar-bg", "--gray-avatar-color0"],
+	]
+
+	encoded_name = str(full_name).encode("utf-8")
+	hash_name = hashlib.md5(encoded_name).hexdigest()
+	idx = cint((int(hash_name[4:6], 16) + 1) / 5.33)
+	return palette[idx % 8]
diff --git a/lms/lms/web_template/courses_mentored/courses_mentored.html b/lms/lms/web_template/courses_mentored/courses_mentored.html
deleted file mode 100644
index c40697a8..00000000
--- a/lms/lms/web_template/courses_mentored/courses_mentored.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% set member = frappe.get_doc("User", frappe.session.user) %}
-<div class="mt-10">
-  {% if member.get_mentored_courses() | length %}
-  <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
-  <div class="cards-parent">
-    {% for course in member.get_mentored_courses() %}
-    {{ widgets.CourseCard(course=course) }}
-    {% endfor %}
-  </div>
-  {% endif %}
-</div>
diff --git a/lms/lms/web_template/courses_mentored/courses_mentored.json b/lms/lms/web_template/courses_mentored/courses_mentored.json
deleted file mode 100644
index 9903e1fc..00000000
--- a/lms/lms/web_template/courses_mentored/courses_mentored.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "__unsaved": 1,
- "creation": "2021-10-21 11:32:57.411626",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [],
- "idx": 0,
- "modified": "2021-10-21 12:01:56.270656",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Courses Mentored",
- "owner": "Administrator",
- "standard": 1,
- "template": "",
- "type": "Section"
-}
\ No newline at end of file
diff --git a/lms/lms/widgets/MemberCard.html b/lms/lms/widgets/MemberCard.html
deleted file mode 100644
index 5d8fdd36..00000000
--- a/lms/lms/widgets/MemberCard.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% set color = get_palette(member.full_name) %}
-<div class="common-card-style member-card">
-	<div class="d-flex">
-		{{ widgets.Avatar(member=member, avatar_class=avatar_class) }}
-
-		<div class="ml-3 my-auto">
-			<div class="member-card-title">
-				{{ member.full_name }}
-			</div>
-
-			{% if member.headline %}
-			<div> {{ member.headline }} </div>
-			{% endif %}
-
-			{% if member.looking_for_job %}
-			<div class="indicator-pill green"> {{ _("Open Network") }} </div>
-			{% endif %}
-
-			{% set course_count = get_authored_courses(member.name, True) | length %}
-			{% set suffix = "Courses" if course_count > 1 else "Course" %}
-
-			{% if show_course_count and course_count > 0 %}
-			<div class="">
-				Created {{ course_count }} {{ suffix }}
-			</div>
-			{% endif %}
-		</div>
-		<a class="stretched-link" href="{{ get_profile_url(member.username) }}"></a>
-	</div>
-
-</div>
diff --git a/lms/locale/ar.po b/lms/locale/ar.po
index 64fda9ce..be0dfc4d 100644
--- a/lms/locale/ar.po
+++ b/lms/locale/ar.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr ""
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "عنوان"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "العنوان سطر 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "العنوان سطر 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "مسجل بالفعل"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "كمية"
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr ""
 msgid "Archived"
 msgstr "أرشفة"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr ""
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -496,7 +506,7 @@ msgstr ""
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "تفاصيل الفاتورة"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr ""
@@ -682,7 +692,7 @@ msgstr "فرع"
 msgid "Business Owner"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "فئة"
 msgid "Category Name"
 msgstr "اسم التصنيف"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "شهادة"
@@ -755,6 +767,10 @@ msgstr ""
 msgid "Certificate Link"
 msgstr ""
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr ""
 
@@ -787,11 +808,6 @@ msgstr ""
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr ""
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "مدينة"
 
@@ -1086,7 +1102,9 @@ msgstr "أكتمل"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr "نموذج البريد الإلكتروني للتأكيد"
 msgid "Congratulations on getting certified!"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr "عقد"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr ""
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "الدولة"
@@ -1255,10 +1273,6 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr ""
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr ""
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr ""
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr ""
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1373,6 +1381,7 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "أنشأ"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr ""
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "حذف"
 
@@ -1542,7 +1551,7 @@ msgstr "حذف"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "تفاصيل"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "تصحيح"
@@ -1758,11 +1767,6 @@ msgstr "الموظف"
 msgid "Enable"
 msgstr "تمكين"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr ""
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr ""
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "خطأ"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr ""
 msgid "Function"
 msgstr "وظيفة"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "تاريخ القضية"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr ""
@@ -2657,7 +2670,7 @@ msgstr "وظائف"
 msgid "Join"
 msgstr "انضم"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "دخول"
 
@@ -3089,8 +3102,8 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "{0} جديد"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "التالي"
 
@@ -3581,10 +3594,6 @@ msgstr ""
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr ""
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr "الخيار 4"
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr "منظمة"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr ""
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr ""
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "يرجى التحقق من بريدك الالكتروني للتحقق"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -4006,7 +4030,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr ""
@@ -4112,7 +4140,7 @@ msgstr ""
 msgid "Post"
 msgstr "بعد"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "الرمز البريدي"
 
@@ -4155,19 +4183,22 @@ msgstr "معاينة الصورة"
 msgid "Preview Video"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "سابق"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "التسعير"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr "خاص"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr ""
 msgid "Published On"
 msgstr "نشرت في"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr "مسار"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr ""
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr "تاريخ البدء"
 msgid "Start Date:"
 msgstr "تاريخ البدء:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr ""
@@ -4945,7 +4981,7 @@ msgstr ""
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "حالة"
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "ملخص"
 msgid "Sunday"
 msgstr "الأحد"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "قالب"
 msgid "Temporarily Disabled"
 msgstr "موقوف مؤقتا"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr ""
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr ""
 
@@ -5331,11 +5367,7 @@ msgstr ""
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr ""
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr ""
 
@@ -5469,7 +5501,7 @@ msgstr "إلى"
 msgid "To Date"
 msgstr "إلى تاريخ"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "وقعت الكثير من المستخدمين في الآونة الأخيرة، وذلك هو تعطيل التسجيل. يرجى المحاولة مرة أخرى في ساعة"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "الاجمالي غير شامل الضريبة"
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr ""
@@ -5917,7 +5957,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "أكتمل"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -6135,11 +6175,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} ذكرتك في تعليق في {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/bs.po b/lms/locale/bs.po
index 7c0777c6..5da18007 100644
--- a/lms/locale/bs.po
+++ b/lms/locale/bs.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-27 20:06\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Bosnian\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr "<span class=\"h4\"><b>Postavke</b></span>"
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr "<span style=\"font-size: 18px;\"><b>Statistika</b></span>"
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr "Kurs ne može imati i plaćeni certifikat i certifikat o završenom kursu."
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "Uvod u kurs u jednom redu koji se pojavljuje na kartici kursa"
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Dodaj zadatak kao {0}"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "Adresa"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "Adresna linija 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "Adresna linija 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Već Registrovan"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "Iznos"
 msgid "Amount (USD)"
 msgstr "Iznos (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr "Iznos i Valuta su obavezni za plaćene grupe."
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr "Iznos i valuta su obevezni za plaćene certifikate."
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr "Iznos i valuta su potrebni za plaćene kurseve."
 
@@ -364,7 +374,7 @@ msgstr "Aplikacije"
 msgid "Archived"
 msgstr "Arhivirano"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "Jeste li sigurni da želite otkazati ovo ocjenjivanje? Ova radnja se ne može poništiti."
 
@@ -400,7 +410,7 @@ msgstr "Tip Procjene"
 msgid "Assessment added successfully"
 msgstr "Procjena je uspješno dodana"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Procjena {0} je već dodana ovoj grupi."
 
@@ -496,7 +506,7 @@ msgstr "Prosječna Ocjena"
 msgid "Average of Feedback Received"
 msgstr "Prosjek Primljenih Povratnih Informacija"
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr "Povratak na Kurs"
 
@@ -602,7 +612,7 @@ msgstr "Postavke Grupe"
 msgid "Batch Start Date:"
 msgstr "Datum Početka Grupe:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr "Podsjetnik Početka Grupe"
 
@@ -617,7 +627,7 @@ msgstr "Naziv Grupe"
 msgid "Batch Updated"
 msgstr "Grupa Ažurirana"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "Datum završetka grupe ne može biti prije datuma početka grupe"
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Detalji Fakture"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Faktura Adresa"
@@ -682,7 +692,7 @@ msgstr "Podružnica"
 msgid "Business Owner"
 msgstr "Poslovni Vlasnik"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr "Kupi ovaj kurs"
 
@@ -695,12 +705,12 @@ msgstr "Od"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr "Otkaži ovo ocjenjivanje?"
 
@@ -741,7 +751,9 @@ msgstr "Kategorija"
 msgid "Category Name"
 msgstr "Naziv kategorije"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Certifikat"
@@ -755,6 +767,10 @@ msgstr "Šablon e-pošte Certifikata"
 msgid "Certificate Link"
 msgstr "Veza Certifikata"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr "Certifikat o Završetku"
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr "Certifikat je uspješno spremljen"
@@ -770,15 +786,20 @@ msgstr "Certifikati su uspješno generirani"
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Certifikacija"
 
@@ -787,11 +808,6 @@ msgstr "Certifikacija"
 msgid "Certification Details"
 msgstr "Detalji Certifikacije"
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "Certifikacija ističe nakon (godina)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Odaberi jedan odgovor"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "Grad"
 
@@ -1086,7 +1102,9 @@ msgstr "Završeno"
 msgid "Completed by Students"
 msgstr "Studenti koji su Završili"
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "Završni Certifikat"
 
@@ -1126,7 +1144,7 @@ msgstr "Šablon e-pošte za potvrdu"
 msgid "Congratulations on getting certified!"
 msgstr "Čestitamo na certificiranju!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr "Kontaktirajte administratora da se upišete na ovaj kurs."
 
@@ -1148,7 +1166,7 @@ msgstr "Nastavi sa Učenjem"
 msgid "Contract"
 msgstr "Ugovor"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Politika Kolačića"
 
@@ -1176,7 +1194,7 @@ msgstr "Tačan Odgovor"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "Zemlja"
@@ -1255,10 +1273,6 @@ msgstr "Poglavlje Kursa"
 msgid "Course Completed"
 msgstr "Kurs je Završen"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Sadržaj Kursa"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Naziv Kursa"
 msgid "Course Outline"
 msgstr "Pregled Kursa"
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Cijena Kursa"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Naziv Kursa"
 msgid "Course added to program"
 msgstr "Kurs dodat programu"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "Kurs je već dodan u grupu."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr "Kurs uspješno izbrisan"
 
@@ -1359,7 +1367,7 @@ msgstr "Kurs uspješno izbrisan"
 msgid "Course moved successfully"
 msgstr "Kurs uspješno pomjeren"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Kurs {0} je već dodan ovoj grupi."
@@ -1373,6 +1381,7 @@ msgstr "Kurs {0} je već dodan ovoj grupi."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Kreirano"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Tip Stepena"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -1542,7 +1551,7 @@ msgstr "Izbriši"
 msgid "Delete Chapter"
 msgstr "Izbriši Poglavlje"
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr "Izbriši Kurs"
 
@@ -1554,7 +1563,7 @@ msgstr "Izbriši ovo Poglavlje?"
 msgid "Delete this lesson?"
 msgstr "Izbriši ovu Lekciju?"
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "Brisanjem kursa izbrisat će se i sva njegova poglavlja i lekcije. Jeste li sigurni da želite izbrisati ovaj kurs?"
 
@@ -1609,7 +1618,7 @@ msgstr "Detalji"
 msgid "Didn't receive the code?"
 msgstr "Niste primili kod?"
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Onemogući Samostalni Upis"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "E-pošta"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "Uredi"
@@ -1758,11 +1767,6 @@ msgstr "Personal"
 msgid "Enable"
 msgstr "Omogući"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "Omogući Certifikaciju"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "Omogućite Google API u Google Postavkama za slanje kalendarskih pozivnica za ocjenjivanje."
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr "Upisan"
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Upisani Studenti"
@@ -1845,7 +1849,7 @@ msgstr "Potvrda upisa za {0}"
 msgid "Enrollment Count"
 msgstr "Broj Upisa"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr "Upis nije uspio"
 
@@ -1886,13 +1890,13 @@ msgstr "Unesite tačan odgovor"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "Grеška"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr "Greška pri kreiranju časa uživo. Pokušaj ponovo. {0}"
 
@@ -1920,7 +1924,7 @@ msgstr "Datum Yavršetka Ocjenjivanja"
 msgid "Evaluation Request"
 msgstr "Zahtjev za Ocjenu"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "Datum završetka ocjenjivanja ne može biti prije od datuma završetka grupe."
 
@@ -1934,15 +1938,17 @@ msgstr "Evaluacija je uspješno sačuvana"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "Ocjenjivač"
@@ -1967,6 +1973,10 @@ msgstr "Raspored Ocjenjivača"
 msgid "Evaluator is Unavailable"
 msgstr "Ocjenjivač je Nedostupan"
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr "Ocjenjivač je obavezan za plaćene certifikate."
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Puno Radno Vrijeme"
 msgid "Function"
 msgstr "Funkcija"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr "Iznos PDV-a"
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr "PDV Broj"
 
@@ -2206,10 +2216,12 @@ msgstr "Generiši Certifikate"
 msgid "Generate Google Meet Link"
 msgstr "Generiraj Google Meet Vezu"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr "Preuzmi Certifikat"
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "Certificiraj se"
@@ -2489,7 +2501,7 @@ msgstr "Instruktor Sadržaj"
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "Instruktor Napomene"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Datum Izdavanja"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "Izdato"
@@ -2657,7 +2670,7 @@ msgstr "Poslovi"
 msgid "Join"
 msgstr "Pridružite se"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr "Pridružite se Pozivu"
 
@@ -2958,7 +2971,7 @@ msgstr "Naziv Lekcije"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr "Preferenca Lokacije"
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Prijava"
 
@@ -3089,9 +3102,9 @@ msgstr "Postavi LMS kao Početnu Web Stranicu"
 msgid "Make an Announcement"
 msgstr "Objavi"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
-msgstr "Obavezno unesite ispravno ime za naplatu jer će se isti koristiti u vašoj fakturi."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
+msgstr "Unesi ispravanu faktura adresu jer će se koristiti u vašoj fakturi."
 
 #: frontend/src/components/BatchOverlay.vue:60
 msgid "Manage Batch"
@@ -3471,11 +3484,11 @@ msgstr "Novi Kviz"
 msgid "New Sign Up"
 msgstr "Nova Registracija"
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr "Novi komentar u grupi {0}"
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr "Novi odgovor na temu {0} na kursu {1}"
 
@@ -3484,7 +3497,7 @@ msgstr "Novi odgovor na temu {0} na kursu {1}"
 msgid "New {0}"
 msgstr "Novi {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "Sljedeći"
 
@@ -3581,10 +3594,6 @@ msgstr "Nema slobodnih termina za ovaj datum."
 msgid "No submissions"
 msgstr "Nema prijava"
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "Nema predstojećih ocjenjivanja."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Bez {0}"
@@ -3686,7 +3695,7 @@ msgstr "Programu se mogu dodati samo kursevi za koje je samostalno učenje onemo
 msgid "Only files of type {0} will be accepted."
 msgstr "Samo datoteke tipa {0} će biti prihvaćeni."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr "Dozvoljena je samo datoteka slike."
 
@@ -3752,10 +3761,6 @@ msgstr "Opcija 4"
 msgid "Order ID"
 msgstr "ID Naloga"
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr "Naručeni Artikal"
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr "Organizacija"
@@ -3765,7 +3770,7 @@ msgstr "Organizacija"
 msgid "Organization"
 msgstr "Organizacija"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr "Originalni Iznos"
 
@@ -3804,13 +3809,23 @@ msgstr "Stranice"
 msgid "Paid Batch"
 msgstr "Plaćena Grupa"
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr "Plaćeni Certifikat"
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr "Plaćeni Certifikat nakon Ocjenjivanja"
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Plaćeni Kurs"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr "Pan Broj"
 
@@ -3898,6 +3913,15 @@ msgstr "Šablon Podsjetnika Plaćanja"
 msgid "Payment Settings"
 msgstr "Postavke Plaćanja"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr "Plaćanje za "
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr "Plaćanje za Certifikat"
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "Procenat (npr. 70%)"
 msgid "Percentage/Status"
 msgstr "Procentualno/Status"
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "Broj Telefona"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr "Prijavi se"
 
@@ -3969,11 +3993,11 @@ msgstr "Provjeri e-poštu za potvrdu"
 msgid "Please click on the following button to set your new password"
 msgstr "Klikni na sljedeće dugme da postavite novu lozinku"
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Završite prethodne kurseve u programu da biste se upisali na ovaj kurs."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Omogućite Zoom Postavke da koristite ovu funkciju."
 
@@ -4006,7 +4030,7 @@ msgstr "Unesi URL za podnošenje zadatka."
 msgid "Please enter your answer"
 msgstr "Unesi svoj odgovor"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr "Instaliraj aplikaciju Payments da kreirate plaćene grupe."
 
@@ -4014,7 +4038,7 @@ msgstr "Instaliraj aplikaciju Payments da kreirate plaćene grupe."
 msgid "Please install the Payments app to create a paid courses."
 msgstr "Instaliraj aplikaciju plaćanja da kreirate plaćene kurseve."
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr "Recite nam odakle ste čuli za nas."
 
@@ -4039,6 +4063,10 @@ msgstr "Prijavi se da nastaviš s plaćanjem."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Dobro se pripremi i dođi na vrijeme za ocjenjivanje."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr "Zakaži ocjenjvanje kako biste dobili certifikat."
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "Odaberi Datum."
@@ -4112,7 +4140,7 @@ msgstr "Mogući Odgovor 4"
 msgid "Post"
 msgstr "Objava"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Poštanski Broj"
 
@@ -4155,19 +4183,22 @@ msgstr "Pregled slike"
 msgid "Preview Video"
 msgstr "Pregledaj Video"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Prethodna"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Određivanje Cijena"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr "Cijene i Certifikati"
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr "Primarne Zemlje"
 msgid "Primary Subgroup"
 msgstr "Primarna Podgrupa"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr "Pravila Privatnosti"
 
@@ -4194,7 +4225,7 @@ msgstr "Privatno"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr "Privatni Podaci uključuju vašu Ocjenu i Preference Radnog Okruženja"
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr "Prijeđi na Plaćanje"
 
@@ -4274,6 +4305,11 @@ msgstr "Objavljeni Kursevi"
 msgid "Published On"
 msgstr "Objavljeno dana"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr "Kupljeni Certifikat"
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr "Kvizovi"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr "Preferenca Uloge"
 msgid "Route"
 msgstr "Ruta"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Red #{0} Datum ne može biti izvan trajanja grupe."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Red #{0} Vrijeme završetka ne može biti izvan trajanja grupe."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Red #{0} Vrijeme početka ne može biti kasnije ili isto vremenu završetka."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Red #{0} Vrijeme početka ne može biti izvan trajanja grupe."
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Raspored"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr "Raspored Ocjenjivanja"
 
@@ -4905,8 +4941,8 @@ msgstr "Start Datum"
 msgid "Start Date:"
 msgstr "Datum Početka:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "Počni Učiti"
@@ -4945,7 +4981,7 @@ msgstr "Početni URL"
 msgid "Startup Organization"
 msgstr "Pokretačka Organizacija"
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "Zemlja"
 
@@ -5074,7 +5110,7 @@ msgstr "Predano {0}"
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr "Predano {0}"
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Sažetak"
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr "Sumnjiva mustra pronađena u {0}: {1}"
 
@@ -5192,7 +5228,7 @@ msgstr "Šablon"
 msgid "Temporarily Disabled"
 msgstr "Privremeno Onemogućeno"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "Uslovi Korišćenja"
 
@@ -5228,7 +5264,7 @@ msgstr "Hvala vam na povratnim informacijama!"
 msgid "Thanks and Regards"
 msgstr "Hvala i Pozdrav"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr "Grupa je popunjena. Kontaktiraj Administratora."
 
@@ -5276,7 +5312,7 @@ msgstr "Nema učesnika koji zadovoljavaju ovaj kriterijum."
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr "Trenutno nema dostupnih programa. Pazite, nova iskustva učenja su uskoro na putu!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr "Nema slobodnih mjesta u ovoj grupi."
 
@@ -5319,11 +5355,11 @@ msgstr "Ovaj certifikat ne ističe"
 msgid "This class has ended"
 msgstr "Ovaj čas je završen"
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr "Ovaj kurs ima:"
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "Ovaj kurs je besplatan."
 
@@ -5331,11 +5367,7 @@ msgstr "Ovaj kurs je besplatan."
 msgid "This is a chapter in the course {0}"
 msgstr "Ovo je poglavlje kursa {0}"
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "Ova lekcija nije dostupna za pregled. Pošto ste instruktor kursa samo vi to možete vidjeti."
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "Ova lekcija nije dostupna za pregled. Prijavi se na kurs da biste mu pristupili."
 
@@ -5469,7 +5501,7 @@ msgstr "Do"
 msgid "To Date"
 msgstr "Do Datuma"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr "Da biste se pridružili ovoj grupi, kontaktirajte administratora."
 
@@ -5481,7 +5513,7 @@ msgstr "Da biste učitali sliku, video, audio ili PDF sa svog sistema, klikni na
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Nedavno se prijavilo previše korisnika, pa je registracija onemogućena. Pokušajte ponovo za sat vremena"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "Ukupno"
 
@@ -5778,7 +5810,7 @@ msgstr "Šta znači uključi u pregled?"
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Kada se kurs pošalje na pregled, biće naveden ovdje."
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr "Gdje ste čuli za nas?"
 
@@ -5827,6 +5859,10 @@ msgstr "Napišite svoj odgovor ovdje"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "Već imate ocjenjivanje na {0} na {1} za kurs {2}."
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr "Već ste certificirani za ovaj kurs. Klikni na karticu ispod da otvorite svoj certifikat."
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr "Već ste upisani za ovu grupu."
@@ -5909,6 +5945,10 @@ msgstr "Već ste se prijavili za ovaj posao."
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "Već ste premašili maksimalan broj pokušaja dozvoljen za ovaj kviz."
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr "Već ste kupili sertifikat za ovaj kurs."
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "Već ste pregledali ovaj kurs"
@@ -5917,7 +5957,7 @@ msgstr "Već ste pregledali ovaj kurs"
 msgid "You have been enrolled in this batch"
 msgstr "Upisani ste u ovu grupu"
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr "Upisani ste na ovaj kurs"
 
@@ -5941,7 +5981,7 @@ msgstr "Još niste kreirali nijedan kviz. Da kreiraš novi kviz, klikni na dugme
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Odlučili ste da budete obaviješteni o ovom kursu. Primit ćete e-poštu kada kurs postane dostupan."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr "Prvo se prijavite da biste se upisali na ovaj kurs"
 
@@ -6027,7 +6067,7 @@ msgstr "ali niste izvršili uplatu"
 msgid "cancel your application"
 msgstr "otkaži svoju prijavu"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "završeno"
 
@@ -6087,7 +6127,7 @@ msgstr "sedmice"
 msgid "you can"
 msgstr "možeš"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr "{0} Postavke nisu pronađene"
 
@@ -6127,7 +6167,7 @@ msgstr "{0} je već certificiran za kurs {1}"
 msgid "{0} is your evaluator"
 msgstr "{0} je vaš ocjenjivač"
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "{0} vas je spomenuo u komentaru"
 
@@ -6135,11 +6175,11 @@ msgstr "{0} vas je spomenuo u komentaru"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr "{0} vas je spomenuo u komentaru u vašoj grupi."
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} vas je spomenuo u komentaru u {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr "{0}k"
 
diff --git a/lms/locale/de.po b/lms/locale/de.po
index 7d2edc3a..d5df3e41 100644
--- a/lms/locale/de.po
+++ b/lms/locale/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Aufgabe als {0} hinzufügen"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "Adresse"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "Adresse Zeile 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "Adresse Zeile 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Bereits registriert"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "Betrag"
 msgid "Amount (USD)"
 msgstr "Betrag (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr "Apps"
 msgid "Archived"
 msgstr "Archiviert"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr "Prüfungstyp"
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -496,7 +506,7 @@ msgstr "Durchschnittliche Bewertung"
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Rechnungsdetails"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Rechnungsname"
@@ -682,7 +692,7 @@ msgstr "Betrieb"
 msgid "Business Owner"
 msgstr "Geschäftsinhaber"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr "Von"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "Kategorie"
 msgid "Category Name"
 msgstr "Kategoriename"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Zertifikat"
@@ -755,6 +767,10 @@ msgstr "Zertifikat-E-Mail-Vorlage"
 msgid "Certificate Link"
 msgstr "Zertifikatslink"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Zertifizierung"
 
@@ -787,11 +808,6 @@ msgstr "Zertifizierung"
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "Zertifizierung läuft ab nach (Jahre)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Wählen Sie eine Antwort"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "Ort"
 
@@ -1086,7 +1102,9 @@ msgstr "Abgeschlossen"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr "Bestätigungs-E-Mail-Vorlage"
 msgid "Congratulations on getting certified!"
 msgstr "Herzlichen Glückwunsch zur Zertifizierung!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr "Vertrag"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Cookie-Richtlinie"
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "Land"
@@ -1255,10 +1273,6 @@ msgstr "Kurskapitel"
 msgid "Course Completed"
 msgstr "Abgeschlossene Kurse"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Kursinhalt"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Kursname"
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Kurspreis"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Kurstitel"
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1373,6 +1381,7 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Erstellt"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Abschlussart"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1542,7 +1551,7 @@ msgstr "Löschen"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "Details"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Selbstregistrierung deaktivieren"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "E-Mail"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1758,11 +1767,6 @@ msgstr "Mitarbeiter"
 msgid "Enable"
 msgstr "ermöglichen"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "Zertifizierung aktivieren"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "Aktivieren Sie die Google API in den Google-Einstellungen, um Kalendereinladungen für Bewertungen zu versenden."
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Eingeschriebene Studenten"
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Anzahl der Einschreibungen"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr "Geben Sie die richtige Antwort ein"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "Fehler"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Vollzeit"
 msgid "Function"
 msgstr "Funktion"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr "Google Meet-Link generieren"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Ausstellungsdatum"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "Ausgestellt am"
@@ -2657,7 +2670,7 @@ msgstr "freie Stellen"
 msgid "Join"
 msgstr "Beitreten"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr "Titel der Unterrichtseinheit"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Anmelden"
 
@@ -3089,8 +3102,8 @@ msgstr "LMS als Standard-Startseite festlegen"
 msgid "Make an Announcement"
 msgstr "Machen Sie eine Ankündigung"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Neu {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "Weiter"
 
@@ -3581,10 +3594,6 @@ msgstr "Für dieses Datum sind keine Plätze verfügbar."
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "Keine bevorstehenden Bewertungen."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Keine {0}"
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Es werden nur Dateien vom Typ {0} akzeptiert."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr "Option 4"
 msgid "Order ID"
 msgstr "Bestell-Nr."
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr "Firma"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr "Seiten"
 msgid "Paid Batch"
 msgstr "Bezahlte Charge"
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Kostenpflichtiger Kurs"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr "Zahlungseinstellungen"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "Prozentsatz (z. B. 70 %)"
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "Bitte überprüfen Sie Ihren Posteingang. Wir haben Ihnen eine E-Mail mi
 msgid "Please click on the following button to set your new password"
 msgstr "Bitte klicken Sie auf die folgende Schaltfläche, um Ihr neues Passwort festzulegen"
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Bitte aktivieren Sie die Zoom-Einstellungen, um diese Funktion zu nutzen."
 
@@ -4006,7 +4030,7 @@ msgstr "Bitte geben Sie die URL zur Aufgabeneinreichung ein."
 msgid "Please enter your answer"
 msgstr "Bitte geben Sie Ihre Antwort ein"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr "Bitte loggen Sie sich ein, um mit der Zahlung fortzufahren."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Bitte bereiten Sie sich gut vor und erscheinen Sie pünktlich zu den Prüfungen."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "Bitte wählen Sie ein Datum aus."
@@ -4112,7 +4140,7 @@ msgstr "Mögliche Antwort 4"
 msgid "Post"
 msgstr "Absenden"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
@@ -4155,19 +4183,22 @@ msgstr "Vorschaubild"
 msgid "Preview Video"
 msgstr "Videovorschau"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Vorhergehende"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Preisgestaltung"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr "Primäre Untergruppe"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr "Datenschutzerklärung"
 
@@ -4194,7 +4225,7 @@ msgstr "Privat"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr "Veröffentlichte Kurse"
 msgid "Published On"
 msgstr "Veröffentlicht am"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr "Pfad"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Planen"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr "Startdatum"
 msgid "Start Date:"
 msgstr "Startdatum:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "Mit dem Lernen beginnen"
@@ -4945,7 +4981,7 @@ msgstr "Start-URL"
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "Bundesland"
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Zusammenfassung"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "Vorlage"
 msgid "Temporarily Disabled"
 msgstr "Zeitweise nicht verfügbar"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "Nutzungsbedingungen"
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Danke und Grüße"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr "Dieses Zertifikat läuft nicht ab"
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "Dieser Kurs ist kostenlos."
 
@@ -5331,11 +5367,7 @@ msgstr "Dieser Kurs ist kostenlos."
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr ""
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr ""
 
@@ -5469,7 +5501,7 @@ msgstr "An"
 msgid "To Date"
 msgstr "Bis-Datum"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr "Um dieser Gruppe beizutreten, wenden Sie sich bitte an den Administrator."
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Zu viele Benutzer unterzeichnete vor kurzem, also die Registrierung ist deaktiviert. Bitte versuchen Sie es in einer Stunde zurück"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "Summe"
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr "Schreiben Sie hier Ihre Antwort"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr "Sie haben sich bereits auf diese Stelle beworben."
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "Sie haben die maximal zulässige Anzahl von Versuchen für dieses Quiz bereits überschritten."
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "Sie haben diesen Kurs bereits bewertet"
@@ -5917,7 +5957,7 @@ msgstr "Sie haben diesen Kurs bereits bewertet"
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Sie haben sich für eine Benachrichtigung zu diesem Kurs entschieden. Sie erhalten eine E-Mail, sobald der Kurs verfügbar ist."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr "stornieren Sie Ihre Bewerbung"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "abgeschlossen"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr "Sie können"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "{0} hat Sie in einem Kommentar erwähnt"
 
@@ -6135,11 +6175,11 @@ msgstr "{0} hat Sie in einem Kommentar erwähnt"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} erwähnte Sie in einem Kommentar in {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/eo.po b/lms/locale/eo.po
index 1e3591b1..8fb60f3c 100644
--- a/lms/locale/eo.po
+++ b/lms/locale/eo.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr "crwdns149196:0crwdne149196:0"
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr "crwdns149198:0crwdne149198:0"
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr "crwdns152597:0crwdne152597:0"
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "crwdns151462:0crwdne151462:0"
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "crwdns149240:0{0}crwdne149240:0"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "crwdns149242:0crwdne149242:0"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "crwdns149244:0crwdne149244:0"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "crwdns149246:0crwdne149246:0"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "crwdns149266:0crwdne149266:0"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "crwdns149268:0crwdne149268:0"
 msgid "Amount (USD)"
 msgstr "crwdns149270:0crwdne149270:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr "crwdns151730:0crwdne151730:0"
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr "crwdns152599:0crwdne152599:0"
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr "crwdns151732:0crwdne151732:0"
 
@@ -364,7 +374,7 @@ msgstr "crwdns149294:0crwdne149294:0"
 msgid "Archived"
 msgstr "crwdns152268:0crwdne152268:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "crwdns152463:0crwdne152463:0"
 
@@ -400,7 +410,7 @@ msgstr "crwdns149304:0crwdne149304:0"
 msgid "Assessment added successfully"
 msgstr "crwdns149306:0crwdne149306:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "crwdns149308:0{0}crwdne149308:0"
 
@@ -496,7 +506,7 @@ msgstr "crwdns149336:0crwdne149336:0"
 msgid "Average of Feedback Received"
 msgstr "crwdns152270:0crwdne152270:0"
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr "crwdns149338:0crwdne149338:0"
 
@@ -602,7 +612,7 @@ msgstr "crwdns149366:0crwdne149366:0"
 msgid "Batch Start Date:"
 msgstr "crwdns149368:0crwdne149368:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr "crwdns152467:0crwdne152467:0"
 
@@ -617,7 +627,7 @@ msgstr "crwdns149372:0crwdne149372:0"
 msgid "Batch Updated"
 msgstr "crwdns149374:0crwdne149374:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "crwdns149376:0crwdne149376:0"
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "crwdns149386:0crwdne149386:0"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "crwdns149388:0crwdne149388:0"
@@ -682,7 +692,7 @@ msgstr "crwdns149396:0crwdne149396:0"
 msgid "Business Owner"
 msgstr "crwdns149398:0crwdne149398:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr "crwdns149404:0crwdne149404:0"
 
@@ -695,12 +705,12 @@ msgstr "crwdns149406:0crwdne149406:0"
 msgid "CGPA/4"
 msgstr "crwdns149408:0crwdne149408:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "crwdns152471:0crwdne152471:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr "crwdns152473:0crwdne152473:0"
 
@@ -741,7 +751,9 @@ msgstr "crwdns149416:0crwdne149416:0"
 msgid "Category Name"
 msgstr "crwdns149418:0crwdne149418:0"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "crwdns149420:0crwdne149420:0"
@@ -755,6 +767,10 @@ msgstr "crwdns149422:0crwdne149422:0"
 msgid "Certificate Link"
 msgstr "crwdns149424:0crwdne149424:0"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr "crwdns152601:0crwdne152601:0"
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr "crwdns149426:0crwdne149426:0"
@@ -770,15 +786,20 @@ msgstr "crwdns151924:0crwdne151924:0"
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "crwdns149430:0crwdne149430:0"
 
@@ -787,11 +808,6 @@ msgstr "crwdns149430:0crwdne149430:0"
 msgid "Certification Details"
 msgstr "crwdns149432:0crwdne149432:0"
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "crwdns149434:0crwdne149434:0"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "crwdns149462:0crwdne149462:0"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "crwdns149464:0crwdne149464:0"
 
@@ -1086,7 +1102,9 @@ msgstr "crwdns149520:0crwdne149520:0"
 msgid "Completed by Students"
 msgstr "crwdns152082:0crwdne152082:0"
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "crwdns149522:0crwdne149522:0"
 
@@ -1126,7 +1144,7 @@ msgstr "crwdns152481:0crwdne152481:0"
 msgid "Congratulations on getting certified!"
 msgstr "crwdns149534:0crwdne149534:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr "crwdns149536:0crwdne149536:0"
 
@@ -1148,7 +1166,7 @@ msgstr "crwdns149540:0crwdne149540:0"
 msgid "Contract"
 msgstr "crwdns149542:0crwdne149542:0"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "crwdns149544:0crwdne149544:0"
 
@@ -1176,7 +1194,7 @@ msgstr "crwdns149552:0crwdne149552:0"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "crwdns149554:0crwdne149554:0"
@@ -1255,10 +1273,6 @@ msgstr "crwdns149558:0crwdne149558:0"
 msgid "Course Completed"
 msgstr "crwdns149560:0crwdne149560:0"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "crwdns149562:0crwdne149562:0"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "crwdns149580:0crwdne149580:0"
 msgid "Course Outline"
 msgstr "crwdns151624:0crwdne151624:0"
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "crwdns149582:0crwdne149582:0"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "crwdns149590:0crwdne149590:0"
 msgid "Course added to program"
 msgstr "crwdns151734:0crwdne151734:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "crwdns149592:0crwdne149592:0"
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr "crwdns151586:0crwdne151586:0"
 
@@ -1359,7 +1367,7 @@ msgstr "crwdns151586:0crwdne151586:0"
 msgid "Course moved successfully"
 msgstr "crwdns151736:0crwdne151736:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "crwdns149596:0{0}crwdne149596:0"
@@ -1373,6 +1381,7 @@ msgstr "crwdns149596:0{0}crwdne149596:0"
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "crwdns152116:0crwdne152116:0"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "crwdns149644:0crwdne149644:0"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "crwdns149646:0crwdne149646:0"
 
@@ -1542,7 +1551,7 @@ msgstr "crwdns149646:0crwdne149646:0"
 msgid "Delete Chapter"
 msgstr "crwdns151626:0crwdne151626:0"
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr "crwdns151588:0crwdne151588:0"
 
@@ -1554,7 +1563,7 @@ msgstr "crwdns151628:0crwdne151628:0"
 msgid "Delete this lesson?"
 msgstr "crwdns151630:0crwdne151630:0"
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "crwdns151590:0crwdne151590:0"
 
@@ -1609,7 +1618,7 @@ msgstr "crwdns149654:0crwdne149654:0"
 msgid "Didn't receive the code?"
 msgstr "crwdns152485:0crwdne152485:0"
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "crwdns149656:0crwdne149656:0"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "crwdns149680:0crwdne149680:0"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "crwdns149682:0crwdne149682:0"
@@ -1758,11 +1767,6 @@ msgstr "crwdns149706:0crwdne149706:0"
 msgid "Enable"
 msgstr "crwdns149708:0crwdne149708:0"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "crwdns149710:0crwdne149710:0"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "crwdns149712:0crwdne149712:0"
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr "crwdns152272:0crwdne152272:0"
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "crwdns149724:0crwdne149724:0"
@@ -1845,7 +1849,7 @@ msgstr "crwdns152430:0{0}crwdne152430:0"
 msgid "Enrollment Count"
 msgstr "crwdns149730:0crwdne149730:0"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr "crwdns149732:0crwdne149732:0"
 
@@ -1886,13 +1890,13 @@ msgstr "crwdns149742:0crwdne149742:0"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "crwdns149744:0crwdne149744:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr "crwdns152489:0{0}crwdne152489:0"
 
@@ -1920,7 +1924,7 @@ msgstr "crwdns149750:0crwdne149750:0"
 msgid "Evaluation Request"
 msgstr "crwdns149752:0crwdne149752:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "crwdns149754:0crwdne149754:0"
 
@@ -1934,15 +1938,17 @@ msgstr "crwdns149756:0crwdne149756:0"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "crwdns149758:0crwdne149758:0"
@@ -1967,6 +1973,10 @@ msgstr "crwdns149762:0crwdne149762:0"
 msgid "Evaluator is Unavailable"
 msgstr "crwdns149764:0crwdne149764:0"
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr "crwdns152603:0crwdne152603:0"
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "crwdns149826:0crwdne149826:0"
 msgid "Function"
 msgstr "crwdns149828:0crwdne149828:0"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr "crwdns149830:0crwdne149830:0"
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr "crwdns149832:0crwdne149832:0"
 
@@ -2206,10 +2216,12 @@ msgstr "crwdns151928:0crwdne151928:0"
 msgid "Generate Google Meet Link"
 msgstr "crwdns149836:0crwdne149836:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr "crwdns149838:0crwdne149838:0"
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "crwdns152432:0crwdne152432:0"
@@ -2489,7 +2501,7 @@ msgstr "crwdns149938:0crwdne149938:0"
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "crwdns149940:0crwdne149940:0"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "crwdns149968:0crwdne149968:0"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "crwdns149970:0crwdne149970:0"
@@ -2657,7 +2670,7 @@ msgstr "crwdns149994:0crwdne149994:0"
 msgid "Join"
 msgstr "crwdns149996:0crwdne149996:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr "crwdns152499:0crwdne152499:0"
 
@@ -2958,7 +2971,7 @@ msgstr "crwdns150084:0crwdne150084:0"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr "crwdns150120:0crwdne150120:0"
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "crwdns150122:0crwdne150122:0"
 
@@ -3089,9 +3102,9 @@ msgstr "crwdns150126:0crwdne150126:0"
 msgid "Make an Announcement"
 msgstr "crwdns150128:0crwdne150128:0"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
-msgstr "crwdns150130:0crwdne150130:0"
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
+msgstr "crwdns152605:0crwdne152605:0"
 
 #: frontend/src/components/BatchOverlay.vue:60
 msgid "Manage Batch"
@@ -3471,11 +3484,11 @@ msgstr "crwdns150228:0crwdne150228:0"
 msgid "New Sign Up"
 msgstr "crwdns150230:0crwdne150230:0"
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr "crwdns150232:0{0}crwdne150232:0"
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr "crwdns150234:0{0}crwdnd150234:0{1}crwdne150234:0"
 
@@ -3484,7 +3497,7 @@ msgstr "crwdns150234:0{0}crwdnd150234:0{1}crwdne150234:0"
 msgid "New {0}"
 msgstr "crwdns150236:0{0}crwdne150236:0"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "crwdns150238:0crwdne150238:0"
 
@@ -3581,10 +3594,6 @@ msgstr "crwdns150264:0crwdne150264:0"
 msgid "No submissions"
 msgstr "crwdns152128:0crwdne152128:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "crwdns150266:0crwdne150266:0"
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "crwdns150268:0{0}crwdne150268:0"
@@ -3686,7 +3695,7 @@ msgstr "crwdns151770:0crwdne151770:0"
 msgid "Only files of type {0} will be accepted."
 msgstr "crwdns150308:0{0}crwdne150308:0"
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr "crwdns150310:0crwdne150310:0"
 
@@ -3752,10 +3761,6 @@ msgstr "crwdns150330:0crwdne150330:0"
 msgid "Order ID"
 msgstr "crwdns150332:0crwdne150332:0"
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr "crwdns150334:0crwdne150334:0"
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr "crwdns150336:0crwdne150336:0"
@@ -3765,7 +3770,7 @@ msgstr "crwdns150336:0crwdne150336:0"
 msgid "Organization"
 msgstr "crwdns150338:0crwdne150338:0"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr "crwdns150340:0crwdne150340:0"
 
@@ -3804,13 +3809,23 @@ msgstr "crwdns150350:0crwdne150350:0"
 msgid "Paid Batch"
 msgstr "crwdns150352:0crwdne150352:0"
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr "crwdns152607:0crwdne152607:0"
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr "crwdns152609:0crwdne152609:0"
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "crwdns150354:0crwdne150354:0"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr "crwdns150356:0crwdne150356:0"
 
@@ -3898,6 +3913,15 @@ msgstr "crwdns152446:0crwdne152446:0"
 msgid "Payment Settings"
 msgstr "crwdns150380:0crwdne150380:0"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr "crwdns152611:0crwdne152611:0"
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr "crwdns152613:0crwdne152613:0"
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "crwdns150394:0crwdne150394:0"
 msgid "Percentage/Status"
 msgstr "crwdns152448:0crwdne152448:0"
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "crwdns150396:0crwdne150396:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr "crwdns150398:0crwdne150398:0"
 
@@ -3969,11 +3993,11 @@ msgstr "crwdns150404:0crwdne150404:0"
 msgid "Please click on the following button to set your new password"
 msgstr "crwdns150406:0crwdne150406:0"
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "crwdns151772:0crwdne151772:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "crwdns150408:0crwdne150408:0"
 
@@ -4006,7 +4030,7 @@ msgstr "crwdns150414:0crwdne150414:0"
 msgid "Please enter your answer"
 msgstr "crwdns150416:0crwdne150416:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr "crwdns150418:0crwdne150418:0"
 
@@ -4014,7 +4038,7 @@ msgstr "crwdns150418:0crwdne150418:0"
 msgid "Please install the Payments app to create a paid courses."
 msgstr "crwdns150420:0crwdne150420:0"
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr "crwdns150422:0crwdne150422:0"
 
@@ -4039,6 +4063,10 @@ msgstr "crwdns150428:0crwdne150428:0"
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "crwdns150430:0crwdne150430:0"
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr "crwdns152615:0crwdne152615:0"
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "crwdns151778:0crwdne151778:0"
@@ -4112,7 +4140,7 @@ msgstr "crwdns150446:0crwdne150446:0"
 msgid "Post"
 msgstr "crwdns150448:0crwdne150448:0"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "crwdns150450:0crwdne150450:0"
 
@@ -4155,19 +4183,22 @@ msgstr "crwdns150464:0crwdne150464:0"
 msgid "Preview Video"
 msgstr "crwdns150466:0crwdne150466:0"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "crwdns150468:0crwdne150468:0"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "crwdns150470:0crwdne150470:0"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr "crwdns152617:0crwdne152617:0"
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr "crwdns150472:0crwdne150472:0"
 msgid "Primary Subgroup"
 msgstr "crwdns150474:0crwdne150474:0"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr "crwdns150476:0crwdne150476:0"
 
@@ -4194,7 +4225,7 @@ msgstr "crwdns150478:0crwdne150478:0"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr "crwdns150480:0crwdne150480:0"
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr "crwdns150482:0crwdne150482:0"
 
@@ -4274,6 +4305,11 @@ msgstr "crwdns150498:0crwdne150498:0"
 msgid "Published On"
 msgstr "crwdns150500:0crwdne150500:0"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr "crwdns152619:0crwdne152619:0"
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr "crwdns150542:0crwdne150542:0"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr "crwdns150594:0crwdne150594:0"
 msgid "Route"
 msgstr "crwdns150596:0crwdne150596:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "crwdns150598:0#{0}crwdne150598:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "crwdns150600:0#{0}crwdne150600:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "crwdns150602:0#{0}crwdne150602:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "crwdns150604:0#{0}crwdne150604:0"
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "crwdns150614:0crwdne150614:0"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr "crwdns150616:0crwdne150616:0"
 
@@ -4905,8 +4941,8 @@ msgstr "crwdns150714:0crwdne150714:0"
 msgid "Start Date:"
 msgstr "crwdns152515:0crwdne152515:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "crwdns150716:0crwdne150716:0"
@@ -4945,7 +4981,7 @@ msgstr "crwdns150724:0crwdne150724:0"
 msgid "Startup Organization"
 msgstr "crwdns150728:0crwdne150728:0"
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "crwdns150730:0crwdne150730:0"
 
@@ -5074,7 +5110,7 @@ msgstr "crwdns150766:0{0}crwdne150766:0"
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr "crwdns150766:0{0}crwdne150766:0"
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "crwdns150770:0crwdne150770:0"
 msgid "Sunday"
 msgstr "crwdns150772:0crwdne150772:0"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr "crwdns151930:0{0}crwdnd151930:0{1}crwdne151930:0"
 
@@ -5192,7 +5228,7 @@ msgstr "crwdns150782:0crwdne150782:0"
 msgid "Temporarily Disabled"
 msgstr "crwdns150784:0crwdne150784:0"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "crwdns150786:0crwdne150786:0"
 
@@ -5228,7 +5264,7 @@ msgstr "crwdns152290:0crwdne152290:0"
 msgid "Thanks and Regards"
 msgstr "crwdns150794:0crwdne150794:0"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr "crwdns152138:0crwdne152138:0"
 
@@ -5276,7 +5312,7 @@ msgstr "crwdns152294:0crwdne152294:0"
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr "crwdns151798:0crwdne151798:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr "crwdns150808:0crwdne150808:0"
 
@@ -5319,11 +5355,11 @@ msgstr "crwdns150818:0crwdne150818:0"
 msgid "This class has ended"
 msgstr "crwdns152144:0crwdne152144:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr "crwdns150820:0crwdne150820:0"
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "crwdns150822:0crwdne150822:0"
 
@@ -5331,11 +5367,7 @@ msgstr "crwdns150822:0crwdne150822:0"
 msgid "This is a chapter in the course {0}"
 msgstr "crwdns151654:0{0}crwdne151654:0"
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "crwdns150824:0crwdne150824:0"
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "crwdns150826:0crwdne150826:0"
 
@@ -5469,7 +5501,7 @@ msgstr "crwdns150852:0crwdne150852:0"
 msgid "To Date"
 msgstr "crwdns150854:0crwdne150854:0"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr "crwdns150858:0crwdne150858:0"
 
@@ -5481,7 +5513,7 @@ msgstr "crwdns150860:0crwdne150860:0"
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "crwdns150862:0crwdne150862:0"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "crwdns150864:0crwdne150864:0"
 
@@ -5778,7 +5810,7 @@ msgstr "crwdns151500:0crwdne151500:0"
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "crwdns150958:0crwdne150958:0"
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr "crwdns150960:0crwdne150960:0"
 
@@ -5827,6 +5859,10 @@ msgstr "crwdns150976:0crwdne150976:0"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "crwdns150978:0{0}crwdnd150978:0{1}crwdnd150978:0{2}crwdne150978:0"
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr "crwdns152621:0crwdne152621:0"
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr "crwdns150980:0crwdne150980:0"
@@ -5909,6 +5945,10 @@ msgstr "crwdns151008:0crwdne151008:0"
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "crwdns151010:0crwdne151010:0"
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr "crwdns152623:0crwdne152623:0"
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "crwdns151012:0crwdne151012:0"
@@ -5917,7 +5957,7 @@ msgstr "crwdns151012:0crwdne151012:0"
 msgid "You have been enrolled in this batch"
 msgstr "crwdns151014:0crwdne151014:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr "crwdns151016:0crwdne151016:0"
 
@@ -5941,7 +5981,7 @@ msgstr "crwdns151594:0crwdne151594:0"
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "crwdns151018:0crwdne151018:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr "crwdns151022:0crwdne151022:0"
 
@@ -6027,7 +6067,7 @@ msgstr "crwdns152456:0crwdne152456:0"
 msgid "cancel your application"
 msgstr "crwdns151052:0crwdne151052:0"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "crwdns151054:0crwdne151054:0"
 
@@ -6087,7 +6127,7 @@ msgstr "crwdns152184:0crwdne152184:0"
 msgid "you can"
 msgstr "crwdns151076:0crwdne151076:0"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr "crwdns151078:0{0}crwdne151078:0"
 
@@ -6127,7 +6167,7 @@ msgstr "crwdns151092:0{0}crwdnd151092:0{1}crwdne151092:0"
 msgid "{0} is your evaluator"
 msgstr "crwdns151094:0{0}crwdne151094:0"
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "crwdns151096:0{0}crwdne151096:0"
 
@@ -6135,11 +6175,11 @@ msgstr "crwdns151096:0{0}crwdne151096:0"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr "crwdns151098:0{0}crwdne151098:0"
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "crwdns151100:0{0}crwdnd151100:0{1}crwdne151100:0"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr "crwdns151102:0{0}crwdne151102:0"
 
diff --git a/lms/locale/es.po b/lms/locale/es.po
index 9f56817e..061c1d23 100644
--- a/lms/locale/es.po
+++ b/lms/locale/es.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr "<span class=\"h4\"><b>Master</b></span>"
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr "<span style=\"font-size: 18px;\"><b>Estadísticas</b></span>"
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "Una introducción de una línea al curso que aparece en la tarjeta del curso."
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Añadir su tarea como {0}"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "Dirección"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "Dirección línea 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "Dirección línea 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Ya está Registrado"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "Importe"
 msgid "Amount (USD)"
 msgstr "Importe (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr "Apps"
 msgid "Archived"
 msgstr "Archivado"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr "Tipo de evaluación"
 msgid "Assessment added successfully"
 msgstr "Examen añadido correctamente"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "La evaluación {0} ya se ha agregado a este lote."
 
@@ -496,7 +506,7 @@ msgstr "Puntuación media"
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr "Volver al curso"
 
@@ -602,7 +612,7 @@ msgstr "Configuración de lotes"
 msgid "Batch Start Date:"
 msgstr "Fecha de inicio del lote:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr "Título del grupo"
 msgid "Batch Updated"
 msgstr "Lote actualizado"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "La fecha de finalización del grupo no puede ser anterior a la fecha de inicio del lote"
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Detalles de facturación"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Nombre de Facturación"
@@ -682,7 +692,7 @@ msgstr "Sucursal"
 msgid "Business Owner"
 msgstr "Propietario de la Empresa"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr "Comprar este curso"
 
@@ -695,12 +705,12 @@ msgstr "Por"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "Categoría"
 msgid "Category Name"
 msgstr "Nombre Categoría"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Certificado"
@@ -755,6 +767,10 @@ msgstr "Plantilla de correo electrónico de certificado"
 msgid "Certificate Link"
 msgstr "Enlace de certificado"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr "Certificado guardado correctamente"
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Certificación"
 
@@ -787,11 +808,6 @@ msgstr "Certificación"
 msgid "Certification Details"
 msgstr "Detalles de certificación"
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "La certificación vence después de (años)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Elige una respuesta"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "Ciudad"
 
@@ -1086,7 +1102,9 @@ msgstr "Completado"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "Certificado de finalización"
 
@@ -1126,7 +1144,7 @@ msgstr "Plantilla de correo electrónico de confirmación"
 msgid "Congratulations on getting certified!"
 msgstr "¡Felicidades por obtener la certificación!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr "Póngase en contacto con el administrador para inscribirse en este curso."
 
@@ -1148,7 +1166,7 @@ msgstr "Continuar aprendiendo"
 msgid "Contract"
 msgstr "Contrato"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Política de cookies"
 
@@ -1176,7 +1194,7 @@ msgstr "Respuesta correcta"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "País"
@@ -1255,10 +1273,6 @@ msgstr "Capítulo del curso"
 msgid "Course Completed"
 msgstr "Curso Completado"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Contenido del curso"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Nombre del Curso"
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Precio del curso"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Título del curso"
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "Curso ya agregado al lote."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "El curso {0} ya se ha agregado a este lote."
@@ -1373,6 +1381,7 @@ msgstr "El curso {0} ya se ha agregado a este lote."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Creado"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Tipo de Grado"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1542,7 +1551,7 @@ msgstr "Eliminar"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "Detalles"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Deshabilitar la autoinscripción"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "Correo Electrónico"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "Editar"
@@ -1758,11 +1767,6 @@ msgstr "Empleado"
 msgid "Enable"
 msgstr "Habilitar"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "Habilitar certificación"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "Habilite la API de Google en la configuración de Google para enviar invitaciones de calendario para evaluaciones."
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Estudiantes inscritos"
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Recuento de inscripciones"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr "Error al inscribirse"
 
@@ -1886,13 +1890,13 @@ msgstr "Ingrese la respuesta correcta"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "Error"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr "Fecha de finalización de la evaluación"
 msgid "Evaluation Request"
 msgstr "Solicitud de evaluación"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "La fecha de finalización de la evaluación no puede ser inferior a la fecha de finalización"
 
@@ -1934,15 +1938,17 @@ msgstr "La evaluación se guardó correctamente"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "Evaluador"
@@ -1967,6 +1973,10 @@ msgstr "Horario del evaluador"
 msgid "Evaluator is Unavailable"
 msgstr "El evaluador no está disponible"
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Tiempo completo"
 msgid "Function"
 msgstr "Función"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr "Importe del GST"
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr "Número de GST"
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr "Generar enlace de Google Meet"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr "Obtener certificado"
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr "Contenido del instructor"
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "Notas del instructor"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Fecha de emisión"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "Emitido el"
@@ -2657,7 +2670,7 @@ msgstr "Trabajos"
 msgid "Join"
 msgstr "Unirse"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr "Título de la lección"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr "Preferencia de ubicación"
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -3089,9 +3102,9 @@ msgstr "Convertir LMS en la página de inicio por defecto"
 msgid "Make an Announcement"
 msgstr "Publicar un anuncio"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
-msgstr "Asegúrese de ingresar el nombre de facturación correcto, ya que el mismo se utilizará en su factura."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
+msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
 msgid "Manage Batch"
@@ -3471,11 +3484,11 @@ msgstr "Nuevo cuestionario"
 msgid "New Sign Up"
 msgstr "Nueva inscripción"
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr "Nuevo comentario en lote {0}"
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr "Nueva respuesta sobre el tema {0} en curso {1}"
 
@@ -3484,7 +3497,7 @@ msgstr "Nueva respuesta sobre el tema {0} en curso {1}"
 msgid "New {0}"
 msgstr "Nuevo/a: {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "Siguiente"
 
@@ -3581,10 +3594,6 @@ msgstr "No hay cupos disponibles para esta fecha."
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "No hay próximas evaluaciones."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "No {0}"
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Sólo se aceptarán archivos del tipo {0}."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr "Sólo se permiten archivos de imagen."
 
@@ -3752,10 +3761,6 @@ msgstr "Opción 4"
 msgid "Order ID"
 msgstr "ID de pedido"
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr "Artículo pedido"
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr "Organización"
@@ -3765,7 +3770,7 @@ msgstr "Organización"
 msgid "Organization"
 msgstr "Organización"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr "Cantidad original"
 
@@ -3804,13 +3809,23 @@ msgstr "Páginas"
 msgid "Paid Batch"
 msgstr "Lote pagó"
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Cursos Pagos"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr "Número NIF"
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr "Opciones de Pago"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "Porcentaje (por ejemplo, 70%)"
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr "Por favor, inicie sesión"
 
@@ -3969,11 +3993,11 @@ msgstr "Por favor, consultar su correo electrónico para la verificación"
 msgid "Please click on the following button to set your new password"
 msgstr "Haga clic en el siguiente botón para establecer su nueva contraseña"
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Habilite la configuración de Zoom para utilizar esta funcionalidad."
 
@@ -4006,7 +4030,7 @@ msgstr "Por favor, introduzca la URL para el envío de la tarea."
 msgid "Please enter your answer"
 msgstr "Por favor escriba su respuesta"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr "Por favor, instale la aplicación de pagos para crear un grupo de pagos."
 
@@ -4014,7 +4038,7 @@ msgstr "Por favor, instale la aplicación de pagos para crear un grupo de pagos.
 msgid "Please install the Payments app to create a paid courses."
 msgstr "Instale la aplicación Pagos para crear un curso pago."
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr "Por favor, háganos saber dónde se enteró de nosotros."
 
@@ -4039,6 +4063,10 @@ msgstr "Por favor inicie sesión para continuar con el pago."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Por favor, prepárese bien y llegue a tiempo a las evaluaciones."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr ""
@@ -4112,7 +4140,7 @@ msgstr "Posible respuesta 4"
 msgid "Post"
 msgstr "Publicar"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Codigo postal"
 
@@ -4155,19 +4183,22 @@ msgstr "Previsualizar imagen"
 msgid "Preview Video"
 msgstr "Vista previa del video"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Anterior"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Precios"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr "Países principales"
 msgid "Primary Subgroup"
 msgstr "Subgrupo primario"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr "Política de privacidad"
 
@@ -4194,7 +4225,7 @@ msgstr "Privado"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr "La información privada incluye su calificación y preferencias de entorno laboral."
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr "Proceder al pago"
 
@@ -4274,6 +4305,11 @@ msgstr "Cursos Publicados"
 msgid "Published On"
 msgstr "Publicado el"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr "Cuestionarios"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr "Preferencia de rol"
 msgid "Route"
 msgstr "Ruta"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Fila #{0} La fecha no puede estar fuera de la duración del lote."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Fila #{0} La hora de finalización no puede estar fuera de la duración del lote."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Fila #{0} La hora de inicio no puede ser mayor o igual que la hora final."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Fila #{0} La hora de inicio no puede estar fuera de la duración del lote."
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Calendario"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr "Programar evaluación"
 
@@ -4905,8 +4941,8 @@ msgstr "Fecha de inicio"
 msgid "Start Date:"
 msgstr "Fecha de inicio:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "Comienza a aprender"
@@ -4945,7 +4981,7 @@ msgstr "URL de inicio"
 msgid "Startup Organization"
 msgstr "Startup"
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "Estado"
 
@@ -5074,7 +5110,7 @@ msgstr "Enviado {0}"
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr "Enviado {0}"
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Resumen"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "Plantilla"
 msgid "Temporarily Disabled"
 msgstr "Desactivado temporalmente"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "Términos de Uso"
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Gracias y saludos"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr "No hay asientos disponibles en este lote."
 
@@ -5319,11 +5355,11 @@ msgstr "Este certificado no caduca"
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr "Este curso tiene:"
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "Este curso es gratuito."
 
@@ -5331,11 +5367,7 @@ msgstr "Este curso es gratuito."
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "Esta lección no está disponible para la vista previa. Como usted es el Instructor del curso sólo usted puede verla."
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "Esta lección no está disponible para la vista previa. Por favor, inscríbase en el curso para acceder a ella."
 
@@ -5469,7 +5501,7 @@ msgstr "A"
 msgid "To Date"
 msgstr "Hasta la fecha"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr "Para unirse a este lote, comuníquese con el Administrador."
 
@@ -5481,7 +5513,7 @@ msgstr "Para cargar una imagen, un vídeo, un audio o un PDF desde su sistema, h
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Hay demasiados usuarios se inscribieron recientemente, por lo que el registro está desactivado. Por favor, intente volver en una hora"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "Total"
 
@@ -5778,7 +5810,7 @@ msgstr "¿Qué significa incluir en la vista previa?"
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Cuando un curso se someta a revisión, aparecerá en esta lista."
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr "¿Dónde escuchaste de nosotros?"
 
@@ -5827,6 +5859,10 @@ msgstr "Escriba su respuesta aquí"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "Ya tiene una evaluación en {0} en {1} para el curso {2}."
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr "Ya estás inscrito en este lote."
@@ -5909,6 +5945,10 @@ msgstr "Ya has solicitado este trabajo."
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "Ya superaste el número máximo de intentos permitidos para esta prueba."
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "Ya has revisado este curso"
@@ -5917,7 +5957,7 @@ msgstr "Ya has revisado este curso"
 msgid "You have been enrolled in this batch"
 msgstr "Te has inscrito en este grupo"
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr "Te has inscrito en este curso"
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Has optado por recibir notificaciones sobre este curso. Recibirás un correo electrónico cuando el curso esté disponible."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr "Debes iniciar sesión primero para inscribirte en este curso."
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr "cancelar su solicitud"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "completado"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr "puedes"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr "Configuraciones {0} no encontradas"
 
@@ -6127,7 +6167,7 @@ msgstr "{0} ya está certificado para el curso {1}"
 msgid "{0} is your evaluator"
 msgstr "{0} es tu evaluador"
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "{0} te mencionó en un comentario"
 
@@ -6135,11 +6175,11 @@ msgstr "{0} te mencionó en un comentario"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr "{0} te mencionó en un comentario en tu lote."
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} te mencionó en un comentario en {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr "{0}k"
 
diff --git a/lms/locale/fa.po b/lms/locale/fa.po
index e1fbff6e..53c46b7e 100644
--- a/lms/locale/fa.po
+++ b/lms/locale/fa.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-28 20:30\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "تکلیف خود را به عنوان {0} اضافه کنید"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "آدرس"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "آدرس خط 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "آدرس خط 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "قبلا ثبت شده است"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "مبلغ"
 msgid "Amount (USD)"
 msgstr "مبلغ (دلار آمریکا)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr "برنامه ها"
 msgid "Archived"
 msgstr "بایگانی شد"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr "نوع ارزیابی"
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "ارزیابی {0} قبلاً به این دسته اضافه شده است."
 
@@ -496,7 +506,7 @@ msgstr "میانگین امتیاز"
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr "تنظمات دسته"
 msgid "Batch Start Date:"
 msgstr "تاریخ شروع دسته:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "جزئیات صورتحساب"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "نام صورتحساب:"
@@ -682,7 +692,7 @@ msgstr "شاخه"
 msgid "Business Owner"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr "توسط"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "لغو"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "دسته بندی"
 msgid "Category Name"
 msgstr "نام دسته"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "گواهی"
@@ -755,6 +767,10 @@ msgstr ""
 msgid "Certificate Link"
 msgstr "لینک گواهی"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr ""
 
@@ -787,11 +808,6 @@ msgstr ""
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr ""
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "یک پاسخ را انتخاب کردن کنید"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "شهر"
 
@@ -1086,7 +1102,9 @@ msgstr "تکمیل شده"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr "الگوی ایمیل تایید"
 msgid "Congratulations on getting certified!"
 msgstr "تبریک برای دریافت گواهینامه!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr "قرارداد"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr ""
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "کشور"
@@ -1255,10 +1273,6 @@ msgstr "فصل دوره"
 msgid "Course Completed"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "محتوای دوره"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "اسم دوره"
 msgid "Course Outline"
 msgstr "طرح کلی دوره"
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "قیمت دوره"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "عنوان دوره"
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "دوره قبلاً به دسته اضافه شده است."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr "دوره با موفقیت حذف شد"
 
@@ -1359,7 +1367,7 @@ msgstr "دوره با موفقیت حذف شد"
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "دوره {0} قبلاً به این دسته اضافه شده است."
@@ -1373,6 +1381,7 @@ msgstr "دوره {0} قبلاً به این دسته اضافه شده است."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "ایجاد شده"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "نوع مدرک"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "حذف"
 
@@ -1542,7 +1551,7 @@ msgstr "حذف"
 msgid "Delete Chapter"
 msgstr "حذف فصل"
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr "حذف دوره"
 
@@ -1554,7 +1563,7 @@ msgstr "این فصل حذف شود؟"
 msgid "Delete this lesson?"
 msgstr "این درس حذف شود؟"
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "جزئیات"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "غیرفعال کردن ثبت نام خود"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "ایمیل"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "ویرایش"
@@ -1758,11 +1767,6 @@ msgstr "کارمند"
 msgid "Enable"
 msgstr "فعال کردن"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "فعال کردن صدور گواهینامه"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr ""
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "دانش آموزان ثبت نام شده"
@@ -1845,7 +1849,7 @@ msgstr "تایید ثبت نام برای {0}"
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr "پاسخ صحیح را وارد کنید"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "خطا"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "ارزیاب"
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "تمام وقت"
 msgid "Function"
 msgstr "تابع"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr "لینک Google Meet را ایجاد کنید"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "گواهینامه دریافت کنید"
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "یادداشت های مدرس"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "تاریخ صدور"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "صادر شده در"
@@ -2657,7 +2670,7 @@ msgstr "شغل ها"
 msgid "Join"
 msgstr "پیوستن"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr "عنوان درس"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "وارد شدن"
 
@@ -3089,8 +3102,8 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "{0} جدید"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "بعد"
 
@@ -3581,10 +3594,6 @@ msgstr ""
 msgid "No submissions"
 msgstr "ارسالی وجود ندارد"
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "بدون ارزیابی های آتی."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "نه {0}"
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "فقط فایل هایی از نوع {0} پذیرفته می شوند."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr "انتخاب کردن 4"
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr "سازمان"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr "صفحات"
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr "الگوی یادآوری پرداخت"
 msgid "Payment Settings"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "درصد (به عنوان مثال 70%)"
 msgid "Percentage/Status"
 msgstr "درصد/وضعیت"
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "شماره تلفن"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "لطفا ایمیل خود را برای تایید بررسی کنید"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -4006,7 +4030,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "لطفا تاریخ را انتخاب کنید"
@@ -4112,7 +4140,7 @@ msgstr "پاسخ ممکن ۴"
 msgid "Post"
 msgstr "پست"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "کد پستی"
 
@@ -4155,19 +4183,22 @@ msgstr "پیش نمایش تصویر"
 msgid "Preview Video"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "قبلی"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "قیمت گذاری"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr "خصوصی"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr ""
 msgid "Published On"
 msgstr "منتشر شده در"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr "مسیر"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "زمان‌بندی"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr "تاریخ شروع"
 msgid "Start Date:"
 msgstr "تاریخ شروع:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr ""
@@ -4945,7 +4981,7 @@ msgstr ""
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "حالت"
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "خلاصه"
 msgid "Sunday"
 msgstr "یک‌شنبه"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "قالب"
 msgid "Temporarily Disabled"
 msgstr "موقتا غیر فعال می باشد"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "شرایط استفاده"
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr "این کلاس به پایان رسید"
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr ""
 
@@ -5331,11 +5367,7 @@ msgstr ""
 msgid "This is a chapter in the course {0}"
 msgstr "این یک فصل از دوره {0} است"
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr ""
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr ""
 
@@ -5469,7 +5501,7 @@ msgstr "به"
 msgid "To Date"
 msgstr "تا تاریخ"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "کاربران زیادی اخیرا ثبت نام کرده اند، بنابراین ثبت نام غیرفعال است. لطفا یک ساعت دیگر دوباره امتحان کنید"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "جمع"
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr ""
@@ -5917,7 +5957,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr "اما پرداخت شما را تکمیل نکرد"
 msgid "cancel your application"
 msgstr "درخواست خود را لغو کنید"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "تکمیل شده"
 
@@ -6087,7 +6127,7 @@ msgstr "هفته ها"
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr "{0} قبلاً برای دوره {1} تایید شده است"
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -6135,11 +6175,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/fr.po b/lms/locale/fr.po
index b4239e78..d5cbed19 100644
--- a/lms/locale/fr.po
+++ b/lms/locale/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Ajoutez votre devoir comme {0}"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "Adresse"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "Adresse Ligne 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "Adresse Ligne 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Déjà Inscrit"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr ""
 msgid "Amount (USD)"
 msgstr "Montant (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr ""
 msgid "Archived"
 msgstr "Archivé"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr "Type d'évaluation"
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "L'évaluation {0} a déjà été ajoutée à ce lot."
 
@@ -496,7 +506,7 @@ msgstr "Notation moyenne"
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr "Paramètres de lot"
 msgid "Batch Start Date:"
 msgstr "Date de début du lot :"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr "Lot mis à jour"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Détails de la Facturation"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Nom de facturation"
@@ -682,7 +692,7 @@ msgstr "Branche"
 msgid "Business Owner"
 msgstr "Propriétaire de l'entreprise"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr "Par"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Annuler"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "Catégorie"
 msgid "Category Name"
 msgstr "Nom de la Catégorie"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Certificat"
@@ -755,6 +767,10 @@ msgstr "Modèle de courriel de certificat"
 msgid "Certificate Link"
 msgstr "Lien de certificat"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Certification"
 
@@ -787,11 +808,6 @@ msgstr "Certification"
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "La certification expire après (années)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Choisissez une réponse"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "Ville"
 
@@ -1086,7 +1102,9 @@ msgstr "Terminé"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr "Modèle de courriel de confirmation"
 msgid "Congratulations on getting certified!"
 msgstr "Félicitations pour votre certification !"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr "Contrat"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Politique des cookies"
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "Pays"
@@ -1255,10 +1273,6 @@ msgstr "Chapitre du cours"
 msgid "Course Completed"
 msgstr "Cours terminé"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Contenu du cours"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Nom du cours"
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Prix du cours"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Titre du cours"
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "Cours déjà ajouté au lot."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Le cours {0} a déjà été ajouté à ce lot."
@@ -1373,6 +1381,7 @@ msgstr "Le cours {0} a déjà été ajouté à ce lot."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Créé"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Type de diplôme"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1542,7 +1551,7 @@ msgstr "Supprimer"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "Détails"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Désactiver l'auto-inscription"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "modifier"
@@ -1758,11 +1767,6 @@ msgstr "Employé"
 msgid "Enable"
 msgstr "Activer"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr ""
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr ""
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "Erreur"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr ""
 msgid "Function"
 msgstr "Une fonction"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Date d'Émission"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr ""
@@ -2657,7 +2670,7 @@ msgstr "Emplois"
 msgid "Join"
 msgstr "Joindre"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Connexion"
 
@@ -3089,8 +3102,8 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Nouveau(elle) {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "Suivant"
 
@@ -3581,10 +3594,6 @@ msgstr ""
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr ""
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr ""
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr "Organisation"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr ""
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr ""
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "Veuillez vérifier votre email pour validation"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -4006,7 +4030,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Veuillez bien vous préparer et être à temps pour les évaluations."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "Veuillez sélectionner une date."
@@ -4112,7 +4140,7 @@ msgstr ""
 msgid "Post"
 msgstr "Poster"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "code postal"
 
@@ -4155,19 +4183,22 @@ msgstr ""
 msgid "Preview Video"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Précedent"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Tarification"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr "Privé"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr ""
 msgid "Published On"
 msgstr "Publié le"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr ""
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr "Date de Début"
 msgid "Start Date:"
 msgstr "Date de Début:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr ""
@@ -4945,7 +4981,7 @@ msgstr ""
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "Etat"
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Résumé"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "Modèle"
 msgid "Temporarily Disabled"
 msgstr "Temporairement désactivé"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr ""
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr ""
 
@@ -5331,11 +5367,7 @@ msgstr ""
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "Cette leçon n'est pas disponible en prévisualisation. Comme vous êtes l'instructeur du cours, vous seul pouvez la voir."
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "Cette leçon n'est pas disponible en prévisualisation. Veuillez vous inscrire au cours pour y accéder."
 
@@ -5469,7 +5501,7 @@ msgstr "À"
 msgid "To Date"
 msgstr "Jusqu'au"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Trop d'utilisateurs se sont inscrits récemment, du coup l’inscription est désactivée. Veuillez essayer à nouveau dans une heure"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr ""
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr ""
@@ -5917,7 +5957,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Vous avez choisi d'être notifié pour ce cours. Vous recevrez un courriel lorsque le cours sera disponible."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "complété"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -6135,11 +6175,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} vous a mentionné dans un commentaire dans {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/hu.po b/lms/locale/hu.po
index 187aa473..314e540a 100644
--- a/lms/locale/hu.po
+++ b/lms/locale/hu.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr ""
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr ""
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Már regisztrált"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr ""
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr ""
 msgid "Archived"
 msgstr "Archivált"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr ""
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -496,7 +506,7 @@ msgstr ""
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr ""
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr ""
@@ -682,7 +692,7 @@ msgstr ""
 msgid "Business Owner"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "Kategória"
 msgid "Category Name"
 msgstr ""
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr ""
@@ -755,6 +767,10 @@ msgstr ""
 msgid "Certificate Link"
 msgstr ""
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr ""
 
@@ -787,11 +808,6 @@ msgstr ""
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr ""
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr ""
 
@@ -1086,7 +1102,9 @@ msgstr ""
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr ""
 msgid "Congratulations on getting certified!"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr ""
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr ""
@@ -1255,10 +1273,6 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr ""
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr ""
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr ""
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr ""
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1373,6 +1381,7 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Alkotó"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr ""
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr ""
 
@@ -1542,7 +1551,7 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "Részletek"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr ""
@@ -1758,11 +1767,6 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr ""
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr ""
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Teljes munkaidőben"
 msgid "Function"
 msgstr "Funkció"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr ""
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr ""
@@ -2657,7 +2670,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Bejelentkezés"
 
@@ -3089,8 +3102,8 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Új {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr ""
 
@@ -3581,10 +3594,6 @@ msgstr ""
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr ""
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr "4. lehetőség"
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr ""
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr ""
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "Kérjük, ellenőrizze e-mail a vizsgálathoz"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -4006,7 +4030,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr ""
@@ -4112,7 +4140,7 @@ msgstr ""
 msgid "Post"
 msgstr "Hozzászólás"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
@@ -4155,19 +4183,22 @@ msgstr ""
 msgid "Preview Video"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Előző"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr "Magán"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr ""
 msgid "Published On"
 msgstr ""
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr "Útvonal"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Ütemezés"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr ""
 msgid "Start Date:"
 msgstr "Kezdés dátuma:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr ""
@@ -4945,7 +4981,7 @@ msgstr ""
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr ""
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Összefoglalás"
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr ""
 msgid "Temporarily Disabled"
 msgstr "Átmenetileg letiltva"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr ""
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr ""
 
@@ -5331,11 +5367,7 @@ msgstr ""
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr ""
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr ""
 
@@ -5469,7 +5501,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Túl sok felhasználó regisztrált a közelmúltban, így a regisztrációt letiltotta. Kérjük, próbálja meg újra egy óra múlva"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr ""
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr ""
@@ -5917,7 +5957,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "befejezve"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -6135,11 +6175,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/pl.po b/lms/locale/pl.po
index 2365c04c..407ddc29 100644
--- a/lms/locale/pl.po
+++ b/lms/locale/pl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr ""
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr ""
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr ""
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr ""
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr ""
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr ""
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -496,7 +506,7 @@ msgstr ""
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr ""
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr ""
@@ -682,7 +692,7 @@ msgstr ""
 msgid "Business Owner"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr ""
 msgid "Category Name"
 msgstr ""
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr ""
@@ -755,6 +767,10 @@ msgstr ""
 msgid "Certificate Link"
 msgstr ""
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr ""
 
@@ -787,11 +808,6 @@ msgstr ""
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr ""
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr ""
 
@@ -1086,7 +1102,9 @@ msgstr ""
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr ""
 msgid "Congratulations on getting certified!"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr ""
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr ""
@@ -1255,10 +1273,6 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr ""
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr ""
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr ""
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr ""
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1373,6 +1381,7 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr ""
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr ""
 
@@ -1542,7 +1551,7 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr ""
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr ""
@@ -1758,11 +1767,6 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr ""
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr ""
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr ""
 msgid "Function"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr ""
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr ""
@@ -2657,7 +2670,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr ""
 
@@ -3089,8 +3102,8 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr ""
 
@@ -3581,10 +3594,6 @@ msgstr ""
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr ""
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr ""
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr ""
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr ""
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -4006,7 +4030,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr ""
@@ -4112,7 +4140,7 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
@@ -4155,19 +4183,22 @@ msgstr ""
 msgid "Preview Video"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr ""
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr ""
 msgid "Published On"
 msgstr ""
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr ""
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr ""
 msgid "Start Date:"
 msgstr "Data rozpoczęcia:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr ""
@@ -4945,7 +4981,7 @@ msgstr ""
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr ""
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Podsumowanie"
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr ""
 msgid "Temporarily Disabled"
 msgstr ""
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr ""
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr ""
 
@@ -5331,11 +5367,7 @@ msgstr ""
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr ""
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr ""
 
@@ -5469,7 +5501,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr ""
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr ""
@@ -5917,7 +5957,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "zakończono"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -6135,11 +6175,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/ru.po b/lms/locale/ru.po
index 76379d79..2974f2b2 100644
--- a/lms/locale/ru.po
+++ b/lms/locale/ru.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Добавьте свое задание как {0}"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr ""
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Уже зарегистрирован"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr ""
 msgid "Amount (USD)"
 msgstr "Сумма"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr ""
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr "Тип оценки"
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Оценка {0} уже добавлена в этот пакет."
 
@@ -496,7 +506,7 @@ msgstr "Средняя оценка"
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr "Настройки группы"
 msgid "Batch Start Date:"
 msgstr "Дата начала группы:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr "Группа обновлена"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Платёжные реквизиты"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Имя плательщика"
@@ -682,7 +692,7 @@ msgstr ""
 msgid "Business Owner"
 msgstr "Владелец бизнеса"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr "От"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Отмена"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "Категория"
 msgid "Category Name"
 msgstr ""
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Сертификат"
@@ -755,6 +767,10 @@ msgstr "Шаблон письма с сертификатом"
 msgid "Certificate Link"
 msgstr "Ссылка на сертификат"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Сертификация"
 
@@ -787,11 +808,6 @@ msgstr "Сертификация"
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "Сертификация истекает после (лет)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Выберите один ответ"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr ""
 
@@ -1086,7 +1102,9 @@ msgstr ""
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr ""
 msgid "Congratulations on getting certified!"
 msgstr "Поздравляем с получением сертификата!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Политика cookies"
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr ""
@@ -1255,10 +1273,6 @@ msgstr "Глава курса"
 msgid "Course Completed"
 msgstr "Курс завершен"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Содержание курса"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Название курса"
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Стоимость курса"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Заголовок курса"
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "Курс уже добавлен в группу."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Курс {0} уже добавлен в группу."
@@ -1373,6 +1381,7 @@ msgstr "Курс {0} уже добавлен в группу."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Тип степени"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr ""
 
@@ -1542,7 +1551,7 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "Детали"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Отключить самостоятельную регистрацию"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr ""
@@ -1758,11 +1767,6 @@ msgstr ""
 msgid "Enable"
 msgstr "Включить"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "Включить сертификацию"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "Включите Google API в настройках Google, чтобы отправлять приглашения в календарь для оценки."
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Зачисленные студенты"
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Количество регистраций"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr "Введите правильный ответ"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr "Дата окончания оценки"
 msgid "Evaluation Request"
 msgstr "Запрос на оценку"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "Дата окончания оценки не может быть меньше даты окончания группы."
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "Оценщик"
@@ -1967,6 +1973,10 @@ msgstr "График оценки"
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Полная занятость"
 msgid "Function"
 msgstr "Функция"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr "Сгенерировать ссылку Google Meet"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr "Содержание инструктора"
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "Заметки инструктора"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Дата"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "Выдано"
@@ -2657,7 +2670,7 @@ msgstr "Вакансии"
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr "Название урока"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Логин"
 
@@ -3089,8 +3102,8 @@ msgstr "Сделать LMS домашней системой по умолчан
 msgid "Make an Announcement"
 msgstr "Разместить объявление"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr "Новая регистрация"
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr "Новый комментарий в группе {0}"
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr "Новый ответ по теме {0} в курсе {1}"
 
@@ -3484,7 +3497,7 @@ msgstr "Новый ответ по теме {0} в курсе {1}"
 msgid "New {0}"
 msgstr "Новый {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr ""
 
@@ -3581,10 +3594,6 @@ msgstr "На эту дату свободных мест нет."
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "Нет предстоящих оценок."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Нет {0}"
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Принимаются только файлы типа {0} ."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr "Вариант 4"
 msgid "Order ID"
 msgstr "ID Заказа"
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr "Страницы"
 msgid "Paid Batch"
 msgstr "Платная группа"
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Платный курс"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr "Настройки Платежей"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "Процент (например, 70%)"
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "Пожалуйста, проверьте свой email для подт
 msgid "Please click on the following button to set your new password"
 msgstr "Нажмите на следующую кнопку, чтобы установить новый пароль."
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Чтобы использовать эту функцию, включите настройки Zoom."
 
@@ -4006,7 +4030,7 @@ msgstr "Введите URL для отправки задания."
 msgid "Please enter your answer"
 msgstr "Пожалуйста, введите ваш ответ"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr "Пожалуйста, войдите в систему, чтобы пр
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Пожалуйста, хорошо подготовьтесь и приходите на оценку вовремя."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "Пожалуйста, выберите дату."
@@ -4112,7 +4140,7 @@ msgstr "Возможный ответ 4"
 msgid "Post"
 msgstr "Пост"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
@@ -4155,19 +4183,22 @@ msgstr "Просмотр изображения"
 msgid "Preview Video"
 msgstr "Предварительный просмотр видео"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Предыдущие"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr "Первичная подгруппа"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr "Политика приватности"
 
@@ -4194,7 +4225,7 @@ msgstr "Личный"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr "Опубликованные курсы"
 msgid "Published On"
 msgstr "Опубликована"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr "Маршрут"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Строка #{0} Дата не может выходить за пределы длительности партии."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Строка #{0} Время окончания не может выходить за рамки длительности партии."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Строка #{0} Время начала не может быть больше или равно времени окончания."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Строка #{0} Время начала не может выходить за рамки длительности партии."
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Расписание"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr "Оценка графика"
 
@@ -4905,8 +4941,8 @@ msgstr ""
 msgid "Start Date:"
 msgstr "Дата начала:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "Начать изучение"
@@ -4945,7 +4981,7 @@ msgstr "Стартовый URL"
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr ""
 
@@ -5074,7 +5110,7 @@ msgstr "Отправлено {0}"
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr "Отправлено {0}"
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Резюме"
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr ""
 msgid "Temporarily Disabled"
 msgstr "Временно отключен"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "Условия использования"
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Спасибо и с наилучшими пожеланиями"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr "В этой группе нет свободных мест."
 
@@ -5319,11 +5355,11 @@ msgstr "Этот сертификат является бессрочным"
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "Этот курс бесплатный."
 
@@ -5331,11 +5367,7 @@ msgstr "Этот курс бесплатный."
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "Этот урок недоступен для предварительного просмотра. Так как вы являетесь инструктором курса, только вы можете его увидеть."
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "Этот урок недоступен для предварительного просмотра. Пожалуйста, присоединитесь к курсу, чтобы получить к нему доступ."
 
@@ -5469,7 +5501,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr "Чтобы присоединиться к этой группе, свяжитесь с администратором."
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Слишком много пользователей зарегистрировались недавно, поэтому регистрация отключена. Пожалуйста, попробуйте через час"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr ""
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Когда курс будет отправлен на рассмотрение, он появится в этом списке."
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr "Напишите свой ответ здесь"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "У вас уже есть оценка {0} в {1} для курса {2}."
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr "Вы уже зачислены в эту группу."
@@ -5909,6 +5945,10 @@ msgstr "Вы уже подали заявку на эту вакансию."
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "Вы уже превысили максимально допустимое количество попыток для этого теста."
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "Вы уже просмотрели этот курс"
@@ -5917,7 +5957,7 @@ msgstr "Вы уже просмотрели этот курс"
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Вы выбрали получение уведомлений об этом курсе. Вы получите электронное письмо, когда курс станет доступен."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr "отменить заявку"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "завершенно"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr "вы можете"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr "{0} уже сертифицирован для курса {1}"
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "{0} упомянул вас в комментарии"
 
@@ -6135,11 +6175,11 @@ msgstr "{0} упомянул вас в комментарии"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr "{0} упомянул вас в комментарии в вашей группе."
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} упомянул вас в комментарии в {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr "{0}k"
 
diff --git a/lms/locale/sv.po b/lms/locale/sv.po
index b2ca0a04..f81f75f8 100644
--- a/lms/locale/sv.po
+++ b/lms/locale/sv.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr "<span class=\"h4\"><b>Inställningar</b></span>"
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr "<span style=\"font-size: 18px;\"><b>Statistik</b></span>"
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr "Kurs kan inte ha både betalt certifikat och certifikat för genomförande."
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "En rad introduktion till kurs som finns på kurskortet"
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Lägg till din uppgift som {0}"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "Adress"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "Adress Linje 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "Adress Linje 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Redan Registrerad"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "Belopp"
 msgid "Amount (USD)"
 msgstr "Belopp (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr "Belopp och valuta erfordras för betalda grupper."
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr "Belopp och valuta är obligatoriska för betalda certifikat."
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr "Belopp och valuta erfordras för betalda kurser."
 
@@ -364,7 +374,7 @@ msgstr "Appar"
 msgid "Archived"
 msgstr "Arkiverad"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "Är du säker på att du vill avbryta denna utvärdering? Denna åtgärd kan inte ångras."
 
@@ -400,7 +410,7 @@ msgstr "Bedömning Typ"
 msgid "Assessment added successfully"
 msgstr "Bedömning tillagd"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Bedömning {0} har redan lagts till i denna grupp."
 
@@ -496,7 +506,7 @@ msgstr "Genomsnittlig Betyg"
 msgid "Average of Feedback Received"
 msgstr "Genomsnitt av mottagen Återkoppling"
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr "Tillbaka till Kurs"
 
@@ -602,7 +612,7 @@ msgstr "Grupp Inställningar"
 msgid "Batch Start Date:"
 msgstr "Grupp Start Datum:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr "Grupp Start Påminnelse"
 
@@ -617,7 +627,7 @@ msgstr "Grupp Benämning"
 msgid "Batch Updated"
 msgstr "Grupp Uppdaterad"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "Grupp slutdatum får inte vara före grupp startdatum"
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Faktura Detaljer"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Faktura Namn"
@@ -682,7 +692,7 @@ msgstr "Bransch"
 msgid "Business Owner"
 msgstr "Affärsägare"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr "Köp denna kurs"
 
@@ -695,12 +705,12 @@ msgstr "Av"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "Annullera"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr "Avbryt denna utvärdering?"
 
@@ -741,7 +751,9 @@ msgstr "Kategori"
 msgid "Category Name"
 msgstr "Kategori Namn"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Certifikat"
@@ -755,6 +767,10 @@ msgstr "E-post Mall för Certifikat"
 msgid "Certificate Link"
 msgstr "Cerifikat Länk"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr "Certifikat för Genomförande"
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr "Certifikat sparad"
@@ -770,15 +786,20 @@ msgstr "Certifikat genererade"
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Certifiering"
 
@@ -787,11 +808,6 @@ msgstr "Certifiering"
 msgid "Certification Details"
 msgstr "Certifiering Detaljer"
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "Certifiering upphör att gälla efter (år)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Välj ett svar"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "Ort"
 
@@ -1086,7 +1102,9 @@ msgstr "Klar"
 msgid "Completed by Students"
 msgstr "Klart av Studenter"
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "Kompletterande Certifikat"
 
@@ -1126,7 +1144,7 @@ msgstr "Bekräftelse E-post Mall"
 msgid "Congratulations on getting certified!"
 msgstr "Grattis till certifiering!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr "Kontakta administratör för att registrera dig till denna kurs."
 
@@ -1148,7 +1166,7 @@ msgstr "Fortsätt lära dig"
 msgid "Contract"
 msgstr "Avtal"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Princip för Kakor"
 
@@ -1176,7 +1194,7 @@ msgstr "Rätt Svar"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "Land"
@@ -1255,10 +1273,6 @@ msgstr "Kurs Kapitel"
 msgid "Course Completed"
 msgstr "Klara Kurser"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Kursinnehåll"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Kursnamn"
 msgid "Course Outline"
 msgstr "Kursöversikt"
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Kurspris"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Kurs Benämning"
 msgid "Course added to program"
 msgstr "Kurs tillagd till program"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "Kurs har redan lagts till grupp."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr "Kurs är borttagen"
 
@@ -1359,7 +1367,7 @@ msgstr "Kurs är borttagen"
 msgid "Course moved successfully"
 msgstr "Kurs flyttad"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Kurs {0} har redan lagts till i denna omgång."
@@ -1373,6 +1381,7 @@ msgstr "Kurs {0} har redan lagts till i denna omgång."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Skapad"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Examen Typ"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1542,7 +1551,7 @@ msgstr "Ta bort"
 msgid "Delete Chapter"
 msgstr "Ta bort Kapitel"
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr "Ta bort kurs"
 
@@ -1554,7 +1563,7 @@ msgstr "Ta bort detta kapitel?"
 msgid "Delete this lesson?"
 msgstr "Ta bort denna lektion?"
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "Om du tar bort kurs raderas också alla dess kapitel och lektioner. Är du säker på att du vill ta bort denna kurs?"
 
@@ -1609,7 +1618,7 @@ msgstr "Detaljer"
 msgid "Didn't receive the code?"
 msgstr "Fick du ingen kod?"
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Inaktivera självregistrering"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "E-post"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "Redigera"
@@ -1758,11 +1767,6 @@ msgstr "Personal"
 msgid "Enable"
 msgstr "Aktivera"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "Aktivera Certifiering"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "Aktivera Google API i Google Inställningar för att skicka kalenderinbjudningar för utvärderingar."
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr "Inskriven"
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Inskrivna Studenter"
@@ -1845,7 +1849,7 @@ msgstr "Registreringsbekräftelse för {0}"
 msgid "Enrollment Count"
 msgstr "Antal Inskrivna"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr "Registrering Misslyckad"
 
@@ -1886,13 +1890,13 @@ msgstr "Ange korrekt svar"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "Fel"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr "Fel vid skapande av liveklass. Vänligen försök igen. {0}"
 
@@ -1920,7 +1924,7 @@ msgstr "Utvärdering Slutdatum"
 msgid "Evaluation Request"
 msgstr "Utvärdering Begäran"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "Utvärdering slutdatum får inte vara tidigare än grupp slutdatum."
 
@@ -1934,15 +1938,17 @@ msgstr "Utvärdering sparad"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "Utvärderare"
@@ -1967,6 +1973,10 @@ msgstr "Utvärderare Schema"
 msgid "Evaluator is Unavailable"
 msgstr "Utvärderare är inte tillgänglig"
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr "Utvärderare erfordras för betalda certifikat."
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Heltid"
 msgid "Function"
 msgstr "Funktion"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr "Moms Belopp"
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr "Moms Nummer"
 
@@ -2206,10 +2216,12 @@ msgstr "Skapa Certifikat"
 msgid "Generate Google Meet Link"
 msgstr "Skapa Google Meet länk"
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr "Hämta Certifikat"
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "Bli Certifierad"
@@ -2489,7 +2501,7 @@ msgstr "Lärares Innehåll"
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "Lärare Anteckningar"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Utfärdande Datum"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "Utfärdad"
@@ -2657,7 +2670,7 @@ msgstr "Jobb"
 msgid "Join"
 msgstr "Anslut"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr "Delta i Samtal"
 
@@ -2958,7 +2971,7 @@ msgstr "Lektion Benämning"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr "Platspreferens"
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Logga In"
 
@@ -3089,9 +3102,9 @@ msgstr "LMS som Standard Sida"
 msgid "Make an Announcement"
 msgstr "Skapa Meddelande"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
-msgstr "Se till att ange rätt faktureringsnamn eftersom det kommer att användas på din faktura."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
+msgstr "Ange rätt faktura adress eftersom det kommer att användas på din faktura."
 
 #: frontend/src/components/BatchOverlay.vue:60
 msgid "Manage Batch"
@@ -3471,11 +3484,11 @@ msgstr "Nytt Frågesport"
 msgid "New Sign Up"
 msgstr "Ny Registrering"
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr "Ny kommentar i grupp {0}"
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr "Nytt svar i ämne {0} i kurs {1}"
 
@@ -3484,7 +3497,7 @@ msgstr "Nytt svar i ämne {0} i kurs {1}"
 msgid "New {0}"
 msgstr "Ny {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "Nästa"
 
@@ -3581,10 +3594,6 @@ msgstr "Inga lediga tider för detta datum."
 msgid "No submissions"
 msgstr "Inga inlämningar"
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "Inga kommande utvärderingar."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Ingen {0}"
@@ -3686,7 +3695,7 @@ msgstr "Endast kurser för vilka självinlärning är inaktiverat kan läggas ti
 msgid "Only files of type {0} will be accepted."
 msgstr "Endast filer av typ {0} kommer att accepteras."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr "Endast bildfiler är tillåtna."
 
@@ -3752,10 +3761,6 @@ msgstr "Alternativ 4"
 msgid "Order ID"
 msgstr "Order ID"
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr "Order Artikel"
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr "Organisation"
@@ -3765,7 +3770,7 @@ msgstr "Organisation"
 msgid "Organization"
 msgstr "Organisation"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr "Ursprungligt Belopp"
 
@@ -3804,13 +3809,23 @@ msgstr "Sidor"
 msgid "Paid Batch"
 msgstr "Betald Parti"
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr "Betalt Certifikat"
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr "Betald Certifikat efter Utvärdering"
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Betald Kurs"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr "Pan Nummer"
 
@@ -3898,6 +3913,15 @@ msgstr "Betalningspåminnelse Mall"
 msgid "Payment Settings"
 msgstr "Betalning Inställningar"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr "Betalning för "
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr "Betalning för Certifikat"
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "Procent (t.ex. 70%)"
 msgid "Percentage/Status"
 msgstr "Procentandel/Status"
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "Telefon Nummer"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr "Logga in"
 
@@ -3969,11 +3993,11 @@ msgstr "Kontrollera din E-post för verifiering"
 msgid "Please click on the following button to set your new password"
 msgstr "Klicka på följande knapp för att ange ditt nya lösenord"
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Slutför tidigare kurser i program för att anmäla dig till denna kurs."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Aktivera Zoom Inställningar för att använda denna funktion."
 
@@ -4006,7 +4030,7 @@ msgstr "Ange URL för uppgift inlämning."
 msgid "Please enter your answer"
 msgstr "Ange ditt svar"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr "Installera Betalning app för att skapa betalda grupper."
 
@@ -4014,7 +4038,7 @@ msgstr "Installera Betalning app för att skapa betalda grupper."
 msgid "Please install the Payments app to create a paid courses."
 msgstr "Installera Betalning App för att skapa betalda kurser."
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr "Låt oss veta varifrån du hörde talas om oss."
 
@@ -4039,6 +4063,10 @@ msgstr "Logga in för att fortsätta med betalning."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Förbered dig väl och kom i tid till utvärderingarna."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr "Boka gärna utvärdering för att bli certifierad."
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "Välj Datum"
@@ -4112,7 +4140,7 @@ msgstr "Möjligt svar 4"
 msgid "Post"
 msgstr "Post"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Postnummer"
 
@@ -4155,19 +4183,22 @@ msgstr "Förhandsgranska Bild"
 msgid "Preview Video"
 msgstr "Förhandsgranska Video"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Föregående"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Prissättning"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr "Prissättning och Certifiering"
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr "Primära Länder"
 msgid "Primary Subgroup"
 msgstr "Primär Undergrupp"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr "Integritet Princip"
 
@@ -4194,7 +4225,7 @@ msgstr "Privat"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr "Privat information inkluderar dina betyg och arbetsmiljöpreferenser"
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr "Fortsätt till Betalning"
 
@@ -4274,6 +4305,11 @@ msgstr "Publicerade Kurser"
 msgid "Published On"
 msgstr "Publicerad"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr "Förvärvad Certifikat"
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr "Frågesporter"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr "Rollpreferens"
 msgid "Route"
 msgstr "Sökväg"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Rad #{0} Datum kan inte vara utanför grupp varaktighet."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Rad #{0} Sluttid kan inte vara utanför grupp varaktighet."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Rad #{0} Starttid kan inte vara senare än eller lika med sluttid."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Rad #{0} Starttid kan inte vara utanför grupp varaktighet."
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Schema"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr "Schemalägg Utvärdering"
 
@@ -4905,8 +4941,8 @@ msgstr "Start Datum"
 msgid "Start Date:"
 msgstr "Start Datum:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "Börja lära dig"
@@ -4945,7 +4981,7 @@ msgstr "Start URL"
 msgid "Startup Organization"
 msgstr "Uppstart Organisation"
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "Län"
 
@@ -5074,7 +5110,7 @@ msgstr "Inskickad {0}"
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr "Inskickad {0}"
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Översikt"
 msgid "Sunday"
 msgstr "Söndag"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr "Misstänkt mönster hittat i {0}: {1}"
 
@@ -5192,7 +5228,7 @@ msgstr "Mall"
 msgid "Temporarily Disabled"
 msgstr "Tillfälligt Inaktiverad"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "Villkor"
 
@@ -5228,7 +5264,7 @@ msgstr "Tack för återkoppling!"
 msgid "Thanks and Regards"
 msgstr "Tack och Hälsningar"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr "Gruppen är full. Kontakta administratör."
 
@@ -5276,7 +5312,7 @@ msgstr "Det finns inga deltagare som stämmer med dessa kriterier."
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr "Det finns inga program tillgängliga för tillfället. Håll utkik, nya inlärningsupplevelser är på väg snart!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr "Det finns inga platser tillgängliga i denna grupp."
 
@@ -5319,11 +5355,11 @@ msgstr "Detta certifikat upphör inte att gälla"
 msgid "This class has ended"
 msgstr "Denna klass har avslutats"
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr "Denna kurs har:"
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "Denna kurs är gratis."
 
@@ -5331,11 +5367,7 @@ msgstr "Denna kurs är gratis."
 msgid "This is a chapter in the course {0}"
 msgstr "Detta är kapitel i kurs {0}"
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "Denna lektion är inte tillgänglig för förhandsgranskning. Eftersom du är Lärare för kurs och bara du kan se den."
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "Denna lektion är inte tillgänglig för förhandsgranskning. Registrera dig för kurs för att få tillgång till den."
 
@@ -5469,7 +5501,7 @@ msgstr "Till"
 msgid "To Date"
 msgstr "Till Datum"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr "För att gå med i denna grupp, kontakta Administratör."
 
@@ -5481,7 +5513,7 @@ msgstr "För att ladda upp bild, video, ljud eller PDF från ditt system, klicka
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Alltför många Användare registrerade sig nyligen, så registrering är inaktiverad. Försök igen om en timme"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "Totalt"
 
@@ -5778,7 +5810,7 @@ msgstr "Vad betyder inkludera i förhandsvisning?"
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "När kurs lämnas in för granskning kommer den att listas här."
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr "Var har du hört talas om oss?"
 
@@ -5827,6 +5859,10 @@ msgstr "Skriv ditt svar här"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "Du har redan utvärdering {0} kl. {1} för kurs {2}."
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr "Du är redan certifierad för denna kurs. Klicka på kort nedan för att öppna ditt certifikat."
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr "Du är redan inskriven för denna grupp."
@@ -5909,6 +5945,10 @@ msgstr "Du har redan sökt detta jobb."
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "Du har redan överskridit maximal antalet försök som tillåts för denna frågesport."
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr "Du har redan köpt certifikat för denna kurs."
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "Du har redan granskat denna kurs"
@@ -5917,7 +5957,7 @@ msgstr "Du har redan granskat denna kurs"
 msgid "You have been enrolled in this batch"
 msgstr "Du har blivit registrerad i denna grupp"
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr "Du har blivit registrerad på denna kurs"
 
@@ -5941,7 +5981,7 @@ msgstr "Du har inte skapat några frågesporter än. För att skapa ny frågespo
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Du har valt att bli meddelad om denna kurs. Du kommer att få ett e-post meddelande när kursen blir tillgänglig."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr "Du måste logga in först för att registrera dig till denna kurs"
 
@@ -6027,7 +6067,7 @@ msgstr "men slutförde inte din betalning"
 msgid "cancel your application"
 msgstr "avbryt din ansökan"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "klar"
 
@@ -6087,7 +6127,7 @@ msgstr "veckor"
 msgid "you can"
 msgstr "du kan"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr "{0} Inställningar hittades inte"
 
@@ -6127,7 +6167,7 @@ msgstr "{0} är redan certifierad för kurs {1}"
 msgid "{0} is your evaluator"
 msgstr "{0} är din utvärderare"
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "{0} nämnde dig i en kommentar"
 
@@ -6135,11 +6175,11 @@ msgstr "{0} nämnde dig i en kommentar"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr "{0} nämnde dig i en kommentar i din grupp."
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr "{0} hänvisade dig i kommentar i {1}"
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr "{0}k"
 
diff --git a/lms/locale/tr.po b/lms/locale/tr.po
index 7f783c5a..5229a293 100644
--- a/lms/locale/tr.po
+++ b/lms/locale/tr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr "<span style=\"font-size: 18px;\"><b>İstatistikler</b></span>"
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr "Ödevinizi {0} olarak ekleyin"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "Adres"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "Adres Satırı 1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "Adres Satırı 2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "Zaten kayıltı"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "Tutar"
 msgid "Amount (USD)"
 msgstr "Tutar (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr "Ödenen partiler için tutar ve para birimi gereklidir."
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr "Ücretli kurslar için miktar ve para birimi gereklidir."
 
@@ -364,7 +374,7 @@ msgstr "Uygulamalar"
 msgid "Archived"
 msgstr "Arşivlendi"
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr "Değerlendirme Türü"
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Değerlendirme {0} bu gruba zaten eklendi."
 
@@ -496,7 +506,7 @@ msgstr "Ortalama Puan"
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr "Kursa geri dön"
 
@@ -602,7 +612,7 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr "Fatura Detayları"
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr "Fatura İsmi"
@@ -682,7 +692,7 @@ msgstr "Görev Bölümü"
 msgid "Business Owner"
 msgstr "İşletme Sahibi"
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr "Bu kursu satın al"
 
@@ -695,12 +705,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "İptal"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "Kategori"
 msgid "Category Name"
 msgstr "Kategori Adı"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr "Sertifika"
@@ -755,6 +767,10 @@ msgstr "Sertifika E-posta Şablonu"
 msgid "Certificate Link"
 msgstr "Sertifika Bağlantısı"
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr "Sertifikasyon"
 
@@ -787,11 +808,6 @@ msgstr "Sertifikasyon"
 msgid "Certification Details"
 msgstr "Sertifikalar"
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr "Sertifikasyon Dolma Süresi (Yıl)"
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr "Bir cevap seçin"
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "Şehir"
 
@@ -1086,7 +1102,9 @@ msgstr "Tamamlandı"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr "Onay E-postası Şablonu"
 msgid "Congratulations on getting certified!"
 msgstr "Sertifikanızı aldığınız için tebrikler!"
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr "Bu kursa kayıt olmak için Yönetici ile iletişime geçin."
 
@@ -1148,7 +1166,7 @@ msgstr "Öğrenmeye Devam Et"
 msgid "Contract"
 msgstr "Sözleşme"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr "Çerez Politikası"
 
@@ -1176,7 +1194,7 @@ msgstr "Doğru Cevap"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "Ülke"
@@ -1255,10 +1273,6 @@ msgstr "Kurs Bölümü"
 msgid "Course Completed"
 msgstr "Kurslar Tamamlandı"
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr "Kurs İçeriği"
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr "Kurs Adı"
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr "Kurs Fiyatı"
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr "Kurs Başlığı"
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr "Kurs zaten gruba eklendi."
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr "Kurs başarıyla silindi"
 
@@ -1359,7 +1367,7 @@ msgstr "Kurs başarıyla silindi"
 msgid "Course moved successfully"
 msgstr "Kurs başarıyla taşındı"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Kurs {0} bu gruba zaten eklenmiştir."
@@ -1373,6 +1381,7 @@ msgstr "Kurs {0} bu gruba zaten eklenmiştir."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr "Oluşturdu"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr "Derece Türü"
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "Sil"
 
@@ -1542,7 +1551,7 @@ msgstr "Sil"
 msgid "Delete Chapter"
 msgstr "Bölümü Sil"
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr "Kursu Sil"
 
@@ -1554,7 +1563,7 @@ msgstr "Bu bölümü silmek istiyor musunuz?"
 msgid "Delete this lesson?"
 msgstr "Bu dersi silmek istiyor musunuz?"
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "Kursu silmek, tüm bölümlerini ve derslerini de silecektir. Bu kursu silmek istediğinizden emin misiniz?"
 
@@ -1609,7 +1618,7 @@ msgstr "Ayrıntılar"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr "Kendi Kendine Kayıt Olmayı Devre Dışı Bırak"
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr "E-Posta"
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "Düzenle"
@@ -1758,11 +1767,6 @@ msgstr "Personel"
 msgid "Enable"
 msgstr "Etkinleştir"
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr "Sertifikasyonu Etkinleştir"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr "Değerlendirmeler için takvim davetleri göndermek üzere Google Ayarları'nda Google API'yi etkinleştirin."
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr "Kayıtlı"
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Kayıtlı Öğrenci"
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Kayıt Sayısı"
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr "Kayıt Başarısız"
 
@@ -1886,13 +1890,13 @@ msgstr "Doğru cevabı girin"
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "Hata"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr "Değerlendirme Bitiş Tarihi"
 msgid "Evaluation Request"
 msgstr "Değerlendirme Talebi"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr "Değerlendirici"
@@ -1967,6 +1973,10 @@ msgstr "Değerlendirici Programı"
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr "Tam Zamanlı"
 msgid "Function"
 msgstr "Fonksiyon"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr "Sertifika Al"
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr "Eğitmen İçeriği"
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr "Eğitmen Notları"
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr "Veriliş tarihi"
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr "Yayınlanma Tarihi"
@@ -2657,7 +2670,7 @@ msgstr "İşler"
 msgid "Join"
 msgstr "Katıl"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr "Ders Başlığı"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr "Konum Tercihi"
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "Giriş"
 
@@ -3089,8 +3102,8 @@ msgstr "ÖYS'yi varsayılan ana sayfa yapın"
 msgid "Make an Announcement"
 msgstr "Bir Duyuru Yapın"
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr "Yeni Test"
 msgid "New Sign Up"
 msgstr "Yeni Kayıt"
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr "Toplu işlerde yeni yorum {0}"
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr "{1} dersinde {0} konusuna yeni yanıt"
 
@@ -3484,7 +3497,7 @@ msgstr "{1} dersinde {0} konusuna yeni yanıt"
 msgid "New {0}"
 msgstr "Yeni {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "Sonraki"
 
@@ -3581,10 +3594,6 @@ msgstr "Bu tarih için boş yer bulunmamaktadır."
 msgid "No submissions"
 msgstr "Başvuru yok"
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr "Yaklaşan değerlendirme yok."
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "{0} Yok"
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Sadece {0} türündeki dosyalar kabul edilecektir."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr "Sadece resim dosyasına izin verilir."
 
@@ -3752,10 +3761,6 @@ msgstr "Seçenek 4"
 msgid "Order ID"
 msgstr "Sipariş No"
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr "Sayfalar"
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Ücretli Kurs"
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr "Ödeme Ayarları"
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr "Yüzde (örn. %70)"
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr "Lütfen Giriş Yapın"
 
@@ -3969,11 +3993,11 @@ msgstr "Doğrulama için lütfen e-postanızı kontrol edin"
 msgid "Please click on the following button to set your new password"
 msgstr "Yeni şifrenizi belirlemek için lütfen aşağıdaki linke tıklayınız"
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Bu özelliği kullanmak için lütfen Zoom Ayarlarını etkinleştirin."
 
@@ -4006,7 +4030,7 @@ msgstr "Lütfen ödev gönderimi için URL'yi girin."
 msgid "Please enter your answer"
 msgstr "Lütfen cevabınızı girin"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr "Ücretli ödeme grupları oluşturmak için lütfen Ödemeler uygulamasını yükleyin."
 
@@ -4014,7 +4038,7 @@ msgstr "Ücretli ödeme grupları oluşturmak için lütfen Ödemeler uygulamas
 msgid "Please install the Payments app to create a paid courses."
 msgstr "Ücretli kurslar oluşturmak için lütfen Ödemeler uygulamasını yükleyin."
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr "Lütfen bizi nereden duyduğunuzu belirtin."
 
@@ -4039,6 +4063,10 @@ msgstr "Ödeme işlemine devam etmek için lütfen giriş yapın."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Lütfen iyi hazırlanın ve değerlendirmelere zamanında katılın."
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr "Lütfen bir tarih seçin."
@@ -4112,7 +4140,7 @@ msgstr "Olası Cevap 4"
 msgid "Post"
 msgstr "Gönder"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Posta Kodu"
 
@@ -4155,19 +4183,22 @@ msgstr "Resim Önizleme"
 msgid "Preview Video"
 msgstr "Video Önzileme"
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "Önceki"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Fiyatlandırma"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr "Birincil Alt Grup"
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr "Özel"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr "Özel Bilgiler, Eğitim ve Çalışma Ortamı Tercihlerinizi içerir"
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr "Yayınlamış Kurslar"
 msgid "Published On"
 msgstr "Yayınlanma Zamanı"
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr "Sınavlar"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr "Rol Tercihi"
 msgid "Route"
 msgstr "Rota"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr "Planla"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr "Başlangıç Tarihi"
 msgid "Start Date:"
 msgstr "Başlangıç Tarihi:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr "Öğrenmeye Başlayın"
@@ -4945,7 +4981,7 @@ msgstr "Başlangıç URL'si"
 msgid "Startup Organization"
 msgstr "Başlangıç Organizasyonu"
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "Durum"
 
@@ -5074,7 +5110,7 @@ msgstr "Kaydedildi {0}"
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr "Kaydedildi {0}"
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "Özet"
 msgid "Sunday"
 msgstr "Pazar"
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "Şablon"
 msgid "Temporarily Disabled"
 msgstr "Geçici Olarak Devre Dışı"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr "Kullanım Koşulları"
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Teşekkürler ve Saygılar"
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr "Bu kriterlere uyan katılımcı bulunamadı."
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr "Bu grupta boş yer bulunmamaktadır."
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr "Bu kursta:"
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr "Bu kurs ücretsizdir."
 
@@ -5331,11 +5367,7 @@ msgstr "Bu kurs ücretsizdir."
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr "Bu ders önizleme için mevcut değildir. Dersin Eğitmeni siz olduğunuz için sadece siz görebilirsiniz."
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr "Bu ders önizleme için mevcut değil. Lütfen erişmek için kursa kaydolun."
 
@@ -5469,7 +5501,7 @@ msgstr "Alıcı"
 msgid "To Date"
 msgstr "Bitiş Tarihi"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr "Sisteminizden Resim, Video, Ses veya PDF yüklemek için ekle simgesine
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "Son zamanlarda çok fazla kullanıcı kaydoldu, bu yüzden kayıt devre dışı bırakıldı. Lütfen bir saat sonra tekrar deneyin"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "Toplam"
 
@@ -5778,7 +5810,7 @@ msgstr "Önizlemede dahil etmek ne anlama geliyor?"
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Bir kurs incelenmek üzere gönderildiğinde burada listelenecektir."
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr "Bizi nereden duydunuz?"
 
@@ -5827,6 +5859,10 @@ msgstr "Cevabınızı buraya yazın"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr "Bu gruba zaten kayıtlısınız."
@@ -5909,6 +5945,10 @@ msgstr "Bu iş için zaten başvurdunuz."
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr "Bu sınav için izin verilen maksimum deneme sayısını zaten aştınız."
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr "Bu kursa zaten yorum eklediniz"
@@ -5917,7 +5957,7 @@ msgstr "Bu kursa zaten yorum eklediniz"
 msgid "You have been enrolled in this batch"
 msgstr "Bu gruba kayıt oldunuz"
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr "Bu kursa zaten kayıtlısınız"
 
@@ -5941,7 +5981,7 @@ msgstr "Henüz hiçbir sınav oluşturmadınız. Yeni bir sınav oluşturmak iç
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Bu kurs için bildirim almayı seçtiniz. Kurs kullanılabilir olduğunda bir e-posta alacaksınız."
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr "Bu kursa kaydolmak için önce giriş yapmanız gerekiyor"
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr "başvurunuzu iptal edin"
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "Tamamlandı"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr "yapabilirsin"
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr "{0} Ayarları bulunamadı"
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr "{0} bir yorumda sizden bahsetti"
 
@@ -6135,11 +6175,11 @@ msgstr "{0} bir yorumda sizden bahsetti"
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/locale/zh.po b/lms/locale/zh.po
index a69b571e..3bdf1cf6 100644
--- a/lms/locale/zh.po
+++ b/lms/locale/zh.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-02-21 16:04+0000\n"
-"PO-Revision-Date: 2025-02-24 19:35\n"
+"POT-Creation-Date: 2025-02-28 16:04+0000\n"
+"PO-Revision-Date: 2025-03-03 21:29\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,10 @@ msgstr ""
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:58
+msgid "A course cannot have both paid certificate and certificate of completion."
+msgstr ""
+
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
@@ -189,16 +193,16 @@ msgid "Add your assignment as {0}"
 msgstr ""
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:17 frontend/src/pages/Billing.vue:69
+#: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
 msgstr "地址"
 
-#: frontend/src/pages/Billing.vue:79
+#: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
 msgstr "地址行1"
 
-#: frontend/src/pages/Billing.vue:83
+#: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
 msgstr "地址行2"
 
@@ -269,9 +273,11 @@ msgid "Already Registered"
 msgstr "已注册"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
+#. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:209
+#: frontend/src/pages/BatchForm.vue:209 frontend/src/pages/CourseForm.vue:220
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
@@ -285,11 +291,15 @@ msgstr "金额"
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:61
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_course/lms_course.py:57
+#: lms/lms/doctype/lms_course/lms_course.py:69
+msgid "Amount and currency are required for paid certificates."
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:66
 msgid "Amount and currency are required for paid courses."
 msgstr ""
 
@@ -364,7 +374,7 @@ msgstr ""
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:129
+#: frontend/src/components/UpcomingEvaluations.vue:135
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -400,7 +410,7 @@ msgstr ""
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:71
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -496,7 +506,7 @@ msgstr ""
 msgid "Average of Feedback Received"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:96
+#: frontend/src/pages/Lesson.vue:97
 msgid "Back to Course"
 msgstr ""
 
@@ -602,7 +612,7 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:430
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
 msgid "Batch Start Reminder"
 msgstr ""
 
@@ -617,7 +627,7 @@ msgstr ""
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgid "Billing Details"
 msgstr ""
 
 #. Label of the billing_name (Data) field in DocType 'LMS Payment'
-#: frontend/src/pages/Billing.vue:75
+#: frontend/src/pages/Billing.vue:70
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Name"
 msgstr ""
@@ -682,7 +692,7 @@ msgstr "分支机构（分公司）"
 msgid "Business Owner"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:45
+#: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
 msgstr ""
 
@@ -695,12 +705,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:55
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:61
+#: frontend/src/components/UpcomingEvaluations.vue:140
 msgid "Cancel"
 msgstr "取消"
 
-#: frontend/src/components/UpcomingEvaluations.vue:128
+#: frontend/src/components/UpcomingEvaluations.vue:134
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -741,7 +751,9 @@ msgstr "类别"
 msgid "Category Name"
 msgstr "分类名"
 
+#. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Certificate"
 msgstr ""
@@ -755,6 +767,10 @@ msgstr ""
 msgid "Certificate Link"
 msgstr ""
 
+#: frontend/src/components/CourseCardOverlay.vue:124
+msgid "Certificate of Completion"
+msgstr ""
+
 #: frontend/src/components/Modals/Event.vue:310
 msgid "Certificate saved successfully"
 msgstr ""
@@ -770,15 +786,20 @@ msgstr ""
 #. Label of the certification (Table) field in DocType 'User'
 #. Name of a DocType
 #. Label of the certification (Check) field in DocType 'LMS Batch'
-#. Label of the certification_tab (Tab Break) field in DocType 'LMS Course'
+#. Label of the certification_section (Section Break) field in DocType 'LMS
+#. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
+#: frontend/src/components/CourseCard.vue:110
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
+#: frontend/src/pages/CourseCertification.vue:10
+#: frontend/src/pages/CourseCertification.vue:114
 #: lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json lms/lms/workspace/lms/lms.json
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+#: lms/lms/workspace/lms/lms.json
 msgid "Certification"
 msgstr ""
 
@@ -787,11 +808,6 @@ msgstr ""
 msgid "Certification Details"
 msgstr ""
 
-#. Label of the expiry (Int) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Certification Expires After (Years)"
-msgstr ""
-
 #. Label of the certification_name (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Certification Name"
@@ -879,7 +895,7 @@ msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
-#: frontend/src/pages/Billing.vue:86 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
 msgid "City"
 msgstr "城市"
 
@@ -1086,7 +1102,9 @@ msgstr "已完成"
 msgid "Completed by Students"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:201
+#. Label of the enable_certification (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:212
+#: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
 
@@ -1126,7 +1144,7 @@ msgstr ""
 msgid "Congratulations on getting certified!"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:53
+#: frontend/src/components/CourseCardOverlay.vue:55
 msgid "Contact the Administrator to enroll for this course."
 msgstr ""
 
@@ -1148,7 +1166,7 @@ msgstr ""
 msgid "Contract"
 msgstr "合同"
 
-#: lms/lms/utils.py:438
+#: lms/lms/utils.py:437
 msgid "Cookie Policy"
 msgstr ""
 
@@ -1176,7 +1194,7 @@ msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:97 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 lms/fixtures/custom_field.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
 msgstr "国家"
@@ -1255,10 +1273,6 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:9
-msgid "Course Content"
-msgstr ""
-
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:16
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1309,12 +1323,6 @@ msgstr ""
 msgid "Course Outline"
 msgstr ""
 
-#. Label of the course_price (Currency) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:219
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Course Price"
-msgstr ""
-
 #. Name of a report
 #: lms/lms/report/course_progress_summary/course_progress_summary.json
 msgid "Course Progress Summary"
@@ -1347,11 +1355,11 @@ msgstr ""
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:277
+#: lms/lms/doctype/lms_batch/lms_batch.py:265
 msgid "Course already added to the batch."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:461
+#: frontend/src/pages/CourseForm.vue:469
 msgid "Course deleted successfully"
 msgstr ""
 
@@ -1359,7 +1367,7 @@ msgstr ""
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:50
+#: lms/lms/doctype/lms_batch/lms_batch.py:49
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1373,6 +1381,7 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
+#: frontend/src/pages/CourseCertification.vue:106
 #: frontend/src/pages/Courses.vue:8 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1433,7 +1442,7 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:226
+#: frontend/src/pages/BatchForm.vue:217 frontend/src/pages/CourseForm.vue:225
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1534,7 +1543,7 @@ msgstr ""
 
 #: frontend/src/components/CourseOutline.vue:240
 #: frontend/src/components/CourseOutline.vue:298
-#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:474
+#: frontend/src/pages/CourseForm.vue:15 frontend/src/pages/CourseForm.vue:482
 msgid "Delete"
 msgstr "删除"
 
@@ -1542,7 +1551,7 @@ msgstr "删除"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:468
+#: frontend/src/pages/CourseForm.vue:476
 msgid "Delete Course"
 msgstr ""
 
@@ -1554,7 +1563,7 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:469
+#: frontend/src/pages/CourseForm.vue:477
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
@@ -1609,7 +1618,7 @@ msgstr "详细信息"
 msgid "Didn't receive the code?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:196
+#: frontend/src/pages/CourseForm.vue:194
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1686,9 +1695,9 @@ msgid "E-mail"
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:107
-#: frontend/src/components/CourseCardOverlay.vue:86
+#: frontend/src/components/CourseCardOverlay.vue:88
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:65
+#: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:66
 #: frontend/src/pages/Profile.vue:32 frontend/src/pages/Programs.vue:53
 msgid "Edit"
 msgstr "编辑"
@@ -1758,11 +1767,6 @@ msgstr "员工"
 msgid "Enable"
 msgstr ""
 
-#. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Enable Certification"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:20
 msgid "Enable Google API in Google Settings to send calendar invites for evaluations."
 msgstr ""
@@ -1827,7 +1831,7 @@ msgid "Enrolled"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:41
-#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/components/CourseCardOverlay.vue:106
 #: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
@@ -1845,7 +1849,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1740
+#: lms/lms/utils.py:1769
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1886,13 +1890,13 @@ msgstr ""
 #: frontend/src/components/Quiz.vue:589
 #: frontend/src/components/SettingDetails.vue:62
 #: frontend/src/pages/AssignmentForm.vue:139
-#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:263
 #: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:147
 msgid "Error"
 msgstr "错误"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:181
+#: lms/lms/doctype/lms_batch/lms_batch.py:180
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
@@ -1920,7 +1924,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:78
+#: lms/lms/doctype/lms_batch/lms_batch.py:77
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -1934,15 +1938,17 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
+#. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:26
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/ProfileRoles.vue:22
+#: frontend/src/pages/CourseForm.vue:231 frontend/src/pages/ProfileRoles.vue:22
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
@@ -1967,6 +1973,10 @@ msgstr ""
 msgid "Evaluator is Unavailable"
 msgstr ""
 
+#: lms/lms/doctype/lms_course/lms_course.py:62
+msgid "Evaluator is required for paid certificates."
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2179,11 +2189,11 @@ msgstr ""
 msgid "Function"
 msgstr "功能"
 
-#: frontend/src/pages/Billing.vue:48
+#: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:115
+#: frontend/src/pages/Billing.vue:110
 msgid "GST Number"
 msgstr ""
 
@@ -2206,10 +2216,12 @@ msgstr ""
 msgid "Generate Google Meet Link"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:73
+#: frontend/src/components/CourseCardOverlay.vue:75
 msgid "Get Certificate"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:24
+#: frontend/src/components/CertificationLinks.vue:40
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2489,7 +2501,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:128 frontend/src/pages/LessonForm.vue:42
+#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:42
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2582,6 +2594,7 @@ msgid "Issue Date"
 msgstr ""
 
 #. Label of the issued_on (Date) field in DocType 'LMS Badge Assignment'
+#: frontend/src/pages/CourseCertification.vue:27
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 msgid "Issued On"
 msgstr ""
@@ -2657,7 +2670,7 @@ msgstr "工作"
 msgid "Join"
 msgstr "加入"
 
-#: frontend/src/components/UpcomingEvaluations.vue:45
+#: frontend/src/components/UpcomingEvaluations.vue:51
 msgid "Join Call"
 msgstr ""
 
@@ -2958,7 +2971,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:32
-#: frontend/src/components/CourseCardOverlay.vue:97
+#: frontend/src/components/CourseCardOverlay.vue:99
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -3054,7 +3067,7 @@ msgstr ""
 #: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
-#: frontend/src/pages/Lesson.vue:24
+#: frontend/src/pages/Lesson.vue:25
 msgid "Login"
 msgstr "登录"
 
@@ -3089,8 +3102,8 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:128
-msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+#: frontend/src/pages/Billing.vue:123
+msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
 #: frontend/src/components/BatchOverlay.vue:60
@@ -3471,11 +3484,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:604
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:598
+#: lms/lms/utils.py:597
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -3484,7 +3497,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "新建 {0}"
 
-#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:85
 msgid "Next"
 msgstr "下一个"
 
@@ -3581,10 +3594,6 @@ msgstr ""
 msgid "No submissions"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:63
-msgid "No upcoming evaluations."
-msgstr ""
-
 #: lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
@@ -3686,7 +3695,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:533
+#: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:533
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3752,10 +3761,6 @@ msgstr "选项4"
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:26
-msgid "Ordered Item"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:74
 msgid "Organisation"
 msgstr ""
@@ -3765,7 +3770,7 @@ msgstr ""
 msgid "Organization"
 msgstr "组织"
 
-#: frontend/src/pages/Billing.vue:37
+#: frontend/src/pages/Billing.vue:32
 msgid "Original Amount"
 msgstr ""
 
@@ -3804,13 +3809,23 @@ msgstr ""
 msgid "Paid Batch"
 msgstr ""
 
+#. Label of the paid_certificate (Check) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:217
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Paid Certificate"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:133
+msgid "Paid Certificate after Evaluation"
+msgstr ""
+
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:120
+#: frontend/src/pages/Billing.vue:115
 msgid "Pan Number"
 msgstr ""
 
@@ -3898,6 +3913,15 @@ msgstr ""
 msgid "Payment Settings"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:21
+msgid "Payment for "
+msgstr ""
+
+#. Label of the payment_for_certificate (Check) field in DocType 'LMS Payment'
+#: lms/lms/doctype/lms_payment/lms_payment.json
+msgid "Payment for Certificate"
+msgstr ""
+
 #. Label of the payment_for_document (Dynamic Link) field in DocType 'LMS
 #. Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -3945,11 +3969,11 @@ msgstr ""
 msgid "Percentage/Status"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:104
+#: frontend/src/pages/Billing.vue:99
 msgid "Phone Number"
 msgstr "电话号码"
 
-#: frontend/src/components/CourseCardOverlay.vue:148
+#: frontend/src/components/CourseCardOverlay.vue:169
 msgid "Please Login"
 msgstr ""
 
@@ -3969,11 +3993,11 @@ msgstr "请检查您的电子邮件验证"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1863 lms/lms/utils.py:1867
+#: lms/lms/utils.py:1901 lms/lms/utils.py:1905
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:188
+#: lms/lms/doctype/lms_batch/lms_batch.py:187
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -4006,7 +4030,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:57
+#: lms/lms/doctype/lms_batch/lms_batch.py:56
 msgid "Please install the Payments app to create a paid batches."
 msgstr ""
 
@@ -4014,7 +4038,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:256
+#: frontend/src/pages/Billing.vue:255
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -4039,6 +4063,10 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
+#: frontend/src/components/UpcomingEvaluations.vue:69
+msgid "Please schedule an evaluation to get certified."
+msgstr ""
+
 #: frontend/src/components/Modals/LiveClassModal.vue:167
 msgid "Please select a date."
 msgstr ""
@@ -4112,7 +4140,7 @@ msgstr ""
 msgid "Post"
 msgstr "发送"
 
-#: frontend/src/pages/Billing.vue:100
+#: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "邮政编码"
 
@@ -4155,19 +4183,22 @@ msgstr ""
 msgid "Preview Video"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:49
+#: frontend/src/pages/Lesson.vue:50
 msgid "Previous"
 msgstr "以前"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:208
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "价钱"
 
+#. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
+#: frontend/src/pages/CourseForm.vue:201
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Pricing and Certification"
+msgstr ""
+
 #. Label of the exception_country (Table MultiSelect) field in DocType 'LMS
 #. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4179,7 +4210,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:437
+#: lms/lms/utils.py:436
 msgid "Privacy Policy"
 msgstr ""
 
@@ -4194,7 +4225,7 @@ msgstr "私人"
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:134
+#: frontend/src/pages/Billing.vue:129
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -4274,6 +4305,11 @@ msgstr ""
 msgid "Published On"
 msgstr ""
 
+#. Label of the purchased_certificate (Check) field in DocType 'LMS Enrollment'
+#: lms/lms/doctype/lms_enrollment/lms_enrollment.json
+msgid "Purchased Certificate"
+msgstr ""
+
 #. Label of the question (Small Text) field in DocType 'Course Lesson'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the question (Text Editor) field in DocType 'LMS Assignment
@@ -4391,7 +4427,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:113
+#: frontend/src/components/CourseCardOverlay.vue:115
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4540,19 +4576,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:127
+#: lms/lms/doctype/lms_batch/lms_batch.py:126
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:122
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:104
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:113
+#: lms/lms/doctype/lms_batch/lms_batch.py:112
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4606,7 +4642,7 @@ msgid "Schedule"
 msgstr ""
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
-#: frontend/src/components/UpcomingEvaluations.vue:8
+#: frontend/src/components/UpcomingEvaluations.vue:14
 msgid "Schedule Evaluation"
 msgstr ""
 
@@ -4905,8 +4941,8 @@ msgstr "开始日期"
 msgid "Start Date:"
 msgstr "开始日期:"
 
-#: frontend/src/components/CourseCardOverlay.vue:63
-#: frontend/src/pages/Lesson.vue:21 frontend/src/pages/SCORMChapter.vue:28
+#: frontend/src/components/CourseCardOverlay.vue:65
+#: frontend/src/pages/Lesson.vue:22 frontend/src/pages/SCORMChapter.vue:28
 #: lms/templates/emails/lms_course_interest.html:9
 msgid "Start Learning"
 msgstr ""
@@ -4945,7 +4981,7 @@ msgstr ""
 msgid "Startup Organization"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:88
+#: frontend/src/pages/Billing.vue:83
 msgid "State"
 msgstr "州"
 
@@ -5074,7 +5110,7 @@ msgstr ""
 #: frontend/src/components/BatchCourses.vue:151
 #: frontend/src/components/BatchOverlay.vue:150
 #: frontend/src/components/BatchStudents.vue:324
-#: frontend/src/components/CourseCardOverlay.vue:168
+#: frontend/src/components/CourseCardOverlay.vue:189
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -5085,7 +5121,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
 #: frontend/src/pages/AssignmentForm.vue:155
-#: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
+#: frontend/src/pages/CourseForm.vue:469 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
 #: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
@@ -5107,7 +5143,7 @@ msgstr "概要"
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:999
+#: lms/lms/api.py:1012
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -5192,7 +5228,7 @@ msgstr "模板"
 msgid "Temporarily Disabled"
 msgstr "暂时禁用"
 
-#: lms/lms/utils.py:436
+#: lms/lms/utils.py:435
 msgid "Terms of Use"
 msgstr ""
 
@@ -5228,7 +5264,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1772
+#: lms/lms/utils.py:1801
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5276,7 +5312,7 @@ msgstr ""
 msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:95
+#: lms/lms/doctype/lms_batch/lms_batch.py:94
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5319,11 +5355,11 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:92
+#: frontend/src/components/CourseCardOverlay.vue:94
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1620
+#: lms/lms/utils.py:1644
 msgid "This course is free."
 msgstr ""
 
@@ -5331,11 +5367,7 @@ msgstr ""
 msgid "This is a chapter in the course {0}"
 msgstr ""
 
-#: lms/lms/widgets/CourseOutline.html:62
-msgid "This lesson is not available for preview. As you are the Instructor of the course only you can see it."
-msgstr ""
-
-#: frontend/src/pages/Lesson.vue:15
+#: frontend/src/pages/Lesson.vue:16
 msgid "This lesson is not available for preview. Please enroll in the course to access it."
 msgstr ""
 
@@ -5469,7 +5501,7 @@ msgstr "至"
 msgid "To Date"
 msgstr "至今"
 
-#: lms/lms/utils.py:1631
+#: lms/lms/utils.py:1655
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5481,7 +5513,7 @@ msgstr ""
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr "最近有太多用户注册，导致注册功能被自动临时禁用了，请一个小时后重试。"
 
-#: frontend/src/pages/Billing.vue:58
+#: frontend/src/pages/Billing.vue:53
 msgid "Total"
 msgstr "总"
 
@@ -5778,7 +5810,7 @@ msgstr ""
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:111
+#: frontend/src/pages/Billing.vue:106
 msgid "Where did you hear about us?"
 msgstr ""
 
@@ -5827,6 +5859,10 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
+#: frontend/src/pages/CourseCertification.vue:14
+msgid "You are already certified for this course. Click on the card below to open your certificate."
+msgstr ""
+
 #: lms/lms/api.py:224
 msgid "You are already enrolled for this batch."
 msgstr ""
@@ -5909,6 +5945,10 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
+#: lms/lms/api.py:237
+msgid "You have already purchased the certificate for this course."
+msgstr ""
+
 #: lms/lms/doctype/lms_course_review/lms_course_review.py:17
 msgid "You have already reviewed this course"
 msgstr ""
@@ -5917,7 +5957,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:169
+#: frontend/src/components/CourseCardOverlay.vue:190
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5941,7 +5981,7 @@ msgstr ""
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:149
+#: frontend/src/components/CourseCardOverlay.vue:170
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6027,7 +6067,7 @@ msgstr ""
 msgid "cancel your application"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:177
+#: frontend/src/pages/Lesson.vue:178
 msgid "completed"
 msgstr "已完成"
 
@@ -6087,7 +6127,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:789 lms/lms/api.py:797
+#: lms/lms/api.py:802 lms/lms/api.py:810
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -6127,7 +6167,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:682
+#: lms/lms/utils.py:681
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -6135,11 +6175,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:635 lms/lms/utils.py:641
+#: lms/lms/utils.py:634 lms/lms/utils.py:640
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/utils.py:458
+#: lms/lms/utils.py:457
 msgid "{0}k"
 msgstr ""
 
diff --git a/lms/overrides/test_user.py b/lms/overrides/test_user.py
deleted file mode 100644
index 2035f89d..00000000
--- a/lms/overrides/test_user.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-
-import unittest
-
-import frappe
-
-from lms.lms.doctype.lms_course.test_lms_course import new_user
-
-
-class TestCustomUser(unittest.TestCase):
-	def test_with_basic_username(self):
-		user = new_user("Username", "test_with_basic_username@example.com")
-		self.assertEqual(user.username, "username")
-
-	def test_without_username(self):
-		"""The user in this test has the same first name as the user of the test test_with_basic_username.
-		In such cases frappe makes the username of the second user empty.
-		The condition in lms app should override this and save a username."""
-		user = new_user("Username", "test-without-username@example.com")
-		self.assertTrue(user.username)
-
-	def test_with_short_first_name(self):
-		user = new_user("USN", "test_with_short_first_name@example.com")
-		self.assertGreaterEqual(len(user.username), 4)
-
-	@classmethod
-	def tearDownClass(cls) -> None:
-		users = [
-			"test_with_basic_username@example.com",
-			"test-without-username@example.com",
-			"test_with_short_first_name@example.com",
-		]
-		frappe.db.delete("User", {"name": ["in", users]})
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
deleted file mode 100644
index 6117c364..00000000
--- a/lms/overrides/user.py
+++ /dev/null
@@ -1,363 +0,0 @@
-import hashlib
-import frappe
-import requests
-from frappe import _
-from frappe.core.doctype.user.user import User
-from frappe.utils import cint, escape_html, random_string
-from frappe.website.utils import is_signup_disabled
-from lms.lms.utils import get_average_rating, get_country_code
-from frappe.website.utils import cleanup_page_name
-from frappe.model.naming import append_number_if_name_exists
-from lms.widgets import Widgets
-
-
-class CustomUser(User):
-	def validate(self):
-		super().validate()
-		self.validate_username_duplicates()
-
-	def after_insert(self):
-		super().after_insert()
-		self.add_roles("LMS Student")
-
-	def validate_username_duplicates(self):
-		while not self.username or self.username_exists():
-			self.username = append_number_if_name_exists(
-				self.doctype, cleanup_page_name(self.full_name), fieldname="username"
-			)
-		if " " in self.username:
-			self.username = self.username.replace(" ", "")
-
-		if len(self.username) < 4:
-			self.username = self.email.replace("@", "").replace(".", "")
-
-	def validate_skills(self):
-		unique_skills = []
-		for skill in self.skill:
-			if not skill.skill_name:
-				return
-			if not skill.skill_name in unique_skills:
-				unique_skills.append(skill.skill_name)
-			else:
-				frappe.throw(_("Skills must be unique"))
-
-	def get_batch_count(self) -> int:
-		"""Returns the number of batches authored by this user."""
-		return frappe.db.count(
-			"LMS Enrollment", {"member": self.name, "member_type": "Mentor"}
-		)
-
-	def get_user_reviews(self):
-		"""Returns the reviews created by user"""
-		return frappe.get_all("LMS Course Review", {"owner": self.name})
-
-	def get_mentored_courses(self):
-		"""Returns all courses mentored by this user"""
-		mentored_courses = []
-		mapping = frappe.get_all(
-			"LMS Course Mentor Mapping",
-			{
-				"mentor": self.name,
-			},
-			["name", "course"],
-		)
-
-		for map in mapping:
-			if frappe.db.get_value("LMS Course", map.course, "published"):
-				course = frappe.db.get_value(
-					"LMS Course",
-					map.course,
-					["name", "upcoming", "title", "image", "enable_certification"],
-					as_dict=True,
-				)
-				mentored_courses.append(course)
-
-		return mentored_courses
-
-
-def get_enrolled_courses():
-	in_progress = []
-	completed = []
-	memberships = get_course_membership(None, member_type="Student")
-
-	for membership in memberships:
-		course = frappe.db.get_value(
-			"LMS Course",
-			membership.course,
-			[
-				"name",
-				"upcoming",
-				"title",
-				"short_introduction",
-				"image",
-				"enable_certification",
-				"paid_course",
-				"course_price",
-				"currency",
-				"published",
-				"creation",
-			],
-			as_dict=True,
-		)
-		if not course.published:
-			continue
-		course.enrollment_count = frappe.db.count(
-			"LMS Enrollment", {"course": course.name, "member_type": "Student"}
-		)
-		course.avg_rating = get_average_rating(course.name) or 0
-		progress = cint(membership.progress)
-		if progress < 100:
-			in_progress.append(course)
-		else:
-			completed.append(course)
-
-	in_progress.sort(key=lambda x: x.enrollment_count, reverse=True)
-	completed.sort(key=lambda x: x.enrollment_count, reverse=True)
-
-	return {"in_progress": in_progress, "completed": completed}
-
-
-def get_course_membership(member=None, member_type=None):
-	"""Returns all memberships of the user."""
-
-	filters = {"member": member or frappe.session.user}
-	if member_type:
-		filters["member_type"] = member_type
-
-	return frappe.get_all("LMS Enrollment", filters, ["name", "course", "progress"])
-
-
-def get_authored_courses(member=None, only_published=True):
-	"""Returns the number of courses authored by this user."""
-	course_details = []
-	courses = frappe.get_all(
-		"Course Instructor", {"instructor": member or frappe.session.user}, ["parent"]
-	)
-
-	for course in courses:
-		detail = frappe.db.get_value(
-			"LMS Course",
-			course.parent,
-			[
-				"name",
-				"upcoming",
-				"title",
-				"short_introduction",
-				"image",
-				"paid_course",
-				"course_price",
-				"currency",
-				"status",
-				"published",
-				"creation",
-			],
-			as_dict=True,
-		)
-
-		if only_published and detail and not detail.published:
-			continue
-		detail.enrollment_count = frappe.db.count(
-			"LMS Enrollment", {"course": detail.name, "member_type": "Student"}
-		)
-		detail.avg_rating = get_average_rating(detail.name) or 0
-		course_details.append(detail)
-
-	course_details.sort(key=lambda x: x.enrollment_count, reverse=True)
-	return course_details
-
-
-def get_palette(full_name):
-	"""
-	Returns a color unique to each member for Avatar"""
-
-	palette = [
-		["--orange-avatar-bg", "--orange-avatar-color"],
-		["--pink-avatar-bg", "--pink-avatar-color"],
-		["--blue-avatar-bg", "--blue-avatar-color"],
-		["--green-avatar-bg", "--green-avatar-color"],
-		["--dark-green-avatar-bg", "--dark-green-avatar-color"],
-		["--red-avatar-bg", "--red-avatar-color"],
-		["--yellow-avatar-bg", "--yellow-avatar-color"],
-		["--purple-avatar-bg", "--purple-avatar-color"],
-		["--gray-avatar-bg", "--gray-avatar-color0"],
-	]
-
-	encoded_name = str(full_name).encode("utf-8")
-	hash_name = hashlib.md5(encoded_name).hexdigest()
-	idx = cint((int(hash_name[4:6], 16) + 1) / 5.33)
-	return palette[idx % 8]
-
-
-@frappe.whitelist(allow_guest=True)
-def sign_up(email, full_name, verify_terms, user_category):
-	if is_signup_disabled():
-		frappe.throw(_("Sign Up is disabled"), _("Not Allowed"))
-
-	user = frappe.db.get("User", {"email": email})
-	if user:
-		if user.enabled:
-			return 0, _("Already Registered")
-		else:
-			return 0, _("Registered but disabled")
-	else:
-		if frappe.db.get_creation_count("User", 60) > 300:
-			frappe.respond_as_web_page(
-				_("Temporarily Disabled"),
-				_(
-					"Too many users signed up recently, so the registration is disabled. Please try back in an hour"
-				),
-				http_status_code=429,
-			)
-
-	user = frappe.get_doc(
-		{
-			"doctype": "User",
-			"email": email,
-			"first_name": escape_html(full_name),
-			"verify_terms": verify_terms,
-			"user_category": user_category,
-			"country": "",
-			"enabled": 1,
-			"new_password": random_string(10),
-			"user_type": "Website User",
-		}
-	)
-	user.flags.ignore_permissions = True
-	user.flags.ignore_password_policy = True
-	user.insert()
-
-	# set default signup role as per Portal Settings
-	default_role = frappe.db.get_value("Portal Settings", None, "default_role")
-	if default_role:
-		user.add_roles(default_role)
-
-	user.add_roles("LMS Student")
-	set_country_from_ip(None, user.name)
-
-	if user.flags.email_sent:
-		return 1, _("Please check your email for verification")
-	else:
-		return 2, _("Please ask your administrator to verify your sign-up")
-
-
-def set_country_from_ip(login_manager=None, user=None):
-	if not user and login_manager:
-		user = login_manager.user
-	user_country = frappe.db.get_value("User", user, "country")
-	# if user_country:
-	#    return
-	frappe.db.set_value("User", user, "country", get_country_code())
-	return
-
-
-def on_session_creation(login_manager):
-	if frappe.db.get_single_value(
-		"System Settings", "setup_complete"
-	) and frappe.db.get_single_value("LMS Settings", "default_home"):
-		frappe.local.response["home_page"] = "/lms"
-
-
-@frappe.whitelist()
-def search_users(start: int = 0, text: str = ""):
-	start = cint(start)
-	search_text = frappe.db.escape(f"%{text}%")
-
-	or_filters = get_or_filters(search_text)
-	count = len(get_users(or_filters, 0, 900000000))
-	users = get_users(or_filters, start, 24)
-	user_details = get_user_details(users)
-
-	return {"user_details": user_details, "start": start + 24, "count": count}
-
-
-def get_or_filters(text):
-	user_fields = [
-		"first_name",
-		"last_name",
-		"full_name",
-		"email",
-		"preferred_location",
-		"dream_companies",
-	]
-	education_fields = ["institution_name", "location", "degree_type", "major"]
-	work_fields = ["title", "company"]
-	certification_fields = ["certification_name", "organization"]
-
-	or_filters = []
-	if text:
-		for field in user_fields:
-			or_filters.append(f"u.{field} like {text}")
-		for field in education_fields:
-			or_filters.append(f"ed.{field} like {text}")
-		for field in work_fields:
-			or_filters.append(f"we.{field} like {text}")
-		for field in certification_fields:
-			or_filters.append(f"c.{field} like {text}")
-
-		or_filters.append(f"s.skill_name like {text}")
-		or_filters.append(f"pf.function like {text}")
-		or_filters.append(f"pi.industry like {text}")
-
-	return "AND ({})".format(" OR ".join(or_filters)) if or_filters else ""
-
-
-def get_user_details(users):
-	user_details = []
-	for user in users:
-		details = frappe.db.get_value(
-			"User",
-			user,
-			["name", "username", "full_name", "user_image", "headline", "looking_for_job"],
-			as_dict=True,
-		)
-		user_details.append(Widgets().MemberCard(member=details, avatar_class="avatar-large"))
-
-	return user_details
-
-
-def get_users(or_filters, start, page_length):
-	users = frappe.db.sql(
-		"""
-        SELECT DISTINCT u.name
-        FROM `tabUser` u
-        LEFT JOIN `tabEducation Detail` ed
-        ON u.name = ed.parent
-        LEFT JOIN `tabWork Experience` we
-        ON u.name = we.parent
-        LEFT JOIN `tabCertification` c
-        ON u.name = c.parent
-        LEFT JOIN `tabSkills` s
-        ON u.name = s.parent
-        LEFT JOIN `tabPreferred Function` pf
-        ON u.name = pf.parent
-        LEFT JOIN `tabPreferred Industry` pi
-        ON u.name = pi.parent
-        WHERE u.enabled = True {or_filters}
-        ORDER BY u.creation desc
-        LIMIT {start}, {page_length}
-	""".format(
-			or_filters=or_filters, start=start, page_length=page_length
-		),
-		as_dict=1,
-	)
-
-	return users
-
-
-@frappe.whitelist()
-def save_role(user, role, value):
-	frappe.only_for("Moderator")
-	if cint(value):
-		doc = frappe.get_doc(
-			{
-				"doctype": "Has Role",
-				"parent": user,
-				"role": role,
-				"parenttype": "User",
-				"parentfield": "roles",
-			}
-		)
-		doc.save(ignore_permissions=True)
-	else:
-		frappe.db.delete("Has Role", {"parent": user, "role": role})
-	return True
diff --git a/lms/page_renderers.py b/lms/page_renderers.py
index 91daf29d..d0e8338b 100644
--- a/lms/page_renderers.py
+++ b/lms/page_renderers.py
@@ -6,6 +6,7 @@ import re
 import os
 import mimetypes
 import frappe
+from frappe.utils import get_files_path
 from frappe.website.page_renderers.base_renderer import BaseRenderer
 from frappe.website.page_renderers.document_page import DocumentPage
 from frappe.website.page_renderers.list_page import ListPage
@@ -173,3 +174,23 @@ class SCORMRenderer(BaseRenderer):
 					)
 					response.mimetype = mimetypes.guess_type(index_path)[0]
 					return response
+			elif not os.path.exists(path):
+				chapter_folder = "/".join(self.path.split("/")[:3])
+				chapter_folder_path = os.path.realpath(
+					frappe.get_site_path("public", chapter_folder)
+				)
+				file = path.split("/")[-1]
+				correct_file_path = None
+
+				for root, dirs, files in os.walk(chapter_folder_path):
+					if file in files:
+						correct_file_path = os.path.join(root, file)
+						break
+
+				if correct_file_path:
+					f = open(correct_file_path, "rb")
+					response = Response(
+						wrap_file(frappe.local.request.environ, f), direct_passthrough=True
+					)
+					response.mimetype = mimetypes.guess_type(correct_file_path)[0]
+					return response
diff --git a/lms/templates/signup-form.html b/lms/templates/signup-form.html
index 6f803dbe..296884d2 100644
--- a/lms/templates/signup-form.html
+++ b/lms/templates/signup-form.html
@@ -85,7 +85,7 @@
         }
 
         frappe.call({
-            method: "lms.overrides.user.sign_up",
+            method: "lms.lms.user.sign_up",
             args: {
                 "email": email,
                 "full_name": full_name,