From a72559666db5be3c4069107e7ee9f306cc211203 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 7 Dec 2025 16:57:33 -0500 Subject: [PATCH] Better list users frontend connection and setup of payment page --- app/controllers/users/lists_controller.rb | 3 ++- app/models/supplier.rb | 4 ++++ app/serializers/users/list_serializer.rb | 2 +- app/serializers/users/supplier_serializer.rb | 2 +- config/routes.rb | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/users/lists_controller.rb b/app/controllers/users/lists_controller.rb index 56bc5cc5..28254bf9 100644 --- a/app/controllers/users/lists_controller.rb +++ b/app/controllers/users/lists_controller.rb @@ -24,10 +24,11 @@ module Users join_requests join_requests.user table + users 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 end diff --git a/app/models/supplier.rb b/app/models/supplier.rb index aaf065d9..82034c9c 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -82,6 +82,10 @@ class Supplier [lat, lng].join(',') end + def suggested_tips + [0, 5, 10, 15, 20] + end + def add_manager(employee) add_employee employee unless employee_ids.include? employee.id settings = settings_for(employee) diff --git a/app/serializers/users/list_serializer.rb b/app/serializers/users/list_serializer.rb index ac11c5ee..3fa09201 100644 --- a/app/serializers/users/list_serializer.rb +++ b/app/serializers/users/list_serializer.rb @@ -16,6 +16,6 @@ class Users::ListSerializer @_include_linkages.any?{|link| link =~ /orders/} end - related_link_for :orders, :table + related_link_for :orders, :table, :users #belongs_to :table end diff --git a/app/serializers/users/supplier_serializer.rb b/app/serializers/users/supplier_serializer.rb index dde802b6..3d0b45ce 100644 --- a/app/serializers/users/supplier_serializer.rb +++ b/app/serializers/users/supplier_serializer.rb @@ -1,7 +1,7 @@ class Users::SupplierSerializer 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 related_link_for :product_categories end diff --git a/config/routes.rb b/config/routes.rb index 8fc06e9a..1e2c07d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -90,6 +90,7 @@ Mozo::Application.routes.draw do member do get :table get :orders + get :users post :needs_payment post :move_to_table post :order_products