Fix sales chart regression
This commit is contained in:
@@ -1562,10 +1562,9 @@ export class EventsService {
|
|||||||
value: 0,
|
value: 0,
|
||||||
percentage: 0,
|
percentage: 0,
|
||||||
totalOrders: 0,
|
totalOrders: 0,
|
||||||
prevRevenue: 0,
|
prevValue: 0,
|
||||||
prevOrders: 0,
|
prevOrders: 0,
|
||||||
prevItemCount: 0,
|
prevItemCount: 0,
|
||||||
prevValue: 0,
|
|
||||||
prevCount: 0,
|
prevCount: 0,
|
||||||
prevPercentage: 0,
|
prevPercentage: 0,
|
||||||
averageOrderValue: 0,
|
averageOrderValue: 0,
|
||||||
@@ -1623,6 +1622,7 @@ export class EventsService {
|
|||||||
|
|
||||||
dayStats.count++;
|
dayStats.count++;
|
||||||
dayStats.value += totalAmount;
|
dayStats.value += totalAmount;
|
||||||
|
dayStats.revenue = dayStats.value;
|
||||||
dayStats.itemCount += items.length;
|
dayStats.itemCount += items.length;
|
||||||
dayStats.percentage = (dayStats.count / dayStats.orders) * 100;
|
dayStats.percentage = (dayStats.count / dayStats.orders) * 100;
|
||||||
dayStats.averageOrderValue = dayStats.value / dayStats.count;
|
dayStats.averageOrderValue = dayStats.value / dayStats.count;
|
||||||
@@ -1695,6 +1695,7 @@ export class EventsService {
|
|||||||
const dayStats = dailyStats.get(currentDayStats.timestamp);
|
const dayStats = dailyStats.get(currentDayStats.timestamp);
|
||||||
if (dayStats) {
|
if (dayStats) {
|
||||||
dayStats.prevValue = prevDayStats.value;
|
dayStats.prevValue = prevDayStats.value;
|
||||||
|
dayStats.prevRevenue = prevDayStats.value;
|
||||||
dayStats.prevCount = prevDayStats.count;
|
dayStats.prevCount = prevDayStats.count;
|
||||||
dayStats.prevOrders = prevDayStats.orders;
|
dayStats.prevOrders = prevDayStats.orders;
|
||||||
dayStats.prevPercentage = prevDayStats.percentage;
|
dayStats.prevPercentage = prevDayStats.percentage;
|
||||||
@@ -1709,7 +1710,7 @@ export class EventsService {
|
|||||||
.sort((a, b) => a.date.localeCompare(b.date))
|
.sort((a, b) => a.date.localeCompare(b.date))
|
||||||
.map(day => ({
|
.map(day => ({
|
||||||
...day,
|
...day,
|
||||||
revenue: Number(day.value || 0),
|
revenue: Number(day.revenue || day.value || 0),
|
||||||
orders: Number(day.orders || 0),
|
orders: Number(day.orders || 0),
|
||||||
itemCount: Number(day.itemCount || 0),
|
itemCount: Number(day.itemCount || 0),
|
||||||
count: Number(day.count || 0),
|
count: Number(day.count || 0),
|
||||||
@@ -1717,6 +1718,7 @@ export class EventsService {
|
|||||||
percentage: Number(day.percentage || 0),
|
percentage: Number(day.percentage || 0),
|
||||||
averageOrderValue: Number(day.averageOrderValue || 0),
|
averageOrderValue: Number(day.averageOrderValue || 0),
|
||||||
averageItemsPerOrder: Number(day.averageItemsPerOrder || 0),
|
averageItemsPerOrder: Number(day.averageItemsPerOrder || 0),
|
||||||
|
prevRevenue: Number(day.prevRevenue || day.prevValue || 0),
|
||||||
prevValue: Number(day.prevValue || 0),
|
prevValue: Number(day.prevValue || 0),
|
||||||
prevCount: Number(day.prevCount || 0),
|
prevCount: Number(day.prevCount || 0),
|
||||||
prevOrders: Number(day.prevOrders || 0),
|
prevOrders: Number(day.prevOrders || 0),
|
||||||
|
|||||||
Reference in New Issue
Block a user