wip #7482 @0.5

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
index 7e95d791a74eb4d1cdbfd4bcb1a371d1a6717348..ea66a025e216f75b8a52b75125dd216a0d8d5262 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
@@ -95,6 +95,7 @@ trait CreateFromWebsite
                 $quote->message = $post['detail'];
                 $quote->coupon = $post['coupon'];
                 $quote->gclid = $post['gclid'];
+                $quote->project_type = $post['project_type'] ?? 'fluidbook';
                 $quote->reseller = 0;
                 $quote->admin = 0;
                 $quote->status = 0;
@@ -107,7 +108,7 @@ trait CreateFromWebsite
             if ($post && !$spam) {
                 try {
                     $quote->slack_ts = Mattermost::send(Mattermost::fluidbookQuoteChannel, 'Demande de devis', FluidbookQuoteReceived::getMarkdown($post),
-                        ['Je vais voir' => backpack_url('fluidbook-quote', ['status' => 0]),
+                        ['Je vais voir' => backpack_url('fluidbook-quote?status=0'),
                             'Je m\'en charge' => ['url' => backpack_url('fluidbook-quote/' . $quote->id . '/assign/me'), 'style' => 'primary'],
                             'C\'est du SPAM' => ['url' => backpack_url('fluidbook-quote/' . $quote->id . '/spam'), 'style' => 'danger'],
                         ], false);

diff --git a/app/Mail/FluidbookQuoteReceived.php b/app/Mail/FluidbookQuoteReceived.php
index 4cbc27a966b120510687de179d62189b7f11f092..e6e4af515044a87cb4e96564486c29e641509778 100644 (file)
--- a/app/Mail/FluidbookQuoteReceived.php
+++ b/app/Mail/FluidbookQuoteReceived.php
@@ -44,6 +44,7 @@ class FluidbookQuoteReceived extends Base
     {
         $fields = array(
             'spam' => 'Demande SPAM',
+            'project_type'=>'Type de projet',
             'prenom' => 'Prenom',
             'nom' => 'Nom',
             'email' => 'E-mail',

diff --git a/app/Models/FluidbookQuote.php b/app/Models/FluidbookQuote.php
index c679b69bc6656a7375c4b81a6da4e9d8d7222865..48d611518524325dd1849e3dab93804aaf5da707 100644 (file)
--- a/app/Models/FluidbookQuote.php
+++ b/app/Models/FluidbookQuote.php
@@ -16,6 +16,7 @@ use Cubist\Backpack\Magic\Fields\Hidden;
 use Cubist\Backpack\Magic\Fields\Integer;
 use Cubist\Backpack\Magic\Fields\ModelAttribute;
 use Cubist\Backpack\Magic\Fields\Number;
+use Cubist\Backpack\Magic\Fields\SelectFromArray;
 use Cubist\Backpack\Magic\Fields\StaticValue;
 
 // __('!! Demandes de devis fluidbook')
@@ -75,6 +76,7 @@ class FluidbookQuote extends ToolboxModel
         $this->addField('pages', Hidden::class, __('Pages'));
         $this->addField('links', Hidden::class, __('Liens'));
         $this->addField('langs', Hidden::class, __('Langues'));
+        $this->addField('project_type', SelectFromArray::class, __('Type de projet'), ['default' => 'fluidbook', 'options' => ['fluidbook' => 'Fluidbook', 'elearning' => 'ELearning'],'filter'=>true, 'column' => true]);
 
         $this->addField('gclid', 'Text', 'Google Adwords ID (gclid)', ['can' => 'fluidbook-quote:admin',]);