FIX: MSF Fields Overrides

SplashSync · Sep 4, 2020 · 110363c · 110363c
1 parent c019398
commit 110363c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -121,7 +121,7 @@ services:
     ################################################################################
     # Prestashop 1.6       
     prestashop_1_6:
-        image: prestashop/pestashop:1.6-7.1-apache
+        image: prestashop/prestashop:1.6-7.1-apache
         container_name: prestashop_1_6
         depends_on:
            - mysql

diff --git a/modules/splashsync/src/Objects/Core/MultishopObjectTrait.php b/modules/splashsync/src/Objects/Core/MultishopObjectTrait.php
@@ -43,7 +43,10 @@ public function fields()
         }
         //====================================================================//
         // Load Core Fields from All Shop Context
-        return MSF::loadFields($this->coreFields());
+        $fields = MSF::loadFields($this->coreFields());
+        //====================================================================//
+        // Redo Override Fields from Local Configurator
+        return Splash::configurator()->overrideFields(self::getType(), $fields);
     }
 
     /**