MAGETWO-37464: Merge and Fix Builds

Cari Spruiell · Cari Spruiell · commit f78a4affcd35 · 2015-05-15T15:13:30.000-05:00
- merge MAGETWO-32618-35024-merge branch
diff --git a/app/code/Magento/Quote/Api/CartManagementInterface.php b/app/code/Magento/Quote/Api/CartManagementInterface.php
@@ -7,6 +7,11 @@
 
 interface CartManagementInterface
 {
+    /**
+     * Checkout types: Checkout as Guest
+     */
+    const METHOD_GUEST = 'guest';
+
     /**
      * Creates an empty cart and quote for a guest.
      *
diff --git a/app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php b/app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php
@@ -11,7 +11,7 @@
 interface GuestBillingAddressManagementInterface
 {
     /**
-     * Assigns a specified billing address to a specified cart.
+     * Assign a specified billing address to a specified cart.
      *
      * @param string $cartId The cart ID.
      * @param \Magento\Quote\Api\Data\AddressInterface $address Billing address data.
@@ -22,7 +22,7 @@ interface GuestBillingAddressManagementInterface
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address);
 
     /**
-     * Returns the billing address for a specified quote.
+     * Return the billing address for a specified quote.
      *
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\AddressInterface Quote billing address object.
diff --git a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php
@@ -11,7 +11,7 @@
 interface GuestCartItemRepositoryInterface
 {
     /**
-     * Lists items that are assigned to a specified cart.
+     * List items that are assigned to a specified cart.
      *
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\CartItemInterface[] Array of items.
@@ -20,7 +20,7 @@ interface GuestCartItemRepositoryInterface
     public function getList($cartId);
 
     /**
-     * Adds the specified item to the specified cart.
+     * Add the specified item to the specified cart.
      *
      * @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item.
      * @return \Magento\Quote\Api\Data\CartItemInterface Item.
@@ -31,7 +31,7 @@ public function getList($cartId);
     public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem);
 
     /**
-     * Removes the specified item from the specified cart.
+     * Remove the specified item from the specified cart.
      *
      * @param string $cartId The cart ID.
      * @param int $itemId The item ID of the item to be removed.
diff --git a/app/code/Magento/Quote/Api/GuestCartManagementInterface.php b/app/code/Magento/Quote/Api/GuestCartManagementInterface.php
@@ -11,15 +11,15 @@
 interface GuestCartManagementInterface
 {
     /**
-     * Enables an customer or guest user to create an empty cart and quote for an anonymous customer.
+     * Enable an customer or guest user to create an empty cart and quote for an anonymous customer.
      *
      * @return string Cart ID.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The empty cart and quote could not be created.
      */
     public function createEmptyCart();
 
     /**
-     * Assigns a specified customer to a specified shopping cart.
+     * Assign a specified customer to a specified shopping cart.
      *
      * @param string $cartId The cart ID.
      * @param int $customerId The customer ID.
@@ -29,7 +29,7 @@ public function createEmptyCart();
     public function assignCustomer($cartId, $customerId, $storeId);
 
     /**
-     * Places an order for a specified cart.
+     * Place an order for a specified cart.
      *
      * @param string $cartId The cart ID.
      * @return int Order ID.
diff --git a/app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php
@@ -11,7 +11,7 @@
 interface GuestCartRepositoryInterface
 {
     /**
-     * Enables a guest user to return information for a specified cart.
+     * Enable a guest user to return information for a specified cart.
      *
      * @param string $cartId
      * @return \Magento\Quote\Api\Data\CartInterface
diff --git a/app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php
@@ -12,7 +12,7 @@
 interface GuestCartTotalRepositoryInterface
 {
     /**
-     * Returns quote totals data for a specified cart.
+     * Return quote totals data for a specified cart.
      *
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\TotalsInterface Quote totals data.
diff --git a/app/code/Magento/Quote/Api/GuestCouponManagementInterface.php b/app/code/Magento/Quote/Api/GuestCouponManagementInterface.php
@@ -13,7 +13,7 @@
 interface GuestCouponManagementInterface
 {
     /**
-     * Returns information for a coupon in a specified cart.
+     * Return information for a coupon in a specified cart.
      *
      * @param string $cartId The cart ID.
      * @return string The coupon code data.
@@ -22,7 +22,7 @@ interface GuestCouponManagementInterface
     public function get($cartId);
 
     /**
-     * Adds a coupon by code to a specified cart.
+     * Add a coupon by code to a specified cart.
      *
      * @param string $cartId The cart ID.
      * @param string $couponCode The coupon code data.
@@ -33,7 +33,7 @@ public function get($cartId);
     public function set($cartId, $couponCode);
 
     /**
-     * Deletes a coupon from a specified cart.
+     * Delete a coupon from a specified cart.
      *
      * @param string $cartId The cart ID.
      * @return bool
diff --git a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
@@ -11,7 +11,7 @@
 interface GuestPaymentMethodManagementInterface
 {
     /**
-     * Adds a specified payment method to a specified shopping cart.
+     * Add a specified payment method to a specified shopping cart.
      *
      * @param string $cartId The cart ID.
      * @param \Magento\Quote\Api\Data\PaymentInterface $method The payment method.
@@ -23,7 +23,7 @@ interface GuestPaymentMethodManagementInterface
     public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method);
 
     /**
-     * Returns the payment method for a specified shopping cart.
+     * Return the payment method for a specified shopping cart.
      *
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\PaymentInterface  Payment method object.
@@ -32,7 +32,7 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method);
     public function get($cartId);
 
     /**
-     * Lists available payment methods for a specified shopping cart.
+     * List available payment methods for a specified shopping cart.
      *
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\PaymentMethodInterface[] Array of payment methods.
diff --git a/app/code/Magento/Quote/Api/GuestShippingAddressManagementInterface.php b/app/code/Magento/Quote/Api/GuestShippingAddressManagementInterface.php
@@ -11,7 +11,7 @@
 interface GuestShippingAddressManagementInterface
 {
     /**
-     * Assigns a specified shipping address to a specified cart.
+     * Assign a specified shipping address to a specified cart.
      *
      * @param string $cartId The cart ID.
      * @param \Magento\Quote\Api\Data\AddressInterface $address The shipping address data.
@@ -22,7 +22,7 @@ interface GuestShippingAddressManagementInterface
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address);
 
     /**
-     * Returns the shipping address for a specified quote.
+     * Return the shipping address for a specified quote.
      *
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\AddressInterface Shipping address object.
diff --git a/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
@@ -11,7 +11,7 @@
 interface GuestShippingMethodManagementInterface
 {
     /**
-     * Sets the carrier and shipping methods codes for a specified cart.
+     * Set the carrier and shipping methods codes for a specified cart.
      *
      * @param string $cartId The shopping cart ID.
      * @param string $carrierCode The carrier code.
@@ -26,7 +26,7 @@ interface GuestShippingMethodManagementInterface
     public function set($cartId, $carrierCode, $methodCode);
 
     /**
-     * Returns selected shipping method for a specified quote.
+     * Return selected shipping method for a specified quote.
      *
      * @param string $cartId The shopping cart ID.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method.
@@ -36,7 +36,7 @@ public function set($cartId, $carrierCode, $methodCode);
     public function get($cartId);
 
     /**
-     * Lists applicable shipping methods for a specified quote.
+     * List applicable shipping methods for a specified quote.
      *
      * @param string $cartId The shopping cart ID.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
@@ -10,6 +10,7 @@
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Api\CartRepositoryInterface;
 
 /**
  * Cart Management class for guest carts.
@@ -28,19 +29,27 @@ class GuestCartManagement implements GuestCartManagementInterface
      */
     protected $quoteIdMaskFactory;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    protected $cartRepository;
+
     /**
      * Initialize dependencies.
      *
      * @param CartManagementInterface $quoteManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param CartRepositoryInterface $cartRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         CartManagementInterface $quoteManagement,
-        QuoteIdMaskFactory $quoteIdMaskFactory
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        CartRepositoryInterface $cartRepository
     ) {
         $this->quoteManagement = $quoteManagement;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->cartRepository = $cartRepository;
     }
 
     /**
@@ -72,6 +81,11 @@ public function placeOrder($cartId)
     {
         /** @var $quoteIdMask QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
+<<<<<<< .merge_file_PPOyn2
         return $this->quoteManagement->placeOrder($quoteIdMask->getQuoteId());
+=======
+        $this->cartRepository->get($quoteIdMask->getId())->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
+        return $this->quoteManagement->placeOrder($quoteIdMask->getId());
+>>>>>>> .merge_file_x9jgp1
     }
 }
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -268,7 +268,7 @@ public function placeOrder($cartId)
     {
         $quote = $this->quoteRepository->getActive($cartId);
 
-        if ($quote->getCheckoutMethod() === 'guest') {
+        if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
             $quote->setCustomerId(null);
             $quote->setCustomerEmail($quote->getBillingAddress()->getEmail());
             $quote->setCustomerIsGuest(true);

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,11 @@`
`7`	`7`
`8`	`8`	`interface CartManagementInterface`
`9`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * Checkout types: Checkout as Guest`
	`12`	`+ */`
	`13`	`+ const METHOD_GUEST = 'guest';`
	`14`	`+`
`10`	`15`	`/**`
`11`	`16`	`* Creates an empty cart and quote for a guest.`
`12`	`17`	`*`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`interface GuestBillingAddressManagementInterface`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`		`- * Assigns a specified billing address to a specified cart.`
	`14`	`+ * Assign a specified billing address to a specified cart.`
`15`	`15`	`*`
`16`	`16`	`* @param string $cartId The cart ID.`
`17`	`17`	`* @param \Magento\Quote\Api\Data\AddressInterface $address Billing address data.`
`@@ -22,7 +22,7 @@ interface GuestBillingAddressManagementInterface`
`22`	`22`	`public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address);`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * Returns the billing address for a specified quote.`
	`25`	`+ * Return the billing address for a specified quote.`
`26`	`26`	`*`
`27`	`27`	`* @param string $cartId The cart ID.`
`28`	`28`	`* @return \Magento\Quote\Api\Data\AddressInterface Quote billing address object.`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`	`interface GuestCartManagementInterface`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`		`- * Enables an customer or guest user to create an empty cart and quote for an anonymous customer.`
	`14`	`+ * Enable an customer or guest user to create an empty cart and quote for an anonymous customer.`
`15`	`15`	`*`
`16`	`16`	`* @return string Cart ID.`
`17`	`17`	`* @throws \Magento\Framework\Exception\CouldNotSaveException The empty cart and quote could not be created.`
`18`	`18`	`*/`
`19`	`19`	`public function createEmptyCart();`
`20`	`20`
`21`	`21`	`/**`
`22`		`- * Assigns a specified customer to a specified shopping cart.`
	`22`	`+ * Assign a specified customer to a specified shopping cart.`
`23`	`23`	`*`
`24`	`24`	`* @param string $cartId The cart ID.`
`25`	`25`	`* @param int $customerId The customer ID.`
`@@ -29,7 +29,7 @@ public function createEmptyCart();`
`29`	`29`	`public function assignCustomer($cartId, $customerId, $storeId);`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * Places an order for a specified cart.`
	`32`	`+ * Place an order for a specified cart.`
`33`	`33`	`*`
`34`	`34`	`* @param string $cartId The cart ID.`
`35`	`35`	`* @return int Order ID.`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`interface GuestCartTotalRepositoryInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * Returns quote totals data for a specified cart.`
	`15`	`+ * Return quote totals data for a specified cart.`
`16`	`16`	`*`
`17`	`17`	`* @param string $cartId The cart ID.`
`18`	`18`	`* @return \Magento\Quote\Api\Data\TotalsInterface Quote totals data.`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`interface GuestCouponManagementInterface`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * Returns information for a coupon in a specified cart.`
	`16`	`+ * Return information for a coupon in a specified cart.`
`17`	`17`	`*`
`18`	`18`	`* @param string $cartId The cart ID.`
`19`	`19`	`* @return string The coupon code data.`
`@@ -22,7 +22,7 @@ interface GuestCouponManagementInterface`
`22`	`22`	`public function get($cartId);`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * Adds a coupon by code to a specified cart.`
	`25`	`+ * Add a coupon by code to a specified cart.`
`26`	`26`	`*`
`27`	`27`	`* @param string $cartId The cart ID.`
`28`	`28`	`* @param string $couponCode The coupon code data.`
`@@ -33,7 +33,7 @@ public function get($cartId);`
`33`	`33`	`public function set($cartId, $couponCode);`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * Deletes a coupon from a specified cart.`
	`36`	`+ * Delete a coupon from a specified cart.`
`37`	`37`	`*`
`38`	`38`	`* @param string $cartId The cart ID.`
`39`	`39`	`* @return bool`