git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emenu api integrated

Browse Source
This commit is contained in:
Min Zeya Phyo
2017-04-19 18:37:07 +06:30
parent a717791a7c
commit c4e76c53b2
23 changed files with 158 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/bill_controller.rb
View File

@@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController
#create Bill by Booking ID
if (params[:booking_id])
@sale = Sale.new
@sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
@status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
elsif (params[:order_id])
@sale = Sale.new
@sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
@status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
end
end

12
app/controllers/api/orders_controller.rb
View File

@@ -1,5 +1,4 @@
class Api::OrdersController < ActionController::API
#before :authenticate_token
class Api::OrdersController < Api::ApiController
#Description
# This API show current order details
@@ -19,8 +18,8 @@ class Api::OrdersController < ActionController::API
# Output Params
# Status [Success | Error | System Error] , order_id, error_message (*)
def create
Rails.logger.debug "Order Source - " + params[:order_source]
Rails.logger.debug "Table ID - " + params[:table_id]
Rails.logger.debug "Order Source - " + params[:order_source].to_s
Rails.logger.debug "Table ID - " + params[:table_id].to_s
# begin
@order = Order.new
@@ -31,16 +30,17 @@ class Api::OrdersController < ActionController::API
@order.guest = params[:guest_info]
@order.table_id = params[:table_id]
@order.new_booking = true
#@order.employee_name = "Emenu"
@order.employee_name = current_login_employee.name
#Create Table Booking or Room Booking
if !params["booking_id"].nil?
if !params["booking_id"].nil? && params[:booking_id].to_i > 0
@order.new_booking = false
@order.booking_id = params[:booking_id]
end
@status = @order.generate
@status, @booking = @order.generate
# rescue Exception => error
# @status = false

7
app/controllers/application_controller.rb
View File

@@ -1,8 +1,9 @@
class ApplicationController < ActionController::Base
include LoginVerification
#before_action :check_installation
protect_from_forgery with: :exception
helper_method :current_company
helper_method :current_company,:current_login_employee
#this is base api base controller to need to inherit.
#all token authentication must be done here
@@ -16,6 +17,10 @@ class ApplicationController < ActionController::Base
end
def current_login_employee
@employee = Employee.find_by_token_session(session[:session_token])
end
private
def check_installation
if current_company.nil?

34
app/controllers/home_controller.rb
View File

@@ -1,10 +1,44 @@
class HomeController < ApplicationController
skip_before_action :authenticate, only: [:index, :create, :destroy]
def index
@login_form = LoginForm.new()
end
def create
@login_form = LoginForm.new()
@login_form.emp_id = params[:login_form][:emp_id]
@login_form.password = params[:login_form][:password]
@employee = Employee.login(@login_form.emp_id, @login_form.password)
if @employee
session[:session_token] = @employee.token_session
redirect_to dashboard_path
else
render :index
end
end
def dashboard
# if @employee && @employee.role == "cashier"
#
# elsif @employee && @employee.role == "waiter"
# elsif @employee && @employee.role == "administrator"
# elsif @employee && @employee.role == "manager"
# elsif @employee && @employee.role == "supervisour"
# redirect_to dashboard_path
# end
end
def destroy
session[:session_token] = nil
redirect_to root_path
end
private
# Never trust parameters from the scary internet, only allow the white list through.
def settings_home_params
params.require(:login_form).permit(:emp_id, :password)
end
end

9
app/controllers/settings/menu_categories_controller.rb
View File

@@ -27,12 +27,19 @@ class Settings::MenuCategoriesController < ApplicationController
# POST /settings/menu_categories.json
def create
@settings_menu_category = MenuCategory.new(settings_menu_category_params)
@settings_menu_category.created_by = current_login_employee.name
#@settings_menu_category.menu = @settings_menu
respond_to do |format|
if @settings_menu_category.save
format.html { redirect_to @settings_menu_category, notice: 'Menu category was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_category }
else
if (@settings_menu_category.errors)
@settings_menu_category.errors.each do |error|
Rails.logger.debug error
end
end
format.html { render :new }
format.json { render json: @settings_menu_category.errors, status: :unprocessable_entity }
end
@@ -74,6 +81,6 @@ class Settings::MenuCategoriesController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def settings_menu_category_params
params.require(:settings_menu_category).permit(:menu_id, :name, :alt_name, :order_by, :menu_category_id)
params.require(:menu_category).permit(:code, :menu_id, :name, :alt_name, :order_by, :menu_category_id)
end
end

5
app/controllers/settings/tax_profiles_controller.rb
View File

@@ -25,10 +25,11 @@ class Settings::TaxProfilesController < ApplicationController
# POST /settings/tax_profiles.json
def create
@settings_tax_profile = TaxProfile.new(settings_tax_profile_params)
@settings_tax_profile.created_by = current_login_employee.name
respond_to do |format|
if @settings_tax_profile.save
format.html { redirect_to @settings_tax_profile, notice: 'Tax profile was successfully created.' }
format.html { redirect_to settings_tax_profiles_path, notice: 'Tax profile was successfully created.' }
format.json { render :show, status: :created, location: @settings_tax_profile }
else
format.html { render :new }
@@ -42,7 +43,7 @@ class Settings::TaxProfilesController < ApplicationController
def update
respond_to do |format|
if @settings_tax_profile.update(settings_tax_profile_params)
format.html { redirect_to @settings_tax_profile, notice: 'Tax profile was successfully updated.' }
format.html { redirect_to settings_tax_profiles_path, notice: 'Tax profile was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_tax_profile }
else
format.html { render :edit }

2
app/models/employee.rb
View File

@@ -32,7 +32,7 @@ class Employee < ApplicationRecord
user = Employee.find_by_token_session(session_token)
if user && user.session_expiry.utc > DateTime.now.utc
#Extend the login time each time authenticatation take place
user.session_expiry = DateTime.now.utc + 30.minutes
user.session_expiry = user.session_expiry.utc + 30.minutes
user.save
return true
else

4
app/models/menu_category.rb
View File

@@ -4,9 +4,9 @@ class MenuCategory < ApplicationRecord
belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true
has_many :menu_items
validates_presence_of :name
validates_presence_of :name, :menu, :code, :order_by
default_scope { order('order_by asc') }
end

20
app/models/order.rb
View File

@@ -6,7 +6,7 @@ class Order < ApplicationRecord
has_many :assigned_order_items
#internal references attributes for business logic control
attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name
attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id
#Main Controller method to create new order - validate all inputs and generate new order
@@ -25,7 +25,9 @@ class Order < ApplicationRecord
:checkin_at => Time.now.utc, :checkin_by => self.employee_name,
:booking_status => "new" })
else
booking = Booking.find(self.booking_id)
if (self.booking_id.to_i > 0 )
booking = Booking.find(self.booking_id)
end
end
@@ -41,7 +43,7 @@ class Order < ApplicationRecord
#Send order to queue one it done!
process_order_queue
return true
return true, booking
end
@@ -59,8 +61,8 @@ class Order < ApplicationRecord
if self.items
#loop to add all items to order
self.items.each do |item|
menu_item = MenuItem.search_by_item_code(item[:item_code])
menu_item = MenuItem.search_by_item_code(item[:item_instance_code])
Rails.logger.debug menu_item
set_order_items = nil
##If menu Item set item - must add child items to order as well, where price is only take from menu_item
if (menu_item[:type] == "SetMenuItem")
@@ -69,8 +71,8 @@ class Order < ApplicationRecord
if (menu_item)
OrderItem.processs_item(menu_item[:item_instance_code], menu_item[:name],
item[:qty],item[:price], item[:options], set_order_items, self.id,
OrderItem.processs_item(menu_item[:item_code], menu_item[:name],
item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name)
end
end
@@ -87,9 +89,9 @@ class Order < ApplicationRecord
end
def update_items_status_to_billed(items)
if (items)
if (items.nil?)
##Update the order status to ensure that reflect the stage
order.order_items.each do |item|
self.order_items.each do |item|
item.order_item_status = "billed"
item.save
end

12
app/models/sale.rb
View File

@@ -31,7 +31,7 @@ class Sale < ApplicationRecord
end
end
def generate_invoice_from_order (order_no, sale_id, requested_by)
def generate_invoice_from_order (order_id, sale_id, requested_by)
taxable = true
#if sale_id is exsit and validate
#add order to that invoice
@@ -45,32 +45,34 @@ class Sale < ApplicationRecord
else
#if this is new sale generate_receipt_no
generate_receipt_no
order = Order.find(order_id)
#Default - Values
self.tax_type = "execlusive"
self.requested_by = requested_by
self.requested_at = DateTime.now.utc
self.customer_id = order.customer_id
order = Order.find(order_no)
Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}"
if order
self.customer_id = order.customer_id
Rails.logger.debug "Order -> #{order.id} | Items Count -> #{order.order_items.count}"
order.order_items.each do |item|
add_item(item)
end
link_order_sale(order.id)
end
link_order_sale(order.id)
self.save!
#compute summary
compute
#Update the order items that is billed
order.update_items_status_to_billed
order.update_items_status_to_billed(nil)
return true, self.id
end

2
app/models/tax_profile.rb
View File

@@ -1,2 +1,4 @@
class TaxProfile < ApplicationRecord
default_scope { order('order_by asc') }
end

1
app/views/api/orders/create.json.jbuilder
View File

@@ -1,6 +1,7 @@
if @status == true
json.status :success
json.id @order.id
json.booking_id @booking.id
json.order_items do
json.array! @order.order_items, :item_code, :item_name, :qty, :options, :remark
end

27
app/views/home/index.html.erb
View File

@@ -1,2 +1,25 @@
<h1>Home#index</h1>
<p>Find me in app/views/home/index.html.erb</p>
<div class="row">
<div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
<%= simple_form_for(@login_form, url: login_path, method: "POST") do |f| %>
<div class="card">
<h4 class="card-title text-center" style="margin:10px">Login</h4>
<div class="content" style="margin:10px">
<div class="form-group">
<%= f.input :emp_id, required: false, autofocus: true, class: "form-control" %>
</div>
<div class="form-group">
<%= f.input :password, required: false, class: "form-control" %>
</div>
</div>
<div class="footer text-center" style="margin:10px">
<%= f.button :submit, "Log in", class: "form-control btn btn-fill btn-warning btn-wd" %>
</div>
</div>
<% end %>
</div>
</div>

6
app/views/layouts/application.html.erb
View File

@@ -16,6 +16,12 @@
<body>
<%= render 'layouts/header' %>
<div class="container-fluid">
<% flash.each do |type, message| %>
<div class="alert fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%= message %>
</div>
<% end %>
<%= yield %>
</div>

2
app/views/settings/menu_categories/_form.html.erb
View File

@@ -2,6 +2,8 @@
<%= f.error_notification %>
<div class="form-inputs">
<%= f.input :menu_id, as: :hidden %>
<%= f.input :code, label: "Category Code" %>
<%= f.input :name %>
<%= f.input :alt_name %>
<%= f.input :order_by %>

16
app/views/settings/menu_categories/edit.html.erb
View File

@@ -1,6 +1,10 @@
<h1>Editing Settings Menu Category</h1>
<%= render 'form', settings_menu_category: @settings_menu_category %>
<%= link_to 'Show', @settings_menu_category %> |
<%= link_to 'Back', settings_menu_categories_path %>
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_categories_path %>">Menu Categories</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_menu_category: @settings_menu_category %>
</div>

4
app/views/settings/menus/show.html.erb
View File

@@ -66,10 +66,10 @@
<tr>
<td><%= category.name %></td>
<td><%= category.children.count rescue "-" %></td>
<td><%= category.menu_items.count rescue "-" %></td>
<td><%= link_to category.menu_items.count, settings_menu_category_menu_items_path(category) %></td>
<td><%= category.order_by %></td>
<td><%=l category.created_at, format: :short %></td>
<td><%= link_to 'Edit', edit_settings_menu_path(@settings_menu) %></td>
<td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category) %></td>
</tr>
<% end %>
</tbody>

2
app/views/settings/tax_profiles/index.html.erb
View File

@@ -34,7 +34,7 @@
<td><%= settings_tax_profile.order_by %></td>
<td><%= settings_tax_profile.created_by %></td>
<td><%= link_to 'Edit', edit_settings_tax_profile_path(settings_tax_profile) %></td>
<td><%= link_to 'Destroy', settings_tax_profile_path(:settings,settings_tax_profile ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td><%= link_to 'Destroy', settings_tax_profile_path(settings_tax_profile ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>

13
config/routes.rb
View File

@@ -12,6 +12,7 @@ Rails.application.routes.draw do
#--------- Login/Authentication ------------#
post 'login' => 'home#create'
delete 'logout' => 'home#destroy'
get 'dashboard' => 'home#dashboard'
#--------- API Routes ------------#
@@ -31,7 +32,7 @@ Rails.application.routes.draw do
end
#User request move table or bills
post "bill" => "bill#create"
post "bill/:booking_id" => "bill#create"
post "move" => "move#create"
#Order Controller
@@ -39,7 +40,7 @@ Rails.application.routes.draw do
post "bill" => "bill#create"
end
#Current active bookings
resources :bookings, only: [:index, :create, :update]
resources :bookings, only: [:index, :show, :create, :update]
resources :customers, only: [:index, :show, :create, :update]
#Generating Invoice and making payments - output render @sale
@@ -91,12 +92,18 @@ Rails.application.routes.draw do
#menu
resources :menus do
#menu_categories
resources :menu_categories, only: [:new, :create]
resources :menu_categories, only: [:new, :create, :edit]
end
resources :menu_categories do
#menu_items
resources :menu_items
end
resources :menu_items do
resources :menu_item_instances
end
#payment_settings
#tax_profiles
resources :tax_profiles

2
db/migrate/20170327152733_create_menu_categories.rb
View File

@@ -2,9 +2,11 @@ class CreateMenuCategories < ActiveRecord::Migration[5.0]
def change
create_table :menu_categories do |t|
t.references :menu, foreign_key: true
t.string :code, :null => false
t.string :name, :null => false
t.string :alt_name
t.integer :order_by
t.string :created_by, :null => false
t.references :menu_category, :null => true
t.timestamps

1
db/migrate/20170403155230_create_employees.rb
View File

@@ -8,6 +8,7 @@ class CreateEmployees < ActiveRecord::Migration[5.0]
t.string :token_session
t.datetime :session_expiry
t.datetime :session_last_login
t.string :created_by
t.timestamps
end
end

2
db/migrate/20170403160742_create_sales.rb
View File

@@ -14,7 +14,7 @@ class CreateSales < ActiveRecord::Migration[5.0]
t.decimal :total_discount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :tax_type, :null => false , :dfault => "exclusive_tax"
t.decimal :grant_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :rounding_adjustment, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :amount_received, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :amount_changed, :precision => 10, :scale => 2, :null => false, :default => 0.00

26
db/seeds.rb
View File

@@ -61,7 +61,7 @@ employee_roles = Lookup.create([{lookup_type:'employee_roles', name: 'Cashier',
{lookup_type:'employee_roles', name: 'Waiter', value: 'waiter'},
{lookup_type:'employee_roles', name: 'Supervisour', value: 'supervisour'},
{lookup_type:'employee_roles', name: 'Manager', value: 'manager'},
{lookup_type:'employee_roles', name: 'Administrator', value: 'Administrator'}])
{lookup_type:'employee_roles', name: 'Administrator', value: 'administrator'}])
#booking_status
booking_status = Lookup.create([{lookup_type:'booking_status', name: 'Available', value: 'available'},
@@ -94,23 +94,23 @@ menu_options = MenuItemOption.create([{name: "Less Spicy", value: "less_spicy"},
menu_options = MenuItemOption.create([{name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{name: "Less Sweet", value: "less_sweet"}])
#Default Menu Category
menu_category1 = MenuCategory.create({menu: menu, name: "Sample Menu Category 1", alt_name: "Sample Alternate Name 1", order_by: 1})
menu_category2 = MenuCategory.create({menu: menu, name: "Sample Menu Category 2", alt_name: "Sample Alternate Name 2", order_by: 2})
menu_category3 = MenuCategory.create({menu: menu, name: "Sample Menu Category 3", alt_name: "Sample Alternate Name 3", order_by: 3})
menu_category4 = MenuCategory.create({menu: menu, name: "Sample Menu Category 4", alt_name: "Sample Alternate Category 4", order_by: 1, menu_category_id: menu_category3.id})
menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Sample Menu Category 1", alt_name: "Sample Alternate Name 1", order_by: 1,created_by: "SYSTEM DEFAULT"})
menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Sample Menu Category 2", alt_name: "Sample Alternate Name 2", order_by: 2,created_by: "SYSTEM DEFAULT"})
menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Menu Category 3", alt_name: "Sample Alternate Name 3", order_by: 3,created_by: "SYSTEM DEFAULT"})
menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Menu Category 4", alt_name: "Sample Alternate Category 4", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"})
#Default Menu items
menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"half portion",item_instance_code:"01001-1", menu_item: menu_category1_menu_item0, price:12.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"full portion",item_instance_code:"01001-2", menu_item: menu_category1_menu_item0, price:18.00, is_on_promotion:false}])
menu_category1_menu_item1 = SetMenuItem.create({item_code:"01002", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 })
menu_category1_menu_item2 = SetMenuItem.create({item_code:"01003", name: "Default Menu Item Name 2",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 2", min_selectable_item: 1, max_selectable_item:1 })
menu_category1_menu_item3 = SetMenuItem.create({item_code:"01004", name: "Default Menu Item Name 3",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 3", min_selectable_item: 1, max_selectable_item:1 })
menu_category1_menu_item1 = SetMenuItem.create({item_code:"I004", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 })
menu_category1_menu_item2 = SetMenuItem.create({item_code:"I005", name: "Default Menu Item Name 2",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 2", min_selectable_item: 1, max_selectable_item:1 })
menu_category1_menu_item3 = SetMenuItem.create({item_code:"I006", name: "Default Menu Item Name 3",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 3", min_selectable_item: 1, max_selectable_item:1 })
menu_category2_menu_item0 = SimpleMenuItem.create({item_code:"02005", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 })
menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"02006", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 })
menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"02007", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 })
menu_category2_menu_item0 = SimpleMenuItem.create({item_code:"I007", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 })
menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"I008", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 })
menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"I009", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 })
menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"})
menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"})
@@ -125,3 +125,7 @@ zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue
#Default Order Queue Process By Zone
zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2})
#Create Adminstrator employee
admin_employee = Employee.create({name: "Administrator", role: "Administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"})