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

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-06-04 10:19:35 +06:30
parent 3ab3fa71a8 9dddd2fc78
commit e5e14aaa62
130 changed files with 2582 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@@ -9,14 +9,18 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.0'
# Use mysql as the database for Active Record
<<<<<<< HEAD
#gem 'mysql2', '>= 0.3.18', '< 0.5'
<<<<<<< HEAD
=======
gem 'mysql2', '>= 0.3.18', '< 0.5'
>>>>>>> 9dddd2fc787b1fa43898427a96cd0bfea4fbd9e0
#Use PosgreSQL
gem 'pg'
# redis server for cable
gem 'redis', '~> 3.0'
# gem 'redis', '~> 3.0'
=======
gem 'pg'

5
Gemfile.lock
View File

@@ -114,11 +114,11 @@ GEM
mini_portile2 (2.1.0)
minitest (5.10.2)
multi_json (1.12.1)
mysql2 (0.4.6)
nio4r (2.1.0)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
pdf-core (0.7.0)
pg (0.20.0)
prawn (2.2.2)
pdf-core (~> 0.7.0)
ttfunk (~> 1.5)
@@ -251,13 +251,12 @@ DEPENDENCIES
jquery-rails
kaminari!
listen (~> 3.0.5)
pg
mysql2 (>= 0.3.18, < 0.5)
prawn
prawn-table
puma (~> 3.0)
rack-cors
rails (~> 5.1.0)
redis (~> 3.0)
rspec-rails (~> 3.5)
sass-rails (~> 5.0)
schema_to_scaffold

72
app/assets/javascripts/OQS.js
View File

@@ -17,21 +17,67 @@
//= require cable
$(document).ready(function(){
$('.queue_station').on('click',function(){
var title=$(this).children().children('.card-title').text();
var titles=title.split(' ');
$('.queue_station').on('click',function(){
var orderZone=$(this).children().children().children('.order-zone').text();
var orderItem=$(this).children().children().children('.order-item').text();
var orderQty=$(this).children().children().children('.order-qty').text();
var orderBy=$(this).children().children().children().children('.order-by').text();
var orderAt=$(this).children().children().children().children('.order-at').text();
var orderCustomer=$(this).children().children('.order-customer').text();
var orderBy=$(this).children().children().children().children('.order-by').text();
var orderAt=$(this).children().children().children().children('.order-at').text();
var orderCustomer=$(this).children().children('.order-customer').text();
$('#order-title').text("ORDER DETAILS - " + orderZone);
$('#order-by').text(orderBy);
$('#order-at').text(orderAt);
$('#order-customer').text(orderCustomer);
$('#order-from').text(orderZone);
$('#order-title').text($('#order-title').text() + titles[0]);
$('#order-by').text(orderBy);
$('#order-at').text(orderAt);
$('#order-customer').text(orderCustomer);
$('#order-from').text(titles[0]);
$('#order-items').text(orderItem);
$('#order-qty').text(orderQty);
$('#order-items').text(titles[1]);
$('#order-qty').text(titles[2].substr(2).replace(']',''));
$('.queue_station').removeClass('selected-item');
$(this).addClass('selected-item');
});
// complete for queue item
$('.order-complete').on('click',function(){
var _self= $(this);
var assigned_item_id=$(this).attr('id').substr(15);
var params = { 'id':assigned_item_id };
var station=$(this).parent().parent(".queue_station").parent().parent().attr('id');
$.ajax({
type: 'POST',
url: '/oqs/update_delivery',
data: params,
dataType: 'json',
success: function(data){
var queue_station=_self.parent().parent(".queue_station");
// Remove a queue card from current station
queue_station.remove();
// Remove a queue card from current station
queue_station.children('.card-footer').remove();
// Add removed queue card from station to completed
$("#completed").children('.card-columns').append(queue_station);
// update queue item count in station
$("#"+station+"_count").text(parseInt($("#"+station+"_count").text())-1);
$("#completed_count").text(parseInt($("#completed_count").text())+1);
alert("updated!");
}
});
});
$('#print_order_item').on('click',function(){
var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
var params = { 'id':assigned_item_id };
$.ajax({
type: 'GET',
url: '/oqs/print/print/'+assigned_item_id,
success: function(data){ }
});
});
});

3
app/assets/javascripts/origami/request_bills.coffee Normal file
View File

@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

3
app/assets/javascripts/print_settings.coffee Normal file
View File

@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

4
app/assets/stylesheets/OQS.scss
View File

@@ -14,3 +14,7 @@
.order-void {
background-color: #FFCCDD;
}
.selected-item {
background-color: blue;
}

25
app/assets/stylesheets/application.scss
View File

@@ -9,6 +9,29 @@
// padding-top: 4.5rem;
// }
.setting_nav{
background-color: #2f5663;
}
ul.navbar-nav li a{
text-decoration :none;
color :#e6e6e6;
}
ul.dropdown-menu li a{
text-decoration :none;
color :#525252;
}
.setting_breadcrumb{
background-color: transparent !important;
margin-bottom: 0px !important;
}
.page-header{
border-bottom :0px solid #000 !important;
margin :0px !important;
}
/*----- Order Processing Items -----*/
.opi_ul {
display:block;
@@ -33,4 +56,4 @@
/*----- Header Bar -----*/
/*----- Header Bar -----*/
/*----- Header Bar -----*/

3
app/assets/stylesheets/origami/request_bills.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the origami/RequestBills controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/print_settings.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the print_settings controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

84
app/assets/stylesheets/scaffolds.scss
View File

@@ -0,0 +1,84 @@
body {
background-color: #fff;
color: #333;
margin: 33px;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px;
}
p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px;
}
pre {
background-color: #eee;
padding: 10px;
font-size: 11px;
}
a {
color: #000;
&:visited {
color: #666;
}
&:hover {
color: #fff;
background-color: #000;
}
}
th {
padding-bottom: 5px;
}
td {
padding: 0 5px 7px;
}
div {
&.field, &.actions {
margin-bottom: 10px;
}
}
#notice {
color: green;
}
.field_with_errors {
padding: 2px;
background-color: red;
display: table;
}
#error_explanation {
width: 450px;
border: 2px solid red;
padding: 7px 7px 0;
margin-bottom: 20px;
background-color: #f0f0f0;
h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px -7px 0;
background-color: #c00;
color: #fff;
}
ul li {
font-size: 12px;
list-style: square;
}
}
label {
display: block;
}

3
app/controllers/api/bookings_controller.rb
View File

@@ -1,6 +1,5 @@
class Api::BookingsController < Api::ApiController
skip_before_action :authenticate
#Show customer by ID
def index
@customer = Customer.find_by(params[:id])

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

@@ -7,7 +7,10 @@ class Api::OrdersController < Api::ApiController
order = Order.find(params[:order_id])
order.order_items
end
def get_order
order = Order.find(params[:order_id])
order.order_items
end
# Description
# This API allow new order creation

18
app/controllers/crm/bookings_controller.rb Normal file
View File

@@ -0,0 +1,18 @@
class Crm::BookingsController < ApplicationController
def update_booking
booking = Booking.find(params[:booking_id])
status = booking.update_attributes(booking_status: params[:type])
if status == true
render json: JSON.generate({:status => true ,:type => params[:type]})
else
render json: JSON.generate({:status => false, :error_message => "Record not found"})
end
end
end

30
app/controllers/crm/home_controller.rb
View File

@@ -1,22 +1,22 @@
class Crm::HomeController < BaseCrmController
def index
# @booking = Booking.all
@booking = Booking.select("bookings.id as booking_id,
bookings.checkin_at,
bookings.checkin_by,
bookings.dining_facility_id,
od.customer_id as customer,
od.item_count as count,
odt.id as order_item_id,
odt.item_name as item_name")
.joins("join booking_orders as bko ON bko.booking_id = bookings.id")
.joins("right join orders as od ON od.id = bko.order_id")
.joins("right join order_items as odt ON odt.order_id=od.id")
.order("bookings.id DESC")
@booking = Booking.all
@customer = Customer.all
#@booking = Booking.select("bookings.id as booking_id,
# bookings.checkin_at,
# bookings.checkin_by,
# bookings.dining_facility_id,
# od.customer_id as customer,
# od.id as order_id,
# od.item_count as count,
# odt.id as order_item_id,
# odt.item_name as item_name")
# .joins("join booking_orders as bko ON bko.booking_id = bookings.id")
# .joins("right join orders as od ON od.id = bko.order_id")
# .joins("right join order_items as odt ON odt.order_id=od.id")
# .order("bookings.id DESC")
end
def show

59
app/controllers/oqs/home_controller.rb
View File

@@ -1,31 +1,50 @@
class Oqs::HomeController < BaseOqsController
def index
@queue_stations=OrderQueueStation.all
queue_stations=OrderQueueStation.all
@queue_items_details = queue_items_query(0)
#sample Data
@queue_items_details = { :queue_id => 1, :order_id => 1, :station_name => 'Queue Station 1', :zone => 'Table4', :item_name => 'beef', :price => 10.00, :qty => 2, :customer => 'Wathon', :item_order_by => 'Yan', :created_at => '2007-05-17'}
# @queue_items_details = OrderItem.select("oqs as queue_id, oqs.station_name, oqs.is_active, oqpz.zone_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.created_at")
# .joins("join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = order_queue_items.order_queue_station_id")
# .joins("right join order_queue_stations as oqs ON oqs.id = order_queue_items.order_queue_station_id")
# .joins("right join orders as od ON od.id = order_queue_items.order_id")
# .joins("right join order_items as odt ON odt.item_code = order_queue_items.item_code")
# .order("odt.item_name DESC")
@queue_completed_item = queue_items_query(1)
@queue_stations_items=Array.new
# Calculate Count for each station tab
queue_stations.each do |que|
i=0
@queue_items_details.each do |qid|
if qid.station_name == que.station_name
i=i+1
end
end
@queue_stations_items.push({:station_name => que.station_name, :is_active => que.is_active ,:item_count => i })
end
# Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price,
# order_items.id as order_items_id,dining_facilities.name as table_name")
# .joins("left join booking_orders on booking_orders.order_id = orders.id
# left join bookings on bookings.id = booking_orders.id
# left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
# left join order_items on order_items.order_id = orders.id")
# .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
# .group("orders.id")
@queue_stations_items
end
def show
end
# update delivery status when complete click
def update_delivery_status
assigned_item_id = params[:id]
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_item.delivery_status=true
assigned_item.save
end
# Query for OQS with status
def queue_items_query(status)
AssignedOrderItem.select("assigned_order_items.id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
.joins("join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id
left join dining_facilities as df on df.zone_id = oqpz.zone_id
left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id
left join orders as od ON od.id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code
left join customers as cus ON cus.id = od.customer_id")
.where("assigned_order_items.delivery_status = #{status}")
.group("assigned_order_items.id")
.order("odt.item_name DESC")
end
end

16
app/controllers/oqs/print_controller.rb Normal file
View File

@@ -0,0 +1,16 @@
class Oqs::PrintController < ApplicationController
def print
unique_code="OrderItemPdf"
assigned_item_id=params[:id]
assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('id='+assigned_item_id)
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings,assigned_order_item[0].order_id, assigned_order_item[0].item_code )
# update print status when complete click
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_item.print_status=true
assigned_item.save
end
end

13
app/controllers/origami/request_bills_controller.rb Normal file
View File

@@ -0,0 +1,13 @@
class Origami::RequestBillsController < BaseOrigamiController
def show
@sale = Sale.new
check_order = Order.find_by_id(params[:id])
if check_order
@order_details = OrderItem.get_order_items_details(check_order.id)
@order_details = OrderItem.get_order_items_details(check_order.id)
@status, @sale_id = @sale.generate_invoice_from_order(check_order.id, nil,current_login_employee.name)
@sale_data = Sale.find_by_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id)
end
end
end

74
app/controllers/print_settings_controller.rb Normal file
View File

@@ -0,0 +1,74 @@
class PrintSettingsController < ApplicationController
before_action :set_print_setting, only: [:show, :edit, :update, :destroy]
# GET /print_settings
# GET /print_settings.json
def index
@print_settings = PrintSetting.all
end
# GET /print_settings/1
# GET /print_settings/1.json
def show
end
# GET /print_settings/new
def new
@print_setting = PrintSetting.new
end
# GET /print_settings/1/edit
def edit
end
# POST /print_settings
# POST /print_settings.json
def create
@print_setting = PrintSetting.new(print_setting_params)
respond_to do |format|
if @print_setting.save
format.html { redirect_to @print_setting, notice: 'Print setting was successfully created.' }
format.json { render :show, status: :created, location: @print_setting }
else
format.html { render :new }
format.json { render json: @print_setting.errors, status: :unprocessable_entity }
end
end
end
# PATCH/PUT /print_settings/1
# PATCH/PUT /print_settings/1.json
def update
respond_to do |format|
if @print_setting.update(print_setting_params)
format.html { redirect_to @print_setting, notice: 'Print setting was successfully updated.' }
format.json { render :show, status: :ok, location: @print_setting }
else
format.html { render :edit }
format.json { render json: @print_setting.errors, status: :unprocessable_entity }
end
end
end
# DELETE /print_settings/1
# DELETE /print_settings/1.json
def destroy
@print_setting.destroy
respond_to do |format|
format.html { redirect_to print_settings_url, notice: 'Print setting was successfully destroyed.' }
format.json { head :no_content }
end
end
private
# Use callbacks to share common setup or constraints between actions.
def set_print_setting
@print_setting = PrintSetting.find(params[:id])
end
# Never trust parameters from the scary internet, only allow the white list through.
def print_setting_params
params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies)
end
end

73
app/controllers/settings/accounts_controller.rb Normal file
View File

@@ -0,0 +1,73 @@
class Settings::AccountsController < ApplicationController
before_action :set_account, only: [:show, :edit, :update, :destroy]
# GET /settings/accounts
# GET /settings/accounts.json
def index
@settings_accounts = Account.all
end
# GET /settings/accounts/1
# GET /settings/accounts/1.json
def show
end
# GET /settings/accounts/new
def new
@settings_account = Account.new
end
# GET /settings/accounts/1/edit
def edit
end
# POST /settings/accounts
# POST /settings/accounts.json
def create
@settings_account = Account.new(account_params)
respond_to do |format|
if @settings_account.save!
format.html { redirect_to settings_accounts_url, notice: 'Account was successfully created.' }
format.json { render :index, status: :created, location: @settings_account }
else
format.html { render :new }
format.json { render json: settings_accounts_url.errors, status: :unprocessable_entity }
end
end
end
# PATCH/PUT /settings/accounts/1
# PATCH/PUT /settings/accounts/1.json
def update
respond_to do |format|
if @settings_account.update(account_params)
format.html { redirect_to settings_accounts_url, notice: 'Account was successfully updated.' }
format.json { render :index, status: :ok, location: @settings_account }
else
format.html { render :edit }
format.json { render json: settings_accounts_url.errors, status: :unprocessable_entity }
end
end
end
# DELETE /settings/accounts/1
# DELETE /settings/accounts/1.json
def destroy
@settings_account.destroy
respond_to do |format|
format.html { redirect_to settings_accounts_url, notice: 'Account was successfully destroyed.' }
format.json { head :no_content }
end
end
private
# Use callbacks to share common setup or constraints between actions.
def set_account
@settings_account = Account.find(params[:id])
end
# Never trust parameters from the scary internet, only allow the white list through.
def account_params
params.require(:account).permit(:title, :account_type)
end
end

79
app/controllers/settings/menu_item_instances_controller.rb Normal file
View File

@@ -0,0 +1,79 @@
class Settings::MenuItemInstancesController < ApplicationController
before_action :set_settings_menu_item_instance, only: [:show, :edit, :update, :destroy]
before_action :set_settings_menu_item, only: [:index, :show, :edit, :new, :update]
# GET /settings/menu_item_instances
# GET /settings/menu_item_instances.json
def index
@settings_menu_item_instances = MenuItemInstance.all
end
# GET /settings/menu_item_instances/1
# GET /settings/menu_item_instances/1.json
def show
end
# GET /settings/menu_item_instances/new
def new
@settings_menu_item_instance = MenuItemInstance.new
end
# GET /settings/menu_item_instances/1/edit
def edit
end
# POST /settings/menu_item_instances
# POST /settings/menu_item_instances.json
def create
@settings_menu_item_instance = MenuItemInstance.new(settings_menu_item_instance_params)
respond_to do |format|
if @settings_menu_item_instance.save
format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item_instance }
else
format.html { render :new }
format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity }
end
end
end
# PATCH/PUT /settings/menu_item_instances/1
# PATCH/PUT /settings/menu_item_instances/1.json
def update
respond_to do |format|
if @settings_menu_item_instance.update(settings_menu_item_instance_params)
format.html { redirect_to settings_menu_item_instance_path(@settings_menu_item_instance), notice: 'Menu item instance was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu_item_instance }
else
format.html { render :edit }
format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity }
end
end
end
# DELETE /settings/menu_item_instances/1
# DELETE /settings/menu_item_instances/1.json
def destroy
# @settings_menu_item_instance.destroy
respond_to do |format|
format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully destroyed.' }
format.json { head :no_content }
end
end
private
# Use callbacks to share common setup or constraints between actions.
def set_settings_menu_item_instance
@set_settings_menu_item_instances = MenuItemInstance.find(params[:id])
end
def set_settings_menu_item
@item = MenuItem.find(params[:menu_item_id])
end
# Never trust parameters from the scary internet, only allow the white list through.
def settings_menu_item_instance_params
params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :is_on_promotion, :promotion_price, :is_available)
end
end

6
app/controllers/settings/order_queue_stations_controller.rb
View File

@@ -1,5 +1,5 @@
class Settings::OrderQueueStationsController < ApplicationController
before_action :set_settings_order_queue_station, only: [:show, :edit,:new, :update, :destroy]
before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy]
# GET /settings/order_queue_stations
# GET /settings/order_queue_stations.json
@@ -25,10 +25,10 @@ class Settings::OrderQueueStationsController < ApplicationController
# POST /settings/order_queue_stations.json
def create
@settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
@settings_order_queue_station.created_by = current_login_employee.name
respond_to do |format|
if @settings_order_queue_station.save
format.html { redirect_to @settings_order_queue_station, notice: 'Order queue station was successfully created.' }
format.html { redirect_to settings_order_queue_stations_path, notice: 'Order queue station was successfully created.' }
format.json { render :show, status: :created, location: @settings_order_queue_station }
else
format.html { render :new }

1
app/controllers/settings/set_menu_items_controller.rb
View File

@@ -10,6 +10,7 @@ class Settings::SetMenuItemsController < ApplicationController
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new

6
app/controllers/settings/simple_menu_items_controller.rb
View File

@@ -1,6 +1,6 @@
class Settings::SimpleMenuItemsController < ApplicationController
before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update]
before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy ]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update ,:create]
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@@ -10,6 +10,8 @@ class Settings::SimpleMenuItemsController < ApplicationController
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
@menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new

7
app/forms/shop_form.rb Normal file
View File

@@ -0,0 +1,7 @@
#Form object to use during the installation process - will handle creation of shop model into db after verification from the cloud
#provising service through license verification
class ShopForm < ActiveModel
:attr_accessor :logo, :name, :address, :township, :city, :state, :country, :license, :base_currency, :password, :password_confirmation
end

2
app/helpers/crm/bookings_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Crm::BookingsHelper
end

2
app/helpers/oqs/print_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Oqs::PrintHelper
end

2
app/helpers/origami/request_bills_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Origami::RequestBillsHelper
end

2
app/helpers/print_settings_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module PrintSettingsHelper
end

2
app/helpers/settings/accounts_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Settings::AccountsHelper
end

7
app/models/account.rb Normal file
View File

@@ -0,0 +1,7 @@
class Account < ApplicationRecord
validates_presence_of :title, :account_type
has_many :menu_items
# belongs_to :lookup , :class_name => "Lookup" ,:foreign_key => :tax_type
end

3
app/models/booking.rb
View File

@@ -1,5 +1,6 @@
class Booking < ApplicationRecord
#primary key - need to be unique
belongs_to :dining_facility, :optional => true
belongs_to :sale, :optional => true
has_many :booking_orders

2
app/models/booking_order.rb
View File

@@ -1,4 +1,6 @@
class BookingOrder < ApplicationRecord
#primary key - need to be unique
belongs_to :booking
belongs_to :order
end

5
app/models/crm.rb Normal file
View File

@@ -0,0 +1,5 @@
module Crm
def self.table_name_prefix
'crm_'
end
end

2
app/models/lookup.rb
View File

@@ -1,4 +1,6 @@
class Lookup < ApplicationRecord
has_many :accounts
def available_types
{'Employee Roles' => 'employee_roles',

3
app/models/menu_item.rb
View File

@@ -1,9 +1,12 @@
class MenuItem < ApplicationRecord
belongs_to :account
belongs_to :menu_category, :optional => true
has_many :menu_item_instances
belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true
has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id"
validates_presence_of :item_code, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item
default_scope { order('item_code asc') }
def self.collection

9
app/models/order.rb
View File

@@ -1,4 +1,6 @@
class Order < ApplicationRecord
#primary key - need to be unique
before_create :set_order_date
belongs_to :customer
@@ -238,13 +240,16 @@ class Order < ApplicationRecord
end
#Origami: Cashier : to view orders
def self.get_orders
from = Time.now.beginning_of_day.utc
to = Time.now.end_of_day.utc
orders = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price,
order_items.id as order_items_id,dining_facilities.name as table_or_room_name")
.joins("left join booking_orders on booking_orders.order_id = orders.id
left join bookings on bookings.id = booking_orders.id
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
left join order_items on order_items.order_id = orders.id")
.where("dining_facilities.is_active=?",true)
.group("orders.id,order_items.id,dining_facilities.name")
.where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
.group("orders.id")
end
end

2
app/models/order_item.rb
View File

@@ -1,4 +1,6 @@
class OrderItem < ApplicationRecord
#primary key - need to be unique
#Associations
belongs_to :order, autosave: true

2
app/models/print_setting.rb Normal file
View File

@@ -0,0 +1,2 @@
class PrintSetting < ApplicationRecord
end

34
app/models/printer/order_queue_printer.rb
View File

@@ -1,22 +1,46 @@
class Printer::OrderQueuePrinter < Printer::PrinterWorker
def print_order_item(order_queue_id)
def print_order_item(printer_settings,order_id, item_code)
#Use CUPS service
#Generate PDF
#Print
pdf = OrderItemPdf.new
pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
order_item= print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)
pdf = OrderItemPdf.new(order_item[0],printer_settings)
pdf.render_file "tmp/receipt.pdf"
self.print("tmp/receipt.pdf")
end
def print_order_summary(booking_id)
def print_order_summary(printer_settings,booking_id)
#Use CUPS service
#Generate PDF
#Print
order=print_query('booking',booking_id)
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
pdf = OrderSummaryPdf.new
pdf = OrderSummaryPdf.new(order,printer_settings)
pdf.render_file filename
self.print(filename)
end
# Query for OQS with status
def print_query(type, code)
if type == 'order_item'
OrderItem.select("order_items.item_code, order_items.item_name,order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
.joins("left join orders ON orders.id = order_items.order_id
left join booking_orders AS bo ON bo.order_id=order_items.order_id
left join bookings AS b ON b.id = bo.booking_id
left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.id = orders.customer_id")
.where("order_items.item_code=" + code)
.group("order_items.item_code")
else
OrderItem.select("order_items.item_code, order_items.item_name, df.name as dining")
.joins("left join orders ON orders.id = order_items.order_id
left join booking_orders AS bo ON bo.order_id=order_items.order_id
left join bookings AS b ON b.id = bo.booking_id
left join dining_facilities AS df ON df.id = b.dining_facility_id")
.where("booking.id=" + code)
end
end
end

5
app/models/sale.rb
View File

@@ -1,3 +1,5 @@
#primary key - need to be unique generated for multiple shops
class Sale < ApplicationRecord
#before_create :generate_receipt_no
belongs_to :cashier, :optional => true
@@ -188,7 +190,8 @@ class Sale < ApplicationRecord
sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate
#include or execulive
sale_tax.tax_payable_amount = total_taxable * tax.rate
# sale_tax.tax_payable_amount = total_taxable * tax.rate
sale_tax.tax_payable_amount = total_taxable * tax.rate / 100
#new taxable amount
total_taxable = total_taxable + sale_tax.tax_payable_amount

2
app/models/sale_audit.rb
View File

@@ -1,4 +1,6 @@
class SaleAudit < ApplicationRecord
#primary key - need to be unique generated for multiple shops
belongs_to :sale
def record_audit_void(sale_id, void_by, approved_by, reason)

2
app/models/sale_item.rb
View File

@@ -1,4 +1,6 @@
class SaleItem < ApplicationRecord
#primary key - need to be unique generated for multiple shops
belongs_to :sale
#compute items - discount, tax, price_change

2
app/models/sale_order.rb
View File

@@ -1,4 +1,6 @@
class SaleOrder < ApplicationRecord
#primary key - need to be unique generated for multiple shops
belongs_to :sale
belongs_to :order
end

2
app/models/sale_payment.rb
View File

@@ -1,4 +1,6 @@
class SalePayment < ApplicationRecord
#primary key - need to be unique generated for multiple shops
belongs_to :sale
:attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status

2
app/models/sale_tax.rb
View File

@@ -1,3 +1,5 @@
class SaleTax < ApplicationRecord
#primary key - need to be unique generated for multiple shops
belongs_to :sale
end

19
app/models/seed_generator.rb
View File

@@ -1,4 +1,23 @@
class SeedGenerator < ApplicationRecord
def self.generate_id(model, prefix)
seed = SeedGenerator.find_by_model(model)
new_receipt_no = 0
if (seed.nil?)
seed = SeedGenerator.new()
seed.model = model
new_receipt_no = seed.next
seed.save
else
current_no = seed.next
seed.next = seed.next + seed.increase_by
seed.current = current_no
seed.save
end
return prefix + "-" + seed.current.to_s
end
def self.new_receipt_no
seed = SeedGenerator.find_by_model("sale")
new_receipt_no = 0

2
app/models/shop.rb Normal file
View File

@@ -0,0 +1,2 @@
class Shop < ApplicationRecord
end

21
app/pdf/order_item_pdf.rb
View File

@@ -5,14 +5,27 @@ class OrderItemPdf < Prawn::Document
# font "public/fonts/#{font_name}".to_s + ".ttf".to_s
# font "public/fonts/Zawgyi-One.ttf"
# font "public/fonts/padauk.ttf"
# font "public/fonts/padauk.ttf"
font_size 9
text "#{"table_name"}", :size => 15
text "#{order_item.dining}", :size => 15
stroke_horizontal_rule
move_down 5
cashier_info(order_item.order_by,order_item.order_at, order_item.customer)
end
def cashier_info(order_by, order_at, customer)
move_down 5
y_position = cursor
bounding_box([0,y_position], :width =>200, :height => 20) do
text "OrderBy:#{order_by} Customer:#{customer} Date:#{order_at.strftime("%Y %m %d")}", :size => 7,:align => :left
end
stroke_horizontal_rule
move_down 5
end
end

2
app/views/api/bookings/show.json.jbuilder
View File

@@ -2,6 +2,8 @@ if (@booking)
json.id @booking.id
json.status @booking.booking_status
json.checkin_at @booking.checkin_at
json.checkin_by @booking.checkin_by
json.table_name @booking.dining_facility.name
if @booking.type == "TableBooking"
json.table_id @booking.dining_facility_id

134
app/views/crm/home/_booking.html.erb
View File

@@ -1,26 +1,112 @@
<!--- Booking Items -->
<div class="card-columns" style="padding-top:10px">
<div class="card-columns" style="padding-top:10px">
<% @i = 0 %>
<% @booking.each do |booking| %>
<% if booking.booking_status == "new" %>
<div class="card">
<div class="card-block booking_click" data-ref="<%= api_booking_path booking.id%>" id="card-block booking_block" style="width:100%;">
<h4 class="card-title">
<%= @i += 1 %> . <%= booking.dining_facility.name %>
- <%= booking.id %>
</h4>
<!-- <p class="card-text">Medium, Fries, Salad</p> -->
<p class="card-text">
<small class="text-muted">
Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %>
</small>
</p>
</div>
<div class="card-footer">
<div class="row">
<div class="col-md-6">
<button id="assign" data-id="<%= booking.id %>" data-type="complete" class="btn assign btn-primary btn-sm btn-block">ASSIGN</button>
</div>
<div class="col-md-6">
<button id="cancel" data-id="<%= booking.id %>" data-type="cancel" class="btn btn-danger cancel btn-sm btn-block">CANCLE</button>
</div>
</div>
</div>
</div>
<% end %>
<% end %>
<!--- end of Items-->
</div>
<script type="text/javascript">
$(function(){
$(".booking_click").on("click", function(){
$(".summary-items tbody tr").remove();
var url = $(this).attr('data-ref');
show_details(url);
});
$('.assign').click(function(e){
var booking_id = $(this).attr("data-id")
var type = $(this).attr("data-type")
update_booking(booking_id,type)
});
$('.cancel').click(function(e){
var booking_id = $(this).attr("data-id")
var type = $(this).attr("data-type")
update_booking(booking_id,type)
});
});
function show_details(url_item){
$.ajax({
type: "GET",
url: url_item,
data: {},
dataType: "json",
success: function(data) {
item_data = data.order_items;
//console.log(item_data.length);
$("#table").text(data.table_name)
$("#order_at").text(data.checkin_at)
$("#order_by").text(data.checkin_by)
<% @i = 0 %>
<% @booking.each do |booking| %>
<div class="card">
<div class="card-block">
<h4 class="card-title">
<%= @i += 1 %> . <%= booking.dining_facility.name %>
- <%= booking.item_name %>
</h4>
<p class="card-text">Medium, Fries, Salad
</p>
<p class="card-text">
<small class="text-muted">
Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %>
</small>
</p>
</div>
<div class="card-footer">
<button id="#id" class="btn btn-primary btn-lg btn-block">COMPLETE</button>
</div>
</div>
<% end %>
<!--- end of Items-->
</div>
for(var field in item_data) {
if (item_data[field].item_name){
var price = parseFloat(item_data[field].price).toFixed(2);
row = "<tr>"
+'<td style="width:33%; text-align:left">' + item_data[field].item_name +'</td>'
+'<td style="width:33%; text-align:center">' + item_data[field].qty + '</td>'
+'<td style="width:33%; text-align:right">' + price + '</td>'
+'</tr>';
}
$(".summary-items tbody").append(row);
}
}
});
}
function update_booking(booking_id,type) {
$.ajax({
type: "POST",
url: "crm/update_booking/" ,
data: {booking_id:booking_id,type:type},
dataType: "json",
success: function(data) {
if(data.status == true && data.type == "cancel")
{
alert('Booking has canceled!');
}else{
alert('Booking has completed!');
}
location.reload();
}
});
}
</script>

60
app/views/crm/home/_queue.html.erb
View File

@@ -1,29 +1,37 @@
<div class="card-columns" style="padding-top:10px">
<div class="card">
<div class="card-block order-completed">
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
<p class="card-text">Well Done, Fries, Salad</p>
<p class="card-text">
<small class="text-muted">Order at 12:23, Kyaw Lwin</small> |
<small class="text-muted">Printed at 12:23</small> |
<small class="text-muted">Completed at 12:43</small>
</p>
<% @i = 0 %>
<% @booking.each do |booking| %>
<% if booking.booking_status == "complete" %>
<div class="card booking_click" data-ref="<%= api_booking_path booking.id%>" id="booking_block">
<div class="card-block" id="card-block" style="width:100%;">
<h4 class="card-title">
<%= @i += 1 %> . <%= booking.dining_facility.name %>
- <%= booking.id %>
</h4>
<!-- <p class="card-text">Medium, Fries, Salad</p> -->
<p class="card-text">
<small class="text-muted">
Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %>
</small>
</p>
</div>
<!-- <div class="card-footer">
<div class="row">
<div class="col-md-6">
<button id="assign" data-ref="<%= booking.id%>" data-type="complete" class="btn assign btn-primary btn-sm btn-block">ASSIGN</button>
</div>
<div class="col-md-6">
<button id="cancel" data-ref="<%= booking.id%>" data-type="cancel" class="btn btn-danger cancel btn-sm btn-block">CANCLE</button>
</div>
</div>
</div> -->
</div>
<% end %>
<% end %>
</div>
</div>
<div class="card">
<div class="card-block order-void">
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
<p class="card-text">Well Done, Fries, Salad</p>
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
</div>
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
<p class="card-text">Well Done, Fries, Salad</p>
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
</div>
</div>
</div>
</div>

44
app/views/crm/home/index.html.erb
View File

@@ -5,10 +5,10 @@
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default">2000</span></a>
<a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","complete").count %></span></a>
</li>
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default"><%= @count %></span></a>
<a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","new").count %></span></a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Customers</a>
@@ -37,9 +37,6 @@
<!-- Panel 3 - Orders -->
<!-- Panel 3 - Orders - End -->
</div>
</div>
<!-- Column Two -->
<div class="col-lg-5 col-md-5 col-sm-5">
@@ -47,51 +44,44 @@
<div class="card-header">
<div id="order-title"><strong>ORDER DETAILS</strong> - Table 4</div>
</div>
<div id="station"></div>
<div class="card-block">
<div class="card-title">
<table class="table">
<table class="table" >
<thead>
<tr>
<th style="width:33%; text-align:left">Order By</th>
<th style="width:33%; text-align:right">Order At</td>
<th style="width:33%; text-align:center;">Order At</td>
<th style="width:33%; text-align:right">Customer</td>
</tr>
</thead>
<tbody>
<tr>
<td style="width:33%; text-align:left">Kyaw Lwin</td>
<td style="width:33%; text-align:right">20/04/17 9:30PM</td>
<td style="width:33%; text-align:right">John Smith</td>
<tr id="">
<td style="width:33%; text-align:left" id="order_by"></td>
<td style="width:33%; text-align:center" id="order_at"></td>
<td style="width:33%; text-align:right" id="customer"></td>
</tr>
<tr>
<tr id="">
<td><strong>Table/Room</strong></td>
<td colspan="2">Table 4</td>
<td colspan="2" style="text-align:left" id="table"></td>
</tr>
</tbody>
</table>
<table class="table">
<thead>
<tr>
<th style="width:80%; text-align:left">Items</th>
<th style="width:20%; text-align:right">QTY</td>
<th style="width:33%; text-align:left">Items</th>
<th style="width:33%; text-align:center">Qty</th>
<th style="width:33%; text-align:right">Price</td>
</tr>
</thead>
</table>
</div>
<div class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
<table class="table">
<table class="table summary-items">
<tbody>
<tr>
<td style="width:80%; text-align:left">
Menu Items Name <br/>
Less Sweet, No MSG
</td>
<td style="width:20%; text-align:right">
5
</td>
</tr>
</tbody>
</table>
</div>

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

@@ -10,7 +10,6 @@
<%= csrf_meta_tags %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

161
app/views/oqs/home/index.html.erb
View File

@@ -1,91 +1,125 @@
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-8">
<!-- Column One -->
<!-- Column One -->
<div class="col-lg-8 col-md-8 col-sm-8">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default">2000</span></a>
<a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
</li>
<%
<%
# For Tab Disable for Station is inactive
status=""
@queue_stations.each do |que|
if que.is_active == false
@queue_stations_items.each do |qsi|
if qsi[:is_active] == false
status="disabled"
end
%>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href=<%= '#' + que.station_name %> role="tab" <%= status %>><%= que.station_name %><span class="badge badge-pill badge-default">18</span></a>
<a class="nav-link" data-toggle="tab" href=<%= '#' + qsi[:station_name].gsub(' ', '_') %> role="tab" <%= status %>>
<%= qsi[:station_name] %>
<span class="badge badge-pill badge-default" id=<%= qsi[:station_name].gsub(' ', '_') + '_count' %>>
<%= qsi[:item_count] %>
</span>
</a>
</li>
<% end %>
</ul>
<!-- Nav tabs - End -->
<div class="tab-content" style="min-height:670px; max-height:670px; overflow-y:scroll">
<div class="tab-content" style="min-height:670px; max-height:670px; overflow:auto">
<!--- Panel 0 - Completed -->
<div class="tab-pane active" id="completed" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:scroll">
<div class="card-columns" style="padding-top:10px">
<div class="card">
<div class="card-block order-completed">
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
<p class="card-text">Well Done, Fries, Salad</p>
<p class="card-text">
<small class="text-muted">Order at 12:23, Kyaw Lwin</small> |
<small class="text-muted">Printed at 12:23</small> |
<small class="text-muted">Completed at 12:43</small>
</p>
</div>
</div>
<!-- <div class="card">
<div class="card-block order-void">
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
<p class="card-text">Well Done, Fries, Salad</p>
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
</div>
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
<p class="card-text">Well Done, Fries, Salad</p>
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
</div>
</div> -->
<div class="tab-pane active" id="completed" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@queue_completed_item.each do |qid|
%>
<div class="card queue_station">
<div class="card-block">
<h4 class="card-title">
<span class="order-zone">
<%= qid.zone %>
</span> -
<span class="order-item">
<%= qid.item_name %>
</span> [x
<span class="order-qty">
<%= qid.qty %>
</span> ]
</h4>
<p class="card-text">Medium, Fries, Salad</p>
<p class="card-text">
<small class="text-muted">Order at
<span class="order-at">
<%= qid.created_at.strftime("%Y %m %d") %>
</span> -
<span class="order-by">
<%= qid.item_order_by %>
</span>
</small>
</p>
<p class="hidden order-customer"><%= qid.customer_name %></p>
<p class="hidden assigned-order-item"><%= qid.id %></p>
</div>
<!-- <div class="card-footer">
<button id=<%= 'assigned_queue_' + qid.id.to_s %> class="btn btn-primary btn-lg btn-block order-complete">COMPLETE</button>
</div> -->
</div>
<%
end
%>
</div>
</div>
<!-- End Panel 0 - Completed -->
<%
@queue_stations.each do |que|
<!-- Order Item for Queue Station -->
<%
@queue_stations_items.each do |qsi|
%>
<!-- Generated Pane -->
<div class="tab-pane" id=<%= que.station_name %> role="tabpanel">
<div class="tab-pane" id=<%= qsi[:station_name].gsub(' ', '_') %> role="tabpanel">
<!--- Order Items -->
<div class="card-columns" style="padding-top:10px">
<%
if @queue_items_details[:station_name] == que.station_name
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@queue_items_details.each do |qid|
if qid.station_name == qsi[:station_name]
%>
<div class="card queue_station">
<div class="card-block">
<h4 class="card-title"><%= @queue_items_details[:zone] + ' ' + @queue_items_details[:item_name] + ' [x' + @queue_items_details[:qty].to_s + ']' %></h4>
<h4 class="card-title">
<span class="order-zone">
<%= qid.zone %>
</span> -
<span class="order-item">
<%= qid.item_name %>
</span> [x
<span class="order-qty">
<%= qid.qty %>
</span> ]
</h4>
<p class="card-text">Medium, Fries, Salad</p>
<p class="card-text">
<small class="text-muted">Order at
<span class="order-at">
<%= @queue_items_details[:created_at] %>
<%= qid.created_at.strftime("%Y %m %d") %>
</span> -
<span class="order-by">
<%= @queue_items_details[:item_order_by] %>
<%= qid.item_order_by %>
</span>
</small>
</p>
<p class="hidden order-customer"><%= @queue_items_details[:customer] %></p>
<!-- Hidden Fields for Items -->
<p class="hidden order-customer"><%= qid.customer_name %></p>
<p class="hidden assigned-order-item"><%= qid.id %></p>
</div>
<div class="card-footer">
<button id="#id" class="btn btn-primary btn-lg btn-block">COMPLETE</button>
<button id=<%= 'assigned_queue_' + qid.id.to_s %> class="btn btn-primary btn-lg btn-block order-complete">COMPLETE</button>
</div>
</div>
<%
end
end
%>
@@ -93,17 +127,16 @@
</div>
</div>
<!-- end of Pane -->
<% end %>
<% end %>
<!-- End Order Item for Queue Station -->
</div>
</div>
<!-- Column Two -->
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="card" >
<div class="card-header">
<div id="order-title"><strong>ORDER DETAILS</strong> - </div>
<div><strong id="order-title">ORDER DETAILS -</strong></div>
</div>
<div class="card-block">
<div class="card-title">
@@ -117,28 +150,26 @@
</thead>
<tbody>
<tr>
<td id="order-by" style="width:33%; text-align:left">Kyaw Lwin</td>
<td id="order-at" style="width:33%; text-align:right">20/04/17 9:30PM</td>
<td id="order-customer" style="width:33%; text-align:right">John Smith</td>
<td id="order-by" style="width:33%; text-align:left"></td>
<td id="order-at" style="width:33%; text-align:right"></td>
<td id="order-customer" style="width:33%; text-align:right"></td>
</tr>
<tr>
<td><strong>Table/Room</strong></td>
<td id="order-from" colspan="2"></td>
</tr>
</tbody>
</table>
</table>
</div>
<div class="card-text" style="min-height:400px; max-height:400px; overflow:auto">
<table class="table">
<thead>
<tr>
<th style="width:80%; text-align:left">Items</th>
<th style="width:20%; text-align:right">QTY</td>
<th style="width:20%; text-align:right">QTY</th>
</tr>
</thead>
</table>
</div>
<div class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
<table class="table">
<tbody>
<tbody>
<tr>
<td id="order-items" style="width:80%; text-align:left">
<!-- Menu Items Name <br/>
@@ -157,11 +188,13 @@
</div>
</div>
</div>
<!-- Column Three--->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- OQS Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button>
<button type="button" title="Print Order Item" id="print_order_item" class="btn btn-primary btn-lg btn-block">Print</a>
<button type="button" class="btn btn-primary btn-lg btn-block" id="print_order_item" disabled>Print <br/>Order<br/>Summary</button>
</div>
</div>

2
app/views/oqs/print/print.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>Oqs::Print#print</h1>
<p>Find me in app/views/oqs/print/print.html.erb</p>

44
app/views/origami/home/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-8">
<!-- Column One -->
@@ -22,15 +22,15 @@
<div class="tab-pane active" id="tables" role="tabpanel">
<!--- Booking Items -->
<div class="card-columns" style="padding-top:10px">
<% @order_table.each do |order_table| %>
<div class="card" id="table-order-<%=order_table.order_id%>" onclick="callOrderDetails('<%=order_table.order_id%>')">
<div class="card-block">
<h4 class="card-title"><span id="table-name-<%=order_table.order_id%>" class="table-name"><%=order_table.table_name%></span></h4>
<p class="card-text"><%=order_table.total_price%></p>
<% if @order_table %>
<% @order_table.each do |order_table| %>
<div class="card" id="table-order-<%=order_table.order_id%>" onclick="callOrderDetails('<%=order_table.order_id%>')">
<div class="card-block">
<h4 class="card-title"><span id="table-name-<%=order_table.order_id%>" class="table-name"><%=order_table.table_name%></span></h4>
<p class="card-text"><%=order_table.total_price%></p>
</div>
</div>
</div>
<%end %>
<%end %>
</div>
@@ -136,32 +136,36 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button> -->
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">
Req.Bill
</button>
<!-- Cashier Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>
</div>
<script>
var old_order_id = 0
var old_table_name = ""
function callOrderDetails(order_id){
var old_table_name = ""
var table_or_order_id = 0
function callOrderDetails(order_id){
table_or_order_id = order_id
$("#test").html(order_id)
var tbody = ""
$("#append-table").html("")
if (old_order_id != order_id){
$("#table-order-"+old_order_id).removeClass("selected_color")
$("#table-order-"+order_id).addClass("selected_color")
old_order_id = order_id
old_order_id = order_id
}
$("#order-detail-header").html("")
$("#order-detail-header").append(document.getElementById("table-name-"+order_id).innerHTML)
$("#sub-total").html("")
url = "origami/"+order_id
url = "origami/"+order_id
$.ajax({type: "GET",
url: url,
data: { order_id: order_id},
@@ -190,6 +194,12 @@ function callOrderDetails(order_id){
});
}
$( document ).ready(function() {
$('#request_bills').click(function() {
window.location.href = '/origami/request_bills/'+table_or_order_id;
return false;
});
});
</script>
<style type="text/css">
.selected_color{

69
app/views/origami/request_bills/show.html.erb Normal file
View File

@@ -0,0 +1,69 @@
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-3">
<div class="card" >
<div class="card-header">
<div id="order-title">
<span><strong>Receipt No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
</div>
</div>
<div class="card-block">
<div class="card-title">
<table class="table">
<thead>
<tr>
<th style="width:60%; text-align:left">Items</th>
<th style="width:20%; text-align:right">QTY</td>
<th style="width:20%; text-align:right">Price</td>
</tr>
</thead>
</table>
</div>
<div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
<table class="table" id="append-table">
<tbody>
<% sub_total = 0 %>
<% if @sale_items %>
<% @sale_items.each do |sale_item| %>
<% sub_total += sale_item.qty*sale_item.unit_price%>
<tr>
<td style="width:60%; text-align:left">
<span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
</td>
<td style="width:20%; text-align:right">
<span id="item-qty"><%=sale_item.qty%></span>
</td>
<td style="width:20%; text-align:right">
<span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
</td>
</tr>
<%end %>
<%end %>
</tbody>
</table>
</div>
<div class="card-footer">
<table class="table" style="margin-bottom:0px">
<tfooter>
<tr>
<td style="width:80%; text-align:left; border-top:none"><strong>Sub Total</strong></td>
<td style="width:20%; text-align:right; border-top:none"><strong><span id="sub-total"><%=sub_total%></span></strong></td>
</tr>
<tr>
<td style="width:80%; text-align:left; border-top:none"><strong>(Discount)</strong></td>
<td style="width:20%; text-align:right; border-top:none"><strong><span>(<%=@sale_data.total_discount%>)</span></strong></td>
</tr>
<td style="width:80%; text-align:left; border-top:none"><strong>Tax</strong></td>
<td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.total_tax%></span></strong></td>
</tr>
<td style="width:80%; text-align:left; border-top:none"><strong>Grand Total</strong></td>
<td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.grand_total%></span></strong></td>
</tr>
</tfooter>
</table>
</div>
</div>
</div>
</div>
</div>

22
app/views/print_settings/_form.html.erb Normal file
View File

@@ -0,0 +1,22 @@
<%= simple_form_for(@print_setting) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<%= f.input :name %>
<%= f.input :unique_code %>
<%= f.input :template %>
<%= f.input :db_name %>
<%= f.input :db_type %>
<%= f.input :db_username %>
<%= f.input :db_password %>
<%= f.input :printer_name %>
<%= f.input :api_settings %>
<%= f.input :page_width %>
<%= f.input :page_height %>
<%= f.input :print_copies %>
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/print_settings/_print_setting.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! print_setting, :id, :name,, :unique_code,, :template,, :db_name,, :db_type,, :db_username,, :db_password,, :printer_name,, :api_settings,, :page_width, :page_height, :print_copies, :created_at, :updated_at
json.url print_setting_url(print_setting, format: :json)

6
app/views/print_settings/edit.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<h1>Editing Print Setting</h1>
<%= render 'form', print_setting: @print_setting %>
<%= link_to 'Show', @print_setting %> |
<%= link_to 'Back', print_settings_path %>

49
app/views/print_settings/index.html.erb Normal file
View File

@@ -0,0 +1,49 @@
<p id="notice"><%= notice %></p>
<h1>Print Settings</h1>
<table>
<thead>
<tr>
<th>Name</th>
<th>Unique code</th>
<th>Template</th>
<th>Db name</th>
<th>Db type</th>
<th>Db username</th>
<th>Db password</th>
<th>Printer name</th>
<th>Api settings</th>
<th>Page width</th>
<th>Page height</th>
<th>Print copies</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @print_settings.each do |print_setting| %>
<tr>
<td><%= print_setting.name %></td>
<td><%= print_setting.unique_code %></td>
<td><%= print_setting.template %></td>
<td><%= print_setting.db_name %></td>
<td><%= print_setting.db_type %></td>
<td><%= print_setting.db_username %></td>
<td><%= print_setting.db_password %></td>
<td><%= print_setting.printer_name %></td>
<td><%= print_setting.api_settings %></td>
<td><%= print_setting.page_width %></td>
<td><%= print_setting.page_height %></td>
<td><%= print_setting.print_copies %></td>
<td><%= link_to 'Show', print_setting %></td>
<td><%= link_to 'Edit', edit_print_setting_path(print_setting) %></td>
<td><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<%= link_to 'New Print Setting', new_print_setting_path %>

1
app/views/print_settings/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @print_settings, partial: 'print_settings/print_setting', as: :print_setting

5
app/views/print_settings/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New Print Setting</h1>
<%= render 'form', print_setting: @print_setting %>
<%= link_to 'Back', print_settings_path %>

64
app/views/print_settings/show.html.erb Normal file
View File

@@ -0,0 +1,64 @@
<p id="notice"><%= notice %></p>
<p>
<strong>Name:</strong>
<%= @print_setting.name %>
</p>
<p>
<strong>Unique code:</strong>
<%= @print_setting.unique_code %>
</p>
<p>
<strong>Template:</strong>
<%= @print_setting.template %>
</p>
<p>
<strong>Db name:</strong>
<%= @print_setting.db_name %>
</p>
<p>
<strong>Db type:</strong>
<%= @print_setting.db_type %>
</p>
<p>
<strong>Db username:</strong>
<%= @print_setting.db_username %>
</p>
<p>
<strong>Db password:</strong>
<%= @print_setting.db_password %>
</p>
<p>
<strong>Printer name:</strong>
<%= @print_setting.printer_name %>
</p>
<p>
<strong>Api settings:</strong>
<%= @print_setting.api_settings %>
</p>
<p>
<strong>Page width:</strong>
<%= @print_setting.page_width %>
</p>
<p>
<strong>Page height:</strong>
<%= @print_setting.page_height %>
</p>
<p>
<strong>Print copies:</strong>
<%= @print_setting.print_copies %>
</p>
<%= link_to 'Edit', edit_print_setting_path(@print_setting) %> |
<%= link_to 'Back', print_settings_path %>

1
app/views/print_settings/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "print_settings/print_setting", print_setting: @print_setting

14
app/views/settings/accounts/_form.html.erb Normal file
View File

@@ -0,0 +1,14 @@
<%= simple_form_for([:settings,@settings_account]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<%= f.input :title %>
<%= f.input :account_type, :collection => Lookup.collection_of("account_type") %>
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/settings/accounts/_settings_account.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! settings_account, :id, :title, :account_type, :created_at, :updated_at
json.url settings_account_url(settings_account, format: :json)

10
app/views/settings/accounts/edit.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_accounts_path %>">Account</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_account: @settings_account %>
</div>

40
app/views/settings/accounts/index.html.erb Normal file
View File

@@ -0,0 +1,40 @@
<%= link_to 'New Settings Account', new_settings_account_path %>
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Account</li>
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_account_path,:class => 'btn btn-primary btn-sm' %>
</span>
</ul>
</div>
<br>
<div class="card">
<table class="table table-striped">
<thead>
<tr>
<th style="width:40%">Title</th>
<th style="width:40%">Account Type</th>
<th style="width:20%">Action</th>
</tr>
</thead>
<tbody>
<% @settings_accounts.each do |account| %>
<tr>
<td><%= account.title %></td>
<td><%= account.account_type %></td>
<td>
<%= link_to 'Edit', edit_settings_account_path(account) %> |
<%= link_to 'Destroy', settings_account_path(account), method: :delete, data: { confirm: 'Are you sure?' } %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>

1
app/views/settings/accounts/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @settings_accounts, partial: 'settings_accounts/settings_account', as: :settings_account

11
app/views/settings/accounts/new.html.erb Normal file
View File

@@ -0,0 +1,11 @@
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_accounts_path %>">Account</a></li>
<li>New</li>
</ul>
</div>
<%= render 'form', settings_account: @settings_account %>
</div>

49
app/views/settings/accounts/show.html.erb Normal file
View File

@@ -0,0 +1,49 @@
<p id="notice"><%= notice %></p>
<p>
<strong>Title:</strong>
<%= @settings_account.title %>
</p>
<p>
<strong>Account type:</strong>
<%= @settings_account.account_type %>
</p>
<%= link_to 'Edit', %> |
<%= link_to 'Back', settings_accounts_path %>
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Account</li>
<span style="float: right">
</span>
</ul>
</div>
<br/>
<div class="card">
<div class="card-block">
<h4 class="card-title">Account</h4>
<table class="table">
<thead>
<tr>
<th>Title</th>
<th>Account type</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= @settings_account.title %></td>
<td><%= @settings_account.account_type %></td>
<td><%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account) %></td>
</tr>
</tbody>
</table>
</div>
</div>

1
app/views/settings/accounts/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "settings_accounts/settings_account", settings_account: @settings_account

7
app/views/settings/menu_categories/show.html.erb
View File

@@ -70,10 +70,15 @@
<td><%= settings_menu_item.parent.name rescue "-" %></td>
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>

2
app/views/settings/menu_item_attributes/show.html.erb
View File

@@ -2,7 +2,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li><a href="<%= settings_menu_item_attributes_path %>">Menu Item Attributes</a></li>
<li>Menu Item Attribute</li>
<span style="float: right">
</span>

18
app/views/settings/menu_item_instances/_form.html.erb Normal file
View File

@@ -0,0 +1,18 @@
<%= simple_form_for([:settings,:menu_item, @settings_menu_item_instance]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<%= f.input :item_instance_code %>
<%= f.input :item_instance_name %>
<%= f.input :price %>
<%= f.input :is_on_promotion %>
<%= f.input :promotion_price %>
<%= f.input :is_available %>
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/settings/menu_item_instances/_settings_menu_item.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! settings_menu_item, :id, :item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by, :created_at, :updated_at
json.url settings_menu_item_url(settings_menu_item, format: :json)

12
app/views/settings/menu_item_instances/edit.html.erb Normal file
View File

@@ -0,0 +1,12 @@
<!-- <h1>Editing Settings Menu Item</h1>-->
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_set_menu_item: @settings_menu_item %>
</div>

93
app/views/settings/menu_item_instances/index.html.erb Normal file
View File

@@ -0,0 +1,93 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
<li>Menu Items</li>
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span>
</ul>
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Category</h4>
<table class="table">
<thead>
<tr>
<th>Menu</th>
<th>Name</th>
<th>Alt name</th>
<th>Order by</th>
<th>Parent</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<tr>
<td><%= @category.menu.name %></td>
<td><%= @category.name %></td>
<td><%= @category.alt_name %></td>
<td><%= @category.order_by %></td>
<td><%= @category.parent.name rescue "-" %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_path(@category) %></td>
</tr>
</tbody>
</table>
</div>
</div>
<br/>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Items
<span style="float: right">
<%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
<%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Parent Item</th>
<th>Created by</th>
<th>Created at</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @settings_menu_items.each do |settings_menu_item| %>
<tr>
<td><%= settings_menu_item.item_code %></td>
<td><%= settings_menu_item.name %></td>
<td><%= settings_menu_item.alt_name %></td>
<td><%= settings_menu_item.type %></td>
<td><%= settings_menu_item.parent.name rescue "-" %></td>
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %>

1
app/views/settings/menu_item_instances/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @settings_menu_items, partial: 'settings_menu_items/settings_menu_item', as: :settings_menu_item

17
app/views/settings/menu_item_instances/new.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<!-- <h1>New Settings Menu Item</h1>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= link_to 'Back', settings_menu_items_path %> -->
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= %>">Menu Item</a></li>
<li>New Menu Item Instance</li>
</ul>
</div>
<%= render 'form', settings_set_menu_instance: @settings_menu_item_instance %>
</div>

96
app/views/settings/menu_item_instances/show.html.erb Normal file
View File

@@ -0,0 +1,96 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>Menu Item</li>
<span style="float: right">
</span>
</ul>
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Item </h4>
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Menu category</th>
<th>Menu item</th>
<th>Min qty</th>
<th>Min selectable item</th>
<th>Max selectable item</th>
<th>Created At</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= @settings_menu_item.item_code %></td>
<td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td>
<td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.menu_item_id %></td>
<td><%= @settings_menu_item.min_qty %></td>
<td><%= @settings_menu_item.min_selectable_item %></td>
<td><%= @settings_menu_item.max_selectable_item %></td>
<td><%=l @settings_menu_item.created_at, format: :short %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %></td>
</tr>
</tbody>
</table>
</div>
</div>
<br>
<div class="card">
<div class="card-block">
<h4 class="card-title">Sub Menu Items </h4>
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Parent Item</th>
<th>Created by</th>
<th>Created at</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @sub_menu.each do |settings_menu_item| %>
<tr>
<td><%= settings_menu_item.item_code %></td>
<td><%= settings_menu_item.name %></td>
<td><%= settings_menu_item.alt_name %></td>
<td><%= settings_menu_item.type %></td>
<td><%= settings_menu_item.parent.name rescue "-" %></td>
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<%= paginate @sub_menu, param_name: :page, :outer_window => 3 %>
</div>

1
app/views/settings/menu_item_instances/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "settings_menu_items/settings_menu_item", settings_menu_item: @settings_menu_item

2
app/views/settings/menu_item_options/edit.html.erb
View File

@@ -4,7 +4,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_items_path %>">Menu Item Options</a></li>
<li><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li>
<li>Edit</li>
</ul>
</div>

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

@@ -1,6 +1,14 @@
<h1>Editing Settings Order Queue Station</h1>
<!-- <h1>Editing Settings Order Queue Station</h1>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %> -->
<%= link_to 'Show', @settings_order_queue_station %> |
<%= link_to 'Back', settings_order_queue_stations_path %>
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>
</div>

8
app/views/settings/order_queue_stations/show.html.erb
View File

@@ -1,3 +1,11 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
<li>Order Queue Station</li>
</ul>
</div>
<p id="notice"><%= notice %></p>
<p>

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

@@ -29,7 +29,9 @@
</div>
<% end %>
</div>
<br>
<div class="form-actions">
<%= f.button :submit, label: "Add Menu Items to Queue Station" %>
</div>
<br>
<% end %>

11
app/views/settings/set_menu_items/edit.html.erb
View File

@@ -1,17 +1,12 @@
<!-- <h1>Editing Settings Menu Item</h1>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= link_to 'Show', @settings_menu_item %> |
<%= link_to 'Back', settings_menu_items_path %> -->
<!-- <h1>Editing Settings Menu Item</h1>-->
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@cattegory) %>">Menu Category</a></li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= render 'form', settings_set_menu_item: @settings_menu_item %>
</div>

22
app/views/settings/set_menu_items/index.html.erb
View File

@@ -5,7 +5,7 @@
<li>Menu Items</li>
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span>
</ul>
</div>
@@ -40,7 +40,13 @@
<br/>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Items</h4>
<h4 class="card-title">Menu Items
<span style="float: right">
<%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
<%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
<table class="table">
<thead>
<tr>
@@ -67,9 +73,15 @@
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<td><%= link_to 'Show', settings_menu_category_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>

2
app/views/settings/set_menu_items/new.html.erb
View File

@@ -13,5 +13,5 @@
<li>New</li>
</ul>
</div>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= render 'form', settings_set_menu_item: @settings_menu_item %>
</div>

54
app/views/settings/set_menu_items/show.html.erb
View File

@@ -9,7 +9,6 @@
</ul>
</div>
<br/>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Item </h4>
@@ -36,17 +35,62 @@
<td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td>
<td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.menu_category %></td>
<td><%= @settings_menu_item.menu_item %></td>
<td><%= @settings_menu_item.menu_qty %></td>
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.menu_item_id %></td>
<td><%= @settings_menu_item.min_qty %></td>
<td><%= @settings_menu_item.min_selectable_item %></td>
<td><%= @settings_menu_item.max_selectable_item %></td>
<td><%=l @settings_menu_item.created_at, format: :short %></td>
<td><%= link_to 'Edit', edit_settings_menu_menu_item_path(@settings_menu_category, @settings_menu_category) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %></td>
</tr>
</tbody>
</table>
</div>
</div>
<br>
<div class="card">
<div class="card-block">
<h4 class="card-title">Sub Menu Items </h4>
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Parent Item</th>
<th>Created by</th>
<th>Created at</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @sub_menu.each do |settings_menu_item| %>
<tr>
<td><%= settings_menu_item.item_code %></td>
<td><%= settings_menu_item.name %></td>
<td><%= settings_menu_item.alt_name %></td>
<td><%= settings_menu_item.type %></td>
<td><%= settings_menu_item.parent.name rescue "-" %></td>
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<%= paginate @sub_menu, param_name: :page, :outer_window => 3 %>
</div>

1
app/views/settings/simple_menu_items/_form.html.erb
View File

@@ -5,6 +5,7 @@
<%= f.input :item_code %>
<%= f.input :name %>
<%= f.input :alt_name %>
<%= f.input :type %>
<%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
<%= f.input :min_qty %>
<%= f.input :min_selectable_item %>

6
app/views/settings/simple_menu_items/index.html.erb
View File

@@ -72,9 +72,15 @@
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>

87
app/views/settings/simple_menu_items/show.html.erb
View File

@@ -9,7 +9,6 @@
</ul>
</div>
<br/>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Item </h4>
@@ -48,5 +47,91 @@
</table>
</div>
</div>
<br>
<div class="card">
<div class="card-block">
<h4 class="card-title">Sub Menu Items </h4>
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Parent Item</th>
<th>Created by</th>
<th>Created at</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @sub_menu.each do |settings_menu_item| %>
<tr>
<td><%= settings_menu_item.item_code %></td>
<td><%= settings_menu_item.name %></td>
<td><%= settings_menu_item.alt_name %></td>
<td><%= settings_menu_item.type %></td>
<td><%= settings_menu_item.parent.name rescue "-" %></td>
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% else %>
<td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<%= paginate @sub_menu, param_name: :page, :outer_window => 3 %>
<br>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Item Instances
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
<table class="table">
<thead>
<tr>
<th>Menu Item Id</th>
<th>item_instance_code</th>
<th>item_attributes</th>
<th>price</th>
<th>is_on_promotion</th>
<th>promotion_price</th>
<th>Created at</th>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @menu_item_instance.each do |settings_menu_item| %>
<tr>
<td><%= settings_menu_item.menu_item_id %></td>
<td><%= settings_menu_item.item_instance_code %></td>
<td><%= settings_menu_item.item_attributes %></td>
<td><%= settings_menu_item.price %></td>
<td><%= settings_menu_item.is_on_promotion %></td>
<td><%= settings_menu_item.promotion_price %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</div>

3
config/application.rb
View File

@@ -14,5 +14,8 @@ module SXRestaurants
config.active_record.time_zone_aware_types = [:datetime, :time]
config.active_job.queue_adapter = :sidekiq
# config.generators do |g|
# g.orm :active_record, primary_key_type: :uuid
# end
end
end

18
config/routes.rb
View File

@@ -38,10 +38,14 @@ Rails.application.routes.draw do
post "bill/:booking_id" => "bill#create"
post "move" => "move#create"
#Order Controller
resources :orders, only: [:create, :show, :update] do
post "bill" => "bill#create"
end
#Current active bookings
resources :bookings, only: [:index, :show, :create, :update]
resources :customers, only: [:index, :show, :create, :update]
@@ -68,10 +72,9 @@ Rails.application.routes.draw do
resources :discounts, only: [:index,:new, :create ] #add discount type
resources :customers, only: [:index,:new, :create ] #add customer type
end
resources :request_bills, only: [:show]
end
#--------- Waiter/Ordering Station ------------#
namespace :oishi do
#zones
@@ -86,12 +89,17 @@ Rails.application.routes.draw do
resources :customers
#membership
#bookings
post "update_booking" , to: "bookings#update_booking", as: "update_booking"
#queue
end
#--------- Order Queue Station ------------#
namespace :oqs do
root "home#index"
post 'update_delivery', to: "home#update_delivery_status"
get 'print/print/:id', to: "print#print"
#dashboard
#
end
@@ -106,6 +114,9 @@ Rails.application.routes.draw do
resources :menu_categories, only: [:new, :create, :edit]
end
#accounts
resources :accounts
resources :menu_categories do
#menu_items
#resources :menu_items
@@ -174,7 +185,8 @@ Rails.application.routes.draw do
# end
# end
#----------- Print Setup --------#
resources :print_settings
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end

2
db/migrate/20170403163734_create_sale_payments.rb
View File

@@ -7,7 +7,7 @@ class CreateSalePayments < ActiveRecord::Migration[5.0]
t.decimal :outstanding_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :payment_reference
t.string :payment_status, :null => false, :default => "new"
t.timestamps
end
end

1
db/migrate/20170408105938_create_seed_generators.rb
View File

@@ -5,7 +5,6 @@ class CreateSeedGenerators < ActiveRecord::Migration[5.0]
t.integer :increase_by, :null => false, :default => 1
t.bigint :current, :null => false ,:default => 1
t.bigint :next, :null => false, :default => 2
t.timestamps
end
end

25
db/migrate/20170530072247_create_shops.rb Normal file
View File

@@ -0,0 +1,25 @@
class CreateShops < ActiveRecord::Migration[5.1]
def change
create_table :shops do |t|
t.string :logo
t.string :name, :null => false
t.string :address, :null => false
t.string :township, :null => false
t.string :city, :null => false
t.string :state, :null => false
t.string :country, :null => false
t.string :phone_no, :null => false
t.string :reserviation_no, :null => false
t.string :license, :null => false
t.datetime :activated_at, :null => false
t.text :license_data, :null => false
t.string :base_currency, :null => false, :limit => 3
t.string :cloud_url
t.string :cloud_token
t.string :owner_token
t.string :id_prefix, :null => false, :limit => 3
t.timestamps
end
end
end

20
db/migrate/20170602093159_create_print_settings.rb Normal file
View File

@@ -0,0 +1,20 @@
class CreatePrintSettings < ActiveRecord::Migration[5.1]
def change
create_table :print_settings do |t|
t.string :name, :null => false
t.string :unique_code, :null => false
t.string :template, :null => false
t.string :db_name, :null => false
t.string :db_type, :null => false
t.string :db_username, :null => false
t.string :db_password
t.string :printer_name, :null => false
t.string :api_settings
t.decimal :page_width, :null => false, :default => 200
t.decimal :page_height, :null => false, :default => 800
t.integer :print_copies, :null => false, :default => 1
t.timestamps
end
end
end

Some files were not shown because too many files have changed in this diff Show More