diff --git a/src/components/products/AddTemplate.jsx b/src/components/products/AddTemplate.jsx
new file mode 100644
index 0000000..7f874fc
--- /dev/null
+++ b/src/components/products/AddTemplate.jsx
@@ -0,0 +1,106 @@
+import {useMutation, useQueryClient} from '@tanstack/react-query'
+import {Formik, Form} from 'formik'
+import * as Yup from "yup";
+import InputText from '../InputText'
+import {addCustomTemplate} from '../../services/siteServices'
+import queryKeys from '../../services/queryKeys';
+
+
+const initialValues = {
+    custom_id: "",
+    provision_name: "",
+};
+
+// To get the validation schema
+const validationSchema = Yup.object().shape({
+    custom_id: Yup.string().required("custom_id is required").min(6, 'must be upto 6 characters').max(25, 'must not exceed 25 characters'),
+    provision_name: Yup.string().required("provision_name is required").min(6, 'must be upto 6 characters').max(25, 'must not exceed 25 characters'),
+});
+
+export default function AddTemplate() {
+
+    const queryClient = useQueryClient()
+
+    const customTemplate = useMutation({
+        mutationFn: (fields) => {
+            if (!fields.custom_id || !fields.provision_name) {
+                throw new Error('Please provide all fields marked *')
+            }
+            return addCustomTemplate(fields)
+        },
+        onSuccess: () => {
+            queryClient.refetchQueries({
+                queryKey: [...queryKeys.custom_template],
+                // type: 'active',
+                // exact: true,
+            })
+        },
+    })
+
+    //FUNCTION TO HANDLE ADD TEMPLATE
+    const handleSubmit = (values, helper) => {
+        customTemplate.mutate(values)
+    };
+
+  return (
+    <Formik
+        initialValues={initialValues}
+        validationSchema={validationSchema}
+        onSubmit={handleSubmit}
+    >
+        {(props) => (
+            <Form>
+                <div
+                    className='flex flex-col w-full bg-white rounded-xl p-16 sm:px-20 sm:py-16 shadow'>
+                    <div className='w-full flex flex-col gap-4'>
+                        <div className='relative text-input flex flex-col sm:flex-row gap-2 sm:items-center'>
+                            <label className={`text-base min-w-36 text-end sm:text-left ${(props.errors.custom_id && props.touched.custom_id) && 'text-red-500'}`}>
+                                Custom ID
+                            </label>
+                            <InputText
+                                id='custom_id'
+                                placeholder='Custom ID'
+                                name='custom_id'
+                                value={props.values.custom_id}
+                                handleChange={props.handleChange}
+                            />
+                        </div>
+                        <div className='relative text-input flex flex-col sm:flex-row gap-2 sm:items-center'>
+                            <label className={`text-base min-w-36 text-end sm:text-left ${(props.errors.provision_name && props.touched.provision_name) && 'text-red-500'}`}>
+                                Provision Name
+                            </label>
+                            <InputText
+                                id='provision_name'
+                                placeholder='Provision Name'
+                                name='provision_name'
+                                value={props.values.provision_name}
+                                handleChange={props.handleChange}
+                            />
+                        </div>
+
+                        <div className='h-10 my-5 text-end'>
+                            <button type='submit' disabled={customTemplate.isPending}
+                                    className='px-4 h-full bg-primary text-white font-bold rounded-md'>{customTemplate.isPending ? 'loading...' : 'Add'}</button>
+                        </div>
+
+                        {customTemplate.error &&
+                            <>
+                                <div className="w-full text-center">
+                                    <p className='text-red-500 text-sm'>{customTemplate.error.message}</p>
+                                </div>
+                            </>
+                        }
+                        {customTemplate.isSuccess &&
+                            <>
+                                <div className="w-full text-center">
+                                    <p className='text-emerald-500 text-sm'>{'Template Added'}</p>
+                                </div>
+                            </>
+                        }
+                    </div>
+                </div>
+            </Form>
+        )}
+    </Formik>
+  )
+}
diff --git a/src/components/products/CustomTemplates.jsx b/src/components/products/CustomTemplates.jsx
index b33b2f4..4268715 100644
--- a/src/components/products/CustomTemplates.jsx
+++ b/src/components/products/CustomTemplates.jsx
@@ -7,6 +7,7 @@ import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
 import Icons from '../Icons'
 import { getCustomTemplate } from '../../services/siteServices'
 import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'
+import AddTemplate from './AddTemplate'
 
 export default function CustomTemplates() {
 
@@ -51,9 +52,10 @@ export default function CustomTemplates() {
         <div className='w-full flex flex-col gap-8'>
             <BreadcrumbCom title='Custom Templates' paths={['Dashboard', 'Custom Templates']} />
             <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body' style={{backgroundColor: 'aliceblue'}}>
-            <b>Add New Custom Template</b>
-
-
+                <div className='mb-3'>
+                    <b>Add New Custom Template</b>
+                </div>
+                <AddTemplate />
             </div>
             <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
                 { isError ?
diff --git a/src/components/subscription_view/SubscriptionViewCom.jsx b/src/components/subscription_view/SubscriptionViewCom.jsx
index 8db7abd..1aa212e 100644
--- a/src/components/subscription_view/SubscriptionViewCom.jsx
+++ b/src/components/subscription_view/SubscriptionViewCom.jsx
@@ -1,11 +1,12 @@
 import {useLocation, useNavigate, Link} from 'react-router-dom'
-import { useQuery } from '@tanstack/react-query'
+import { useQuery, useMutation } from '@tanstack/react-query'
 import { FaCaretDown } from "react-icons/fa";
 import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
-import {useEffect} from 'react';
+import {useEffect, useState} from 'react';
 import RouteLinks from '../../RouteLinks';
-import { getSubscriptionsView } from '../../services/siteServices'
+import { getSubscriptionsView, updateTemplate } from '../../services/siteServices'
 import queryKeys from '../../services/queryKeys'
+import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
 
 export default function SubscriptionViewCom() {
 
@@ -13,6 +14,20 @@ export default function SubscriptionViewCom() {
     const {state} = useLocation()
     const navigate = useNavigate()
 
+    const [reqStatus, setReqStatus] = useState({loading: false, type: '', error: false, success: false})
+
+    const [values, setValues] = useState({custom_id: '', template_uid: ''})
+
+    const handleValueChange = ({target:{name, value}}) => {
+        if(name == 'custom_template'){
+            setValues(prev => ({...prev, custom_id: value}))
+        }else if (name == 'template') {
+            setValues(prev => ({...prev, template_uid: value}))
+        }else{
+            setValues(prev => ({...prev}))
+        }
+    }
+
     useEffect(() => {
         if (!state?.subscriptionUID) {
             navigate(RouteLinks.homePage, {replace: true})
@@ -33,7 +48,44 @@ export default function SubscriptionViewCom() {
         staleTime: 0 //0 mins
     })
     const subscriptionViewData = data?.data // ACCOUNT VIEW DATA
-    console.log('subscriptionViewData', subscriptionViewData)
+    const customTemplates = subscriptionViewData?.available_custom_templates
+    const availableTemplates = subscriptionViewData?.available_templates
+    const selectedSubscription = subscriptionViewData?.subscription
+    // console.log('subscriptionViewData', subscriptionViewData)
+
+
+    const templateUpdate = useMutation({
+        mutationFn: (fields) => {
+            setReqStatus(prev => ({...prev, loading: true}))
+            return updateTemplate(fields)
+        },
+        onError: (error) => {
+            setReqStatus(prev => ({...prev, loading: false, error: true}))
+        },
+        onSuccess: (res) => {
+            setReqStatus(prev => ({...prev, loading: false, error: false, success: true}))
+        },
+        onSettled: () => {
+            setTimeout(()=>{
+                setReqStatus({loading: false, type: '', error: false, success: false})
+            }, 3000)
+        }
+    })
+
+    const handleUpdateTemplate = ({target:{name}}) => {
+        setReqStatus({loading: false, type: name, error: false, success: false})
+        const reqData = {Subscrtiption_uid: state?.subscriptionUID}
+        if(name == 'template'){
+            reqData.template_uid = values.template_uid
+        }else if (name == 'custom_template'){
+            reqData.custom_id = values.custom_id
+        }else{
+            return
+        }
+        console.log('req', reqData)
+        templateUpdate.mutate(reqData)
+    }
+
 
     return (
         <div className='w-full flex flex-col gap-8'>
@@ -47,28 +99,57 @@ export default function SubscriptionViewCom() {
                 <p className='text-red-500'>{error.message}</p>
             :
                 <>
-                    <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
-
-                        <div>
-                            Repeat the Subscription at the top
-
-                        </div>
+                    <div className='w-full box bg-white dark:bg-black-box text-black-body dark:text-white-body overflow-x-auto'>
+                        <table className="py-2 w-full text-sm bg-[aliceblue] dark:bg-transparent rounded-[10px]">
+                            <tbody>
+                                <tr className="py-2 border-t border-dashed border-slate-300">
+                                    <td className="px-2 py-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{getDateTimeFromDateString(selectedSubscription?.added)}</div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{selectedSubscription?.product_id}</div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{selectedSubscription?.internal_url}
+                                            <br /><span>Template :</span> {selectedSubscription?.product_template}
+                                            <br /><span>Custom :</span> {selectedSubscription?.custom_template}
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-right">
+                                            <div className="text-base font-semibold">{selectedSubscription?.status}</div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
                     </div>
 
                     <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
 
                         <div className='w-full'>
                             <label className='font-medium'>Assign Template</label>
-                            <div className='flex flex-col md:flex-row md:items-center gap-2'>
-                                <div className='w-full relative'>
-                                    <select className='w-full p-2'>
+                            <div className='flex flex-col xs:flex-row md:items-center gap-2'>
+                                <div className='w-full h-10 relative overflow-hidden rounded-md'>
+                                    <select name='template' value={values.template_uid} onChange={handleValueChange} className='w-full h-full p-2 appearance-none dark:bg-transparent border-0 dark:border-1 border-white ring-0 outline-none'>
                                         <option value=''>None</option>
+                                        {availableTemplates && availableTemplates.map(item => (
+                                            <option key={item?.template_uid} value={item?.template_uid}>{`${item?.product_id}-${item?.provision_name}`}</option>
+                                        ))}
                                     </select>
                                     <FaCaretDown className='text-base absolute top-1/2 -translate-y-1/2 right-2' />
                                 </div>
-                                <button>Update</button>
+                                <button name='template' onClick={handleUpdateTemplate} disabled={(reqStatus.loading || !values.template_uid)} className={`rounded-md p-2 bg-primary text-white text-center ${(reqStatus.loading || !values.template_uid) && 'opacity-50'}`}>Update</button>
                             </div>
-
+                            {(reqStatus.type == 'template' && (reqStatus.error || reqStatus.success)) &&
+                                <p className={`p-2 mt-4 ${reqStatus.success ? 'text-emerald-500' : 'text-red-500'}`}>{reqStatus.success ? 'Template updated' : 'Unable to complete request, try again'}</p>
+                            }
                         </div>
                     </div>
 
@@ -76,22 +157,25 @@ export default function SubscriptionViewCom() {
 
                         <div className='w-full'>
                             <label className='font-medium'>Assign Custom Template</label>
-                            <div className='flex flex-col md:flex-row md:items-center gap-2'>
-                                <div className='w-full relative'>
-                                    <select className='w-full p-2'>
+                            <div className='flex flex-col xs:flex-row md:items-center gap-2'>
+                                <div className='w-full h-10 relative overflow-hidden rounded-md'>
+                                    <select name='custom_template' value={values.custom_id} onChange={handleValueChange} className='w-full h-full p-2 appearance-none dark:bg-transparent border-0 dark:border-1 border-white ring-0 outline-none'>
                                         <option value=''>None</option>
+                                        {customTemplates && customTemplates.map(item => (
+                                            <option key={item?.custom_id} value={item?.custom_id}>{`${item?.custom_id}-${item?.provision_name}`}</option>
+                                        ))}
                                     </select>
                                     <FaCaretDown className='text-base absolute top-1/2 -translate-y-1/2 right-2' />
                                 </div>
-                                <button>Update</button>
+                                <button name='custom_template' onClick={handleUpdateTemplate} disabled={(reqStatus.loading || !values.custom_id)} className={`rounded-md p-2 bg-primary text-white text-center ${(reqStatus.loading || !values.custom_id) && 'opacity-50'}`}>Update</button>
                             </div>
-
+                            {(reqStatus.type == 'custom_template' && (reqStatus.error || reqStatus.success)) &&
+                                <p className={`p-2 mt-4 ${reqStatus.success ? 'text-emerald-500' : 'text-red-500'}`}>{reqStatus.success ? 'Template updated' : 'Unable to complete request, try again'}</p>
+                            }
                         </div>
                     </div>
                 </>
             }
-
-
         </div>
     )
 }
\ No newline at end of file
diff --git a/src/services/siteServices.js b/src/services/siteServices.js
index 11c4bc8..1e4e790 100644
--- a/src/services/siteServices.js
+++ b/src/services/siteServices.js
@@ -104,6 +104,22 @@ export const getProductsTemplate = (reqData) => {
     return getAuxEnd(`/products-templates`, postData)
 }
 
+// FUNCTION TO UPDATE TEMPLATE
+export const updateTemplate = (reqData) => {
+    let postData = {
+        ...reqData
+    }
+    return postAuxEnd('/template/set-template', postData, false)
+}
+
+// FUNCTION TO ADD CUSTOM TEMPLATE
+export const addCustomTemplate = (reqData) => {
+    let postData = {
+        ...reqData
+    }
+    return postAuxEnd('/template/custom-add', postData, false)
+}
+
 // FUNCTION TO GET CUSTOM TEMPLATE DATA
 export const getCustomTemplate = (reqData) => {
     const postData = { ...reqData }