← All changes
|
app/Http/Controllers/Reports/ReportingController.php
+12
-23
1.4.1
→
1.6.5
View file →
| @@ -10,9 +10,8 @@ | ||
| 10 | 10 | use FluentCart\App\Helpers\Status; |
| 11 | 11 | use FluentCart\App\Http\Controllers\Controller; |
| 12 | 12 | use FluentCart\App\Models\Order; |
| 13 | 13 | use FluentCart\App\Modules\ReportingModule\OrdersReport; |
| 14 | -use FluentCart\App\Modules\ReportingModule\SalesReport; | |
| 15 | 14 | use FluentCart\App\Services\DateTime\DateTime; |
| 16 | 15 | use FluentCart\App\Services\Report\DashBoardReportService; |
| 17 | 16 | use FluentCart\App\Services\Report\ReportHelper; |
| 18 | 17 | use FluentCart\Framework\Http\Request\Request; |
| @@ -39,31 +38,17 @@ | ||
| 39 | 38 | 'to_date' => gmdate('Y-m-d 23:59:59', current_time('timestamp')) |
| 40 | 39 | ]; |
| 41 | 40 | } |
| 42 | 41 | |
| 43 | - public function getSalesGrowth(Request $request, SalesReport $salesReport): array | |
| 44 | - { | |
| 45 | - | |
| 46 | - $endYear = $request->get('end_date', Order::query()->max('created_at')); | |
| 47 | - $startYear = $request->get('start_date', Order::query()->min('created_at')); | |
| 48 | - | |
| 49 | - $filters = [ | |
| 50 | - "status" => ["column" => "status", "operator" => "in", "value" => Status::getOrderSuccessStatuses()], | |
| 51 | - "payment_status" => ["column" => "payment_status", "operator" => "in", "value" => Status::getTransactionSuccessStatuses()], | |
| 52 | - "created_at" => ["column" => "created_at", "operator" => "between", "value" => [$startYear, $endYear]] | |
| 53 | - ]; | |
| 54 | - | |
| 55 | - return [ | |
| 56 | - 'sales_data' => $salesReport->getSalesGrowth($filters) | |
| 57 | - ]; | |
| 58 | - } | |
| 59 | - | |
| 42 | + /** | |
| 43 | + * @deprecated since v1.4. Use GET reports/overview (OverviewReportController::getOverview) instead. | |
| 44 | + */ | |
| 60 | 45 | public function getReportOverview(Request $request): array |
| 61 | 46 | { |
| 47 | + _deprecated_function(__METHOD__, '1.4', 'GET /fluent-cart/v2/reports/overview'); | |
| 62 | 48 | |
| 63 | 49 | $params = $request->get('params'); |
| 64 | 50 | $params["status"] = ["column" => "status", "operator" => "in", "value" => Status::getOrderSuccessStatuses()]; |
| 65 | - // $params["payment_status"] = [ "column" => "payment_status", "operator" => "in", "value" => Status::getTransactionSuccessStatuses() ]; | |
| 66 | 51 | $queryParam = Arr::only($params, ['created_at', 'status', 'payment_status']); |
| 67 | 52 | |
| 68 | 53 | $reportOverview = OrderResource::reportOverview($queryParam); |
| 69 | 54 | |
| @@ -69,12 +54,12 @@ | ||
| 69 | 54 | |
| 70 | 55 | $ordersByPaymentMethod = OrderResource::orderSummaryByPayment($queryParam); |
| 71 | 56 | |
| 72 | 57 | return [ |
| 73 | - 'data' => $reportOverview, | |
| 58 | + '_deprecated' => 'This endpoint is deprecated since v1.4 and will be removed in a future release. Use GET /fluent-cart/v2/reports/overview instead.', | |
| 59 | + 'data' => $reportOverview, | |
| 74 | 60 | 'orders_by_payment_method' => $ordersByPaymentMethod, |
| 75 | 61 | ]; |
| 76 | - | |
| 77 | 62 | } |
| 78 | 63 | |
| 79 | 64 | public function searchRepeatCustomer(Request $request): array |
| 80 | 65 | { |
| @@ -84,14 +69,18 @@ | ||
| 84 | 69 | 'repeat_customers' => CustomerHelper::getRepeatCustomerBySearch($params)->paginate(Arr::get($params, 'per_page'), ['*'], 'page', Arr::get($params, 'current_page')) |
| 85 | 70 | ]; |
| 86 | 71 | } |
| 87 | 72 | |
| 73 | + /** | |
| 74 | + * @deprecated since v1.4. Use GET reports/fetch-top-sold-products (DefaultReportController::getTopSoldProducts) instead. | |
| 75 | + */ | |
| 88 | 76 | public function getTopProductsSold(Request $request): array |
| 89 | 77 | { |
| 78 | + _deprecated_function(__METHOD__, '1.4', 'GET /fluent-cart/v2/reports/fetch-top-sold-products'); | |
| 90 | 79 | |
| 91 | - | |
| 92 | 80 | return [ |
| 93 | - 'top_products_sold' => OrderItemResource::topProductsSold($request->get('params')) | |
| 81 | + '_deprecated' => 'This endpoint is deprecated since v1.4 and will be removed in a future release. Use GET /fluent-cart/v2/reports/fetch-top-sold-products instead.', | |
| 82 | + 'top_products_sold' => OrderItemResource::topProductsSold($request->get('params')), | |
| 94 | 83 | ]; |
| 95 | 84 | } |
| 96 | 85 | |
| 97 | 86 | public function getReportMeta(Request $request): array |