wip #7957

diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
index fc06cf547c908a00ca28a590c3d9ffeea661cf4b..1b59ffbef21dcc962f4717dfad4c01890667996a 100644 (file)
--- a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
@@ -28,6 +28,7 @@ class FluidbookPublicationCrudController extends \Cubist\Backpack\Magic\Controll
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\BastideOperation;
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\PumaOperation;
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\KimplayOperation;
+       use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\NewHeidiOperation;
 
 
 

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/NewHeidiOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/NewHeidiOperation.php
index 1e07445fabcb3f495f034a2042fea65a0d214472..1c9a897981260a2f421768fbc74a3d2ecd1a1017 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/NewHeidiOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/NewHeidiOperation.php
@@ -24,6 +24,8 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 trait NewHeidiOperation
 {
+    use KimplayOperation;
+
     protected function setupNewHeidiRoutes($segment, $routeName, $controller)
     {
         foreach (['services', 's'] as $s) {
@@ -33,7 +35,6 @@ trait NewHeidiOperation
 
     public function newheidi(Request $request)
     {
-
         $validator = Validator::make($request->all(), [
             'company' => 'required|max:255',
             'name' => 'required|string|max:255',
@@ -65,7 +66,7 @@ trait NewHeidiOperation
         $this->sendMail($file, request('mail'));
     }
 
-    public function getCsv($cart_items, $user_details)
+    public function getCsvNewHeidi($cart_items, $user_details)
     {
         $column_headings = [
             'ref' => 'Réference',
@@ -175,7 +176,7 @@ trait NewHeidiOperation
         return $xls_file;
     }
 
-    public function sendMail($xls_file, $user_email)
+    public function sendMailNewHeidi($xls_file, $user_email)
     {
 
         $admin = 'test@fluidbook.com';