Skip to content

Commit f007bc9

Browse files
rgrebenchukrgrebenchuk
committed
Merge remote-tracking branch 'remotes/dev/1.10' into 1.10
2 parents 3f8f955 + 46f7ec1 commit f007bc9

File tree

26 files changed

+143
-229
lines changed

26 files changed

+143
-229
lines changed

Diff for: ‎src/OroCRM/Bundle/AccountBundle/Entity/Account.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
/**
2323
* @ORM\Entity()
24-
* @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name", "id"})})
24+
* @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name"})})
2525
* @ORM\HasLifecycleCallbacks()
2626
* @Oro\Loggable
2727
* @Config(

Diff for: ‎src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
8080
*/
8181
public function getMigrationVersion()
8282
{
83-
return 'v1_11_1';
83+
return 'v1_11';
8484
}
8585

8686
/**
@@ -157,7 +157,7 @@ protected function createOrocrmAccountTable(Schema $schema, QueryBag $queries)
157157
$table->addIndex(['user_owner_id'], 'IDX_7166D3719EB185F9', []);
158158
$table->addIndex(['organization_id'], 'IDX_7166D37132C8A3DE', []);
159159
$table->addIndex(['default_contact_id'], 'IDX_7166D371AF827129', []);
160-
$table->addIndex(['name', 'id'], 'account_name_idx', []);
160+
$table->addIndex(['name'], 'account_name_idx', []);
161161

162162
$queries->addPostQuery(new AccountNameExprIndexQuery());
163163
}

Diff for: ‎src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_11_1/UpdateIndexes.php

-25
This file was deleted.

Diff for: ‎src/OroCRM/Bundle/CampaignBundle/Entity/Repository/CampaignRepository.php

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ public function getCampaignsByCloseRevenueQB($opportunitiesAlias)
153153
->join('OroCRMSalesBundle:Lead', 'lead', 'WITH', 'lead.campaign = campaign')
154154
->join('lead.opportunities', $opportunitiesAlias)
155155
->where(sprintf('%s.status=\'won\'', $opportunitiesAlias))
156+
->andWhere(sprintf('%s.closeRevenue>0', $opportunitiesAlias))
156157
->orderBy('closeRevenue', 'DESC')
157158
->groupBy('campaign.name');
158159

Diff for: ‎src/OroCRM/Bundle/CaseBundle/Entity/CaseEntity.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
/**
2121
* @ORM\Entity
2222
* @ORM\Table(
23-
* name="orocrm_case",
24-
* indexes={@ORM\Index(name="case_reported_at_idx",columns={"reportedAt", "id"})}
23+
* name="orocrm_case"
2524
* )
2625
* @ORM\HasLifecycleCallbacks()
2726
* @Oro\Loggable

Diff for: ‎src/OroCRM/Bundle/CaseBundle/Migrations/Schema/OroCRMCaseBundleInstaller.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class OroCRMCaseBundleInstaller implements
4242
*/
4343
public function getMigrationVersion()
4444
{
45-
return 'v1_10';
45+
return 'v1_9';
4646
}
4747

4848
/**
@@ -138,7 +138,6 @@ protected function createOrocrmCaseTable(Schema $schema)
138138
$table->addIndex(['related_account_id'], 'IDX_AB3BAC1E11A6570A', []);
139139
$table->addIndex(['source_name'], 'IDX_AB3BAC1E5FA9FB05', []);
140140
$table->addIndex(['priority_name'], 'IDX_AB3BAC1E965BD3DF', []);
141-
$table->addIndex(['reportedAt', 'id'], 'case_reported_at_idx', []);
142141
}
143142

144143
/**

Diff for: ‎src/OroCRM/Bundle/CaseBundle/Migrations/Schema/v1_10/UpdateIndexes.php

-29
This file was deleted.

Diff for: ‎src/OroCRM/Bundle/ContactBundle/Entity/Contact.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @ORM\Table(
3434
* name="orocrm_contact",
3535
* indexes={
36-
* @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name", "id"}),
36+
* @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name"}),
3737
* @ORM\Index(name="contact_updated_at_idx",columns={"updatedAt"}),
3838
* }
3939
* )

Diff for: ‎src/OroCRM/Bundle/ContactBundle/Migrations/Schema/OroCRMContactBundleInstaller.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
7373
*/
7474
public function getMigrationVersion()
7575
{
76-
return 'v1_15';
76+
return 'v1_14';
7777
}
7878

7979
/**
@@ -151,7 +151,7 @@ protected function createOrocrmContactTable(Schema $schema)
151151
$table->addIndex(['reports_to_contact_id'], 'IDX_403263EDF27EBC1E', []);
152152
$table->addIndex(['created_by_user_id'], 'IDX_403263ED7D182D95', []);
153153
$table->addIndex(['updated_by_user_id'], 'IDX_403263ED2793CC5E', []);
154-
$table->addIndex(['last_name', 'first_name', 'id'], 'contact_name_idx', []);
154+
$table->addIndex(['last_name', 'first_name'], 'contact_name_idx', []);
155155
$table->addIndex(['updatedAt'], 'contact_updated_at_idx', []);
156156
}
157157

Diff for: ‎src/OroCRM/Bundle/ContactBundle/Migrations/Schema/v1_15/UpdateIndexes.php

-25
This file was deleted.

Diff for: ‎src/OroCRM/Bundle/ContactUsBundle/Entity/ContactRequest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @ORM\Entity
2323
* @ORM\Table(
2424
* name="orocrm_contactus_request",
25-
* indexes={@ORM\Index(name="request_create_idx",columns={"created_at", "id"})}
25+
* indexes={@ORM\Index(name="request_create_idx",columns={"created_at"})}
2626
* )
2727
*
2828
* @Config(

Diff for: ‎src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/OroCRMContactUsBundleInstaller.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function setActivityExtension(ActivityExtension $activityExtension)
3434
*/
3535
public function getMigrationVersion()
3636
{
37-
return 'v1_10_1';
37+
return 'v1_10';
3838
}
3939

4040
/**
@@ -117,7 +117,7 @@ protected function createOrocrmContactusRequestTable(Schema $schema)
117117
$table->addIndex(['opportunity_id'], 'IDX_342872E89A34590F', []);
118118
$table->addIndex(['lead_id'], 'IDX_342872E855458D', []);
119119
$table->addIndex(['workflow_step_id'], 'IDX_342872E871FE882C', []);
120-
$table->addIndex(['created_at', 'id'], 'request_create_idx', []);
120+
$table->addIndex(['created_at'], 'request_create_idx', []);
121121
}
122122

123123

Diff for: ‎src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/v1_10_1/UpdateIndexes.php

-25
This file was deleted.

Diff for: ‎src/OroCRM/Bundle/MagentoBundle/Entity/Cart.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* @ORM\Table(name="orocrm_magento_cart",
3131
* indexes={
3232
* @ORM\Index(name="magecart_origin_idx", columns={"origin_id"}),
33-
* @ORM\Index(name="magecart_updated_idx", columns={"updatedAt", "id"}),
33+
* @ORM\Index(name="magecart_updated_idx", columns={"updatedAt"}),
3434
* @ORM\Index(name="magecart_payment_details_idx", columns={"payment_details"}),
3535
* @ORM\Index(name="status_name_items_qty_idx", columns={"status_name", "items_qty"})
3636
* },

Diff for: ‎src/OroCRM/Bundle/MagentoBundle/Entity/Customer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* uniqueConstraints={@ORM\UniqueConstraint(name="magecustomer_oid_cid_unq", columns={"origin_id", "channel_id"})},
3636
* indexes={
3737
* @ORM\Index(name="magecustomer_name_idx",columns={"first_name", "last_name"}),
38-
* @ORM\Index(name="magecustomer_rev_name_idx",columns={"last_name", "first_name", "id"}),
38+
* @ORM\Index(name="magecustomer_rev_name_idx",columns={"last_name", "first_name"}),
3939
* @ORM\Index(name="magecustomer_email_guest_idx",columns={"email"})
4040
* }
4141
* )

Diff for: ‎src/OroCRM/Bundle/MagentoBundle/Entity/Order.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use Oro\Bundle\UserBundle\Entity\User;
1313
use Oro\Bundle\AddressBundle\Entity\AddressType;
1414
use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress;
15+
use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem;
16+
use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep;
1517
use Oro\Bundle\LocaleBundle\Model\FirstNameInterface;
1618
use Oro\Bundle\LocaleBundle\Model\LastNameInterface;
1719

@@ -26,7 +28,7 @@
2628
* @ORM\HasLifecycleCallbacks
2729
* @ORM\Table(name="orocrm_magento_order",
2830
* indexes={
29-
* @ORM\Index(name="mageorder_created_idx",columns={"created_at", "id"})
31+
* @ORM\Index(name="mageorder_created_idx",columns={"created_at"})
3032
* },
3133
* uniqueConstraints={
3234
* @ORM\UniqueConstraint(name="unq_increment_id_channel_id", columns={"increment_id", "channel_id"})

Diff for: ‎src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/OroCRMMagentoBundleInstaller.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function setVisitEventAssociationExtension(VisitEventAssociationExtension
110110
*/
111111
public function getMigrationVersion()
112112
{
113-
return 'v1_41_5';
113+
return 'v1_41_4';
114114
}
115115

116116
/**
@@ -336,7 +336,7 @@ protected function createOrocrmMagentoOrderTable(Schema $schema)
336336
$table->addIndex(['data_channel_id'], 'IDX_4D09F305BDC09B73', []);
337337
$table->addIndex(['organization_id'], 'IDX_4D09F30532C8A3DE', []);
338338
$table->setPrimaryKey(['id']);
339-
$table->addIndex(['created_at', 'id'], 'mageorder_created_idx', []);
339+
$table->addIndex(['created_at'], 'mageorder_created_idx', []);
340340
$table->addUniqueIndex(['increment_id', 'channel_id'], 'unq_increment_id_channel_id');
341341
}
342342

@@ -427,7 +427,7 @@ protected function createOrocrmMagentoCustomerTable(Schema $schema)
427427
$table->addIndex(['organization_id'], 'IDX_2A61EE7D32C8A3DE', []);
428428
$table->setPrimaryKey(['id']);
429429
$table->addIndex(['first_name', 'last_name'], 'magecustomer_name_idx', []);
430-
$table->addIndex(['last_name', 'first_name', 'id'], 'magecustomer_rev_name_idx', []);
430+
$table->addIndex(['last_name', 'first_name'], 'magecustomer_rev_name_idx', []);
431431
$table->addIndex(['email'], 'magecustomer_email_guest_idx', []);
432432
$table->addUniqueIndex(['origin_id', 'channel_id'], 'magecustomer_oid_cid_unq');
433433
}
@@ -714,7 +714,7 @@ protected function createOrocrmMagentoCartTable(Schema $schema)
714714
$table->addIndex(['organization_id'], 'IDX_96661A8032C8A3DE', []);
715715
$table->setPrimaryKey(['id']);
716716
$table->addIndex(['origin_id'], 'magecart_origin_idx', []);
717-
$table->addIndex(['updatedAt', 'id'], 'magecart_updated_idx', []);
717+
$table->addIndex(['updatedAt'], 'magecart_updated_idx', []);
718718
$table->addIndex(['payment_details'], 'magecart_payment_details_idx', []);
719719
$table->addIndex(['status_name', 'items_qty'], 'status_name_items_qty_idx', []);
720720
$table->addUniqueIndex(['origin_id', 'channel_id'], 'unq_cart_origin_id_channel_id');

Diff for: ‎src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/UpdateIndexes.php

-41
This file was deleted.

Diff for: ‎src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace OroCRM\Bundle\MagentoBundle\Tests\Functional\Controller;
44

5+
use Doctrine\ORM\EntityManager;
6+
57
use Oro\Bundle\ImportExportBundle\Job\JobExecutor;
68
use Oro\Bundle\ImportExportBundle\Job\JobResult;
79
use OroCRM\Bundle\MagentoBundle\Entity\NewsletterSubscriber;
@@ -106,8 +108,8 @@ public function gridProvider()
106108
'gridFilters' => [],
107109
'assert' => [
108110
'channelName' => 'Magento channel',
109-
'email' => 'subscriber3@example.com',
110-
'status' => 'Unsubscribed',
111+
'email' => 'subscriber@example.com',
112+
'status' => 'Subscribed',
111113
'customerName' => 'John Doe',
112114
'customerEmail' => '[email protected]'
113115
],
@@ -122,8 +124,8 @@ public function gridProvider()
122124
],
123125
'assert' => [
124126
'channelName' => 'Magento channel',
125-
'email' => 'subscriber3@example.com',
126-
'status' => 'Unsubscribed',
127+
'email' => 'subscriber@example.com',
128+
'status' => 'Subscribed',
127129
'customerName' => 'John Doe',
128130
'customerEmail' => '[email protected]'
129131
],

Diff for: ‎src/OroCRM/Bundle/SalesBundle/Entity/Lead.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*
3333
* @ORM\Table(
3434
* name="orocrm_sales_lead",
35-
* indexes={@ORM\Index(name="lead_created_idx",columns={"createdAt", "id"})}
35+
* indexes={@ORM\Index(name="lead_created_idx",columns={"createdAt"})}
3636
* )
3737
* @ORM\Entity(repositoryClass="OroCRM\Bundle\SalesBundle\Entity\Repository\LeadRepository")
3838
* @ORM\HasLifecycleCallbacks()

Diff for: ‎src/OroCRM/Bundle/SalesBundle/Entity/Opportunity.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @ORM\Table(
2424
* name="orocrm_sales_opportunity",
2525
* indexes={
26-
* @ORM\Index(name="opportunity_created_idx",columns={"created_at", "id"}),
26+
* @ORM\Index(name="opportunity_created_idx",columns={"created_at"}),
2727
* @ORM\Index(
2828
* name="opportunities_by_status_idx",
2929
* columns={"organization_id","status_id","close_revenue","budget_amount","created_at"}

0 commit comments

Comments
 (0)