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

oroinc · Feb 7, 2017 · f007bc9 · f007bc9
2 parents 3f8f955 + 46f7ec1
commit f007bc9
Show file tree

Hide file tree

Showing 26 changed files with 143 additions and 229 deletions.
diff --git a/src/OroCRM/Bundle/AccountBundle/Entity/Account.php b/src/OroCRM/Bundle/AccountBundle/Entity/Account.php
@@ -21,7 +21,7 @@
 
 /**
  * @ORM\Entity()
- * @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name", "id"})})
+ * @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name"})})
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable
  * @Config(

diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php
@@ -80,7 +80,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_11_1';
+        return 'v1_11';
     }
 
     /**
@@ -157,7 +157,7 @@ protected function createOrocrmAccountTable(Schema $schema, QueryBag $queries)
         $table->addIndex(['user_owner_id'], 'IDX_7166D3719EB185F9', []);
         $table->addIndex(['organization_id'], 'IDX_7166D37132C8A3DE', []);
         $table->addIndex(['default_contact_id'], 'IDX_7166D371AF827129', []);
-        $table->addIndex(['name', 'id'], 'account_name_idx', []);
+        $table->addIndex(['name'], 'account_name_idx', []);
 
         $queries->addPostQuery(new AccountNameExprIndexQuery());
     }

diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_11_1/UpdateIndexes.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_11_1/UpdateIndexes.php
diff --git a/src/OroCRM/Bundle/CampaignBundle/Entity/Repository/CampaignRepository.php b/src/OroCRM/Bundle/CampaignBundle/Entity/Repository/CampaignRepository.php
@@ -153,6 +153,7 @@ public function getCampaignsByCloseRevenueQB($opportunitiesAlias)
             ->join('OroCRMSalesBundle:Lead', 'lead', 'WITH', 'lead.campaign = campaign')
             ->join('lead.opportunities', $opportunitiesAlias)
             ->where(sprintf('%s.status=\'won\'', $opportunitiesAlias))
+            ->andWhere(sprintf('%s.closeRevenue>0', $opportunitiesAlias))
             ->orderBy('closeRevenue', 'DESC')
             ->groupBy('campaign.name');
 

diff --git a/src/OroCRM/Bundle/CaseBundle/Entity/CaseEntity.php b/src/OroCRM/Bundle/CaseBundle/Entity/CaseEntity.php
@@ -20,8 +20,7 @@
 /**
  * @ORM\Entity
  * @ORM\Table(
- *      name="orocrm_case",
- *      indexes={@ORM\Index(name="case_reported_at_idx",columns={"reportedAt", "id"})}
+ *      name="orocrm_case"
  * )
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable

diff --git a/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/OroCRMCaseBundleInstaller.php b/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/OroCRMCaseBundleInstaller.php
@@ -42,7 +42,7 @@ class OroCRMCaseBundleInstaller implements
      */
     public function getMigrationVersion()
     {
-        return 'v1_10';
+        return 'v1_9';
     }
 
     /**
@@ -138,7 +138,6 @@ protected function createOrocrmCaseTable(Schema $schema)
         $table->addIndex(['related_account_id'], 'IDX_AB3BAC1E11A6570A', []);
         $table->addIndex(['source_name'], 'IDX_AB3BAC1E5FA9FB05', []);
         $table->addIndex(['priority_name'], 'IDX_AB3BAC1E965BD3DF', []);
-        $table->addIndex(['reportedAt', 'id'], 'case_reported_at_idx', []);
     }
 
     /**

diff --git a/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/v1_10/UpdateIndexes.php b/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/v1_10/UpdateIndexes.php
diff --git a/src/OroCRM/Bundle/ContactBundle/Entity/Contact.php b/src/OroCRM/Bundle/ContactBundle/Entity/Contact.php
@@ -33,7 +33,7 @@
  * @ORM\Table(
  *      name="orocrm_contact",
  *      indexes={
- *          @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name", "id"}),
+ *          @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name"}),
  *          @ORM\Index(name="contact_updated_at_idx",columns={"updatedAt"}),
  *      }
  * )

diff --git a/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/OroCRMContactBundleInstaller.php b/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/OroCRMContactBundleInstaller.php
@@ -73,7 +73,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_15';
+        return 'v1_14';
     }
 
     /**
@@ -151,7 +151,7 @@ protected function createOrocrmContactTable(Schema $schema)
         $table->addIndex(['reports_to_contact_id'], 'IDX_403263EDF27EBC1E', []);
         $table->addIndex(['created_by_user_id'], 'IDX_403263ED7D182D95', []);
         $table->addIndex(['updated_by_user_id'], 'IDX_403263ED2793CC5E', []);
-        $table->addIndex(['last_name', 'first_name', 'id'], 'contact_name_idx', []);
+        $table->addIndex(['last_name', 'first_name'], 'contact_name_idx', []);
         $table->addIndex(['updatedAt'], 'contact_updated_at_idx', []);
     }
 

diff --git a/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/v1_15/UpdateIndexes.php b/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/v1_15/UpdateIndexes.php
diff --git a/src/OroCRM/Bundle/ContactUsBundle/Entity/ContactRequest.php b/src/OroCRM/Bundle/ContactUsBundle/Entity/ContactRequest.php
@@ -22,7 +22,7 @@
  * @ORM\Entity
  * @ORM\Table(
  *      name="orocrm_contactus_request",
- *      indexes={@ORM\Index(name="request_create_idx",columns={"created_at", "id"})}
+ *      indexes={@ORM\Index(name="request_create_idx",columns={"created_at"})}
  * )
  *
  * @Config(

diff --git a/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/OroCRMContactUsBundleInstaller.php b/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/OroCRMContactUsBundleInstaller.php
@@ -34,7 +34,7 @@ public function setActivityExtension(ActivityExtension $activityExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_10_1';
+        return 'v1_10';
     }
 
     /**
@@ -117,7 +117,7 @@ protected function createOrocrmContactusRequestTable(Schema $schema)
         $table->addIndex(['opportunity_id'], 'IDX_342872E89A34590F', []);
         $table->addIndex(['lead_id'], 'IDX_342872E855458D', []);
         $table->addIndex(['workflow_step_id'], 'IDX_342872E871FE882C', []);
-        $table->addIndex(['created_at', 'id'], 'request_create_idx', []);
+        $table->addIndex(['created_at'], 'request_create_idx', []);
     }
 
 

diff --git a/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/v1_10_1/UpdateIndexes.php b/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/v1_10_1/UpdateIndexes.php
diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Cart.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Cart.php
@@ -30,7 +30,7 @@
  * @ORM\Table(name="orocrm_magento_cart",
  *  indexes={
  *      @ORM\Index(name="magecart_origin_idx", columns={"origin_id"}),
- *      @ORM\Index(name="magecart_updated_idx", columns={"updatedAt", "id"}),
+ *      @ORM\Index(name="magecart_updated_idx", columns={"updatedAt"}),
  *      @ORM\Index(name="magecart_payment_details_idx", columns={"payment_details"}),
  *      @ORM\Index(name="status_name_items_qty_idx", columns={"status_name", "items_qty"})
  *  },

diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Customer.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Customer.php
@@ -35,7 +35,7 @@
  *      uniqueConstraints={@ORM\UniqueConstraint(name="magecustomer_oid_cid_unq", columns={"origin_id", "channel_id"})},
  *      indexes={
  *          @ORM\Index(name="magecustomer_name_idx",columns={"first_name", "last_name"}),
- *          @ORM\Index(name="magecustomer_rev_name_idx",columns={"last_name", "first_name", "id"}),
+ *          @ORM\Index(name="magecustomer_rev_name_idx",columns={"last_name", "first_name"}),
  *          @ORM\Index(name="magecustomer_email_guest_idx",columns={"email"})
  *      }
  * )

diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Order.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Order.php
@@ -12,6 +12,8 @@
 use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\AddressBundle\Entity\AddressType;
 use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress;
+use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem;
+use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep;
 use Oro\Bundle\LocaleBundle\Model\FirstNameInterface;
 use Oro\Bundle\LocaleBundle\Model\LastNameInterface;
 
@@ -26,7 +28,7 @@
  * @ORM\HasLifecycleCallbacks
  * @ORM\Table(name="orocrm_magento_order",
  *     indexes={
- *          @ORM\Index(name="mageorder_created_idx",columns={"created_at", "id"})
+ *          @ORM\Index(name="mageorder_created_idx",columns={"created_at"})
  *     },
  *     uniqueConstraints={
  *          @ORM\UniqueConstraint(name="unq_increment_id_channel_id", columns={"increment_id", "channel_id"})

diff --git a/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/OroCRMMagentoBundleInstaller.php b/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/OroCRMMagentoBundleInstaller.php
@@ -110,7 +110,7 @@ public function setVisitEventAssociationExtension(VisitEventAssociationExtension
      */
     public function getMigrationVersion()
     {
-        return 'v1_41_5';
+        return 'v1_41_4';
     }
 
     /**
@@ -336,7 +336,7 @@ protected function createOrocrmMagentoOrderTable(Schema $schema)
         $table->addIndex(['data_channel_id'], 'IDX_4D09F305BDC09B73', []);
         $table->addIndex(['organization_id'], 'IDX_4D09F30532C8A3DE', []);
         $table->setPrimaryKey(['id']);
-        $table->addIndex(['created_at', 'id'], 'mageorder_created_idx', []);
+        $table->addIndex(['created_at'], 'mageorder_created_idx', []);
         $table->addUniqueIndex(['increment_id', 'channel_id'], 'unq_increment_id_channel_id');
     }
 
@@ -427,7 +427,7 @@ protected function createOrocrmMagentoCustomerTable(Schema $schema)
         $table->addIndex(['organization_id'], 'IDX_2A61EE7D32C8A3DE', []);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['first_name', 'last_name'], 'magecustomer_name_idx', []);
-        $table->addIndex(['last_name', 'first_name', 'id'], 'magecustomer_rev_name_idx', []);
+        $table->addIndex(['last_name', 'first_name'], 'magecustomer_rev_name_idx', []);
         $table->addIndex(['email'], 'magecustomer_email_guest_idx', []);
         $table->addUniqueIndex(['origin_id', 'channel_id'], 'magecustomer_oid_cid_unq');
     }
@@ -714,7 +714,7 @@ protected function createOrocrmMagentoCartTable(Schema $schema)
         $table->addIndex(['organization_id'], 'IDX_96661A8032C8A3DE', []);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['origin_id'], 'magecart_origin_idx', []);
-        $table->addIndex(['updatedAt', 'id'], 'magecart_updated_idx', []);
+        $table->addIndex(['updatedAt'], 'magecart_updated_idx', []);
         $table->addIndex(['payment_details'], 'magecart_payment_details_idx', []);
         $table->addIndex(['status_name', 'items_qty'], 'status_name_items_qty_idx', []);
         $table->addUniqueIndex(['origin_id', 'channel_id'], 'unq_cart_origin_id_channel_id');

diff --git a/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/UpdateIndexes.php b/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/UpdateIndexes.php
diff --git a/...M/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php b/...M/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php
@@ -2,6 +2,8 @@
 
 namespace OroCRM\Bundle\MagentoBundle\Tests\Functional\Controller;
 
+use Doctrine\ORM\EntityManager;
+
 use Oro\Bundle\ImportExportBundle\Job\JobExecutor;
 use Oro\Bundle\ImportExportBundle\Job\JobResult;
 use OroCRM\Bundle\MagentoBundle\Entity\NewsletterSubscriber;
@@ -106,8 +108,8 @@ public function gridProvider()
                     'gridFilters' => [],
                     'assert' => [
                         'channelName' => 'Magento channel',
-                        'email' => 'subscriber3@example.com',
-                        'status' => 'Unsubscribed',
+                        'email' => 'subscriber@example.com',
+                        'status' => 'Subscribed',
                         'customerName' => 'John Doe',
                         'customerEmail' => '[email protected]'
                     ],
@@ -122,8 +124,8 @@ public function gridProvider()
                     ],
                     'assert' => [
                         'channelName' => 'Magento channel',
-                        'email' => 'subscriber3@example.com',
-                        'status' => 'Unsubscribed',
+                        'email' => 'subscriber@example.com',
+                        'status' => 'Subscribed',
                         'customerName' => 'John Doe',
                         'customerEmail' => '[email protected]'
                     ],

diff --git a/src/OroCRM/Bundle/SalesBundle/Entity/Lead.php b/src/OroCRM/Bundle/SalesBundle/Entity/Lead.php
@@ -32,7 +32,7 @@
  *
  * @ORM\Table(
  *      name="orocrm_sales_lead",
- *      indexes={@ORM\Index(name="lead_created_idx",columns={"createdAt", "id"})}
+ *      indexes={@ORM\Index(name="lead_created_idx",columns={"createdAt"})}
  * )
  * @ORM\Entity(repositoryClass="OroCRM\Bundle\SalesBundle\Entity\Repository\LeadRepository")
  * @ORM\HasLifecycleCallbacks()

diff --git a/src/OroCRM/Bundle/SalesBundle/Entity/Opportunity.php b/src/OroCRM/Bundle/SalesBundle/Entity/Opportunity.php
@@ -23,7 +23,7 @@
  * @ORM\Table(
  *  name="orocrm_sales_opportunity",
  *  indexes={
- *    @ORM\Index(name="opportunity_created_idx",columns={"created_at", "id"}),
+ *    @ORM\Index(name="opportunity_created_idx",columns={"created_at"}),
  *    @ORM\Index(
  *      name="opportunities_by_status_idx",
  *      columns={"organization_id","status_id","close_revenue","budget_amount","created_at"}