Merge branch '1.2.4-rc' of https://github.com/magento-commerce/facebook-for-magento2 into 1.2.4

Author: strygo

app/code/Meta/BusinessExtension/Helper/GraphAPIAdapter.php

@@ -585,7 +585,7 @@ public function getOrders($ordersRootId, $cursorAfter = false, $filterType = "")
             'selected_shipping_option{name, reference_id, price, calculated_tax, estimated_shipping_time}',
             'shipping_address{first_name, last_name, street1, street2, city, postal_code, state, country}',
             'payments',
-            'promotion_details{applied_amount, coupon_code, target_granularity, target_type, sponsor, campaign_name}',
+            'promotion_details{applied_amount, coupon_code, target_granularity, sponsor, campaign_name}',
             'last_updated',
         ];
         $request = [

app/code/Meta/Sales/Model/Mapper/OrderItemMapper.php

@@ -121,18 +121,30 @@ public function map(array $item, int $storeId): OrderItem
         // sale price if available, otherwise list price
         $price = $productInfo['sale_price'] ?? $originalPrice;
 
-        // actual price, including applied discounts
+        // actual price, including applied item-level discounts
         $discountPrice = $item['price_per_unit']['amount'];
 
+        $discountAmountItems = $price - $discountPrice;
+        $discountPercent = round(($discountAmountItems / $price) * 100, 2);
+
+        $discountAmountOrder = 0;
+        $promotionDetails = $item['promotion_details']['data'] ?? null;
+        if ($promotionDetails) {
+            foreach ($promotionDetails as $promotionDetail) {
+                if ($promotionDetail['target_granularity'] === 'order_level') {
+                    $discountAmountOrder += $promotionDetail['applied_amount']['amount'];
+                }
+            }
+        }
+
         $rowTotal = $price * $quantity;
         $rowWeight = $product->getWeight() * $quantity;
         $rowTaxAmount = $item['tax_details']['estimated_tax']['amount'];
-        $rowDiscountAmount = ($price - $discountPrice) * $quantity;
-
-        $discountAmount = $price - $discountPrice;
-        $discountPercent = round(($discountAmount / $price) * 100, 2);
+        $rowDiscountAmount = round(($discountAmountItems * $quantity) + $discountAmountOrder, 2);
+        $rowDiscountPrice = $discountPrice * $quantity - $discountAmountOrder;
 
-        $taxPercent = round($rowTaxAmount / ($discountPrice * $quantity) * 100, 2);
+        // discount price can be $0 for free BXGY items
+        $taxPercent = $rowDiscountPrice > 0 ? round(($rowTaxAmount / $rowDiscountPrice) * 100, 2) : 0;
         $priceInclTax = round(($price * (100 + $taxPercent) / 100), 2);
         $rowTotalInclTax = round(($priceInclTax * $quantity), 2);
 

app/code/Meta/Sales/Model/Mapper/OrderMapper.php

@@ -170,7 +170,6 @@ public function map(array $data, int $storeId): Order
 
         $this->applyShippingToOrder($order, $data, $storeId);
         $this->applyItemsToOrder($order, $data, $storeId);
-        $this->applyDiscountsToOrder($order, $data);
         $this->applyTotalsToOrder($order, $data, $storeId);
 
         $order->addCommentToStatusHistory("Order Imported from Meta. Meta Order ID: #{$facebookOrderId}");
@@ -315,7 +314,7 @@ private function getOrderBillingAddress(array $data): Order\Address
             'street' => $street,
             'city' => $data['shipping_address']['city'],
             'email' => $data['buyer_details']['email'],
-            'telephone' => '0', // is required by magento
+            'telephone' => 'N/A', // is required by magento
             'country_id' => $data['shipping_address']['country'] // maps 1:1
         ];
 
@@ -331,25 +330,29 @@ private function getOrderBillingAddress(array $data): Order\Address
      *
      * @param Order $order
      * @param array $data
+     * @param array $items
      * @return void
      */
-    private function applyDiscountsToOrder(Order $order, array $data)
+    private function applyDiscountsToOrder(Order $order, array $data, array $items)
     {
-        $promotionDetails = $data['promotion_details'] ?? null;
-        $orderSubtotalAmount = $data['estimated_payment_details']['subtotal']['items']['amount'];
         $discountAmount = 0;
         $discountNames = [];
 
-        if ($promotionDetails) {
-            foreach ($promotionDetails['data'] as $promotionDetail) {
-                $targetType = $promotionDetail['target_type'] ?? null;
-                if ($targetType === 'shipping') {
-                    // don't treat free shipping as a discount since it is
-                    // already reflected as free under shipping charges.
-                } else {
+        // calculate discounts using items to exclude order-level shipping discounts
+        foreach ($items['data'] as $item) {
+            $itemPromotionDetails = $item['promotion_details']['data'] ?? null;
+            if ($itemPromotionDetails) {
+                foreach ($itemPromotionDetails as $promotionDetail) {
                     $discountAmount -= $promotionDetail['applied_amount']['amount'];
                 }
+            }
+        }
+
+        $orderPromotionDetails = $data['promotion_details'] ?? null;
+        $orderSubtotalAmount = $data['estimated_payment_details']['subtotal']['items']['amount'];
 
+        if ($orderPromotionDetails) {
+            foreach ($orderPromotionDetails['data'] as $promotionDetail) {
                 $couponCode = $promotionDetail['coupon_code'] ?? null;
                 if ($couponCode) {
                     $order->setCouponCode($couponCode);
@@ -417,6 +420,8 @@ private function applyItemsToOrder(Order $order, array $data, int $storeId)
             ->setBaseSubtotalInclTax($subtotalInclTax)
             ->setTotalQtyOrdered($totalQtyOrdered)
             ->setWeight($weight);
+
+        $this->applyDiscountsToOrder($order, $data, $items);
     }
 
     /**