Merge branch 'trunk' into PCP-417-new-feature---pay-upon-invoice

modules/ppcp-api-client/src/Entity/PurchaseUnit.php

@@ -175,6 +175,15 @@ class PurchaseUnit {
 		return $this->shipping;
 	}
 
+	/**
+	 * Sets shipping info.
+	 *
+	 * @param Shipping|null $shipping The value to set.
+	 */
+	public function set_shipping( ?Shipping $shipping ): void {
+		$this->shipping = $shipping;
+	}
+
 	/**
 	 * Returns the reference id.
 	 *

modules/ppcp-api-client/src/Exception/PayPalApiException.php

@@ -119,4 +119,13 @@ class PayPalApiException extends RuntimeException {
 	public function issues(): array {
 		return $this->response->issues ?? array();
 	}
+
+	/**
+	 * The HTTP status code.
+	 *
+	 * @return int
+	 */
+	public function status_code(): int {
+		return $this->status_code;
+	}
 }

modules/ppcp-api-client/src/Factory/AmountFactory.php

@@ -124,6 +124,27 @@ class AmountFactory {
 		$currency = $order->get_currency();
 		$items    = $this->item_factory->from_wc_order( $order );
 
+		$discount_value = array_sum(
+			array(
+				(float) $order->get_total_discount( false ), // Only coupons.
+				$this->discounts_from_items( $items ),
+			)
+		);
+		$discount       = null;
+		if ( $discount_value ) {
+			$discount = new Money(
+				(float) $discount_value,
+				$currency
+			);
+		}
+
+		$items = array_filter(
+			$items,
+			function ( Item $item ): bool {
+				return $item->unit_amount()->value() > 0;
+			}
+		);
+
 		$total_value = (float) $order->get_total();
 		if ( (
 			CreditCardGateway::ID === $order->get_payment_method()
@@ -160,14 +181,6 @@ class AmountFactory {
 			$currency
 		);
 
-		$discount = null;
-		if ( (float) $order->get_total_discount( false ) ) {
-			$discount = new Money(
-				(float) $order->get_total_discount( false ),
-				$currency
-			);
-		}
-
 		$breakdown = new AmountBreakdown(
 			$item_total,
 			$shipping,
@@ -251,4 +264,29 @@ class AmountFactory {
 
 		return new AmountBreakdown( ...$money );
 	}
+
+	/**
+	 * Returns the sum of items with negative amount;
+	 *
+	 * @param Item[] $items PayPal order items.
+	 * @return float
+	 */
+	private function discounts_from_items( array $items ): float {
+		$discounts = array_filter(
+			$items,
+			function ( Item $item ): bool {
+				return $item->unit_amount()->value() < 0;
+			}
+		);
+		return abs(
+			array_sum(
+				array_map(
+					function ( Item $item ): float {
+						return (float) $item->quantity() * $item->unit_amount()->value();
+					},
+					$discounts
+				)
+			)
+		);
+	}
 }

modules/ppcp-api-client/src/Factory/ItemFactory.php

@@ -146,7 +146,7 @@ class ItemFactory {
 			mb_substr( $product->get_name(), 0, 127 ),
 			new Money( $price_without_tax_rounded, $currency ),
 			$quantity,
-			mb_substr( wp_strip_all_tags( $product->get_description() ), 0, 127 ),
+			substr( wp_strip_all_tags( $product->get_description() ), 0, 127 ) ?: '',
 			$tax,
 			$product->get_sku(),
 			( $product->is_virtual() ) ? Item::DIGITAL_GOODS : Item::PHYSICAL_GOODS,

modules/ppcp-api-client/src/Factory/PurchaseUnitFactory.php

@@ -107,7 +107,12 @@ class PurchaseUnitFactory {
 	 */
 	public function from_wc_order( \WC_Order $order ): PurchaseUnit {
 		$amount   = $this->amount_factory->from_wc_order( $order );
-		$items    = $this->item_factory->from_wc_order( $order );
+		$items    = array_filter(
+			$this->item_factory->from_wc_order( $order ),
+			function ( Item $item ): bool {
+				return $item->unit_amount()->value() > 0;
+			}
+		);
 		$shipping = $this->shipping_factory->from_wc_order( $order );
 		if (
 			! $this->shipping_needed( ... array_values( $items ) ) ||
@@ -153,7 +158,12 @@ class PurchaseUnitFactory {
 	 */
 	public function from_wc_cart( \WC_Cart $cart ): PurchaseUnit {
 		$amount = $this->amount_factory->from_wc_cart( $cart );
-		$items  = $this->item_factory->from_wc_cart( $cart );
+		$items  = array_filter(
+			$this->item_factory->from_wc_cart( $cart ),
+			function ( Item $item ): bool {
+				return $item->unit_amount()->value() > 0;
+			}
+		);
 
 		$shipping = null;
 		$customer = \WC()->customer;