💄Better UI
This commit is contained in:
1597
package-lock.json
generated
Normal file
1597
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -565,19 +565,9 @@
|
||||
}
|
||||
|
||||
let rewardName = '';
|
||||
if (contributor.latest_project_order &&
|
||||
contributor.latest_project_order.items &&
|
||||
contributor.latest_project_order.items.length > 0) {
|
||||
|
||||
const items = contributor.latest_project_order.items;
|
||||
|
||||
items.forEach(item => {
|
||||
if (item.reward &&
|
||||
item.reward.title &&
|
||||
item.reward.title.fr) {
|
||||
rewardName += item.reward.title.fr + " & "
|
||||
}
|
||||
});
|
||||
if (contributor.reward) {
|
||||
rewardName = contributor.reward;
|
||||
console.log(rewardName);
|
||||
}
|
||||
|
||||
const avatarUrl = contributor.avatar || 'https://s3-eu-west-1.amazonaws.com/com.ulule.assets/site/build/img/avatars/avatar-blue.png';
|
||||
|
||||
32
server.js
32
server.js
@@ -41,8 +41,8 @@ app.get('/api/ulule/:slug', async (req, res) => {
|
||||
// Formater les données pour notre application
|
||||
const formattedData = {
|
||||
name: projectData.name ?
|
||||
(projectData.name.fr || projectData.name.en || Object.values(projectData.name)[0]) :
|
||||
slug,
|
||||
(projectData.name.fr || projectData.name.en || Object.values(projectData.name)[0]) :
|
||||
slug,
|
||||
amount_raised: projectData.amount_raised || 0,
|
||||
goal: projectData.goal || 0,
|
||||
currency: projectData.currency || "EUR",
|
||||
@@ -151,23 +151,35 @@ app.get('/api/ulule/:slug/supporters', async (req, res) => {
|
||||
|
||||
// Extraire les informations de commande si disponibles
|
||||
let reward = '';
|
||||
let reward_desc = '';
|
||||
let amount = 0;
|
||||
let comment = '';
|
||||
|
||||
if (supporter.latest_project_order && supporter.latest_project_order.items && supporter.latest_project_order.items.length > 0) {
|
||||
// Récupérer la première récompense
|
||||
const firstItem = supporter.latest_project_order.items[0];
|
||||
amount = firstItem.line_total || firstItem.unit_price || 0;
|
||||
amount = firstItem.line_subtotal || firstItem.unit_price || 0;
|
||||
|
||||
if (firstItem.reward.parent && firstItem.reward.parent.delivery) {
|
||||
if (firstItem.reward.parent.delivery.shipping_type == 'physical-delivery') {
|
||||
amount = firstItem.line_subtotal || firstItem.unit_price || 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Récupérer le titre de la récompense
|
||||
if (firstItem.reward && firstItem.reward.parent && firstItem.reward.parent.title) {
|
||||
const titles = firstItem.reward.parent.title;
|
||||
reward = titles.fr || titles.en || Object.values(titles)[0] || '';
|
||||
if (firstItem.reward && firstItem.reward.title) {
|
||||
const titles = firstItem.reward.title || firstItem.reward.parent.title;
|
||||
reward = titles.fr || Object.values(titles)[0] || '';
|
||||
reward_desc = firstItem.reward.description_fr;
|
||||
|
||||
// Si c'est une variante, ajouter sa description
|
||||
if (firstItem.reward.description_fr) {
|
||||
reward += ` (${firstItem.reward.description_fr})`;
|
||||
}
|
||||
reward = reward;
|
||||
|
||||
} else if (firstItem.reward.parent && firstItem.reward.parent.title) {
|
||||
const titles = firstItem.reward.parent.title;
|
||||
reward = titles.fr || firstItem.reward.description_fr || Object.values(titles)[0] || '';
|
||||
reward_desc = firstItem.reward.description_fr;
|
||||
|
||||
reward = reward + ' - ' + reward_desc;
|
||||
}
|
||||
|
||||
// Ajouter un pourboire si présent
|
||||
|
||||
Reference in New Issue
Block a user