ヘッダ行の出力をセッション操作後に行うように修正

EC-CUBE · Dec 13, 2022 · a471ef5 · a471ef5
1 parent 9f6a2ab
commit a471ef5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Eccube/Controller/Admin/Customer/CustomerController.php b/src/Eccube/Controller/Admin/Customer/CustomerController.php
@@ -292,13 +292,13 @@ public function export(Request $request)
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER);
 
-            // ヘッダ行の出力.
-            $this->csvExportService->exportHeader();
-
             // 会員データ検索用のクエリビルダを取得.
             $qb = $this->csvExportService
                 ->getCustomerQueryBuilder($request);
 
+            // ヘッダ行の出力.
+            $this->csvExportService->exportHeader();
+
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
             $this->csvExportService->exportData(function ($entity, $csvService) use ($request) {

diff --git a/src/Eccube/Controller/Admin/Order/OrderController.php b/src/Eccube/Controller/Admin/Order/OrderController.php
@@ -408,13 +408,13 @@ protected function exportCsv(Request $request, $csvTypeId, $fileName)
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType($csvTypeId);
 
-            // ヘッダ行の出力.
-            $this->csvExportService->exportHeader();
-
             // 受注データ検索用のクエリビルダを取得.
             $qb = $this->csvExportService
                 ->getOrderQueryBuilder($request);
 
+            // ヘッダ行の出力.
+            $this->csvExportService->exportHeader();
+
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
             $this->csvExportService->exportData(function ($entity, $csvService) use ($request) {

diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php
@@ -967,13 +967,13 @@ public function export(Request $request)
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_PRODUCT);
 
-            // ヘッダ行の出力.
-            $this->csvExportService->exportHeader();
-
             // 商品データ検索用のクエリビルダを取得.
             $qb = $this->csvExportService
                 ->getProductQueryBuilder($request);
 
+            // ヘッダ行の出力.
+            $this->csvExportService->exportHeader();
+
             // Get stock status
             $isOutOfStock = 0;
             $session = $request->getSession();