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

oroinc · Jun 16, 2015 · 21a1967 · 21a1967
2 parents 387fc7e + 3e4e5d5
commit 21a1967
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/OroCRM/Bundle/MagentoBundle/ImportExport/Converter/GuestCustomerDataConverter.php b/src/OroCRM/Bundle/MagentoBundle/ImportExport/Converter/GuestCustomerDataConverter.php
@@ -13,11 +13,8 @@ protected function getHeaderConversionRules()
     {
         return [
             'customerEmail' => 'email',
-            'firstname' => 'firstName',
-            'lastname' => 'lastName',
-            'prefix' => 'namePrefix',
-            'suffix' => 'nameSuffix',
-            'middlename' => 'middleName',
+            'customer_firstname' => 'firstName',
+            'customer_lastname' => 'lastName',
             'created_at' => 'createdAt',
             'updated_at' => 'updatedAt',
             'store_id' => 'store:originId',

diff --git a/src/OroCRM/Bundle/MagentoBundle/ImportExport/Strategy/CartStrategy.php b/src/OroCRM/Bundle/MagentoBundle/ImportExport/Strategy/CartStrategy.php
@@ -46,7 +46,7 @@ protected function beforeProcessEntity($entity)
      */
     protected function afterProcessEntity($entity)
     {
-        if ($entity->getStatus()->getName() === CartStatus::STATUS_OPEN) {
+        if ($this->existingEntity->getStatus()->getName() === CartStatus::STATUS_OPEN) {
             $this->updateRemovedCartItems($entity);
         }
 
@@ -61,6 +61,7 @@ protected function afterProcessEntity($entity)
             ->updateCartStatus($entity);
 
         $this->existingEntity = null;
+        $this->existingCartItems = null;
 
         return parent::afterProcessEntity($entity);
     }

diff --git a/...Resources/config/oro/workflow/b2c_flow_abandoned_shopping_cart/transition_definitions.yml b/...Resources/config/oro/workflow/b2c_flow_abandoned_shopping_cart/transition_definitions.yml
@@ -77,6 +77,7 @@ workflows:
                          to: $email_to
                          subject: $email_subject
                          body: $email_body
+                         type: 'html'
                      - @call_method:
                          method: 'addRelatedEmail'
                          object: $cart

diff --git a/...entoBundle/Resources/config/oro/workflow/b2c_flow_abandoned_shopping_cart/transitions.yml b/...entoBundle/Resources/config/oro/workflow/b2c_flow_abandoned_shopping_cart/transitions.yml
@@ -215,6 +215,9 @@ workflows:
                                 required: false
                     init_actions:
                         - @assign_active_user: $.result.user
+                        - @assign_value: [$email_subject, ""]
+                        - @assign_value: [$email_body, ""]
+                        - @assign_value: [$notes, ""]
                         - @assign_value: [$email_from, $.result.user.email]
                         - @assign_value: #Assign email to as shopping cart email
                             conditions:

diff --git a/...oBundle/Resources/config/oro/workflow/b2c_flow_order_follow_up/transition_definitions.yml b/...oBundle/Resources/config/oro/workflow/b2c_flow_order_follow_up/transition_definitions.yml
@@ -71,6 +71,7 @@ workflows:
                         to: $email_to
                         subject: $email_subject
                         body: $email_body
+                        type: 'html'
                     - @call_method:
                         method: 'addRelatedEmail'
                         object: $order