Pickdate and some better general foundation styling
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
td.list-status
|
||||
td.status-icons
|
||||
if view.content.needs_help
|
||||
span.icon.needs-help
|
||||
if view.content.needs_payment
|
||||
@@ -11,9 +11,9 @@ td.actions
|
||||
if view.content.needs_help
|
||||
button.mark_list_as_helped{ action markListAsHelped view.content.id}
|
||||
span.fa-stack
|
||||
i.fa.fa-bell.fa-stack-1x
|
||||
/i.fa.fa-bell.fa-stack-1x
|
||||
i.fa.fa-ban.fa-stack-2x.revoke
|
||||
span.button-text=t 'list.is_helped_button'
|
||||
/span.button-text=t 'list.is_helped_button'
|
||||
button.close_list{ action closeList view.content.id}
|
||||
span.fa.fa-times.fa-2x
|
||||
span.button-text=t 'list.close_list'
|
||||
|
||||
@@ -7,13 +7,13 @@ td.section_title {{view.content.section.title}}
|
||||
td.currency {{currency view.content.total }}
|
||||
td.actions
|
||||
if view.content.placed
|
||||
button{ action markOrderActive view.content.id}
|
||||
button.mark_order_active{ action markOrderActive view.content.id}
|
||||
span.fa.fa-check.fa-2x
|
||||
span.button-text=t 'order.being_processed'
|
||||
button.hide.mark-order-active{ action markOrderActive view.content.id}
|
||||
span.button-icon
|
||||
span.button-text=t 'order.being_processed'
|
||||
button{ action markOrderDelivered view.content.id}
|
||||
button.mark_order_delivered{ action markOrderDelivered view.content.id}
|
||||
span.fa-shifted-stack
|
||||
i.fa.fa-check.fa-2x
|
||||
i.fa.fa-check.fa-2x
|
||||
|
||||
@@ -125,3 +125,8 @@ $ ->
|
||||
else
|
||||
menu.show().animate left: 0
|
||||
toggle.animate left: 222 - 30, -> $(@).addClass('open')
|
||||
|
||||
# Hide alert boxes on click
|
||||
$(document).on 'click', '.general-alerts .alert-box', -> $(@).slideUp()
|
||||
|
||||
$(document).on 'click', '.supplier-is-closed', -> $(@).slideUp()
|
||||
|
||||
@@ -47,6 +47,10 @@ root.Qsupplier=
|
||||
else if e.event == 'order_being_delivered'
|
||||
$('.order-row-'+e.data.id).remove()
|
||||
$('.section-table-list-'+e.data.list_id).removeClass('active_order')
|
||||
else if e.event == 'orders_in_process_count'
|
||||
$('.supplier-orders-in-process-count').text e.data.count
|
||||
else if e.event == 'orders_placed_count'
|
||||
$('.supplier-orders-placed-count').text e.data.count
|
||||
else if e.event == 'list_changed_table'
|
||||
Qsupplier.App && Qsupplier.App.List.updateOrAdd(e.data.list)
|
||||
|
||||
@@ -69,7 +73,6 @@ root.Qsupplier=
|
||||
#to_table.addClass('needs_payment') if list.needs_payment()
|
||||
#to_table.addClass('active_order') if list.has_active_orders()
|
||||
#from_table.removeClass('occupied needs_help needs_payment active_order section-table-list-'+list.id())
|
||||
console.log(e)
|
||||
false
|
||||
move_table_to_active_section: (table_id)->
|
||||
table_container = $('#section-table-'+table_id)
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
@import foundation_and_overrides
|
||||
|
||||
.active-lists-table
|
||||
width: 100%
|
||||
.mark_list_as_helped
|
||||
+button-icon-only
|
||||
.close_list
|
||||
+button-icon-only
|
||||
|
||||
.active-orders-table
|
||||
width: 100%
|
||||
.mark_order_active
|
||||
+button-icon-only
|
||||
.mark_order_delivered
|
||||
+button-icon-only
|
||||
@@ -24,6 +24,8 @@ header.top-menu
|
||||
float: left
|
||||
@media #{$medium-up}
|
||||
padding-left: 14px
|
||||
a
|
||||
padding-left: 16px
|
||||
&.extra-info
|
||||
float: right
|
||||
.supplier-info-row
|
||||
|
||||
@@ -7,6 +7,7 @@ aside.side-menu
|
||||
top: 0
|
||||
width: 222px
|
||||
height: 100%
|
||||
z-index: 50
|
||||
> ul
|
||||
list-style: none
|
||||
a
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
// Full day active is not special, highlight when not active,
|
||||
// because it indicates the being active of a time range
|
||||
color: #444
|
||||
|
||||
|
||||
#sub-day-container
|
||||
display: inline-block
|
||||
&.hide
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
$side-spacing: 0px
|
||||
@import constants
|
||||
@import ./foundation_and_overrides
|
||||
@mixin table-fit
|
||||
width: 1px
|
||||
white-space: nowrap
|
||||
html
|
||||
body
|
||||
label
|
||||
@@ -11,9 +14,16 @@ body
|
||||
&.number
|
||||
width: 40px
|
||||
.supplier-is-closed
|
||||
.alert
|
||||
form
|
||||
margin: 0
|
||||
+alert($bg: $secondary-color)
|
||||
.close
|
||||
+alert-close
|
||||
.open-supplier-button
|
||||
+button($padding: $button-tny)
|
||||
margin: 0
|
||||
margin-left: 20px
|
||||
form
|
||||
margin: 0
|
||||
display: inline-block
|
||||
.location_picker_search
|
||||
float: left
|
||||
.draggable
|
||||
@@ -54,3 +64,12 @@ main.main-section
|
||||
|
||||
.hide, .hidden
|
||||
display: none
|
||||
table
|
||||
&.table
|
||||
// Bootstrap behaviour
|
||||
width: 100%
|
||||
td.actions, th.actions
|
||||
text-align: right
|
||||
+table-fit
|
||||
th.status-icons, td.status-icons
|
||||
+table-fit
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ class List
|
||||
property :price, type: Float
|
||||
property :is_paid, type: :boolean, default: false
|
||||
property :paid_at, type: Time
|
||||
property :user_requests_closing, :boolean, default: false
|
||||
property :user_requests_closing, type: :boolean, default: false
|
||||
|
||||
has_many :orders, dependent: :destroy
|
||||
belongs_to :table
|
||||
|
||||
@@ -21,22 +21,21 @@ html lang="en"
|
||||
main.main-section
|
||||
.container
|
||||
.content.main-content
|
||||
- if flash[:alert].present?
|
||||
.alert.alert-error
|
||||
a.close data-dismiss="alert" ×
|
||||
div= flash[:alert]
|
||||
- if flash[:notice].present?
|
||||
.alert.alert-success
|
||||
a.close data-dismiss="alert" ×
|
||||
div= flash[:notice]
|
||||
.general-alerts
|
||||
- if flash[:alert].present?
|
||||
.alert-box.warning
|
||||
div= flash[:alert]
|
||||
a.close data-dismiss="alert" ×
|
||||
- if flash[:notice].present?
|
||||
.alert-box
|
||||
div= flash[:notice]
|
||||
a.close data-dismiss="alert" ×
|
||||
- if current_supplier.closed?
|
||||
.row.supplier-is-closed
|
||||
.span12
|
||||
.alert.alert-block
|
||||
button.close{data-dismiss="alert"} x
|
||||
p = t('supplier.you_are_currently_closed_alert')
|
||||
= form_tag supplier_mark_as_open_path do
|
||||
= submit_tag t('supplier.mark_as_open_button'), class: [:btn, 'btn-primary']
|
||||
.supplier-is-closed
|
||||
= t('supplier.you_are_currently_closed_alert')
|
||||
= form_tag supplier_mark_as_open_path do
|
||||
= submit_tag t('supplier.mark_as_open_button'), class: ['open-supplier-button']
|
||||
a.close{data-dismiss="alert"} ×
|
||||
.row
|
||||
.span12
|
||||
= content_for?(:content) ? yield(:content) : yield
|
||||
|
||||
Reference in New Issue
Block a user