diff --git a/admin/ajax_products_list.php b/admin/ajax_products_list.php index 98f9647cb..2971bdd42 100644 --- a/admin/ajax_products_list.php +++ b/admin/ajax_products_list.php @@ -60,22 +60,39 @@ $exclude_packs = (bool)Tools::getValue('exclude_packs', true); $bookingProduct = (int) Tools::getValue('booking_product'); +$idHotel = (int) Tools::getValue('id_hotel'); + $context = Context::getContext(); -$sql = 'SELECT p.`id_product`, pl.`link_rewrite`, p.`reference`, pl.`name`, image_shop.`id_image` id_image, il.`legend`, p.`cache_default_attribute` - FROM `'._DB_PREFIX_.'product` p - '.Shop::addSqlAssociation('product', 'p').' - LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product = p.id_product AND pl.id_lang = '.(int)$context->language->id.Shop::addSqlRestrictionOnLang('pl').') +$sqlSelect = 'SELECT p.`id_product`, pl.`link_rewrite`, p.`reference`, pl.`name`, image_shop.`id_image` id_image, il.`legend`, p.`cache_default_attribute`'; + +$sqlFrom = ' FROM `'._DB_PREFIX_.'product` p '.Shop::addSqlAssociation('product', 'p'); + +$sqlJoin =' LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product` AND pl.`id_lang` = '.(int) $context->language->id.Shop::addSqlRestrictionOnLang('pl').') LEFT JOIN `'._DB_PREFIX_.'image_shop` image_shop - ON (image_shop.`id_product` = p.`id_product` AND image_shop.cover=1 AND image_shop.id_shop='.(int)$context->shop->id.') - LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (image_shop.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$context->language->id.') - WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'. + ON (image_shop.`id_product` = p.`id_product` AND image_shop.`cover`=1 AND image_shop.`id_shop`='.(int) $context->shop->id.') + LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (image_shop.`id_image` = il.`id_image` AND il.`id_lang` = '.(int) $context->language->id.')'; + +$sqlWhere = ' WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'. (!empty($excludeIds) ? ' AND p.id_product NOT IN ('.$excludeIds.') ' : ' '). (!empty($excludePackItself) ? ' AND p.id_product <> '.$excludePackItself.' ' : ' '). ($excludeVirtuals ? 'AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : ''). ($exclude_packs ? 'AND (p.cache_is_pack IS NULL OR p.cache_is_pack = 0)' : ''). - ($bookingProduct ? 'AND p.`booking_product` = '.(int) $bookingProduct : ''). - ' GROUP BY p.id_product'; + ($bookingProduct ? 'AND p.`booking_product` = '.(int) $bookingProduct : ''); + +$sqlGroupBy = ' GROUP BY p.id_product'; + +if ($idHotel && $bookingProduct) { + // To get hotel info for the booking product only + $sqlSelect .= ', hbil.`hotel_name`, hbil.`id` AS id_hotel '; + $sqlJoin .= ' LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt + ON hrt.`id_product` = p.`id_product` + LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbil + ON pl.`id_lang` = hbil.`id_lang` AND hbil.`id` = hrt.`id_hotel`'; + $sqlWhere .= ' AND hbil.`id`='.(int) $idHotel ; +} + +$sql = $sqlSelect.' '.$sqlFrom.' '.$sqlJoin.' '.$sqlWhere.' '.$sqlGroupBy; $items = Db::getInstance()->executeS($sql); diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index f28080e92..6c4efed72 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -869,7 +869,7 @@
 {l s='Rooms Booking Detail'} {$order_detail_data|@count} - {if !$order->hasBeenDelivered()} + {if !$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED')} diff --git a/admin/themes/default/template/controllers/orders/modals/_document_note.tpl b/admin/themes/default/template/controllers/orders/modals/_document_note.tpl index ecb8e98e5..2fbbb25bd 100644 --- a/admin/themes/default/template/controllers/orders/modals/_document_note.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_document_note.tpl @@ -18,7 +18,7 @@ *}
-
+
diff --git a/classes/Cart.php b/classes/Cart.php index 921afd2cf..7500dd21e 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -2407,7 +2407,8 @@ class CartCore extends ObjectModel $product['cart_quantity'] = $selectedProduct['quantity']; $product['total'] = $selectedProduct['total_price_tax_excl']; $product['total_wt'] = $selectedProduct['total_price_tax_incl']; - $product['price_wt'] = $selectedProduct['unit_price_tax_incl']; + $product['price_wt'] = $selectedProduct['total_price_tax_incl'] / $product['cart_quantity']; + $product['price'] = $selectedProduct['total_price_tax_excl'] / $product['cart_quantity']; $product['id_hotel'] = $selectedProduct['id_hotel']; $orderPackage[$id_address][$selectedProduct['id_hotel']]['product_list'][] = $product; if (!isset($orderPackage[$id_address][$selectedProduct['id_hotel']]['id_hotel'])) { diff --git a/classes/Notification.php b/classes/Notification.php index 16ca67b94..fc46b176b 100644 --- a/classes/Notification.php +++ b/classes/Notification.php @@ -72,9 +72,11 @@ class NotificationCore SELECT SQL_CALC_FOUND_ROWS o.`id_order`, o.`id_customer`, o.`total_paid`, o.`id_currency`, o.`date_upd`, c.`firstname`, c.`lastname` FROM `'._DB_PREFIX_.'orders` as o LEFT JOIN `'._DB_PREFIX_.'customer` as c ON (c.`id_customer` = o.`id_customer`) - WHERE `id_order` > '.(int)$id_last_element. - Shop::addSqlRestriction(false, 'o').' - ORDER BY `id_order` DESC + LEFT JOIN '._DB_PREFIX_.'htl_booking_detail hbd ON (hbd.id_order = o.id_order) + WHERE o.`id_order` > '.(int)$id_last_element. + Shop::addSqlRestriction(false, 'o'). HotelBranchInformation::addHotelRestriction(false, 'hbd').' + GROUP BY o.`id_order` + ORDER BY o.`id_order` DESC LIMIT 5'; break; diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php index 874171009..1d09988c0 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -449,7 +449,7 @@ class OrderHistoryCore extends ObjectModel ); if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { - $objHotelBranchInformation = new HotelBranchInformation($idHotel, $order->id_lang); + $objHotelBranchInformation = new HotelBranchInformation($idHotel); $fields = array_merge( $objHotelBranchInformation->getFields(), $objHotelBranchInformation->getFieldsLang()[$order->id_lang], diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 8b53e911c..108b51a75 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -45,8 +45,8 @@ class AdminCartsControllerCore extends AdminController $this->_select = 'CONCAT(c.`firstname`, \' \', c.`lastname`) `customer`, a.id_cart total, TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) AS `time_diff`, - IFNULL(GROUP_CONCAT(o.`id_order`), 0) AS `ids_order`, - IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(o.`id_order`)) AS filter_ids_order, + IFNULL(GROUP_CONCAT(DISTINCT o.`id_order`), 0) AS `ids_order`, + IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(DISTINCT o.`id_order`)) AS filter_ids_order, IF(o.id_order, 1, 0) badge_success, IF(o.id_order, 0, 1) badge_danger, IF(co.id_guest, 1, 0) id_guest'; $this->_join = 'LEFT JOIN '._DB_PREFIX_.'customer c ON (c.id_customer = a.id_customer) LEFT JOIN '._DB_PREFIX_.'currency cu ON (cu.id_currency = a.id_currency) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 87a959951..cf78be63c 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -3079,7 +3079,7 @@ class AdminNormalProductsControllerCore extends AdminController } else { $address->id_country = (int)$address_infos['id_country']; $address->id_state = (int)$address_infos['id_state']; - $address->zipcode = $address_infos['postcode']; + $address->postcode = $address_infos['postcode']; } $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true); $tax_rates = array( diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 768e1bfe2..a80039be5 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -470,44 +470,44 @@ class AdminOrdersControllerCore extends AdminController { if ($this->display == 'view') { /** @var Order $order */ - $order = $this->loadObject(); + if (Validate::isLoadedObject($order = $this->loadObject())) { + // hotel link in header + if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { + $this->toolbar_btn['hotel'] = array( + 'href' => $this->context->link->getAdminLink('AdminAddHotel').'&id='.$idHotel.'&updatehtl_branch_info', + 'desc' => $this->l('View Hotel'), + 'class' => 'icon-building', + 'target' => true, + ); + } - // hotel link in header - if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { - $this->toolbar_btn['hotel'] = array( - 'href' => $this->context->link->getAdminLink('AdminAddHotel').'&id='.$idHotel.'&updatehtl_branch_info', - 'desc' => $this->l('View Hotel'), - 'class' => 'icon-building', - 'target' => true, + if (Configuration::get('PS_INVOICE') && $order->hasInvoice() && !$this->lite_display) { + $this->toolbar_btn['file'] = array( + 'short' => $this->l('Invoice'), + 'href' => $this->context->link->getAdminLink('AdminPdf').'&submitAction=generateInvoicePDF&id_order='.$order->id, + 'desc' => $this->l('View invoice'), + 'class' => 'icon-file-text', + 'target' => true, + ); + } + + $this->toolbar_btn['print'] = array( + 'short' => $this->l('Print'), + 'href' => 'javascript:window.print()', + 'desc' => $this->l('Print order'), + 'class' => 'icon-print', ); - } - if (Configuration::get('PS_INVOICE') && $order->hasInvoice() && !$this->lite_display) { - $this->toolbar_btn['file'] = array( - 'short' => $this->l('Invoice'), - 'href' => $this->context->link->getAdminLink('AdminPdf').'&submitAction=generateInvoicePDF&id_order='.$order->id, - 'desc' => $this->l('View invoice'), - 'class' => 'icon-file-text', - 'target' => true, - ); - } - - $this->toolbar_btn['print'] = array( - 'short' => $this->l('Print'), - 'href' => 'javascript:window.print()', - 'desc' => $this->l('Print order'), - 'class' => 'icon-print', - ); - - if (((int) $order->isReturnable()) && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG)) { - $this->toolbar_btn['cancel'] = array( - 'short' => ((float) $order->getTotalPaid()) ? $this->l('Refund') : $this->l('Cancel'), - 'href' => '#refundForm', - 'id' => 'desc-order-standard_refund', - 'desc' => ((float) $order->getTotalPaid()) ? $this->l('Initiate refund') : $this->l('Cancel bookings'), - 'class' => 'icon-exchange', - 'target' => true, - ); + if (((int) $order->isReturnable()) && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG)) { + $this->toolbar_btn['cancel'] = array( + 'short' => ((float) $order->getTotalPaid()) ? $this->l('Refund') : $this->l('Cancel'), + 'href' => '#refundForm', + 'id' => 'desc-order-standard_refund', + 'desc' => ((float) $order->getTotalPaid()) ? $this->l('Initiate refund') : $this->l('Cancel bookings'), + 'class' => 'icon-exchange', + 'target' => true, + ); + } } } @@ -1611,6 +1611,9 @@ class AdminOrdersControllerCore extends AdminController $this->errors[] = Tools::displayError('The date is invalid'); } elseif (!Validate::isUnsignedInt($payment_type)) { $this->errors[] = Tools::displayError('Payment source is invalid'); + // Amount cannot be less than paid amount by guest in negative price + } elseif ($amount < 0 && ($order->total_paid_real + $amount) < 0) { + $this->errors[] = sprintf(Tools::displayError('Amount cannot be less than -%s'), Tools::displayPrice($order->total_paid_real, new Currency($order->id_currency))); } else { if (!$order->addOrderPayment( $amount, @@ -1636,16 +1639,20 @@ class AdminOrdersControllerCore extends AdminController } elseif (Tools::isSubmit('submitEditNote')) { $note = Tools::getValue('note'); $order_invoice = new OrderInvoice((int)Tools::getValue('id_order_invoice')); - if (Validate::isLoadedObject($order_invoice) && Validate::isCleanHtml($note)) { - if ($this->tabAccess['edit'] === '1') { - $order_invoice->note = $note; - if ($order_invoice->save()) { - Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order_invoice->id_order.'&vieworder&conf=4&token='.$this->token); + if (Validate::isLoadedObject($order_invoice)) { + if (Validate::isCleanHtml($note)) { + if ($this->tabAccess['edit'] === '1') { + $order_invoice->note = $note; + if ($order_invoice->save()) { + Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order_invoice->id_order.'&vieworder&conf=4&token='.$this->token); + } else { + $this->errors[] = Tools::displayError('The invoice note was not saved.'); + } } else { - $this->errors[] = Tools::displayError('The invoice note was not saved.'); + $this->errors[] = Tools::displayError('You do not have permission to edit this.'); } } else { - $this->errors[] = Tools::displayError('You do not have permission to edit this.'); + $this->errors[] = Tools::displayError('Invalid note found.'); } } else { $this->errors[] = Tools::displayError('The invoice for edit note was unable to load. '); @@ -2445,9 +2452,8 @@ class AdminOrdersControllerCore extends AdminController public function renderView() { - $order = new Order(Tools::getValue('id_order')); - if (!Validate::isLoadedObject($order)) { - $this->errors[] = Tools::displayError('The order cannot be found within your database.'); + if (!Validate::isLoadedObject($order = new Order(Tools::getValue('id_order')))) { + return; } $this->content .= $this->renderKpis(); @@ -4730,47 +4736,47 @@ class AdminOrdersControllerCore extends AdminController if ($order_detail->id_order_invoice != $order_invoice->id) { $old_order_invoice = new OrderInvoice($order_detail->id_order_invoice); // We remove cost of products - $old_order_invoice->total_products -= $order_detail->total_price_tax_excl; - $old_order_invoice->total_products_wt -= $order_detail->total_price_tax_incl; + $old_order_invoice->total_products -= Tools::ps_round($order_detail->total_price_tax_excl, 6); + $old_order_invoice->total_products_wt -= Tools::ps_round($order_detail->total_price_tax_incl, 6); - $old_order_invoice->total_paid_tax_excl -= $order_detail->total_price_tax_excl; - $old_order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl; + $old_order_invoice->total_paid_tax_excl -= Tools::ps_round($order_detail->total_price_tax_excl, 6); + $old_order_invoice->total_paid_tax_incl -= Tools::ps_round($order_detail->total_price_tax_incl, 6); $res &= $old_order_invoice->update(); - $order_invoice->total_products += $order_detail->total_price_tax_excl; - $order_invoice->total_products_wt += $order_detail->total_price_tax_incl; + $order_invoice->total_products += Tools::ps_round($order_detail->total_price_tax_excl, 6); + $order_invoice->total_products_wt += Tools::ps_round($order_detail->total_price_tax_incl, 6); - $order_invoice->total_paid_tax_excl += $order_detail->total_price_tax_excl; - $order_invoice->total_paid_tax_incl += $order_detail->total_price_tax_incl; + $order_invoice->total_paid_tax_excl += Tools::ps_round($order_detail->total_price_tax_excl, 6); + $order_invoice->total_paid_tax_incl += Tools::ps_round($order_detail->total_price_tax_incl, 6); $order_detail->id_order_invoice = $order_invoice->id; } } if ($diff_price_tax_incl != 0 && $diff_price_tax_excl != 0) { - $order_detail->unit_price_tax_excl = $product_price_tax_excl; - $order_detail->unit_price_tax_incl = $product_price_tax_incl; + $order_detail->unit_price_tax_excl = Tools::ps_round($product_price_tax_excl, 6); + $order_detail->unit_price_tax_incl = Tools::ps_round($product_price_tax_incl, 6); - $order_detail->total_price_tax_incl += (float)$diff_price_tax_incl; - $order_detail->total_price_tax_excl += (float)$diff_price_tax_excl; + $order_detail->total_price_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6); + $order_detail->total_price_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6); if (isset($order_invoice)) { // Apply changes on OrderInvoice - $order_invoice->total_products += (float)$diff_price_tax_excl; - $order_invoice->total_products_wt += (float)$diff_price_tax_incl; + $order_invoice->total_products += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order_invoice->total_products_wt += Tools::ps_round((float)$diff_price_tax_incl, 6); - $order_invoice->total_paid_tax_excl += (float)$diff_price_tax_excl; - $order_invoice->total_paid_tax_incl += (float)$diff_price_tax_incl; + $order_invoice->total_paid_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order_invoice->total_paid_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6); } // Apply changes on Order $order = new Order($order_detail->id_order); - $order->total_products += (float)$diff_price_tax_excl; - $order->total_products_wt += (float)$diff_price_tax_incl; - $order->total_paid += (float)$diff_price_tax_incl; - $order->total_paid_tax_excl += (float)$diff_price_tax_excl; - $order->total_paid_tax_incl += (float)$diff_price_tax_incl; + $order->total_products += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order->total_products_wt += Tools::ps_round((float)$diff_price_tax_incl, 6); + $order->total_paid += Tools::ps_round((float)$diff_price_tax_incl, 6); + $order->total_paid_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order->total_paid_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6); $res &= $order->update(); } @@ -5334,8 +5340,8 @@ class AdminOrdersControllerCore extends AdminController } else { // Calculate differences of price (Before / After) - $order_detail->total_price_tax_incl -= $diff_products_tax_incl; - $order_detail->total_price_tax_excl -= $diff_products_tax_excl; + $order_detail->total_price_tax_incl -= Tools::ps_round($diff_products_tax_incl, 6); + $order_detail->total_price_tax_excl -= Tools::ps_round($diff_products_tax_excl, 6); $old_quantity = $order_detail->product_quantity; @@ -5354,8 +5360,8 @@ class AdminOrdersControllerCore extends AdminController if ($service['quantity'] >= $serviceOrderDetail->product_quantity) { $serviceOrderDetail->delete(); } else { - $order_detail->total_price_tax_incl -= $service['total_price_tax_incl']; - $order_detail->total_price_tax_excl -= $service['total_price_tax_excl']; + $order_detail->total_price_tax_incl -= Tools::ps_round($service['total_price_tax_incl'], 6); + $order_detail->total_price_tax_excl -= Tools::ps_round($service['total_price_tax_excl'], 6); $serviceOldQuantity = $serviceOrderDetail->product_quantity; $serviceOrderDetail->product_quantity = $serviceOldQuantity - $service['quantity']; @@ -5373,20 +5379,37 @@ class AdminOrdersControllerCore extends AdminController if ($order_detail->id_order_invoice != 0) { // values changes as values are calculated accoding to the quantity of the product by webkul $order_invoice = new OrderInvoice($order_detail->id_order_invoice); - $order_invoice->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE); - $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI); - $order_invoice->total_products -= $diff_products_tax_excl; - $order_invoice->total_products_wt -= $diff_products_tax_incl; + $order_invoice->total_paid_tax_excl -= Tools::ps_round(($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE), 6); + $order_invoice->total_paid_tax_excl = $order_invoice->total_paid_tax_excl > 0 ? $order_invoice->total_paid_tax_excl : 0; + + $order_invoice->total_paid_tax_incl -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6); + $order_invoice->total_paid_tax_incl = $order_invoice->total_paid_tax_incl > 0 ? $order_invoice->total_paid_tax_incl : 0; + + $order_invoice->total_products -= Tools::ps_round($diff_products_tax_excl, 6); + $order_invoice->total_products = $order_invoice->total_products > 0 ? $order_invoice->total_products : 0; + + $order_invoice->total_products_wt -= Tools::ps_round($diff_products_tax_incl, 6); + $order_invoice->total_products_wt = $order_invoice->total_products_wt > 0 ? $order_invoice->total_products_wt : 0; + $res &= $order_invoice->update(); } // Update Order // values changes as values are calculated accoding to the quantity of the product by webkul - $order->total_paid -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI); - $order->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI); - $order->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE); - $order->total_products -= ($diff_products_tax_excl + $additionlServicesTE); - $order->total_products_wt -= ($diff_products_tax_incl + $additionlServicesTI); + $order->total_paid -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6); + $order->total_paid = $order->total_paid > 0 ? $order->total_paid : 0; + + $order->total_paid_tax_incl -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6); + $order->total_paid_tax_incl = $order->total_paid_tax_incl > 0 ? $order->total_paid_tax_incl : 0; + + $order->total_paid_tax_excl -= Tools::ps_round(($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE), 6); + $order->total_paid_tax_excl = $order->total_paid_tax_excl > 0 ? $order->total_paid_tax_excl : 0; + + $order->total_products -= Tools::ps_round(($diff_products_tax_excl + $additionlServicesTE), 6); + $order->total_products = $order->total_products > 0 ? $order->total_products : 0; + + $order->total_products_wt -= Tools::ps_round(($diff_products_tax_incl + $additionlServicesTI), 6); + $order->total_products_wt = $order->total_products_wt > 0 ? $order->total_products_wt : 0; $res &= $order->update(); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..21bba9ce7 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1089,16 +1089,18 @@ class AdminProductsControllerCore extends AdminController } $id_product = Tools::getValue('id_product'); - $id_adv_pmt = Tools::getValue('id_adv_pmt'); if ($id_adv_pmt) { $obj_adv_pmt = new HotelAdvancedPayment($id_adv_pmt); } else { $obj_adv_pmt = new HotelAdvancedPayment(); + if ($adv_pmt_info = $obj_adv_pmt->getIdAdvPaymentByIdProduct($id_product)) { + // To prevent duplication from two separate tabs + $obj_adv_pmt = new HotelAdvancedPayment((int) $adv_pmt_info['id']); + } } $adv_payment_active = Tools::getValue('adv_payment_active'); - $obj_adv_pmt->id_product = $id_product; $obj_adv_pmt->active = $adv_payment_active; @@ -3178,12 +3180,8 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeServiceProductPrice->id_element = $idProduct; $objRoomTypeServiceProductPrice->element_type = RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE; } - $objRoomTypeServiceProductPrice->price = $price; - if ($idTaxRulesGroup) { - $objRoomTypeServiceProductPrice->id_tax_rules_group = $idTaxRulesGroup; - } - + $objRoomTypeServiceProductPrice->id_tax_rules_group = $idTaxRulesGroup; $objRoomTypeServiceProductPrice->save(); } else { // create new association @@ -3910,7 +3908,7 @@ class AdminProductsControllerCore extends AdminController } else { $address->id_country = (int)$address_infos['id_country']; $address->id_state = (int)$address_infos['id_state']; - $address->zipcode = $address_infos['postcode']; + $address->postcode = $address_infos['postcode']; } $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true); diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index ab05a2876..e7017e12f 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -92,10 +92,11 @@ class GuestTrackingControllerCore extends FrontController $customer = new Customer((int)$order->id_customer); if (!Validate::isLoadedObject($customer)) { $this->errors[] = Tools::displayError('Invalid customer'); - } elseif (!Tools::getValue('password')) { + } elseif (!Tools::getValue('password') + || !Validate::isPasswd(Tools::getValue('password') + )) { $this->errors[] = Tools::displayError('Invalid password.'); } elseif (!$customer->transformToCustomer($this->context->language->id, Tools::getValue('password'))) { - // @todo clarify error message $this->errors[] = Tools::displayError('An error occurred while transforming a guest into a registered customer.'); } else { $this->context->smarty->assign('transformSuccess', true); diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 9de4e2b55..79ad0b6e7 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -173,7 +173,9 @@ class OrderOpcControllerCore extends ParentOrderController if (!count($this->errors)) { $customer = new Customer($this->context->customer->id); - if ($customer->transformToCustomer($this->context->language->id, $passwd)) { + if (!$customer->isGuest()) { + $this->errors[] = Tools::displayError('This account is already registered as a customer.'); + } else if ($customer->transformToCustomer($this->context->language->id, $passwd)) { $this->context->updateCustomer($customer); } else { $this->errors[] = Tools::displayError('An error occurred while transforming your account into a registered customer.'); diff --git a/install/langs/bg/data/order_state.xml b/install/langs/bg/data/order_state.xml index fd178eee0..ba7230bc7 100644 --- a/install/langs/bg/data/order_state.xml +++ b/install/langs/bg/data/order_state.xml @@ -45,7 +45,7 @@