Better list users frontend connection and setup of payment page
This commit is contained in:
@@ -24,10 +24,11 @@ module Users
|
|||||||
join_requests
|
join_requests
|
||||||
join_requests.user
|
join_requests.user
|
||||||
table
|
table
|
||||||
|
users
|
||||||
orders
|
orders
|
||||||
orders.product_orders
|
orders.product_orders
|
||||||
]
|
]
|
||||||
include_config << 'users' if @list.user_ids.size > 1
|
#include_config << 'users' if @list.user_ids.size > 1
|
||||||
render json: @list, include: include_config, serializer: Users::ListSerializer, is_collection: false
|
render json: @list, include: include_config, serializer: Users::ListSerializer, is_collection: false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -82,6 +82,10 @@ class Supplier
|
|||||||
[lat, lng].join(',')
|
[lat, lng].join(',')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def suggested_tips
|
||||||
|
[0, 5, 10, 15, 20]
|
||||||
|
end
|
||||||
|
|
||||||
def add_manager(employee)
|
def add_manager(employee)
|
||||||
add_employee employee unless employee_ids.include? employee.id
|
add_employee employee unless employee_ids.include? employee.id
|
||||||
settings = settings_for(employee)
|
settings = settings_for(employee)
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ class Users::ListSerializer
|
|||||||
@_include_linkages.any?{|link| link =~ /orders/}
|
@_include_linkages.any?{|link| link =~ /orders/}
|
||||||
end
|
end
|
||||||
|
|
||||||
related_link_for :orders, :table
|
related_link_for :orders, :table, :users
|
||||||
#belongs_to :table
|
#belongs_to :table
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
class Users::SupplierSerializer
|
class Users::SupplierSerializer
|
||||||
include Mozo::UserBaseSerializer
|
include Mozo::UserBaseSerializer
|
||||||
|
|
||||||
attributes :open, :name, :orders_placed_count, :orders_in_process_count, :user_message
|
attributes :open, :name, :orders_placed_count, :orders_in_process_count, :user_message, :suggested_tips
|
||||||
has_many :product_categories, serializer: Users::ProductCategorySerializer
|
has_many :product_categories, serializer: Users::ProductCategorySerializer
|
||||||
related_link_for :product_categories
|
related_link_for :product_categories
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ Mozo::Application.routes.draw do
|
|||||||
member do
|
member do
|
||||||
get :table
|
get :table
|
||||||
get :orders
|
get :orders
|
||||||
|
get :users
|
||||||
post :needs_payment
|
post :needs_payment
|
||||||
post :move_to_table
|
post :move_to_table
|
||||||
post :order_products
|
post :order_products
|
||||||
|
|||||||
Reference in New Issue
Block a user