From: Vincent Vanwaelscappel Date: Mon, 14 Apr 2025 13:25:45 +0000 (+0200) Subject: wip #7482 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3a8673f3d73c2a8d939b45d4ed50952d2f02280f;p=fluidbook-toolbox.git 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 7e95d791a..ea66a025e 100644 --- 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 4cbc27a96..e6e4af515 100644 --- 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 c679b69bc..48d611518 100644 --- 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',]);