Internal: Improve terms & conditions DB structure - refs #7172

assets/vue/services/legalService.js

@@ -9,29 +9,42 @@ const legalExtensions = {
     })
     return fetch(`${ENTRYPOINT}legals?${params.toString()}`)
   },
+
+  async findLatestByLanguage(languageId) {
+    const params = new URLSearchParams({
+      languageId: languageId,
+      "order[version]": "desc",
+      itemsPerPage: "1",
+    })
+    return fetch(`${ENTRYPOINT}legals?${params.toString()}`)
+  },
+
+  async findByLanguageAndVersion(languageId, version) {
+    const params = new URLSearchParams({
+      languageId: languageId,
+      version: version,
+      "order[type]": "asc",
+      itemsPerPage: "50",
+    })
+    return fetch(`${ENTRYPOINT}legals?${params.toString()}`)
+  },
+
+  async findAllType0() {
+    const params = new URLSearchParams({
+      type: "0",
+      "order[version]": "desc",
+      itemsPerPage: "50",
+    })
+    return fetch(`${ENTRYPOINT}legals?${params.toString()}`)
+  },
+
   async saveOrUpdateLegal(payload) {
-    console.log("Saving or updating legal terms")
     return fetch(`/legal/save`, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
+      headers: { "Content-Type": "application/json" },
       body: JSON.stringify(payload),
     })
   },
-  async fetchExtraFields(termId = null) {
-    try {
-      const url = termId ? `/legal/extra-fields?termId=${termId}` : `/legal/extra-fields`
-      const response = await fetch(url)
-      if (!response.ok) {
-        throw new Error("Network response was not ok")
-      }
-      return await response.json()
-    } catch (error) {
-      console.error("Error loading extra fields:", error)
-      throw error
-    }
-  },
 }
 
 export default makeService("legals", legalExtensions)

assets/vue/services/socialService.js

@@ -43,11 +43,21 @@ export default {
     }
   },
 
-  async fetchTermsAndConditions(userId) {
+  async fetchTermsAndConditions(userId, { accepted = false } = {}) {
     try {
-      const response = await axios.get(`${API_URL}/terms-and-conditions/${userId}`)
-
-      return response.data.terms
+      const url = accepted
+        ? `${API_URL}/terms-and-conditions/${userId}?accepted=1`
+        : `${API_URL}/terms-and-conditions/${userId}`
+
+      const response = await axios.get(url)
+
+      return {
+        items: response.data?.terms ?? [],
+        date_text: response.data?.date_text ?? "",
+        version: response.data?.version ?? null,
+        language_id: response.data?.language_id ?? null,
+        showing_accepted: response.data?.showing_accepted ?? false,
+      }
     } catch (error) {
       console.error("Error fetching terms and conditions:", error)
       throw error

assets/vue/views/terms/Terms.vue

@@ -2,10 +2,15 @@
   <div class="terms">
     <div v-if="!isLoading">
       <div
-        v-for="(item, index) in term"
+        v-for="(item, index) in term.items"
         :key="index"
       >
         <h3>{{ item.title }}</h3>
+        <p
+          v-if="item.subtitle"
+          class="small"
+          v-text="item.subtitle"
+        ></p>
         <div v-html="item.content"></div>
       </div>
       <p class="small mt-4 mb-4">{{ term.date_text }}</p>
@@ -44,7 +49,7 @@ import socialService from "../../services/socialService"
 
 const { t } = useI18n()
 
-const term = ref({})
+const term = ref({ items: [], date_text: "" })
 const accepted = ref(false)
 const acceptanceDate = ref(null)
 const blockButton = ref(false)
@@ -87,8 +92,7 @@ const acceptTerms = async () => {
   try {
     const userId = securityStore.user.id
     await socialService.submitAcceptTerm(userId)
-    accepted.value = true
-    acceptanceDate.value = new Date().toLocaleDateString()
+    await checkAcceptance()
   } catch (error) {
     console.error("Error accepting terms:", error)
   }
@@ -98,8 +102,7 @@ const revokeAcceptance = async () => {
   try {
     const userId = securityStore.user.id
     await socialService.revokeAcceptTerm(userId)
-    accepted.value = false
-    acceptanceDate.value = null
+    await checkAcceptance()
   } catch (error) {
     console.error("Error revoking acceptance:", error)
   }