Merge pull request #1736 from magento-partners/prs-develop-2017-11-17

[EngCom] Partners Pull Requests

Author: Volodymyr Kublytskyi

app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php

@@ -179,6 +179,11 @@ protected function _createTemporaryFlatTable($storeId)
 
             $columnComment = isset($fieldProp['comment']) ? $fieldProp['comment'] : $fieldName;
 
+            if ($fieldName == 'created_at') {
+                $columnDefinition['nullable'] = true;
+                $columnDefinition['default'] = null;
+            }
+
             $table->addColumn($fieldName, $fieldProp['type'], $columnLength, $columnDefinition, $columnComment);
         }
 

app/code/Magento/Customer/Api/CustomerRepositoryInterface.php

@@ -38,7 +38,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
     public function get($email, $websiteId = null);
 
     /**
-     * Get customer by customer ID.
+     * Get customer by Customer ID.
      *
      * @param int $customerId
      * @return \Magento\Customer\Api\Data\CustomerInterface
@@ -70,7 +70,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer);
 
     /**
-     * Delete customer by ID.
+     * Delete customer by Customer ID.
      *
      * @param int $customerId
      * @return bool true on success

app/code/Magento/Customer/Model/AccountManagement.php

@@ -460,7 +460,12 @@ private function activateCustomer($customer, $confirmationKey)
 
         $customer->setConfirmation(null);
         $this->customerRepository->save($customer);
-        $this->getEmailNotification()->newAccount($customer, 'confirmed', '', $this->storeManager->getStore()->getId());
+        $this->getEmailNotification()->newAccount(
+            $customer,
+            'confirmed',
+            '',
+            $this->storeManager->getStore()->getId()
+        );
         return $customer;
     }
 
@@ -531,12 +536,8 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
                     $this->getEmailNotification()->passwordResetConfirmation($customer);
                     break;
                 default:
-                    throw new InputException(
-                        __(
-                            'Invalid value of "%value" provided for the %fieldName field.',
-                            ['value' => $template, 'fieldName' => 'email type']
-                        )
-                    );
+                    $this->handleUnknownTemplate($template);
+                    break;
             }
             return true;
         } catch (MailException $e) {
@@ -546,6 +547,25 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
         return false;
     }
 
+    /**
+     * Handle not supported template
+     *
+     * @param string $template
+     * @throws InputException
+     */
+    private function handleUnknownTemplate($template)
+    {
+        throw new InputException(__(
+            'Invalid value of "%value" provided for the %fieldName field. Possible values: %template1 or %template2.',
+            [
+                'value' => $template,
+                'fieldName' => 'template',
+                'template1' => AccountManagement::EMAIL_REMINDER,
+                'template2' => AccountManagement::EMAIL_RESET
+            ]
+        ));
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -1111,15 +1131,23 @@ protected function sendEmailTemplate(
         $storeId = null,
         $email = null
     ) {
-        $templateId = $this->scopeConfig->getValue($template, ScopeInterface::SCOPE_STORE, $storeId);
+        $templateId = $this->scopeConfig->getValue(
+            $template,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
         if ($email === null) {
             $email = $customer->getEmail();
         }
 
         $transport = $this->transportBuilder->setTemplateIdentifier($templateId)
             ->setTemplateOptions(['area' => Area::AREA_FRONTEND, 'store' => $storeId])
             ->setTemplateVars($templateParams)
-            ->setFrom($this->scopeConfig->getValue($sender, ScopeInterface::SCOPE_STORE, $storeId))
+            ->setFrom($this->scopeConfig->getValue(
+                $sender,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            ))
             ->addTo($email, $this->customerViewHelper->getCustomerName($customer))
             ->getTransport();
 
@@ -1313,8 +1341,10 @@ protected function getFullCustomerObject($customer)
         // No need to flatten the custom attributes or nested objects since the only usage is for email templates and
         // object passed for events
         $mergedCustomerData = $this->customerRegistry->retrieveSecureData($customer->getId());
-        $customerData =
-            $this->dataProcessor->buildOutputDataArray($customer, \Magento\Customer\Api\Data\CustomerInterface::class);
+        $customerData = $this->dataProcessor->buildOutputDataArray(
+            $customer,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
         $mergedCustomerData->addData($customerData);
         $mergedCustomerData->setData('name', $this->customerViewHelper->getCustomerName($customer));
         return $mergedCustomerData;

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -1173,10 +1173,6 @@ public function testInitiatePasswordResetEmailReset()
         $this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Invalid value of "" provided for the email type field
-     */
     public function testInitiatePasswordResetNoTemplate()
     {
         $storeId = 1;
@@ -1192,6 +1188,10 @@ public function testInitiatePasswordResetNoTemplate()
 
         $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
 
+        $this->expectException(\Magento\Framework\Exception\InputException::class);
+        $this->expectExceptionMessage(
+            'Invalid value of "" provided for the template field. Possible values: email_reminder or email_reset.'
+        );
         $this->accountManagement->initiatePasswordReset($email, $template);
     }
 

app/code/Magento/Customer/etc/webapi.xml

@@ -128,7 +128,7 @@
             <resource ref="anonymous"/>
         </resources>
     </route>
-    <route url="/V1/customers/:id" method="PUT">
+    <route url="/V1/customers/:customerId" method="PUT">
         <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="save"/>
         <resources>
             <resource ref="Magento_Customer::manage"/>
@@ -194,6 +194,12 @@
             <resource ref="anonymous"/>
         </resources>
     </route>
+    <route url="/V1/customers/resetPassword" method="POST">
+        <service class="Magento\Customer\Api\AccountManagementInterface" method="resetPassword"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
     <route url="/V1/customers/:customerId/confirm" method="GET">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="getConfirmationStatus"/>
         <resources>

app/code/Magento/Tax/Model/Plugin/OrderSave.php

@@ -163,7 +163,9 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
                                     if (isset($quoteItemId['id'])) {
                                         //This is a product item
                                         $item = $order->getItemByQuoteItemId($quoteItemId['id']);
-                                        $itemId = $item->getId();
+                                        if ($item !== null && $item->getId()) {
+                                            $itemId = $item->getId();
+                                        }
                                     } elseif (isset($quoteItemId['associated_item_id'])) {
                                         //This item is associated with a product item
                                         $item = $order->getItemByQuoteItemId($quoteItemId['associated_item_id']);

app/code/Magento/Ui/view/base/web/templates/form/element/input.html

@@ -15,5 +15,6 @@
             placeholder: placeholder,
             'aria-describedby': noticeId,
             id: uid,
-            disabled: disabled
+            disabled: disabled,
+            maxlength: 255
     }"/>

app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml

@@ -11,7 +11,7 @@
 <?php if ($block->isAllowInCart() && $block->isProductVisibleInSiteVisibility()): ?>
     <a href="#"
        data-post='<?= /* @noEscape */ $block->getMoveFromCartParams() ?>'
-       class="use-ajax action action-towishlist">
+       class="use-ajax action towishlist action-towishlist">
         <span><?= $block->escapeHtml(__('Move to Wishlist')) ?></span>
     </a>
 <?php endif ?>

app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less

@@ -328,7 +328,7 @@
     }
 
     .gift-options-cart-item {
-        & + .action-towishlist {
+        & + .towishlist {
             left: 43px;
             position: absolute;
         }

app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less

@@ -267,7 +267,7 @@
     }
 
     .cart.table-wrapper {
-        .action-towishlist {
+        .towishlist {
             .lib-icon-font(
             @icon-wishlist-full,
             @_icon-font-size: 18px,