Bläddra i källkod

Merge branch 'feature/updates_subscription_page' into develop

Olivier Massot 3 år sedan
förälder
incheckning
f79cc80811

+ 14 - 15
pages/subscription.vue

@@ -24,11 +24,10 @@ Page 'Mon abonnement'
                   </tr>
                   <tr v-if="dolibarrAccount && dolibarrAccount.contract">
                     <td>{{ $t('services') }}</td>
-                    <td>
+                    <td class="py-2">
                       <div
                         v-for="line in dolibarrAccount.contract.lines"
                         :key="line.id"
-                        style="list-style: none;"
                       >
                         {{ line.serviceLabel }}
                       </div>
@@ -66,7 +65,7 @@ Page 'Mon abonnement'
                     <td>{{ bill.ref }}</td>
                     <td>{{ $moment(bill.date).format($moment.localeData($i18n.locale).longDateFormat('L')) }}</td>
                     <td>{{ bill.taxExcludedAmount.toLocaleString($i18n.locale, { style: 'currency', currency: 'EUR' }) }}</td>
-                    <td>{{ bill.status === 1 ? $t('paid') : $t('unpaid') }}</td>
+                    <td>{{ bill.paid === true ? $t('paid') : $t('unpaid') }}</td>
                   </tr>
                 </tbody>
               </v-simple-table>
@@ -138,18 +137,18 @@ Page 'Mon abonnement'
                         </div>
 
                         <p class="mt-3">
-                          <a href="https://www.opentalent.fr/uploads/opentalent/ficheproduit_Opentalentartist.pdf" target="_blank">
+                          <a href="/resources/ficheproduit_Opentalentartist.pdf" target="_blank">
                             {{ $t('product_sheet') }} {{ $t('PRODUCT_ARTIST_PREMIUM') }}
                           </a>
                         </p>
 
                         <p v-if="organizationProfile.isCmf()" class="mt-3">
-                          <a href="">
+                          <a href="/resources/BDC_Artist_Premium_CMF.pdf">
                             <b>{{ $t('download_cmf_order_form') }}</b>
                           </a>
                         </p>
                         <p v-else class="mt-3">
-                          <a href="">
+                          <a href="/resources/BDC_Artist_Premium_Public.pdf">
                             <b>{{ $t('download_order_form') }}</b>
                           </a>
                         </p>
@@ -183,7 +182,7 @@ Page 'Mon abonnement'
                         </div>
 
                         <p class="mt-4">
-                          <a href="https://www.opentalent.fr/uploads/opentalent/ficheproduit_Opentalentschool" target="_blank">
+                          <a href="/resources/ficheproduit_Opentalentschool.pdf" target="_blank">
                             {{ $t('product_sheet') }} {{ $t('PRODUCT_SCHOOL') }}
                           </a>
                         </p>
@@ -205,7 +204,7 @@ Page 'Mon abonnement'
 
                           <p>
                             <b>
-                              <a href="https://www.opentalent.fr/uploads/opentalent/Bon_commande_SMS_ouverture-CMF.pdf" target="_blank">
+                              <a href="/resources/BDC_SMS_CMF.pdf" target="_blank">
                                 {{ $t('download_cmf_order_form') }}
                               </a>
                             </b>
@@ -217,7 +216,7 @@ Page 'Mon abonnement'
                           <p><i>* {{ $t('for_x_sms', { amount: '5000' }) }}</i></p>
 
                           <p>
-                            <a href="https://www.opentalent.fr/uploads/opentalent/Bon_commande_SMS_ouverture-public.pdf" target="_blank">
+                            <a href="/resources/BDC_SMS_Public.pdf" target="_blank">
                               <b>{{ $t('download_order_form') }}</b>
                             </a>
                           </p>
@@ -249,6 +248,12 @@ Page 'Mon abonnement'
                             </tr>
                           </tbody>
                         </table>
+
+                        <p>
+                          <a href="/resources/BDC_Nom_de_domaine.pdf" target="_blank">
+                            <b>{{ $t('download_order_form') }}</b>
+                          </a>
+                        </p>
                       </td>
                     </tr>
                   </tbody>
@@ -267,7 +272,6 @@ import { defineComponent, useFetch, useContext, ref, Ref } from '@nuxtjs/composi
 import { $organizationProfile } from '~/services/profile/organizationProfile'
 import { QUERY_TYPE } from '~/types/enums'
 import { ApiResponse, DolibarrAccount } from '~/types/interfaces'
-import {trimEnd} from "lodash";
 
 export default defineComponent({
   name: 'Subscription',
@@ -277,11 +281,6 @@ export default defineComponent({
     const id: number = store.state.profile.organization.id
     const dolibarrAccount: Ref<DolibarrAccount | null> = ref(null)
 
-    console.log(organizationProfile.value)
-    console.log(organizationProfile.value.isArtist())
-    console.log(organizationProfile.value.isArtistProduct())
-
-
     // fetch the dolibarr account's data
     const { fetchState } = useFetch(async () => {
       try {

BIN
static/resources/BDC_Achat_SMS_CMF.pdf


BIN
static/resources/BDC_Achat_SMS_Public.pdf


BIN
static/resources/BDC_Artist_Premium_CMF.pdf


BIN
static/resources/BDC_Artist_Premium_Public.pdf


BIN
static/resources/BDC_Nom_de_domaine.pdf


BIN
static/resources/BDC_SMS_CMF.pdf


BIN
static/resources/BDC_SMS_Public.pdf


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 24 - 0
static/resources/ficheproduit_Opentalentartist.pdf


BIN
static/resources/ficheproduit_Opentalentschool.pdf


Vissa filer visades inte eftersom för många filer har ändrats