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

Updated: The disabled dates interface, add and update process. #1176

Merged
merged 16 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
115 changes: 115 additions & 0 deletions admin/themes/default/sass/controllers/_products.sass
Original file line number Diff line number Diff line change
@@ -1,2 +1,117 @@
#leave_bprice
margin-left: 0px

#deactiveDatesModal
.fc-popover-body .fc-daygrid-event-harness
.fc-event-end, .fc-event-start
margin-left: unset
margin-right: unset
.fc-popover.fc-more-popover
max-width: 450px
.fc-daygrid-event
box-shadow: 0px 1px 2px 0px rgba(171, 171, 171, 0.3)
border-radius: 4px
.fc-daygrid-day-bg
min-height: 40px
.fc-h-event.fc-event
border-color: #FFFFFF
background: #FFFFFF
.fc-h-event .fc-event-main
color: #333333
.fc-h-event.fc-event.calendar_hover_highlight
border-color: #CAE4FF
background: #CAE4FF
.fc-event-title-container
cursor: pointer
padding: 4px
.highlight-event-day
background: #F5F5F5
.fc-event-title
text-overflow: ellipsis
white-space: nowrap
max-width: 65%
overflow: hidden
padding-left: 10px
.event_title_container, .fc-popover-body .fc-event-title
border-left: 2px solid red
#disable_dates_form
.date_from_container, .date_to_container
.ui-datepicker
position: absolute
top: 62px
left: 5px
position: relative
textarea
border-radius: 4px
.form-group
.control-label
margin-bottom: 5px
.btn
border-radius: 5px
.modal-title
.add_disable_dates, .close
margin-right: 10px
.remove_disable_dates
margin-right: 20px
.close
line-height: 2
.disable_dates_title
.disable_dates_room_num
color: grey
display: inline-block
font-weight: 600
line-height: 2
.delete_disable_dates
margin-left: 10px
.delete_disable_dates:hover , .edit_disable_dates:hover
cursor: pointer
.tooltip_info_block
.tooltip_title
margin: 10px 5px
font-weight: 600
min-width: 340px
.tooltip_container
.tooltip_title
.close
opacity: 0.6
padding-bottom: 5px
font-weight: 600
.tooltip_label
font-weight: 400
color: #888888
margin-bottom: 5px
.tooltip_event_title
border: 1px solid #D9D9D9
border-radius: 6px
padding: 5px 10px
.tooltip_content
.tooltip_reason
word-wrap: break-word
max-height: 200px
overflow: auto
.tooltip_reason_container, .id_event
margin-top: 10px
&> div
display: inline-block
.row
margin-left: 0
margin-right: 0
ul.disable_dates_actions
.btn
text-align: left
display: block
border: none
padding-left: 0
margin-bottom: 0
list-style-type: none
font-size: 14px
z-index: 99999
position: absolute
min-width: 450px
max-width: 450px
background: #fff
box-shadow: 0 8px 25px -2px rgba(0,0,0,0.20)
padding: 15px
border-radius: 6px
.tooltip_action_block
min-width: unset
22 changes: 22 additions & 0 deletions admin/themes/default/sass/partials/_rtl.sass
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,25 @@ html
ul#ellipsis_submenu
left: 0
right: unset

#deactiveDatesModal
.tooltip_container
.disable_dates_actions
.btn
text-align: right !important
padding-inline-start: unset
.fc-event-title
border-left: unset !important
border-right: 2px solid red !important
padding-right: 10px !important
padding-left: unset !important
.delete_disable_dates
margin-left: unset !important
margin-right: 10px
.remove_disable_dates
margin-right: 10px !important
margin-left: 20px
.alert.alert-danger
text-align: right !important
.error_message_label
float: right !important
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,17 @@
* @license LICENSE.txt
*}

{l s='This room already has bookings for highlighted date range(s):'}

<table width="70%">
<tr>
<th class="text-center">{l s='Order ID'}</th>
<th class="text-center">{l s='Date From'}</th>
<th class="text-center">{l s='Date To'}</th>
</tr>
{foreach from=$booked_rows_list item=booked_row}
<tr>
<td class="text-center">
<a href="{$link->getAdminLink('AdminOrders')}&id_order={$booked_row->id_order}&vieworder" target="_blank"><strong>#{$booked_row->id_order|intval}</strong></a>
</td>
<td class="text-center">{dateFormat date=$booked_row->date_from}</td>
<td class="text-center">{dateFormat date=$booked_row->date_to}</td>
</tr>
{/foreach}
</table>
{l s='This room already has a booking for the selected date range.'}
<div class="row">
<div class="col-xs-12">
<span class="error_message_label">{l s='Order ID'}:</span> <a href="{$link->getAdminLink('AdminOrders')}&id_order={$orderDetails->id_order}&vieworder" target="_blank"><strong>#{$orderDetails->id_order|intval}</strong></a>
</div>
<div class="col-xs-12">
<span class="error_message_label">{l s='Date From'}:</span> {dateFormat date=$orderDetails->date_from}
</div>
<div class="col-xs-12">
<span class="error_message_label">{l s='Date To'}:</span> {dateFormat date=$orderDetails->date_to}
</div>
<div>
</div>
</div>
Loading