Multi theme support and supplier order facebook info option

This commit is contained in:
2014-03-17 11:31:02 +01:00
parent c4e002104c
commit 90316d5b25
25 changed files with 316 additions and 13 deletions
@@ -31,3 +31,5 @@ Qsupplier.App.IndexController = Ember.ObjectController.extend
$.post('/supplier/mark_order_in_process', order_id: id) $.post('/supplier/mark_order_in_process', order_id: id)
if order = Qsupplier.App.Order.findCached(id) if order = Qsupplier.App.Order.findCached(id)
order.set('state', 'active') order.set('state', 'active')
showListInfo: (view, link)->
debugger
@@ -1,5 +1,6 @@
td {{view.content.display}} td {{view.content.display}}
td.numeric.table_number {{view.content.list.table.number}} td.numeric.table_number
view Qsupplier.App.ActiveOrderTableNumberView contextBinding=view.content
td.section_title {{view.content.section.title}} td.section_title {{view.content.section.title}}
td.currency {{currency view.content.price }} td.currency {{currency view.content.price }}
td.actions td.actions
@@ -0,0 +1,3 @@
.number= list.table_number
.extra-list-info
img.spinner src="/assets/spinner.gif" alt=""
@@ -13,3 +13,8 @@ div class="table-actions table-actions-#{unbound table.id}"
button{ action closeList table.active_list } class="btn btn-warning btn-small close-list" {{t 'list.close_list'}} button{ action closeList table.active_list } class="btn btn-warning btn-small close-list" {{t 'list.close_list'}}
/.table-action-row /.table-action-row
a href="suppliers_table_path(@table)" {{t 'section.tables_view.table_actions.got_to_table'}} a href="suppliers_table_path(@table)" {{t 'section.tables_view.table_actions.got_to_table'}}
if editmode
.table-settings
select
option Round
option rectangular
@@ -0,0 +1,10 @@
Qsupplier.App.ActiveOrderTableNumberView = Ember.View.extend
tagName: 'span'
templateName: 'active_order_table_number'
classNames: 'active_order_table_number'
click: ->
$el = $(@get('element')).find('.extra-list-info')
return $el.hide() if $el.is(':visible')
$el.show()
$.get Routes.extra_info_suppliers_list_path(@get('context.list.id')), (res)->
$el.html(res)
@@ -25,6 +25,21 @@
padding-left: 35px padding-left: 35px
background-position: 5px center background-position: 5px center
background-repeat: no-repeat background-repeat: no-repeat
.active_order_table_number
position: relative
.extra-list-info
display: none
$extra-info-width: 220px
position: absolute
width: $extra-info-width
// 7px is padding + border, 5px is extra spacing
right: -$extra-info-width - 7px*2 - 5px
top: -7px*2
padding: 4px
border: 3px solid #aaa
border-radius: 3px
background-color: white
text-align: left
&.active &.active
td td
&:first-child &:first-child
@@ -0,0 +1,106 @@
.section-title
font-size: 24px
padding: 4px 0px
.section-tables-container
.section-manage-tables
margin: -26px 6px 4px 6px
.section-table
background-color: #ccc
//TODO remove width and height for ember control
height: 48px
width: 83px
background-repeat: no-repeat
color: black
a
color: black
//background-image: image-url('icons/section-table.png')
.table-link
margin-top: -45px
.table-number
color: black
position: absolute
top: 0
line-height: 44px
width: 45px
font-size: 42px
text-align: center
.status-icons
float: right
width: 16px
span
display: none
float: right
.action-button-container
margin-right: -20px
.table-actions
display: none
position: absolute
left: 100%
top: 0
width: 140px
text-align: center
background-color: white
border: 1px solid #aaa
padding-bottom: 10px
.title
background-color: #aaa
.table-action-row
margin-top: 10px
.table-settings
width: 200px
height: 30px
position: absolute
top: -30px
select
width: 92px
&.section-tables-active
position: relative
padding: 0
height: 400px
//background-image: image-url('textures/wood4.jpg')
background-color: rgba(0,0,0,0.4)
.section-table
position: absolute
cursor: pointer
&.occupied
background-color: #ffa
&.needs_help
background-color: #7f7
.needs_help
display: block
&.needs_payment
background-image: image-url('icons/needs-payment.png')
background-position: 40px 2px
.needs_payment
display: block
&.active_order
.active_order
display: block
//background-color: #f77
a
&:hover
text-decoration: none
&.section-tables-manage
.section-table
cursor: move
&.section-tables-inactive
.section-table
position: relative
margin-top: 10px
margin-bottom: 30px
float: left
margin-right: 30px
// INDEX
table
td
&.table-info
.table-count
&:after
content: " - "
.go-to-tables-view.hide
display: inline-block
ul#table-actions-list
list-style: none
margin: 0
@@ -0,0 +1,58 @@
$side-spacing: 0px
@import constants
html
body
padding-left: $side-spacing
padding-right: $side-spacing
background-color: transparent
//padding-top: 50px
.navbar-fixed-top
margin-left: -$side-spacing
margin-right: -$side-spacing
margin-bottom: 3px
.page-header
margin-top: 4px
margin-bottom: 6px
padding-bottom: 0
.main-content
padding-top: 16px
label
&.number
display: inline
padding: 4px 10px
input
&.number
width: 40px
.supplier-is-closed
.alert
form
margin: 0
.location_picker_search
float: left
.draggable
cursor: move !important
input.dimension
width: 40px
.location_picker_map
width: 600px
height: 500px
border: 1px solid black
padding: 2px
display: inline-block
float: left
clear: left
img
max-width: none
label
width: auto
display:inline
.handle
cursor: move
font-size: 0.8em
color: #777
form
&.form-inline
display: inline-block
padding: 4px
.clear
clear: both
@@ -0,0 +1,50 @@
.list-status
.list-needs-help-indicator
display: inline-block
width: 30px
color: #400
background-color: #aaf
text-align: center
margin-right: 7px
&.hide
display: none
.list-needs-payment-indicator
display: inline-block
width: 30px
color: #440
background-color: #faa
text-align: center
margin-right: 7px
&.hide
display: none
.active-orders-table
tbody
tr
td
&:first-child
padding-left: 35px
background-position: 5px center
background-repeat: no-repeat
.active_order_table_number
position: relative
.extra-list-info
display: none
$extra-info-width: 220px
position: absolute
width: $extra-info-width
// 7px is padding + border, 5px is extra spacing
right: -$extra-info-width - 7px*2 - 5px
top: -7px*2
padding: 4px
border: 3px solid #aaa
border-radius: 3px
background-color: white
text-align: left
&.active
td
&:first-child
background-image: image-url('icons/order-check.png')
&.delivered
td
&:first-child
background-image: image-url('icons/order-doublecheck.png')
@@ -0,0 +1,10 @@
/*
*= require 'twitter-bootstrap/bootstrap_and_overrides'
*= require 'twitter-bootstrap/bootstrap_overrides'
*= require 'jquery-ui-1.8.23.custom.css'
*= require qtip
*= require 'general'
*= require user/active_list
*= require_directory .
*= require_self
*/
@@ -0,0 +1,21 @@
#product-category-list
list-style: none
li
clear: both
margin-bottom: 8px
.name
padding: 5px 5px
#week_days-group
.btn
opacity: 0.4
&.active
opacity: 1
#full_day-controller
margin: 0 10px
#sub-day-container
display: inline-block
&.hide
display: none
select
width: 70px
margin-right: 14px
@@ -0,0 +1,17 @@
.products_preview-date
.products_preview-time-container
float: left
input
width: 120px
.products_preview-hour
float: left
margin-left: 10px
select
width: 50px
&:after
content: " :"
.products_preview-minute
float: left
margin-left: 10px
select
width: 50px
@@ -1,17 +1,6 @@
//BOOTSTRAP overrides //BOOTSTRAP overrides
body body
.main-content
h1, h2, h3, h4
color: #eee
a
color: white
.table-hover
tbody
tr
&:hover
td
background-color: #555
.navbar-inner .navbar-inner
$navbar-inner-teint: 200 $navbar-inner-teint: 200
background-color: rgba($navbar-inner-teint, $navbar-inner-teint, $navbar-inner-teint, 0.8) background-color: rgba($navbar-inner-teint, $navbar-inner-teint, $navbar-inner-teint, 0.8)
@@ -57,6 +57,13 @@ module Suppliers
end end
end end
# GET /lists/1/extra_info
# GET /lists/1/extra_info.json
def extra_info
@list = List.find_by_supplier_id_and_id!(current_supplier.id, params[:id])
render layout: false
end
# GET /lists/new # GET /lists/new
# GET /lists/new.json # GET /lists/new.json
def new def new
+1
View File
@@ -84,6 +84,7 @@ class Supplier
self.open = true self.open = true
save save
end end
def mark_as_closed! def mark_as_closed!
self.open = false self.open = false
save save
+1 -1
View File
@@ -10,7 +10,7 @@ html lang="en"
/! Le HTML5 shim, for IE6-8 support of HTML elements /! Le HTML5 shim, for IE6-8 support of HTML elements
/[if lt IE 9] /[if lt IE 9]
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "supplier/application", :media => "all" = stylesheet_link_tag "supplier/basic1/application", media: "all"
link href="/favicon.ico" rel="shortcut icon" link href="/favicon.ico" rel="shortcut icon"
= render 'suppliers/application/head' = render 'suppliers/application/head'
= javascript_include_tag "supplier/application" = javascript_include_tag "supplier/application"
@@ -0,0 +1,4 @@
- @list.users.each do |user|
.extra-list-info-user
img src="http://graph.facebook.com/#{user.uid}/picture?type=square"
span= user.auth_data['info']['nickname'] rescue '(unknown)'
+4
View File
@@ -103,6 +103,10 @@ Qwaiter::Application.routes.draw do
get :active get :active
get :at_date get :at_date
end end
member do
get :extra_info
end
end end
resources :product_categories do resources :product_categories do
collection do collection do