Merge pull request #30 from intraordinaire/feature/phpspreadsheet

🐛 Fixing date format if contain slashes

Author: mfrancois

src/Distilleries/Expendable/States/ExportStateTrait.php

@@ -53,7 +53,7 @@ public function postExport(Request $request)
         $dateStart = !empty($data['range']) && !empty($data['range']['start']) ? $data['range']['start'] : Carbon::now()->format('Y-m-d');
         $dateEnd = !empty($data['range']) && !empty($data['range']['end']) ? $data['range']['end'] : Carbon::now()->format('Y-m-d');
         $type = !empty($data['type']) ? $data['type'] : 'csv';
-        $filename = $dateStart . ' ' . $dateEnd . '.' . $type;
+        $filename = str_replace('/', '-', $dateStart . '_' . $dateEnd) . '.' . mb_strtolower($type);
 
         return (new BaseExport($this->model, $data))->export($filename);
     }

tests/Http/Controllers/Backend/LanguageControllerTest.php

@@ -276,7 +276,7 @@ public function testExportCsv()
         ]);
 
         $this->assertContains('HTTP/1.1 200 OK', (string)$response);
-        $this->assertContains('filename="'.$dateBegin.' '.$dateEnd.'.csv"', (string)$response);
+        $this->assertContains('filename='.$dateBegin.'_'.$dateEnd.'.csv', (string)$response);
     }
 
     public function testExportXls()
@@ -305,7 +305,37 @@ public function testExportXls()
 
 
         $this->assertContains('HTTP/1.1 200 OK', (string)$response);
-        $this->assertContains('filename="'.$dateBegin.' '.$dateEnd.'.xls"', (string)$response);
+        $this->assertContains('filename='.$dateBegin.'_'.$dateEnd.'.xls', (string)$response);
+
+    }
+
+    public function testExportDateFormat()
+    {
+
+        $faker = Faker\Factory::create();
+        $data  = [
+            'libelle'     => str_replace('\'', '', $faker->country),
+            'iso'         => $faker->countryCode,
+            'not_visible' => 0,
+            'is_default'  => 1,
+            'status'      => 1,
+        ];
+        \Distilleries\Expendable\Models\Language::create($data);
+
+        $dateBegin = date('d/m/Y', time() - (24 * 60 * 60));
+        $dateEnd   = date('d/m/Y', time() + (24 * 60 * 60));
+        \File::delete(storage_path('exports'));
+        $response = $this->call('POST', action('Backend\LanguageController@postExport'), [
+            'range' => [
+                'start' => $dateBegin,
+                'end'   => $dateEnd
+            ],
+            'type'  => 'xls'
+        ]);
+
+
+        $this->assertContains('HTTP/1.1 200 OK', (string)$response);
+        $this->assertContains('filename='.str_replace('/', '-', $dateBegin . '_' . $dateEnd).'.xls', (string)$response);
 
     }