From 6345e157e4240c4d79f3f82a20f456199fc1d66e Mon Sep 17 00:00:00 2001 From: Gundo Sifhufhi <sifhufhisg@gmail.com> Date: Wed, 11 Jan 2023 21:18:37 +0200 Subject: [PATCH] getWorkingDays() Refactor --- uafrica/Customshipping/Model/Carrier/Customshipping.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/uafrica/Customshipping/Model/Carrier/Customshipping.php b/uafrica/Customshipping/Model/Carrier/Customshipping.php index 0b0e1ef..014949a 100644 --- a/uafrica/Customshipping/Model/Carrier/Customshipping.php +++ b/uafrica/Customshipping/Model/Carrier/Customshipping.php @@ -831,7 +831,8 @@ 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 ' . $max_delivery_date .' - ' . $min_delivery_date .' Business Days'); + $method->setCarrierTitle('Delivery in ' . $min_delivery_date .' - ' . $max_delivery_date .' Business Days'); + } else { $method->setCarrierTitle($this->getConfigData('title')); } @@ -857,7 +858,7 @@ class Customshipping extends AbstractCarrierOnline implements \Magento\Shipping\ $begin = strtotime($startDate); $end = strtotime($endDate); if ($begin > $end) { - echo "Start Date Cannot Be In The Future! <br />"; +// echo "Start Date Cannot Be In The Future! <br />"; return 0; } else { $no_days = 0; -- GitLab