Merge branch 'webkul:develop' into gli-1052

This commit is contained in:
abhishek-webkul
2023-09-21 10:21:08 +05:30
committed by GitHub
4 changed files with 15 additions and 8 deletions

View File

@@ -1259,9 +1259,9 @@
{displayPrice price=$discount['value'] currency=$currency->id}
</td>
{if $can_edit}
<td>
<a href="{$current_index}&amp;submitDeleteVoucher&amp;id_order_cart_rule={$discount['id_order_cart_rule']}&amp;id_order={$order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">
<i class="icon-minus-sign"></i>
<td class="text-center">
<a class="btn btn-default" href="{$current_index}&amp;submitDeleteVoucher&amp;id_order_cart_rule={$discount['id_order_cart_rule']}&amp;id_order={$order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">
<i class="icon-trash"></i>
{l s='Delete voucher'}
</a>
</td>

View File

@@ -2580,9 +2580,15 @@ class ProductCore extends ObjectModel
$id_address = $context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')};
$ids = Address::getCountryAndState($id_address);
$id_country = $ids['id_country'] ? (int) $ids['id_country'] : (int) Configuration::get('PS_COUNTRY_DEFAULT');
return SpecificPrice::getProductIdByDate(
$id_country = null;
if (isset($ids['id_country']) && (int) $ids['id_country']) {
$id_country = (int) $ids['id_country'];
} else {
$id_country = (int) Configuration::get('PS_COUNTRY_DEFAULT');
}
return SpecificPrice::getProductIdByDate(
$context->shop->id,
$context->currency->id,
$id_country,

View File

@@ -3603,6 +3603,8 @@ exit;
public static function purifyHTML($html, $uri_unescape = null, $allow_style = false)
{
require_once(_PS_TOOL_DIR_.'htmlpurifier/HTMLPurifier.auto.php');
static $use_html_purifier = null;
static $purifier = null;

View File

@@ -260,7 +260,6 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$hotelRoomType = new HotelRoomType();
$context = Context::getContext();
$roomTypeRatesAndInventory = array();
$hotelCartBookingData = new HotelCartBookingData();
$objBookingDetail = new HotelBookingDetail();
$incr = 0;
$date_from = date('Y-m-d', strtotime($date_from));
@@ -283,7 +282,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$totalAvailableRooms = 0;
}
$roomTypePrice = $hotelCartBookingData->getRoomTypeTotalPrice($id_product, $currentDate, $nextDayDate);
$roomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice($id_product, $currentDate, $nextDayDate);
$roomTypeRatesAndInventory[$incr]['date'] = $currentDate;
$roomTypeRatesAndInventory[$incr]['room_types'][0]['id'] = $id_product;
$roomTypeRatesAndInventory[$incr]['room_types'][0]['rates'] = $roomTypePrice;
@@ -293,7 +292,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
if ($hotelRoomTypes) {
$roomTypeRatesAndInventory[$incr]['date'] = $currentDate;
foreach ($hotelRoomTypes as $key => $product) {
$roomTypePrice = $hotelCartBookingData->getRoomTypeTotalPrice(
$roomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
$product['id_product'],
$currentDate,
$nextDayDate