nodebb-plugin-onekite-calendar 2.0.89 → 2.0.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/admin.js +2 -0
  2. package/lib/api.js +2 -0
  3. package/lib/scheduler.js +1 -0
  4. package/package.json +1 -1
  5. package/templates/emails/calendar-onekite_approved.tpl +10 -5
  6. package/templates/emails/calendar-onekite_reminder.tpl +10 -5
package/lib/admin.js CHANGED
@@ -17,6 +17,7 @@ const {
17
17
  calendarDaysExclusiveYmd,
18
18
  yearFromTs,
19
19
  autoFormSlugForYear,
20
+ forumBaseUrl,
20
21
  } = shared;
21
22
 
22
23
  const dbLayer = require('./db');
@@ -213,6 +214,7 @@ admin.approveReservation = async function (req, res) {
213
214
  itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
214
215
  dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
215
216
  paymentUrl: paymentUrl || '',
217
+ calendarUrl: `${forumBaseUrl()}/calendar`,
216
218
  pickupAddress: r.pickupAddress || '',
217
219
  notes: r.notes || '',
218
220
  pickupTime: r.pickupTime || '',
package/lib/api.js CHANGED
@@ -1653,6 +1653,7 @@ api.createReservation = async function (req, res) {
1653
1653
  pickupLon: '',
1654
1654
  mapUrl: '',
1655
1655
  paymentUrl: resv.paymentUrl || '',
1656
+ calendarUrl: `${forumBaseUrl()}/calendar`,
1656
1657
  validatedBy: creatorUsername || '',
1657
1658
  validatedByUrl: creatorUsername ? `${forumBaseUrl()}/user/${encodeURIComponent(String(creatorUsername))}` : '',
1658
1659
  ...buildCalendarLinks({
@@ -1889,6 +1890,7 @@ api.approveReservation = async function (req, res) {
1889
1890
  pickupLon: r.pickupLon || '',
1890
1891
  mapUrl,
1891
1892
  paymentUrl: r.paymentUrl || '',
1893
+ calendarUrl: `${forumBaseUrl()}/calendar`,
1892
1894
  ...buildCalendarLinks({
1893
1895
  type: 'reservation',
1894
1896
  id: String(r.rid),
package/lib/scheduler.js CHANGED
@@ -253,6 +253,7 @@ async function processAwaitingPayment(preIds, preReservations) {
253
253
  itemNames: arrayifyNames(r),
254
254
  dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
255
255
  paymentUrl: r.paymentUrl || '',
256
+ calendarUrl: `${forumBaseUrl()}/calendar`,
256
257
  delayMinutes: holdMins,
257
258
  pickupLine: r.pickupTime ? (r.adminNote ? `${r.pickupTime} à ${r.adminNote}` : r.pickupTime) : '',
258
259
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nodebb-plugin-onekite-calendar",
3
- "version": "2.0.89",
3
+ "version": "2.0.90",
4
4
  "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
5
5
  "main": "library.js",
6
6
  "license": "MIT",
package/templates/emails/calendar-onekite_approved.tpl CHANGED
@@ -40,11 +40,16 @@
40
40
  <p><strong>Notes :</strong><br>{notes}</p>
41
41
  <!-- ENDIF notes -->
42
42
 
43
- <!-- IF paymentUrl -->
43
+ <!-- IF calendarUrl -->
44
44
  <p>
45
- <a href="{paymentUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
46
- Payer maintenant
45
+ <a href="{calendarUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
46
+ Accéder au calendrier pour payer
47
47
  </a>
48
48
  </p>
49
- <p style="font-size: 12px; color: #666;">Si le bouton ne fonctionne pas, utilisez ce lien : <a href="{paymentUrl}">{paymentUrl}</a></p>
50
- <!-- ENDIF paymentUrl -->
49
+ <p style="font-size: 12px; color: #666;">
50
+ Sur le calendrier, cliquez sur votre réservation puis sur le bouton <strong>« Payer maintenant »</strong>.
51
+ <!-- IF paymentUrl -->
52
+ <br>Vous pouvez aussi payer directement via ce lien (valable quelques heures) : <a href="{paymentUrl}">{paymentUrl}</a>
53
+ <!-- ENDIF paymentUrl -->
54
+ </p>
55
+ <!-- ENDIF calendarUrl -->
package/templates/emails/calendar-onekite_reminder.tpl CHANGED
@@ -10,11 +10,16 @@
10
10
 
11
11
  <p>{dateRange}</p>
12
12
 
13
- <!-- IF paymentUrl -->
13
+ <!-- IF calendarUrl -->
14
14
  <p>
15
- <a href="{paymentUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
16
- Payer maintenant
15
+ <a href="{calendarUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
16
+ Accéder au calendrier pour payer
17
17
  </a>
18
18
  </p>
19
- <p style="font-size: 12px; color: #666;">Si le bouton ne fonctionne pas, utilisez ce lien : <a href="{paymentUrl}">{paymentUrl}</a></p>
20
- <!-- ENDIF paymentUrl -->
19
+ <p style="font-size: 12px; color: #666;">
20
+ Sur le calendrier, cliquez sur votre réservation puis sur le bouton <strong>« Payer maintenant »</strong>.
21
+ <!-- IF paymentUrl -->
22
+ <br>Vous pouvez aussi payer directement via ce lien (valable quelques heures) : <a href="{paymentUrl}">{paymentUrl}</a>
23
+ <!-- ENDIF paymentUrl -->
24
+ </p>
25
+ <!-- ENDIF calendarUrl -->