Merge pull request #126 from BeAPI/issue/68254

petitphp · web-flow · commit 9f31d9892c91 · 2025-01-23T17:14:22.000+01:00
Issue/68254
diff --git a/.lando.dist.yml b/.lando.dist.yml
@@ -17,6 +17,11 @@ services:
       user: wordpress-test
       password: wordpress-test
       database: wordpress-test
+  mailcatcher:
+    type: mailhog
+    hogfrom:
+      - appserver
+    portforward: true
 tooling:
   setup-env:
     service: appserver
@@ -32,20 +37,27 @@ tooling:
       - wp config create --dbname=wordpress --dbuser=wordpress --dbpass=wordpress --dbhost=database --path=/app/wordpress
       - echo "➡️ Install WP"
       - wp core install --url="https://shoppingfeed-for-woocommerce.lndo.site" --title="Test" --admin_user=admin --admin_password=password --admin_email=wordpress@example.com --skip-email
+      - wp rewrite structure "/%postname%/"
       - echo "➡️ Install Woocommerce"
       - wp plugin install --activate woocommerce
       - echo "➡️ Install Storefront"
       - wp theme install storefront --activate
       - echo "➡️ Install WordPress importer"
       - wp plugin install wordpress-importer --activate
-      - echo "➡️ Install Woocommerce"
+      - echo "➡️ Configure Woocommerce"
       - wp option set woocommerce_store_address "Example Address Line 1"
       - wp option set woocommerce_store_address_2 "Example Address Line 2"
       - wp option set woocommerce_store_city "Example City"
       - wp option set woocommerce_default_country "US:CA"
       - wp option set woocommerce_store_postcode "94110"
       - wp option set woocommerce_currency "EUR"
       - wp option set woocommerce_product_type "both"
+      - wp option set woocommerce_calc_taxes "yes"
+      - wp option set woocommerce_prices_include_tax "yes"
+      - wp option set woocommerce_tax_display_shop "incl"
+      - wp option set woocommerce_tax_display_cart "incl"
+      - wp wc tax create --country=FR --rate=20 --user=admin
+      - wp wc tax create --country=FR --rate=5.5 --class=reduced-rate --user=admin
       - wp option set woocommerce_allow_tracking "no"
       - wp option set woocommerce_enable_checkout_login_reminder "yes"
       - wp option set --format=json woocommerce_cod_settings '{"enabled":"yes"}'
diff --git a/src/Admin/Options.php b/src/Admin/Options.php
@@ -1533,6 +1533,30 @@ function () use ( $wc_order_statuses ) {
 			'sf_orders_settings_import_options'
 		);
 
+		add_settings_field(
+			'import_vat_order',
+			__( 'VAT', 'shopping-feed' ),
+			function () {
+				?>
+				<label for="import_vat_order">
+					<input
+						type="checkbox"
+						id="import_vat_order"
+						name="<?php echo esc_attr( sprintf( '%s[import_vat_order]', self::SF_ORDERS_OPTIONS ) ); ?>"
+						value="1"
+						<?php checked( '1', isset( $this->sf_orders_options['import_vat_order'] ) ? $this->sf_orders_options['import_vat_order'] : '0' ); ?>
+					>
+					<?php esc_html_e( 'Import VAT (beta)', 'shopping-feed' ); ?>
+				</label>
+				<p class="description" id="tagline-description">
+					<?php esc_html_e( 'Include VAT when importing orders. The option "Enable taxes" in the Woocommerce general settings must be checked.', 'shopping-feed' ); ?>
+				</p>
+				<?php
+			},
+			self::SF_ORDERS_SETTINGS_PAGE,
+			'sf_orders_settings_import_options'
+		);
+
 		//mapping
 		$sf_actions = Operations::get_available_operations();
 
diff --git a/src/Orders/Order.php b/src/Orders/Order.php
@@ -25,11 +25,16 @@
  */
 class Order {
 
+	public const RATE_ID = 999999999999;
+
 	use Marketplace;
 
 	/** @var OrderResource $sf_order */
 	private $sf_order;
 
+	/** @var bool $include_vat */
+	private $include_vat;
+
 	/** @var array $shipping_address */
 	private $shipping_address;
 
@@ -61,11 +66,13 @@ class Order {
 	 * Order constructor.
 	 * Init all order requirements
 	 *
-	 * @param $sf_order OrderResource
+	 * @param OrderResource $sf_order
+	 * @param bool $include_vat
 	 */
-	public function __construct( $sf_order ) {
+	public function __construct( $sf_order, $include_vat = false ) {
 
-		$this->sf_order = $sf_order;
+		$this->sf_order    = $sf_order;
+		$this->include_vat = $include_vat;
 
 		$this->set_shipping_address();
 		$this->set_billing_address();
@@ -112,7 +119,7 @@ public function add() {
 
 		//Payment
 		try {
-			$wc_order->set_prices_include_tax( $this->payment->get_total() );
+			$wc_order->set_prices_include_tax( true );
 			$wc_order->set_payment_method( $this->payment->get_method() );
 		} catch ( \Exception $exception ) {
 			$message = sprintf(
@@ -139,13 +146,23 @@ public function add() {
 			$shipping_rate = $this->shipping->get_shipping_rate();
 			$item          = new \WC_Order_Item_Shipping();
 			$item->set_shipping_rate( $shipping_rate );
+			$item->save();
 			$wc_order->add_item( $item );
 			do_action( 'sf_after_order_add_shipping', $item, $wc_order );
 		} else {
 			try {
 				$item = new \WC_Order_Item_Shipping();
 				$item->set_method_title( $this->shipping->get_method() );
 				$item->set_total( $this->shipping->get_total() );
+				if ( $this->include_vat && $this->shipping->get_total_tax() > 0 ) {
+					$item->set_taxes(
+						[
+							'total' => [
+								self::RATE_ID => $this->shipping->get_total_tax(),
+							],
+						]
+					);
+				}
 				$item->save();
 				$wc_order->add_item( $item );
 				do_action( 'sf_after_order_add_shipping', $item, $wc_order );
@@ -205,6 +222,33 @@ public function add() {
 			}
 		}
 
+		if ( $this->include_vat ) {
+			$total_product_tax = 0;
+			foreach ( $this->sf_order->getItems() as $item ) {
+				$total_product_tax += $item->getTaxAmount();
+			}
+
+			$total_shipping_tax = 0;
+			if ( isset( $this->sf_order->toArray()['additionalFields']['shipping_tax'] ) ) {
+				$total_shipping_tax = (float) $this->sf_order->toArray()['additionalFields']['shipping_tax'];
+			}
+
+			if ( $total_product_tax > 0 || $total_shipping_tax > 0 ) {
+				$tax = new \WC_Order_Item_Tax();
+				$tax->set_props(
+					[
+						'rate_code'          => 'SF-VAT',
+						'rate_id'            => self::RATE_ID,
+						'label'              => __( 'VAT', 'shopping-feed' ),
+						'tax_total'          => $total_product_tax,
+						'shipping_tax_total' => $total_shipping_tax,
+					]
+				);
+				$tax->save();
+				$wc_order->add_item( $tax );
+			}
+		}
+
 		$wc_order->set_status( $this->status->get_name(), $this->status->get_note() );
 		$wc_order->calculate_totals( false );
 		$wc_order->save();
@@ -323,7 +367,7 @@ private function set_products() {
 			$this->products = array();
 		}
 
-		$products       = new Products( $this->sf_order );
+		$products       = new Products( $this->sf_order, $this->include_vat );
 		$this->products = $products->get_products();
 	}
 
diff --git a/src/Orders/Order/Products.php b/src/Orders/Order/Products.php
@@ -6,8 +6,8 @@
 defined( 'ABSPATH' ) || exit;
 
 use ShoppingFeed\ShoppingFeedWC\Dependencies\ShoppingFeed\Sdk\Api\Order\{OrderItem, OrderResource};
+use ShoppingFeed\ShoppingFeedWC\Orders\Order;
 use ShoppingFeed\ShoppingFeedWC\ShoppingFeedHelper;
-use WC_Product;
 
 /**
  * @psalm-consistent-constructor
@@ -19,6 +19,11 @@ class Products {
 	 */
 	private $sf_order;
 
+	/**
+	 * @var bool $include_vat
+	 */
+	private $include_vat;
+
 	/**
 	 * @var array $products
 	 */
@@ -27,10 +32,12 @@ class Products {
 	/**
 	 * Products constructor.
 	 *
-	 * @param $sf_order OrderResource
+	 * @param OrderResource $sf_order
+	 * @param bool $include_vat
 	 */
-	public function __construct( $sf_order ) {
-		$this->sf_order = $sf_order;
+	public function __construct( $sf_order, $include_vat = false ) {
+		$this->sf_order    = $sf_order;
+		$this->include_vat = $include_vat;
 		$this->set_products();
 	}
 
@@ -94,6 +101,17 @@ private function mapping_product( $sf_product ) {
 			'quantity'     => $sf_product_quantity,
 		);
 
+		if ( $this->include_vat && $sf_product->getTaxAmount() > 0 ) {
+			$args['taxes'] = [
+				'subtotal' => [
+					Order::RATE_ID => $sf_product->getTaxAmount(),
+				],
+				'total'    => [
+					Order::RATE_ID => $sf_product->getTaxAmount(),
+				],
+			];
+		}
+
 		return array(
 			'args'         => $args,
 			'is_available' => $wc_product->is_in_stock() && $wc_product->has_enough_stock( $sf_product_quantity ),
diff --git a/src/Orders/Order/Shipping.php b/src/Orders/Order/Shipping.php
@@ -6,6 +6,7 @@
 defined( 'ABSPATH' ) || exit;
 
 use ShoppingFeed\ShoppingFeedWC\Dependencies\ShoppingFeed\Sdk\Api\Order\OrderResource;
+use ShoppingFeed\ShoppingFeedWC\Orders\Order;
 use ShoppingFeed\ShoppingFeedWC\ShoppingFeedHelper;
 
 /**
@@ -33,6 +34,12 @@ class Shipping {
 	 */
 	private $total;
 
+	/** @var float $total_tax */
+	private $total_tax;
+
+	/** @var bool $include_vat */
+	private $include_vat;
+
 	/** @var array|\WC_Shipping_Rate $shipping_rate */
 	private $shipping_rate;
 
@@ -42,13 +49,16 @@ class Shipping {
 	/**
 	 * Shipping constructor.
 	 *
-	 * @param $sf_order OrderResource
+	 * @param OrderResource $sf_order
+	 * @param bool $include_vat
 	 */
-	public function __construct( $sf_order ) {
-		$this->sf_order = $sf_order;
+	public function __construct( $sf_order, $include_vat = false ) {
+		$this->sf_order    = $sf_order;
+		$this->include_vat = $include_vat;
 
 		$this->set_shipping_method_and_colis_number();
 		$this->set_total();
+		$this->set_total_tax();
 	}
 
 	/**
@@ -93,11 +103,20 @@ private function set_shipping_rate() {
 			$shipping_rate = $default_shipping_method;
 		}
 
+		$taxes = [];
+		if ( $this->include_vat && $this->get_total_tax() > 0 ) {
+			$taxes = [
+				'total' => [
+					Order::RATE_ID => $this->get_total_tax(),
+				],
+			];
+		}
+
 		$rate                = new \WC_Shipping_Rate(
 			$shipping_rate['method_rate_id'],
 			$shipping_rate['method_title'],
 			$this->get_total_shipping() ? $this->get_total_shipping() : ShoppingFeedHelper::get_sf_default_shipping_fees(),
-			array(),
+			$taxes,
 			$shipping_rate['method_rate_id'],
 			$shipping_rate['method_id']
 		);
@@ -106,19 +125,37 @@ private function set_shipping_rate() {
 	}
 
 	/**
+	 * Get total shipping amount.
+	 *
 	 * @return float
 	 */
 	public function get_total() {
 		return $this->total;
 	}
 
 	/**
-	 * Set total
+	 * Set total shipping amount.
 	 */
 	public function set_total() {
 		$this->total = $this->get_total_shipping();
 	}
 
+	/**
+	 * Get total shipping tax amount.
+	 *
+	 * @return float
+	 */
+	public function get_total_tax() {
+		return $this->total_tax;
+	}
+
+	/**
+	 * Set total shipping tax amount.
+	 */
+	public function set_total_tax() {
+		$this->total_tax = isset( $this->sf_order->toArray()['additionalFields']['shipping_tax'] ) ? (float) $this->sf_order->toArray()['additionalFields']['shipping_tax'] : 0;
+	}
+
 	/**
 	 * @return array|\WC_Shipping_Rate $shipping_rate
 	 */
diff --git a/src/Orders/Orders.php b/src/Orders/Orders.php
@@ -115,8 +115,11 @@ public function get_orders( $sf_account, $since = '' ) {
 				continue;
 			}
 
+			// Include VAT when importing the order.
+			$include_vat = (bool) ( ShoppingFeedHelper::get_sf_orders_options()['import_vat_order'] ?? false );
+
 			//Init Order
-			$order = new Order( $sf_order );
+			$order = new Order( $sf_order, $include_vat );
 			//Add Order
 			$order->add();
 		}

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,11 @@ public function get_orders( $sf_account, $since = '' ) {`
`115`	`115`	`continue;`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ // Include VAT when importing the order.`
	`119`	`+ $include_vat = (bool) ( ShoppingFeedHelper::get_sf_orders_options()['import_vat_order'] ?? false );`
	`120`	`+`
`118`	`121`	`//Init Order`
`119`		`- $order = new Order( $sf_order );`
	`122`	`+ $order = new Order( $sf_order, $include_vat );`
`120`	`123`	`//Add Order`
`121`	`124`	`$order->add();`
`122`	`125`	`}`