Add a message for cash on delivery for classic checkout

ISSUE: PKLPM-71

Author: IvanaLog

PluginInstallation/3.6.0/packlink-pro-shipping.zip

@@ -10,10 +10,12 @@
 use Logeecom\Infrastructure\Logger\Logger;
 use Logeecom\Infrastructure\ORM\RepositoryRegistry;
 use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\CashOnDelivery\Services\OfflinePaymentsServices;
 use Packlink\BusinessLogic\Location\LocationService;
 use Packlink\BusinessLogic\ShippingMethod\Models\ShippingMethod;
 use Packlink\WooCommerce\Components\Order\Order_Drop_Off_Map;
 use Packlink\WooCommerce\Components\Order\Paid_Order_Handler;
+use Packlink\WooCommerce\Components\Services\Offline_Payments_Service;
 use Packlink\WooCommerce\Components\ShippingMethod\Packlink_Shipping_Method;
 use Packlink\WooCommerce\Components\ShippingMethod\Shipping_Method_Helper;
 use Packlink\WooCommerce\Components\Utility\Script_Loader;
@@ -40,6 +42,17 @@ class Checkout_Handler {
 	 */
 	const DEFAULT_SHIPPING = 'shipping cost';
 
+    /**
+     * @var Offline_Payments_Service
+     */
+    private $offline_payments_service;
+
+    public function __construct()
+    {
+        $this->offline_payments_service = ServiceRegister::getService(
+            OfflinePaymentsServices::CLASS_NAME);
+    }
+
 	/**
 	 * This hook is triggered after shipping method label, and it will insert hidden input values.
 	 *
@@ -57,11 +70,27 @@ public function after_shipping_rate( WC_Shipping_Rate $rate, $index ) {
 			return;
 		}
 
-		$fields = array(
+        $cart = WC()->cart;
+        $totals = $cart->get_totals();
+
+        $subtotal   = isset($totals['cart_contents_total']) ? (float) $totals['cart_contents_total'] : 0;
+        $shipping   = isset($totals['shipping_total']) ? (float) $totals['shipping_total'] : 0;
+        $discount   = isset($totals['discount_total']) ? (float) $totals['discount_total'] : 0;
+
+        $current_total = $subtotal + $shipping - $discount;
+
+        $offlinePaymentName = $this->getOfflinePaymentName();
+
+
+        $fields = array(
 			'packlink_image_url'   => $shipping_method->getLogoUrl() ?: Shop_Helper::get_plugin_base_url() . 'resources/images/box.svg',
 			'packlink_show_image'  => $shipping_method->isDisplayLogo() ? 'yes' : 'no',
 			'packlink_is_drop_off' => $shipping_method->isDestinationDropOff() ? 'yes' : 'no',
-		);
+            'packlink_cash_on_delivery' => $this->is_cash_on_delivery_enabled($shipping_method) ? 'yes' : 'no',
+            'packlink_cash_on_delivery_fee' => $this->offline_payments_service->calculateFee($shipping_method->getId(), $current_total),
+            'packlink_cash_on_delivery_name' => $offlinePaymentName ?: '',
+
+        );
 
 		foreach ( $fields as $field => $value ) {
 			$this->print_hidden_input( $field, $value );
@@ -264,6 +293,49 @@ public function get_drop_off_locations_missing_message() {
 		return __( 'There are no drop-off locations available for the entered address', 'packlink-pro-shipping' );
 	}
 
+    /**
+     * Returns the display name of the current offline payment method or null.
+     *
+     * @return string|null
+     */
+    private function getOfflinePaymentName()
+    {
+        try {
+            $offlinePayments = $this->offline_payments_service->getOfflinePayments();
+            $accountConfig   = $this->offline_payments_service->getAccountConfiguration();
+            $offlinePaymentName = null;
+
+            if ($accountConfig && $accountConfig->account) {
+                $id = $accountConfig->account->getOfflinePaymentMethod();
+
+                foreach ($offlinePayments as $payment) {
+                    if ($payment['name'] === $id) {
+                        $offlinePaymentName = $payment['displayName'];
+                        break;
+                    }
+                }
+            }
+
+            return $offlinePaymentName;
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
+    /**
+     * @param ShippingMethod $shippingMethod
+     *
+     * @return bool
+     */
+    private function is_cash_on_delivery_enabled($shippingMethod) {
+        foreach ($shippingMethod->getShippingServices() as $service) {
+            if ($service->cashOnDeliveryConfig && $service->cashOnDeliveryConfig->offered) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
 	/**
 	 * Returns Packlink shipping method.
 	 *

src/Components/Checkout/class-checkout-handler.php

@@ -166,7 +166,7 @@ public function calculateFee( $shippingMethodId, $amount ) {
 			$cod = null;
 		}
 
-		if ( $cod && $cod->account && $cod->account->getCashOnDeliveryFee() ) {
+		if ( $cod && $cod->account && $cod->account->getCashOnDeliveryFee() !== null) {
 			return $cod->account->getCashOnDeliveryFee();
 		}
 

src/Components/Services/class-offline-payments-service.php

@@ -725,7 +725,7 @@ private function checkout_hooks_and_actions() {
 		add_action( 'woocommerce_checkout_update_order_meta', array( $handler, 'checkout_update_drop_off' ), 10, 2 );
 		add_action( 'wp_enqueue_scripts', array( $handler, 'load_scripts' ) );
 
-        add_action('woocommerce_checkout_create_order', array($surcharge_handle, 'add_surcharge_to_order'), 20, 1); // Classic checkout
+        add_action('woocommerce_checkout_create_order', array($surcharge_handle, 'add_surcharge_to_order'), 20, 1);
 
         add_action( 'woocommerce_store_api_checkout_update_order_from_request', [ $surcharge_handle, 'add_surcharge_block' ], 10, 2 );
 

src/class-plugin.php

@@ -39,6 +39,21 @@ var Packlink = window.Packlink || {};
 				let button     = parent.querySelector( '#packlink-drop-off-picker' );
 				let isDropOff  = parent.querySelector( 'input[name="packlink_is_drop_off"]' );
 
+				let isCOD  = parent.querySelector('input[name="packlink_cash_on_delivery"]');
+
+				if (isCOD && isCOD.value === 'yes') {
+					const codFeeInput = parent.querySelector('input[name="packlink_cash_on_delivery_fee"]');
+					let codNameInput = parent.querySelector('input[name="packlink_cash_on_delivery_name"]');
+					const codName = codNameInput ? codNameInput.value : '';
+
+					const codFee = codFeeInput ? parseFloat(codFeeInput.value) : 0;
+
+					const shippingInput = parent.querySelector('input[name^="shipping_method"]');
+					if (shippingInput && shippingInput.checked) {
+						addCODMessage(parent, codName, codFee);
+					}
+				}
+
 				if (showImage === 'yes' && imageInput && parent.querySelector('.pl-checkout-carrier-image') === null) {
 					injectImage( imageInput );
 				}
@@ -110,6 +125,22 @@ var Packlink = window.Packlink || {};
 		}
 	}
 
+	function addCODMessage(dataDiv, codName, codFee) {
+		if (!dataDiv) return;
+		if (!codName || !codFee || codFee <= 0) return;
+
+		if (dataDiv.querySelector('.packlink-cod-message')) return;
+
+		const messageDiv = document.createElement('div');
+		messageDiv.className = 'packlink-cod-message';
+		messageDiv.innerHTML = `This service supports <strong>${codName}</strong>. If you choose the <strong>${codName}</strong> payment method, an additional fee of <strong>${codFee}</strong> will be applied.`;
+		messageDiv.style.marginTop = '8px';
+		messageDiv.style.fontSize = '12px';
+		messageDiv.style.color = '#555';
+
+		dataDiv.lastChild.before(messageDiv);
+	}
+
 	/**
 	 * Sets locations.
 	 *