wait #6172 mail dynamique

diff --git a/.env.dev b/.env.dev
index 5bb4442ab8ad0c97f61ee60d23bbeaacf062dc6a..a9fda084775692c6b7b5eab140af88efbb53d9c9 100644 (file)
--- a/.env.dev
+++ b/.env.dev
@@ -33,6 +33,7 @@ MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b
 MAIL_ENCRYPTION=tls
 MAIL_FROM_ADDRESS=web@pm-instrumentation.com
 MAIL_FROM_NAME="PM-Instrumentation"
+MAIL_TO_ADDRESS=soufiane@cubedesigners.com
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

diff --git a/.env.production b/.env.production
index 58f25774056f7ac9ba01bf1dc4f0cf8ff383e5e5..1bbecaa368a2d6c4a6eeb797a0916606179de433 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -32,6 +32,7 @@ MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b
 MAIL_ENCRYPTION=tls
 MAIL_FROM_ADDRESS=web@pm-instrumentation.com
 MAIL_FROM_NAME="PM-Instrumentation"
+MAIL_TO_ADDRESS=contact@pm-instrumentation.com
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

diff --git a/.env.staging b/.env.staging
new file mode 100644 (file)
index 0000000..0c89144
--- /dev/null
+++ b/.env.staging
@@ -0,0 +1,64 @@
+APP_NAME=PMI
+APP_ENV=production
+APP_KEY=base64:/Jmlg7TepI/inQ4KJ3VF0YVTqghRGvvBrnDI7NkUk94=
+APP_DEBUG=true
+APP_URL=https://staging.pm-instrumentation.com
+APP_VARIANTS=PMI,MICHSCI
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=localhost
+DB_PORT=3306
+DB_DATABASE=pmi
+DB_USERNAME=pmi
+DB_PASSWORD=ZJMcD6nAc3xnLjLVKZ2iWi69
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=memcached
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+SESSION_DOMAIN=.pm-instrumentation.com,.michsci-europe.com
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=in-v3.mailjet.com
+MAIL_PORT=587
+MAIL_USERNAME=ca110b35f8735c223d69c9987c2ac47d
+MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=web@pm-instrumentation.com
+MAIL_FROM_NAME="PM-Instrumentation"
+MAIL_TO_ADDRESS=contact@pm-instrumentation.com
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SEO_ROBOTS=false
+
+GOOGLE_ANALYTICS_ID=UA-4339912-10
+BACKPACK_LICENSE=YwdOWjeEczPAwy06GzkBJggW
+
+CUBIST_INTERNAL_SEARCH=true
+CUBIST_INTERNAL_SEARCH_INDEX=pmi_production
+
+ELASTICSEARCH_HOST=127.0.0.1
+ELASTICSEARCH_PORT=9200
+ELASTICSEARCH_SCHEME=http
+ELASTICSEARCH_USER=
+ELASTICSEARCH_PASS=
+
+FEATURE_QUOTE=true
+FEATURE_NEWS=true
+FEATURE_SEARCH=true
+FEATURE_I18N=true
+FEATURE_TEAM=true
+FEATURE_CLIENTS=true

diff --git a/app/Http/Controllers/Admin/ProductBaseController.php b/app/Http/Controllers/Admin/ProductBaseController.php
index 6babbfdcb0907a336dbfa8a3ae005af83fd3ba3c..9d719d0f9a424e97f6f6125e4739f6c86c901aef 100644 (file)
--- a/app/Http/Controllers/Admin/ProductBaseController.php
+++ b/app/Http/Controllers/Admin/ProductBaseController.php
@@ -237,7 +237,7 @@ class ProductBaseController extends CubistMagicController {
         Mail::raw($contents, function ($message) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->sender(config('mail.from.address'), config('mail.from.name'));
-            $message->to(env('MAIL_TO_ADDRESS'));
+            $message->to(config('mail.to'));
             $message->bcc('test+pmi@cubedesigners.com');
             $message->subject("[PMI] Import des fiches produits");
         });

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 59631ed696d90ef5445050b7e87444ae44148d19..1112208068ee67f56d7370d9b50e38979489a3a0 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -126,7 +126,6 @@ class AjaxController extends CubistFrontController
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->sender(config('mail.from.address'), config('mail.from.name'));
             $message->bcc('test+pmi@cubedesigners.com');
-            $message->to('soufiane@cubedesigners.com');
             if($recipient) {
                 $message->to($recipient);
             }

diff --git a/config/mail.php b/config/mail.php
index 83dd8747025fa33de485592ed20c07c27a88ba00..e1efb2e4803f4eb05f15722f2aa58ebe9c6616d6 100644 (file)
--- a/config/mail.php
+++ b/config/mail.php
@@ -60,6 +60,8 @@ return [
         'name' => env('MAIL_FROM_NAME', 'PM-Instrumentation'),
     ],
 
+    'to' => env('MAIL_TO_ADDRESS'),
+
     /*
     |--------------------------------------------------------------------------
     | E-Mail Encryption Protocol