Update option wording and improve checks

Author: petitphp

src/Actions/Actions.php

@@ -41,9 +41,10 @@ public static function register_feed_generation() {
 	 * Register new action to get orders
 	 */
 	public static function register_get_orders() {
-		if ( ShoppingFeedHelper::is_disable_order_import() ) {
+		if ( ShoppingFeedHelper::is_order_import_disable() ) {
 			return;
 		}
+
 		$sf_accounts = ShoppingFeedHelper::get_sf_account_options();
 		if ( empty( $sf_accounts ) ) {
 			ShoppingFeedHelper::get_logger()->error(

src/Admin/Options.php

@@ -1513,7 +1513,7 @@ function () {
 
 				add_settings_field(
 					'disable_orders_import_option',
-					__( 'Disable order import', 'shopping-feed' ),
+					__( 'Order import', 'shopping-feed' ),
 					function () {
 						?>
 				<label for="disable_order_import">
@@ -1524,10 +1524,10 @@ function () {
 						value="yes"
 								<?php checked( 1, isset( $this->sf_orders_options['disable_order_import'] ) ? $this->sf_orders_options['disable_order_import'] : 0 ); ?>
 					>
-							<?php esc_html_e( 'Would you like to deactivate order import ?', 'shopping-feed' ); ?>
+							<?php esc_html_e( 'Disable orders synchronisation', 'shopping-feed' ); ?>
 				</label>
 				<p class="description" id="tagline-description">
-							<?php esc_html_e( 'If the box is checked, item import will be disabled.', 'shopping-feed' ); ?>
+							<?php esc_html_e( 'Disable the import of new orders to WooCommerce and stops the synchronization of existing ones with ShoppingFeed.', 'shopping-feed' ); ?>
 				</p>
 						<?php
 					},

src/Admin/WoocommerceActions.php

@@ -151,10 +151,16 @@ function ( $order_id, $message ) {
 				add_action(
 					$action,
 					function ( $order_id ) use ( $sf_action ) {
-						//if its not a sf order
+						//if it's not a sf order
 						if ( ! Order::is_sf_order( $order_id ) ) {
 							return;
 						}
+
+						// Don't update order is synchronisation is disabled.
+						if ( ShoppingFeedHelper::is_order_import_disable() ) {
+							return;
+						}
+
 						try {
 							$operations = new Operations( $order_id );
 							if ( ! method_exists( $operations, $sf_action ) ) {

src/Orders/Operations.php

@@ -53,10 +53,6 @@ class Operations {
 	 * @throws Exception
 	 */
 	public function __construct( $order_id ) {
-		// Check if import is enable
-		if ( ShoppingFeedHelper::is_disable_order_import() ) {
-			return;
-		}
 		//Check if the order from SF and return it with metas data
 		$order_sf_metas = Order::get_order_sf_metas( $order_id );
 		if (
@@ -196,6 +192,11 @@ private function acknowledge( $message = '' ) {
 	 * @param string $message
 	 */
 	public static function acknowledge_order( $order_id, $message = '' ) {
+		// Don't acknowledge order is synchronisation is disabled.
+		if ( ShoppingFeedHelper::is_order_import_disable() ) {
+			return;
+		}
+
 		$ok = true;
 		try {
 			$operations = new self( $order_id );
@@ -251,6 +252,11 @@ public static function get_available_operations() {
 	 * @author Stéphane Gillot
 	 */
 	public static function acknowledge_error( OrderResource $sf_order, $error ) {
+		// Don't acknowledge order is synchronisation is disabled.
+		if ( ShoppingFeedHelper::is_order_import_disable() ) {
+			return;
+		}
+
 		$shop = Sdk::get_sf_account_shop( $sf_order->toArray()['storeId'] );
 		if ( ! $shop ) {
 			ShoppingFeedHelper::get_logger()->notice(

src/Orders/Orders.php

@@ -60,8 +60,8 @@ public function get_orders( $sf_account, $since = '' ) {
 			'shopping-feed-orders'
 		);
 
-		// Check if import is enable
-		if ( ShoppingFeedHelper::is_disable_order_import() ) {
+		// Check if order import is enable
+		if ( ShoppingFeedHelper::is_order_import_disable() ) {
 			return false;
 		}
 

src/ShoppingFeedHelper.php

@@ -969,10 +969,11 @@ public static function current_language() {
 	}
 
 	/**
-	 * Return SF disable order import
+	 * Check if order import is disable.
+	 *
 	 * @return bool
 	 */
-	public static function is_disable_order_import() {
+	public static function is_order_import_disable() {
 		$orders_options = self::get_sf_orders_options();
 
 		if ( false === $orders_options ) {