Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release branch update #104

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dpdbaltics.php
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ public function hookDisplayCarrierExtraContent($params)
);

$return .= $this->context->smarty->fetch(
$this->getLocalPath() . '/views/templates/hook/front/pudo-points.tpl'
'module:dpdbaltics/views/templates/hook/front/pudo-points.tpl'
);
}

Expand Down Expand Up @@ -1226,7 +1226,7 @@ public function hookDisplayOrderDetail($params)
]
);
$html = $this->context->smarty->fetch(
$this->getLocalPath() . 'views/templates/hook/front/order-detail.tpl'
'module:dpdbaltics/views/templates/hook/front/order-detail.tpl'
);

return $html;
Expand Down
2 changes: 1 addition & 1 deletion src/Builder/Template/Front/CarrierOptionsBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function renderCarrierOptionsInProductPage()
]);

return $this->context->smarty->fetch(
$this->moduleLocalPath . 'views/templates/hook/front/product-page-carriers.tpl'
'module:dpdbaltics/views/templates/hook/front/product-page-carriers.tpl'
);
}
}
2 changes: 1 addition & 1 deletion src/Presenter/DeliveryTimePresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function getDeliveryTimeTemplate($countryIso, $city)
);

return $this->context->smarty->fetch(
$this->module->getLocalPath().'/views/templates/hook/front/carrier-delivery-time.tpl'
'module:dpdbaltics/views/templates/hook/front/carrier-delivery-time.tpl'
);
}
}
2 changes: 1 addition & 1 deletion src/Presenter/SameDayDeliveryMessagePresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function getSameDayDeliveryMessageTemplate()
);

return $this->context->smarty->fetch(
$this->module->getLocalPath() . '/views/templates/hook/front/carrier-same-day-delivery-message.tpl'
'module:dpdbaltics/views/templates/hook/front/carrier-same-day-delivery-message.tpl'
);
}
}
2 changes: 1 addition & 1 deletion src/Service/CarrierPhoneService.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function getCarrierPhoneTemplate($cartId, $carrierReference)
);

return $this->context->smarty->fetch(
$this->module->getLocalPath().'/views/templates/hook/front/carrier-phone-number.tpl'
'module:dpdbaltics/views/templates/hook/front/carrier-phone-number.tpl'
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Util/StringUtility.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static function toLowerCase($string)
}

public static function trimString($message) {
return strlen($message) > self::REMARK_LIMIT ? substr($message,0,self::REMARK_LIMIT)."..." : $message;
return mb_strlen($message) > self::REMARK_LIMIT ? mb_substr($message, 0, self::REMARK_LIMIT) . "..." : $message;
}

public static function removeSpecialCharacters($string) {
Expand Down
Loading