');
+ // return $pdf->download();
+ return view('export.index')->with(['sites'=> $sites, 'startdate' => $startdate, 'enddate' => $enddate]);
+ }
+
+ //------ AJAX Export
+ public function export_coupons(Request $request){
+ $ids = $request->input('ids');
+ $startdate = date('Y-m-d', strtotime($request->input('startdate')));
+ $enddate = date('Y-m-d', strtotime($request->input('enddate')));
+ $coupons = Coupon::find($ids);
+
+ $labels = $this->getLabelsForStats($startdate, $enddate);
+
+
+
+ foreach ($coupons as $coupon) {
+ $cpName = str_replace(' ', '', $coupon->coupon_name);
+ $now = strtotime(now());
+ $full_path = 'export/'.$cpName.'_'.$now.'.pdf';
+ $dataCoupon = $this->getDataForCouponAllCamp($labels, $coupon);
+ $coupon->couponQuantity = $this->getFullQuantity($coupon);
+ $coupon->couponFullPrinted = $this->getUsedQuantity($coupon);
+ $coupon->couponPrinted = $this->getUsedQuantityOnPeriod($coupon, $startdate, $enddate);
+
+ $pdf = App::make('dompdf.wrapper');
+
+ $myData = new Data();
+
+ $myData->addPoints($dataCoupon,"My Serie 1");
+ $myData->addPoints($labels,"My Serie 2");
+ $myData->setAxisName(0,"Coupons Diffusés");
+ $myData->setAbscissa("My Serie 2");
+ $myData->setSerieTicks("My Serie 2",2);
+ $serieSettings = array("R"=>229,"G"=>11,"B"=>11);
+ $myData->setPalette("My Serie 1",$serieSettings);
+ $myPicture = new Image(700,230,$myData);
+ $myPicture->setGraphArea(60,40,670,190);
+ $myPicture->setFontProperties(array("FontSize"=>10));
+ $myPicture->drawScale(array("DrawSubTicks"=>TRUE, 'LabelSkip'=>1, 'LabelRotation'=>25, "Mode" => SCALE_MODE_START0, "CycleBackground"=>TRUE,"GridR"=>102,"GridG"=>102,"GridB"=>102));
+ $myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+ $myPicture->drawLineChart(array("DisplayColor"=>DISPLAY_AUTO));
+ $LabelSettings = array("NoTitle"=>TRUE);
+ $myPicture->Render('export/temp.png');
+
+ $view = view('export.template')->with(['src' => 'export/temp.png', 'coupon' => $coupon, 'startdate' => $startdate, 'enddate' => $enddate])->render();
+
+ //var_dump($view);
+
+ $pdf->loadHTML($view);
+ $pdf->save($full_path);
+ }
+
+ return json_encode($full_path);
+ }
+}
diff --git a/app/Http/Controllers/StatistiqueController.php b/app/Http/Controllers/StatistiqueController.php
index df7b541..826e773 100644
--- a/app/Http/Controllers/StatistiqueController.php
+++ b/app/Http/Controllers/StatistiqueController.php
@@ -7,11 +7,12 @@ use App\Campagne;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Traits\CouponTrait;
-use DateTime;
+use App\Traits\GraphTrait;
class StatistiqueController extends Controller
{
use CouponTrait;
+ use GraphTrait;
/**
* Display a listing of the resource.
*
@@ -91,51 +92,21 @@ class StatistiqueController extends Controller
$startdate = $request->startdate;
$enddate = $request->enddate;
- $datetime1 = new DateTime($request->startdate);
- $datetime2 = new DateTime($request->enddate);
- $interval = $datetime1->diff($datetime2);
- $days = $interval->format('%a');
- // ---- Labels des graphiques
- $labels = [];
- for ($i=0; $i <= $days ; $i++) {
- $date = date('d/m/Y', strtotime("+".$i." days", strtotime($startdate)));
- array_push($labels, $date);
- }
- //array_reverse($labels);
+ // ---- Labels pour la période
+ $labels = $this->getLabelsForStats($startdate, $enddate);
// ---- Data pour le graphique global
- $dataGlobal = [];
- $test = [];
- foreach ($labels as $label) {
- $date = date('Y-m-d', strtotime(str_replace('/', '-', $label)));
- $stat = Statistique::where(['stat_campId' => $campid])->whereDate('created_at', '=', $date)->sum('stat_couponPrinted');
- $test[] = $date;
- if(isset($stat)){
- $dataGlobal[] = $stat;
- } else {
- $dataGlobal[] = 0;
- }
- }
-
+ $dataGlobal = $this->getDataForCamp($labels, $campid);
+
// ---- Data pour le graphique par coupons
$campagne = Campagne::where(['camp_id' => $campid])->first();
$coupons = $campagne->coupons;
$dataSpec = [];
foreach ($coupons as $coupon) {
- $dataCoupon = [];
- foreach ($labels as $label) {
- $date = date('Y-m-d', strtotime(str_replace('/', '-', $label)));
- $stat = Statistique::where(['stat_campId' => $campid, 'stat_couponId' => $coupon->coupon_id])->whereDate('created_at', '=', $date)->first();
- if(isset($stat->stat_couponPrinted)){
- $dataCoupon[] = $stat->stat_couponPrinted;
- } else {
- $dataCoupon[] = 0;
- }
- }
+ $dataCoupon = $this->getDataForCoupon($labels, $campid, $coupon);
$dataSpec[$coupon->coupon_code] = $dataCoupon;
}
-
$data = array('labels' => $labels, 'dataGlobal' => $dataGlobal, 'dataSpec' => $dataSpec);
return json_encode($data);
diff --git a/app/Traits/CouponTrait.php b/app/Traits/CouponTrait.php
index de30243..47e74cc 100644
--- a/app/Traits/CouponTrait.php
+++ b/app/Traits/CouponTrait.php
@@ -7,8 +7,9 @@ use App\Coupon;
use App\Contact;
use App\Calendrier;
use App\Mur;
+use App\Statistique;
use App\Panier;
-
+use DateTime;
trait CouponTrait {
@@ -247,4 +248,27 @@ trait CouponTrait {
}
return $countPrinted;
}
+
+ public function getUsedQuantityOnPeriod(Coupon $coupon, $startdate, $enddate) {
+ $countPrinted = 0;
+ $startdate = date('Y-m-d H:i:s', strtotime($startdate));
+ $enddate = date('Y-m-d H:i:s', strtotime($enddate));
+ $campagnes = $coupon->campagnes()->get();
+ foreach ($campagnes as $campagne) {
+ if($campagne->camp_type == 0 || $campagne->camp_type == 2) { // Murs
+ $murs = Mur::where(['mur_campid' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->whereBetween('mur_createdate', [$startdate, $enddate])->get();
+ $countPrinted = $countPrinted + count($murs);
+ } else { // Paniers
+ $paniers = Panier::where(['panier_campId' => $campagne->camp_id])->where(function($query) use ($startdate, $enddate){
+ $query->whereBetween('panier_createdate', [$startdate, $enddate])
+ ->orWhereBetween('panier_updatedate', [$startdate, $enddate]);
+ })->get();
+ foreach ($paniers as $key => $panier) {
+ $panierContentCount = $panier->panierContents->sum('panier_content_printed');
+ $countPrinted = $countPrinted + $panierContentCount;
+ }
+ }
+ }
+ return $countPrinted;
+ }
}
\ No newline at end of file
diff --git a/app/Traits/GraphTrait.php b/app/Traits/GraphTrait.php
new file mode 100644
index 0000000..2c38f6b
--- /dev/null
+++ b/app/Traits/GraphTrait.php
@@ -0,0 +1,78 @@
+diff($datetime2);
+ $days = $interval->format('%a');
+
+ // ---- Labels des graphiques
+ $labels = [];
+ for ($i=0; $i <= $days ; $i++) {
+ $date = date('d/m/Y', strtotime("+".$i." days", strtotime($startdate)));
+ array_push($labels, $date);
+ }
+
+ return $labels;
+ }
+
+ // ---- Data for global graph
+ public function getDataForCamp($labels, $campid){
+ $dataGlobal = [];
+ foreach ($labels as $label) {
+ $date = date('Y-m-d', strtotime(str_replace('/', '-', $label)));
+ $stat = Statistique::where(['stat_campId' => $campid])->whereDate('created_at', '=', $date)->sum('stat_couponPrinted');
+ if(isset($stat)){
+ $dataGlobal[] = $stat;
+ } else {
+ $dataGlobal[] = 0;
+ }
+ }
+ return $dataGlobal;
+ }
+
+ // ---- Data for one coupon on one camp
+ public function getDataForCoupon($labels, $campid, $coupon){
+ $dataCoupon = [];
+ foreach ($labels as $label) {
+ $date = date('Y-m-d', strtotime(str_replace('/', '-', $label)));
+ $stat = Statistique::where(['stat_campId' => $campid, 'stat_couponId' => $coupon->coupon_id])->whereDate('created_at', '=', $date)->first();
+ if(isset($stat->stat_couponPrinted)){
+ $dataCoupon[] = $stat->stat_couponPrinted;
+ } else {
+ $dataCoupon[] = 0;
+ }
+ }
+ return $dataCoupon;
+ }
+
+ // ---- Data for one coupon all camp
+ public function getDataForCouponAllCamp($labels, $coupon) {
+ $dataCoupon = [];
+ foreach ($labels as $label) {
+ $date = date('Y-m-d', strtotime(str_replace('/', '-', $label)));
+ $stat = Statistique::where(['stat_couponId' => $coupon->coupon_id])->whereDate('created_at', '=', $date)->sum('stat_couponPrinted');
+ if(isset($stat)){
+ $dataCoupon[] = $stat;
+ } else {
+ $dataCoupon[] = 0;
+ }
+ }
+ return $dataCoupon;
+ }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5772a56..27085e3 100644
--- a/composer.json
+++ b/composer.json
@@ -6,12 +6,14 @@
"type": "project",
"require": {
"php": "^7.1.3",
+ "barryvdh/laravel-dompdf": "^0.8.4",
"doctrine/dbal": "^2.8",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.7.*",
"laravel/tinker": "^1.0",
"laravelcollective/html": "^5.4.0",
"picqer/php-barcode-generator": "^0.3.0",
+ "szymach/c-pchart": "^3.0",
"uxweb/sweet-alert": "^2.0"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index 8a73eef..fcf6cf2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,64 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "5472aedecf7d5401ffe3f89f46979fa2",
+ "content-hash": "24e88d3c29349a8c1dded281fc337313",
"packages": [
+ {
+ "name": "barryvdh/laravel-dompdf",
+ "version": "v0.8.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/barryvdh/laravel-dompdf.git",
+ "reference": "3fd817065e1c820b1ddace8b2bf65ca45088df4f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/3fd817065e1c820b1ddace8b2bf65ca45088df4f",
+ "reference": "3fd817065e1c820b1ddace8b2bf65ca45088df4f",
+ "shasum": ""
+ },
+ "require": {
+ "dompdf/dompdf": "^0.8",
+ "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x",
+ "php": ">=7"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.8-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Barryvdh\\DomPDF\\ServiceProvider"
+ ],
+ "aliases": {
+ "PDF": "Barryvdh\\DomPDF\\Facade"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Barryvdh\\DomPDF\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Barry vd. Heuvel",
+ "email": "barryvdh@gmail.com"
+ }
+ ],
+ "description": "A DOMPDF Wrapper for Laravel",
+ "keywords": [
+ "dompdf",
+ "laravel",
+ "pdf"
+ ],
+ "time": "2019-02-26T18:07:43+00:00"
+ },
{
"name": "dnoegel/php-xdg-base-dir",
"version": "0.1",
@@ -388,6 +444,72 @@
],
"time": "2014-09-09T13:34:57+00:00"
},
+ {
+ "name": "dompdf/dompdf",
+ "version": "v0.8.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/dompdf/dompdf.git",
+ "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/dompdf/dompdf/zipball/75f13c700009be21a1965dc2c5b68a8708c22ba2",
+ "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-mbstring": "*",
+ "phenx/php-font-lib": "0.5.*",
+ "phenx/php-svg-lib": "0.3.*",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8|^5.5|^6.5",
+ "squizlabs/php_codesniffer": "2.*"
+ },
+ "suggest": {
+ "ext-gd": "Needed to process images",
+ "ext-gmagick": "Improves image processing performance",
+ "ext-imagick": "Improves image processing performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-develop": "0.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Dompdf\\": "src/"
+ },
+ "classmap": [
+ "lib/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-2.1"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Ménager",
+ "email": "fabien.menager@gmail.com"
+ },
+ {
+ "name": "Brian Sweeney",
+ "email": "eclecticgeek@gmail.com"
+ },
+ {
+ "name": "Gabriel Bull",
+ "email": "me@gabrielbull.com"
+ }
+ ],
+ "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
+ "homepage": "https://github.com/dompdf/dompdf",
+ "time": "2018-12-14T02:40:31+00:00"
+ },
{
"name": "dragonmantank/cron-expression",
"version": "v2.2.0",
@@ -1266,6 +1388,83 @@
],
"time": "2018-07-02T15:55:56+00:00"
},
+ {
+ "name": "phenx/php-font-lib",
+ "version": "0.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PhenX/php-font-lib.git",
+ "reference": "760148820110a1ae0936e5cc35851e25a938bc97"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/760148820110a1ae0936e5cc35851e25a938bc97",
+ "reference": "760148820110a1ae0936e5cc35851e25a938bc97",
+ "shasum": ""
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "FontLib\\": "src/FontLib"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Ménager",
+ "email": "fabien.menager@gmail.com"
+ }
+ ],
+ "description": "A library to read, parse, export and make subsets of different types of font files.",
+ "homepage": "https://github.com/PhenX/php-font-lib",
+ "time": "2017-09-13T16:14:37+00:00"
+ },
+ {
+ "name": "phenx/php-svg-lib",
+ "version": "v0.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PhenX/php-svg-lib.git",
+ "reference": "ccc46ef6340d4b8a4a68047e68d8501ea961442c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/ccc46ef6340d4b8a4a68047e68d8501ea961442c",
+ "reference": "ccc46ef6340d4b8a4a68047e68d8501ea961442c",
+ "shasum": ""
+ },
+ "require": {
+ "sabberworm/php-css-parser": "8.1.*"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~5.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Svg\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Ménager",
+ "email": "fabien.menager@gmail.com"
+ }
+ ],
+ "description": "A library to read, parse and export to PDF SVG files.",
+ "homepage": "https://github.com/PhenX/php-svg-lib",
+ "time": "2018-06-03T10:10:03+00:00"
+ },
{
"name": "picqer/php-barcode-generator",
"version": "v0.3",
@@ -1635,6 +1834,50 @@
],
"time": "2018-07-19T23:38:55+00:00"
},
+ {
+ "name": "sabberworm/php-css-parser",
+ "version": "8.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
+ "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/850cbbcbe7fbb155387a151ea562897a67e242ef",
+ "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Sabberworm\\CSS": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Raphael Schweikert"
+ }
+ ],
+ "description": "Parser for CSS Files written in PHP",
+ "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser",
+ "keywords": [
+ "css",
+ "parser",
+ "stylesheet"
+ ],
+ "time": "2016-07-19T19:14:21+00:00"
+ },
{
"name": "swiftmailer/swiftmailer",
"version": "v6.1.3",
@@ -2566,6 +2809,71 @@
],
"time": "2018-08-02T09:24:26+00:00"
},
+ {
+ "name": "szymach/c-pchart",
+ "version": "v3.0.7",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/szymach/c-pchart.git",
+ "reference": "cff756ac9cb87671b4833c5935c1c7bd12947db0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/szymach/c-pchart/zipball/cff756ac9cb87671b4833c5935c1c7bd12947db0",
+ "reference": "cff756ac9cb87671b4833c5935c1c7bd12947db0",
+ "shasum": ""
+ },
+ "require": {
+ "ext-gd": "*",
+ "php": ">=5.4"
+ },
+ "require-dev": {
+ "codeception/codeception": "^2.4",
+ "phpunit/phpunit": "^4.8|^7.1",
+ "squizlabs/php_codesniffer": "^2.8|^3.3"
+ },
+ "type": "project",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0.x-dev",
+ "2.0": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "CpChart\\": "src/"
+ },
+ "files": [
+ "constants.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-3.0-only"
+ ],
+ "authors": [
+ {
+ "name": "Jean-Damien Pogolotti",
+ "homepage": "http://www.pchart.net",
+ "role": "Creator of the original pChart library"
+ },
+ {
+ "name": "Piotr Szymaszek",
+ "homepage": "https://github.com/szymach",
+ "role": "Developer of the CpChart wrapper package"
+ }
+ ],
+ "description": "Port of \"pChart\" library into PHP 5+",
+ "homepage": "https://github.com/szymach/c-pchart",
+ "keywords": [
+ "CpChart",
+ "c-pChart",
+ "charts",
+ "pchart",
+ "statistics"
+ ],
+ "time": "2018-11-22T11:28:00+00:00"
+ },
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.1",
diff --git a/config/app.php b/config/app.php
index 332b434..c6b1e65 100644
--- a/config/app.php
+++ b/config/app.php
@@ -161,7 +161,7 @@ return [
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
-
+ Barryvdh\DomPDF\ServiceProvider::class,
],
/*
@@ -213,7 +213,7 @@ return [
'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\HtmlFacade::class,
'Debugbar' => Barryvdh\Debugbar\Facade::class,
-
+ 'PDF' => Barryvdh\DomPDF\Facade::class,
],
];
diff --git a/public/css/app.css b/public/css/app.css
index 62764b5..63dcf6a 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -172,6 +172,13 @@ h5 i {
margin-right: 10px;
}
+h5 {
+ font-family: 'Nunito-ExtraLight', sans-serif;
+ font-size: 1em;
+ color: #de9700;
+ margin: 20px 0 10px 0;
+}
+
p {
font-family: 'Nunito-ExtraLight', sans-serif;
color: #adb5bd;
@@ -6933,9 +6940,17 @@ main section .statistiquesContent .couponStats .couponStatsDetail h4 {
color: #adb5bd;
font-weight: bold;
background-color: #212121;
+}
+
+main section .statistiquesContent .couponStats .couponStatsDetail h4 span {
cursor: pointer;
}
+main section .statistiquesContent .couponStats .couponStatsDetail h4 span:first-child {
+ width: 95%;
+ display: block;
+}
+
main section .statistiquesContent .couponStats .couponStatsDetail h4 .couponLegend {
position: absolute;
display: inline-block;
@@ -6944,6 +6959,17 @@ main section .statistiquesContent .couponStats .couponStatsDetail h4 .couponLege
width: 20px;
height: 20px;
border-radius: 50%;
+ overflow: hidden;
+}
+
+main section .statistiquesContent .couponStats .couponStatsDetail h4 .couponLegend .line {
+ width: 35px;
+ height: 20px;
+ border-bottom: 3px solid red;
+ -webkit-transform: translateY(-20px) translateX(5px) rotate(27deg);
+ position: absolute;
+ top: 9px;
+ left: -10px;
}
main section .statistiquesContent .couponStats .couponStatsDetail .content {
@@ -6985,108 +7011,48 @@ main section .statistiquesContent .graphStats h3 {
margin: 30px 0 20px 0;
}
+main section .statistiquesContent .graphStats h3 i {
+ float: right;
+ margin-left: 10px;
+ cursor: pointer;
+}
+
+main section .selector-export {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-pack: end;
+ -ms-flex-pack: end;
+ justify-content: flex-end;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+}
+
+main section .selector-export h4 {
+ margin: 0;
+ margin-right: 20px;
+}
+
+main section .selector-export input {
+ min-width: 150px;
+}
+
+main section .selector-export input#startdate {
+ margin-right: 20px;
+}
+
+main section .export-btn {
+ text-align: right;
+ margin-top: 20px;
+}
+
#coupons-list {
background-color: #2d2d2d;
padding: 20px;
min-width: 550px;
}
-#coupons-list .inputGroup {
- background-color: #393939;
- display: block;
- margin: 2px 0;
- position: relative;
-}
-
-#coupons-list .inputGroup.notPublished {
- background-color: rgba(223, 0, 0, 0.3);
-}
-
-#coupons-list .inputGroup label {
- padding: 8px 30px;
- width: 100%;
- display: block;
- text-align: left;
- color: #adb5bd;
- cursor: pointer;
- position: relative;
- z-index: 2;
- -webkit-transition: color 200ms ease-in;
- transition: color 200ms ease-in;
- overflow: hidden;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- font-family: 'Nunito-Regular', sans-serif;
-}
-
-#coupons-list .inputGroup label:before {
- width: 10px;
- height: 10px;
- border-radius: 50%;
- content: '';
- background-color: #212121;
- position: absolute;
- left: 50%;
- top: 50%;
- -webkit-transform: translate(-50%, -50%) scale3d(1, 1, 1);
- transform: translate(-50%, -50%) scale3d(1, 1, 1);
- -webkit-transition: all 300ms cubic-bezier(0.4, 0, 0.2, 1);
- transition: all 300ms cubic-bezier(0.4, 0, 0.2, 1);
- opacity: 0;
- z-index: -1;
-}
-
-#coupons-list .inputGroup label:after {
- width: 20px;
- height: 20px;
- content: '';
- border: 1px solid #de9700;
- background-color: #393939;
- background-image: url("data:image/svg+xml,%3Csvg width='32' height='32' viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.414 11L4 12.414l5.414 5.414L20.828 6.414 19.414 5l-10 10z' fill='%23393939' fill-rule='nonzero'/%3E%3C/svg%3E ");
- background-repeat: no-repeat;
- background-position: -3px -1px;
- z-index: 2;
- position: absolute;
- right: 30px;
- top: 50%;
- -webkit-transform: translateY(-50%);
- transform: translateY(-50%);
- cursor: pointer;
- -webkit-transition: all 200ms ease-in;
- transition: all 200ms ease-in;
-}
-
-#coupons-list .inputGroup input:checked ~ label {
- color: #fff;
-}
-
-#coupons-list .inputGroup input:checked ~ label:before {
- -webkit-transform: translate(-50%, -50%) scale3d(130, 130, 1);
- transform: translate(-50%, -50%) scale3d(130, 130, 1);
- opacity: 1;
-}
-
-#coupons-list .inputGroup input:checked ~ label:after {
- background-color: #de9700;
- border-color: #de9700;
-}
-
-#coupons-list .inputGroup input {
- width: 32px;
- height: 32px;
- -webkit-box-ordinal-group: 2;
- -ms-flex-order: 1;
- order: 1;
- z-index: 2;
- position: absolute;
- right: 30px;
- top: 50%;
- -webkit-transform: translateY(-50%);
- transform: translateY(-50%);
- cursor: pointer;
- visibility: hidden;
-}
-
#coupons-list input[type=submit] {
padding: 5px 10px;
background-color: #de9700;
@@ -7197,3 +7163,99 @@ main section .statistiquesContent .graphStats h3 {
cursor: pointer;
margin-right: 15px;
}
+
+.inputGroup {
+ background-color: #393939;
+ display: block;
+ margin: 2px 0;
+ position: relative;
+}
+
+.inputGroup.notPublished {
+ background-color: rgba(223, 0, 0, 0.3);
+}
+
+.inputGroup label {
+ padding: 8px 30px;
+ width: 100%;
+ display: block;
+ text-align: left;
+ color: #adb5bd;
+ cursor: pointer;
+ position: relative;
+ z-index: 2;
+ -webkit-transition: color 200ms ease-in;
+ transition: color 200ms ease-in;
+ overflow: hidden;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ font-family: 'Nunito-Regular', sans-serif;
+}
+
+.inputGroup label:before {
+ width: 10px;
+ height: 10px;
+ border-radius: 50%;
+ content: '';
+ background-color: #212121;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ -webkit-transform: translate(-50%, -50%) scale3d(1, 1, 1);
+ transform: translate(-50%, -50%) scale3d(1, 1, 1);
+ -webkit-transition: all 300ms cubic-bezier(0.4, 0, 0.2, 1);
+ transition: all 300ms cubic-bezier(0.4, 0, 0.2, 1);
+ opacity: 0;
+ z-index: -1;
+}
+
+.inputGroup label:after {
+ width: 20px;
+ height: 20px;
+ content: '';
+ border: 1px solid #de9700;
+ background-color: #393939;
+ background-image: url("data:image/svg+xml,%3Csvg width='32' height='32' viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.414 11L4 12.414l5.414 5.414L20.828 6.414 19.414 5l-10 10z' fill='%23393939' fill-rule='nonzero'/%3E%3C/svg%3E ");
+ background-repeat: no-repeat;
+ background-position: -3px -1px;
+ z-index: 2;
+ position: absolute;
+ right: 30px;
+ top: 50%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ cursor: pointer;
+ -webkit-transition: all 200ms ease-in;
+ transition: all 200ms ease-in;
+}
+
+.inputGroup input:checked ~ label {
+ color: #fff;
+}
+
+.inputGroup input:checked ~ label:before {
+ -webkit-transform: translate(-50%, -50%) scale3d(130, 130, 1);
+ transform: translate(-50%, -50%) scale3d(130, 130, 1);
+ opacity: 1;
+}
+
+.inputGroup input:checked ~ label:after {
+ background-color: #de9700;
+ border-color: #de9700;
+}
+
+.inputGroup input {
+ width: 32px;
+ height: 32px;
+ -webkit-box-ordinal-group: 2;
+ -ms-flex-order: 1;
+ order: 1;
+ z-index: 2;
+ position: absolute;
+ right: 30px;
+ top: 50%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ cursor: pointer;
+ visibility: hidden;
+}
diff --git a/public/export/.gitkeep b/public/export/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/public/js/app.js b/public/js/app.js
index 2095059..a096d3f 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -76,7 +76,7 @@ module.exports = __webpack_require__(3);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-eval("/**\r\n * First we will load all of this project's JavaScript dependencies which\r\n * includes Vue and other libraries. It is a great starting point when\r\n * building robust, powerful web applications using Vue and Laravel.\r\n */\n\n/*\r\nrequire('./bootstrap');\r\n\r\nwindow.Vue = require('vue');\r\n\r\n/**\r\n * Next, we will create a fresh Vue application instance and attach it to\r\n * the page. Then, you may begin adding components to this application\r\n * or customize the JavaScript scaffolding to fit your unique needs.\r\n */\n\n/*\r\nVue.component('example-component', require('./components/ExampleComponent.vue'));\r\n\r\nconst app = new Vue({\r\n el: '#app'\r\n});\r\n*/\n\n\n\ntry {\n window.$ = window.jQuery = __webpack_require__(2);\n} catch (e) {}\n\nvar changeIcon = $('.marque');\nvar dropDownMarque = $('.marque-select');\n\n// FancyBox Communes\n// Confirmation \n$.fancyConfirm = function (opts) {\n opts = $.extend(true, {\n title: 'Are you sure?',\n message: '',\n okButton: 'OK',\n noButton: 'Cancel',\n callback: $.noop\n }, opts || {});\n\n $.fancybox.open({\n type: 'html',\n src: 'MesBR.eu
+{{ $coupon->coupon_name }}
+Diffusions du {{ date('d/m/Y', strtotime($startdate)) }} au {{ date('d/m/Y', strtotime($enddate)) }}
+Détail du coupon
+| Nom | +Code | +Quantité totale | +Qté totale diffusée | +Date de début de diffusion | +Date de fin de diffusion | +||
|---|---|---|---|---|---|---|---|
| {{ $coupon->coupon_name }} | +{{ $coupon->coupon_code }} | +{{ $coupon->couponQuantity }} | +{{ $coupon->couponFullPrinted }} | + @if($coupon->coupon_maxdatediffusion != null) +{{ date('d/m/Y', strtotime($coupon->coupon_mindatediffusion)) }} | + @else +n/c | + @endif + @if($coupon->coupon_maxdatediffusion != null) +{{ date('d/m/Y', strtotime($coupon->coupon_maxdatediffusion)) }} | + @else +n/c | + @endif +
Graphique de diffusion sur la période du {{ date('d/m/Y', strtotime($startdate)) }} au {{ date('d/m/Y', strtotime($enddate)) }}
+Nombre de coupons diffusés : {{ $coupon->couponPrinted }}
+