forge-joniko/ldc-mesbr-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modifs Diverses + Alerte pour chaque campagne

Browse source
This commit is contained in:
Thibault Richy 2019-03-13 12:02:05 +01:00
parent c101b2b980
commit 56b2f71192
6 changed files with 58 additions and 363 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
app/Console/Kernel.php
View file

@ -45,34 +45,34 @@ class Kernel extends ConsoleKernel
$couponSeuilGlobal = array();
$couponDiffusionGlobal = array();
$sendGlobal = false;
foreach ($sites as $site) { // ---- Pour chaque site
$sendMail = false;
$users = array();
$couponSeuil = array();
$couponDiffusion = array();
$coupons = Coupon::where(['coupon_siteId' => $site->id])->get();
foreach ($coupons as $coupon) {
$couponAlert = false;
// --- Check du seuil
$coupon->coupon_left = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon);
if($coupon->coupon_left < $coupon->coupon_seuil_alert){
array_push($couponSeuil, $coupon);
array_push($couponSeuilGlobal, [$site->site_nom , $coupon]);
$sendGlobal = true;
$couponAlert = true;
}
foreach ($sites as $site) { // ---- Pour chaque site
$campagnes = Campagne::where(['camp_siteId' => $site->id])->get();
foreach ($campagnes as $campagne) {
$sendMail = false;
$users = array();
$couponSeuil = array();
$couponDiffusion = array();
$coupons = $campagne->coupons()->get();
foreach ($coupons as $coupon) {
$couponAlert = false;
$coupon->coupon_left = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon);
if($coupon->coupon_left < $coupon->coupon_seuil_alert){
array_push($couponSeuil, $coupon);
array_push($couponSeuilGlobal, [$site->site_nom , $coupon]);
$sendGlobal = true;
$couponAlert = true;
}
// --- Check MaxDateDiffusion
if($coupon->coupon_maxdatediffusion != null && strtotime($coupon->coupon_maxdatediffusion) < (time() + (30*24*60*60))){ //Fin de diffusion dans moins de 30jours
array_push($couponDiffusion, $coupon);
array_push($couponDiffusionGlobal, [$site->site_nom , $coupon]);
$sendGlobal = true;
$couponAlert = true;
}
// --- Check MaxDateDiffusion
if($coupon->coupon_maxdatediffusion != null && strtotime($coupon->coupon_maxdatediffusion) < (time() + (30*24*60*60))){ //Fin de diffusion dans moins de 30jours
array_push($couponDiffusion, $coupon);
array_push($couponDiffusionGlobal, [$site->site_nom , $coupon]);
$sendGlobal = true;
$couponAlert = true;
}
if($couponAlert){
$campagnes = $coupon->campagnes()->get();
foreach ($campagnes as $campagne) {
if($couponAlert){
$notifications = Notification::where(['notif_campId' => $campagne->camp_id])->get();
foreach ($notifications as $notification) {
if(!array_key_exists($notification->notif_id, $users)){
@ -83,11 +83,11 @@ class Kernel extends ConsoleKernel
}
}
}
$sendMail = true;
}
}
if($sendMail){
Mail::to($users)->send(new AlertBr($couponSeuil, $couponDiffusion, $site->site_nom));
if($sendMail){
Mail::to($users)->send(new AlertBr($couponSeuil, $couponDiffusion, $site->site_nom));
}
}
}
if($sendGlobal) {

20
app/Traits/GenerateBR.php
View file

@ -129,6 +129,21 @@ trait GenerateBR {
$this->imagettftextSp($ImageFond , 12 , 0, 0, $y, $black, $arialbd, $textReduc, 0.01);
$y= $y+18;
}
imagecolortransparent($ImageFond, $white);
imagecopy($mask, $ImageFond, 360, 170, 0, 0, imagesx($ImageFond), imagesy($ImageFond));
} elseif(strlen($textReduc) > 200) {
$ImageFond = imagecreate(387, 205);
$white = imagecolorallocate($ImageFond, 255, 255, 255);
$black = imagecolorallocate($ImageFond, 0, 0, 0);
$textReducs = explode("\r\n", $textReduc);
$y = 10;
foreach ($textReducs as $textReduc) {
$this->imagettftextSp($ImageFond , 9 , 0, 0, $y, $black, $arialbd, $textReduc, 0.01);
$y= $y+12;
}
imagecolortransparent($ImageFond, $white);
imagecopy($mask, $ImageFond, 360, 165, 0, 0, imagesx($ImageFond), imagesy($ImageFond));
} else {
$ImageFond = imagecreate(387, 200);
$white = imagecolorallocate($ImageFond, 255, 255, 255);
@ -140,10 +155,11 @@ trait GenerateBR {
$this->imagettftextSp($ImageFond , 10 , 0, 0, $y, $black, $arialbd, $textReduc, 0.01);
$y= $y+12;
}
imagecolortransparent($ImageFond, $white);
imagecopy($mask, $ImageFond, 360, 170, 0, 0, imagesx($ImageFond), imagesy($ImageFond));
}
//imagettftext($ImageFond , 12 , 0, 0, 14, $black, $arialbd, $textReduc);
imagecolortransparent($ImageFond, $white);
imagecopy($mask, $ImageFond, 360, 170, 0, 0, imagesx($ImageFond), imagesy($ImageFond));
// ---- Copie le produit dans le mask
$size = getimagesize($product_image);

2
config/constants.php
View file

@ -5,7 +5,7 @@ return [
'delctrlcontact' => 2,
'impression' => 3,
'updatecontact' => 4,
'colors' => ['#ffe258', '#8c86ff', '#86ffbc', '#86caff', '#ff86e7', '#b986ff', '#ff869d', '#b9ff86', '#cdff86']
'colors' => ['#ffe258', '#8c86ff', '#86ffbc', '#ffc286', '#86caff', '#ff86e7', '#ff869d', '#b9ff86', '#e7ff86', '#b986ff', '#ffae86', '#5c60ff', '#ff5c5c', '#3ba33b']
];
?>

8
resources/views/coupon/create.blade.php
View file

@ -100,21 +100,21 @@
<h4>Vignettes</h4>
<div class="form-split">
<div class="form-field">
{!! Form::label('coupon_thumbnail1', 'Vignette 1 active') !!}
{!! Form::label('coupon_thumbnail1', 'Vignette Desktop active') !!}
{!! Form::file('coupon_thumbnail1', ['class' => 'input-file']) !!}
</div>
<div class="form-field">
{!! Form::label('coupon_thumbnail2', 'Vignette 1 grise') !!}
{!! Form::label('coupon_thumbnail2', 'Vignette Desktop grise') !!}
{!! Form::file('coupon_thumbnail2', ['class' => 'input-file']) !!}
</div>
</div>
<div class="form-split">
<div class="form-field">
{!! Form::label('coupon_thumbnail3', 'Vignette 2 active') !!}
{!! Form::label('coupon_thumbnail3', 'Vignette Mobile active') !!}
{!! Form::file('coupon_thumbnail3', ['class' => 'input-file']) !!}
</div>
<div class="form-field">
{!! Form::label('coupon_thumbnail4', 'Vignette 2 grise') !!}
{!! Form::label('coupon_thumbnail4', 'Vignette Mobile grise') !!}
{!! Form::file('coupon_thumbnail4', ['class' => 'input-file']) !!}
</div>
</div>

8
resources/views/coupon/edit.blade.php
View file

@ -129,7 +129,7 @@
<h4>Vignettes</h4>
<div class="form-split">
<div class="form-field">
{!! Form::label('coupon_thumbnail1', 'Vignette 1 active') !!}
{!! Form::label('coupon_thumbnail1', 'Vignette Desktop active') !!}
{!! Form::file('coupon_thumbnail1', ['class' => 'input-file']) !!}
@if($coupon->coupon_thumbnail1 != "")
<figure class="figure-desktop">
@ -139,7 +139,7 @@
{!! Form::input('hidden', 'coupon_thumbnail1_hidden', $coupon->coupon_thumbnail1) !!}
</div>
<div class="form-field">
{!! Form::label('coupon_thumbnail2', 'Vignette 1 grise') !!}
{!! Form::label('coupon_thumbnail2', 'Vignette Desktop grise') !!}
{!! Form::file('coupon_thumbnail2', ['class' => 'input-file']) !!}
@if($coupon->coupon_thumbnail2 != "")
<figure class="figure-desktop">
@ -151,7 +151,7 @@
</div>
<div class="form-split align-start">
<div class="form-field">
{!! Form::label('coupon_thumbnail3', 'Vignette 2 active') !!}
{!! Form::label('coupon_thumbnail3', 'Vignette Mobile active') !!}
{!! Form::file('coupon_thumbnail3', ['class' => 'input-file']) !!}
@if($coupon->coupon_thumbnail3 != "")
<figure class="figure-mobile">
@ -161,7 +161,7 @@
{!! Form::input('hidden', 'coupon_thumbnail3_hidden', $coupon->coupon_thumbnail3) !!}
</div>
<div class="form-field">
{!! Form::label('coupon_thumbnail4', 'Vignette 2 grise') !!}
{!! Form::label('coupon_thumbnail4', 'Vignette Mobile grise') !!}
{!! Form::file('coupon_thumbnail4', ['class' => 'input-file']) !!}
@if($coupon->coupon_thumbnail4 != "")
<figure class="figure-mobile">

323
resources/views/stats/index.blade.php
View file

@ -21,7 +21,7 @@
<i class="fas fa-times-circle red"></i>
@endif
</p>
<p><a href="{{ route('camp.stats', $campagne) }}">{{ $campagne->camp_name }}</a></p>
<p><a href="{{ route('camp.stats', $campagne) }}">{{ $campagne->camp_name }} ({{ $campagne->camp_id }})</a></p>
<p>{{ $campagne->camp_type }}</p>
<p>{{ $campagne->coupons->count() }} Coupon(s) <i class="fas fa-exclamation-triangle red"></i></p>
<p>{{ date('d/m/Y', strtotime($campagne->camp_createdate)) }}</p>
@ -76,324 +76,3 @@
@endforeach
<svg></svg>
@endsection
@section('scripts')
<script>
// var data = [
// {
// date: new Date(2019, 1, 4, 1,0,0,0),
// countA: 70,
// countB: 24
// },
// {
// date: new Date(2019, 1, 5, 1,0,0,0),
// countA: 76,
// countB: 45
// },
// {
// date: new Date(2019, 1, 6, 1,0,0,0),
// countA: 89,
// countB: 12
// },
// {
// date: new Date(2019, 1, 7, 1,0,0,0),
// countA: 34,
// countB: 64
// },
// {
// date: new Date(2019, 1, 8, 1,0,0,0),
// countA: 46,
// countB: 54
// },
// {
// date: new Date(2019, 1, 9, 1,0,0,0),
// countA: 61,
// countB: 36
// },
// {
// date: new Date(2019, 1, 10, 1,0,0,0),
// countA: 84,
// countB: 42
// },
// {
// date: new Date(2019, 1, 11, 1,0,0,0),
// countA: 22,
// countB: 44
// },
// {
// date: new Date(2019, 1, 12, 1,0,0,0),
// countA: 101,
// countB: 84
// },
// {
// date: new Date(2019, 1, 13, 1,0,0,0),
// countA: 59,
// countB: 11
// }
// ];
// document.addEventListener("DOMContentLoaded", function(event) {
// data.forEach(function (d) {
// d.year = +d.year;
// d.countA = +d.countA;
// d.countB = +d.countB;
// });
// var chart = makeLineChart(data, 'date', {
// 'Count A': {column: 'countA', name: 'Test', color: '#000'},
// 'Count B': {column: 'countB', name: 'Test', color: '#BBBBBB'},
// }, {xAxis: 'Date', yAxis: 'Montant imprimé'});
// chart.bind("#chart-line1");
// chart.render();
// });
// // function drawChart(data) {
// // var svgWidth = 600, svgHeight = 400;
// // var margin = { top: 20, right: 20, bottom: 30, left: 50 };
// // var width = svgWidth - margin.left - margin.right;
// // var height = svgHeight - margin.top - margin.bottom;
// // var svg = d3.select('svg')
// // .attr("width", svgWidth)
// // .attr("height", svgHeight);
// // var g = svg.append("g")
// // .attr("transform",
// // "translate(" + margin.left + "," + margin.top + ")"
// // );
// // var x = d3.scaleTime().rangeRound([0, width]);
// // var y = d3.scaleLinear().rangeRound([height, 0]);
// // var line = d3.line()
// // .x(function(d) { return x(d.date)})
// // .y(function(d) { return y(d.count)})
// // x.domain(d3.extent(data, function(d) { return d.date }));
// // y.domain(d3.extent(data, function(d) { return d.count }));
// // g.append("g")
// // .attr("transform", "translate(0," + height + ")")
// // .call(d3.axisBottom(x))
// // .select(".domain")
// // .remove();
// // g.append("g")
// // .call(d3.axisLeft(y))
// // .append("text")
// // .attr("fill", "#000")
// // .attr("transform", "rotate(-90)")
// // .attr("y", 6)
// // .attr("dy", "0.71em")
// // .attr("text-anchor", "end")
// // .text("Nombre");
// // g.append("path")
// // .datum(data)
// // .attr("fill", "none")
// // .attr("stroke", "steelblue")
// // .attr("stroke-linejoin", "round")
// // .attr("stroke-linecap", "round")
// // .attr("stroke-width", 1.5)
// // .attr("d", line);
// // }
// function makeLineChart(dataset, xName, yObjs, axisLables) {
// var chartObj = {};
// var color = d3.schemeCategory10;
// chartObj.xAxisLable = axisLables.xAxis;
// chartObj.yAxisLable = axisLables.yAxis;
// /*
// yObjsects format:
// {y1:{column:'',name:'name',color:'color'},y2}
// */
// chartObj.data = dataset;
// chartObj.margin = {top: 15, right: 60, bottom: 30, left: 50};
// chartObj.width = 650 - chartObj.margin.left - chartObj.margin.right;
// chartObj.height = 480 - chartObj.margin.top - chartObj.margin.bottom;
// // So we can pass the x and y as strings when creating the function
// chartObj.xFunct = function(d){return d[xName]};
// // For each yObjs argument, create a yFunction
// function getYFn(column) {
// return function (d) {
// return d[column];
// };
// }
// // Object instead of array
// chartObj.yFuncts = [];
// for (var y in yObjs) {
// yObjs[y].name = y;
// yObjs[y].yFunct = getYFn(yObjs[y].column); //Need this list for the ymax function
// chartObj.yFuncts.push(yObjs[y].yFunct);
// }
// //Formatter functions for the axes
// chartObj.formatAsNumber = d3.format(".0f");
// chartObj.formatAsDecimal = d3.format(".2f");
// chartObj.formatAsCurrency = d3.format("$.2f");
// chartObj.formatAsFloat = function (d) {
// if (d % 1 !== 0) {
// return d3.format(".2f")(d);
// } else {
// return d3.format(".0f")(d);
// }
// };
// chartObj.xFormatter = chartObj.formatAsNumber;
// chartObj.yFormatter = chartObj.formatAsFloat;
// chartObj.bisectYear = d3.bisector(chartObj.xFunct).left; //< Can be overridden in definition
// //Create scale functions
// chartObj.xScale = d3.scaleLinear().range([0, chartObj.width]).domain(d3.extent(chartObj.data, chartObj.xFunct)); //< Can be overridden in definition
// // Get the max of every yFunct
// chartObj.max = function (fn) {
// return d3.max(chartObj.data, fn);
// };
// chartObj.yScale = d3.scaleLinear().range([chartObj.height, 0]).domain([0, d3.max(chartObj.yFuncts.map(chartObj.max))]);
// chartObj.formatAsYear = d3.format("");
// //Create axis
// chartObj.xAxis = d3.axisBottom(chartObj.xScale).tickFormat(chartObj.xFormatter); //< Can be overridden in definition
// chartObj.yAxis = d3.axisLeft(chartObj.yScale).tickFormat(chartObj.yFormatter); //< Can be overridden in definition
// // Build line building functions
// function getYScaleFn(yObj) {
// return function (d) {
// return chartObj.yScale(yObjs[yObj].yFunct(d));
// };
// }
// for (var yObj in yObjs) {
// yObjs[yObj].line = d3.line().x(function (d) {
// return chartObj.xScale(chartObj.xFunct(d));
// }).y(getYScaleFn(yObj)).curve(d3.curveNatural);
// }
// chartObj.svg;
// // Change chart size according to window size
// chartObj.update_svg_size = function () {
// chartObj.width = parseInt(chartObj.chartDiv.style("width"), 10) - (chartObj.margin.left + chartObj.margin.right);
// chartObj.height = parseInt(chartObj.chartDiv.style("height"), 10) - (chartObj.margin.top + chartObj.margin.bottom);
// /* Update the range of the scale with new width/height */
// chartObj.xScale.range([0, chartObj.width]);
// chartObj.yScale.range([chartObj.height, 0]);
// if (!chartObj.svg) {return false;}
// /* Else Update the axis with the new scale */
// chartObj.svg.select('.x.axis').attr("transform", "translate(0," + chartObj.height + ")").call(chartObj.xAxis);
// chartObj.svg.select('.x.axis .label').attr("x", chartObj.width / 2);
// chartObj.svg.select('.y.axis').call(chartObj.yAxis);
// chartObj.svg.select('.y.axis .label').attr("x", -chartObj.height / 2);
// /* Force D3 to recalculate and update the line */
// for (var y in yObjs) {
// yObjs[y].path.attr("d", yObjs[y].line);
// }
// d3.selectAll(".focus.line").attr("y2", chartObj.height);
// chartObj.chartDiv.select('svg').attr("width", chartObj.width + (chartObj.margin.left + chartObj.margin.right)).attr("height", chartObj.height + (chartObj.margin.top + chartObj.margin.bottom));
// chartObj.svg.select(".overlay").attr("width", chartObj.width).attr("height", chartObj.height);
// return chartObj;
// };
// chartObj.bind = function (selector) {
// chartObj.mainDiv = d3.select(selector);
// // Add all the divs to make it centered and responsive
// chartObj.mainDiv.append("div").attr("class", "inner-wrapper").append("div").attr("class", "outer-box").append("div").attr("class", "inner-box");
// chartSelector = selector + " .inner-box";
// chartObj.chartDiv = d3.select(chartSelector);
// d3.select(window).on('resize.' + chartSelector, chartObj.update_svg_size);
// chartObj.update_svg_size();
// return chartObj;
// };
// // Render the chart
// chartObj.render = function () {
// //Create SVG element
// chartObj.svg = chartObj.chartDiv.append("svg").attr("class", "chart-area").attr("width", chartObj.width + (chartObj.margin.left + chartObj.margin.right)).attr("height", chartObj.height + (chartObj.margin.top + chartObj.margin.bottom)).append("g").attr("transform", "translate(" + chartObj.margin.left + "," + chartObj.margin.top + ")");
// // Draw Lines
// for (var y in yObjs) {
// yObjs[y].path = chartObj.svg.append("path").datum(chartObj.data).attr("class", "line").attr("d", yObjs[y].line).style("stroke", yObjs[y].color).attr("data-series", y).on("mouseover", function () {
// focus.style("display", null);
// }).on("mouseout", function () {
// focus.transition().delay(700).style("display", "none");
// }).on("mousemove", mousemove);
// }
// // Draw Axis
// chartObj.svg.append("g").attr("class", "x axis").attr("transform", "translate(0," + chartObj.height + ")").call(chartObj.xAxis).append("text").attr("class", "label").attr("x", chartObj.width / 2).attr("y", 30).style("text-anchor", "middle").text(chartObj.xAxisLable);
// chartObj.svg.append("g").attr("class", "y axis").call(chartObj.yAxis).append("text").attr("class", "label").attr("transform", "rotate(-90)").attr("y", -42).attr("x", -chartObj.height / 2).attr("dy", ".71em").style("text-anchor", "middle").text(chartObj.yAxisLable);
// //Draw tooltips
// var focus = chartObj.svg.append("g").attr("class", "focus").style("display", "none");
// for (var y in yObjs) {
// yObjs[y].tooltip = focus.append("g");
// yObjs[y].tooltip.append("circle").attr("r", 5);
// yObjs[y].tooltip.append("rect").attr("x", 8).attr("y","-5").attr("width",22).attr("height",'0.75em');
// yObjs[y].tooltip.append("text").attr("x", 9).attr("dy", ".35em");
// }
// // Year label
// focus.append("text").attr("class", "focus year").attr("x", 9).attr("y", 7);
// // Focus line
// focus.append("line").attr("class", "focus line").attr("y1", 0).attr("y2", chartObj.height);
// //Draw legend
// var legend = chartObj.mainDiv.append('div').attr("class", "legend");
// for (var y in yObjs) {
// series = legend.append('div');
// series.append('div').attr("class", "series-marker").style("background-color", "#b20000");
// series.append('p').text(y);
// yObjs[y].legend = series;
// }
// // Overlay to capture hover
// chartObj.svg.append("rect").attr("class", "overlay").attr("width", chartObj.width).attr("height", chartObj.height).on("mouseover", function () {
// focus.style("display", null);
// }).on("mouseout", function () {
// focus.style("display", "none");
// }).on("mousemove", mousemove);
// return chartObj;
// function mousemove() {
// var x0 = chartObj.xScale.invert(d3.mouse(this)[0]), i = chartObj.bisectYear(dataset, x0, 1), d0 = chartObj.data[i - 1], d1 = chartObj.data[i];
// try {
// var d = x0 - chartObj.xFunct(d0) > chartObj.xFunct(d1) - x0 ? d1 : d0;
// } catch (e) { return;}
// minY = chartObj.height;
// for (var y in yObjs) {
// yObjs[y].tooltip.attr("transform", "translate(" + chartObj.xScale(chartObj.xFunct(d)) + "," + chartObj.yScale(yObjs[y].yFunct(d)) + ")");
// yObjs[y].tooltip.select("text").text(chartObj.yFormatter(yObjs[y].yFunct(d)));
// minY = Math.min(minY, chartObj.yScale(yObjs[y].yFunct(d)));
// }
// focus.select(".focus.line").attr("transform", "translate(" + chartObj.xScale(chartObj.xFunct(d)) + ")").attr("y1", minY);
// focus.select(".focus.year").text("Year: " + chartObj.xFormatter(chartObj.xFunct(d)));
// }
// };
// return chartObj;
// }
</script>
@endsection