wip #6278 @0.5

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index 43a135ddeaeeffc870b65eab974ac7d11025aaae..f63c1493d18105f1bb3bbf3e5e7cb22218ccc51e 100644 (file)
--- a/.docker/production/docker-compose.yml
+++ b/.docker/production/docker-compose.yml
@@ -54,8 +54,8 @@ services:
     restart: unless-stopped
     environment:
       ADMINER_DEFAULT_SERVER: pmi-mariadb
-      VIRTUAL_HOST: adminer.www.pm-instrumentation.com
-      LETSENCRYPT_HOST: adminer.www.pm-instrumentation.com
+      VIRTUAL_HOST: adminer.pm-instrumentation.com
+      LETSENCRYPT_HOST: adminer.pm-instrumentation.com
     networks:
       - pmi
 

diff --git a/app/Http/Controllers/Admin/ApplicationCrudController.php b/app/Http/Controllers/Admin/ApplicationCrudController.php
index 2ac828dbf17ebb24792e6b41cf9e85d64abb5184..f1bf5f4454d23d65acb5046de9d7f66c7165036e 100644 (file)
--- a/app/Http/Controllers/Admin/ApplicationCrudController.php
+++ b/app/Http/Controllers/Admin/ApplicationCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class ApplicationCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class ApplicationCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Application';
     protected $_routeURL = 'application';

diff --git a/app/Http/Controllers/Admin/CartCrudController.php b/app/Http/Controllers/Admin/CartCrudController.php
new file mode 100644 (file)
index 0000000..0e78a79
--- /dev/null
+++ b/app/Http/Controllers/Admin/CartCrudController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class CartCrudController extends CubistMagicController
+{
+    protected $_modelNamespace = 'App\Models\Cart';
+    protected $_routeURL = 'cart';
+    protected $_singular = 'Cart';
+    protected $_plural = 'Carts';
+    protected $_clonable = true;
+    protected $_bulk = true;
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/ClientCrudController.php b/app/Http/Controllers/Admin/ClientCrudController.php
index 7366739ed9f36d3a54faeca11c01805878c1a2de..5cb9bf4cb689c3d31e6d76a7bef8734a8abd6f33 100644 (file)
--- a/app/Http/Controllers/Admin/ClientCrudController.php
+++ b/app/Http/Controllers/Admin/ClientCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class ClientCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class ClientCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Client';
     protected $_routeURL = 'client';

diff --git a/app/Http/Controllers/Admin/CrudController.php b/app/Http/Controllers/Admin/CrudController.php
index bb3c99e4b28f43b43a836b9176074cca06a86da1..f7f572ee02817aa518ed9744d1c3355ad8e7b8a8 100644 (file)
--- a/app/Http/Controllers/Admin/CrudController.php
+++ b/app/Http/Controllers/Admin/CrudController.php
@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers\Admin;
 
-class CrudController extends \App\Http\Controllers\Admin\ProductBaseController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class CrudController extends CubistMagicController
 {
-    protected $_modelNamespace = 'App\Models\Option';
+    protected $_modelNamespace = 'App\Models\ECommerceCommon';
     protected $_routeURL = '';
     protected $_singular = '';
     protected $_plural = '';

diff --git a/app/Http/Controllers/Admin/LocaleCrudController.php b/app/Http/Controllers/Admin/LocaleCrudController.php
index 0ec4b3e239d8ccc6a866fad6fd5116d84641fe28..32ea1848e172004b6d8d25695fca3de010786aff 100644 (file)
--- a/app/Http/Controllers/Admin/LocaleCrudController.php
+++ b/app/Http/Controllers/Admin/LocaleCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class LocaleCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class LocaleCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Locale';
     protected $_routeURL = 'locale';

diff --git a/app/Http/Controllers/Admin/NewsCrudController.php b/app/Http/Controllers/Admin/NewsCrudController.php
index 90be7c603e676852107cb998cb8bddceec33141c..ff04f36a5cef928a1a56eed3a1400bc06ba9aa15 100644 (file)
--- a/app/Http/Controllers/Admin/NewsCrudController.php
+++ b/app/Http/Controllers/Admin/NewsCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class NewsCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class NewsCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\News';
     protected $_routeURL = 'news';

diff --git a/app/Http/Controllers/Admin/PageCrudController.php b/app/Http/Controllers/Admin/PageCrudController.php
index 09ea83ca289bfa24dffeded1dc23ead9428cc76f..12ca6402ddbaf9f7006607c746f7a60e69f8ee0d 100644 (file)
--- a/app/Http/Controllers/Admin/PageCrudController.php
+++ b/app/Http/Controllers/Admin/PageCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class PageCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController;
+
+class PageCrudController extends CubistMagicNestedController
 {
     protected $_modelNamespace = 'App\Models\Page';
     protected $_routeURL = 'page';

diff --git a/app/Http/Controllers/Admin/ProductCrudController.php b/app/Http/Controllers/Admin/ProductCrudController.php
index edd9627f5fbca563f8e674dd888a0e69ccd1f0a4..ab46ab6c4ed99140a376c6d0609131886a43b15b 100644 (file)
--- a/app/Http/Controllers/Admin/ProductCrudController.php
+++ b/app/Http/Controllers/Admin/ProductCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class ProductCrudController extends \App\Http\Controllers\Admin\ProductBaseController
+use Cubist\Backpack\app\Magic\Controllers\App\Http\Controllers\Admin\ProductBaseController;
+
+class ProductCrudController extends App\Http\Controllers\Admin\ProductBaseController
 {
     protected $_modelNamespace = 'App\Models\Product';
     protected $_routeURL = 'product';

diff --git a/app/Http/Controllers/Admin/ProductTypeCrudController.php b/app/Http/Controllers/Admin/ProductTypeCrudController.php
index d85c17cefb41054bfbea51340a285bdb7f4c52bb..bc190302da1de0bc2c5f81885d6166be64620e02 100644 (file)
--- a/app/Http/Controllers/Admin/ProductTypeCrudController.php
+++ b/app/Http/Controllers/Admin/ProductTypeCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class ProductTypeCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class ProductTypeCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\ProductType';
     protected $_routeURL = 'producttype';

diff --git a/app/Http/Controllers/Admin/QuotesCrudController.php b/app/Http/Controllers/Admin/QuotesCrudController.php
index 6a565fafac294647a9eebf8c1be0a2f9f1247526..d5cf41cb7483173b4bfd1a443e0b0f877e2e8691 100644 (file)
--- a/app/Http/Controllers/Admin/QuotesCrudController.php
+++ b/app/Http/Controllers/Admin/QuotesCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class QuotesCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class QuotesCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\QuoteRequest';
     protected $_routeURL = 'quotes';

diff --git a/app/Http/Controllers/Admin/SettingsCrudController.php b/app/Http/Controllers/Admin/SettingsCrudController.php
index 727ca4e484bf40db5177bae74d63ebd178a89edc..708729e1e84fbad16ad9434ee4b3ce90ce6d13dd 100644 (file)
--- a/app/Http/Controllers/Admin/SettingsCrudController.php
+++ b/app/Http/Controllers/Admin/SettingsCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class SettingsCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class SettingsCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Settings';
     protected $_routeURL = 'settings';

diff --git a/app/Http/Controllers/Admin/SpecificationCrudController.php b/app/Http/Controllers/Admin/SpecificationCrudController.php
index 7addfc19bc3723afcdfaab4cd31adbe37222fe2b..9dbac29ab2279c4bc45acf9d451c0e8ad5bd255a 100644 (file)
--- a/app/Http/Controllers/Admin/SpecificationCrudController.php
+++ b/app/Http/Controllers/Admin/SpecificationCrudController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-class SpecificationCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+
+class SpecificationCrudController extends CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Specification';
     protected $_routeURL = 'specification';

diff --git a/app/Models/Product.php b/app/Models/Product.php
index b05f1b1ed86debb8f7d7a5d42b48cf11b9c9704e..2da5ba1697111f076e6cbf2c3df5d6e40fbe6a62 100644 (file)
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -201,7 +201,7 @@ class Product extends CubistMagicPageModel
 
     protected function _getBaseController()
     {
-        return ProductBaseController::class;
+        return 'ProductBaseController';
     }
 
     protected static function _getRelatedEntities()
@@ -311,7 +311,7 @@ class Product extends CubistMagicPageModel
                 /** @var $media Media */
                 $e = explode('/', $media->getUrl());
                 $fname = array_pop($e);
-                $res[] = ['media' => $media, 'label' => $media->getCustomProperty('alt') ?: $fname, 'tooltip' => __($label), 'type' => $fieldName, 'forceDownload' => in_array($fieldName, $forceDownload)?$fname:false];
+                $res[] = ['media' => $media, 'label' => $media->getCustomProperty('alt') ?: $fname, 'tooltip' => __($label), 'type' => $fieldName, 'forceDownload' => in_array($fieldName, $forceDownload) ? $fname : false];
             }
         }
 
@@ -476,24 +476,28 @@ class Product extends CubistMagicPageModel
     public static function getCartData($cart_items = [])
     {
         if (!self::$_cart_data && isset($cart_items)) {
-            if(sizeof($cart_items) < 1) {
+            if (sizeof($cart_items) < 1) {
                 $cart_items = session('cart_items', []);
                 self::$_cart_data = [];
             }
 
-            $cart_items_id = array_map(function($n){ return $n['id']; }, $cart_items);
+            $cart_items_id = array_map(function ($n) {
+                return $n['id'];
+            }, $cart_items);
 
             if (count($cart_items) > 0) {
                 $productsSellingBasicPrice = self::whereIn('id', $cart_items_id)
-                    ->select('id','basic_selling_price')
+                    ->select('id', 'basic_selling_price')
                     ->get()
                     ->toArray();
 
                 foreach ($cart_items as $key => &$values) {
                     $id = $values["id"];
-                    $getCartItem = array_values(array_filter($productsSellingBasicPrice, function($n) use($id) { return $n['id'] === $id; }));
+                    $getCartItem = array_values(array_filter($productsSellingBasicPrice, function ($n) use ($id) {
+                        return $n['id'] === $id;
+                    }));
                     $values["basic_selling_price"] = floatval($getCartItem[0]["basic_selling_price"]) ?? 0;
-                    if(!Client::getClientConnected()) {
+                    if (!Client::getClientConnected()) {
                         $values["basic_selling_price"] = 0;
                         $values["price"] = 0;
                     }
@@ -508,7 +512,7 @@ class Product extends CubistMagicPageModel
     public static function getProductsByIds($ids)
     {
         return self::whereIn('id', $ids)
-            ->select('id','basic_selling_price','category','json')
+            ->select('id', 'basic_selling_price', 'category', 'json')
             ->get()
             ->groupBy('id')
             ->toArray();
@@ -516,19 +520,20 @@ class Product extends CubistMagicPageModel
 
     public static function getProductIds($data)
     {
-        if(isset($data['products'])){ //way to check if is multidimensional array
+        if (isset($data['products'])) { //way to check if is multidimensional array
             $allProducts = json_decode($data['products'], true);
             $ids = array_column($allProducts, 'id');
-        }else{
+        } else {
             $allProducts = array_map(function ($n) {
                 return json_decode($n['products'], true);
             }, $data);
-            $ids = array_column(call_user_func_array('array_merge', $allProducts),'id');
+            $ids = array_column(call_user_func_array('array_merge', $allProducts), 'id');
         }
         return $ids;
     }
 
-    public static function optionPrice($id, $refs, $productsInfosBase, $mailCondition = false) {
+    public static function optionPrice($id, $refs, $productsInfosBase, $mailCondition = false)
+    {
         $opt = [];
         $optDetails = [];
 
@@ -536,7 +541,7 @@ class Product extends CubistMagicPageModel
 
         if (sizeof($explodeRef) > 1) {
             $options = json_decode($productsInfosBase[$id][0]['json'], true);
-            if(!$options) {
+            if (!$options) {
                 return false;
             }
 
@@ -554,19 +559,20 @@ class Product extends CubistMagicPageModel
                     }
                     $counter++;
                 }
-            }catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return $opt;
             }
         }
 
-        if($mailCondition) {
+        if ($mailCondition) {
             return [$opt, $optDetails];
         } else {
             return $opt;
         }
     }
 
-    public static function totalOptionPrice($optionPrice, $refs) {
+    public static function totalOptionPrice($optionPrice, $refs)
+    {
         return $optionPrice ? array_reduce(array_values($optionPrice)[0], function ($carry, $item) {
             return $carry + $item;
         }) : 0;

diff --git a/config/app.php b/config/app.php
index e699ea32a57e1b3db3e0d0640b6d51ceae5a2236..fd654df3ee804bf2903e19d1880f0a36440c4fd0 100644 (file)
--- a/config/app.php
+++ b/config/app.php
@@ -46,7 +46,7 @@ return [
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => (isset($_SERVER['HTTP_X_REAL_IP']) && $_SERVER['HTTP_X_REAL_IP'] === '130.180.213.67') || env('APP_DEBUG', false),
 
     'debug_blacklist' => [
         '_ENV' => [