Merge pull request magento#1702 from magento-partners/prs-2.2-2017-11-10

[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

@@ -531,12 +531,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 +542,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}
      */

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"/>

app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CarrierFinder.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\InstantPurchase\Model\ShippingMethodChoose;
+
+use Magento\Customer\Model\Address;
+use Magento\Framework\DataObject;
+use Magento\Shipping\Model\Config as CarriersConfig;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Collect shipping rates for customer address without packaging estiamtion.
+ */
+class CarrierFinder
+{
+    /**
+     * @var CarriersConfig
+     */
+    private $carriersConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * CarrierFinder constructor.
+     * @param CarriersConfig $carriersConfig
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        CarriersConfig $carriersConfig,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->carriersConfig = $carriersConfig;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Finds carriers delivering to customer address
+     *
+     * @param Address $address
+     * @return array
+     */
+    public function getCarriersForCustomerAddress(Address $address): array
+    {
+        $request = new DataObject([
+            'dest_country_id' => $address->getCountryId()
+        ]);
+
+        $carriers = [];
+        foreach ($this->carriersConfig->getActiveCarriers($this->storeManager->getStore()->getId()) as $carrier) {
+            $checked = $carrier->checkAvailableShipCountries($request);
+            if (false !== $checked && null === $checked->getErrorMessage() && !empty($checked->getAllowedMethods())) {
+                $carriers[] = $checked;
+            }
+        }
+
+        return $carriers;
+    }
+}

app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CheapestMethodChooser.php

@@ -6,7 +6,6 @@
 namespace Magento\InstantPurchase\Model\ShippingMethodChoose;
 
 use Magento\Customer\Model\Address;
-use Magento\Quote\Api\Data\ShippingMethodInterface;
 use Magento\Quote\Api\Data\ShippingMethodInterfaceFactory;
 
 /**
@@ -20,21 +19,21 @@ class CheapestMethodChooser implements ShippingMethodChooserInterface
     private $shippingMethodFactory;
 
     /**
-     * @var ShippingRateFinder
+     * @var CarrierFinder
      */
-    private $shippingRateFinder;
+    private $carrierFinder;
 
     /**
      * CheapestMethodChooser constructor.
      * @param ShippingMethodInterfaceFactory $shippingMethodFactory
-     * @param ShippingRateFinder $shippingRateFinder
+     * @param CarrierFinder $carrierFinder
      */
     public function __construct(
         ShippingMethodInterfaceFactory $shippingMethodFactory,
-        ShippingRateFinder $shippingRateFinder
+        CarrierFinder $carrierFinder
     ) {
         $this->shippingMethodFactory = $shippingMethodFactory;
-        $this->shippingRateFinder = $shippingRateFinder;
+        $this->carrierFinder = $carrierFinder;
     }
 
     /**
@@ -58,7 +57,7 @@ public function choose(Address $address)
      */
     private function areShippingMethodsAvailable(Address $address): bool
     {
-        $shippingRatesForAddress = $this->shippingRateFinder->getRatesForCustomerAddress($address);
-        return !empty($shippingRatesForAddress);
+        $carriersForAddress = $this->carrierFinder->getCarriersForCustomerAddress($address);
+        return !empty($carriersForAddress);
     }
 }

app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingRateFinder.php

@@ -13,6 +13,7 @@
     "magento/module-catalog": "102.0.*",
     "magento/module-customer": "101.0.*",
     "magento/module-sales": "101.0.*",
+    "magento/module-shipping": "100.2.*",
     "magento/module-quote": "101.0.*",
     "magento/module-vault": "101.0.*",
     "magento/framework": "100.2.*"

app/code/Magento/InstantPurchase/composer.json

@@ -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']);