Improve stuff and add counters
This commit is contained in:
@@ -21,3 +21,5 @@ App.List = DS.Model.extend
|
|||||||
|
|
||||||
is_extended_version: ->
|
is_extended_version: ->
|
||||||
@get('extended_version')
|
@get('extended_version')
|
||||||
|
|
||||||
|
sorted_orders: (-> @get('orders').sortBy('created_at').reverseObjects()).property('orders.@each.isLoaded')
|
||||||
|
|||||||
@@ -2,10 +2,11 @@ each user in list.users
|
|||||||
img.facebook-image src="http://graph.facebook.com/#{unbound user.facebook_id}/picture?type=square" alt="f"
|
img.facebook-image src="http://graph.facebook.com/#{unbound user.facebook_id}/picture?type=square" alt="f"
|
||||||
if list.orders
|
if list.orders
|
||||||
.list-orders-container
|
.list-orders-container
|
||||||
each order in orders
|
each order in list.sorted_orders
|
||||||
.list-order-container class=order.state
|
.list-order-container class=order.state
|
||||||
= order.display
|
= order.display
|
||||||
span.currency= currency order.total
|
span.currency= currency order.total
|
||||||
|
span.created_at= time order.created_at
|
||||||
if displayTotal
|
if displayTotal
|
||||||
.list-orders-total.total
|
.list-orders-total.total
|
||||||
= t 'total'
|
= t 'total'
|
||||||
|
|||||||
@@ -58,6 +58,21 @@ header.top-menu
|
|||||||
App.MenuItemView route='table' route_param=list.table.id
|
App.MenuItemView route='table' route_param=list.table.id
|
||||||
App.MenuItemListNeedsHelpView
|
App.MenuItemListNeedsHelpView
|
||||||
App.MenuItemListNeedsPaymentView
|
App.MenuItemListNeedsPaymentView
|
||||||
|
section.extra-info
|
||||||
|
.supplier-info-row
|
||||||
|
.supplier-name= list.supplier.name
|
||||||
|
.table-number
|
||||||
|
|
|
||||||
|
= t 'models.table'
|
||||||
|
|
|
||||||
|
= list.table.number
|
||||||
|
.supplier-info-row
|
||||||
|
.counter.supplier-orders-placed-count
|
||||||
|
= list.supplier.orders_placed_count
|
||||||
|
span.orders-placed-count-icon
|
||||||
|
.counter.supplier-orders-in-process-count
|
||||||
|
= list.supplier.orders_in_process_count
|
||||||
|
span.orders-in-process-count-icon
|
||||||
aside.side-menu
|
aside.side-menu
|
||||||
ul
|
ul
|
||||||
li
|
li
|
||||||
|
|||||||
@@ -26,6 +26,10 @@
|
|||||||
background-image: image-url('icons/order-check.png')
|
background-image: image-url('icons/order-check.png')
|
||||||
&.delivered
|
&.delivered
|
||||||
background-image: image-url('icons/order-doublecheck.png')
|
background-image: image-url('icons/order-doublecheck.png')
|
||||||
|
.created_at
|
||||||
|
float: right
|
||||||
|
padding-right: 20px
|
||||||
|
padding-left: 10px
|
||||||
.list-orders-total
|
.list-orders-total
|
||||||
+grid-column(12)
|
+grid-column(12)
|
||||||
padding: $padding
|
padding: $padding
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
@import constants
|
@import constants
|
||||||
@import font-awesome
|
@import font-awesome
|
||||||
|
@import foundation_and_overrides
|
||||||
header.top-menu
|
header.top-menu
|
||||||
height: 90px
|
height: 90px
|
||||||
background-color: transparent
|
background-color: transparent
|
||||||
@@ -19,6 +20,27 @@ header.top-menu
|
|||||||
section
|
section
|
||||||
height: 52px
|
height: 52px
|
||||||
line-height: 48px
|
line-height: 48px
|
||||||
|
&.main-buttons
|
||||||
|
float: left
|
||||||
|
@media #{$medium-up}
|
||||||
|
padding-left: 14px
|
||||||
|
&.extra-info
|
||||||
|
float: right
|
||||||
|
.supplier-info-row
|
||||||
|
float: right
|
||||||
|
clear: right
|
||||||
|
line-height: 27px
|
||||||
|
padding-right: 7px
|
||||||
|
.table-number
|
||||||
|
display: inline-block
|
||||||
|
//text-transform: lowercase
|
||||||
|
.supplier-name
|
||||||
|
display: inline-block
|
||||||
|
.supplier-orders-placed-count
|
||||||
|
display: inline-block
|
||||||
|
margin-right: 15px
|
||||||
|
.supplier-orders-in-process-count
|
||||||
|
display: inline-block
|
||||||
.menu-list-item
|
.menu-list-item
|
||||||
margin-left: 20px
|
margin-left: 20px
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
@@ -35,7 +57,20 @@ header.top-menu
|
|||||||
&.callout
|
&.callout
|
||||||
color: #f70
|
color: #f70
|
||||||
border-color: #f70
|
border-color: #f70
|
||||||
|
@media #{$medium-only}
|
||||||
|
margin-left: 8px
|
||||||
|
@media #{$small-only}
|
||||||
|
margin-left: 5px
|
||||||
|
.orders-placed-count-icon
|
||||||
|
@extend .fa
|
||||||
|
@extend .fa-clock-o
|
||||||
|
@extend .fa-lg
|
||||||
|
margin-left: 3px
|
||||||
|
.orders-in-process-count-icon
|
||||||
|
@extend .fa
|
||||||
|
@extend .fa-check
|
||||||
|
@extend .fa-lg
|
||||||
|
margin-left: 3px
|
||||||
.toggle-side-menu
|
.toggle-side-menu
|
||||||
position: absolute
|
position: absolute
|
||||||
width: 28px
|
width: 28px
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ class UserExtendedListSerializer < Qwaiter::Serializer
|
|||||||
self.root = :list
|
self.root = :list
|
||||||
embed :ids, include: true
|
embed :ids, include: true
|
||||||
attributes :extended_version, :state, :needs_help, :needs_payment, :is_paid, :price,
|
attributes :extended_version, :state, :needs_help, :needs_payment, :is_paid, :price,
|
||||||
:table_id, :table_number, :section_id, :user_ids,
|
:table_id, :table_number, :section_id, :user_ids, :supplier_id
|
||||||
:supplier_orders_in_process_count, :supplier_orders_placed_count, :supplier_id
|
#:supplier_orders_in_process_count, :supplier_orders_placed_count
|
||||||
|
|
||||||
def has_active_orders
|
def has_active_orders
|
||||||
object.has_active_orders?
|
object.has_active_orders?
|
||||||
@@ -21,7 +21,7 @@ class UserExtendedListSerializer < Qwaiter::Serializer
|
|||||||
has_one :table, serializer: UserExtendedTableSerializer
|
has_one :table, serializer: UserExtendedTableSerializer
|
||||||
has_many :join_requests
|
has_many :join_requests
|
||||||
has_many :users, serializer: UserUserSerializer
|
has_many :users, serializer: UserUserSerializer
|
||||||
#has_one :supplier
|
#has_one :supplier # added by other resource
|
||||||
|
|
||||||
def extended_version
|
def extended_version
|
||||||
true
|
true
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
class UserExtendedSupplierSerializer < Qwaiter::Serializer
|
class UserExtendedSupplierSerializer < Qwaiter::Serializer
|
||||||
self.root = :supplier
|
self.root = :supplier
|
||||||
embed :ids, include: true
|
embed :ids, include: true
|
||||||
attributes :extended_version, :open, :name
|
attributes :extended_version, :open, :name, :orders_in_process_count, :orders_placed_count
|
||||||
has_many :product_categories
|
has_many :product_categories
|
||||||
|
|
||||||
def extended_version
|
def extended_version
|
||||||
|
|||||||
@@ -5,4 +5,5 @@ class UserExtendedSupplierSerializer < Qwaiter::Serializer
|
|||||||
def extended_version
|
def extended_version
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user