make class name of customer configurable - fixes #6

Author: markus-moser

src/Controller/Admin/ActivitiesController.php

@@ -15,6 +15,7 @@
 
 namespace CustomerManagementFrameworkBundle\Controller\Admin;
 
+use CustomerManagementFrameworkBundle\CustomerProvider\CustomerProviderInterface;
 use Pimcore\Db\ZendCompatibility\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -42,7 +43,12 @@ public function listAction(Request $request)
         $activities = null;
         $paginator = null;
 
-        if ($customer = \Pimcore\Model\DataObject\Customer::getById($request->get('customerId'))) {
+        /**
+         * @var CustomerProviderInterface $customerProvier
+         */
+        $customerProvier = \Pimcore::getContainer()->get('cmf.customer_provider');
+
+        if ($customer = $customerProvier->getById($request->get('customerId'))) {
             $list = \Pimcore::getContainer()->get('cmf.activity_store')->getActivityList();
             $list->setCondition('customerId = ' . $customer->getId());
             $list->setOrderKey('activityDate');

src/Controller/Admin/HelperController.php

@@ -88,10 +88,13 @@ public function activityTypesAction(Request $request)
      */
     public function settingJsonAction()
     {
+        $customerClassName = explode('\\', \Pimcore::getContainer()->get('cmf.customer_provider')->getCustomerClassName());
+
         $settings = [
             'newsletterSyncEnabled' => $this->container->getParameter('pimcore_customer_management_framework.newsletter.newsletterSyncEnabled'),
             'duplicatesViewEnabled' => $this->container->getParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_view.enabled'),
-            'segmentAssignment' => $this->getParameter('pimcore_customer_management_framework.segment_assignment_classes.types')
+            'segmentAssignment' => $this->getParameter('pimcore_customer_management_framework.segment_assignment_classes.types'),
+            'customerClassName' => $customerClassName[sizeof($customerClassName) - 1]
         ];
 
         $content = '

src/CustomerList/Exporter/AbstractExporter.php

@@ -17,7 +17,7 @@
 
 use CustomerManagementFrameworkBundle\Model\CustomerSegmentInterface;
 use Pimcore\Model\DataObject\ClassDefinition;
-use Pimcore\Model\DataObject\Customer;
+use Pimcore\Model\DataObject\Listing\Concrete;
 
 abstract class AbstractExporter implements ExporterInterface
 {
@@ -27,7 +27,7 @@ abstract class AbstractExporter implements ExporterInterface
     protected $name;
 
     /**
-     * @var Customer\Listing
+     * @var Concrete
      */
     protected $listing;
 
@@ -100,17 +100,17 @@ public function setProperties(array $properties)
     }
 
     /**
-     * @return Customer\Listing
+     * @return Concrete
      */
     public function getListing()
     {
         return $this->listing;
     }
 
     /**
-     * @param Customer\Listing $listing
+     * @param Concrete $listing
      */
-    public function setListing(Customer\Listing $listing)
+    public function setListing(Concrete $listing)
     {
         $this->reset();
         $this->listing = $listing;

src/CustomerList/Exporter/ExporterInterface.php

@@ -15,7 +15,7 @@
 
 namespace CustomerManagementFrameworkBundle\CustomerList\Exporter;
 
-use Pimcore\Model\DataObject\Customer;
+use Pimcore\Model\DataObject\Listing\Concrete;
 
 interface ExporterInterface
 {
@@ -40,14 +40,14 @@ public function getProperties();
     public function setProperties(array $properties);
 
     /**
-     * @return Customer\Listing
+     * @return Concrete
      */
     public function getListing();
 
     /**
-     * @param Customer\Listing $listing
+     * @param Concrete $listing
      */
-    public function setListing(Customer\Listing $listing);
+    public function setListing(Concrete $listing);
 
     /**
      * Get file MIME type

src/Resources/public/js/startup.js

@@ -144,7 +144,7 @@ pimcore.plugin.customermanagementframework = Class.create(pimcore.plugin.admin,
             return;
         }
 
-        if (object.data.general.o_className === "Customer" && pimcore.globalmanager.get("user").isAllowed(ActivityView.config.PERMISSION)) {
+        if (object.data.general.o_className === pimcore.settings.cmf && pimcore.globalmanager.get("user").isAllowed(ActivityView.config.PERMISSION)) {
             var panel = new ActivityView.ActivityTab(object, type).getPanel();
 
             object.tab.items.items[1].insert(1, panel);

src/SegmentBuilder/StateSegmentBuilder.php

@@ -43,7 +43,7 @@ public function __construct($groupName = 'State', array $countryTransformers = [
      *
      * @param SegmentManagerInterface $segmentManager
      *
-     * @return \Pimcore\Model\DataObject\Customer\Listing
+     * @return \Pimcore\Model\DataObject\Listing\Concrete
      */
     public function prepare(SegmentManagerInterface $segmentManager)
     {