From bef7095be3e13279127a924bcc32c220457248f5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 14:38:38 +0530
Subject: [PATCH 01/31] feat: Billing & Plans settings page

---
 frontend/src/components/Icons/UpgradeIcon.vue | 22 +++++++++++++++++++
 frontend/src/components/Icons/WalletsIcon.vue | 20 +++++++++++++++++
 .../src/components/Settings/SettingsModal.vue | 21 ++++++++++++++++--
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/components/Icons/UpgradeIcon.vue
 create mode 100644 frontend/src/components/Icons/WalletsIcon.vue

diff --git a/frontend/src/components/Icons/UpgradeIcon.vue b/frontend/src/components/Icons/UpgradeIcon.vue
new file mode 100644
index 00000000..74212e7e
--- /dev/null
+++ b/frontend/src/components/Icons/UpgradeIcon.vue
@@ -0,0 +1,22 @@
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="16"
+    height="16"
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="1.5"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    class="lucide lucide-circle-fading-arrow-up"
+  >
+    <path d="M12 2a10 10 0 0 1 7.38 16.75" />
+    <path d="m16 12-4-4-4 4" />
+    <path d="M12 16V8" />
+    <path d="M2.5 8.875a10 10 0 0 0-.5 3" />
+    <path d="M2.83 16a10 10 0 0 0 2.43 3.4" />
+    <path d="M4.636 5.235a10 10 0 0 1 .891-.857" />
+    <path d="M8.644 21.42a10 10 0 0 0 7.631-.38" />
+  </svg>
+</template>
diff --git a/frontend/src/components/Icons/WalletsIcon.vue b/frontend/src/components/Icons/WalletsIcon.vue
new file mode 100644
index 00000000..a3d814cc
--- /dev/null
+++ b/frontend/src/components/Icons/WalletsIcon.vue
@@ -0,0 +1,20 @@
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="16"
+    height="16"
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="1.5"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    class="lucide lucide-wallet-cards"
+  >
+    <rect width="18" height="18" x="3" y="3" rx="2" />
+    <path d="M3 9a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2" />
+    <path
+      d="M3 11h3c.8 0 1.6.3 2.1.9l1.1.9c1.6 1.6 4.1 1.6 5.7 0l1.1-.9c.5-.5 1.3-.9 2.1-.9H21"
+    />
+  </svg>
+</template>
diff --git a/frontend/src/components/Settings/SettingsModal.vue b/frontend/src/components/Settings/SettingsModal.vue
index 2bbe9922..18cd66b8 100644
--- a/frontend/src/components/Settings/SettingsModal.vue
+++ b/frontend/src/components/Settings/SettingsModal.vue
@@ -41,6 +41,8 @@ import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import WhatsAppIcon from '@/components/Icons/WhatsAppIcon.vue'
 import ERPNextIcon from '@/components/Icons/ERPNextIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
+import UpgradeIcon from '@/components/Icons/UpgradeIcon.vue'
+import WalletsIcon from '@/components/Icons/WalletsIcon.vue'
 import InviteMemberPage from '@/components/Settings/InviteMemberPage.vue'
 import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
 import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
@@ -48,8 +50,8 @@ import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue'
 import TwilioSettings from '@/components/Settings/TwilioSettings.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import { isWhatsappInstalled } from '@/composables/settings'
-import { Dialog } from 'frappe-ui'
-import { ref, markRaw, computed, h } from 'vue'
+import { Dialog, Plans, Billing } from 'frappe-ui'
+import { ref, markRaw, computed } from 'vue'
 
 const show = defineModel()
 
@@ -71,6 +73,21 @@ const tabs = computed(() => {
         },
       ],
     },
+    {
+      label: __('Subscription'),
+      items: [
+        {
+          label: 'Plans',
+          icon: UpgradeIcon,
+          component: markRaw(Plans),
+        },
+        {
+          label: 'Billing',
+          icon: WalletsIcon,
+          component: markRaw(Billing),
+        },
+      ],
+    },
     {
       label: __('Integrations'),
       items: [

From de4464cdaaf06b7b3bf89738482eb66f615d764f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 15:43:08 +0530
Subject: [PATCH 02/31] fix: added subscription_conf & telemetry_site_age in
 boot

---
 crm/www/crm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crm/www/crm.py b/crm/www/crm.py
index 22b2ed58..6ea1b92f 100644
--- a/crm/www/crm.py
+++ b/crm/www/crm.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.boot import add_subscription_conf
 from frappe.utils.telemetry import capture
 
 no_cache = 1
@@ -32,6 +33,8 @@ def get_boot():
             "site_name": frappe.local.site,
             "read_only_mode": frappe.flags.read_only,
             "csrf_token": frappe.sessions.get_csrf_token(),
+            "telemetry_site_age": frappe.utils.telemetry.site_age(),
+            "subscription_conf": add_subscription_conf(),
         }
     )
 

From f12ad4ba282308170a87c745f2eb9d2da98a8be7 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 15:43:32 +0530
Subject: [PATCH 03/31] fix: added TrialBanner in AppsSidebar

---
 frontend/src/components/Layouts/AppSidebar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 1c0a017a..ca57b2fc 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -74,6 +74,7 @@
         </Section>
       </div>
     </div>
+    <TrialBanner :isSidebarCollapsed="isSidebarCollapsed" />
     <div class="m-2 flex flex-col gap-1">
       <SidebarLink
         :label="isSidebarCollapsed ? __('Expand') : __('Collapse')"
@@ -113,7 +114,7 @@ import SidebarLink from '@/components/SidebarLink.vue'
 import Notifications from '@/components/Notifications.vue'
 import { viewsStore } from '@/stores/views'
 import { notificationsStore } from '@/stores/notifications'
-import { FeatherIcon } from 'frappe-ui'
+import { FeatherIcon, TrialBanner } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'
 import { computed, h } from 'vue'
 

From 83de0a6b4c25c7d4d1129975a10e380a4c5d774a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 17:00:19 +0530
Subject: [PATCH 04/31] fix: show billing setting page on click of banner
 button

---
 frontend/src/App.vue                          | 10 ++++---
 .../src/components/Layouts/AppSidebar.vue     | 11 +++++++-
 .../src/components/Settings/SettingsModal.vue | 28 +++++++++++++++----
 frontend/src/components/UserDropdown.vue      |  5 +---
 frontend/src/composables/settings.js          |  3 ++
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 61e774c9..d523281a 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,21 +2,23 @@
   <Layout v-if="session().isLoggedIn">
     <router-view />
   </Layout>
+  <SettingsModal />
   <Dialogs />
   <Toasts />
 </template>
 
 <script setup>
+import SettingsModal from '@/components/Settings/SettingsModal.vue'
 import { Dialogs } from '@/utils/dialogs'
 import { sessionStore as session } from '@/stores/session'
 import { Toasts } from 'frappe-ui'
 import { computed, defineAsyncComponent } from 'vue'
 
-const MobileLayout = defineAsyncComponent(() =>
-  import('./components/Layouts/MobileLayout.vue')
+const MobileLayout = defineAsyncComponent(
+  () => import('./components/Layouts/MobileLayout.vue'),
 )
-const DesktopLayout = defineAsyncComponent(() =>
-  import('./components/Layouts/DesktopLayout.vue')
+const DesktopLayout = defineAsyncComponent(
+  () => import('./components/Layouts/DesktopLayout.vue'),
 )
 const Layout = computed(() => {
   if (window.innerWidth < 640) {
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index ca57b2fc..75bedeab 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -74,7 +74,10 @@
         </Section>
       </div>
     </div>
-    <TrialBanner :isSidebarCollapsed="isSidebarCollapsed" />
+    <TrialBanner
+      :isSidebarCollapsed="isSidebarCollapsed"
+      @upgradePlan="showBillingSettingPage"
+    />
     <div class="m-2 flex flex-col gap-1">
       <SidebarLink
         :label="isSidebarCollapsed ? __('Expand') : __('Collapse')"
@@ -114,6 +117,7 @@ import SidebarLink from '@/components/SidebarLink.vue'
 import Notifications from '@/components/Notifications.vue'
 import { viewsStore } from '@/stores/views'
 import { notificationsStore } from '@/stores/notifications'
+import { showSettingsModal, activeSettingsPage } from '@/composables/settings'
 import { FeatherIcon, TrialBanner } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'
 import { computed, h } from 'vue'
@@ -227,4 +231,9 @@ function getIcon(routeName, icon) {
       return PinIcon
   }
 }
+
+function showBillingSettingPage() {
+  showSettingsModal.value = true
+  activeSettingsPage.value = 'Billing'
+}
 </script>
diff --git a/frontend/src/components/Settings/SettingsModal.vue b/frontend/src/components/Settings/SettingsModal.vue
index 18cd66b8..81c4fe8c 100644
--- a/frontend/src/components/Settings/SettingsModal.vue
+++ b/frontend/src/components/Settings/SettingsModal.vue
@@ -1,5 +1,9 @@
 <template>
-  <Dialog v-model="show" :options="{ size: '5xl' }">
+  <Dialog
+    v-model="showSettingsModal"
+    :options="{ size: '5xl' }"
+    @close="activeSettingsPage = ''"
+  >
     <template #body>
       <div class="flex h-[calc(100vh_-_8rem)]">
         <div class="flex w-52 shrink-0 flex-col bg-gray-50 p-2">
@@ -49,11 +53,13 @@ import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
 import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue'
 import TwilioSettings from '@/components/Settings/TwilioSettings.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
-import { isWhatsappInstalled } from '@/composables/settings'
+import {
+  isWhatsappInstalled,
+  showSettingsModal,
+  activeSettingsPage,
+} from '@/composables/settings'
 import { Dialog, Plans, Billing } from 'frappe-ui'
-import { ref, markRaw, computed } from 'vue'
-
-const show = defineModel()
+import { ref, markRaw, computed, watch } from 'vue'
 
 const tabs = computed(() => {
   let _tabs = [
@@ -123,4 +129,16 @@ const tabs = computed(() => {
 })
 
 const activeTab = ref(tabs.value[0].items[0])
+
+function setActiveTab(tabName) {
+  activeTab.value =
+    (tabName &&
+      tabs.value
+        .map((tab) => tab.items)
+        .flat()
+        .find((tab) => tab.label === tabName)) ||
+    tabs.value[0].items[0]
+}
+
+watch(activeSettingsPage, (activePage) => setActiveTab(activePage))
 </script>
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index cf5bf263..64d799fa 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -44,15 +44,14 @@
       </button>
     </template>
   </Dropdown>
-  <SettingsModal v-if="showSettingsModal" v-model="showSettingsModal" />
 </template>
 
 <script setup>
-import SettingsModal from '@/components/Settings/SettingsModal.vue'
 import CRMLogo from '@/components/Icons/CRMLogo.vue'
 import Apps from '@/components/Apps.vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
+import { showSettingsModal } from '@/composables/settings'
 import { Dropdown } from 'frappe-ui'
 import { computed, ref, markRaw} from 'vue'
 
@@ -68,8 +67,6 @@ const { getUser } = usersStore()
 
 const user = computed(() => getUser() || {})
 
-const showSettingsModal = ref(false)
-
 let dropdownOptions = ref([
   {
     group: 'Manage',
diff --git a/frontend/src/composables/settings.js b/frontend/src/composables/settings.js
index 53022bc2..1fc6ea3f 100644
--- a/frontend/src/composables/settings.js
+++ b/frontend/src/composables/settings.js
@@ -33,3 +33,6 @@ createResource({
 export const mobileSidebarOpened = ref(false)
 
 export const isMobileView = computed(() => window.innerWidth < 768)
+
+export const showSettingsModal = ref(false)
+export const activeSettingsPage = ref('')
\ No newline at end of file

From 2d7032f4eddf0d77cda478504a326e871fa0be12 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 17:09:58 +0530
Subject: [PATCH 05/31] chore: renamed SettingsModal to Settings and moved it
 to AppSidebar

---
 frontend/src/App.vue                                        | 2 --
 frontend/src/components/Layouts/AppSidebar.vue              | 6 ++++--
 .../components/Settings/{SettingsModal.vue => Settings.vue} | 4 ++--
 frontend/src/components/UserDropdown.vue                    | 6 +++---
 frontend/src/composables/settings.js                        | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename frontend/src/components/Settings/{SettingsModal.vue => Settings.vue} (98%)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d523281a..b735b073 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,13 +2,11 @@
   <Layout v-if="session().isLoggedIn">
     <router-view />
   </Layout>
-  <SettingsModal />
   <Dialogs />
   <Toasts />
 </template>
 
 <script setup>
-import SettingsModal from '@/components/Settings/SettingsModal.vue'
 import { Dialogs } from '@/utils/dialogs'
 import { sessionStore as session } from '@/stores/session'
 import { Toasts } from 'frappe-ui'
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 75bedeab..723ac60a 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -96,6 +96,7 @@
       </SidebarLink>
     </div>
     <Notifications />
+    <Settings />
   </div>
 </template>
 
@@ -115,9 +116,10 @@ import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
 import NotificationsIcon from '@/components/Icons/NotificationsIcon.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import Notifications from '@/components/Notifications.vue'
+import Settings from '@/components/Settings/Settings.vue'
 import { viewsStore } from '@/stores/views'
 import { notificationsStore } from '@/stores/notifications'
-import { showSettingsModal, activeSettingsPage } from '@/composables/settings'
+import { showSettings, activeSettingsPage } from '@/composables/settings'
 import { FeatherIcon, TrialBanner } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'
 import { computed, h } from 'vue'
@@ -233,7 +235,7 @@ function getIcon(routeName, icon) {
 }
 
 function showBillingSettingPage() {
-  showSettingsModal.value = true
+  showSettings.value = true
   activeSettingsPage.value = 'Billing'
 }
 </script>
diff --git a/frontend/src/components/Settings/SettingsModal.vue b/frontend/src/components/Settings/Settings.vue
similarity index 98%
rename from frontend/src/components/Settings/SettingsModal.vue
rename to frontend/src/components/Settings/Settings.vue
index 81c4fe8c..24a58a3e 100644
--- a/frontend/src/components/Settings/SettingsModal.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog
-    v-model="showSettingsModal"
+    v-model="showSettings"
     :options="{ size: '5xl' }"
     @close="activeSettingsPage = ''"
   >
@@ -55,7 +55,7 @@ import TwilioSettings from '@/components/Settings/TwilioSettings.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import {
   isWhatsappInstalled,
-  showSettingsModal,
+  showSettings,
   activeSettingsPage,
 } from '@/composables/settings'
 import { Dialog, Plans, Billing } from 'frappe-ui'
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 64d799fa..98b80736 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -51,9 +51,9 @@ import CRMLogo from '@/components/Icons/CRMLogo.vue'
 import Apps from '@/components/Apps.vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
-import { showSettingsModal } from '@/composables/settings'
+import { showSettings } from '@/composables/settings'
 import { Dropdown } from 'frappe-ui'
-import { computed, ref, markRaw} from 'vue'
+import { computed, ref, markRaw } from 'vue'
 
 const props = defineProps({
   isCollapsed: {
@@ -94,7 +94,7 @@ let dropdownOptions = ref([
       {
         icon: 'settings',
         label: computed(() => __('Settings')),
-        onClick: () => (showSettingsModal.value = true),
+        onClick: () => (showSettings.value = true),
       },
       {
         icon: 'log-out',
diff --git a/frontend/src/composables/settings.js b/frontend/src/composables/settings.js
index 1fc6ea3f..e4f27c47 100644
--- a/frontend/src/composables/settings.js
+++ b/frontend/src/composables/settings.js
@@ -34,5 +34,5 @@ export const mobileSidebarOpened = ref(false)
 
 export const isMobileView = computed(() => window.innerWidth < 768)
 
-export const showSettingsModal = ref(false)
-export const activeSettingsPage = ref('')
\ No newline at end of file
+export const showSettings = ref(false)
+export const activeSettingsPage = ref('')

From fb6246e1f22eb3af9bbb59e01201d184c2ff07e9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 17:46:40 +0530
Subject: [PATCH 06/31] fix: conditional show/hide settings subscription
 section

---
 frontend/src/components/Settings/Settings.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 24a58a3e..372609a1 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -81,6 +81,7 @@ const tabs = computed(() => {
     },
     {
       label: __('Subscription'),
+      condition: () => window.subscription_conf,
       items: [
         {
           label: 'Plans',
@@ -117,14 +118,15 @@ const tabs = computed(() => {
     },
   ]
 
-  return _tabs.map((tab) => {
-    tab.items = tab.items.filter((item) => {
-      if (item.condition) {
-        return item.condition()
-      }
-      return true
-    })
-    return tab
+  return _tabs.filter((tab) => {
+    if (tab.condition && !tab.condition()) return false
+    if (tab.items) {
+      tab.items = tab.items.filter((item) => {
+        if (item.condition && !item.condition()) return false
+        return true
+      })
+    }
+    return true
   })
 })
 

From 6dc2199a81b6f89fb59e229556df8d6600f2e1c0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 17:56:42 +0530
Subject: [PATCH 07/31] fix: only show Invite Member settings page if manager

---
 frontend/src/components/Settings/Settings.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 372609a1..fa02fb1d 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -53,6 +53,7 @@ import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
 import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue'
 import TwilioSettings from '@/components/Settings/TwilioSettings.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
+import { usersStore } from '@/stores/users'
 import {
   isWhatsappInstalled,
   showSettings,
@@ -61,6 +62,8 @@ import {
 import { Dialog, Plans, Billing } from 'frappe-ui'
 import { ref, markRaw, computed, watch } from 'vue'
 
+const { isManager } = usersStore()
+
 const tabs = computed(() => {
   let _tabs = [
     {
@@ -76,6 +79,7 @@ const tabs = computed(() => {
           label: __('Invite Members'),
           icon: 'user-plus',
           component: markRaw(InviteMemberPage),
+          condition: () => isManager(),
         },
       ],
     },

From e3b4de08261040065458812518914fcbfdd7ee4d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 18:07:34 +0530
Subject: [PATCH 08/31] fix: added setup_complete in boot

---
 crm/www/crm.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crm/www/crm.py b/crm/www/crm.py
index 6ea1b92f..38a6f13a 100644
--- a/crm/www/crm.py
+++ b/crm/www/crm.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.boot import add_subscription_conf
+from frappe.utils import cint
 from frappe.utils.telemetry import capture
 
 no_cache = 1
@@ -35,6 +36,7 @@ def get_boot():
             "csrf_token": frappe.sessions.get_csrf_token(),
             "telemetry_site_age": frappe.utils.telemetry.site_age(),
             "subscription_conf": add_subscription_conf(),
+            "setup_complete": cint(frappe.get_system_settings("setup_complete"))
         }
     )
 

From 62472946333ba5b91ed806c7de245208db2a4744 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 28 Oct 2024 13:01:02 +0530
Subject: [PATCH 09/31] fix: change tab to plans on click if manage plan button
 in current plan component

---
 frontend/src/components/Settings/Settings.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index fa02fb1d..145d49b5 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -60,7 +60,7 @@ import {
   activeSettingsPage,
 } from '@/composables/settings'
 import { Dialog, Plans, Billing } from 'frappe-ui'
-import { ref, markRaw, computed, watch } from 'vue'
+import { ref, markRaw, computed, watch, h } from 'vue'
 
 const { isManager } = usersStore()
 
@@ -95,7 +95,9 @@ const tabs = computed(() => {
         {
           label: 'Billing',
           icon: WalletsIcon,
-          component: markRaw(Billing),
+          component: markRaw(
+            h(Billing, { onChangePlan: () => setActiveTab('Plans') }),
+          ),
         },
       ],
     },

From b78f9ebf9f84d5d7d0fad6d3f4ade15e0589e23d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sat, 2 Nov 2024 13:27:46 +0530
Subject: [PATCH 10/31] fix: change gitmodules for testing

---
 .gitmodules | 3 ++-
 frappe-ui   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index aac084b1..58fe5ef7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "frappe-ui"]
 	path = frappe-ui
-	url = https://github.com/frappe/frappe-ui
+	url = https://github.com/shariquerik/frappe-ui
+	branch = saas-signup
diff --git a/frappe-ui b/frappe-ui
index b2dbd419..88f05c38 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit b2dbd41936905aa46b18d3c22e5d09a7b08a9b98
+Subproject commit 88f05c3877f975652ece45acde4914ae49c3c1fc

From 386ec6471e1c52ea58d8fe59cdf5376cc4ad1d35 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sat, 2 Nov 2024 13:41:38 +0530
Subject: [PATCH 11/31] revert: gitmodule changes

---
 .gitmodules | 3 +--
 frappe-ui   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 58fe5ef7..aac084b1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "frappe-ui"]
 	path = frappe-ui
-	url = https://github.com/shariquerik/frappe-ui
-	branch = saas-signup
+	url = https://github.com/frappe/frappe-ui
diff --git a/frappe-ui b/frappe-ui
index 88f05c38..2e14f0ed 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 88f05c3877f975652ece45acde4914ae49c3c1fc
+Subproject commit 2e14f0edbc6301ad6e728b0556e79f7d2e41d3dc

From 246d0a335f9fadb309a4a98cc6caf1f4be84d13c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sat, 2 Nov 2024 13:48:30 +0530
Subject: [PATCH 12/31] fix: change frappe-ui branch to saas-signup for testing

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 56683963..dc1bca1a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,7 +14,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.71",
+    "frappe-ui": "shariquerik/frappe-ui#saas-signup",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",

From 71406a495cfc0def566c6f61abb9542ea46caf1c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sat, 2 Nov 2024 22:39:06 +0530
Subject: [PATCH 13/31] fix: test api call

---
 frappe-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe-ui b/frappe-ui
index 2e14f0ed..b496da75 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 2e14f0edbc6301ad6e728b0556e79f7d2e41d3dc
+Subproject commit b496da753880dba27223813979f8cee8417bcc90

From 32c4b24a3107414749978f91fd61a22ce5bc755a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 4 Nov 2024 17:55:46 +0530
Subject: [PATCH 14/31] fix: added saas api's to communicate with frappe cloud

---
 crm/api/saas_billing.py                       | 56 +++++++++++++++++++
 crm/www/crm.py                                |  4 +-
 frappe-ui                                     |  2 +-
 .../src/components/Layouts/AppSidebar.vue     |  1 +
 frontend/src/components/Settings/Settings.vue |  9 ++-
 5 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 crm/api/saas_billing.py

diff --git a/crm/api/saas_billing.py b/crm/api/saas_billing.py
new file mode 100644
index 00000000..2601f98f
--- /dev/null
+++ b/crm/api/saas_billing.py
@@ -0,0 +1,56 @@
+import frappe
+import requests
+
+def get_base_url():
+    url = "https://frappecloud.com"
+    if frappe.conf.developer_mode and frappe.conf.get("saas_billing_base_url"):
+        url = frappe.conf.get("saas_billing_base_url")
+    return url
+
+def get_site_name():
+    site_name = frappe.local.site
+    if frappe.conf.developer_mode and frappe.conf.get("saas_billing_site_name"):
+        site_name = frappe.conf.get("saas_billing_site_name")
+    return site_name
+
+def get_headers():
+    # check if user is system manager
+    if frappe.get_roles(frappe.session.user).count("System Manager") == 0:
+        frappe.throw("You are not allowed to access this resource")
+
+    # check if communication secret is set
+    if not frappe.conf.get("fc_communication_secret"):
+        frappe.throw("Communication secret not set")
+
+    return {
+        "X-Site-Token": frappe.conf.get("fc_communication_secret"),
+        "X-Site": get_site_name()
+    }
+
+@frappe.whitelist()
+def generate_access_token():
+    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.auth.generate_access_token", headers=get_headers())
+    if request.status_code == 200:
+        return request.json()["message"]
+    else:
+        frappe.throw("Failed to generate access token")
+
+@frappe.whitelist()
+def is_access_token_valid(token):
+    headers={ 'Content-Type': 'application/json' }
+    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.auth.is_access_token_valid", headers, json={ token })
+    return request.json()["message"]
+
+@frappe.whitelist()
+def current_site_info():
+    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.site.info", headers=get_headers())
+    if request.status_code == 200:
+        return request.json().get("message")
+    else:
+        frappe.throw("Failed to get site info")
+
+@frappe.whitelist()
+def saas_api(method, data={}):
+    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.{method}", headers=get_headers(), json=data)
+    print(request.json())
+    return request.json().get("message")
\ No newline at end of file
diff --git a/crm/www/crm.py b/crm/www/crm.py
index 38a6f13a..be96a45f 100644
--- a/crm/www/crm.py
+++ b/crm/www/crm.py
@@ -3,7 +3,6 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.boot import add_subscription_conf
 from frappe.utils import cint
 from frappe.utils.telemetry import capture
 
@@ -34,8 +33,7 @@ def get_boot():
             "site_name": frappe.local.site,
             "read_only_mode": frappe.flags.read_only,
             "csrf_token": frappe.sessions.get_csrf_token(),
-            "telemetry_site_age": frappe.utils.telemetry.site_age(),
-            "subscription_conf": add_subscription_conf(),
+            "fc_communication_secret": frappe.conf.fc_communication_secret,
             "setup_complete": cint(frappe.get_system_settings("setup_complete"))
         }
     )
diff --git a/frappe-ui b/frappe-ui
index b496da75..519cc536 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit b496da753880dba27223813979f8cee8417bcc90
+Subproject commit 519cc536e720c4e785432084c04be63f450a2d4e
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 723ac60a..a4aa7627 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -75,6 +75,7 @@
       </div>
     </div>
     <TrialBanner
+      baseAPIPath="crm.api.saas_billing"
       :isSidebarCollapsed="isSidebarCollapsed"
       @upgradePlan="showBillingSettingPage"
     />
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 145d49b5..da8e9a3e 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -85,18 +85,21 @@ const tabs = computed(() => {
     },
     {
       label: __('Subscription'),
-      condition: () => window.subscription_conf,
+      condition: () => window.fc_communication_secret && isManager(),
       items: [
         {
           label: 'Plans',
           icon: UpgradeIcon,
-          component: markRaw(Plans),
+          component: markRaw(h(Plans, { baseAPIPath: 'crm.api.saas_billing' })),
         },
         {
           label: 'Billing',
           icon: WalletsIcon,
           component: markRaw(
-            h(Billing, { onChangePlan: () => setActiveTab('Plans') }),
+            h(Billing, {
+              baseAPIPath: 'crm.api.saas_billing',
+              onChangePlan: () => setActiveTab('Plans'),
+            }),
           ),
         },
       ],

From 4d66e04403b94d1277482b0779ddf92714f2b619 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 4 Nov 2024 20:03:17 +0530
Subject: [PATCH 15/31] fix: updated base url

---
 crm/api/saas_billing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/api/saas_billing.py b/crm/api/saas_billing.py
index 2601f98f..6c3a8f94 100644
--- a/crm/api/saas_billing.py
+++ b/crm/api/saas_billing.py
@@ -2,7 +2,7 @@ import frappe
 import requests
 
 def get_base_url():
-    url = "https://frappecloud.com"
+    url = frappe.conf.get("saas_billing_base_url") or "https://frappecloud.com"
     if frappe.conf.developer_mode and frappe.conf.get("saas_billing_base_url"):
         url = frappe.conf.get("saas_billing_base_url")
     return url

From 92521b4e8e1511fcee874a803e7f5d01b61daf6d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 7 Nov 2024 19:19:34 +0530
Subject: [PATCH 16/31] chore: updated frappe-ui

---
 frappe-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe-ui b/frappe-ui
index 519cc536..95e51c41 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 519cc536e720c4e785432084c04be63f450a2d4e
+Subproject commit 95e51c41c498e00633e84b8031b17429738107a1

From c2d771d3c6fa6d54e9c0b73b465df795d45d6753 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 8 Nov 2024 17:17:28 +0530
Subject: [PATCH 17/31] fix: updated Plans & Billing Icon

---
 frappe-ui                                     |  2 +-
 frontend/src/components/Icons/BillingIcon.vue | 16 ++++++++++++++++
 frontend/src/components/Icons/PlansIcon.vue   | 16 ++++++++++++++++
 frontend/src/components/Settings/Settings.vue |  8 ++++----
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/components/Icons/BillingIcon.vue
 create mode 100644 frontend/src/components/Icons/PlansIcon.vue

diff --git a/frappe-ui b/frappe-ui
index 95e51c41..51e68dea 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 95e51c41c498e00633e84b8031b17429738107a1
+Subproject commit 51e68dea9c230533618d8ec4248df2c46cfb138b
diff --git a/frontend/src/components/Icons/BillingIcon.vue b/frontend/src/components/Icons/BillingIcon.vue
new file mode 100644
index 00000000..82c74c7c
--- /dev/null
+++ b/frontend/src/components/Icons/BillingIcon.vue
@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M2.00516 3.89776C2.05637 3.3935 2.48223 3 3 3H13C13.5523 3 14 3.44772 14 4V5.38867H2V4C2 3.96548 2.00175 3.93137 2.00516 3.89776ZM1 6.38867V5.38867V4C1 3.93096 1.0035 3.86275 1.01033 3.79551C1.11275 2.787 1.96447 2 3 2H13C14.1046 2 15 2.89543 15 4V5.38867V6.38867V12C15 13.1046 14.1046 14 13 14H3C1.89543 14 1 13.1046 1 12V6.38867ZM14 6.38867V12C14 12.5523 13.5523 13 13 13H3C2.44772 13 2 12.5523 2 12V6.38867H14Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>
diff --git a/frontend/src/components/Icons/PlansIcon.vue b/frontend/src/components/Icons/PlansIcon.vue
new file mode 100644
index 00000000..a0ac6dbb
--- /dev/null
+++ b/frontend/src/components/Icons/PlansIcon.vue
@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M10.1787 14.1967C9.57127 14.3936 8.92306 14.5 8.25 14.5C4.79822 14.5 2 11.7018 2 8.25C2 5.85176 3.35077 3.76901 5.33301 2.72104V10.4262L4.25346 9.34664C4.05819 9.15138 3.74161 9.15138 3.54635 9.34664C3.35109 9.5419 3.35109 9.85849 3.54635 10.0537L5.47968 11.9871C5.67494 12.1823 5.99153 12.1823 6.18679 11.9871L8.12012 10.0537C8.31538 9.85849 8.31538 9.5419 8.12012 9.34664C7.92486 9.15138 7.60828 9.15138 7.41302 9.34664L6.33301 10.4267V2.41357C6.33301 2.37572 6.3288 2.33886 6.32083 2.30341C6.92842 2.10644 7.57678 2 8.25 2C11.7018 2 14.5 4.79822 14.5 8.25C14.5 10.6484 13.149 12.7313 11.1665 13.7792V6.07358L12.2465 7.15359C12.4418 7.34885 12.7584 7.34885 12.9536 7.15359C13.1489 6.95832 13.1489 6.64174 12.9536 6.44648L11.0203 4.51315C10.9512 4.44411 10.867 4.39948 10.7784 4.37926C10.7417 4.37089 10.7042 4.3667 10.6667 4.3667H10.6665C10.5239 4.3667 10.3952 4.42643 10.3041 4.52226L8.37985 6.44648C8.18458 6.64174 8.18458 6.95832 8.37985 7.15359C8.57511 7.34885 8.89169 7.34885 9.08695 7.15359L10.1665 6.07403V14.0863C10.1665 14.1242 10.1707 14.1612 10.1787 14.1967ZM8.25 15.5C12.2541 15.5 15.5 12.2541 15.5 8.25C15.5 4.24594 12.2541 1 8.25 1C4.24594 1 1 4.24594 1 8.25C1 12.2541 4.24594 15.5 8.25 15.5Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index da8e9a3e..68b12c42 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -45,8 +45,8 @@ import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import WhatsAppIcon from '@/components/Icons/WhatsAppIcon.vue'
 import ERPNextIcon from '@/components/Icons/ERPNextIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
-import UpgradeIcon from '@/components/Icons/UpgradeIcon.vue'
-import WalletsIcon from '@/components/Icons/WalletsIcon.vue'
+import PlansIcon from '@/components/Icons/PlansIcon.vue'
+import BillingIcon from '@/components/Icons/BillingIcon.vue'
 import InviteMemberPage from '@/components/Settings/InviteMemberPage.vue'
 import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
 import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
@@ -89,12 +89,12 @@ const tabs = computed(() => {
       items: [
         {
           label: 'Plans',
-          icon: UpgradeIcon,
+          icon: PlansIcon,
           component: markRaw(h(Plans, { baseAPIPath: 'crm.api.saas_billing' })),
         },
         {
           label: 'Billing',
-          icon: WalletsIcon,
+          icon: BillingIcon,
           component: markRaw(
             h(Billing, {
               baseAPIPath: 'crm.api.saas_billing',

From 90ab32af7f838a013567043203700d5ac1cd7270 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 10 Nov 2024 13:33:20 +0530
Subject: [PATCH 18/31] chore: updated frappe-ui

---
 frappe-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe-ui b/frappe-ui
index 51e68dea..33ae5418 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 51e68dea9c230533618d8ec4248df2c46cfb138b
+Subproject commit 33ae5418149bea6fe163b6e098ea765fda96f4f5

From bfa52fbd6f62026aab9db8c2f9d964a2245e021f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 10 Nov 2024 14:34:47 +0530
Subject: [PATCH 19/31] fix: get token & base url method to download invoice
 from client site

---
 crm/api/saas_billing.py | 8 +++++---
 frappe-ui               | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crm/api/saas_billing.py b/crm/api/saas_billing.py
index 6c3a8f94..9b508bef 100644
--- a/crm/api/saas_billing.py
+++ b/crm/api/saas_billing.py
@@ -28,10 +28,13 @@ def get_headers():
     }
 
 @frappe.whitelist()
-def generate_access_token():
+def get_token_and_base_url():
     request = requests.post(f"{get_base_url()}/api/method/press.saas.api.auth.generate_access_token", headers=get_headers())
     if request.status_code == 200:
-        return request.json()["message"]
+        return {
+            "base_url": get_base_url(),
+            "token": request.json()["message"],
+        }
     else:
         frappe.throw("Failed to generate access token")
 
@@ -52,5 +55,4 @@ def current_site_info():
 @frappe.whitelist()
 def saas_api(method, data={}):
     request = requests.post(f"{get_base_url()}/api/method/press.saas.api.{method}", headers=get_headers(), json=data)
-    print(request.json())
     return request.json().get("message")
\ No newline at end of file
diff --git a/frappe-ui b/frappe-ui
index 33ae5418..526e5f8b 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 33ae5418149bea6fe163b6e098ea765fda96f4f5
+Subproject commit 526e5f8b0651201294fcde4ecb602721bbe83368

From 9083b327f48d8ebcbecf5bd3c8a52b7624700173 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 11 Nov 2024 12:53:15 +0530
Subject: [PATCH 20/31] fix: removed baseAPIPath since fc billing api helper is
 moved to frappe framework

---
 frappe-ui                                      | 2 +-
 frontend/src/components/Layouts/AppSidebar.vue | 1 -
 frontend/src/components/Settings/Settings.vue  | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe-ui b/frappe-ui
index 526e5f8b..b8f44434 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 526e5f8b0651201294fcde4ecb602721bbe83368
+Subproject commit b8f444344d5993dcd12304f53243be9f65f5626e
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index a4aa7627..723ac60a 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -75,7 +75,6 @@
       </div>
     </div>
     <TrialBanner
-      baseAPIPath="crm.api.saas_billing"
       :isSidebarCollapsed="isSidebarCollapsed"
       @upgradePlan="showBillingSettingPage"
     />
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 68b12c42..e8be472a 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -90,14 +90,15 @@ const tabs = computed(() => {
         {
           label: 'Plans',
           icon: PlansIcon,
-          component: markRaw(h(Plans, { baseAPIPath: 'crm.api.saas_billing' })),
+          component: markRaw(
+            h(Plans, { onSuccess: () => setActiveTab('Billing') }),
+          ),
         },
         {
           label: 'Billing',
           icon: BillingIcon,
           component: markRaw(
             h(Billing, {
-              baseAPIPath: 'crm.api.saas_billing',
               onChangePlan: () => setActiveTab('Plans'),
             }),
           ),

From 3e6e2623f0a5852d708fc840a23c77a8a1b33f0d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 11 Nov 2024 13:10:28 +0530
Subject: [PATCH 21/31] fix: do not redirect to billing page on plan change

---
 frontend/src/components/Settings/Settings.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index e8be472a..be977cec 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -90,9 +90,7 @@ const tabs = computed(() => {
         {
           label: 'Plans',
           icon: PlansIcon,
-          component: markRaw(
-            h(Plans, { onSuccess: () => setActiveTab('Billing') }),
-          ),
+          component: markRaw(Plans),
         },
         {
           label: 'Billing',

From 06ccd7b120de6e83ee21a85722040424966a55fd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:29:12 +0530
Subject: [PATCH 22/31] chore: resolved conflict

---
 frontend/src/components/Layouts/AppSidebar.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index a809e681..dbedf399 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -115,7 +115,10 @@ import SidebarLink from '@/components/SidebarLink.vue'
 import Notifications from '@/components/Notifications.vue'
 import Settings from '@/components/Settings/Settings.vue'
 import { viewsStore } from '@/stores/views'
-import { notificationsStore } from '@/stores/notifications'
+import {
+  unreadNotificationsCount,
+  notificationsStore,
+} from '@/stores/notifications'
 import { showSettings, activeSettingsPage } from '@/composables/settings'
 import { FeatherIcon, TrialBanner } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'

From 995dbdf8dfab5bea5d9d5f2c1edeb4bff45ca43c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 11 Nov 2024 13:42:14 +0530
Subject: [PATCH 23/31] fix: removed saas_billing.py since it is moved to
 frappe framework

---
 crm/api/saas_billing.py | 58 -----------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 crm/api/saas_billing.py

diff --git a/crm/api/saas_billing.py b/crm/api/saas_billing.py
deleted file mode 100644
index 9b508bef..00000000
--- a/crm/api/saas_billing.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import frappe
-import requests
-
-def get_base_url():
-    url = frappe.conf.get("saas_billing_base_url") or "https://frappecloud.com"
-    if frappe.conf.developer_mode and frappe.conf.get("saas_billing_base_url"):
-        url = frappe.conf.get("saas_billing_base_url")
-    return url
-
-def get_site_name():
-    site_name = frappe.local.site
-    if frappe.conf.developer_mode and frappe.conf.get("saas_billing_site_name"):
-        site_name = frappe.conf.get("saas_billing_site_name")
-    return site_name
-
-def get_headers():
-    # check if user is system manager
-    if frappe.get_roles(frappe.session.user).count("System Manager") == 0:
-        frappe.throw("You are not allowed to access this resource")
-
-    # check if communication secret is set
-    if not frappe.conf.get("fc_communication_secret"):
-        frappe.throw("Communication secret not set")
-
-    return {
-        "X-Site-Token": frappe.conf.get("fc_communication_secret"),
-        "X-Site": get_site_name()
-    }
-
-@frappe.whitelist()
-def get_token_and_base_url():
-    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.auth.generate_access_token", headers=get_headers())
-    if request.status_code == 200:
-        return {
-            "base_url": get_base_url(),
-            "token": request.json()["message"],
-        }
-    else:
-        frappe.throw("Failed to generate access token")
-
-@frappe.whitelist()
-def is_access_token_valid(token):
-    headers={ 'Content-Type': 'application/json' }
-    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.auth.is_access_token_valid", headers, json={ token })
-    return request.json()["message"]
-
-@frappe.whitelist()
-def current_site_info():
-    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.site.info", headers=get_headers())
-    if request.status_code == 200:
-        return request.json().get("message")
-    else:
-        frappe.throw("Failed to get site info")
-
-@frappe.whitelist()
-def saas_api(method, data={}):
-    request = requests.post(f"{get_base_url()}/api/method/press.saas.api.{method}", headers=get_headers(), json=data)
-    return request.json().get("message")
\ No newline at end of file

From 42c81874a49c4525a0cac6e1c2c7ab5cf0233c8d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 11 Nov 2024 14:50:33 +0530
Subject: [PATCH 24/31] chore: sync frappe-ui

---
 frappe-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe-ui b/frappe-ui
index b8f44434..7586ef29 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit b8f444344d5993dcd12304f53243be9f65f5626e
+Subproject commit 7586ef29ed5e0441d920b6de5eee7b2babc8b985

From 9d30a7a17ec0b599064eee55e907b334b77824ad Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 11 Nov 2024 14:58:22 +0530
Subject: [PATCH 25/31] chore: removed unused icons

---
 frontend/src/components/Icons/UpgradeIcon.vue | 22 -------------------
 frontend/src/components/Icons/WalletsIcon.vue | 20 -----------------
 2 files changed, 42 deletions(-)
 delete mode 100644 frontend/src/components/Icons/UpgradeIcon.vue
 delete mode 100644 frontend/src/components/Icons/WalletsIcon.vue

diff --git a/frontend/src/components/Icons/UpgradeIcon.vue b/frontend/src/components/Icons/UpgradeIcon.vue
deleted file mode 100644
index 74212e7e..00000000
--- a/frontend/src/components/Icons/UpgradeIcon.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="16"
-    height="16"
-    viewBox="0 0 24 24"
-    fill="none"
-    stroke="currentColor"
-    stroke-width="1.5"
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    class="lucide lucide-circle-fading-arrow-up"
-  >
-    <path d="M12 2a10 10 0 0 1 7.38 16.75" />
-    <path d="m16 12-4-4-4 4" />
-    <path d="M12 16V8" />
-    <path d="M2.5 8.875a10 10 0 0 0-.5 3" />
-    <path d="M2.83 16a10 10 0 0 0 2.43 3.4" />
-    <path d="M4.636 5.235a10 10 0 0 1 .891-.857" />
-    <path d="M8.644 21.42a10 10 0 0 0 7.631-.38" />
-  </svg>
-</template>
diff --git a/frontend/src/components/Icons/WalletsIcon.vue b/frontend/src/components/Icons/WalletsIcon.vue
deleted file mode 100644
index a3d814cc..00000000
--- a/frontend/src/components/Icons/WalletsIcon.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="16"
-    height="16"
-    viewBox="0 0 24 24"
-    fill="none"
-    stroke="currentColor"
-    stroke-width="1.5"
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    class="lucide lucide-wallet-cards"
-  >
-    <rect width="18" height="18" x="3" y="3" rx="2" />
-    <path d="M3 9a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2" />
-    <path
-      d="M3 11h3c.8 0 1.6.3 2.1.9l1.1.9c1.6 1.6 4.1 1.6 5.7 0l1.1-.9c.5-.5 1.3-.9 2.1-.9H21"
-    />
-  </svg>
-</template>

From 9aea5973f1d759b17a1045c634246c46c9a144c2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 15 Nov 2024 17:39:15 +0530
Subject: [PATCH 26/31] fix: removed old Billing component from settings page
 and added Billing action button in user dropdown

---
 frontend/src/components/Icons/BillingIcon.vue | 16 ------------
 frontend/src/components/Icons/PlansIcon.vue   | 16 ------------
 .../src/components/Layouts/AppSidebar.vue     | 22 ++++++++--------
 frontend/src/components/Settings/Settings.vue | 26 ++-----------------
 frontend/src/components/UserDropdown.vue      | 10 ++++++-
 5 files changed, 22 insertions(+), 68 deletions(-)
 delete mode 100644 frontend/src/components/Icons/BillingIcon.vue
 delete mode 100644 frontend/src/components/Icons/PlansIcon.vue

diff --git a/frontend/src/components/Icons/BillingIcon.vue b/frontend/src/components/Icons/BillingIcon.vue
deleted file mode 100644
index 82c74c7c..00000000
--- a/frontend/src/components/Icons/BillingIcon.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <svg
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M2.00516 3.89776C2.05637 3.3935 2.48223 3 3 3H13C13.5523 3 14 3.44772 14 4V5.38867H2V4C2 3.96548 2.00175 3.93137 2.00516 3.89776ZM1 6.38867V5.38867V4C1 3.93096 1.0035 3.86275 1.01033 3.79551C1.11275 2.787 1.96447 2 3 2H13C14.1046 2 15 2.89543 15 4V5.38867V6.38867V12C15 13.1046 14.1046 14 13 14H3C1.89543 14 1 13.1046 1 12V6.38867ZM14 6.38867V12C14 12.5523 13.5523 13 13 13H3C2.44772 13 2 12.5523 2 12V6.38867H14Z"
-      fill="currentColor"
-    />
-  </svg>
-</template>
diff --git a/frontend/src/components/Icons/PlansIcon.vue b/frontend/src/components/Icons/PlansIcon.vue
deleted file mode 100644
index a0ac6dbb..00000000
--- a/frontend/src/components/Icons/PlansIcon.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <svg
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M10.1787 14.1967C9.57127 14.3936 8.92306 14.5 8.25 14.5C4.79822 14.5 2 11.7018 2 8.25C2 5.85176 3.35077 3.76901 5.33301 2.72104V10.4262L4.25346 9.34664C4.05819 9.15138 3.74161 9.15138 3.54635 9.34664C3.35109 9.5419 3.35109 9.85849 3.54635 10.0537L5.47968 11.9871C5.67494 12.1823 5.99153 12.1823 6.18679 11.9871L8.12012 10.0537C8.31538 9.85849 8.31538 9.5419 8.12012 9.34664C7.92486 9.15138 7.60828 9.15138 7.41302 9.34664L6.33301 10.4267V2.41357C6.33301 2.37572 6.3288 2.33886 6.32083 2.30341C6.92842 2.10644 7.57678 2 8.25 2C11.7018 2 14.5 4.79822 14.5 8.25C14.5 10.6484 13.149 12.7313 11.1665 13.7792V6.07358L12.2465 7.15359C12.4418 7.34885 12.7584 7.34885 12.9536 7.15359C13.1489 6.95832 13.1489 6.64174 12.9536 6.44648L11.0203 4.51315C10.9512 4.44411 10.867 4.39948 10.7784 4.37926C10.7417 4.37089 10.7042 4.3667 10.6667 4.3667H10.6665C10.5239 4.3667 10.3952 4.42643 10.3041 4.52226L8.37985 6.44648C8.18458 6.64174 8.18458 6.95832 8.37985 7.15359C8.57511 7.34885 8.89169 7.34885 9.08695 7.15359L10.1665 6.07403V14.0863C10.1665 14.1242 10.1707 14.1612 10.1787 14.1967ZM8.25 15.5C12.2541 15.5 15.5 12.2541 15.5 8.25C15.5 4.24594 12.2541 1 8.25 1C4.24594 1 1 4.24594 1 8.25C1 12.2541 4.24594 15.5 8.25 15.5Z"
-      fill="currentColor"
-    />
-  </svg>
-</template>
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index dbedf399..e958952a 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -71,10 +71,7 @@
         </Section>
       </div>
     </div>
-    <TrialBanner
-      :isSidebarCollapsed="isSidebarCollapsed"
-      @upgradePlan="showBillingSettingPage"
-    />
+    <TrialBanner v-if="isFCSite.data" />
     <div class="m-2 flex flex-col gap-1">
       <SidebarLink
         :label="isSidebarCollapsed ? __('Expand') : __('Collapse')"
@@ -119,10 +116,9 @@ import {
   unreadNotificationsCount,
   notificationsStore,
 } from '@/stores/notifications'
-import { showSettings, activeSettingsPage } from '@/composables/settings'
-import { FeatherIcon, TrialBanner } from 'frappe-ui'
+import { FeatherIcon, TrialBanner, createResource } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'
-import { computed, h } from 'vue'
+import { computed, h, provide } from 'vue'
 
 const { getPinnedViews, getPublicViews } = viewsStore()
 const { toggle: toggleNotificationPanel } = notificationsStore()
@@ -234,8 +230,12 @@ function getIcon(routeName, icon) {
   }
 }
 
-function showBillingSettingPage() {
-  showSettings.value = true
-  activeSettingsPage.value = 'Billing'
-}
+const isFCSite = createResource({
+  url: 'frappe.integrations.frappe_providers.frappecloud_billing.is_fc_site',
+  cache: 'isFCSite',
+  auto: true,
+  transform: (data) => Boolean(data),
+})
+
+provide('isFCSite', isFCSite)
 </script>
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index be977cec..16ab8959 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -45,8 +45,6 @@ import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import WhatsAppIcon from '@/components/Icons/WhatsAppIcon.vue'
 import ERPNextIcon from '@/components/Icons/ERPNextIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
-import PlansIcon from '@/components/Icons/PlansIcon.vue'
-import BillingIcon from '@/components/Icons/BillingIcon.vue'
 import InviteMemberPage from '@/components/Settings/InviteMemberPage.vue'
 import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
 import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
@@ -59,8 +57,8 @@ import {
   showSettings,
   activeSettingsPage,
 } from '@/composables/settings'
-import { Dialog, Plans, Billing } from 'frappe-ui'
-import { ref, markRaw, computed, watch, h } from 'vue'
+import { Dialog } from 'frappe-ui'
+import { ref, markRaw, computed, watch } from 'vue'
 
 const { isManager } = usersStore()
 
@@ -83,26 +81,6 @@ const tabs = computed(() => {
         },
       ],
     },
-    {
-      label: __('Subscription'),
-      condition: () => window.fc_communication_secret && isManager(),
-      items: [
-        {
-          label: 'Plans',
-          icon: PlansIcon,
-          component: markRaw(Plans),
-        },
-        {
-          label: 'Billing',
-          icon: BillingIcon,
-          component: markRaw(
-            h(Billing, {
-              onChangePlan: () => setActiveTab('Plans'),
-            }),
-          ),
-        },
-      ],
-    },
     {
       label: __('Integrations'),
       items: [
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 98b80736..25424655 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -53,7 +53,7 @@ import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
 import { showSettings } from '@/composables/settings'
 import { Dropdown } from 'frappe-ui'
-import { computed, ref, markRaw } from 'vue'
+import { computed, ref, markRaw, inject } from 'vue'
 
 const props = defineProps({
   isCollapsed: {
@@ -67,6 +67,8 @@ const { getUser } = usersStore()
 
 const user = computed(() => getUser() || {})
 
+const isFCSite = inject('isFCSite')
+
 let dropdownOptions = ref([
   {
     group: 'Manage',
@@ -91,6 +93,12 @@ let dropdownOptions = ref([
     group: 'Others',
     hideLabel: true,
     items: [
+      {
+        icon: 'credit-card',
+        label: computed(() => __('Billing')),
+        onClick: () => (window.location.href = '/billing'),
+        condition: () => isFCSite.data,
+      },
       {
         icon: 'settings',
         label: computed(() => __('Settings')),

From d1e4f4e0f6c7c03573e34a5b672a32ca406d8629 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 15 Nov 2024 17:48:06 +0530
Subject: [PATCH 27/31] fix: removed fc_communication_secret from boot

---
 crm/www/crm.py        | 1 -
 frappe-ui             | 2 +-
 frontend/package.json | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/crm/www/crm.py b/crm/www/crm.py
index be96a45f..98871d14 100644
--- a/crm/www/crm.py
+++ b/crm/www/crm.py
@@ -33,7 +33,6 @@ def get_boot():
             "site_name": frappe.local.site,
             "read_only_mode": frappe.flags.read_only,
             "csrf_token": frappe.sessions.get_csrf_token(),
-            "fc_communication_secret": frappe.conf.fc_communication_secret,
             "setup_complete": cint(frappe.get_system_settings("setup_complete"))
         }
     )
diff --git a/frappe-ui b/frappe-ui
index 7586ef29..9b480a68 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 7586ef29ed5e0441d920b6de5eee7b2babc8b985
+Subproject commit 9b480a68f561714edd3d49e79d2563f2d1c1f8fd
diff --git a/frontend/package.json b/frontend/package.json
index dc1bca1a..f56aaca6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,7 +14,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "shariquerik/frappe-ui#saas-signup",
+    "frappe-ui": "shariquerik/frappe-ui#trial-banner",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",

From 9f9c9db3d5fd6f85ab99db42c6f22bd36d528dfd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 15 Nov 2024 18:45:12 +0530
Subject: [PATCH 28/31] build(deps): bump frappeui to 0.1.74

---
 frappe-ui             | 2 +-
 frontend/package.json | 2 +-
 yarn.lock             | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/frappe-ui b/frappe-ui
index 9b480a68..ee1e7d91 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 9b480a68f561714edd3d49e79d2563f2d1c1f8fd
+Subproject commit ee1e7d915a3147d387c419cd317d5982d060fd14
diff --git a/frontend/package.json b/frontend/package.json
index f56aaca6..36ac89a8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,7 +14,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "shariquerik/frappe-ui#trial-banner",
+    "frappe-ui": "^0.1.74",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index d336bfe7..ef913b41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3780,11 +3780,6 @@ human-signals@^5.0.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
   integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
-husky@>=6:
-  version "9.1.6"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.6.tgz#e23aa996b6203ab33534bdc82306b0cf2cb07d6c"
-  integrity sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==
-
 iconv-lite@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"

From df6c597c0a6002e37ba256c922745b2f11f880c0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 15 Nov 2024 19:19:33 +0530
Subject: [PATCH 29/31] fix: include typescript in dev dependencies

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 36ac89a8..f0b6c40b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,6 @@
     "socket.io-client": "^4.7.2",
     "sortablejs": "^1.15.0",
     "tailwindcss": "^3.3.3",
-    "vite": "^4.4.9",
     "vue": "^3.4.12",
     "vue-router": "^4.2.2",
     "vuedraggable": "^4.1.0"
@@ -32,6 +31,7 @@
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.5",
+    "typescript": "^5.5.4",
     "vite": "^4.4.9",
     "vite-plugin-pwa": "^0.15.0"
   }

From 66ed9aace33c6ee63c3bd6f0700010829aa4c3bf Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sat, 16 Nov 2024 21:19:08 +0530
Subject: [PATCH 30/31] fix: redirect to /login if logged out

---
 frontend/src/stores/session.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
index 9a5139ab..fdc870dd 100644
--- a/frontend/src/stores/session.js
+++ b/frontend/src/stores/session.js
@@ -35,7 +35,7 @@ export const sessionStore = defineStore('crm-session', () => {
     onSuccess() {
       userResource.reset()
       user.value = null
-      router.replace({ name: 'Home' })
+      window.location.href = '/login?redirect-to=/crm'
     },
   })
 

From 258ae41044e43e1d37422174f9c361e528fbf168 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 18 Nov 2024 17:38:37 +0530
Subject: [PATCH 31/31] fix: removed typescript from devDependencies

---
 frontend/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index f0b6c40b..ecd3f0c9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -31,7 +31,6 @@
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.5",
-    "typescript": "^5.5.4",
     "vite": "^4.4.9",
     "vite-plugin-pwa": "^0.15.0"
   }