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

oroinc · Mar 20, 2017 · 0839136 · 0839136
2 parents 21b68fc + bcd32ed
commit 0839136
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 26 deletions.
diff --git a/src/OroCRM/Bundle/AccountBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/AccountBundle/Resources/config/datagrid.yml
@@ -52,7 +52,7 @@ datagrid:
                 contactPhone:
                     data_name: a.defaultContact
         options:
-            entityHint: account
+            entityHint: accounts
             toolbarOptions:
                 hide: true
                 pageSize:
@@ -225,7 +225,7 @@ datagrid:
                 entity_name: %orocrm_account.account.entity.class%
                 data_identifier: a.id
         options:
-            entityHint: account
+            entityHint: accounts
             export: true
             entity_pagination: true
         views_list: '@orocrm_account.accounts_view_list'
@@ -276,7 +276,7 @@ datagrid:
             default:
                 lastName: ASC
         options:
-            entityHint: contact
+            entityHint: contacts
 
     account-contacts-update-grid:
         extends: base-account-contacts-grid
@@ -454,7 +454,7 @@ datagrid:
                     data_name: a.owner
                     className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
         options:
-            entityHint: account
+            entityHint: accounts
 
     accounts-for-context-grid:
         extended_entity_name: %orocrm_account.account.entity.class%
@@ -540,7 +540,7 @@ datagrid:
                             property: fullName
                             translatable_options: false
         options:
-            entityHint: account
+            entityHint: accounts
             entity_pagination: true
             toolbarOptions:
                 pageSize:

diff --git a/src/OroCRM/Bundle/ContactBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/ContactBundle/Resources/config/datagrid.yml
@@ -41,7 +41,7 @@ datagrid:
                 label: orocrm.contact.contactphone.phone.label
                 frontend_type: phone
         options:
-            entityHint: contact
+            entityHint: contacts
             toolbarOptions:
                 hide: true
                 pageSize:
@@ -96,7 +96,7 @@ datagrid:
                 icon:          trash
                 link:          delete_link
         options:
-            entityHint: group
+            entityHint: groups
             entity_pagination: true
 
     # contacts assigned to group, shown on orocrm_contact_group_update route
@@ -155,7 +155,7 @@ datagrid:
                     data_name: c.lastName
             default: { hasGroup: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_DESC }
         options:
-            entityHint: contact
+            entityHint: contacts
             rowSelection:
                 dataField: id
                 columnName: hasGroup
@@ -549,7 +549,7 @@ datagrid:
                 entity_name: %orocrm_contact.entity.class%
                 data_identifier: c.id
         options:
-            entityHint: contact
+            entityHint: contacts
             export: true
             entity_pagination: true
         views_list: '@orocrm_contact.contacts_view_list'
@@ -668,7 +668,7 @@ datagrid:
         properties:
             id: ~
         options:
-            entityHint: account
+            entityHint: accounts
             rowSelection:
                 dataField: id
                 columnName: hasContact
@@ -788,7 +788,7 @@ datagrid:
         properties:
             id: ~
         options:
-            entityHint: contact
+            entityHint: contacts
 
     # contacts grid for context
     contacts-for-context-grid:
@@ -898,7 +898,7 @@ datagrid:
                     data_name: addressPostalCode
                     enabled: false
         options:
-            entityHint: contact
+            entityHint: contacts
             entity_pagination: true
             toolbarOptions:
                 pageSize:

diff --git a/src/OroCRM/Bundle/ContactUsBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/ContactUsBundle/Resources/config/datagrid.yml
@@ -109,5 +109,5 @@ datagrid:
                 icon:         trash
                 link:         delete_link
         options:
-            entityHint: contact request
+            entityHint: contact requests
             entity_pagination: true
diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Order.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Order.php
@@ -196,6 +196,7 @@ class Order extends ExtendOrder implements
 
     /**
      * @ORM\ManyToOne(targetEntity="Cart")
+     * @ORM\JoinColumn(onDelete="CASCADE")
      */
     protected $cart;
 

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_4';
+        return 'v1_41_5';
     }
 
     /**
@@ -911,7 +911,7 @@ protected function addOrocrmMagentoOrderForeignKeys(Schema $schema)
             $schema->getTable('orocrm_magento_cart'),
             ['cart_id'],
             ['id'],
-            []
+            ['onDelete' => 'CASCADE']
         );
         $table->addForeignKeyConstraint(
             $schema->getTable('oro_workflow_item'),

diff --git a/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/SetCascadeDeleteToOrderCartFK.php b/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/SetCascadeDeleteToOrderCartFK.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Oro\Bundle\MagentoBundle\Migrations\Schema\v1_41_5;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class SetCascadeDeleteToOrderCartFK implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table  = $schema->getTable('orocrm_magento_order');
+        $fkName = 'FK_4D09F3051AD5CDBF';
+        $fk     = $table->getForeignKey($fkName);
+        if ($fk->getOption('onDelete') !== 'CASCADE') {
+            $table->removeForeignKey($fkName);
+            $table->addForeignKeyConstraint(
+                $schema->getTable('orocrm_magento_cart'),
+                ['cart_id'],
+                ['id'],
+                ['onDelete' => 'CASCADE']
+            );
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/MagentoBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/MagentoBundle/Resources/config/datagrid.yml
@@ -191,7 +191,7 @@ datagrid:
 
         action_configuration: [ "@orocrm_magento.datagrid.customer_actions_provider", "getCustomerActionsPermissions"]
         options:
-            entityHint: customer
+            entityHint: customers
             export: true
             entity_pagination: true
 
@@ -373,7 +373,7 @@ datagrid:
                 acl_resource: orocrm_magento_cart_view
                 rowAction:    true
         options:
-            entityHint: cart
+            entityHint: carts
             export: true
             entity_pagination: true
         views_list : '@orocrm_magento.datagrid.cart_view_list'
@@ -428,7 +428,7 @@ datagrid:
             default:
                 createdAt:  DESC
         options:
-            entityHint: cart item
+            entityHint: cart items
             toolbarOptions:
                 hide: true
                 pagination:
@@ -647,7 +647,7 @@ datagrid:
                 acl_resource: orocrm_magento_product_view
                 rowAction:    true
         options:
-            entityHint: magento product
+            entityHint: magento products
 
     magento-order-grid:
         extended_entity_name: OroCRM\Bundle\MagentoBundle\Entity\Order
@@ -857,7 +857,7 @@ datagrid:
                 acl_resource: orocrm_magento_order_view
                 rowAction:    true
         options:
-            entityHint: order
+            entityHint: orders
             export: true
             entity_pagination: true
 
@@ -956,7 +956,7 @@ datagrid:
                 taxAmount:           { data_name: oi.taxAmount }
                 rowTotal:            { data_name: oi.rowTotal }
         options:
-            entityHint: order item
+            entityHint: order items
             toolbarOptions:
                 hide: true
                 pagination:
@@ -1579,7 +1579,7 @@ datagrid:
                     error:           orocrm.magento.newslettersubscriber.action.error.unsubscribe
         action_configuration: [ "@orocrm_magento.datagrid.newsletter_subscriber_provider", "getActionsPermissions"]
         options:
-            entityHint: newsletter subscriber
+            entityHint: newsletter subscribers
             export: true
             entity_pagination: true
 
@@ -1662,7 +1662,7 @@ datagrid:
                     type: string
                     data_name: c.email
         options:
-            entityHint: customer
+            entityHint: customers
             entity_pagination: true
             toolbarOptions:
                 pageSize:
@@ -1825,7 +1825,7 @@ datagrid:
                     data_name:        o.updatedAt
                     enabled:          false
         options:
-            entityHint: order
+            entityHint: orders
             entity_pagination: true
             toolbarOptions:
                 pageSize:
@@ -1968,7 +1968,7 @@ datagrid:
                     data_name: c.updatedAt
                     enabled: false
         options:
-            entityHint: cart
+            entityHint: carts
             entity_pagination: true
             toolbarOptions:
                 pageSize:

diff --git a/src/OroCRM/Bundle/MarketingListBundle/Form/Handler/MarketingListHandler.php b/src/OroCRM/Bundle/MarketingListBundle/Form/Handler/MarketingListHandler.php
@@ -129,9 +129,13 @@ protected function processSegment(MarketingList $marketingList)
             ->setEntity($marketingList->getEntity())
             ->setType($this->getSegmentTypeByMarketingListType($marketingList->getType()))
             ->setDefinition($requestData['definition'])
-            ->setOwner($marketingList->getOwner()->getOwner())
             ->setOrganization($marketingList->getOrganization());
 
+        $owner = $marketingList->getOwner()->getOwner();
+        if (null !== $owner) {
+            $segment->setOwner($owner);
+        }
+
         $marketingList->setSegment($segment);
     }