Răsfoiți Sursa

Fix "Sales Orders Value" chart

Alan Lam 1 an în urmă
părinte
comite
2dbd0a7bec
1 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 4 4
      controllers/api.php

+ 4 - 4
controllers/api.php

@@ -2,7 +2,6 @@
 
 namespace App;
 
-use App\Constraint\Constraint;
 use App\Constraint\HasTextConstraint;
 use App\Constraint\MoreThanOrEqualsConstraint;
 use App\Constraint\StartsWithConstraint;
@@ -55,6 +54,7 @@ try {
 
 		case "get-sales-orders-value-chart-data":
 			$dt_min = CarbonImmutable::now("Europe/London")->startOfMonth()->subMonths(12);
+			$date_min = $dt_min->toDateString();
 
 			$labels = [];
 			$data = [];
@@ -69,13 +69,13 @@ try {
 			$sales_orders = Document::query([
 				"type" => DocumentTypes::SALES_ORDER,
 				"currency" => "GBP",
-				"dts_created" => new MoreThanOrEqualsConstraint($dt_min->utc()),
+				"date" => new MoreThanOrEqualsConstraint($date_min),
 				"dts_deleted" => null
 			]);
 
 			foreach($sales_orders as $sales_order) {
-				$dt_created = $sales_order->getDateTimeCreated()->setTimezone($_ENV["TIMEZONE"]);
-				$label = $dt_created->format("M y");
+				$dt = CarbonImmutable::parse($sales_order->date);
+				$label = $dt->format("M y");
 				$data[$label] = bcadd($data[$label], $sales_order->getSubtotal(), 2);
 			}