wip #3753 @0.25

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
index c30d1b0b4e5bd3342a1de697a33eb02ab8d27eec..b9a16cc4f2d24673cd31313b186cfd3eada703ce 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
@@ -3,7 +3,6 @@
 
 namespace App\Http\Controllers\Admin\Operations\FluidbookQuote;
 
-
 use App\Http\Middleware\Authenticate;
 use App\Http\Middleware\CheckIfAdmin;
 use App\Http\Middleware\VerifyCsrfToken;
@@ -72,10 +71,10 @@ trait CreateFromWebsite
                 $quote->coupon = $post['coupon'];
                 $quote->gclid = $post['gclid'];
                 $quote->reseller = 0;
+                $quote->admin = 0;
                 $quote->status = 0;
                 $quote->conversion = 0;
-                $quote->admin = 0;
-                $quote->user = $user->id;
+                $quote->setAttribute('user', $user->id);
                 $quote->save();
             }
 

diff --git a/app/Models/FluidbookQuote.php b/app/Models/FluidbookQuote.php
index c4a633c61b1de60e8abac61cf6fe998530a477e5..0292f4f2da1ac3142f2c895af71365ce848ec03a 100644 (file)
--- a/app/Models/FluidbookQuote.php
+++ b/app/Models/FluidbookQuote.php
@@ -63,6 +63,15 @@ class FluidbookQuote extends CubistMagicAbstractModel
             1 => 'Devis en cours',
             2 => 'Devis refusé',
             3 => 'Projet validé',
+            4 => 'Déjà client',
         ], 'column' => true]);
+
+        $this->addField('origin_column', 'ModelAttribute', 'Origine', ['column' => true, 'attribute' => 'origin']);
+        $this->addField('fluidbooks', 'ModelAttribute', 'Fluidbooks', ['column' => true, 'attribute' => 'user.e1_ws_count']);
+    }
+
+    public function getOriginAttribute()
+    {
+        return $this->getAttribute('gclid') ? 'Paid' : 'Organic';
     }
 }

diff --git a/composer.lock b/composer.lock
index f884447054219d650339a9e81ef9e323bd216d28..792b849ec6f4b6edacd78aa77562c503361ff555 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b363d708ea1214f29e5b04cd7c489912",
+    "content-hash": "f3d61fdde3fd92f5d104e6de7521d7e5",
     "packages": [
         {
             "name": "backpack/backupmanager",
@@ -990,13 +990,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "33230176b8eb3cb34f3b4e24698b2df46d6df3c7"
+                "reference": "10088864870b63e2a3d27e3e9b3cc25c8cbe4019"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-92be34.tar",
-                "reference": "33230176b8eb3cb34f3b4e24698b2df46d6df3c7",
-                "shasum": "0211980d2e273299902a12d9ea1b0b9592164bb5"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-26ae6b.tar",
+                "reference": "10088864870b63e2a3d27e3e9b3cc25c8cbe4019",
+                "shasum": "763d02b2f8b22febab7c26e19e302ecd1b118ccd"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
@@ -1017,7 +1017,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2020-11-05T19:13:12+00:00"
+            "time": "2020-11-25T20:21:18+00:00"
         },
         {
             "name": "cubist/cms-back",
@@ -1025,13 +1025,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "2f3cb158c63903fdb9c473ef1d488ca89c671f3f"
+                "reference": "13f6dcc2a9b77b14e2614f671f961719da607f88"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-5c64c7.tar",
-                "reference": "2f3cb158c63903fdb9c473ef1d488ca89c671f3f",
-                "shasum": "e34c683959187cda41b0c021f303474b98cae349"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-3abbad.tar",
+                "reference": "13f6dcc2a9b77b14e2614f671f961719da607f88",
+                "shasum": "85246384ed16f7f923851ec105b45ab79cc8bce3"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1106,7 +1106,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-11-25T11:45:09+00:00"
+            "time": "2020-11-26T08:09:07+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -1353,13 +1353,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "6acf40c0dc413f8ef3a7873be753d64021e99721"
+                "reference": "9a5716478a1400bbfa1874686550648fc08066e7"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-b13272.tar",
-                "reference": "6acf40c0dc413f8ef3a7873be753d64021e99721",
-                "shasum": "e694e699880245c20d439ef292f52c1e5325231e"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-6fcee9.tar",
+                "reference": "9a5716478a1400bbfa1874686550648fc08066e7",
+                "shasum": "ac575cbf050f9f127975293a92b9d25e6a347c84"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -1388,7 +1388,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2020-03-11T13:58:32+00:00"
+            "time": "2020-11-25T20:09:36+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
@@ -4948,37 +4948,36 @@
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "6.12.0",
+            "version": "6.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "0690862ae2c64e1a2f03fa9990925313696db71d"
+                "reference": "08a76a1366c3cc98ec3ddd4ce90a28c3b73cc8bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/0690862ae2c64e1a2f03fa9990925313696db71d",
-                "reference": "0690862ae2c64e1a2f03fa9990925313696db71d",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/08a76a1366c3cc98ec3ddd4ce90a28c3b73cc8bf",
+                "reference": "08a76a1366c3cc98ec3ddd4ce90a28c3b73cc8bf",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^5.8.15|^6.0|^7.0|^8.0",
-                "illuminate/contracts": "^5.8.15|^6.0|^7.0|^8.0",
-                "illuminate/events": "^5.8.15|^6.0|^7.0|^8.0",
-                "illuminate/filesystem": "^5.8.15|^6.0|^7.0|^8.0",
-                "illuminate/notifications": "^5.8.15|^6.0|^7.0|^8.0",
-                "illuminate/support": "^5.8.15|^6.0|^7.0|^8.0",
+                "illuminate/console": "^6.0|^7.0|^8.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0",
+                "illuminate/events": "^6.0|^7.0|^8.0",
+                "illuminate/filesystem": "^6.0|^7.0|^8.0",
+                "illuminate/notifications": "^6.0|^7.0|^8.0",
+                "illuminate/support": "^6.0|^7.0|^8.0",
                 "league/flysystem": "^1.0.49",
-                "php": "^7.3",
+                "php": "^7.3|^8.0",
                 "spatie/db-dumper": "^2.12",
                 "spatie/temporary-directory": "^1.1",
                 "symfony/finder": "^4.2|^5.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.16",
-                "laravel/slack-notification-channel": "^1.0",
+                "laravel/slack-notification-channel": "^2.3",
                 "league/flysystem-aws-s3-v3": "^1.0",
-                "mockery/mockery": "^1.3",
-                "orchestra/testbench": "3.8.*|4.*|5.*|6.*",
+                "mockery/mockery": "^1.4.2",
+                "orchestra/testbench": "4.*|5.*|6.*",
                 "phpunit/phpunit": "^8.4|^9.0"
             },
             "suggest": {
@@ -5020,7 +5019,7 @@
                 "laravel-backup",
                 "spatie"
             ],
-            "time": "2020-11-19T14:35:13+00:00"
+            "time": "2020-11-25T12:24:28+00:00"
         },
         {
             "name": "spatie/laravel-googletagmanager",
@@ -8429,6 +8428,7 @@
                 "faker",
                 "fixtures"
             ],
+            "abandoned": true,
             "time": "2019-12-12T13:22:17+00:00"
         },
         {
@@ -10420,7 +10420,8 @@
         "php": ">=7.4",
         "ext-simplexml": "*",
         "ext-tidy": "*",
-        "ext-zip": "*"
+        "ext-zip": "*",
+        "ext-json": "*"
     },
     "platform-dev": []
 }