Merge remote-tracking branch 'remotes/dev/2.0' into 2.0

Author: rgrebenchuk

Diff for: src/Oro/Bundle/MagentoBundle/Migrations/Data/ORM/LoadShoppingCartStatusData.php

@@ -20,7 +20,7 @@ class LoadShoppingCartStatusData extends AbstractFixture implements
     protected $dataV0 = array(
         'open'                     => 'Open',
         'lost'                     => 'Lost',
-        'converted_to_opportunity' => 'Converted to opportunity',
+        'converted_to_opportunity' => 'Converted to Opportunity',
     );
 
     /** @var array */

Diff for: src/Oro/Bundle/MagentoBundle/Migrations/Schema/OroMagentoBundleInstaller.php

@@ -72,7 +72,7 @@ public function setExtendExtension(ExtendExtension $extendExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_46_1';
+        return 'v1_46_2';
     }
 
     /**

Diff for: src/Oro/Bundle/MagentoBundle/Migrations/Schema/v1_46_2/RenameMagentoCartStatusLabel.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Oro\Bundle\MagentoBundle\Migrations\Schema\v1_46_2;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\ParametrizedSqlMigrationQuery;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class RenameMagentoCartStatusLabel implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $sql = 'UPDATE orocrm_magento_cart_status' .
+            ' SET label = :label' .
+            ' WHERE name = :name';
+
+        $queries->addQuery(
+            new ParametrizedSqlMigrationQuery(
+                $sql,
+                ['label' => 'Converted to Opportunity', 'name' => 'converted_to_opportunity']
+            )
+        );
+    }
+}

Diff for: src/Oro/Bundle/MagentoBundle/Resources/doc/reference/workflows.md

@@ -53,7 +53,7 @@ that can be used to contact customer;
 * **Abandoned** - processing of shopping cart was stopped due to some reason and it should not be processed
 until reopen;
 * **Converted** - shopping cart was successfully converted;
-* **Converted to opportunity** - shopping cart was successfully converted and new opportunity was created
+* **Converted to Opportunity** - shopping cart was successfully converted and new opportunity was created
 (it can be processed separately using B2B flow).
 
 ### Transitions
@@ -74,7 +74,7 @@ until reopen;
 * **Abandon** - shopping cart must have status "Open" to allow this transition:
     * open form with Notes attribute;
     * set shopping cart status to "lost";
-* **Reopen** - shopping cart must have status "Converted", "Converted to opportunity" or "Abandoned" to allow this transition:
+* **Reopen** - shopping cart must have status "Converted", "Converted to Opportunity" or "Abandoned" to allow this transition:
     * open form with Notes attribute;
     * set shopping cart status to "open";
     * reset all attributes related to call, email and opportunity.

Diff for: src/Oro/Bundle/MagentoBundle/Resources/translations/workflows.en.yml

@@ -7,7 +7,7 @@ oro:
                 abandoned:
                     label: Abandoned
                 converted_to_opportunity:
-                    label: 'Converted to opportunity'
+                    label: 'Converted to Opportunity'
                 converted:
                     label: Converted
             attribute:
@@ -29,7 +29,7 @@ oro:
                 place_order:
                     label: 'Place an order'
                 convert_to_opportunity:
-                    label: 'Convert to opportunity'
+                    label: 'Convert to Opportunity'
                 abandon:
                     label: Abandon
                     warning_message: 'You are going to abandon this shopping cart.'

Diff for: src/Oro/Bundle/SalesBundle/Migrations/Schema/v1_31/Query/MigrateB2bCustomersQuery.php

@@ -45,6 +45,48 @@ public function execute(LoggerInterface $logger)
      */
     protected function doExecute(LoggerInterface $logger, $dryRun = false)
     {
+        $query = 'SELECT id, name, user_owner_id, organization_id, name, createdAt, updatedAt '.
+            'FROM orocrm_sales_b2bcustomer WHERE account_id IS NULL';
+        $customersWithoutAccount = $this->connection->fetchAll($query);
+        foreach ($customersWithoutAccount as $customer) {
+            $query = 'INSERT INTO orocrm_account SET user_owner_id = :user_owner_id, '.
+                'organization_id = :organization_id, name = :name, createdAt = :createdAt, '.
+                'updatedAt = :updatedAt, serialized_data = :serialized_data';
+            $this->connection->executeQuery(
+                $query,
+                [
+                    'user_owner_id' => $customer['user_owner_id'],
+                    'organization_id' => $customer['organization_id'],
+                    'name' => $customer['name'],
+                    'createdAt' => $customer['createdAt'],
+                    'updatedAt' => $customer['updatedAt'],
+                    'serialized_data' => base64_encode(serialize(null)),
+                ],
+                [
+                    'user_owner_id' => 'integer',
+                    'organization_id' => 'integer',
+                    'name' => 'string',
+                    'createdAt' => 'integer',
+                    'updatedAt' => 'integer',
+                    'serialized_data' => 'string',
+                ]
+            );
+            $accountId = $this->connection->lastInsertId();
+
+            $query = 'UPDATE orocrm_sales_b2bcustomer SET account_id = :account_id WHERE id = :id';
+            $this->connection->executeQuery(
+                $query,
+                [
+                    'account_id' => $accountId,
+                    'id' => $customer['id'],
+                ],
+                [
+                    'account_id' => 'integer',
+                    'id' => 'integer',
+                ]
+            );
+        }
+
         $query = 'INSERT INTO orocrm_sales_customer (account_id, ' . $this->customerColumnName . ') '
             . ' SELECT account_id, id FROM orocrm_sales_b2bcustomer';
 

Diff for: src/Oro/Bundle/SalesBundle/Provider/Customer/ConfigProvider.php

@@ -14,6 +14,9 @@ class ConfigProvider
     /** @var ConfigManager */
     protected $configManager;
 
+    /** @var string */
+    private $customerClasses;
+
     /**
      * @param ConfigManager    $configManager
      */
@@ -33,20 +36,29 @@ public function isCustomerClass($objectOrClass)
             return false;
         }
 
-        $class = is_object($objectOrClass) ? ClassUtils::getClass($objectOrClass) : $objectOrClass;
+        if (is_object($objectOrClass)) {
+            $objectOrClass = ClassUtils::getClass($objectOrClass);
+        }
 
-        return in_array($class, $this->getAssociatedCustomerClasses(), true);
+        return in_array($objectOrClass, $this->getCustomerClasses(), true);
     }
 
+    /**
+     * @return string[]
+     */
     public function getCustomerClasses()
     {
-        return $this->getAssociatedCustomerClasses();
+        if (null === $this->customerClasses) {
+            $this->customerClasses = $this->getAssociatedCustomerClasses();
+        }
+
+        return $this->customerClasses;
     }
 
     /**
      * @return array
      * [
-     *     className   => customer class with _ instead of \,
+     *     className   => FQCN of a customer,
      *     label       => entity label,
      *     icon        => entity icon,
      *     gridName    => customer grid name
@@ -121,7 +133,7 @@ protected function getRouteCreate($entityClass)
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     protected function getAssociatedCustomerClasses()
     {

Diff for: src/Oro/Bundle/SalesBundle/Resources/config/oro/datagrids.yml

@@ -1077,6 +1077,8 @@ datagrids:
             lifetime:
                 label:          oro.sales.b2bcustomer.lifetime.label
                 frontend_type:  currency
+                inline_editing:
+                    enable: false
             createdAt:
                 label:          oro.ui.created_at
                 frontend_type:  datetime