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/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index f7f30d0d2..c5315218e 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -14,18 +14,43 @@ .booking_occupancy .booking_occupancy_wrapper max-height: 250px + width: 100% overflow-x: auto label.room_num_wrapper text-decoration: underline margin-bottom: 10px #booking-documents-modal - .documents-list - table - tbody - img - max-height: 55px - max-width: 55px + .documents-list table tbody img + max-width: 55px + +.toolbar_order_status_badge + font-size: 12px +.error_text + color: red +.room_type_old_price + text-decoration: line-through + color: #979797 + font-size: 12px +.wk-input-date + cursor: text + background-color: #F5F8F9 +#room_status_info_wrapper .margin-bottom-5 + margin-bottom: 5px +#room_status_info_wrapper .room_status_date + display: none + +#order_detail_view .panel .panel-heading + height: auto + padding: 5px 5px 3px 5px + a + text-transform: none +.modal-body .modal-footer + padding: 15px 0px 0px 0px +.modal-body .tab-content + padding: 15px + border: 1px solid #ddd + .loading_overlay display: none position: fixed diff --git a/admin/themes/default/sass/partials/_content.sass b/admin/themes/default/sass/partials/_content.sass index 94328c025..02f828538 100644 --- a/admin/themes/default/sass/partials/_content.sass +++ b/admin/themes/default/sass/partials/_content.sass @@ -85,8 +85,8 @@ body .btn-group position: absolute white-space: nowrap - top: -2px - @include right(2px) + top: 2px + @include right(6px) a.btn float: none > a.btn @@ -191,6 +191,84 @@ body.display-modal margin: 15px 0 0!important height: 40px!important +//list header +.list_action_wrapper + margin-bottom: 15px + .list_availibility_container + position: relative + .dropdown-menu + right: 0 + padding: 8px 12px + label + font-weight: 400 + #selected_filter_container + background-color: #fff + padding: 8px 20px + border: solid 1px #d3d8db + border-radius: 5px 5px 0 0 + font-size: 14px + min-height: 52px + margin-top: 15px + .selected_filters > span + font-size: 12px + padding: 6px 10px + display: inline-block + background: #F5F8F9 + border: 1px solid #A0D0EB + border-radius: 3px + &+ span + margin-left: 12px + .filter_value + font-weight: 700 + i + cursor: pointer + + #list_filters_panel + margin-top: 15px + margin-bottom: 0 + #selected_filter_container + #list_filters_panel + margin-top: 0 + #selected_filter_container + div.panel + border-top: transparent + border-radius: 0 0 5px 5px + .list_filters + padding: 0 30px + display: grid + grid-template-columns: repeat(3, minmax(0, 1fr)) + gap: 8px 40px + &>.row + display: flex + align-items: center + .date_range, .input_range + display: flex + justify-content: space-between + gap: 15px + .date_range .input-group:first-child + margin-bottom: 0 + label + text-align: right + font-weight: 400 + .actions + grid-column-start: 1 + grid-column-end: 4 + @media (max-width: $screen-desktop) + .list_filters + grid-template-columns: repeat(2, 1fr) + .actions + grid-column-start: 1 + grid-column-end: 3 + + @media (max-width: $screen-tablet) + .list_filters + grid-template-columns: repeat(1, 1fr) + .actions + grid-column-start: 1 + grid-column-end: 2 + label + text-align: left + + + //help containers #main.helpOpen width: 70% diff --git a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss index a126c3986..8240fa4ad 100644 --- a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss +++ b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss @@ -9,7 +9,7 @@ // Kill the scroll on the body .modal-open { - overflow: hidden; + overflow-x: hidden; } // Container that the modal scrolls within diff --git a/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl deleted file mode 100644 index 27872f854..000000000 --- a/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl +++ /dev/null @@ -1,36 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{extends file="helpers/list/list_header.tpl"} - -{block name=leadin} - {if isset($category_tree)} -
-
- {$category_tree} -
-
- {/if} -{/block} diff --git a/admin/themes/default/template/controllers/orders/_booking_documents_modal.tpl b/admin/themes/default/template/controllers/orders/_booking_documents_modal.tpl deleted file mode 100644 index d62524b3f..000000000 --- a/admin/themes/default/template/controllers/orders/_booking_documents_modal.tpl +++ /dev/null @@ -1,101 +0,0 @@ -{** - * 2010-2023 Webkul. - * - * NOTICE OF LICENSE - * - * All right is reserved, - * Please go through LICENSE.txt file inside our module - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade this module to newer - * versions in the future. If you wish to customize this module for your - * needs please refer to CustomizationPolicy.txt file inside our module for more information. - * - * @author Webkul IN - * @copyright 2010-2023 Webkul IN - * @license LICENSE.txt - *} - -
-
-
-
-
- - - - - - - - - - -
{l s='Preview'}{l s='Title'}{l s='Upload Date'}{l s='Actions'}
-
-
-
- - {l s='Upload new document'} - - -
- -
-
-
-
- -{addJsDefL name=txt_booking_document_upload_success}{l s='Document uploaded successfully.' js=1}{/addJsDefL} -{addJsDefL name=txt_booking_document_delete_confirm}{l s='Are you sure?' js=1}{/addJsDefL} -{addJsDefL name=txt_booking_document_delete_success}{l s='Document deleted successfully.' js=1}{/addJsDefL} diff --git a/admin/themes/default/template/controllers/orders/_customized_data.tpl b/admin/themes/default/template/controllers/orders/_customized_data.tpl deleted file mode 100644 index 43af9be07..000000000 --- a/admin/themes/default/template/controllers/orders/_customized_data.tpl +++ /dev/null @@ -1,233 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{if $product['customizedDatas']} -{* Assign product price *} -{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {assign var=product_price value=($product['unit_price_tax_excl'] + $product['ecotax'])} -{else} - {assign var=product_price value=$product['unit_price_tax_incl']} -{/if} - - - - {if isset($product['image']) && $product['image']->id|intval}{$product['image_tag']}{else}--{/if} - - - - {$product['product_name']} - {l s='Customized'}
- {if ($product['product_reference'])}{l s='Reference number:'} {$product['product_reference']}
{/if} - {if ($product['product_supplier_reference'])}{l s='Supplier reference:'} {$product['product_supplier_reference']}{/if} - - - - {displayPrice price=$product_price currency=$currency->id|intval} - {if $can_edit} - - {/if} - - {$product['customizationQuantityTotal']} - {if $display_warehouse} {/if} - {if ($order->hasBeenPaid())}{$product['customizationQuantityRefunded']}{/if} - {if ($order->hasBeenDelivered() || $order->hasProductReturned())}{$product['customizationQuantityReturned']}{/if} - {if $stock_management}{$product['current_stock']}{/if} - - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {displayPrice price=($product['unit_price_tax_excl'] * $product['customizationQuantityTotal']) currency=$currency->id|intval} - {else} - {displayPrice price=($product['unit_price_tax_incl'] * $product['customizationQuantityTotal']) currency=$currency->id|intval} - {/if} - - -   - -   - - {if ($can_edit && !$order->hasBeenDelivered())} - - {* edit/delete controls *} -
- - - -
- {* Update controls *} - - - - {/if} - - {foreach $product['customizedDatas'] as $customizationPerAddress} - {foreach $customizationPerAddress as $customizationId => $customization} - - - -
- {foreach $customization.datas as $type => $datas} - {if ($type == Product::CUSTOMIZE_FILE)} - {foreach from=$datas item=data} -
- {if $data['name']}{$data['name']}{else}{l s='Picture #'}{$data@iteration}{/if} -
- - - -
-
- {/foreach} - {elseif ($type == Product::CUSTOMIZE_TEXTFIELD)} - {foreach from=$datas item=data} -
- {if $data['name']}{l s='%s' sprintf=$data['name']}{else}{l s='Text #%s' sprintf=$data@iteration}{/if} -
-

{$data['value']}

-
-
- {/foreach} - {/if} - {/foreach} -
- - - - - {$customization['quantity']} - {if $can_edit} - - {/if} - - {if $display_warehouse} {/if} - {if ($order->hasBeenPaid())} - - {if !empty($product['amount_refund'])} - {l s='%s (%s refund)' sprintf=[$customization['quantity_refunded'], $product['amount_refund']]} - {/if} - - - - {/if} - {if ($order->hasBeenDelivered())}{$customization['quantity_returned']}{/if} - - - - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {displayPrice price=($product['unit_price_tax_excl'] * $customization['quantity']) currency=$currency->id|intval} - {else} - {displayPrice price=($product['unit_price_tax_incl'] * $customization['quantity']) currency=$currency->id|intval} - {/if} - - - - - - {if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($customization['quantity_returned']) < (int)($customization['quantity']))} - = $product['product_quantity'])}disabled="disabled" {/if}/> - {else} - -- - {/if} - - - {if ($customization['quantity_returned'] + $customization['quantity_refunded'] >= $customization['quantity'])} - - {elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))} - 0/{$customization['quantity']-$customization['quantity_refunded']} - {/if} - - - {if $product['quantity_refundable'] > 0} - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {assign var='amount_refundable' value=$product['amount_refundable']} - {else} - {assign var='amount_refundable' value=$product['amount_refundable_tax_incl']} - {/if} -
-
- -
- -
/ {$product['quantity_refundable']}
-
-
-
- -
- {if $currency->format % 2}
{$currency->sign}
{/if} - - {if !($currency->format % 2)}
{$currency->sign}
{/if} -
-

{l s='(Max %s %s)' sprintf=[Tools::displayPrice(Tools::ps_round($amount_refundable, 2), $currency->id), $smarty.capture.TaxMethod]}

-
-
- {/if} - - {if ($can_edit && !$order->hasBeenDelivered())} - - - {/if} - - {/foreach} - {/foreach} -{/if} diff --git a/admin/themes/default/template/controllers/orders/_discount_form.tpl b/admin/themes/default/template/controllers/orders/_discount_form.tpl deleted file mode 100644 index f3fe50749..000000000 --- a/admin/themes/default/template/controllers/orders/_discount_form.tpl +++ /dev/null @@ -1,110 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -
-
- -
- -
-
- -
- -
- -
-
- -
- -
-
-
- - % -
- -
- -
-
- - {if $order->hasInvoice()} -
- -
- -
-
- -
-
-

- -

-

- {l s='If you chooses to create this discount for all invoices, only one discount will be created per order invoice.'} -

-
-
- {/if} - -
-
- - -
-
-
diff --git a/admin/themes/default/template/controllers/orders/_documents.tpl b/admin/themes/default/template/controllers/orders/_documents.tpl index 022df0499..a47bc8a5a 100644 --- a/admin/themes/default/template/controllers/orders/_documents.tpl +++ b/admin/themes/default/template/controllers/orders/_documents.tpl @@ -38,113 +38,90 @@ {l s='Amount'} - + {l s='Note'} - {foreach from=$order->getDocuments() item=document} - {if get_class($document) eq 'OrderInvoice'} - - {elseif get_class($document) eq 'OrderSlip'} - - {/if} - {dateFormat date=$document->date_add} - - {if get_class($document) eq 'OrderInvoice'} - {l s='Invoice'} - {elseif get_class($document) eq 'OrderSlip'} - {l s='Credit Slip'} - {/if} - - - {if get_class($document) eq 'OrderInvoice'} - - {elseif get_class($document) eq 'OrderSlip'} - - {/if} - {if get_class($document) eq 'OrderInvoice'} - {$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)} - {elseif get_class($document) eq 'OrderSlip'} - {Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id} - {/if} - - - - {if get_class($document) eq 'OrderInvoice'} - {displayPrice price=$document->total_paid_tax_incl currency=$currency->id}  - {if $document->getTotalPaid()} - - {if $document->getRestPaid() > 0} - ({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'}) - {elseif $document->getRestPaid() < 0} - ({displayPrice price=-$document->getRestPaid() currency=$currency->id} {l s='overpaid'}) - {/if} - - {/if} - {elseif get_class($document) eq 'OrderSlip'} - {displayPrice price=$document->total_products_tax_incl+$document->total_shipping_tax_incl currency=$currency->id} - {/if} - - - {if get_class($document) eq 'OrderInvoice'} - {if $document->getRestPaid()} - - - {l s='Enter payment'} - - {/if} - - - {if $document->note eq ''} - - {l s='Add note'} - {else} - - {l s='Edit note'} - {/if} - - {/if} - - - {if get_class($document) eq 'OrderInvoice'} - - -
-

- - - -

-

- - - - {l s='Cancel'} - -

-
- - - {/if} - {foreachelse} - + {if $orderDocuments|count} + {foreach from=$orderDocuments item=document} + {if get_class($document) eq 'OrderInvoice'} + + {elseif get_class($document) eq 'OrderSlip'} + + {/if} + {dateFormat date=$document->date_add} + + {if get_class($document) eq 'OrderInvoice'} + {l s='Invoice'} + {elseif get_class($document) eq 'OrderSlip'} + {l s='Credit Slip'} + {/if} + + + {if get_class($document) eq 'OrderInvoice'} + + {elseif get_class($document) eq 'OrderSlip'} + + {/if} + {if get_class($document) eq 'OrderInvoice'} + {$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)} + {elseif get_class($document) eq 'OrderSlip'} + {Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id} + {/if} + + + + {if get_class($document) eq 'OrderInvoice'} + {displayPrice price=$document->total_paid_tax_incl currency=$currency->id}  + {if $document->getTotalPaid()} + + {if $document->getRestPaid() > 0} + ({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'}) + {elseif $document->getRestPaid() < 0} + ({displayPrice price=-$document->getRestPaid() currency=$currency->id} {l s='overpaid'}) + {/if} + + {/if} + {elseif get_class($document) eq 'OrderSlip'} + {displayPrice price=$document->total_products_tax_incl+$document->total_shipping_tax_incl currency=$currency->id} + {/if} + + + {if get_class($document) eq 'OrderInvoice'} + + {if $document->note eq ''} +  {l s='Add note'} + {else} +  {l s='Edit note'} + {/if} + + {if $document->getRestPaid()} + +  {l s='Enter payment'} + + {/if} + {/if} + + + {/foreach} + {else} +
{l s='There is no available document'}
- {if isset($invoice_management_active) && $invoice_management_active} - - - {l s='Generate invoice'} - - {/if} - {/foreach} + {/if} - + + {if !$orderDocuments|count && isset($invoice_management_active) && $invoice_management_active} +
+ + {l s='Generate invoice'} + +
+ {/if} + \ No newline at end of file diff --git a/admin/themes/default/template/controllers/orders/_new_product.tpl b/admin/themes/default/template/controllers/orders/_new_product.tpl index 423f2af17..525795c10 100644 --- a/admin/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin/themes/default/template/controllers/orders/_new_product.tpl @@ -68,7 +68,7 @@ {if $order->with_occupancy}
- diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 4685230f5..18ceebacc 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -24,39 +24,17 @@ *} - {if $refund_allowed} - - - - {/if} - -

{$data.room_num}

+ +

{$data.room_num}

{if $data.is_back_order} {l s='overbooked'} {/if} - - - - - -

{$data.room_type}

- {*

- - {l s='Extra Services'} - -

*} - {* {if (isset($data['extra_demands']) && $data['extra_demands']) || (isset($data['additional_services']) && $data['additional_services'])} -

- {convertPriceWithCurrency price=($data['extra_demands_price_ti'] + $data['additional_services_price_ti']) currency=$currency->id} -

- {/if} *} - - - - {$data['hotel_name']} - - - + + + +

{$data.room_type}

+ + {dateFormat date=$data.date_from} - {dateFormat date=$data.date_to} {if $can_edit} @@ -65,7 +43,7 @@
{l s='Check In'}
- +
@@ -81,12 +59,12 @@
{/if} - + {if $data['children']}
- +
{if isset($data['child_ages']) && $data['child_ages']} @@ -101,8 +79,7 @@ {else} {if $data['adults']}{$data['adults']}{/if} {if $data['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$data['children']}}, {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} {/if} - - -
- {l s='Or'}  - - - {l s='Add new customer'} - -
-
-
-
-
-
-
- {*
- + {* If cart has errors the do not allow to proceed with this cart *} +
+
+ + {l s='Customer'} +
+
+ +
+
+
+
+ + + + +
+
+
+ {l s='Or'}  + + + {l s='Add new customer'} + +
+
+
+
+
+
+
+ {*
+ - -
-
- - - - - - - - - - - -
{l s='ID'}{l s='Date'}{l s='Total'}
-
-
- - - - - - - - - - - - - - -
{l s='ID'}{l s='Date'}{l s='Products'}{l s='Total paid'}{l s='Payment'}{l s='Status'}
-
-
-
-->*} -
+ +
+
+ + + + + + + + + + + +
{l s='ID'}{l s='Date'}{l s='Total'}
+
+
+ + + + + + + + + + + + + + +
{l s='ID'}{l s='Date'}{l s='Products'}{l s='Total paid'}{l s='Payment'}{l s='Status'}
+
+
+
-->*} + - + {strip} {addJsDef max_child_age=$max_child_age} {addJsDef max_child_in_room=$max_child_in_room} diff --git a/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl index 255b57976..c4365c90f 100644 --- a/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl @@ -65,446 +65,91 @@ {/if} {/block} - - -{block name="tableFilter"}{/block} {block name="override_form_extra"} - {if !$simple_header && $show_filters} - -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- {if $filters_has_value} -
- {l s='Filters: '} - - {foreach $fields_display AS $key => $params} - {if (!isset($params.search) || $params.search) && $params.value != ''} - {if ($params.type == 'date' || $params.type == 'datetime' || $params.type == 'range') && $params.value|is_array} - {assign var="filter_value" value=''} - {foreach $params.value as $value} - {if (isset($value) && ($value !== '' || $value === 0))} - {if !(isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} - {assign var="filter_value" value=$value} - {else} - {assign var="filter_value" value="`$filter_value` - `$value`"} - {/if} - {/if} - {/foreach} - {if (isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} - - {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} - - - {/if} - {elseif $params.type == 'select'} - {if isset($params.multiple) && $params.multiple} - - {$params['title']|escape:'html':'UTF-8'}: - - {foreach from=$params.value item=option name=foreachInfo} - {$params.list[$option]}{if !$smarty.foreach.foreachInfo.last}{if $params.operator == 'or'} | {else}, {/if}{/if} - {/foreach} - - - - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['list'][$params['value']]|replace: ' ' : ''} - - - {/if} - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['value']|escape:'html':'UTF-8'} - - - {/if} - {/if} - {/foreach} - -
- {/if} -
-
-
-
- {foreach $fields_display AS $key => $params} - {if !isset($params.search) || $params.search} -
- -
- {if $params.type == 'range'} -
- - -
- {elseif $params.type == 'bool'} - - {elseif $params.type == 'date' || $params.type == 'datetime'} -
-
- - - - - -
-
- - - - - -
- -
- {elseif $params.type == 'select'} - {if isset($params.multiple) && $params.multiple} - - {else} - {if isset($params.filter_key)} - - {/if} - {/if} - {else} - - {/if} -
-
- {/if} - {/foreach} - {if $has_actions || $show_filters} -
-
- {if $show_filters} - - - {if $filters_has_value} - - {/if} - - {/if} -
- {/if} -
-
-
-
-
-
-
- - {/if} {/block} 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 d72232f78..6c4efed72 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -24,6 +24,19 @@ *} {extends file="helpers/view/view.tpl"} +{extends file="page_header_toolbar.tpl"} +{block name=pageTitle} +

+ {if is_array($title)}{$title|end|strip_tags}{else}{$title|strip_tags}{/if} + {if $currentState == Configuration::get('PS_OS_REFUND')} + {l s='Refunded'} + {elseif $currentState == Configuration::get('PS_OS_CANCELED')} + {l s='Cancelled'} + {else} + {l s='Booked'} + {/if} +

+{/block} {block name="override_tpl"} -
- - {* -