From f007d5fb44fe7d26f7b5158d19387aaef197fcb1 Mon Sep 17 00:00:00 2001 From: Thibault Richy Date: Mon, 18 Mar 2019 09:40:02 +0100 Subject: [PATCH] =?UTF-8?q?Pause=20on=20coupons=20/=20Change=20statut=20to?= =?UTF-8?q?=20publi=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/app.css | 4 ++++ resources/sass/partials/content.scss | 3 +++ resources/views/campagne/index.blade.php | 2 +- resources/views/coupon/index.blade.php | 2 +- resources/views/stats/detail.blade.php | 6 +++++- resources/views/stats/index.blade.php | 6 +++++- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 63dcf6a..358fdda 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -6184,6 +6184,10 @@ main section .red { color: #d70000; } +main section .orange { + color: #de9700; +} + main section .campagne-list, main section .notifs-wrapper { margin-top: 30px; } diff --git a/resources/sass/partials/content.scss b/resources/sass/partials/content.scss index ea9b373..9f6f165 100644 --- a/resources/sass/partials/content.scss +++ b/resources/sass/partials/content.scss @@ -81,6 +81,9 @@ table { .red { color:#d70000; } +.orange { + color:$orange; +} .campagne-list, .notifs-wrapper { margin-top:30px; diff --git a/resources/views/campagne/index.blade.php b/resources/views/campagne/index.blade.php index 7839e7f..7788bcf 100644 --- a/resources/views/campagne/index.blade.php +++ b/resources/views/campagne/index.blade.php @@ -9,7 +9,7 @@ {{__('Ref') }} {{__('Nom') }} {{__('Création') }} - {{__('Status')}} + {{__('Publié ?')}} {{__('Démo')}} diff --git a/resources/views/coupon/index.blade.php b/resources/views/coupon/index.blade.php index ad10713..1f7ea7e 100644 --- a/resources/views/coupon/index.blade.php +++ b/resources/views/coupon/index.blade.php @@ -14,7 +14,7 @@ {{__('Quantité') }} {{__('Qte restante') }} {{__('Qte Diffusé') }} - {{__('Status')}} + {{__('Publié ?')}} diff --git a/resources/views/stats/detail.blade.php b/resources/views/stats/detail.blade.php index c083a99..ea60e58 100644 --- a/resources/views/stats/detail.blade.php +++ b/resources/views/stats/detail.blade.php @@ -102,7 +102,11 @@ @if ( $coupon->isPrintable == 1)

Imprimable ?

@else -

Imprimable ?

+ @if ( $coupon->coupon_published == 0) +

Imprimable ?

+ @else +

Imprimable ?

+ @endif @endif diff --git a/resources/views/stats/index.blade.php b/resources/views/stats/index.blade.php index e37ba01..fa3c52e 100644 --- a/resources/views/stats/index.blade.php +++ b/resources/views/stats/index.blade.php @@ -57,7 +57,11 @@ @if ( $coupon->isPrintable == 1) @else - + @if ( $coupon->coupon_published == 0) + + @else + + @endif @endif {{--

{{$coupon->remain}}/{{$coupon->quantity}}

--}}