From 4bb80aea020c56a640f366ee4c094f89e3bebf73 Mon Sep 17 00:00:00 2001
From: Gundo Sifhufhi <sifhufhisg@gmail.com>
Date: Wed, 25 Jan 2023 19:30:14 +0200
Subject: [PATCH] Shipping `day(s)` output logic improvement.
---
Model/Carrier/Customshipping.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Model/Carrier/Customshipping.php b/Model/Carrier/Customshipping.php
index b22b4cb..b22bfcc 100644
--- a/Model/Carrier/Customshipping.php
+++ b/Model/Carrier/Customshipping.php
@@ -45,7 +45,6 @@ class Customshipping extends AbstractCarrierOnline implements \Magento\Shipping\
{
/**
* Code of the carrier
- *`
* @var string
*/
public const CODE = 'uafrica';
@@ -753,7 +752,13 @@ class Customshipping extends AbstractCarrierOnline implements \Magento\Shipping\
if ($this->getConfigData('additional_info') == 1) {
$min_delivery_date = $this->getWorkingDays(date('Y-m-d'), $title['min_delivery_date']);
$max_delivery_date = $this->getWorkingDays(date('Y-m-d'), $title['max_delivery_date']);
- $method->setCarrierTitle('Delivery in ' . $min_delivery_date .' - ' . $max_delivery_date .' Business Days');
+
+ if ($min_delivery_date == 1 && $max_delivery_date == 1) {
+ $method->setCarrierTitle('delivery in ' . $min_delivery_date .' business day');
+ } else {
+ $method->setCarrierTitle('delivery in ' . $min_delivery_date .' - ' . $max_delivery_date .' business days');
+ }
+
} else {
$method->setCarrierTitle($this->getConfigData('title'));
--
GitLab