From 2d55ea0dab7556f28f81b5a3df8d96bb6dc4296a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 7 Jul 2017 09:56:18 +0630 Subject: [PATCH 001/246] update add order --- .../javascripts/origami/addorders.coffee | 3 + app/assets/stylesheets/origami.scss | 1 + app/assets/stylesheets/origami/addorders.scss | 3 + .../origami/addorders_controller.rb | 21 ++++ app/helpers/origami/addorders_helper.rb | 2 + app/views/origami/addorders/index.html.erb | 108 ++++++++++++++++++ app/views/origami/addorders/show.html.erb | 30 +++++ app/views/origami/home/show.html.erb | 8 +- config/routes.rb | 2 + .../origami/addorders_controller_spec.rb | 5 + spec/helpers/origami/addorders_helper_spec.rb | 15 +++ 11 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/origami/addorders.coffee create mode 100644 app/assets/stylesheets/origami/addorders.scss create mode 100644 app/controllers/origami/addorders_controller.rb create mode 100644 app/helpers/origami/addorders_helper.rb create mode 100644 app/views/origami/addorders/index.html.erb create mode 100644 app/views/origami/addorders/show.html.erb create mode 100644 spec/controllers/origami/addorders_controller_spec.rb create mode 100644 spec/helpers/origami/addorders_helper_spec.rb diff --git a/app/assets/javascripts/origami/addorders.coffee b/app/assets/javascripts/origami/addorders.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/addorders.coffee @@ -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/ diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 7935b50e..1f195ba5 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -211,3 +211,4 @@ tr.discount-item-row:hover { margin-left:-40px !important; margin-top:-40px !important; } + diff --git a/app/assets/stylesheets/origami/addorders.scss b/app/assets/stylesheets/origami/addorders.scss new file mode 100644 index 00000000..f45d06f3 --- /dev/null +++ b/app/assets/stylesheets/origami/addorders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/addorders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb new file mode 100644 index 00000000..68a15c71 --- /dev/null +++ b/app/controllers/origami/addorders_controller.rb @@ -0,0 +1,21 @@ +class Origami::AddordersController < BaseOrigamiController + before_action :set_dining, only: [:show] + + def index + @tables = Table.all.active.order('zone_id asc').group("zone_id") + @rooms = Room.all.active.order('zone_id asc').group("zone_id") + @all_table = Table.all.active.order('status desc') + @all_room = Room.all.active.order('status desc') + end + + def show + @menu = MenuCategory.all + end + + private + + def set_dining + @dining = DiningFacility.find(params[:id]) + end + +end diff --git a/app/helpers/origami/addorders_helper.rb b/app/helpers/origami/addorders_helper.rb new file mode 100644 index 00000000..c90e5344 --- /dev/null +++ b/app/helpers/origami/addorders_helper.rb @@ -0,0 +1,2 @@ +module Origami::AddordersHelper +end diff --git a/app/views/origami/addorders/index.html.erb b/app/views/origami/addorders/index.html.erb new file mode 100644 index 00000000..50e52d3e --- /dev/null +++ b/app/views/origami/addorders/index.html.erb @@ -0,0 +1,108 @@ +
+
+ +
+ +
+ <% @tables.each do |zone| %> +

Zone : <%=zone.zone.name%>

+
+ + <% @all_table.each do |table| %> + <% if zone.zone_id == table.zone_id %> +
" data-id = "<%= table.id %>"> +
+ +

<%= table.name %>

+

Seat : <%= table.seater %>

+
+
+ <% end %> <% end %> +
+ <% end %> +
+ +
+ <% @rooms.each do |zone| %> +

Zone : <%=zone.zone.name%>

+
+ + <% @all_room.each do |room| %> + <% if zone.zone_id == room.zone_id %> +
" data-id = "<%= room.id %>"> +
+ +

<%= room.name %>

+

Seat : <%= room.seater %>

+
+
+ <% end %> <% end %> +
+ <% end %> +
+ +
+
+ +
+ +
+
+ + diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb new file mode 100644 index 00000000..1a2e7b8b --- /dev/null +++ b/app/views/origami/addorders/show.html.erb @@ -0,0 +1,30 @@ +
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8b613409..cb18971c 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -302,7 +302,7 @@ <% if @status_order == 'order' && @status_sale != 'sale' %> - + @@ -312,7 +312,7 @@ <% else %> - + @@ -555,4 +555,8 @@ function show_customer_details(customer_id){ } }); + + $('#add_order').on('click',function(){ + window.location.href = '/origami/addorders'; + }); diff --git a/config/routes.rb b/config/routes.rb index 2b7db5eb..b04bed33 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -156,6 +156,8 @@ Rails.application.routes.draw do get '/:sale_id/customers', to: "customers#add_customer" get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details" post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer" # update customer id in sale table + + resources :addorders end #--------- Waiter/Ordering Station ------------# diff --git a/spec/controllers/origami/addorders_controller_spec.rb b/spec/controllers/origami/addorders_controller_spec.rb new file mode 100644 index 00000000..9e0643ad --- /dev/null +++ b/spec/controllers/origami/addorders_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::AddordersController, type: :controller do + +end diff --git a/spec/helpers/origami/addorders_helper_spec.rb b/spec/helpers/origami/addorders_helper_spec.rb new file mode 100644 index 00000000..f9ea7bcf --- /dev/null +++ b/spec/helpers/origami/addorders_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::AddordersHelper. For example: +# +# describe Origami::AddordersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::AddordersHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From d99ed58d28b7f7f1a527e7ea2a7cb9c94f4627da Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 9 Jul 2017 21:00:33 +0630 Subject: [PATCH 002/246] update view --- app/views/origami/addorders/show.html.erb | 16 ++++++++++++++-- app/views/origami/home/show.html.erb | 4 +++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 1a2e7b8b..98055c46 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -4,7 +4,7 @@ -
- -
- +
+
+
ORDER DETAILS | Table 21
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + +
#ItemsPrice
1aaaaa x2name
+
+
+ + + + + + +
Sub Total:22222
+
+
+
+ + From a7cbea5dbb3d6f6c6c57ed8e6d655e2f425b9445 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 24 Jul 2017 17:42:34 +0630 Subject: [PATCH 004/246] update login To show dashboard screen with available features based on user type --- app/assets/javascripts/application.js | 131 ------------------------- app/controllers/crm/home_controller.rb | 14 +-- app/controllers/home_controller.rb | 14 ++- app/models/ability.rb | 18 +++- app/pdf/order_item_pdf.rb | 4 +- app/pdf/order_summary_pdf.rb | 8 +- app/views/home/index.html.erb | 125 ++++++++++++++++++++++- 7 files changed, 158 insertions(+), 156 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 63c871d9..9adb6b75 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -30,134 +30,3 @@ function export_to(path) var form_params = $("#frm_report").serialize(); window.location = path+"?"+ form_params; } - -/* -* ToDo Move to here from pages -* -* - - - -$(function(){ - $('#custom_excel').hide(); - - $('#custom_excel').click(function(){ - var url = $('#custom_excel').attr('data-url'); - $('#frm_report').attr('action',url) - $('#frm_report').submit(); - // window.location = url; - }); - - var item = $('#item').val(); - var payment_type = $('#payment_type'); - - if(item == 'order'){ - $('#cashier').hide(); - $('#waiter').show(); - if(payment_type){ - $('#payment_type').hide(); - } - } - else if(item == 'sale'){ - $('#waiter').hide(); - $('#cashier').show(); - } - else{ - $('#waiter').hide(); - $('#cashier').show(); - $("#item").val('sale'); - } -}); - -//Reset the form to pervious values -$("#branch").val(<%=params[:branch]%>); -$("#waiter").val("<%=params[:waiter]%>"); -$("#cashier").val(<%=params[:cashier]%>); -$("#product").val(<%=params[:product]%>); -$("#singer").val(<%=params[:singer]%>); -$("#item").val('<%=params[:item]%>'); -$("#guest_role").val('<%=params[:guest_role]%>'); - - -$("#from").val("<%=params[:from]%>"); -$("#to").val("<%=params[:to]%>"); -$("#sel_period").val(<%=params[:period]%>); -$("#sel_sale_type").val(<%=params[:sale_type]%>); - -<% if params[:period_type] == 1 || params[:period_type] == "1" %> - $("#rd_period_type_1").attr("checked","checked"); -<% else %> - $("#rd_period_type_0").attr("checked","checked"); -<% end %> -$(".btn-group button").removeClass("active"); -<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> -$("#btn_report_type_<%= report_type %>").addClass("active"); - -$('#item').change(function(){ - var item = $('#item').val(); - var payment_type = $('#payment_type'); - - if(item == 'sale'){ - $('#waiter').hide(); - $('#cashier').show(); - if(payment_type){ - $('#payment_type').show(); - } - } - else{ - $('#cashier').hide(); - $('#waiter').show(); - if(payment_type){ - $('#payment_type').hide(); - } - } -}); - -$(function(){ - var check_arr = []; - var search = '<%= params[:period_type] %>'; - if(search){ - if(parseInt(search) == 0){ - search_by_period(); - } - else{ - search_by_date(); - } - }else{ - search_by_period(); - } - $('#sel_period').change(function(){ - search_by_period(); - }); - function search_by_period(){ - var period = $('#sel_period').val(); - var period_type = 0; - var from = ""; - var to = ""; - } - - $('#from').change(function(){ - search_by_date(); - }); - - $('#to').change(function(){ - search_by_date(); - }); - function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); - var period = 0; - var period_type = 1; - if(to != '' && from != ''){ - shift_name = from + ',' + to; - check_arr.push(to); - // console.log(check_arr.length) - if(check_arr.length == 1){ - } - if(check_arr.length == 3){ - check_arr = []; - } - } - } -}); -*/ diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index d3934eef..012f2bc6 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -1,13 +1,13 @@ class Crm::HomeController < BaseCrmController def index - @booking = Booking.all - @customer = Customer.all - from = Time.now.beginning_of_day.utc - to = Time.now.end_of_day.utc - @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') - # redirect_to crm_customers_path - # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + @booking = Booking.all + @customer = Customer.all + from = Time.now.beginning_of_day.utc + to = Time.now.end_of_day.utc + @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') + redirect_to crm_customers_path + # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index fb42bfee..ead69f39 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -42,9 +42,12 @@ class HomeController < ApplicationController elsif @employee.role == "manager" session[:session_token] = @employee.token_session redirect_to dashboard_path - elsif @employee.role == "accountant" + elsif @employee.role == "supervisour" session[:session_token] = @employee.token_session - redirect_to dashboard_path + redirect_to origami_root_path + elsif @employee.role == "account" + session[:session_token] = @employee.token_session + redirect_to reports_dailysale_index_path else render :index end @@ -96,12 +99,15 @@ class HomeController < ApplicationController redirect_to new_origami_shift_path end elsif employee.role == "manager" - redirect_to oqs_root_path + redirect_to dashboard_path elsif employee.role == "waiter" redirect_to oqs_root_path elsif employee.role == "crm" redirect_to crm_root_path - + elsif @employee.role == "supervisour" + redirect_to origami_root_path + elsif @employee.role == "account" + redirect_to reports_dailysale_index_path end end end diff --git a/app/models/ability.rb b/app/models/ability.rb index f9d98bfc..368aa424 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -104,7 +104,7 @@ class Ability can :manage, DiningQueue - elsif user.role == "accountant" + elsif user.role == "account" can :index, :dailysale can :index, :saleitem @@ -113,11 +113,19 @@ class Ability elsif user.role == "supervisour" - can :index, :dailysale - can :index, :saleitem - can :index, :receipt_no - can :index, :shiftsale + can :edit, :sale_edit + can :item_void, :sale_edit + can :item_edit, :sale_edit + can :item_void_cancel, :sale_edit + can :cancel_all_void, :sale_edit + can :apply_void, :sale_edit + can :overall_void, :void + can :first_bill, :payment + can :create, :payment + can :show, :payment + can :reprint, :payment + can :rounding_adj, :payment end end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 546e8f82..61f5f0c2 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -6,7 +6,7 @@ class OrderItemPdf < Prawn::Document self.page_height = 1450 self.margin = 0 self.price_width = 40 # No Need for item - self.qty_width = 35 + self.qty_width = 40 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) self.item_height = 15 @@ -80,7 +80,7 @@ class OrderItemPdf < Prawn::Document text "#{order_item.item_name}", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width-4,y_position], :width => self.qty_width) do text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 6d530058..26a89476 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -68,8 +68,8 @@ class OrderSummaryPdf < Prawn::Document text "Item", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width-2,y_position], :width => self.qty_width, :height => self.item_height) do - text "Qty", :size => self.item_font_size,:align => :left + bounding_box([self.item_width-4,y_position], :width => self.qty_width, :height => self.item_height) do + text "Qty", :size => self.item_font_size,:align => :right end stroke_horizontal_rule @@ -96,8 +96,8 @@ class OrderSummaryPdf < Prawn::Document end - bounding_box([self.item_width,y_position], :width => self.qty_width) do - text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left + bounding_box([self.item_width-4,y_position], :width => self.qty_width) do + text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :right end bounding_box([0,y_position], :width => self.item_width) do diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 87bf3f50..ac20f446 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -24,8 +24,8 @@ -->
-
-
+
+
<% @employees.each do |employee| %> @@ -43,11 +43,111 @@
- <% end %> + <% end %>
+ +
+
+ + +
+
+
+

+ Administrator +

+
+
+
+
    +
  • All Accept
    • +
+
+
+
+
+
+

+ Manager +

+
+
+
+
    +
  • All Accept except Membership and Payment Settings
    • +
+
+
+
+
+
+

+ Supervisor +

+
+
+
+
    +
  • Void
    • +
  • FOC
    • +
  • Edit
    • +
  • Credit
    • +
  • and Payment
    • +
+
+
+
+
+
+

+ Cashier +

+
+
+
+
    +
  • Orgami Panel except Edit and Void
    • +
  • Sale and Order
    • +
  • and Queue in CRM
    • +
+
+
+
+
+
+

+ Accountant +

+
+
+
+
    +
  • Daily Sale Report
    • +
  • Sale Item Report
    • +
  • Receipt No Report
    • +
  • ShiftSale Report
    • +
+
+
+
+
+
+
+ + + + + + + + + From 9c4e5bbdc8c22a3aea093f28fdae237f765040fa Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 24 Jul 2017 19:25:31 +0630 Subject: [PATCH 005/246] update comertial tax and service in sale model --- .../reports/receipt_no_controller.rb | 2 +- app/models/sale.rb | 41 +++++++++++-------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index a69177bd..3ca19e9d 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -19,7 +19,7 @@ authorize_resource :class => false end payment_type = params[:payment_type] @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) - @sale_taxes = Sale.get_separate_tax(@shift,from,to,payment_type) + @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @from = from @to = to diff --git a/app/models/sale.rb b/app/models/sale.rb index 0e634d8f..324bb608 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,7 +617,17 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -def self.get_separate_tax(shift,from,to,payment_type) +# def self.get_separate_tax(from,to,payment_method=nil) + +# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") +# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") +# .group("sale_taxes.tax_name") +# .order("sale_taxes.sale_tax_id asc") + +# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +# end + +def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) if payment_type.blank? payment_type = '' @@ -629,28 +639,23 @@ def self.get_separate_tax(shift,from,to,payment_type) end end - query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") - .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") - .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .group("sale_taxes.tax_name") - .order("sale_taxes.sale_tax_id asc") - + puts "SSSSSSSSSSS" if shift.present? - query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .group("sale_taxes.tax_name") + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) else - query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to) + query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) + .group("sale_taxes.tax_name") end + end -# def self.get_separate_tax(from,to,payment_method=nil) - -# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") -# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") -# .group("sale_taxes.tax_name") - -# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) -# end - def grand_total_after_rounding return self.old_grand_total.to_f + self.rounding_adjustment.to_f end From 6e4228853addc883adefa9ff53f85971848efe23 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 24 Jul 2017 19:29:58 +0630 Subject: [PATCH 006/246] update comertial tax and service in sale model --- app/models/sale.rb | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 324bb608..11d67543 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,16 +617,6 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -# def self.get_separate_tax(from,to,payment_method=nil) - -# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") -# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") -# .group("sale_taxes.tax_name") -# .order("sale_taxes.sale_tax_id asc") - -# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) -# end - def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) if payment_type.blank? @@ -638,24 +628,45 @@ def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) payment_type = " and sale_payments.payment_method = '#{payment_type}'" end end - - puts "SSSSSSSSSSS" + if shift.present? query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") - .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) .group("sale_taxes.tax_name") - .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + .order("sale_taxes.sale_tax_id asc") else query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) .group("sale_taxes.tax_name") + .order("sale_taxes.sale_tax_id asc") end + # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + # .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") + # .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + # .group("sale_taxes.tax_name") + # .order("sale_taxes.sale_tax_id asc") + + # if shift.present? + # query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + # else + # query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to) + # end end +# def self.get_separate_tax(from,to,payment_method=nil) + +# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") +# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") +# .group("sale_taxes.tax_name") + +# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +# end + def grand_total_after_rounding return self.old_grand_total.to_f + self.rounding_adjustment.to_f end From d01ec184f59a4b00a57030702200c808898fa294 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 25 Jul 2017 09:53:25 +0630 Subject: [PATCH 007/246] edit merchant code for bitp --- db/seeds.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 504862a5..317194c1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -163,25 +163,25 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: " crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) -member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"}) From a135e220248b5e9deef92118313bdbaf80d58cc6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 25 Jul 2017 10:49:36 +0630 Subject: [PATCH 008/246] update wrong commercial tax and service tax and role features --- app/models/sale.rb | 6 +++--- app/views/home/index.html.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 11d67543..fc2a761b 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,7 +617,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) +def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) if payment_type.blank? payment_type = '' @@ -633,14 +633,14 @@ def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") else query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift_sale_range.to_a) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ac20f446..cf8729f3 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -49,7 +49,7 @@
- +

Role Features

From 3f0ecb5ac6273165f41013c120c72b2f4db54df1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 25 Jul 2017 12:21:05 +0630 Subject: [PATCH 009/246] update home view card column --- app/views/home/index.html.erb | 44 ++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index cf8729f3..0e046691 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -25,11 +25,11 @@
-->
-
+
<% @employees.each do |employee| %> -
+

@@ -140,12 +140,44 @@ .panel-body { padding: 5px !important; } - .card-columns { - column-count: 5; - } + /*.card-columns { + column-count: 4; + display: inline-block; + }*/ .panel-title .glyphicon { - float: right; + float: right; + } + @media (min-width: 34em) { + .card-columns { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + } + } + + @media (min-width: 48em) { + .card-columns { + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + } + } + + @media (min-width: 62em) { + .card-columns { + -webkit-column-count: 4; + -moz-column-count: 4; + column-count: 4; + } + } + + @media (min-width: 75em) { + .card-columns { + -webkit-column-count: 5; + -moz-column-count: 5; + column-count: 5; + } } + + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 92b37cf9..8281a16e 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -579,6 +579,6 @@ function show_customer_details(customer_id){ $('#add_order').on('click',function(){ var dining_id = "<%= @dining.id %>" - window.location.href = '/origami/addorders/'+dining_id; + window.location.href = '/origami/addorders/'+ dining_id; }); diff --git a/config/routes.rb b/config/routes.rb index e4723a22..310ae0f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,7 +30,7 @@ Rails.application.routes.draw do namespace :restaurant do get 'zones' => "zones#index" resources :menu, only:[:index, :show] - resources :menu_categories, only: [:index] + resources :menu_categories, only: [:index, :show] resources :menu_items, only: [:index, :show] resources :menu_item_attributes, only: [:index] resources :menu_item_options, only: [:index] From 50a878349d19b512de9dc5efd53997d4f99ca659 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 15:08:44 +0630 Subject: [PATCH 019/246] update add order --- app/assets/images/logo.png | Bin 0 -> 9424 bytes .../restaurant/menu_categories_controller.rb | 39 ++++++++++++++++ .../menu_categories/show.json.jbuilder | 43 ++++++++++++++++++ app/views/origami/addorders/show.html.erb | 4 +- public/image/logo.png | Bin 0 -> 9424 bytes 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/logo.png create mode 100644 app/controllers/api/restaurant/menu_categories_controller.rb create mode 100644 app/views/api/restaurant/menu_categories/show.json.jbuilder create mode 100644 public/image/logo.png diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..578d16f7b25ca4b60a4db70950c07c23d96c3ce3 GIT binary patch literal 9424 zcmV;>Brn^EP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000^LNklv@+@4R8j~2w1=-;1!_nSb7Ql7zZH^d<0ko z%mhvXCIL3k3cLwy237*A0r4InM}``KuK-s7;|jE^z-;*g@GW2~a4&G@Smqk_7zE>6 zQXGA`2pGj^Ch$-4+RwfR$jE6T@I3H+z#PFilY##R9(WIs!>5_RdSKxwj(H{UA`pHL zkm1od$r+Q6z}O3bXWs*4c=UUq;Rud@I&jx}R#tEYep-NjyMc#+*Q7P211HGI{uB@? zbNy1_m%ysge0W1sQBV-Wu(p*k>=@Pq`vUa)F7U6wKnW%OUEuR&#@Pu>8RKs2Y9-zu&9@ez&qGKRMO+^ex z3_nscR;{e_O0;zXw~k=!o65AG8ypNl$k3<^nXGQx!NYGikxZwliG&XejIj*J@g>?G z8sXS&zzZeX7X<|)Vi+jE>TNsN+|f93-VS_Q20U2MSZ8XfnH6_|=gA5Q4nP{rQ z%H}p+*|CSPu3_lvh{MTaQHN-_xs779V-)VuQKGGEoGfMGJ>&xT%yg!&Akr+V{2Cr zPi@^s*0u>7`Vj+TECaF%*j1wa2H?WO828&{9KV%7rxyyTiGVGVPB6UmwPJ*8#Vb;~oJRs!CYb*tEZk6ACK|c zo_(y_zMFW+B&2Ca4UD4+hyhdrRlsmOse6In72%#60&+%>^z3&GP1|4#hi6*1^XA_D zL<|i>JtP#O;1=g4q;WCobfi3W9r&p98Rh{e0u}OwQa}rC`2028ocaC|V_k|{fp~)a z|Gxn@26%?g2jL9hSHLYbkuYnv?_ynZ8}WFQkbcmbI!(UIT-?gYTDg#O(r0;DKHrl- z(?}<7v{SgXz~2B@15<|~ntp{_QMjQeNk5xxPG z0=lXKTmyVz7<$Sx*Y58s4$$ve;KQDu@#L0P z&zkzM5aL#X6;~9a$8k$tTmBR}M8{2g-p$C%b-pUaSYv^(2%!1%ThV$}%2 zK>A3p0T&-_K%&4)0j-^&bRurfW8N^YTN+SItpPq#0E|0@5VwrtdsIn-XV?=ihmi_8i3qA3anj^t%-Jd4PT| z0O!U`!)fa5VMWtH5Bv%t#Mh3n+5bxdrVS3)>^+b2g=gT_PW>9UHg`L2uA>f^4=iDD z|3*IDDXq0~bUDGwc2)}^&WndkvX;%Wt=rw4xM|i1A$}h4ogW3BlBR7AhyinePZF#M z{5L@?w!^iu+5(uh{|@{^86V?|zz-Q(>iM5#Jamti$d@cfYk`Hjs-h_Hht?gmb|<~$ z(tXlIFGWvD%Wp%8J|CCP>hWd9`U~I}qb;&73joGvfG?E+!vpPP1~Y^~!MHRa7|#KV zgb*acAvW&oU`u<42gZZ|VB9JvdqV*KV?OY7nSTFxBy`9ZOU8s8=Nd&-9}17Fr()`K z!nJj1W(X9eSQWq~$@V`E2*xGSkt|2+fDa2HoJ1rbAXsh>Nax|7c!+Axt^-vM$5 zl2TYI`3m=i0Qdit)Jf&&dEgwtF*J>|W%JU`y`*JPf((f)DRKQS;M&8~ub;rJz%R9+ zo*6Ab7M0)(%&O`eRKw(z@7=`qCx3^Pv)EZ(O>E+1CY-&Psh?OvW#cST?R&BM`%tuD z6_8v}PX78h<6LP#5H}6h?%2)t?j+T*hzG_r;Qb>JEhVTKx0vsWBJF34rpTI8)H=}h z7xhS_<<*+VH-WAZ0`hW^c$_!qQ%4Jsf*T|?BZM{3|JIhD--WJg zzf}zL8iY7Qt~3Q9KnRSADiVz|*t32uFaQ1DU=8%6MI?V@b4j+-btLy`4xs z_;*4Hfp8om6>%c<6R@*cR9!0-4jB$-IN+8&YKlTtD8#zt9tJWQs$LJg56>xt*1%3|Tc$FfRrh%d;yt-!}Tf4fc2!{)$V1I>Mq1cx< zIZ;Yiy9A|%GF+G{3dnP9JE@I?nN(T9wCYNxC#vYpWU+;y04#?Vuqg`GKpz!Tr=OiT zeok-q+izh+V+bKG1KP>k`LhvLWxM(M3hbq{1`{y~xHw zgIK8)k?|9kO#a9P=~Oyhsi+z<3VeGZ5vLkvF(>f~g6;o!QNSWaQS7RaN!&DO?Md?c zEiL?hON$#CG4!Kepx~qHO0>OFO26pfZpo^SMaftePdB%*xuc7dCe$;%I>CWVmaJ|2 zLlNnG<*sNNeQmArNsBL>SO3_r+fsXXU29e)azcnxq%+q8+^DE3j^&W)>2e*zp`!8f zfTrzBLWo5nUAIh4Wm``#8{0eB){{gCs4xvwMM3Z&&w(s|<-oV7UF-F=S`%u-ZUM^WAY z&Qw(Ofn0x|rf3S)b3TZb8Y0Oq3K+FrFN8QNVi=aLDy(eT&SUR1)7qURZWvUBOcV*m zpNJ*|h$K7|*fA7xa;qa@G*w~kj@>-IxtaAl_mHwILb`_HMm2|!V_8%-&SvLRE7ZN~ zRv$P0%(Kb$_Zr=;EzP-P@*ZJXOVXVkSEf7KC(XRux0XgHWh+*V3 zRbj=}ZER}qpdvITfbbl?wYcR@r7XgYCByHD+aD}>m#l3wkj+sSi*f#}X;g+y`ZBq- zilUt1=>$dBNz6Q+<)1u*e^KExEEI6A? zR|i%)b)urG-;m~QATbp&jI5?AJlWJrb7#+}Z7{L`5sViL;Bg2-cDCOmSt)h zMnt18o8{q6O`Jb#I@7DGu59m1HG_j=Sxh)(0ndN=D#G;*G+wZTr!G2|#wDN8&-&Sa z$M(LszHVUOo_$p_X6GVx<8SKQ-csjS)D+fm4;GzPtkgknSX0pwzx9vnhX_-(F`%1s2-%&f~L^eNg4_kio z3$AWXvf;K{(Bm=8arF%B?Wi{@D(mYeOeWWV;Ns-gO{lt2$kZ*x8RrxM4}zq;;&@4xn1`uFTX3&&|(@)z{)-idS)hZVXO zLR=6rj8p+IPLyJ*>KFiH9dH4qx91h)5QQLn_JkleeoA+I<)ascS~ve$X5NBtnz8t& zx4-br6C0M@7d`o+OTH4Tty}WWD?eYf_`xUWZQY7GyaZGe@J%7aZzG050WjuB&ZsyB zMAWUgWwpa59e6?p+y1&7AZS|7358lCJ6h_aktp^%Z@e7J47{a;jN2nM^_^QEdGyW` zuleF-Mxy3ZeLLGOP|Z*fyYvMa)x8(6bxp-`Y*x1H^n-CRg|{V)CE6_K@h;pWp*UPX z2oz{jRg7KR>QiT&_u|g8KAOoj9^aa{|Blng{ns534q@lAMCEeSOOmO`m{U zzcmN9JSHKzaR4{XxdnGG;XD4@#0-P=yY|x5-a#T31^0BG8)Y!DdkjpxBInJL(d^BV zbJrfuV7B9sv2Aj;gQ6%00eK_H#lkSrdO9bgC@8t?so5EGNX?y(`u6L%c_@LC%XvC{ z52aI?Mc-Bk;m@~s03YHQIF))hl(lU#mQBRaX{=7r5Ra0zogsiE11U>4Ab6MF-SJ9x z_6O)+xESNj*G6r=yu5}lCzE}*fS@P}IoqZ$o1-QYX5RRErd3x_88V3)2DUQ@NWWyg zAho(1fa`^Bpzq&JcG@hIcnl?zLPX-cN5#QN<#MQs%9&FpGOMPVQ3Ws$WVx~%j; zS%{BI@&U<6{qlzV*)Sx0>^KM`1giROlPCo#XFCW4nyR7?Bbe!dVLO7wv!*hqu7;j; zmSj3JL{#U8PJW16{-2Qw^flZqWV=g=FU7WGvPl{FDgrcBJ($lJYw|u34q<2-y_pRC zmOUi*;(rHA2yDkeK>-D_mW`q)oIiUyGiwsG_oo8IvYK$uBODGNx*5O&eS~_uvEo(e zs*0)W7^;e@Y1oc~RX82&dZwyMNS;}kb(}$^K1P5@jUGMyo2 z9RATqs-lp}S)?p$$PukV2y{&)s_Uq#isLv8SQeHvIS=+xRU9Fx3WxaM_-L$YcrWI;N(gjiTP@NoP2B`V`JN zZZbVS#i^+(S=(l7XAk>&571Cq!OYqOrWCDy?$T5h%W;MPQH;DJ#mkB3;dtsJSIC-< z(tp5>O8Uf2rD@^_L2GxCJqP+ogu^5=8EnU)DjXWJ>PCxHMImF^^rSQNX0nH@>=`u) zPN=UXYuOCsEc&v!gOlhL+GQOlFo*hA|44P;5kFeP%hOkdOf*%cJC#ON6e9Z3Kkm^p z7zT1VdQxcya=Akc2nF}Z@FHM*RYo69I8x7e)Mmw7d73O89c8n&23a7jDBw7PtZfhL z%=G|t67He@NcZ5}BQa0M;y0-BX)5lX$NQzPims{DMI+=Kdo=Ik|8he0k$RbT10Yjy ziwsT!7|7*#-?(aK)mGD=vqtkies8Y-JwS?6v;4giAZJNCjCXYmEym~O;z5<&@I8&;GVRz26uZ{Wr_QL9rvum=YYSLf4>wr zVdXvFBB@NHxEaG=06)UblX&|_<^%UDs=B}y0?TnK6op&lxEpbc@d};R5C?9S@9{eB zkxm9~9_P2dYf5eRisF8;VHNPUyw}x5`ksfIkb52X2$8$}`pEBxoFFG=Vu3-vARly* ze8FwFd&~WY%~-g3i^~hVcq?w@#g05t^E8LU=>lfp?n9rE*JqJ1Wz*|^2cD6l?b zSyi*fRX@~mUzb3gAJV;k$Iu{SAQ^17cen9gl+1A$I|bu`l3Se>9d zo&K0Kc`e{n$^B>J9yahJdCk=fooGoBn~Jd(roD=qAY53$UE`w-*bvy(NEp8A-36 z_Xh>~{*RoXSOH!4L&-Vho1g+rT~#qv6(K~2@48!YYt7ckN&l*B^A~meiv+7*a&Ecf zXZz&Xo}L(B=$??I1k0oA8T$R*x$-$;@|`Z0+$vO`-}Y(TlhDqQa{N`_YR#u`2`95q zo90`Io=EUGtq{FYWbAFFyl`6x(zcDFD1YYzp=#~Pj z)K4E6t}o!lpcsrzt(E%Vbh)s+DC14IA06|H-TX@Y50(ilnNpN{KxQT2-p4E#$bUD= ze=qi3d%NU_Yvp1W()3;qTXj1nLoXFMi<7dlVmRB3W%hBI*1cBqR+ znN?d&%Cf#KLn$XoTmQ4bf8>d)$9(_)zEAvAQTo7s&v!{leT(#4E|%8ZdO6YWNEhIH za{dz1|L~6OxL1PZ87Gy%CAx27ekK*n&Ay301^2kUexCyrB#v0l5xqk?Qs0zfWu?!Y zUU@j+59D&3JgI?(SoHMHfz&NB19+8OdD|pc_!rwoX+?VRu-BzCd~%*MtobJ04+yyD zfn6*a^y|`WUoGe9d|%AVJK4eej=T3*OT2`Tq8lO#Sajebg%3KUBb?^Q^z$<%do@I^E|SEt592pDvXwza{VQ6|(JD z1;ovX(yM;B$O^w&{=OUcZI{3oHCK5n<>0NzKbgT zqhdQ?=g1Wrk^p!M?i=!bJahYfa#9O@N~2EtA`NmOJwoA6{KX}AG|G9pAK(6w{~G|X W;#|`CF$kdm0000 1 then + + json.item_instances item.menu_item_instances do |is| + json.item_instance_item_code = is.item_instance_code + json.item_instance_name = is.item_instance_name + json.price = is.price + json.is_available = is.is_available + json.is_on_promotion = is.is_on_promotion + json.promotion_price = is.promotion_price + json.item_attributes = is.item_attributes + end + + end + #Child Menu items + if (item.children) then + json.set_items item.children.each do |item| + json.partial! 'api/restaurant/menu/menu_item', item: item + end + + end + end +end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 049ba371..952836d1 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -81,6 +81,7 @@ $(function(){ }); //End Booking Click function show_details(url_item){ + alert(url_item) //Start Ajax $.ajax({ type: "GET", @@ -109,9 +110,8 @@ function show_details(url_item){ +'
' +''+ price +'' +'
'; - + $(".menu_items_list").append(row); } - $(".menu_items_list").html(row); } }); //end Ajax diff --git a/public/image/logo.png b/public/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..578d16f7b25ca4b60a4db70950c07c23d96c3ce3 GIT binary patch literal 9424 zcmV;>Brn^EP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000^LNklv@+@4R8j~2w1=-;1!_nSb7Ql7zZH^d<0ko z%mhvXCIL3k3cLwy237*A0r4InM}``KuK-s7;|jE^z-;*g@GW2~a4&G@Smqk_7zE>6 zQXGA`2pGj^Ch$-4+RwfR$jE6T@I3H+z#PFilY##R9(WIs!>5_RdSKxwj(H{UA`pHL zkm1od$r+Q6z}O3bXWs*4c=UUq;Rud@I&jx}R#tEYep-NjyMc#+*Q7P211HGI{uB@? zbNy1_m%ysge0W1sQBV-Wu(p*k>=@Pq`vUa)F7U6wKnW%OUEuR&#@Pu>8RKs2Y9-zu&9@ez&qGKRMO+^ex z3_nscR;{e_O0;zXw~k=!o65AG8ypNl$k3<^nXGQx!NYGikxZwliG&XejIj*J@g>?G z8sXS&zzZeX7X<|)Vi+jE>TNsN+|f93-VS_Q20U2MSZ8XfnH6_|=gA5Q4nP{rQ z%H}p+*|CSPu3_lvh{MTaQHN-_xs779V-)VuQKGGEoGfMGJ>&xT%yg!&Akr+V{2Cr zPi@^s*0u>7`Vj+TECaF%*j1wa2H?WO828&{9KV%7rxyyTiGVGVPB6UmwPJ*8#Vb;~oJRs!CYb*tEZk6ACK|c zo_(y_zMFW+B&2Ca4UD4+hyhdrRlsmOse6In72%#60&+%>^z3&GP1|4#hi6*1^XA_D zL<|i>JtP#O;1=g4q;WCobfi3W9r&p98Rh{e0u}OwQa}rC`2028ocaC|V_k|{fp~)a z|Gxn@26%?g2jL9hSHLYbkuYnv?_ynZ8}WFQkbcmbI!(UIT-?gYTDg#O(r0;DKHrl- z(?}<7v{SgXz~2B@15<|~ntp{_QMjQeNk5xxPG z0=lXKTmyVz7<$Sx*Y58s4$$ve;KQDu@#L0P z&zkzM5aL#X6;~9a$8k$tTmBR}M8{2g-p$C%b-pUaSYv^(2%!1%ThV$}%2 zK>A3p0T&-_K%&4)0j-^&bRurfW8N^YTN+SItpPq#0E|0@5VwrtdsIn-XV?=ihmi_8i3qA3anj^t%-Jd4PT| z0O!U`!)fa5VMWtH5Bv%t#Mh3n+5bxdrVS3)>^+b2g=gT_PW>9UHg`L2uA>f^4=iDD z|3*IDDXq0~bUDGwc2)}^&WndkvX;%Wt=rw4xM|i1A$}h4ogW3BlBR7AhyinePZF#M z{5L@?w!^iu+5(uh{|@{^86V?|zz-Q(>iM5#Jamti$d@cfYk`Hjs-h_Hht?gmb|<~$ z(tXlIFGWvD%Wp%8J|CCP>hWd9`U~I}qb;&73joGvfG?E+!vpPP1~Y^~!MHRa7|#KV zgb*acAvW&oU`u<42gZZ|VB9JvdqV*KV?OY7nSTFxBy`9ZOU8s8=Nd&-9}17Fr()`K z!nJj1W(X9eSQWq~$@V`E2*xGSkt|2+fDa2HoJ1rbAXsh>Nax|7c!+Axt^-vM$5 zl2TYI`3m=i0Qdit)Jf&&dEgwtF*J>|W%JU`y`*JPf((f)DRKQS;M&8~ub;rJz%R9+ zo*6Ab7M0)(%&O`eRKw(z@7=`qCx3^Pv)EZ(O>E+1CY-&Psh?OvW#cST?R&BM`%tuD z6_8v}PX78h<6LP#5H}6h?%2)t?j+T*hzG_r;Qb>JEhVTKx0vsWBJF34rpTI8)H=}h z7xhS_<<*+VH-WAZ0`hW^c$_!qQ%4Jsf*T|?BZM{3|JIhD--WJg zzf}zL8iY7Qt~3Q9KnRSADiVz|*t32uFaQ1DU=8%6MI?V@b4j+-btLy`4xs z_;*4Hfp8om6>%c<6R@*cR9!0-4jB$-IN+8&YKlTtD8#zt9tJWQs$LJg56>xt*1%3|Tc$FfRrh%d;yt-!}Tf4fc2!{)$V1I>Mq1cx< zIZ;Yiy9A|%GF+G{3dnP9JE@I?nN(T9wCYNxC#vYpWU+;y04#?Vuqg`GKpz!Tr=OiT zeok-q+izh+V+bKG1KP>k`LhvLWxM(M3hbq{1`{y~xHw zgIK8)k?|9kO#a9P=~Oyhsi+z<3VeGZ5vLkvF(>f~g6;o!QNSWaQS7RaN!&DO?Md?c zEiL?hON$#CG4!Kepx~qHO0>OFO26pfZpo^SMaftePdB%*xuc7dCe$;%I>CWVmaJ|2 zLlNnG<*sNNeQmArNsBL>SO3_r+fsXXU29e)azcnxq%+q8+^DE3j^&W)>2e*zp`!8f zfTrzBLWo5nUAIh4Wm``#8{0eB){{gCs4xvwMM3Z&&w(s|<-oV7UF-F=S`%u-ZUM^WAY z&Qw(Ofn0x|rf3S)b3TZb8Y0Oq3K+FrFN8QNVi=aLDy(eT&SUR1)7qURZWvUBOcV*m zpNJ*|h$K7|*fA7xa;qa@G*w~kj@>-IxtaAl_mHwILb`_HMm2|!V_8%-&SvLRE7ZN~ zRv$P0%(Kb$_Zr=;EzP-P@*ZJXOVXVkSEf7KC(XRux0XgHWh+*V3 zRbj=}ZER}qpdvITfbbl?wYcR@r7XgYCByHD+aD}>m#l3wkj+sSi*f#}X;g+y`ZBq- zilUt1=>$dBNz6Q+<)1u*e^KExEEI6A? zR|i%)b)urG-;m~QATbp&jI5?AJlWJrb7#+}Z7{L`5sViL;Bg2-cDCOmSt)h zMnt18o8{q6O`Jb#I@7DGu59m1HG_j=Sxh)(0ndN=D#G;*G+wZTr!G2|#wDN8&-&Sa z$M(LszHVUOo_$p_X6GVx<8SKQ-csjS)D+fm4;GzPtkgknSX0pwzx9vnhX_-(F`%1s2-%&f~L^eNg4_kio z3$AWXvf;K{(Bm=8arF%B?Wi{@D(mYeOeWWV;Ns-gO{lt2$kZ*x8RrxM4}zq;;&@4xn1`uFTX3&&|(@)z{)-idS)hZVXO zLR=6rj8p+IPLyJ*>KFiH9dH4qx91h)5QQLn_JkleeoA+I<)ascS~ve$X5NBtnz8t& zx4-br6C0M@7d`o+OTH4Tty}WWD?eYf_`xUWZQY7GyaZGe@J%7aZzG050WjuB&ZsyB zMAWUgWwpa59e6?p+y1&7AZS|7358lCJ6h_aktp^%Z@e7J47{a;jN2nM^_^QEdGyW` zuleF-Mxy3ZeLLGOP|Z*fyYvMa)x8(6bxp-`Y*x1H^n-CRg|{V)CE6_K@h;pWp*UPX z2oz{jRg7KR>QiT&_u|g8KAOoj9^aa{|Blng{ns534q@lAMCEeSOOmO`m{U zzcmN9JSHKzaR4{XxdnGG;XD4@#0-P=yY|x5-a#T31^0BG8)Y!DdkjpxBInJL(d^BV zbJrfuV7B9sv2Aj;gQ6%00eK_H#lkSrdO9bgC@8t?so5EGNX?y(`u6L%c_@LC%XvC{ z52aI?Mc-Bk;m@~s03YHQIF))hl(lU#mQBRaX{=7r5Ra0zogsiE11U>4Ab6MF-SJ9x z_6O)+xESNj*G6r=yu5}lCzE}*fS@P}IoqZ$o1-QYX5RRErd3x_88V3)2DUQ@NWWyg zAho(1fa`^Bpzq&JcG@hIcnl?zLPX-cN5#QN<#MQs%9&FpGOMPVQ3Ws$WVx~%j; zS%{BI@&U<6{qlzV*)Sx0>^KM`1giROlPCo#XFCW4nyR7?Bbe!dVLO7wv!*hqu7;j; zmSj3JL{#U8PJW16{-2Qw^flZqWV=g=FU7WGvPl{FDgrcBJ($lJYw|u34q<2-y_pRC zmOUi*;(rHA2yDkeK>-D_mW`q)oIiUyGiwsG_oo8IvYK$uBODGNx*5O&eS~_uvEo(e zs*0)W7^;e@Y1oc~RX82&dZwyMNS;}kb(}$^K1P5@jUGMyo2 z9RATqs-lp}S)?p$$PukV2y{&)s_Uq#isLv8SQeHvIS=+xRU9Fx3WxaM_-L$YcrWI;N(gjiTP@NoP2B`V`JN zZZbVS#i^+(S=(l7XAk>&571Cq!OYqOrWCDy?$T5h%W;MPQH;DJ#mkB3;dtsJSIC-< z(tp5>O8Uf2rD@^_L2GxCJqP+ogu^5=8EnU)DjXWJ>PCxHMImF^^rSQNX0nH@>=`u) zPN=UXYuOCsEc&v!gOlhL+GQOlFo*hA|44P;5kFeP%hOkdOf*%cJC#ON6e9Z3Kkm^p z7zT1VdQxcya=Akc2nF}Z@FHM*RYo69I8x7e)Mmw7d73O89c8n&23a7jDBw7PtZfhL z%=G|t67He@NcZ5}BQa0M;y0-BX)5lX$NQzPims{DMI+=Kdo=Ik|8he0k$RbT10Yjy ziwsT!7|7*#-?(aK)mGD=vqtkies8Y-JwS?6v;4giAZJNCjCXYmEym~O;z5<&@I8&;GVRz26uZ{Wr_QL9rvum=YYSLf4>wr zVdXvFBB@NHxEaG=06)UblX&|_<^%UDs=B}y0?TnK6op&lxEpbc@d};R5C?9S@9{eB zkxm9~9_P2dYf5eRisF8;VHNPUyw}x5`ksfIkb52X2$8$}`pEBxoFFG=Vu3-vARly* ze8FwFd&~WY%~-g3i^~hVcq?w@#g05t^E8LU=>lfp?n9rE*JqJ1Wz*|^2cD6l?b zSyi*fRX@~mUzb3gAJV;k$Iu{SAQ^17cen9gl+1A$I|bu`l3Se>9d zo&K0Kc`e{n$^B>J9yahJdCk=fooGoBn~Jd(roD=qAY53$UE`w-*bvy(NEp8A-36 z_Xh>~{*RoXSOH!4L&-Vho1g+rT~#qv6(K~2@48!YYt7ckN&l*B^A~meiv+7*a&Ecf zXZz&Xo}L(B=$??I1k0oA8T$R*x$-$;@|`Z0+$vO`-}Y(TlhDqQa{N`_YR#u`2`95q zo90`Io=EUGtq{FYWbAFFyl`6x(zcDFD1YYzp=#~Pj z)K4E6t}o!lpcsrzt(E%Vbh)s+DC14IA06|H-TX@Y50(ilnNpN{KxQT2-p4E#$bUD= ze=qi3d%NU_Yvp1W()3;qTXj1nLoXFMi<7dlVmRB3W%hBI*1cBqR+ znN?d&%Cf#KLn$XoTmQ4bf8>d)$9(_)zEAvAQTo7s&v!{leT(#4E|%8ZdO6YWNEhIH za{dz1|L~6OxL1PZ87Gy%CAx27ekK*n&Ay301^2kUexCyrB#v0l5xqk?Qs0zfWu?!Y zUU@j+59D&3JgI?(SoHMHfz&NB19+8OdD|pc_!rwoX+?VRu-BzCd~%*MtobJ04+yyD zfn6*a^y|`WUoGe9d|%AVJK4eej=T3*OT2`Tq8lO#Sajebg%3KUBb?^Q^z$<%do@I^E|SEt592pDvXwza{VQ6|(JD z1;ovX(yM;B$O^w&{=OUcZI{3oHCK5n<>0NzKbgT zqhdQ?=g1Wrk^p!M?i=!bJahYfa#9O@N~2EtA`NmOJwoA6{KX}AG|G9pAK(6w{~G|X W;#|`CF$kdm0000 Date: Wed, 26 Jul 2017 16:00:15 +0630 Subject: [PATCH 020/246] bind member for already register member --- app/controllers/crm/customers_controller.rb | 11 +++++++++-- app/models/customer.rb | 2 +- db/seeds.rb | 20 -------------------- lib/tasks/menu_import.rake | 20 ++++++++++++++++++++ lib/tasks/menu_osaka.rake | 20 ++++++++++++++++++++ 5 files changed, 50 insertions(+), 23 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 4b045221..c0123945 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -128,8 +128,15 @@ class Crm::CustomersController < BaseCrmController end # format.json { render :index, status: :created, location: @crm_customers } else - customer = Customer.find(@crm_customers.customer_id) - status = customer.update_attributes(membership_type:member_group_id ) + customer = Customer.find(@crm_customers.customer_id) + + # Check membership id and bind to user + if response["membership_id"] != nil + status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) + else + status = customer.update_attributes(membership_type:member_group_id) + end + if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]} else diff --git a/app/models/customer.rb b/app/models/customer.rb index ef777c2d..06f7f1d1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,7 +10,7 @@ class Customer < ApplicationRecord validates :contact_no, uniqueness: true validates :email, uniqueness: true validates :card_no, uniqueness: true - # validates :paypar_account_no + validates :paypar_account_no, uniqueness: true paginates_per 50 diff --git a/db/seeds.rb b/db/seeds.rb index 317194c1..879ef921 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -163,26 +163,6 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: " crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) - -member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - ]) - -payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) - cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"}) cashier_terminal3 = CashierTerminal.create({name:"Terminal 3"}) diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index e0e0be3a..61234dd9 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -636,6 +636,26 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, +]) + +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 9241166b..313c8974 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -896,6 +896,26 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU table = Table.create({zone: zone3, name:"34", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) table = Table.create({zone: zone3, name:"35", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) + +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, +]) + +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) + #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From 1de6cc906c2758c83f2a393421872e6682e46047 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 16:35:34 +0630 Subject: [PATCH 021/246] update rounding adj for osaka --- app/controllers/origami/home_controller.rb | 1 + app/pdf/close_cashier_pdf.rb | 7 +++++++ app/views/origami/home/show.html.erb | 23 +++++++++++++--------- db/migrate/20170530072247_create_shops.rb | 1 + db/seeds.rb | 2 +- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 7ee03e47..f78f162a 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -15,6 +15,7 @@ class Origami::HomeController < BaseOrigamiController @rooms = Room.all.active.order('status desc') @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') + @shop = Shop.find_by_id(1) @status_order = "" @status_sale = "" @sale_array = Array.new diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 893746b2..4eadf007 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -200,6 +200,13 @@ class CloseCashierPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right end + end + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Rounding Adjustment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.total_rounding.round(2)}", :size => self.item_font_size, :align => :right end y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index daacffd9..709ed7ca 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -20,7 +20,7 @@ - +
@@ -452,15 +452,20 @@ $("#first_bill").on('click', function(){ $('#pay').on('click',function() { var sale_id = $('#sale_id').val(); - var url = '/origami/sale/'+ sale_id + "/rounding_adj" ; + var rounding_adj = $('#rounding_adj').val(); - $.ajax({ - type: "POST", - url: '/origami/sale/'+ sale_id + "/rounding_adj", - success:function(result){ - window.location.href = '/origami/sale/'+ sale_id + "/payment"; - } - }); + if(rounding_adj == "true"){ + var url = '/origami/sale/'+ sale_id + "/rounding_adj" ; + $.ajax({ + type: "POST", + url: '/origami/sale/'+ sale_id + "/rounding_adj", + success:function(result){ + window.location.href = '/origami/sale/'+ sale_id + "/payment"; + } + }); + }else{ + window.location.href = '/origami/sale/'+ sale_id + "/payment"; + } }); diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb index 4f07d5c4..72d8b882 100644 --- a/db/migrate/20170530072247_create_shops.rb +++ b/db/migrate/20170530072247_create_shops.rb @@ -18,6 +18,7 @@ class CreateShops < ActiveRecord::Migration[5.1] t.string :cloud_token t.string :owner_token t.string :id_prefix, :null => false, :limit => 3 + t.boolean :is_rounding_adj, :default => false t.timestamps end diff --git a/db/seeds.rb b/db/seeds.rb index 317194c1..14f070eb 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -139,7 +139,7 @@ menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) shop = Shop.create({id:1, name: "OSAKA OHSHO", address:'No. 256, Kyaikkasan Road, Tamwe Township, Yangon', township:"Tamwe",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"Tel: 09-258676611",reservation_no:"111",license:"123", -activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111"}) +activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111",is_rounding_adj:"0"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) From f7588bd8d99050c966a45b49878389aec1c4ac68 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 26 Jul 2017 16:42:51 +0630 Subject: [PATCH 022/246] update member for already register member --- app/controllers/crm/customers_controller.rb | 13 ++++++++++++- lib/tasks/menu_import.rake | 12 ++++++------ lib/tasks/menu_osaka.rake | 12 ++++++------ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index c0123945..c819af7b 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -224,7 +224,12 @@ end else customer = Customer.find(@crm_customer.customer_id) - status = customer.update_attributes(membership_type:member_group_id ) + # Check membership id and bind to user + if response["membership_id"] != nil + status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) + else + status = customer.update_attributes(membership_type:member_group_id) + end format.html { redirect_to crm_customers_path, notice: response["error"] } end @@ -262,6 +267,12 @@ end format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } format.json { render :show, status: :ok, location: @crm_customer } else + # Check membership id and bind to user + if response["membership_id"] != nil + status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) + else + status = customer.update_attributes(membership_type:member_group_id) + end format.html { redirect_to crm_customers_path, notice: response["message"] } end diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index 61234dd9..cdf175bf 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -636,7 +636,7 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, @@ -650,11 +650,11 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, ]) -payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 313c8974..941494aa 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -896,7 +896,7 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU table = Table.create({zone: zone3, name:"34", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) table = Table.create({zone: zone3, name:"35", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, @@ -910,11 +910,11 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, ]) -payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://staging.membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://staging.membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://staging.membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://staging.membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From 7bfe8b1578faac6f994213771bc2e81e8a2998a9 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 26 Jul 2017 18:02:30 +0630 Subject: [PATCH 023/246] dump.rdb --- dump.rdb | Bin 487 -> 573 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index 0e8d606fd2b675a0c3e88d8fa1ab9153d5ebc576..059a26dd90f8185e1b640d7ce37ffdc7b689e486 100644 GIT binary patch delta 319 zcmaFPyq9HyfkaeoMdUAz(&E$<-Q3jNLlbTbG5llr&BZt|Rg=+d;!0^IBZG-66(+8c zU@|hB*e~Pv=XuYnx>!aA1{TrE#5^kt6C(qw6eF{g)Wp;@vlMef7M7&c#1cV6Qv*W- zGYd0gBRz9N17l+|*22=v)DqUT#GK+(mdw1g{KF3G9kxvtV^j>02dgzTFgDOLH!?Ff zGtp5h$V^cJo2{c%l9;Yw%3NGgl&WCNQd*RlSE67ipPZkUTv}9=nwMOuWMyQkqf}U$ zTAEs{WEHKHlA4xS$}qWyQQc-@LN*_Y6Hm%a zTqhZ1XmNmnfxEaQvBWAZF*7GMHmjf>96+Z|5ykBEF4&x From 92e73c54a32d958d1b1d65986806ebc370051871 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 18:26:55 +0630 Subject: [PATCH 024/246] update add order view --- app/views/origami/addorders/show.html.erb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 952836d1..8fdf0c32 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -81,7 +81,9 @@ $(function(){ }); //End Booking Click function show_details(url_item){ - alert(url_item) + var menu_list = $('.menu_items_list'); + // menu_list.empty(); + // var row = ''; //Start Ajax $.ajax({ type: "GET", @@ -89,29 +91,32 @@ function show_details(url_item){ data: {}, dataType: "json", success: function(data) { - + menu_items = data.menu_items; for(var field in menu_items) { if (menu_items[field].item_instances){ - var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2); + console.log(menu_items[field].item_instances.price); + var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2); }else{ var price = parseFloat(menu_items[field].price).toFixed(2); } - row = '
' +'
' +''+ menu_items[field].name +'' +'
' + +'
' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' +'
' + +'
' +''+ price +'' +'
'; - $(".menu_items_list").append(row); + $('.menu_items_list').append(row); } + } }); //end Ajax From ad2dfa2ee04b2c91fdc39ad2af3c9761d34cd1e7 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 26 Jul 2017 18:39:46 +0630 Subject: [PATCH 025/246] crm updated --- app/controllers/crm/customers_controller.rb | 3 --- app/views/crm/customers/_new_form.html.erb | 5 ++-- app/views/origami/customers/index.html.erb | 14 +++++++----- db/seeds.rb | 3 ++- dump.rdb | Bin 573 -> 574 bytes lib/tasks/menu_osaka.rake | 24 ++++++++++---------- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index c819af7b..b2c715ad 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -215,14 +215,11 @@ end end if response["status"] == true - customer = Customer.find(@crm_customer.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated'} - else - customer = Customer.find(@crm_customer.customer_id) # Check membership id and bind to user if response["membership_id"] != nil diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 3c09d20f..b99c25a3 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -128,10 +128,9 @@ diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 709ed7ca..891524ec 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -305,27 +305,27 @@ <% if @dining.bookings.length >= 1 %> - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - - - - - - <% else %> - - - - - - - - - - <% end %> + <% if @status_order == 'order' && @status_sale != 'sale' %> + + + + + + + + + + <% else %> + + + + + + + + + + <% end %> From 98c04f21d8d7ddc91cdb6427b3310730f26e58e7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 28 Jul 2017 17:07:16 +0630 Subject: [PATCH 033/246] update report and view --- app/controllers/origami/home_controller.rb | 2 +- .../origami/payments_controller.rb | 9 +- .../reports/credit_payment_controller.rb | 61 ++++++ .../reports/void_sale_controller.rb | 60 ++++++ app/models/ability.rb | 2 +- app/models/sale.rb | 42 +++-- app/views/origami/home/show.html.erb | 7 +- .../_shift_sale_report_filter.html.erb | 125 +++++++++++++ .../reports/credit_payment/index.html.erb | 150 +++++++++++++++ .../reports/credit_payment/index.xls.erb | 39 ++++ .../_shift_sale_report_filter.html.erb | 125 +++++++++++++ app/views/reports/void_sale/index.html.erb | 175 ++++++++++++++++++ app/views/reports/void_sale/index.xls.erb | 39 ++++ config/routes.rb | 8 +- 14 files changed, 815 insertions(+), 29 deletions(-) create mode 100644 app/controllers/reports/credit_payment_controller.rb create mode 100644 app/controllers/reports/void_sale_controller.rb create mode 100644 app/views/reports/credit_payment/_shift_sale_report_filter.html.erb create mode 100644 app/views/reports/credit_payment/index.html.erb create mode 100644 app/views/reports/credit_payment/index.xls.erb create mode 100644 app/views/reports/void_sale/_shift_sale_report_filter.html.erb create mode 100644 app/views/reports/void_sale/index.html.erb create mode 100644 app/views/reports/void_sale/index.xls.erb diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index f78f162a..0e7f3388 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -15,7 +15,7 @@ class Origami::HomeController < BaseOrigamiController @rooms = Room.all.active.order('status desc') @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') - @shop = Shop.find_by_id(1) + @status_order = "" @status_sale = "" @sale_array = Array.new diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 24d63b71..8c328030 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -166,7 +166,14 @@ class Origami::PaymentsController < BaseOrigamiController def rounding_adj saleObj = Sale.find(params[:sale_id]) - new_total = Sale.get_rounding_adjustment(saleObj.grand_total) + @shop = Shop.find_by_id(1) + + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(saleObj.grand_total) + else + new_total = saleObj.grand_total + end + rounding_adj = new_total-saleObj.grand_total saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb new file mode 100644 index 00000000..dd9b3987 --- /dev/null +++ b/app/controllers/reports/credit_payment_controller.rb @@ -0,0 +1,61 @@ +class Reports::CreditPaymentController < BaseReportController +authorize_resource :class => false + def index + + from, to = get_date_range_from_params + + @shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + + @shift = '' + if params[:shift_name].to_i != 0 + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + + @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + + @sale_data = Sale.get_by_shift_sale_credit_payment(@shift_sale_range,@shift,from,to) + + @from = from + @to = to + + if @shift.present? + @shift.each do |sh| + @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = sh + end + end + + respond_to do |format| + format.html + format.xls + end + end + + def show + from, to = get_date_range_from_params + + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + shift_id = sale.id.nil? ? '-' : sale.id + str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end + end +end \ No newline at end of file diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb new file mode 100644 index 00000000..80526ad0 --- /dev/null +++ b/app/controllers/reports/void_sale_controller.rb @@ -0,0 +1,60 @@ +class Reports::VoidSaleController < BaseReportController +authorize_resource :class => false + def index + + from, to = get_date_range_from_params + + # @shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + @shift = '' + if params[:shift_name].to_i != 0 + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + + @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + + @sale_data = Sale.get_void_sale(@shift,from,to) + + @from = from + @to = to + + if @shift.present? + @shift.each do |sh| + @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = sh + end + end + + respond_to do |format| + format.html + format.xls + end + end + + def show + from, to = get_date_range_from_params + + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + shift_id = sale.id.nil? ? '-' : sale.id + str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end + end +end \ No newline at end of file diff --git a/app/models/ability.rb b/app/models/ability.rb index 368aa424..bd3ce87e 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -68,7 +68,7 @@ class Ability can :overall_void, :void elsif user.role == "cashier" - +can :overall_void, :void can :read, Order can :update, Order diff --git a/app/models/sale.rb b/app/models/sale.rb index 197c7106..fc064b96 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -642,10 +642,36 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - end - + end +end + +def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) + query = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date, + s.cashier_name as cashier_name") + .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id") + + if shift.present? + query = query.where("payment_method= 'creditnote' and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift.to_a) + elsif shift_sale_range.present? + query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift_sale_range.to_a) + else + query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) + end end + def self.get_void_sale(shift,from,to) + sale_arr = Array.new + + account= Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment") + .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id") + .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? + OR sh.shift_closed_at between ? and ? )", from ,to, from, to) + + out = {:items => account} + sale_arr.push(out) + return sale_arr +end + def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) if payment_type.blank? @@ -680,18 +706,6 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") end - - # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") - # .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") - # .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - # .group("sale_taxes.tax_name") - # .order("sale_taxes.sale_tax_id asc") - - # if shift.present? - # query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) - # else - # query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to) - # end end # def self.get_separate_tax(from,to,payment_method=nil) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 891524ec..206c8f20 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -20,7 +20,6 @@ -
@@ -452,9 +451,7 @@ $("#first_bill").on('click', function(){ $('#pay').on('click',function() { var sale_id = $('#sale_id').val(); - var rounding_adj = $('#rounding_adj').val(); - if(rounding_adj == "true"){ var url = '/origami/sale/'+ sale_id + "/rounding_adj" ; $.ajax({ type: "POST", @@ -463,9 +460,7 @@ $('#pay').on('click',function() { window.location.href = '/origami/sale/'+ sale_id + "/payment"; } }); - }else{ - window.location.href = '/origami/sale/'+ sale_id + "/payment"; - } + }); diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..5313e61d --- /dev/null +++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb @@ -0,0 +1,125 @@ +
+
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
+
+ + +
+ +
+ + + +
+
+ + +
+
+ + +
+
+ +
+
+ <% end %> + + <% end %> +
+
+ + + diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb new file mode 100644 index 00000000..6e3e6a58 --- /dev/null +++ b/app/views/reports/credit_payment/index.html.erb @@ -0,0 +1,150 @@ +
+
    +
  • Home
    • +
  • Credit Payment List Report
    • +
+
+ +
+ <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %> +
+
+ +
+
+
+ Export to Excel +
+
+
+ +
+
+ <% unless @sale_data.blank? %> + + + + <% if !params[:from].blank?%> + + + + <% end %> + + + + + + + + + + <% @sale_data.each do |credit| %> + + + <% if @shift_from.nil? && @shift_to.nil? %> + + <% else %> + + <% end %> + + + + + + <% end %> + +
From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
Shift Name Receive No Cashier Name Customer Name Credit Amount
<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= credit.receipt_no rescue '-' %><%= credit.cashier_name rescue '-' %><%= credit.sale.customer.name rescue '-' %><%= credit.payment_amount rescue '-' %>
+ <% end %> +
+
+ + \ No newline at end of file diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb new file mode 100644 index 00000000..9597e3d9 --- /dev/null +++ b/app/views/reports/credit_payment/index.xls.erb @@ -0,0 +1,39 @@ +
+
+ <% unless @sale_data.blank? %> + + + + <% if !params[:from].blank?%> + + + + <% end %> + + + + + + + + + + <% @sale_data.each do |credit| %> + + + <% if @shift_from.nil? && @shift_to.nil? %> + + <% else %> + + <% end %> + + + + + + <% end %> + +
From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
Shift Name Receive No Cashier Name Customer Name Credit Amount
<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= credit.receipt_no rescue '-' %><%= credit.cashier_name rescue '-' %><%= credit.sale.customer.name rescue '-' %><%= credit.payment_amount rescue '-' %>
+ <% end %> +
+
\ No newline at end of file diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..5313e61d --- /dev/null +++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb @@ -0,0 +1,125 @@ +
+
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
+
+ + +
+ +
+ + + +
+
+ + +
+
+ + +
+
+ +
+
+ <% end %> + + <% end %> +
+
+ + + diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb new file mode 100644 index 00000000..b008f5e8 --- /dev/null +++ b/app/views/reports/void_sale/index.html.erb @@ -0,0 +1,175 @@ +
+
    +
  • Home
    • +
  • Credit Payment List Report
    • +
+
+ +
+ <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %> +
+
+ +
+
+
+ Export to Excel +
+
+
+ +
+
+ <% if @sale_data.count > 0 %> + + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift.cashier_id %> + <% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + + <% total_amount = 0.0 %> + <% grand_total = 0.0 %> + <% rounding_adjustment = 0.0 %> + <% grand_rounding_adjustment = 0.0 %> + <% @sale_data.each do |result| %> + <% result[:items].each do |item| %> + + + + + + + + + + + <% total_amount = total_amount.to_f + item.total_amount.to_f %> + <% grand_total = grand_total.to_f + item.grand_total.to_f %> + <% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %> + <% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %> + <% end %> + <% end %> + + + + + + + + +
From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
Receipt NoSale DateTotal AmountGrand TotalRounding Adj.Grand Total +
Rounding Adj.		Sale StatusRemarks
<%= item.receipt_no rescue '-' %> <%= item.date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %><%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %><%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%> <%= item.sales_status rescue '-' %> <%= item.remarks rescue '-' %>
Total Void Amount :<%= total_amount rescue '-' %><%= grand_total rescue '-' %><%= rounding_adjustment rescue '-'%><%= grand_rounding_adjustment rescue '-'%>
+<% end %> +
+
+ + \ No newline at end of file diff --git a/app/views/reports/void_sale/index.xls.erb b/app/views/reports/void_sale/index.xls.erb new file mode 100644 index 00000000..9597e3d9 --- /dev/null +++ b/app/views/reports/void_sale/index.xls.erb @@ -0,0 +1,39 @@ +
+
+ <% unless @sale_data.blank? %> + + + + <% if !params[:from].blank?%> + + + + <% end %> + + + + + + + + + + <% @sale_data.each do |credit| %> + + + <% if @shift_from.nil? && @shift_to.nil? %> + + <% else %> + + <% end %> + + + + + + <% end %> + +
From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
Shift Name Receive No Cashier Name Customer Name Credit Amount
<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= credit.receipt_no rescue '-' %><%= credit.cashier_name rescue '-' %><%= credit.sale.customer.name rescue '-' %><%= credit.payment_amount rescue '-' %>
+ <% end %> +
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d285cc2e..acb8b3f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -276,14 +276,10 @@ Rails.application.routes.draw do resources :dailysale, :only => [:index, :show] resources :saleitem, :only => [:index, :show] resources :shiftsale, :only => [:index, :show] + resources :credit_payment, :only => [:index, :show] + resources :void_sale, :only => [:index, :show] get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date" - # resources :sales, :only => [:index, :show] - # resources :orders, :only => [:index, :show] - # resources :customers, :only => [:index, :show] - # resources :products, :only => [:index, :show] - # resources :inventory, :only => [:index, :show] - # resources :employees, :only => [:index, :show] end #mount_compendium at: '/report' #, controller: 'reports' From 78d383f5ece590c3737b4c47d9d6c91b8ec5369a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 28 Jul 2017 18:08:11 +0630 Subject: [PATCH 034/246] update customer validation messages --- app/models/customer.rb | 4 ++-- app/models/sale.rb | 8 +++++++- app/views/crm/customers/_new_form.html.erb | 11 ++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 06f7f1d1..c1751104 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,8 +7,8 @@ class Customer < ApplicationRecord has_many :sales validates_presence_of :name, :contact_no, :email,:card_no - validates :contact_no, uniqueness: true - validates :email, uniqueness: true + validates :contact_no, uniqueness: true, numericality: true + validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create } validates :card_no, uniqueness: true validates :paypar_account_no, uniqueness: true diff --git a/app/models/sale.rb b/app/models/sale.rb index fc064b96..82b9b781 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -666,7 +666,13 @@ end .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id") .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? OR sh.shift_closed_at between ? and ? )", from ,to, from, to) - + + if shift.present? + query = query.where("sales.sale_status = 'void' and s.shift_sale_id in (?)",shift.to_a) + else + query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) + end + out = {:items => account} sale_arr.push(out) return sale_arr diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index b99c25a3..5ec0b903 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -6,7 +6,7 @@
"> <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" + <% str="[\"#{msg['card_no']}\"]" str.gsub!('["', '') str.gsub!('"]', '') %> <%= str %> @@ -32,11 +32,12 @@ <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>
- +
"> <%= f.input :name, :class => "form-control col-md-6 name", :required => true %> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" + <% flash.each do |test, msg| %> + <% + str="[\"#{msg['name']}\"]" str.gsub!('["', '') str.gsub!('"]', '') %> <%= str %> @@ -80,7 +81,7 @@ <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%> <% flash.each do |name, msg| %> - <% str="[\"#{msg['contact_no']}\"]" + <% str="[\"#{msg['email']}\"]" str.gsub!('["', '') str.gsub!('"]', '') %> <%= str %> From 6ac35bb8741e7c327beff45d825097dc07bda81b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 31 Jul 2017 09:39:34 +0630 Subject: [PATCH 035/246] update receipt no twice and sale order double and report changes --- app/models/sale.rb | 18 +++++++++--------- app/models/seed_generator.rb | 2 +- app/views/reports/void_sale/index.html.erb | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 82b9b781..b23c630b 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -91,7 +91,7 @@ class Sale < ApplicationRecord add_item(item) end - link_order_sale(order.id) + # link_order_sale(order.id) end self.save! @@ -352,7 +352,7 @@ class Sale < ApplicationRecord if saleOrder.nil? sale_order = SaleOrder.new - sale_order.create_sale_order(self.id, order_id) + sale = sale_order.create_sale_order(self.id, order_id) end # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?) # SaleOrder.create(:sale_id => self.id, :order_id => order_id) @@ -662,18 +662,18 @@ end def self.get_void_sale(shift,from,to) sale_arr = Array.new - account= Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment") - .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id") - .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? - OR sh.shift_closed_at between ? and ? )", from ,to, from, to) + query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment") + # .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id") + # .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? + # OR sh.shift_closed_at between ? and ? )", from ,to, from, to) if shift.present? - query = query.where("sales.sale_status = 'void' and s.shift_sale_id in (?)",shift.to_a) + query = query.where("sales.sale_status = 'void' and sales.shift_sale_id in (?)",shift.to_a) else - query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) + query = query.where("sales.sale_status = 'void' and sales.receipt_date between ? and ? ",from,to) end - out = {:items => account} + out = {:items => query} sale_arr.push(out) return sale_arr end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 335ab131..a5bf5976 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -35,7 +35,7 @@ class SeedGenerator < ApplicationRecord else current_no = seed.next - seed.next = seed.next + seed.increase_by + seed.next = seed.next seed.current = current_no seed.save end diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index b008f5e8..4e33c27d 100644 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -31,8 +31,8 @@ <% end %> <% if @shift_from %> - <% if @shift.cashier_id %> - <% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %> + <% if @shift %> + <% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %> <% end %> Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> ) From df08569facf06c66b9d22653d76225ec60101b6e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 31 Jul 2017 10:37:47 +0630 Subject: [PATCH 036/246] update rake file for membership data --- app/views/transactions/sales/show.html.erb | 4 ++-- lib/tasks/menu_osaka.rake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index cbd07c41..0ea005c9 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -13,13 +13,13 @@ Back - +
diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 515abe53..9fe7da98 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -904,7 +904,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_account_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, From 24d6a530e734c2a0d585e9be412418da4840bc2e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 31 Jul 2017 13:14:36 +0630 Subject: [PATCH 037/246] update --- app/models/ability.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index bd3ce87e..1a6596ff 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -68,7 +68,9 @@ class Ability can :overall_void, :void elsif user.role == "cashier" -can :overall_void, :void + + # can :overall_void, :void + can :read, Order can :update, Order From bca21a664ea269be601478aedc955ac91d6cf1d7 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 31 Jul 2017 13:14:48 +0630 Subject: [PATCH 038/246] editing menu --- lib/tasks/menu_osaka.rake | 114 ++++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 47 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 515abe53..1f7603b8 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -19,76 +19,100 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz #Gyoza 12 Pcs menu_category1_menu_item6 = SimpleMenuItem.create({name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - # Cheese Gyoza 6pcs - menu_category1_menu_item2 = SimpleMenuItem.create({name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + #Gyoza 30 Pcs + menu_category1_menu_item20 = SimpleMenuItem.create({name: "Gyoza 30 Pcs", alt_name: "Gyoza 30 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) + #Green Onion Gyoza 6Pcs + menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:3500.0, is_on_promotion:false}]) + #Kimchi Mayo Gyoza 6Pcs + menu_category1_menu_item8 = SimpleMenuItem.create({name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3500.0, is_on_promotion:false}]) + #White Onion Gyoza 6Pcs + menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) + # Cheese Gyoza 6pcs + menu_category1_menu_item2 = SimpleMenuItem.create({name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) #Garlic Gyoza 6pcs menu_category1_menu_item26 = SimpleMenuItem.create({name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) - #Green Onion Gyoza 6Pcs - menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) - #Kimchi Mayo Gyoza 6Pcs - menu_category1_menu_item8 = SimpleMenuItem.create({name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) - #White Onion Gyoza 6Pcs - menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) - # Gyoza 3pcs - menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # Gyoza Salad + menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) # Gyoza 2pcs - menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) - # Curry Gyoza 6pcs - # menu_category1_menu_item3 = SimpleMenuItem.create({ name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) + # menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + # Gyoza dumpling soup with Udon + menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + # Gyoza dumpling soup with Udon + menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + # Gyoza dumpling soup + menu_category1_menu_item22 = SimpleMenuItem.create({name: "Gyoza dumpling soup", alt_name: "Gyoza dumpling soup",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}]) + # Gyoza dumpling tossed + menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling tossed", alt_name: "Gyoza dumpling tossed",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}]) + # Gyoza dumpling soup with Ramen + menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Ramen", alt_name: "Gyoza dumpling soup with Ramen",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}]) # Salad menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) - # S1-Glass Noodle Salad - menu_category1_menu_item37 = SimpleMenuItem.create({name: "S1-Glass Noodle Salad", alt_name: "S1-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) - # S2-Kimuchi - menu_category1_menu_item32 = SimpleMenuItem.create({ name: "S2-Kimuchi", alt_name: "S2-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # S1-Kimuchi + menu_category1_menu_item32 = SimpleMenuItem.create({ name: "S1-Kimuchi", alt_name: "S1-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item32, price:1000.00, is_on_promotion:false}]) - # S3-Bean Sprout Salad - menu_category1_menu_item33 = SimpleMenuItem.create({ name: " S3-Bean Sprout Salad", alt_name: " S3-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # S2-Bean Sprout Salad + menu_category1_menu_item33 = SimpleMenuItem.create({ name: " S2-Bean Sprout Salad", alt_name: " S2-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) + # S3-Edamame + menu_category1_menu_item36 = SimpleMenuItem.create({name: "S3-Edamame", alt_name: "S3-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2500.00, is_on_promotion:false}]) + # S4-Glass Noodle Salad + menu_category1_menu_item37 = SimpleMenuItem.create({name: "S4-Glass Noodle Salad", alt_name: "S4-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) + # Seaweed Salad + menu_category1_menu_item28 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) + # Apple Salad + menu_category1_menu_item27 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) # S4 Green Salad # menu_category1_menu_item34 = SimpleMenuItem.create({name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item34, price:2500.00, is_on_promotion:false}]) # S5-Otsumami Sansyu # menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) - # S6-Edamame - menu_category1_menu_item36 = SimpleMenuItem.create({name: "S6-Edamame", alt_name: "S6-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2000.00, is_on_promotion:false}]) + # Fried Tofu Salad menu_category1_menu_item31 = SimpleMenuItem.create({name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) - # Apple Salad - # menu_category1_menu_item27 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) - # Seaweed Salad - # menu_category1_menu_item28 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) - # BBQ Pork Salad + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + #BBQ Pork Salad menu_category1_menu_item29 = SimpleMenuItem.create({ name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) # Seafood Salad menu_category1_menu_item30 = SimpleMenuItem.create({name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) # Gyoza Salad - menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) + # menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) # Appetizer menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) + # A1 - Fried Tofu + menu_category1_menu_item55 = SimpleMenuItem.create({name: "A1-Fried Tofu", alt_name: "A1 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) + # A2 Fried Gyoza + menu_category1_menu_item57 = SimpleMenuItem.create({name: "A2-Fried Gyoza", alt_name: "A2 - Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) #A1 Pork Cutlet menu_category1_menu_item47 = SimpleMenuItem.create({name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) @@ -113,15 +137,11 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # A8 - Fried Chicken menu_category1_menu_item54 = SimpleMenuItem.create({name: "A8-Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) - # A9 - Fried Tofu - menu_category1_menu_item55 = SimpleMenuItem.create({name: "A9-Fried Tofu", alt_name: "A9 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) + # A 10 - Fried Potato menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) - # A11 Fried Gyoza - menu_category1_menu_item57 = SimpleMenuItem.create({name: "A11-Fried Gyoza", alt_name: "A11 - Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) + # A12 Chicken Cutlet menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) @@ -131,7 +151,7 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # Grilled Saba menu_category1_menu_item43 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) -# Yakitori + # Yakitori menu_category1_menu_item44 = SimpleMenuItem.create({name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) # Chicken Hamburg Steak From bc5a7d01f7810441897aa5489283d2279cb0e949 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 31 Jul 2017 14:35:02 +0630 Subject: [PATCH 039/246] update sale payment for rebate deleting puts --- app/models/sale_payment.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 74764785..50724f03 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -413,8 +413,7 @@ class SalePayment < ApplicationRecord rebate_arr.push(data) end - puts "ssssssssss" - puts rebate_arr.to_json + total_amount = rebate_prices - payparcost - overall_dis if credit == 1 @@ -455,8 +454,7 @@ class SalePayment < ApplicationRecord response = { "status": false, "message": "Can't connect server"} end return response - puts "latest respppppp" - puts response.to_json + end else response = { "status": "no_member", "message": "Not membership"} From a57831a3fc8d4900f957f18d8c4f5b0edc5e22e7 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 31 Jul 2017 15:49:36 +0630 Subject: [PATCH 040/246] fix for member --- app/controllers/crm/customers_controller.rb | 6 +- app/models/sale_payment.rb | 2 - lib/tasks/menu_osaka.rake | 388 +++++++++++--------- 3 files changed, 211 insertions(+), 185 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index d7a73ba0..6b9a3808 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -150,7 +150,11 @@ class Crm::CustomersController < BaseCrmController # When paypar account no not exist in paypar if response["message"] == "Account has not exist." customer.destroy - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]} + if params[:sale_id] + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]} + else + format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] } + end end if params[:sale_id] diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 50724f03..6b40cedf 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -411,7 +411,6 @@ class SalePayment < ApplicationRecord end rebate_arr.push(data) - end total_amount = rebate_prices - payparcost - overall_dis @@ -454,7 +453,6 @@ class SalePayment < ApplicationRecord response = { "status": false, "message": "Can't connect server"} end return response - end else response = { "status": "no_member", "message": "Not membership"} diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 77c8c348..d6c497d1 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -32,7 +32,7 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3500.0, is_on_promotion:false}]) #White Onion Gyoza 6Pcs menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) @@ -44,7 +44,7 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) # Gyoza Salad menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:0.0, is_on_promotion:false}]) # Gyoza 2pcs # menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) @@ -79,10 +79,10 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala menu_category1_menu_item37 = SimpleMenuItem.create({name: "S4-Glass Noodle Salad", alt_name: "S4-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) # Seaweed Salad - menu_category1_menu_item28 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item28 = SimpleMenuItem.create({name: "S5-Seaweed Salad", alt_name: "S5-Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) # Apple Salad - menu_category1_menu_item27 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item27 = SimpleMenuItem.create({name: "S6-Apple Salad", alt_name: "S6-Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) # S4 Green Salad # menu_category1_menu_item34 = SimpleMenuItem.create({name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) @@ -92,13 +92,13 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) # Fried Tofu Salad - menu_category1_menu_item31 = SimpleMenuItem.create({name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item31 = SimpleMenuItem.create({name: "S7-Fried Tofu Salad", alt_name: "S7-Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) #BBQ Pork Salad - menu_category1_menu_item29 = SimpleMenuItem.create({ name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item29 = SimpleMenuItem.create({ name: "S8-BBQ Pork Salad", alt_name: "S8-BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) # Seafood Salad - menu_category1_menu_item30 = SimpleMenuItem.create({name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item30 = SimpleMenuItem.create({name: "S9-Seafood Salad", alt_name: "S9-Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) # Gyoza Salad # menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) @@ -107,15 +107,37 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala # Appetizer menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) # A1 - Fried Tofu - menu_category1_menu_item55 = SimpleMenuItem.create({name: "A1-Fried Tofu", alt_name: "A1 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item55 = SimpleMenuItem.create({name: "A1-Fried Tofu", alt_name: "A1-Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) # A2 Fried Gyoza - menu_category1_menu_item57 = SimpleMenuItem.create({name: "A2-Fried Gyoza", alt_name: "A2 - Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item57 = SimpleMenuItem.create({name: "A2-Fried Gyoza", alt_name: "A2-Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) - #A1 Pork Cutlet - menu_category1_menu_item47 = SimpleMenuItem.create({name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) + # A3 - Fried Chicken + menu_category1_menu_item54 = SimpleMenuItem.create({name: "A3-Fried Chicken ", alt_name: "A3-Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) + #A4 Cutlet + menu_category1_menu_item47 = SimpleMenuItem.create({name: "A4-Cutlet", alt_name: "A4-Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) + # A5 Tempura Assortment + menu_category1_menu_item53 = SimpleMenuItem.create({name: "A5-Tempura Assortment ", alt_name: "A5-Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) + # A6 Party Set A + menu_category1_menu_item54 = SimpleMenuItem.create({name: "A6-Party Set A", alt_name: "A6-Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:0.00, is_on_promotion:false}]) + # A7 Party Set + menu_category1_menu_item55 = SimpleMenuItem.create({name: "A7-Party Set", alt_name: "A7-Party Set",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}]) + # A8 Wakatori Spring Chicken + menu_category1_menu_item56 = SimpleMenuItem.create({name: "A8-Wakatori Spring Chicken", alt_name: "A8-Wakatori Spring Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}]) + # A9 Ohsho Fried Chicken + menu_category1_menu_item57 = SimpleMenuItem.create({name: "A9-Ohsho Fried Chicken", alt_name: "A9-Ohsho Fried Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}]) + # A10 Fish & Chip + menu_category1_menu_item58 = SimpleMenuItem.create({name: "A10-Fish & Chip", alt_name: "A10-Fish & Chip",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}]) # A2 Kushi Katsu # menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) @@ -123,67 +145,61 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # menu_category1_menu_item49 = SimpleMenuItem.create({name: "A3 Croquette", alt_name: "A3 Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item49, price:3500.00, is_on_promotion:false}]) # A4 Fried Prawn - menu_category1_menu_item50 = SimpleMenuItem.create({name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) - # A5 Fried Soft Shell Crab - menu_category1_menu_item51 = SimpleMenuItem.create({name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) - # A6 Vegetable Tempura - menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) - # A7 Tempura Assortment - menu_category1_menu_item53 = SimpleMenuItem.create({name: "A7 Tempura Assortment ", alt_name: "A7 Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) - # A8 - Fried Chicken - menu_category1_menu_item54 = SimpleMenuItem.create({name: "A8-Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) + # menu_category1_menu_item50 = SimpleMenuItem.create({name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) + # # A5 Fried Soft Shell Crab + # menu_category1_menu_item51 = SimpleMenuItem.create({name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) + # # A6 Vegetable Tempura + # menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) - # A 10 - Fried Potato - menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) + # # A 10 - Fried Potato + # menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) - # A12 Chicken Cutlet - menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) - # Spicy Steamed Chicken - menu_category1_menu_item42 = SimpleMenuItem.create({name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) - # Grilled Saba - menu_category1_menu_item43 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) - # Yakitori - menu_category1_menu_item44 = SimpleMenuItem.create({name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) - # Chicken Hamburg Steak - menu_category1_menu_item45 = SimpleMenuItem.create({name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) - # Grilled Shishamo - menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) - # Party Set A - menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) - # Party Set B - menu_category1_menu_item39 = SimpleMenuItem.create({name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) - # Croquette - menu_category1_menu_item40 = SimpleMenuItem.create({name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) - # Fried Potato - menu_category1_menu_item41 = SimpleMenuItem.create({name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) + # # A12 Chicken Cutlet + # menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) + # # Spicy Steamed Chicken + # menu_category1_menu_item42 = SimpleMenuItem.create({name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) + # # Grilled Saba + # menu_category1_menu_item43 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) + # # Yakitori + # menu_category1_menu_item44 = SimpleMenuItem.create({name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) + # # Chicken Hamburg Steak + # menu_category1_menu_item45 = SimpleMenuItem.create({name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) + # # Grilled Shishamo + # menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) + # # Party Set A + # menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) + # # Party Set B + # menu_category1_menu_item39 = SimpleMenuItem.create({name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) + # # Croquette + # menu_category1_menu_item40 = SimpleMenuItem.create({name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) + # # Fried Potato + # menu_category1_menu_item41 = SimpleMenuItem.create({name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) # set -menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) - # Set A ( Soup + Gyoza 3 pcs) - menu_category1_menu_item60 = SimpleMenuItem.create({name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) - # Set B(Rice + Soup + Gyoza 3pcs) - menu_category1_menu_item61 = SimpleMenuItem.create({name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) - # Set C ( Rice + Soup + Salad + Gyoza 3pcs) - menu_category1_menu_item62 = SimpleMenuItem.create({name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) +# menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) +# # Set A ( Soup + Gyoza 3 pcs) +# menu_category1_menu_item60 = SimpleMenuItem.create({name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) +# # Set B(Rice + Soup + Gyoza 3pcs) +# menu_category1_menu_item61 = SimpleMenuItem.create({name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) +# # Set C ( Rice + Soup + Salad + Gyoza 3pcs) +# menu_category1_menu_item62 = SimpleMenuItem.create({name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) # Rice # menu_category1_menu_item63 = SimpleMenuItem.create({name: "Rice", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item63, price:500.00, is_on_promotion:false}]) @@ -197,44 +213,130 @@ menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", # A La Carte menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) # F1 Mabo Tofu - menu_category1_menu_item70 = SimpleMenuItem.create({name: "F1 Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item70, price:2900.00, is_on_promotion:false}]) - # F2 Black Vinegar Chicken - menu_category1_menu_item71 = SimpleMenuItem.create({name: "F2 Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item71, price:3900.00, is_on_promotion:false}]) - # Green Pepper Steak - menu_category1_menu_item72 = SimpleMenuItem.create({name: "Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3000.00, is_on_promotion:false}]) - # F4 Mabo Eggplant - menu_category1_menu_item73 = SimpleMenuItem.create({name: "F4 Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item73, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item70 = SimpleMenuItem.create({name: "F1-Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item70, price:3400.00, is_on_promotion:false}]) + # F2 Mabo Eggplant + menu_category1_menu_item73 = SimpleMenuItem.create({name: "F2-Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item73, price:3400.00, is_on_promotion:false}]) + # F3 Fried Egg with Pork + menu_category1_menu_item67 = SimpleMenuItem.create({name: "F3-Fried Egg", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category1_menu_item67, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef",menu_item: menu_category1_menu_item67, price:3400.00, is_on_promotion:false}]) + # F4 Black Vinegar Chicken + menu_category1_menu_item71 = SimpleMenuItem.create({name: "F4-Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item71, price:4400.00, is_on_promotion:false}]) # F5 Fried Vegetable - menu_category1_menu_item74 = SimpleMenuItem.create({name: "F5 Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item74 = SimpleMenuItem.create({name: "F5-Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item74, price:2500.00, is_on_promotion:false}]) - #F6 - Ebichili - menu_category1_menu_item75 = SimpleMenuItem.create({name: "F6 - Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) - # F7 Ebimayo - menu_category1_menu_item76 = SimpleMenuItem.create({name: "F7 Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # F6 Fried Pork Liver + menu_category1_menu_item77 = SimpleMenuItem.create({name: "F6-Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item77, price:3400.00, is_on_promotion:false}]) + # F7 - Fried Pork with Kimchi + menu_category1_menu_item78 = SimpleMenuItem.create({name: "F7-Fried Pork with Kimchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item78, price:3400.00, is_on_promotion:false}]) + # F8 Ebimayo + menu_category1_menu_item76 = SimpleMenuItem.create({name: "F8-Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item76, price:4900.00, is_on_promotion:false}]) - #F8 Fried Pork Liver - menu_category1_menu_item77 = SimpleMenuItem.create({name: "F8 Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item77, price:2900.00, is_on_promotion:false}]) - # F9 - Fried Pork with Kimuchi - menu_category1_menu_item78 = SimpleMenuItem.create({name: " F9 - Fried Pork with Kimuchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item78, price:2900.00, is_on_promotion:false}]) - # Fried Egg with Pork - menu_category1_menu_item67 = SimpleMenuItem.create({name: "Fried Egg with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item67, price:2900.00, is_on_promotion:false}]) - # Fried Eggplant with Pork - menu_category1_menu_item68 = SimpleMenuItem.create({name: " Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:2900.00, is_on_promotion:false}]) - # Spicy Fried Beef - menu_category1_menu_item69 = SimpleMenuItem.create({name: " Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:2900.00, is_on_promotion:false}]) - # Fried Egg with Beef - menu_category1_menu_item66 = SimpleMenuItem.create({name: "Fried Egg with Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2900.00, is_on_promotion:false}]) + # F9 - Ebichili + menu_category1_menu_item75 = SimpleMenuItem.create({name: "F9-Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) + # F10 Green Pepper Steak + menu_category1_menu_item72 = SimpleMenuItem.create({name: "F10-Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}]) + # F11 Fried Eggplant with Pork + menu_category1_menu_item68 = SimpleMenuItem.create({name: "F11-Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:0.00, is_on_promotion:false}]) + # F12 Spicy Fried Beef + menu_category1_menu_item69 = SimpleMenuItem.create({name: "F12-Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}]) + # F13 Fried Egg with Beef + menu_category1_menu_item66 = SimpleMenuItem.create({name: "F13-Fried Cabage with Konbu Taste", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}]) + +# Curry +menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) + # C1-Curry Rice + menu_category12_menu_item4 = SimpleMenuItem.create({name: "C1-Curry Rice", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item4, price:3500.00, is_on_promotion:false}]) + # C2-Katsu Curry + menu_category12_menu_item4 = SimpleMenuItem.create({name: "C2-Katsu Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category12_menu_item4, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category12_menu_item4, price:6000.00, is_on_promotion:false}]) + # C3-Fried Chicken Curry + menu_category12_menu_item3 = SimpleMenuItem.create({name: "C3-Fried Chicken Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item3, price:6000.00, is_on_promotion:false}]) + # C4-Fried Prawn Curry + menu_category12_menu_item5 = SimpleMenuItem.create({name: "C4-Fried Prawn Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item5, price:7400.00, is_on_promotion:false}]) + # C1-Pork Cutlet Curry + menu_category12_menu_item1 = SimpleMenuItem.create({name: "C1-Pork Cutlet Curry", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:5500.00, is_on_promotion:false}]) + # C2-Beef Curry + menu_category12_menu_item2 = SimpleMenuItem.create({name: "C2-Beef Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item2, price:5500.00, is_on_promotion:false}]) + + + # Chicken Cutlet Curry + menu_category12_menu_item6 = SimpleMenuItem.create({name: "Chicken Cutlet Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:5500.00, is_on_promotion:false}]) + +# Rice +menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) + # R1-Katsu Don + menu_category13_menu_item1 = SimpleMenuItem.create({name: "R1-Katsu Don", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item1, price:5900.00, is_on_promotion:false}]) + # R2-Beef Don + menu_category13_menu_item2 = SimpleMenuItem.create({name: "R2-Beef Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item2, price:4000.00, is_on_promotion:false}]) + # R3-Pork Don + menu_category13_menu_item3 = SimpleMenuItem.create({name: "R3-Pork Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item3, price:4000.00, is_on_promotion:false}]) + # R4- Chicken Cutlet Don + menu_category13_menu_item4 = SimpleMenuItem.create({name: "R4- Chicken Cutlet Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item4, price:5900.00, is_on_promotion:false}]) + # R5-Egg and Chicken Don + menu_category13_menu_item5 = SimpleMenuItem.create({name: "R5-Egg and Chicken Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) + # R6-Fried Prawn Don + menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) + # R7-Fried Rice + menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # R8-Kimuchi Fried Rice + menu_category13_menu_item8 = SimpleMenuItem.create({name: "R8-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}]) + # R9-Crab Tenshinhan + menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) + # R10-Crab Fried Rice + menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) + # Beef Fried Rice + menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + # Mabo Fried Rice + menu_category13_menu_item12 = SimpleMenuItem.create({name: "Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}]) + # Seafood Fried Rice + menu_category13_menu_item13 = SimpleMenuItem.create({name: "Seafood Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:6000.00, is_on_promotion:false}]) + # Mabo Tenshinhan + menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) + # KatsuCurry Tenshinhan + menu_category13_menu_item15 = SimpleMenuItem.create({name: "KatsuCurry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item15, price:7000.00, is_on_promotion:false}]) + # Fried Prawn Curry Tenshinhan + menu_category13_menu_item16 = SimpleMenuItem.create({name: "Fried Prawn Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) + # Fried Chicken Curry Tenshinhan + menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) + # Chicken Cutlet Curry Tenshinhan + menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) # Ramen menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) @@ -314,84 +416,6 @@ menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udo menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) -# Curry -menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) - # C1-Pork Cutlet Curry - menu_category12_menu_item1 = SimpleMenuItem.create({name: "C1-Pork Cutlet Curry", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:5500.00, is_on_promotion:false}]) - # C2-Beef Curry - menu_category12_menu_item2 = SimpleMenuItem.create({name: "C2-Beef Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item2, price:5500.00, is_on_promotion:false}]) - # C3-Fried Chicken Curry - menu_category12_menu_item3 = SimpleMenuItem.create({name: "C3-Fried Chicken Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item3, price:5500.00, is_on_promotion:false}]) - # C4-Curry Rice - menu_category12_menu_item4 = SimpleMenuItem.create({name: "C4-Curry Rice", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item4, price:3500.00, is_on_promotion:false}]) - # C5-Fried Prawn Curry - menu_category12_menu_item5 = SimpleMenuItem.create({name: "C5-Fried Prawn Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item5, price:6900.00, is_on_promotion:false}]) - # Chicken Cutlet Curry - menu_category12_menu_item6 = SimpleMenuItem.create({name: "Chicken Cutlet Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:5500.00, is_on_promotion:false}]) - -# Rice -menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) - # R1-Katsu Don - menu_category13_menu_item1 = SimpleMenuItem.create({name: "R1-Katsu Don", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item1, price:5900.00, is_on_promotion:false}]) - # R2-Beef Don - menu_category13_menu_item2 = SimpleMenuItem.create({name: "R2-Beef Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item2, price:4000.00, is_on_promotion:false}]) - # R3-Pork Don - menu_category13_menu_item3 = SimpleMenuItem.create({name: "R3-Pork Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item3, price:4000.00, is_on_promotion:false}]) - # R4- Chicken Cutlet Don - menu_category13_menu_item4 = SimpleMenuItem.create({name: "R4- Chicken Cutlet Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item4, price:5900.00, is_on_promotion:false}]) - # R5-Egg and Chicken Don - menu_category13_menu_item5 = SimpleMenuItem.create({name: "R5-Egg and Chicken Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) - # R6-Fried Prawn Don - menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) - # R7-Fried Rice - menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - # R8-Kimuchi Fried Rice - menu_category13_menu_item8 = SimpleMenuItem.create({name: "R8-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}]) - # R9-Crab Tenshinhan - menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) - # R10-Crab Fried Rice - menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) - # Beef Fried Rice - menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) - # Mabo Fried Rice - menu_category13_menu_item12 = SimpleMenuItem.create({name: "Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}]) - # Seafood Fried Rice - menu_category13_menu_item13 = SimpleMenuItem.create({name: "Seafood Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:6000.00, is_on_promotion:false}]) - # Mabo Tenshinhan - menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) - # KatsuCurry Tenshinhan - menu_category13_menu_item15 = SimpleMenuItem.create({name: "KatsuCurry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item15, price:7000.00, is_on_promotion:false}]) - # Fried Prawn Curry Tenshinhan - menu_category13_menu_item16 = SimpleMenuItem.create({name: "Fried Prawn Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) - # Fried Chicken Curry Tenshinhan - menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) - # Chicken Cutlet Curry Tenshinhan - menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) # Kids Set menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) From b3c77fc28c2c89b34bf508cd7b7a417bf72c926b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 31 Jul 2017 17:33:06 +0630 Subject: [PATCH 041/246] update lookup --- app/controllers/crm/customers_controller.rb | 10 ++++++-- .../settings/lookups_controller.rb | 10 ++++---- app/models/sale_payment.rb | 5 +--- app/views/settings/lookups/_form.html.erb | 2 +- app/views/settings/lookups/edit.html.erb | 2 +- app/views/settings/lookups/index.html.erb | 25 ++++++++++++------- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index d7a73ba0..ecc2a262 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -96,7 +96,8 @@ class Crm::CustomersController < BaseCrmController merchant_uid:merchant_uid,auth_token:auth_token}.to_json # Check for paypar account exists - if paypar_account_no != nil || paypar_account_no != '' + # if paypar_account_no != nil || paypar_account_no != '' + if paypar_account_no.present? member_params = { name: name,phone: phone,email: email, dob: dob,address: address,nrc:nrc,card_no:card_no, paypar_account_no: paypar_account_no, @@ -150,7 +151,12 @@ class Crm::CustomersController < BaseCrmController # When paypar account no not exist in paypar if response["message"] == "Account has not exist." customer.destroy - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]} + if params[:sale_id] + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]} + else + format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] } + end + end if params[:sale_id] diff --git a/app/controllers/settings/lookups_controller.rb b/app/controllers/settings/lookups_controller.rb index 2463d640..8eb98aed 100644 --- a/app/controllers/settings/lookups_controller.rb +++ b/app/controllers/settings/lookups_controller.rb @@ -28,11 +28,11 @@ class Settings::LookupsController < ApplicationController respond_to do |format| if @settings_lookup.save - format.html { redirect_to @settings_lookup, notice: 'Lookup was successfully created.' } + format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully created.' } format.json { render :show, status: :created, location: @settings_lookup } else format.html { render :new } - format.json { render json: @settings_lookup.errors, status: :unprocessable_entity } + format.json { render json: settings_lookups_path.errors, status: :unprocessable_entity } end end end @@ -42,11 +42,11 @@ class Settings::LookupsController < ApplicationController def update respond_to do |format| if @settings_lookup.update(settings_lookup_params) - format.html { redirect_to @settings_lookup, notice: 'Lookup was successfully updated.' } + format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully updated.' } format.json { render :show, status: :ok, location: @settings_lookup } else format.html { render :edit } - format.json { render json: @settings_lookup.errors, status: :unprocessable_entity } + format.json { render json: settings_lookups_path.errors, status: :unprocessable_entity } end end end @@ -56,7 +56,7 @@ class Settings::LookupsController < ApplicationController def destroy @settings_lookup.destroy respond_to do |format| - format.html { redirect_to settings_lookups_url, notice: 'Lookup was successfully destroyed.' } + format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 50724f03..fe86ab6c 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -400,10 +400,8 @@ class SalePayment < ApplicationRecord rebate_arr =[] campaign_method.each do |a| data = {:type => a[:type], :amount => a[:amount]} - puts data type_arr.each do |si| if si[:type] == a[:type] - puts "steeeeeeeeeeeee" amount = (redeem_amount / total_percentage)*si[:percentage] actual = a[:amount] - amount data[:amount] = actual @@ -413,7 +411,7 @@ class SalePayment < ApplicationRecord rebate_arr.push(data) end - + total_amount = rebate_prices - payparcost - overall_dis if credit == 1 @@ -454,7 +452,6 @@ class SalePayment < ApplicationRecord response = { "status": false, "message": "Can't connect server"} end return response - end else response = { "status": "no_member", "message": "Not membership"} diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb index e3b3e295..a21004f9 100644 --- a/app/views/settings/lookups/_form.html.erb +++ b/app/views/settings/lookups/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for(@settings_lookup) do |f| %> +<%= simple_form_for([:settings,@settings_lookup]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/lookups/edit.html.erb b/app/views/settings/lookups/edit.html.erb index e8b08f44..2998e489 100644 --- a/app/views/settings/lookups/edit.html.erb +++ b/app/views/settings/lookups/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', settings_lookup: @settings_lookup %> -<%= link_to 'Show', @settings_lookup %> | +<%= link_to 'Show', settings_lookup_path(@settings_lookup) %> | <%= link_to 'Back', settings_lookups_path %> diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index 9ac392a5..805c7560 100644 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -1,14 +1,23 @@ -

<%= notice %>

-

Settings Lookups

+
+
    +
  • Home
    • +
  • Account
    • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_lookup_path,:class => 'btn btn-primary btn-sm' %> + +
+
- - +
+
+
+ - + @@ -24,8 +33,6 @@ <% end %> -
Lookup type Name ValueAction
+ +
-
- -<%= link_to 'New Settings Lookup', new_settings_lookup_path %> From 2d6841a4c40245cee5af61e195ea10a8aefbaeda Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 31 Jul 2017 18:33:47 +0630 Subject: [PATCH 042/246] update --- app/controllers/crm/customers_controller.rb | 8 +++++--- db/seeds.rb | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index ecc2a262..dcc51950 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -245,13 +245,14 @@ end response = { status: false} end + customer = Customer.find(@crm_customer.customer_id) + if response["status"] == true - customer = Customer.find(@crm_customer.customer_id) + status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated'} else - customer = Customer.find(@crm_customer.customer_id) # Check membership id and bind to user if response["membership_id"] != nil status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) @@ -305,11 +306,12 @@ end format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } format.json { render :show, status: :ok, location: @crm_customer } else + customer = Customer.find(@crm_customer.customer_id) # Check membership id and bind to user if response["membership_id"] != nil status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) else - status = customer.update_attributes(membership_type:member_group_id) + status = customer.update_attributes(membership_type:member_group_id ) end format.html { redirect_to crm_customers_path, notice: response["message"] } end diff --git a/db/seeds.rb b/db/seeds.rb index 43d1fbdf..2828648f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -51,7 +51,11 @@ menu_item_type = Lookup.create([{lookup_type:'menu_item_type', name: 'SIMPLE', v {lookup_type:'menu_item_type', name: 'Set Menu', value: 'setMenu'}, {lookup_type:'menu_item_type', name: 'DIY', value: 'diy'}]) -member_group_type = Lookup.create([{lookup_type:'member_group_type', name: 'Normal', value: '1'}]) +member_group_type = Lookup.create([{lookup_type:'member_group_type', name: 'Normal', value: '1'}, + {lookup_type:'member_group_type', name: 'Platinum', value: '5'}, + {lookup_type:'member_group_type', name: 'Silver', value: '4'}, + {lookup_type:'member_group_type', name: 'Gold', value: '3'} + ]) #menu_item_attribute:[size|] menu_item_attribute_type = Lookup.create([{lookup_type:'menu_item_attribute_type', name: 'Size', value: 'size'}]) From ac21e14062dba3602c290c0b769189f683072a95 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 31 Jul 2017 19:30:26 +0630 Subject: [PATCH 043/246] update menu_osaka --- lib/tasks/menu_osaka.rake | 681 ++++++++++++++++++++++++-------------- 1 file changed, 429 insertions(+), 252 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index d6c497d1..c39d8f2f 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -268,157 +268,413 @@ menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Cur # C4-Fried Prawn Curry menu_category12_menu_item5 = SimpleMenuItem.create({name: "C4-Fried Prawn Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item5, price:7400.00, is_on_promotion:false}]) - # C1-Pork Cutlet Curry - menu_category12_menu_item1 = SimpleMenuItem.create({name: "C1-Pork Cutlet Curry", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # C5-Beef Curry + menu_category12_menu_item2 = SimpleMenuItem.create({name: "C5-Beef Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item2, price:6000.00, is_on_promotion:false}]) + # C6-Green Curry + menu_category12_menu_item5 = SimpleMenuItem.create({name: "C6-Green Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item5, price:0.00, is_on_promotion:false}]) + # C7-Mabo Tenshinhan + menu_category12_menu_item1 = SimpleMenuItem.create({name: "C7-Mabo Tenshinhan", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:5500.00, is_on_promotion:false}]) - # C2-Beef Curry - menu_category12_menu_item2 = SimpleMenuItem.create({name: "C2-Beef Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item2, price:5500.00, is_on_promotion:false}]) - - - # Chicken Cutlet Curry - menu_category12_menu_item6 = SimpleMenuItem.create({name: "Chicken Cutlet Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:5500.00, is_on_promotion:false}]) + # C8-Katsu Curry Tenshinhan + menu_category12_menu_item1 = SimpleMenuItem.create({name: "C8-Katsu Curry Tenshinhan", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:7000.00, is_on_promotion:false}]) + # C9-Fried Prawn Curry Tenshinhan + menu_category12_menu_item1 = SimpleMenuItem.create({name: "C8-Fried Prawn Curry Tenshinhan", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:7900.00, is_on_promotion:false}]) + # C10-Fried Chicken Curry Tenshinhan + menu_category12_menu_item6 = SimpleMenuItem.create({name: "C10-Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}]) # Rice menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) - # R1-Katsu Don - menu_category13_menu_item1 = SimpleMenuItem.create({name: "R1-Katsu Don", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item1, price:5900.00, is_on_promotion:false}]) - # R2-Beef Don - menu_category13_menu_item2 = SimpleMenuItem.create({name: "R2-Beef Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item2, price:4000.00, is_on_promotion:false}]) - # R3-Pork Don - menu_category13_menu_item3 = SimpleMenuItem.create({name: "R3-Pork Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item3, price:4000.00, is_on_promotion:false}]) - # R4- Chicken Cutlet Don - menu_category13_menu_item4 = SimpleMenuItem.create({name: "R4- Chicken Cutlet Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item4, price:5900.00, is_on_promotion:false}]) - # R5-Egg and Chicken Don - menu_category13_menu_item5 = SimpleMenuItem.create({name: "R5-Egg and Chicken Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) - # R6-Fried Prawn Don - menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) - # R7-Fried Rice - menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - # R8-Kimuchi Fried Rice - menu_category13_menu_item8 = SimpleMenuItem.create({name: "R8-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # R1-Fried Rice + menu_category13_menu_item7 = SimpleMenuItem.create({name: "R1-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # R2-Kimuchi Fried Rice + menu_category13_menu_item8 = SimpleMenuItem.create({name: "R2-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}]) - # R9-Crab Tenshinhan - menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) - # R10-Crab Fried Rice - menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) - # Beef Fried Rice - menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # R3-Beef Fried Rice + menu_category13_menu_item11 = SimpleMenuItem.create({name: "R3-Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) - # Mabo Fried Rice - menu_category13_menu_item12 = SimpleMenuItem.create({name: "Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # R4-Mabo Fried Rice + menu_category13_menu_item12 = SimpleMenuItem.create({name: "R4-Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}]) - # Seafood Fried Rice - menu_category13_menu_item13 = SimpleMenuItem.create({name: "Seafood Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # R5-Seafood Fried Rice + menu_category13_menu_item13 = SimpleMenuItem.create({name: "R5-Seafood Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:6000.00, is_on_promotion:false}]) - # Mabo Tenshinhan - menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) - # KatsuCurry Tenshinhan - menu_category13_menu_item15 = SimpleMenuItem.create({name: "KatsuCurry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item15, price:7000.00, is_on_promotion:false}]) - # Fried Prawn Curry Tenshinhan - menu_category13_menu_item16 = SimpleMenuItem.create({name: "Fried Prawn Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) - # Fried Chicken Curry Tenshinhan - menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) - # Chicken Cutlet Curry Tenshinhan - menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) + # R6-Chilli Basil Fried Rice + menu_category13_menu_item13 = SimpleMenuItem.create({name: "R6-Chilli Basil Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:3500.00, is_on_promotion:false}]) + # R7-Tomyan Fried Rice + menu_category13_menu_item13 = SimpleMenuItem.create({name: "R7-Tomyan Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:3500.00, is_on_promotion:false}]) + # R8-Rice Salad With Tea Leaf + menu_category13_menu_item13 = SimpleMenuItem.create({name: "R8-Rice Salad With Tea Leaf", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:3500.00, is_on_promotion:false}]) + # R9-Don + menu_category13_menu_item13 = SimpleMenuItem.create({name: "R9-Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef",menu_item: menu_category13_menu_item13, price:4500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category13_menu_item13, price:4500.00, is_on_promotion:false}]) + # R10-Katsu Don + menu_category13_menu_item1 = SimpleMenuItem.create({name: "R10-Katsu Don", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Port",menu_item: menu_category13_menu_item1, price:5900.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category13_menu_item1, price:5900.00, is_on_promotion:false}]) + # R11-Fried Prawn Don + menu_category13_menu_item13 = SimpleMenuItem.create({name: "R11-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:7400.00, is_on_promotion:false}]) + + # # R2-Beef Don + # menu_category13_menu_item2 = SimpleMenuItem.create({name: "R2-Beef Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item2, price:4000.00, is_on_promotion:false}]) + # # R3-Pork Don + # menu_category13_menu_item3 = SimpleMenuItem.create({name: "R3-Pork Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item3, price:4000.00, is_on_promotion:false}]) + # # R4- Chicken Cutlet Don + # menu_category13_menu_item4 = SimpleMenuItem.create({name: "R4- Chicken Cutlet Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item4, price:5900.00, is_on_promotion:false}]) + # # R5-Egg and Chicken Don + # menu_category13_menu_item5 = SimpleMenuItem.create({name: "R5-Egg and Chicken Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) + # # R6-Fried Prawn Don + # menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) + # # R7-Fried Rice + # menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + + # # R9-Crab Tenshinhan + # menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) + # # R10-Crab Fried Rice + # menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) + # # Beef Fried Rice + # menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + + + # # Mabo Tenshinhan + # menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) + # # KatsuCurry Tenshinhan + # menu_category13_menu_item15 = SimpleMenuItem.create({name: "KatsuCurry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item15, price:7000.00, is_on_promotion:false}]) + # # Fried Prawn Curry Tenshinhan + # menu_category13_menu_item16 = SimpleMenuItem.create({name: "Fried Prawn Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) + # # Fried Chicken Curry Tenshinhan + # menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) + # # Chicken Cutlet Curry Tenshinhan + # menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) # Ramen menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) # N1 - Sio Ramen - menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1-Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) # N2 Syoyu Ramen - menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2-Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) - # N3 Tonkotsu Ramen - menu_category1_menu_item83 = SimpleMenuItem.create({name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) - # N4-Fried Noodle with Thick Sauce - menu_category1_menu_item81 = SimpleMenuItem.create({name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + # N3 Miso Ramen + menu_category1_menu_item86 = SimpleMenuItem.create({name: "N3-Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) + # N4 Spicy Miso Ramen + menu_category1_menu_item000 = SimpleMenuItem.create({name: "N4-Spicy Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item000, price:5500.00, is_on_promotion:false}]) #N5 Curry Ramen menu_category1_menu_item84 = SimpleMenuItem.create({name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) - # N6 Spicy Curry Ramen - menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) - # N7 Miso Ramen - menu_category1_menu_item86 = SimpleMenuItem.create({name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) - # N8 Spicy Miso Ramen - menu_category1_menu_item000 = SimpleMenuItem.create({name: "N8-Spicy Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item000, price:5500.00, is_on_promotion:false}]) - # Cold Ramen - menu_category1_menu_item79 = SimpleMenuItem.create({name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # N6 Tonkotsu Ramen + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N6-Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) + # N7 Tomyan Ramen + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N7-Tomyan Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6000.00, is_on_promotion:false}]) + # N8 Kimchi Ramen + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N8-Kimchi Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:5500.00, is_on_promotion:false}]) + # N9 Gomoku Ramen + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N9-Gomoku Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:5500.00, is_on_promotion:false}]) + # N10 Ramen Tossed + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N9-Ramen Tossed", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}]) + # N11-Fried Noodle with Thick Sauce + menu_category1_menu_item81 = SimpleMenuItem.create({name: "N11-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + # # N6 Spicy Curry Ramen + # menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) + + # N12 Cold Ramen + menu_category1_menu_item79 = SimpleMenuItem.create({name: "N12-Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) # Ramen Topping menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) - # Green Onion - menu_category1_menu_item88 = SimpleMenuItem.create({name: "Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:400.00, is_on_promotion:false}]) - # Bamboo Shoot - menu_category1_menu_item89 = SimpleMenuItem.create({name: "Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # E1-Bamboo Shoot + menu_category1_menu_item89 = SimpleMenuItem.create({name: "E1-Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) - # Egg - menu_category1_menu_item90 = SimpleMenuItem.create({name: "Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) - # Extra Noodle - menu_category1_menu_item91 = SimpleMenuItem.create({name: "Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) - # BBQ Pork - menu_category1_menu_item92 = SimpleMenuItem.create({name: "BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # E2-BBQ Pork + menu_category1_menu_item92 = SimpleMenuItem.create({name: "E2-BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item92, price:1500.00, is_on_promotion:false}]) - # Half Egg - menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) + # E3-Extra Noodle + menu_category1_menu_item91 = SimpleMenuItem.create({name: "E3-Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) + # E4-Egg + menu_category1_menu_item90 = SimpleMenuItem.create({name: "E4-Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) + # E5-Green Onion + menu_category1_menu_item88 = SimpleMenuItem.create({name: "E5-Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:500.00, is_on_promotion:false}]) + + # # Half Egg + # menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) # Udon menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) # U1 Ebi Ten udon - menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1 Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1-Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) # U2 Vegetable Fried Udon - menu_category1_menu_item95 = SimpleMenuItem.create({name: "U2 Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item95 = SimpleMenuItem.create({name: "U2-Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item95, price:5000.00, is_on_promotion:false}]) # U3 Curry Udon - menu_category1_menu_item96 = SimpleMenuItem.create({name: "U3 Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item96, price:5500.00, is_on_promotion:false}]) + menu_category1_menu_item96 = SimpleMenuItem.create({name: "U3-Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item96, price:5900.00, is_on_promotion:false}]) # U4 Pork Fried Udon - menu_category1_menu_item97 = SimpleMenuItem.create({name: "U4 Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item97, price:4500.00, is_on_promotion:false}]) - # U5 Spicy Pork Fried Udon - menu_category1_menu_item98 = SimpleMenuItem.create({name: "U5 Spicy Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item98, price:4500.00, is_on_promotion:false}]) - # U6 Seafood Fried Udon - menu_category1_menu_item99 = SimpleMenuItem.create({name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) - # U7 Beef Frid Udon - menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7 Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) - # U8 Spicy Beef Fried Udon - menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item97 = SimpleMenuItem.create({name: "U4-Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item97, price:5000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Beef",menu_item: menu_category1_menu_item97, price:5000.00, is_on_promotion:false}]) + # U5 Seafood Fried Udon + menu_category1_menu_item99 = SimpleMenuItem.create({name: "U5-Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item99, price:5400.00, is_on_promotion:false}]) + # U6 Omelette Udon + menu_category1_menu_item98 = SimpleMenuItem.create({name: "U6-Omelette Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item98, price:3000.00, is_on_promotion:false}]) + # U7 Udon Tossed + menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7-Udon Tossed", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:2500.00, is_on_promotion:false}]) + # U8 Udon Salad + menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8-Udon Salad", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) +# Grilled +menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) + # Grilled Salmon + menu_category33_menu_item200 = SimpleMenuItem.create({name: "Y1-Grilled Salmon", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:12000.00, is_on_promotion:false}]) + # Grilled Garlic + menu_category33_menu_item201 = SimpleMenuItem.create({name: "Y2-Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Garlic",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) + # Grilled Shishamo + menu_category33_menu_item202 = SimpleMenuItem.create({name: "Y3-Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Shishamo",menu_item: menu_category33_menu_item202, price:5500.00, is_on_promotion:false}]) + # Grilled Saba + menu_category33_menu_item203 = SimpleMenuItem.create({name: "Y4-Grilled Saba", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Saba",menu_item: menu_category33_menu_item203, price:4500.00, is_on_promotion:false}]) + # Pork Yakiniku + menu_category33_menu_item204 = SimpleMenuItem.create({name: "Y5-Pork Yakiniku", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Yakiniku",menu_item: menu_category33_menu_item204, price:2500.00, is_on_promotion:false}]) + # Beef Yakiniku + menu_category33_menu_item205 = SimpleMenuItem.create({name: "Y6-Beef Yakiniku", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Yakiniku",menu_item: menu_category33_menu_item205, price:2500.00, is_on_promotion:false}]) + # Yakitori + menu_category33_menu_item206 = SimpleMenuItem.create({name: "Y7-Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}]) + # Yakitori Assortment + menu_category33_menu_item207 = SimpleMenuItem.create({name: "Y8-Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori Assortment",menu_item: menu_category33_menu_item207, price:4500.00, is_on_promotion:false}]) + # Shiitake mushroom (1 piece) + menu_category33_menu_item208 = SimpleMenuItem.create({name: "Y9-Shiitake mushroom", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shiitake mushroom",menu_item: menu_category33_menu_item208, price:3500.00, is_on_promotion:false}]) + # Lady finger (1 piece) + menu_category33_menu_item209 = SimpleMenuItem.create({name: "Y10-Lady finger", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lady finger",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) + # Chicken Satay (1 piece) + menu_category33_menu_item210 = SimpleMenuItem.create({name: "Y11-Chicken Satay", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lady finger",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) -# Kids Set -menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) +#Sushi +menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) + # Grilled Salmon Roll + menu_category30_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon Roll", alt_name: " ",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item200, price:7500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item200, price:4000.00, is_on_promotion:false}]) + # Sushi Tempura + menu_category30_menu_item202 = SimpleMenuItem.create({name: "Sushi Tempura", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item202, price:6500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item202, price:3500.00, is_on_promotion:false}]) + # Avocado Roll + menu_category30_menu_item201 = SimpleMenuItem.create({name: "Avocado Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item201, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item201, price:3000.00, is_on_promotion:false}]) + # Salmon Skin Roll + menu_category30_menu_item2011 = SimpleMenuItem.create({name: "Salmon Skin Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item2011, price:6500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item2011, price:3500.00, is_on_promotion:false}]) + # California Roll + menu_category30_menu_item205 = SimpleMenuItem.create({name: "California Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item205, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item205, price:2500.00, is_on_promotion:false}]) + # Fried Chicken Roll + menu_category30_menu_item208 = SimpleMenuItem.create({name: "Fried Chicken Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item208, price:5500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item208, price:3000.00, is_on_promotion:false}]) + # Jade Garden Roll + menu_category30_menu_item204 = SimpleMenuItem.create({name: "Jade Garden Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item204, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item204, price:2500.00, is_on_promotion:false}]) + # Fried Prawn Roll + menu_category30_menu_item203 = SimpleMenuItem.create({name: "Fried Prawn Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item203, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item203, price:3500.00, is_on_promotion:false}]) + # Special Sushi Roll + menu_category30_menu_item2012 = SimpleMenuItem.create({name: "Special Sushi Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Special Sushi Roll",menu_item: menu_category30_menu_item2012, price:2000.00, is_on_promotion:false}]) + # Salmon Roll + menu_category30_menu_item2013 = SimpleMenuItem.create({name: "Salmon Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Roll",menu_item: menu_category30_menu_item2013, price:1500.00, is_on_promotion:false}]) + # Red Dragon Roll + menu_category30_menu_item2014 = SimpleMenuItem.create({name: "Red Dragon Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Red Dragon Roll",menu_item: menu_category30_menu_item2014, price:3500.00, is_on_promotion:false}]) + # Tamago Nigiri + menu_category30_menu_item2015 = SimpleMenuItem.create({name: "Tamago Nigiri", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Tamago Nigiri",menu_item: menu_category30_menu_item2015, price:1500.00, is_on_promotion:false}]) + # Corn Salad Gunkan + menu_category30_menu_item2016 = SimpleMenuItem.create({name: "Corn Salad Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Corn Salad Gunkan",menu_item: menu_category30_menu_item2016, price:1500.00, is_on_promotion:false}]) + # Salmon Nigiri + menu_category30_menu_item2017 = SimpleMenuItem.create({name: "Salmon Nigiri", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Nigiri",menu_item: menu_category30_menu_item2017 price:2000.00, is_on_promotion:false}]) + # Seaweed Gunkan + menu_category30_menu_item2018 = SimpleMenuItem.create({name: "Seaweed Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Gunkan",menu_item: menu_category30_menu_item2018, price:2500.00, is_on_promotion:false}]) + # Kani Salad Gunkan + menu_category30_menu_item2019 = SimpleMenuItem.create({name: "Kani Salad Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kani Salad Gunkan",menu_item: menu_category30_menu_item2019, price:1500.00, is_on_promotion:false}]) + # Masago Gunkan + menu_category30_menu_item2020 = SimpleMenuItem.create({name: "Masago Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Masago Gunkan",menu_item: menu_category30_menu_item2020, price:2500.00, is_on_promotion:false}]) + # Sushi Set + menu_category30_menu_item2021 = SimpleMenuItem.create({name: "Sushi Set", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sushi Set",menu_item: menu_category30_menu_item2021, price:8000.00, is_on_promotion:false}]) + # # Philadelphia Roll + # menu_category30_menu_item206 = SimpleMenuItem.create({name: "Philadelphia Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Philadelphia Roll",menu_item: menu_category30_menu_item206, price:7500.00, is_on_promotion:false}]) + # # Soft Shell Crab Roll + # menu_category30_menu_item207 = SimpleMenuItem.create({name: "Soft Shell Crab Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soft Shell Crab Roll",menu_item: menu_category30_menu_item207, price:5500.00, is_on_promotion:false}]) + + # # Apple Salad + # menu_category30_menu_item209 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Apple Salad",menu_item: menu_category30_menu_item209, price:3500.00, is_on_promotion:false}]) + # # Seaweed Salad + # menu_category30_menu_item2010 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Salad",menu_item: menu_category30_menu_item2010, price:3000.00, is_on_promotion:false}]) + +# set +menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) + # Set A ( Soup + Gyoza 3 pcs) + menu_category1_menu_item60 = SimpleMenuItem.create({name: "Set A", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) + # Set B(Rice + Soup + Gyoza 3pcs) + menu_category1_menu_item61 = SimpleMenuItem.create({name: "Set B", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) + # Set C ( Rice + Soup + Salad + Gyoza 3pcs) + menu_category1_menu_item62 = SimpleMenuItem.create({name: "Set C", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) + # Kids Set A + menu_category1_menu_item63 = SimpleMenuItem.create({name: "Kids Set A", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item63, price:4000.00, is_on_promotion:false}]) + # Kids Set B + menu_category1_menu_item64 = SimpleMenuItem.create({name: "Kids Set B", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:4500.00, is_on_promotion:false}]) + +# Dessert +menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) + # D1-Banana Tempura With Ice Cream + menu_category11_menu_item200 = SimpleMenuItem.create({name: "D1-Banana Tempura With Ice Cream", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Banana Tempura With Ice Cream",menu_item: menu_category11_menu_item200, price:3500.00, is_on_promotion:false}]) + # D2-Ice Cream Chocolate + menu_category11_menu_item201 = SimpleMenuItem.create({name: "D2-Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + # D3-Seasonal Fruits + menu_category11_menu_item202 = SimpleMenuItem.create({name: "D3-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) + # D4-Banana Gyoza + menu_category15_menu_item202 = SimpleMenuItem.create({name: "D4-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D4-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) + # D5-Red Bean Gyoza + menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) + # D6-Peanuts Butter Gyoza + menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}]) + # D7-Coffee Jelly + menu_category15_menu_item206 = SimpleMenuItem.create({name: "D7-Coffee Jelly", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D7-Coffee Jelly",menu_item: menu_category15_menu_item206, price:1500.00, is_on_promotion:false}]) + # D8-Green Tea Jelly + menu_category15_menu_item207 = SimpleMenuItem.create({name: "D8-Green Tea Jelly", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Green Tea Jelly",menu_item: menu_category15_menu_item207, price:1500.00, is_on_promotion:false}]) + # D9-Coffee Jelly With Chocolate Scoop + menu_category15_menu_item208 = SimpleMenuItem.create({name: "D9-Coffee Jelly With Chocolate Scoop", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Coffee Jelly With Chocolate Scoop",menu_item: menu_category15_menu_item208, price:2000.00, is_on_promotion:false}]) + # D10-Green Tea Jelly With Green Tea Scoop + menu_category15_menu_item209 = SimpleMenuItem.create({name: "D10-Green Tea Jelly With Green Tea Scoop", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Green Tea Jelly With Green Tea Scoop",menu_item: menu_category15_menu_item209, price:2000.00, is_on_promotion:false}]) + # D11-Chocolate Pudding + menu_category15_menu_item210 = SimpleMenuItem.create({name: "D11-Chocolate Pudding", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Chocolate Pudding",menu_item: menu_category15_menu_item210, price:1500.00, is_on_promotion:false}]) + # D12-Mango Pudding + menu_category15_menu_item211 = SimpleMenuItem.create({name: "D12-Mango Pudding", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Mango Pudding",menu_item: menu_category15_menu_item211, price:1500.00, is_on_promotion:false}]) + # D13-Original Pudding + menu_category15_menu_item212= SimpleMenuItem.create({name: "D13-Original Pudding", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Original Pudding",menu_item: menu_category15_menu_item212, price:1500.00, is_on_promotion:false}]) + +# Extra +menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) + # Rice + menu_category16_menu_item200 = SimpleMenuItem.create({name: "Rice", alt_name: " ",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Rice",menu_item: menu_category16_menu_item200, price:500.00, is_on_promotion:false}]) + # Soup + menu_category16_menu_item201 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soup",menu_item: menu_category16_menu_item201, price:500.00, is_on_promotion:false}]) + # # Salad + # menu_category16_menu_item202 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salad",menu_item: menu_category16_menu_item202, price:500.00, is_on_promotion:false}]) + # # Curry + # menu_category16_menu_item203 = SimpleMenuItem.create({name: "Curry", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Curry",menu_item: menu_category16_menu_item203, price:3000.00, is_on_promotion:false}]) + # # Beef + # menu_category16_menu_item204 = SimpleMenuItem.create({name: "Beef", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef",menu_item: menu_category16_menu_item204, price:3500.00, is_on_promotion:false}]) + # # Pieces of Chicken + # menu_category16_menu_item205 = SimpleMenuItem.create({name: "Pieces of Chicken", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pieces of Chicken",menu_item: menu_category16_menu_item205, price:1000.00, is_on_promotion:false}]) + # # Pieces of Prawn + # menu_category16_menu_item206 = SimpleMenuItem.create({name: "Pieces of Prawn", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pieces of Prawn",menu_item: menu_category16_menu_item206, price:1500.00, is_on_promotion:false}]) + # # Ginger + # menu_category16_menu_item207 = SimpleMenuItem.create({name: "Ginger", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ginger",menu_item: menu_category16_menu_item207, price:500.00, is_on_promotion:false}]) + + +# # Kids Set +# menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) # Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs) menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) @@ -426,6 +682,27 @@ menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: " menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) +# Can Soda +menu_category55 = MenuCategory.create({menu: menu, name: "Float", alt_name: "Float", order_by: 2, created_by: "SYSTEM DEFAULT"}) + # Green Tea With Green Tea Scoop + menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Green Tea With Green Tea Scoop", alt_name: "Green Tea With Green Tea Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item10, price:3000.00, is_on_promotion:false}]) + # Coke With Chocolate Scoop + menu_category1_menu_item11 = SimpleMenuItem.create({name: "Coke With Chocolate Scoop", alt_name: "Coke With Chocolate Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item11, price:3000.00, is_on_promotion:false}]) + # Sprite With Vanilla Scoop + menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Sprite With Vanilla Scoop", alt_name: "Sprite With Vanilla Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:3000.0, is_on_promotion:false}]) + # Green Tea Frappe With GT Scoop + menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Green Tea Frappe With GT Scoop", alt_name: "Green Tea Frappe With GT Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:4900.00, is_on_promotion:false}]) + # Chocolate Frappe With Cho Scoop + menu_category1_menu_item14 = SimpleMenuItem.create({name: "Chocolate Frappe With Cho Scoop", alt_name: "Chocolate Frappe With Cho Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:4900.00, is_on_promotion:false}]) + # Hot Espresso With Vanilla Scoop + menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Hot Espresso With Vanilla Scoop", alt_name: "Hot Espresso With Vanilla Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:3000.0, is_on_promotion:false}]) + # Drink menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) # Lime Juice @@ -551,6 +828,7 @@ menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "C # Coke Zero menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) + # Sunkist menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) @@ -696,107 +974,42 @@ menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mango Smoothie",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) -#Sushi -menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) - # Grilled Salmon Roll - menu_category30_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon Roll", alt_name: " ",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon Roll",menu_item: menu_category30_menu_item200, price:7500.00, is_on_promotion:false}]) - # Avocado Roll - menu_category30_menu_item201 = SimpleMenuItem.create({name: "Avocado Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Avocado Roll",menu_item: menu_category30_menu_item201, price:5000.00, is_on_promotion:false}]) - # Sushi Tempura - menu_category30_menu_item202 = SimpleMenuItem.create({name: "Sushi Tempura", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sushi Tempura",menu_item: menu_category30_menu_item202, price:6500.00, is_on_promotion:false}]) - # Fried Prawn Roll - menu_category30_menu_item203 = SimpleMenuItem.create({name: "Fried Prawn Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Fried Prawn Roll",menu_item: menu_category30_menu_item203, price:7000.00, is_on_promotion:false}]) - # Jade Garden Roll - menu_category30_menu_item204 = SimpleMenuItem.create({name: "Jade Garden Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Jade Garden Roll",menu_item: menu_category30_menu_item204, price:5000.00, is_on_promotion:false}]) - # California Roll - menu_category30_menu_item205 = SimpleMenuItem.create({name: "California Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"California Roll",menu_item: menu_category30_menu_item205, price:5000.00, is_on_promotion:false}]) - # Philadelphia Roll - menu_category30_menu_item206 = SimpleMenuItem.create({name: "Philadelphia Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Philadelphia Roll",menu_item: menu_category30_menu_item206, price:7500.00, is_on_promotion:false}]) - # Soft Shell Crab Roll - menu_category30_menu_item207 = SimpleMenuItem.create({name: "Soft Shell Crab Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soft Shell Crab Roll",menu_item: menu_category30_menu_item207, price:5500.00, is_on_promotion:false}]) - # Fried Chicken Roll - menu_category30_menu_item208 = SimpleMenuItem.create({name: "Fried Chicken Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Fried Chicken Roll",menu_item: menu_category30_menu_item208, price:5500.00, is_on_promotion:false}]) - # Apple Salad - menu_category30_menu_item209 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Apple Salad",menu_item: menu_category30_menu_item209, price:3500.00, is_on_promotion:false}]) - # Seaweed Salad - menu_category30_menu_item2010 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Salad",menu_item: menu_category30_menu_item2010, price:3000.00, is_on_promotion:false}]) - # Salmon Skin Roll - menu_category30_menu_item2011 = SimpleMenuItem.create({name: "Salmon Skin Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Skin Roll",menu_item: menu_category30_menu_item2011, price:6500.00, is_on_promotion:false}]) -# Extra -menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) - # Rice - menu_category16_menu_item200 = SimpleMenuItem.create({name: "Rice", alt_name: " ",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Rice",menu_item: menu_category16_menu_item200, price:500.00, is_on_promotion:false}]) - # Soup - menu_category16_menu_item201 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soup",menu_item: menu_category16_menu_item201, price:500.00, is_on_promotion:false}]) - # Salad - menu_category16_menu_item202 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salad",menu_item: menu_category16_menu_item202, price:500.00, is_on_promotion:false}]) - # Curry - menu_category16_menu_item203 = SimpleMenuItem.create({name: "Curry", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Curry",menu_item: menu_category16_menu_item203, price:3000.00, is_on_promotion:false}]) - # Beef - menu_category16_menu_item204 = SimpleMenuItem.create({name: "Beef", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef",menu_item: menu_category16_menu_item204, price:3500.00, is_on_promotion:false}]) - # Pieces of Chicken - menu_category16_menu_item205 = SimpleMenuItem.create({name: "Pieces of Chicken", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pieces of Chicken",menu_item: menu_category16_menu_item205, price:1000.00, is_on_promotion:false}]) - # Pieces of Prawn - menu_category16_menu_item206 = SimpleMenuItem.create({name: "Pieces of Prawn", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pieces of Prawn",menu_item: menu_category16_menu_item206, price:1500.00, is_on_promotion:false}]) - # Ginger - menu_category16_menu_item207 = SimpleMenuItem.create({name: "Ginger", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ginger",menu_item: menu_category16_menu_item207, price:500.00, is_on_promotion:false}]) +# # Bar Dessert +# menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) +# # D4-Banana Tempura With Ice Cream +# menu_category11_menu_item200 = SimpleMenuItem.create({name: "D4-Banana Tempura With Ice Cream", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D4-Banana Tempura With Ice Cream",menu_item: menu_category11_menu_item200, price:3500.00, is_on_promotion:false}]) +# # D5-Ice Cream Chocolate +# menu_category11_menu_item201 = SimpleMenuItem.create({name: "D5-Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) +# # D6-Seasonal Fruits +# menu_category11_menu_item202 = SimpleMenuItem.create({name: "D6-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) +# # D7-Seasona Fruits with Ice Cream +# menu_category11_menu_item203 = SimpleMenuItem.create({name: "D7-Seasona Fruits with Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D7-Seasona Fruits with Ice Cream",menu_item: menu_category11_menu_item203, price:2000.00, is_on_promotion:false}]) +# # Ice Cream +# menu_category11_menu_item204 = SimpleMenuItem.create({name: "Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Cream",menu_item: menu_category11_menu_item204, price:800.00, is_on_promotion:false}]) -# Bar Dessert -menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) - # D4-Banana Tempura With Ice Cream - menu_category11_menu_item200 = SimpleMenuItem.create({name: "D4-Banana Tempura With Ice Cream", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D4-Banana Tempura With Ice Cream",menu_item: menu_category11_menu_item200, price:3500.00, is_on_promotion:false}]) - # D5-Ice Cream Chocolate - menu_category11_menu_item201 = SimpleMenuItem.create({name: "D5-Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) - menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) - # D6-Seasonal Fruits - menu_category11_menu_item202 = SimpleMenuItem.create({name: "D6-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) - # D7-Seasona Fruits with Ice Cream - menu_category11_menu_item203 = SimpleMenuItem.create({name: "D7-Seasona Fruits with Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D7-Seasona Fruits with Ice Cream",menu_item: menu_category11_menu_item203, price:2000.00, is_on_promotion:false}]) - # Ice Cream - menu_category11_menu_item204 = SimpleMenuItem.create({name: "Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Cream",menu_item: menu_category11_menu_item204, price:800.00, is_on_promotion:false}]) - -# Kitchen Dessert -menu_category15 = MenuCategory.create({menu: menu, name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) - # D1-Peanuts Butter Gyoza - menu_category15_menu_item200 = SimpleMenuItem.create({name: "D1-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item200, price:3000.00, is_on_promotion:false}]) - # D2-Red Bean Gyoza - menu_category15_menu_item201 = SimpleMenuItem.create({name: "D2-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) - # D3-Banana Gyoza - menu_category15_menu_item202 = SimpleMenuItem.create({name: "D3-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) - # Dessert Gyoza 2Pcs - menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) +# # Kitchen Dessert +# menu_category15 = MenuCategory.create({menu: menu, name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) +# # D1-Peanuts Butter Gyoza +# menu_category15_menu_item200 = SimpleMenuItem.create({name: "D1-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item200, price:3000.00, is_on_promotion:false}]) +# # D2-Red Bean Gyoza +# menu_category15_menu_item201 = SimpleMenuItem.create({name: "D2-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) +# # D3-Banana Gyoza +# menu_category15_menu_item202 = SimpleMenuItem.create({name: "D3-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) +# # Dessert Gyoza 2Pcs +# menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) # Beer menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) @@ -850,42 +1063,6 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine menu_category32_menu_item203 = SimpleMenuItem.create({name: "PINOT NOIR", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"PINOT NOIR",menu_item: menu_category32_menu_item203, price:25000.00, is_on_promotion:false}]) -# Grilled -menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) - # Grilled Salmon - menu_category33_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:13000.00, is_on_promotion:false}]) - # Grilled Garlic - menu_category33_menu_item201 = SimpleMenuItem.create({name: "Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Garlic",menu_item: menu_category33_menu_item201, price:1500.00, is_on_promotion:false}]) - # Grilled Shishamo - menu_category33_menu_item202 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Shishamo",menu_item: menu_category33_menu_item202, price:3800.00, is_on_promotion:false}]) - # Grilled Saba - menu_category33_menu_item203 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Saba",menu_item: menu_category33_menu_item203, price:4800.00, is_on_promotion:false}]) - # Pork Yakiniku - menu_category33_menu_item204 = SimpleMenuItem.create({name: "Pork Yakiniku", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Yakiniku",menu_item: menu_category33_menu_item204, price:600.00, is_on_promotion:false}]) - # Beef Yakiniku - menu_category33_menu_item205 = SimpleMenuItem.create({name: "Beef Yakiniku", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Yakiniku",menu_item: menu_category33_menu_item205, price:700.00, is_on_promotion:false}]) - # Yakitori - menu_category33_menu_item206 = SimpleMenuItem.create({name: "Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:600.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:600.00, is_on_promotion:false}]) - menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:600.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3800.00, is_on_promotion:false}]) - # Yakitori Assortment - menu_category33_menu_item207 = SimpleMenuItem.create({name: "Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori Assortment",menu_item: menu_category33_menu_item207, price:5000.00, is_on_promotion:false}]) - # Shiitake mushroom (1 piece) - menu_category33_menu_item208 = SimpleMenuItem.create({name: "Shiitake mushroom (1 piece)", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shiitake mushroom (1 piece)",menu_item: menu_category33_menu_item208, price:600.00, is_on_promotion:false}]) - # Lady finger (1 piece) - menu_category33_menu_item209 = SimpleMenuItem.create({name: "Lady finger (1 piece)", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lady finger (1 piece)",menu_item: menu_category33_menu_item209, price:600.00, is_on_promotion:false}]) - #discount # menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) @@ -950,8 +1127,8 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_account_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, - {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, - {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:5},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:5},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://staging.membership.paypar.ws"}) From 86f1faea372bd67bb6679c0a86fc7bd7d77c8b11 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 31 Jul 2017 20:40:45 +0630 Subject: [PATCH 044/246] update rake menu --- lib/tasks/menu_osaka.rake | 366 +++++++++++++++++++++----------------- 1 file changed, 199 insertions(+), 167 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index c39d8f2f..4eceef57 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -682,7 +682,7 @@ menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Ext menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) -# Can Soda +# Float menu_category55 = MenuCategory.create({menu: menu, name: "Float", alt_name: "Float", order_by: 2, created_by: "SYSTEM DEFAULT"}) # Green Tea With Green Tea Scoop menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Green Tea With Green Tea Scoop", alt_name: "Green Tea With Green Tea Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) @@ -703,8 +703,86 @@ menu_category55 = MenuCategory.create({menu: menu, name: "Float", alt_name: "Flo menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Hot Espresso With Vanilla Scoop", alt_name: "Hot Espresso With Vanilla Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:3000.0, is_on_promotion:false}]) +# Hot Drinks +menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) + # Green Tea Pot + menu_category17_menu_item2 = SimpleMenuItem.create({name: "Green Tea Pot", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea Pot",menu_item: menu_category17_menu_item2, price:1500.00, is_on_promotion:false}]) + # Hot Coffee + menu_category17_menu_item14 = SimpleMenuItem.create({name: "Hot Coffee", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Coffee",menu_item: menu_category17_menu_item14, price:1500.00, is_on_promotion:false}]) + # Hot Chocolate + menu_category17_menu_item9 = SimpleMenuItem.create({name: "Hot Chocolate", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Chocolate",menu_item: menu_category17_menu_item9, price:2500.00, is_on_promotion:false}]) + # Espresso + menu_category17_menu_item1 = SimpleMenuItem.create({name: "Espresso", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Espresso",menu_item: menu_category17_menu_item1, price:1500.00, is_on_promotion:false}]) + # Cafe' Americano + menu_category17_menu_item3 = SimpleMenuItem.create({name: "Cafe' Americano", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Americano",menu_item: menu_category17_menu_item3, price:1800.00, is_on_promotion:false}]) + # Double Espresso + menu_category17_menu_item4 = SimpleMenuItem.create({name: "Double Espresso", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Double Espresso",menu_item: menu_category17_menu_item4, price:2000.00, is_on_promotion:false}]) + # Cappuccino + menu_category17_menu_item5 = SimpleMenuItem.create({name: "Cappuccino", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) + # Cafe' latte + menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' latte",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) + # Matcha latte + menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Matcha latte",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) + # Cafe' Mocha + menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Mocha",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) + # Flavor latte + menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Almond)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butter scotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + # Roasted Almond Matchal latte + menu_category17_menu_item12 = SimpleMenuItem.create({name: "Roasted Almond", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Roasted Almond",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) + # Coconut Matcha latte + menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Coconut Matcha",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) + +# Cold Drinks +menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) +# Cold Coffee + menu_category1_menu_item26 = SimpleMenuItem.create({name: "Cold Coffee", alt_name: "Cold Coffee",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item26, price:1800.00, is_on_promotion:false}]) + # Ice Lemon Tea + menu_category1_menu_item24 = SimpleMenuItem.create({name: "Ice Lemon Tea", alt_name: "Ice Lemon Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item24, price:1800.00, is_on_promotion:false}]) + # Sassy High Tea + menu_category1_menu_item25 = SimpleMenuItem.create({name: "Sassy High Tea", alt_name: "Sassy High Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item25, price:2300.00, is_on_promotion:false}]) + # Ice Cappuccino + menu_category1_menu_item18 = SimpleMenuItem.create({name: "Ice Cappuccino", alt_name: "Ice Cappuccino",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item18, price:3000.00, is_on_promotion:false}]) + # Ice Cafe Latte + menu_category1_menu_item19 = SimpleMenuItem.create({name: "Ice Cafe Latte", alt_name: "Ice Cafe Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item19, price:3000.00, is_on_promotion:false}]) + # Ice Cafe Mocha + menu_category1_menu_item20 = SimpleMenuItem.create({name: "Ice Cafe Mocha", alt_name: "Ice Cafe Mocha",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item20, price:3500.00, is_on_promotion:false}]) + # Ice Flavor Latte + menu_category1_menu_item21 = SimpleMenuItem.create({name: "Ice Flavor Latte", alt_name: "Ice Flavor Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hazelut",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Almond",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + # Ice Espresso + menu_category1_menu_item22 = SimpleMenuItem.create({name: "Ice Espresso", alt_name: "Ice Espresso",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item22, price:2000.00, is_on_promotion:false}]) + # Ice Americano + menu_category1_menu_item23 = SimpleMenuItem.create({name: "Ice Americano", alt_name: "Ice Americano",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item23, price:2000.00, is_on_promotion:false}]) + # Drink -menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) +menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seasonal)", alt_name: "Drink(Fresh Juice Seasonal)", order_by: 20, created_by: "SYSTEM DEFAULT"}) # Lime Juice menu_category20_menu_item1 = SimpleMenuItem.create({name: "Lime Juice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item1, price:1500.00, is_on_promotion:false}]) @@ -735,87 +813,88 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Dri # Lime Soda menu_category20_menu_item11 = SimpleMenuItem.create({name: "Lime Soda", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) - # Ice - menu_category20_menu_item12 = SimpleMenuItem.create({name: "Ice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item12, price:500.00, is_on_promotion:false}]) - # Green Apple Juice - menu_category20_menu_item13 = SimpleMenuItem.create({name: "Green Apple Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item13, price:1500.00, is_on_promotion:false}]) - # Snow Tower - menu_category20_menu_item14 = SimpleMenuItem.create({name: "Snow Tower", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) + # # Ice + # menu_category20_menu_item12 = SimpleMenuItem.create({name: "Ice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item12, price:500.00, is_on_promotion:false}]) + # # Green Apple Juice + # menu_category20_menu_item13 = SimpleMenuItem.create({name: "Green Apple Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item13, price:1500.00, is_on_promotion:false}]) + # # Snow Tower + # menu_category20_menu_item14 = SimpleMenuItem.create({name: "Snow Tower", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) -# Hot Drinks -menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) - # Espresso - menu_category17_menu_item1 = SimpleMenuItem.create({name: "Espresso", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Espresso",menu_item: menu_category17_menu_item1, price:1500.00, is_on_promotion:false}]) - # Green Tea Pot - menu_category17_menu_item2 = SimpleMenuItem.create({name: "Green Tea Pot", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea Pot",menu_item: menu_category17_menu_item2, price:1500.00, is_on_promotion:false}]) - # Cafe' Americano - menu_category17_menu_item3 = SimpleMenuItem.create({name: "Cafe' Americano", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Americano",menu_item: menu_category17_menu_item3, price:1800.00, is_on_promotion:false}]) - # Double Espresso - menu_category17_menu_item4 = SimpleMenuItem.create({name: "Double Espresso", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Double Espresso",menu_item: menu_category17_menu_item4, price:2000.00, is_on_promotion:false}]) - # Cappuccino - menu_category17_menu_item5 = SimpleMenuItem.create({name: "Cappuccino", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) - # Cafe' latte - menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' latte",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) - # Matcha latte - menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Matcha latte",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) - # Hot Chocolate - menu_category17_menu_item9 = SimpleMenuItem.create({name: "Hot Chocolate", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Chocolate",menu_item: menu_category17_menu_item9, price:2500.00, is_on_promotion:false}]) - # Cafe' Mocha - menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Mocha",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) - # Flavor latte - menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazelnut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) - menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Almond)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butterscotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) - # Roasted Almond Matchal latte - menu_category17_menu_item12 = SimpleMenuItem.create({name: "Roasted Almond Matchal latte", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Roasted Almond Matchal latte",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) - # Coconut Matcha latte - menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Coconut Matcha latte",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) +#Smoothies +menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) + # Berry Sunshine Smoothie + menu_category23_menu_item204 = SimpleMenuItem.create({name: "Berry Sunshine Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Berry Sunshine Smoothie",menu_item: menu_category23_menu_item204, price:3500.00, is_on_promotion:false}]) + # Mixederry smoothie + menu_category23_menu_item202 = SimpleMenuItem.create({name: "Mixedberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mixedberry smoothie",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) + # Strawberry smoothie + menu_category23_menu_item200 = SimpleMenuItem.create({name: "Strawberry smoothie", alt_name: " ",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Strawberry smoothie",menu_item: menu_category23_menu_item200, price:3500.00, is_on_promotion:false}]) + # Passion fruit smoothie + menu_category23_menu_item201 = SimpleMenuItem.create({name: "Passion fruit smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Passion fruit smoothie",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) + # Mango Smoothie + menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mango Smoothie",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) + # Blueberry smoothie + menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Blueberry smoothie",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) -# Cold Drinks -menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) - # Ice Cappuccino - menu_category1_menu_item18 = SimpleMenuItem.create({name: "Ice Cappuccino", alt_name: "Ice Cappuccino",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item18, price:3000.00, is_on_promotion:false}]) - # Ice Cafe Latte - menu_category1_menu_item19 = SimpleMenuItem.create({name: "Ice Cafe Latte", alt_name: "Ice Cafe Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item19, price:3000.00, is_on_promotion:false}]) - # Ice Cafe Mocha - menu_category1_menu_item20 = SimpleMenuItem.create({name: "Ice Cafe Mocha", alt_name: "Ice Cafe Mocha",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item20, price:3500.00, is_on_promotion:false}]) - # Ice Flavor Latte - menu_category1_menu_item21 = SimpleMenuItem.create({name: "Ice Flavor Latte", alt_name: "Ice Flavor Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hazelut",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Almond",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - # Ice Espresso - menu_category1_menu_item22 = SimpleMenuItem.create({name: "Ice Espresso", alt_name: "Ice Espresso",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item22, price:2000.00, is_on_promotion:false}]) - # Ice Americano - menu_category1_menu_item23 = SimpleMenuItem.create({name: "Ice Americano", alt_name: "Ice Americano",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item23, price:2000.00, is_on_promotion:false}]) - # Ice Lemon Tea - menu_category1_menu_item24 = SimpleMenuItem.create({name: "Ice Lemon Tea", alt_name: "Ice Lemon Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item24, price:2000.00, is_on_promotion:false}]) - # Sassy High Tea - menu_category1_menu_item25 = SimpleMenuItem.create({name: "Sassy High Tea", alt_name: "Sassy High Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item25, price:2500.00, is_on_promotion:false}]) +#Frappe +menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) + # Cappuccino Frappe + menu_category27_menu_item200 = SimpleMenuItem.create({name: "Cappuccino Frappe", alt_name: " ",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino Frappe",menu_item: menu_category27_menu_item200, price:3900.00, is_on_promotion:false}]) + # Caramel frappe + menu_category27_menu_item201 = SimpleMenuItem.create({name: "Caramel frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel frappe",menu_item: menu_category27_menu_item201, price:3900.00, is_on_promotion:false}]) + # Mocha frappe + menu_category27_menu_item205 = SimpleMenuItem.create({name: "Mocha frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mocha frappe",menu_item: menu_category27_menu_item205, price:3900.00, is_on_promotion:false}]) + # Green Tea frappe + menu_category27_menu_item202 = SimpleMenuItem.create({name: "Green Tea frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea frappe",menu_item: menu_category27_menu_item202, price:3900.00, is_on_promotion:false}]) + # KBanoffee + menu_category27_menu_item203 = SimpleMenuItem.create({name: "Banoffee Frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Banoffee Frappe",menu_item: menu_category27_menu_item203, price:3900.00, is_on_promotion:false}]) + # Butterscotch Popcorn frappe + menu_category27_menu_item204 = SimpleMenuItem.create({name: "Butterscotch Popcorn Frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch Popcorn frappe",menu_item: menu_category27_menu_item204, price:3900.00, is_on_promotion:false}]) + # Chocolate frappe + menu_category27_menu_item206 = SimpleMenuItem.create({name: "Chocolate frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chocolate frappe",menu_item: menu_category27_menu_item206, price:3900.00, is_on_promotion:false}]) + +# Italian Soda +menu_category2 = MenuCategory.create({menu: menu, name: "Italian Soda", alt_name: "Italian Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) + # Blue Sky + menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Blue Sky", alt_name: "Blue Sky",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item10, price:2500.00, is_on_promotion:false}]) + # Ruby Land + menu_category1_menu_item11 = SimpleMenuItem.create({name: "Ruby Land", alt_name: "Ruby Land",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item11, price:2500.00, is_on_promotion:false}]) + # Mintberry + menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Mintberry", alt_name: "Mintberry",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:2500.0, is_on_promotion:false}]) + +# Strawberry + menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Strawberry", alt_name: "Strawberry",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:2500.00, is_on_promotion:false}]) +# Raspberry + menu_category1_menu_item14 = SimpleMenuItem.create({ name: "Raspberry", alt_name: "Raspberry",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:2500.00, is_on_promotion:false}]) +# Blueberry + menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Blueberry", alt_name: "Blueberry",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:2500.00, is_on_promotion:false}]) +#Green Apple + menu_category1_menu_item16 = SimpleMenuItem.create({ name: "Green Apple", alt_name: "Green Apple",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item16, price:2500.00, is_on_promotion:false}]) +# Passion + menu_category1_menu_item17 = SimpleMenuItem.create({name: "Passion", alt_name: "Passion",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:2500.00, is_on_promotion:false}]) # Can Soda menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "Can Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) @@ -828,23 +907,58 @@ menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "C # Coke Zero menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) - # Sunkist menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) # Sprite menu_category1_menu_item14 = SimpleMenuItem.create({ name: "Sprite", alt_name: "Sprite",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:1000.00, is_on_promotion:false}]) +# Soda Water + menu_category1_menu_item17 = SimpleMenuItem.create({name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) # Pocari Sweat menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Pocari Sweat", alt_name: "Pocari Sweat",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:1000.00, is_on_promotion:false}]) #Green Tea menu_category1_menu_item16 = SimpleMenuItem.create({ name: "Green Tea", alt_name: "Green Tea",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item16, price:2000.00, is_on_promotion:false}]) -# Soda Water - menu_category1_menu_item17 = SimpleMenuItem.create({name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) +# Beer +menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) + # Myanmar Premium Draft Beer + menu_category18_menu_item200 = SimpleMenuItem.create({name: "Myanmar Premium Draft Beer", alt_name: " ",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Premium Draft Beer",menu_item: menu_category18_menu_item200, price:1500.00, is_on_promotion:false}]) + # Kirin Ichiban Draft Beer + menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kirin Ichiban Draft Beer",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) + # Myanmar Beer + menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Beer",menu_item: menu_category18_menu_item202, price:2000.00, is_on_promotion:false}]) + # Tuborg Beer + menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Tuborg Beer",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) + # # Wine by the Glass + # menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) + +#Japanese Sake +menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) + # Kha Ka Bora Fresh Shochu 18% 360ml + menu_category25_menu_item203 = SimpleMenuItem.create({name: "Kha Ka Bora Fresh Shochu 18% 360ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kha Ka Bora Fresh Shochu 18% 360ml",menu_item: menu_category25_menu_item203, price:3200.00, is_on_promotion:false}]) + # Shwe Yi Soba Shochu 36% 700ml + menu_category25_menu_item204 = SimpleMenuItem.create({name: "Shwe Yi Soba Shochu 36% 700ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shwe Yi Soba Shochu 36% 700ml",menu_item: menu_category25_menu_item204, price:7500.00, is_on_promotion:false}]) + # Sawanotsuru Fresh 300mml + menu_category25_menu_item202 = SimpleMenuItem.create({name: "Sawanotsuru Fresh 300mml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sawanotsuru Fresh 300mml",menu_item: menu_category25_menu_item202, price:9000.00, is_on_promotion:false}]) + # Kurokirishima Imo Shochu 720ml + menu_category25_menu_item201 = SimpleMenuItem.create({name: "Kurokirishima Imo Shochu 720ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kurokirishima Imo Shochu 720ml",menu_item: menu_category25_menu_item201, price:29000.00, is_on_promotion:false}]) + # Lichiko Silhouette 720ml + menu_category25_menu_item200 = SimpleMenuItem.create({name: "Lichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lichiko Silhouette 720ml",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) + # Cocktail menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) # Moscow's Sky @@ -902,24 +1016,6 @@ menu_category21 = MenuCategory.create({menu: menu, name: "Whisky", alt_name: "Wh menu_category21_menu_item208 = SimpleMenuItem.create({name: "DOUBLE BLACK", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"DOUBLE BLACK",menu_item: menu_category21_menu_item208, price:48000.00, is_on_promotion:false}]) -#Japanese Sake & Shochu -menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) - # Iichiko Silhouette 720ml - menu_category25_menu_item200 = SimpleMenuItem.create({name: "Iichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Iichiko Silhouette 720ml",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) - # Kurokirishima Imo Shochu 720ml - menu_category25_menu_item201 = SimpleMenuItem.create({name: "Kurokirishima Imo Shochu 720ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kurokirishima Imo Shochu 720ml",menu_item: menu_category25_menu_item201, price:29000.00, is_on_promotion:false}]) - # Sawanotsuru Fresh 300ml - menu_category25_menu_item202 = SimpleMenuItem.create({name: "Sawanotsuru Fresh 300ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sawanotsuru Fresh 300ml",menu_item: menu_category25_menu_item202, price:9000.00, is_on_promotion:false}]) - # Kha Ka Bora Soba Fresh Shochu - menu_category25_menu_item203 = SimpleMenuItem.create({name: "Kha Ka Bora Soba Fresh Shochu", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kha Ka Bora Soba Fresh Shochu",menu_item: menu_category25_menu_item203, price:2500.00, is_on_promotion:false}]) - # Shwe Yi Soba Shochu - menu_category25_menu_item204 = SimpleMenuItem.create({name: "Shwe Yi Soba Shochu", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shwe Yi Soba Shochu",menu_item: menu_category25_menu_item204, price:7000.00, is_on_promotion:false}]) - #Breakfast Kitchen menu_category28 = MenuCategory.create({menu: menu, name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) # Ham and Cheese Sandwich with French Fries @@ -929,52 +1025,6 @@ menu_category28 = MenuCategory.create({menu: menu, name: "Breakfast Kitchen", al menu_category28_menu_item201 = SimpleMenuItem.create({name: "Grilled Cheese Sandwich with French Fries", alt_name: "",menu_category: menu_category28 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Cheese Sandwich with French Fries",menu_item: menu_category28_menu_item201, price:3500.00, is_on_promotion:false}]) -#Frappe -menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) - # Cappuccino Frappe - menu_category27_menu_item200 = SimpleMenuItem.create({name: "Cappuccino Frappe", alt_name: " ",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino Frappe",menu_item: menu_category27_menu_item200, price:3900.00, is_on_promotion:false}]) - # Caramel frappe - menu_category27_menu_item201 = SimpleMenuItem.create({name: "Caramel frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel frappe",menu_item: menu_category27_menu_item201, price:3900.00, is_on_promotion:false}]) - # Green Tea frappe - menu_category27_menu_item202 = SimpleMenuItem.create({name: "Green Tea frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea frappe",menu_item: menu_category27_menu_item202, price:3900.00, is_on_promotion:false}]) - # KBanoffee - menu_category27_menu_item203 = SimpleMenuItem.create({name: "KBanoffee", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"KBanoffee",menu_item: menu_category27_menu_item203, price:3900.00, is_on_promotion:false}]) - # Butterscotch Popcorn frappe - menu_category27_menu_item204 = SimpleMenuItem.create({name: "Butterscotch Popcorn frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch Popcorn frappe",menu_item: menu_category27_menu_item204, price:3900.00, is_on_promotion:false}]) - # Mocha frappe - menu_category27_menu_item205 = SimpleMenuItem.create({name: "Mocha frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mocha frappe",menu_item: menu_category27_menu_item205, price:3900.00, is_on_promotion:false}]) - # Chocolate frappe - menu_category27_menu_item206 = SimpleMenuItem.create({name: "Chocolate frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chocolate frappe",menu_item: menu_category27_menu_item206, price:3900.00, is_on_promotion:false}]) - -#Smoothies -menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) - # Strawberry smoothie - menu_category23_menu_item200 = SimpleMenuItem.create({name: "Strawberry smoothie", alt_name: " ",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Strawberry smoothie",menu_item: menu_category23_menu_item200, price:3500.00, is_on_promotion:false}]) - # Passion fruit smoothie - menu_category23_menu_item201 = SimpleMenuItem.create({name: "Passion fruit smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Passion fruit smoothie",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) - # Mixederry smoothie - menu_category23_menu_item202 = SimpleMenuItem.create({name: "Mixedberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mixedberry smoothie",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) - # Blueberry smoothie - menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Blueberry smoothie",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) - # Berry Sunshine Smoothie - menu_category23_menu_item204 = SimpleMenuItem.create({name: "Berry Sunshine Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Berry Sunshine Smoothie",menu_item: menu_category23_menu_item204, price:3500.00, is_on_promotion:false}]) - # Mango Smoothie - menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mango Smoothie",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) - - # # Bar Dessert # menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) # # D4-Banana Tempura With Ice Cream @@ -1011,24 +1061,6 @@ menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: # menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) -# Beer -menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) - # Myanmar Premium Draft Beer - menu_category18_menu_item200 = SimpleMenuItem.create({name: "Myanmar Premium Draft Beer", alt_name: " ",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Premium Draft Beer",menu_item: menu_category18_menu_item200, price:1800.00, is_on_promotion:false}]) - # Kirin Ichiban Draft Beer - menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kirin Ichiban Draft Beer",menu_item: menu_category18_menu_item201, price:2200.00, is_on_promotion:false}]) - # Myanmar Beer - menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Beer",menu_item: menu_category18_menu_item202, price:2300.00, is_on_promotion:false}]) - # Tuborg Beer - menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Tuborg Beer",menu_item: menu_category18_menu_item203, price:2500.00, is_on_promotion:false}]) - # Wine by the Glass - menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) - # Green Tea menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) # Hot Green Tea From 9f7472cd2ddfb7d4c1d51a301ddacba43f048f27 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 31 Jul 2017 20:41:47 +0630 Subject: [PATCH 045/246] update osaka menu --- lib/tasks/menu_osaka.rake | 110 ++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 41 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index c39d8f2f..af19d2de 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -682,7 +682,7 @@ menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Ext menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) -# Can Soda +# Float menu_category55 = MenuCategory.create({menu: menu, name: "Float", alt_name: "Float", order_by: 2, created_by: "SYSTEM DEFAULT"}) # Green Tea With Green Tea Scoop menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Green Tea With Green Tea Scoop", alt_name: "Green Tea With Green Tea Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) @@ -845,33 +845,6 @@ menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "C menu_category1_menu_item17 = SimpleMenuItem.create({name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) -# Cocktail -menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) - # Moscow's Sky - menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}]) - # Tokyo Sunset - menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) - # Crane at Lakeside - menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}]) - # Memoir of a Geisha - menu_category1_menu_item203 = SimpleMenuItem.create({name: "Memoir of a Geisha", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item203, price:2500.00, is_on_promotion:false}]) - # Dawn to Dark - menu_category1_menu_item204 = SimpleMenuItem.create({name: "Dawn to Dark", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item204, price:2500.00, is_on_promotion:false}]) - # Sakura Night - menu_category1_menu_item205 = SimpleMenuItem.create({name: "Sakura Night", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item205, price:3500.00, is_on_promotion:false}]) - # Kyoto Temptation - menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) - # Love Potion - menu_category1_menu_item207 = SimpleMenuItem.create({name: "Love Potion", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}]) - # Whisky menu_category21 = MenuCategory.create({menu: menu, name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) # BLACK LABEL 1Lit @@ -1049,20 +1022,75 @@ menu_category31 = MenuCategory.create({menu: menu, name: "Chinese Tea", alt_name # Wine menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"}) - # Viejo Vinedo (Arge;) - menu_category32_menu_item200 = SimpleMenuItem.create({name: "Viejo Vinedo (Arge;)", alt_name: " ",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Viejo Vinedo (Arge;)",menu_item: menu_category32_menu_item200, price:15000.00, is_on_promotion:false}]) - # Church Lane - menu_category32_menu_item201 = SimpleMenuItem.create({name: "Church Lane", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Church Lane (SHIRAZ)",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Church Lane (Cabernet Sauvignon)",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) - # Chardonnay Layer Cake (Napa Valley) - menu_category32_menu_item202 = SimpleMenuItem.create({name: "Chardonnay Layer Cake (Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chardonnay Layer Cake (Napa Valley)",menu_item: menu_category32_menu_item202, price:30000.00, is_on_promotion:false}]) - # PINOT NOIR - menu_category32_menu_item203 = SimpleMenuItem.create({name: "PINOT NOIR", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"PINOT NOIR",menu_item: menu_category32_menu_item203, price:25000.00, is_on_promotion:false}]) + # House Winw by the glass + menu_category32_menu_item200 = SimpleMenuItem.create({name: "VHouse Winw by the glass", alt_name: " ",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VHouse Winw by the glass",menu_item: menu_category32_menu_item200, price:0.00, is_on_promotion:false}]) + # Cabernet Sauvignon Viejo Vivedo + menu_category32_menu_item201 = SimpleMenuItem.create({name: "Cabernet Sauvignon Viejo Vivedo(Argentina)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cabernet Sauvignon Viejo Vivedo",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) + # Church lane (South Australia) + menu_category32_menu_item202 = SimpleMenuItem.create({name: "Church lane (South Australia)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Church lane (South Australia)",menu_item: menu_category32_menu_item202, price:25000.00, is_on_promotion:false}]) + # Chardonnay Layer Cake + menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chardonnay Layer Cake(Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chardonnay Layer Cake(Napa Valley)",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) +# Cocktail +menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) + # Crane at Lakeside + menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside (Sake, Lime, Green, Apple)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}]) + # Memoir of a Geisha + menu_category1_menu_item203 = SimpleMenuItem.create({name: "Memoir of a Geisha (Shochu, Pineapple, Vodka)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item203, price:2500.00, is_on_promotion:false}]) + # Dawn to Dark + menu_category1_menu_item204 = SimpleMenuItem.create({name: "Dawn to Dark (Shoshu, Lime, Orange Juice)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item204, price:2500.00, is_on_promotion:false}]) + # Moscow's Sky + menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky (Vodka, Lime, Orange Juice)", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}]) + # Sakura Night + menu_category1_menu_item205 = SimpleMenuItem.create({name: "Sakura Night (Lichiko, Lime, Passion)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item205, price:3500.00, is_on_promotion:false}]) + # Love Potion + menu_category1_menu_item207 = SimpleMenuItem.create({name: "Love Potion (Sake, Vodka, Lime, Passion)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}]) + # Kyoto Temptation + menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation (Lichiko, Lime, Passion)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) + # Tokyo Sunset + menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset (Lichiko, Vodka, Lime, Strawberry)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) + +# Spirits +menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "Spirits", order_by: 32, created_by: "SYSTEM DEFAULT"}) + # Chivas 12 years + menu_category32_menu_item200 = SimpleMenuItem.create({name: "Chivas 12 years", alt_name: " ",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chivas 12 years",menu_item: menu_category32_menu_item200, price:45000.00, is_on_promotion:false}]) + # Johanny Walker Double Limited + menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Double Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Double Limited",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) + # Johanny Walker Black Limited + menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Black Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Black Limited",menu_item: menu_category32_menu_item202, price:48000.00, is_on_promotion:false}]) + # Glenffich 12 years + menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 12 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Glenffich 12 years",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) + # Glenffich 15 years + menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 15 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Glenffich 15 years",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) + # Chivas Extra + menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chivas Extra", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chivas Extra",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) + # Johanny Walker Gold Tin Pack + menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Gold Tin Pack", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Gold Tin Pack",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) + # Johanny Walker Platinum + menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Platinum", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Platinum",menu_item: menu_category32_menu_item202, price:82000.00, is_on_promotion:false}]) + # Johanny Walker Blue + menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Blue", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Blue",menu_item: menu_category32_menu_item202, price:200000.00, is_on_promotion:false}]) #discount # menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) From 4f846765477461bec15e6cfb19221c0b3554f561 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 31 Jul 2017 20:57:42 +0630 Subject: [PATCH 046/246] updated osaka menu --- lib/tasks/menu_osaka.rake | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 5b47d812..5363e97f 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -555,7 +555,7 @@ menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sus menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Corn Salad Gunkan",menu_item: menu_category30_menu_item2016, price:1500.00, is_on_promotion:false}]) # Salmon Nigiri menu_category30_menu_item2017 = SimpleMenuItem.create({name: "Salmon Nigiri", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Nigiri",menu_item: menu_category30_menu_item2017 price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Nigiri",menu_item: menu_category30_menu_item2017, price:2000.00, is_on_promotion:false}]) # Seaweed Gunkan menu_category30_menu_item2018 = SimpleMenuItem.create({name: "Seaweed Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Gunkan",menu_item: menu_category30_menu_item2018, price:2500.00, is_on_promotion:false}]) @@ -615,34 +615,34 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D menu_category11_menu_item202 = SimpleMenuItem.create({name: "D3-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) # D4-Banana Gyoza - menu_category15_menu_item202 = SimpleMenuItem.create({name: "D4-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item202 = SimpleMenuItem.create({name: "D4-Banana Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D4-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) # D5-Red Bean Gyoza - menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) # D6-Peanuts Butter Gyoza - menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}]) # D7-Coffee Jelly - menu_category15_menu_item206 = SimpleMenuItem.create({name: "D7-Coffee Jelly", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item206 = SimpleMenuItem.create({name: "D7-Coffee Jelly", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D7-Coffee Jelly",menu_item: menu_category15_menu_item206, price:1500.00, is_on_promotion:false}]) # D8-Green Tea Jelly - menu_category15_menu_item207 = SimpleMenuItem.create({name: "D8-Green Tea Jelly", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item207 = SimpleMenuItem.create({name: "D8-Green Tea Jelly", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Green Tea Jelly",menu_item: menu_category15_menu_item207, price:1500.00, is_on_promotion:false}]) # D9-Coffee Jelly With Chocolate Scoop - menu_category15_menu_item208 = SimpleMenuItem.create({name: "D9-Coffee Jelly With Chocolate Scoop", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item208 = SimpleMenuItem.create({name: "D9-Coffee Jelly With Chocolate Scoop", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Coffee Jelly With Chocolate Scoop",menu_item: menu_category15_menu_item208, price:2000.00, is_on_promotion:false}]) # D10-Green Tea Jelly With Green Tea Scoop - menu_category15_menu_item209 = SimpleMenuItem.create({name: "D10-Green Tea Jelly With Green Tea Scoop", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item209 = SimpleMenuItem.create({name: "D10-Green Tea Jelly With Green Tea Scoop", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Green Tea Jelly With Green Tea Scoop",menu_item: menu_category15_menu_item209, price:2000.00, is_on_promotion:false}]) # D11-Chocolate Pudding - menu_category15_menu_item210 = SimpleMenuItem.create({name: "D11-Chocolate Pudding", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item210 = SimpleMenuItem.create({name: "D11-Chocolate Pudding", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Chocolate Pudding",menu_item: menu_category15_menu_item210, price:1500.00, is_on_promotion:false}]) # D12-Mango Pudding - menu_category15_menu_item211 = SimpleMenuItem.create({name: "D12-Mango Pudding", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item211 = SimpleMenuItem.create({name: "D12-Mango Pudding", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Mango Pudding",menu_item: menu_category15_menu_item211, price:1500.00, is_on_promotion:false}]) # D13-Original Pudding - menu_category15_menu_item212= SimpleMenuItem.create({name: "D13-Original Pudding", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category15_menu_item212= SimpleMenuItem.create({name: "D13-Original Pudding", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Original Pudding",menu_item: menu_category15_menu_item212, price:1500.00, is_on_promotion:false}]) # Extra @@ -676,31 +676,31 @@ menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Ext # # Kids Set # menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) # Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs) - menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) - # Kids Set B (Ramen+Fried Potato+Gyoza 2pcs) - menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) + # menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) + # # Kids Set B (Ramen+Fried Potato+Gyoza 2pcs) + # menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) # Float menu_category55 = MenuCategory.create({menu: menu, name: "Float", alt_name: "Float", order_by: 2, created_by: "SYSTEM DEFAULT"}) # Green Tea With Green Tea Scoop - menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Green Tea With Green Tea Scoop", alt_name: "Green Tea With Green Tea Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Green Tea With Green Tea Scoop", alt_name: "Green Tea With Green Tea Scoop",menu_category: menu_category55 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item10, price:3000.00, is_on_promotion:false}]) # Coke With Chocolate Scoop - menu_category1_menu_item11 = SimpleMenuItem.create({name: "Coke With Chocolate Scoop", alt_name: "Coke With Chocolate Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category1_menu_item11 = SimpleMenuItem.create({name: "Coke With Chocolate Scoop", alt_name: "Coke With Chocolate Scoop",menu_category: menu_category55 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item11, price:3000.00, is_on_promotion:false}]) # Sprite With Vanilla Scoop - menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Sprite With Vanilla Scoop", alt_name: "Sprite With Vanilla Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Sprite With Vanilla Scoop", alt_name: "Sprite With Vanilla Scoop",menu_category: menu_category55 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:3000.0, is_on_promotion:false}]) # Green Tea Frappe With GT Scoop - menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Green Tea Frappe With GT Scoop", alt_name: "Green Tea Frappe With GT Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Green Tea Frappe With GT Scoop", alt_name: "Green Tea Frappe With GT Scoop",menu_category: menu_category55 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:4900.00, is_on_promotion:false}]) # Chocolate Frappe With Cho Scoop - menu_category1_menu_item14 = SimpleMenuItem.create({name: "Chocolate Frappe With Cho Scoop", alt_name: "Chocolate Frappe With Cho Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category1_menu_item14 = SimpleMenuItem.create({name: "Chocolate Frappe With Cho Scoop", alt_name: "Chocolate Frappe With Cho Scoop",menu_category: menu_category55 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:4900.00, is_on_promotion:false}]) # Hot Espresso With Vanilla Scoop - menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Hot Espresso With Vanilla Scoop", alt_name: "Hot Espresso With Vanilla Scoop",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Hot Espresso With Vanilla Scoop", alt_name: "Hot Espresso With Vanilla Scoop",menu_category: menu_category55 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:3000.0, is_on_promotion:false}]) # Hot Drinks From fa901806d4c58682584f860d9d9eaf8a4f4340ec Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 1 Aug 2017 11:50:41 +0630 Subject: [PATCH 047/246] bugs fix for crm --- app/controllers/crm/customers_controller.rb | 3 +-- app/models/customer.rb | 2 +- app/models/sale_payment.rb | 13 ++++++++----- app/views/crm/customers/_new_form.html.erb | 6 +++--- lib/tasks/menu_osaka.rake | 6 +++--- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index ba451027..d314222b 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -67,8 +67,7 @@ class Crm::CustomersController < BaseCrmController # POST /crm/customers # POST /crm/customers.json - def create - + def create @crm_customers = Customer.new(customer_params) respond_to do |format| diff --git a/app/models/customer.rb b/app/models/customer.rb index c1751104..dff92ba2 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,7 +10,7 @@ class Customer < ApplicationRecord validates :contact_no, uniqueness: true, numericality: true validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create } validates :card_no, uniqueness: true - validates :paypar_account_no, uniqueness: true + # validates :paypar_account_no, uniqueness: true paginates_per 50 diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 69aa2143..ff2f6e2f 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -390,11 +390,14 @@ class SalePayment < ApplicationRecord total_percentage = 0 type_arr = [] - response["membership_campaign_data"].each do |a| - data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i} - total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i - - type_arr.push(data) + # Check for present response fields + if response["membership_campaign_data"].present? + response["membership_campaign_data"].each do |a| + data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i} + total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i + + type_arr.push(data) + end end rebate_arr =[] diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 5ec0b903..1eda0bec 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -10,7 +10,7 @@ str.gsub!('["', '') str.gsub!('"]', '') %> <%= str %> - <% end -%> + <% end %>
@@ -74,7 +74,7 @@ str.gsub!('["', '') str.gsub!('"]', '') %> <%= str %> - <% end -%> + <% end %>
"> @@ -85,7 +85,7 @@ str.gsub!('["', '') str.gsub!('"]', '') %> <%= str %> - <% end -%> + <% end %>
diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 5363e97f..f2125332 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -51,9 +51,9 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz # Gyoza dumpling soup with Udon menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) - # Gyoza dumpling soup with Udon - menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + # # Gyoza dumpling soup with Udon + # menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) # Gyoza dumpling soup menu_category1_menu_item22 = SimpleMenuItem.create({name: "Gyoza dumpling soup", alt_name: "Gyoza dumpling soup",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}]) From 8762783484dd88b41fe2da0dafdb9eafaeae335a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 1 Aug 2017 12:02:28 +0630 Subject: [PATCH 048/246] update customer and receipt old balance --- app/controllers/crm/customers_controller.rb | 5 +++-- app/pdf/receipt_bill_pdf.rb | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index ba451027..a116c6a0 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -217,7 +217,8 @@ end merchant_uid:merchant_uid,auth_token:auth_token}.to_json # Check for paypar account exists - if paypar_account_no != nil || paypar_account_no != '' + # if paypar_account_no != nil || paypar_account_no != '' + if paypar_account_no.present? member_params = { name: name,phone: phone,email: email, dob: dob,address: address,nrc:nrc,card_no:card_no, paypar_account_no: paypar_account_no, @@ -274,7 +275,7 @@ end merchant_uid:merchant_uid,auth_token:auth_token}.to_json # Check for paypar account exists - if paypar_account_no != nil || paypar_account_no != '' + if paypar_account_no.present? member_params = { name: name,phone: phone,email: email, dob: dob,address: address,nrc:nrc,card_no:card_no, paypar_account_no: paypar_account_no, diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 28ce5745..a2b726c9 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -280,9 +280,12 @@ class ReceiptBillPdf < Prawn::Document if rebate_amount["status"] == true stroke_horizontal_rule + total = 0 balance = 0 + rebate_balance =0 redeem = 0 rebate_amount["data"].each do |res| + total = total + res["balance"] #total redeem amount if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Redeem" redeem = redeem + res["redeem"] @@ -292,7 +295,7 @@ class ReceiptBillPdf < Prawn::Document #total Rebate Earn if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateAccount" && res["status"]== "Rebate" - # balance = balance + res["balance"] + rebate_balance = rebate_balance + res["rebate"] move_down 5 y_position = cursor @@ -306,7 +309,7 @@ class ReceiptBillPdf < Prawn::Document end # Total Rebate Amount if birthday if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateBonusAccount" && res["status"]== "Rebate" - # balance = balance + res["balance"] + rebate_balance = rebate_balance + res["rebate"] move_down 5 y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do @@ -328,7 +331,12 @@ class ReceiptBillPdf < Prawn::Document text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right end - old = balance + redeem + + if redeem == 0 + old = total - rebate_balance + else + old = balance + redeem + end move_down 5 y_position = cursor @@ -343,11 +351,11 @@ class ReceiptBillPdf < Prawn::Document end if member_info["status"] == true && member_info["data"].present? - balance = 0 + total_balance = 0 member_info["data"].each do |res| if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" - balance = balance + res["balance"] + total_balance = total_balance + res["balance"] end @@ -358,7 +366,7 @@ class ReceiptBillPdf < Prawn::Document text "Total Balance", :size => self.item_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - text "#{number_with_precision(balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end end From 632a8d624b97a471ad4378c5fd4e89312b7a6fa2 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 1 Aug 2017 12:07:45 +0630 Subject: [PATCH 049/246] update menu osaka --- lib/tasks/menu_osaka.rake | 166 +++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index f2125332..906ba179 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -402,7 +402,7 @@ menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Rame menu_category1_menu_item83 = SimpleMenuItem.create({name: "N9-Gomoku Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:5500.00, is_on_promotion:false}]) # N10 Ramen Tossed - menu_category1_menu_item83 = SimpleMenuItem.create({name: "N9-Ramen Tossed", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N10-Ramen Tossed", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}]) # N11-Fried Noodle with Thick Sauce menu_category1_menu_item81 = SimpleMenuItem.create({name: "N11-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) @@ -469,22 +469,22 @@ menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udo menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) # Grilled Salmon menu_category33_menu_item200 = SimpleMenuItem.create({name: "Y1-Grilled Salmon", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:12000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item200, price:12000.00, is_on_promotion:false}]) # Grilled Garlic menu_category33_menu_item201 = SimpleMenuItem.create({name: "Y2-Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Garlic",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) # Grilled Shishamo menu_category33_menu_item202 = SimpleMenuItem.create({name: "Y3-Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Shishamo",menu_item: menu_category33_menu_item202, price:5500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item202, price:5500.00, is_on_promotion:false}]) # Grilled Saba menu_category33_menu_item203 = SimpleMenuItem.create({name: "Y4-Grilled Saba", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Saba",menu_item: menu_category33_menu_item203, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item203, price:4500.00, is_on_promotion:false}]) # Pork Yakiniku menu_category33_menu_item204 = SimpleMenuItem.create({name: "Y5-Pork Yakiniku", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Yakiniku",menu_item: menu_category33_menu_item204, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item204, price:2500.00, is_on_promotion:false}]) # Beef Yakiniku menu_category33_menu_item205 = SimpleMenuItem.create({name: "Y6-Beef Yakiniku", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Yakiniku",menu_item: menu_category33_menu_item205, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item205, price:2500.00, is_on_promotion:false}]) # Yakitori menu_category33_menu_item206 = SimpleMenuItem.create({name: "Y7-Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) @@ -493,16 +493,16 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}]) # Yakitori Assortment menu_category33_menu_item207 = SimpleMenuItem.create({name: "Y8-Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori Assortment",menu_item: menu_category33_menu_item207, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item207, price:4500.00, is_on_promotion:false}]) # Shiitake mushroom (1 piece) menu_category33_menu_item208 = SimpleMenuItem.create({name: "Y9-Shiitake mushroom", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shiitake mushroom",menu_item: menu_category33_menu_item208, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item208, price:3500.00, is_on_promotion:false}]) # Lady finger (1 piece) menu_category33_menu_item209 = SimpleMenuItem.create({name: "Y10-Lady finger", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lady finger",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) # Chicken Satay (1 piece) menu_category33_menu_item210 = SimpleMenuItem.create({name: "Y11-Chicken Satay", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lady finger",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) #Sushi menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) @@ -540,34 +540,34 @@ menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sus menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item203, price:3500.00, is_on_promotion:false}]) # Special Sushi Roll menu_category30_menu_item2012 = SimpleMenuItem.create({name: "Special Sushi Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Special Sushi Roll",menu_item: menu_category30_menu_item2012, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2012, price:2000.00, is_on_promotion:false}]) # Salmon Roll menu_category30_menu_item2013 = SimpleMenuItem.create({name: "Salmon Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Roll",menu_item: menu_category30_menu_item2013, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2013, price:1500.00, is_on_promotion:false}]) # Red Dragon Roll menu_category30_menu_item2014 = SimpleMenuItem.create({name: "Red Dragon Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Red Dragon Roll",menu_item: menu_category30_menu_item2014, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2014, price:3500.00, is_on_promotion:false}]) # Tamago Nigiri menu_category30_menu_item2015 = SimpleMenuItem.create({name: "Tamago Nigiri", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Tamago Nigiri",menu_item: menu_category30_menu_item2015, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2015, price:1500.00, is_on_promotion:false}]) # Corn Salad Gunkan menu_category30_menu_item2016 = SimpleMenuItem.create({name: "Corn Salad Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Corn Salad Gunkan",menu_item: menu_category30_menu_item2016, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2016, price:1500.00, is_on_promotion:false}]) # Salmon Nigiri menu_category30_menu_item2017 = SimpleMenuItem.create({name: "Salmon Nigiri", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Nigiri",menu_item: menu_category30_menu_item2017, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2017, price:2000.00, is_on_promotion:false}]) # Seaweed Gunkan menu_category30_menu_item2018 = SimpleMenuItem.create({name: "Seaweed Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Gunkan",menu_item: menu_category30_menu_item2018, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2018, price:2500.00, is_on_promotion:false}]) # Kani Salad Gunkan menu_category30_menu_item2019 = SimpleMenuItem.create({name: "Kani Salad Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kani Salad Gunkan",menu_item: menu_category30_menu_item2019, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2019, price:1500.00, is_on_promotion:false}]) # Masago Gunkan menu_category30_menu_item2020 = SimpleMenuItem.create({name: "Masago Gunkan", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Masago Gunkan",menu_item: menu_category30_menu_item2020, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2020, price:2500.00, is_on_promotion:false}]) # Sushi Set menu_category30_menu_item2021 = SimpleMenuItem.create({name: "Sushi Set", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sushi Set",menu_item: menu_category30_menu_item2021, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category30_menu_item2021, price:8000.00, is_on_promotion:false}]) # # Philadelphia Roll # menu_category30_menu_item206 = SimpleMenuItem.create({name: "Philadelphia Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Philadelphia Roll",menu_item: menu_category30_menu_item206, price:7500.00, is_on_promotion:false}]) @@ -604,7 +604,7 @@ menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) # D1-Banana Tempura With Ice Cream menu_category11_menu_item200 = SimpleMenuItem.create({name: "D1-Banana Tempura With Ice Cream", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Banana Tempura With Ice Cream",menu_item: menu_category11_menu_item200, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category11_menu_item200, price:3500.00, is_on_promotion:false}]) # D2-Ice Cream Chocolate menu_category11_menu_item201 = SimpleMenuItem.create({name: "D2-Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) @@ -613,46 +613,46 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # D3-Seasonal Fruits menu_category11_menu_item202 = SimpleMenuItem.create({name: "D3-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) # D4-Banana Gyoza menu_category15_menu_item202 = SimpleMenuItem.create({name: "D4-Banana Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D4-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) # D5-Red Bean Gyoza menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) # D6-Peanuts Butter Gyoza menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}]) # D7-Coffee Jelly menu_category15_menu_item206 = SimpleMenuItem.create({name: "D7-Coffee Jelly", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D7-Coffee Jelly",menu_item: menu_category15_menu_item206, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item206, price:1500.00, is_on_promotion:false}]) # D8-Green Tea Jelly menu_category15_menu_item207 = SimpleMenuItem.create({name: "D8-Green Tea Jelly", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Green Tea Jelly",menu_item: menu_category15_menu_item207, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item207, price:1500.00, is_on_promotion:false}]) # D9-Coffee Jelly With Chocolate Scoop menu_category15_menu_item208 = SimpleMenuItem.create({name: "D9-Coffee Jelly With Chocolate Scoop", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Coffee Jelly With Chocolate Scoop",menu_item: menu_category15_menu_item208, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item208, price:2000.00, is_on_promotion:false}]) # D10-Green Tea Jelly With Green Tea Scoop menu_category15_menu_item209 = SimpleMenuItem.create({name: "D10-Green Tea Jelly With Green Tea Scoop", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Green Tea Jelly With Green Tea Scoop",menu_item: menu_category15_menu_item209, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item209, price:2000.00, is_on_promotion:false}]) # D11-Chocolate Pudding menu_category15_menu_item210 = SimpleMenuItem.create({name: "D11-Chocolate Pudding", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Chocolate Pudding",menu_item: menu_category15_menu_item210, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item210, price:1500.00, is_on_promotion:false}]) # D12-Mango Pudding menu_category15_menu_item211 = SimpleMenuItem.create({name: "D12-Mango Pudding", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Mango Pudding",menu_item: menu_category15_menu_item211, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item211, price:1500.00, is_on_promotion:false}]) # D13-Original Pudding menu_category15_menu_item212= SimpleMenuItem.create({name: "D13-Original Pudding", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Original Pudding",menu_item: menu_category15_menu_item212, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item212, price:1500.00, is_on_promotion:false}]) # Extra menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) # Rice menu_category16_menu_item200 = SimpleMenuItem.create({name: "Rice", alt_name: " ",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Rice",menu_item: menu_category16_menu_item200, price:500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category16_menu_item200, price:500.00, is_on_promotion:false}]) # Soup menu_category16_menu_item201 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soup",menu_item: menu_category16_menu_item201, price:500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category16_menu_item201, price:500.00, is_on_promotion:false}]) # # Salad # menu_category16_menu_item202 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salad",menu_item: menu_category16_menu_item202, price:500.00, is_on_promotion:false}]) @@ -707,34 +707,34 @@ menu_category55 = MenuCategory.create({menu: menu, name: "Float", alt_name: "Flo menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) # Green Tea Pot menu_category17_menu_item2 = SimpleMenuItem.create({name: "Green Tea Pot", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea Pot",menu_item: menu_category17_menu_item2, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item2, price:1500.00, is_on_promotion:false}]) # Hot Coffee menu_category17_menu_item14 = SimpleMenuItem.create({name: "Hot Coffee", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Coffee",menu_item: menu_category17_menu_item14, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item14, price:1500.00, is_on_promotion:false}]) # Hot Chocolate menu_category17_menu_item9 = SimpleMenuItem.create({name: "Hot Chocolate", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Chocolate",menu_item: menu_category17_menu_item9, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item9, price:2500.00, is_on_promotion:false}]) # Espresso menu_category17_menu_item1 = SimpleMenuItem.create({name: "Espresso", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Espresso",menu_item: menu_category17_menu_item1, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item1, price:1500.00, is_on_promotion:false}]) # Cafe' Americano menu_category17_menu_item3 = SimpleMenuItem.create({name: "Cafe' Americano", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Americano",menu_item: menu_category17_menu_item3, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item3, price:1800.00, is_on_promotion:false}]) # Double Espresso menu_category17_menu_item4 = SimpleMenuItem.create({name: "Double Espresso", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Double Espresso",menu_item: menu_category17_menu_item4, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item4, price:2000.00, is_on_promotion:false}]) # Cappuccino menu_category17_menu_item5 = SimpleMenuItem.create({name: "Cappuccino", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) # Cafe' latte menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' latte",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) # Matcha latte menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Matcha latte",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) # Cafe' Mocha menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Mocha",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) # Flavor latte menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) @@ -743,10 +743,10 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butter scotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) # Roasted Almond Matchal latte menu_category17_menu_item12 = SimpleMenuItem.create({name: "Roasted Almond", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Roasted Almond",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) # Coconut Matcha latte menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Coconut Matcha",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) # Cold Drinks menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) @@ -803,7 +803,7 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) # Avocado Juice menu_category20_menu_item7 = SimpleMenuItem.create({name: "Avocado Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Avocado Juice",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) # Kiwi Juice menu_category20_menu_item9 = SimpleMenuItem.create({name: "Kiwi Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) @@ -827,46 +827,46 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) # Berry Sunshine Smoothie menu_category23_menu_item204 = SimpleMenuItem.create({name: "Berry Sunshine Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Berry Sunshine Smoothie",menu_item: menu_category23_menu_item204, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item204, price:3500.00, is_on_promotion:false}]) # Mixederry smoothie menu_category23_menu_item202 = SimpleMenuItem.create({name: "Mixedberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mixedberry smoothie",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) # Strawberry smoothie menu_category23_menu_item200 = SimpleMenuItem.create({name: "Strawberry smoothie", alt_name: " ",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Strawberry smoothie",menu_item: menu_category23_menu_item200, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item200, price:3500.00, is_on_promotion:false}]) # Passion fruit smoothie menu_category23_menu_item201 = SimpleMenuItem.create({name: "Passion fruit smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Passion fruit smoothie",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) # Mango Smoothie menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mango Smoothie",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) # Blueberry smoothie menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Blueberry smoothie",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) #Frappe menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) # Cappuccino Frappe menu_category27_menu_item200 = SimpleMenuItem.create({name: "Cappuccino Frappe", alt_name: " ",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino Frappe",menu_item: menu_category27_menu_item200, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item200, price:3900.00, is_on_promotion:false}]) # Caramel frappe menu_category27_menu_item201 = SimpleMenuItem.create({name: "Caramel frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel frappe",menu_item: menu_category27_menu_item201, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item201, price:3900.00, is_on_promotion:false}]) # Mocha frappe menu_category27_menu_item205 = SimpleMenuItem.create({name: "Mocha frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mocha frappe",menu_item: menu_category27_menu_item205, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item205, price:3900.00, is_on_promotion:false}]) # Green Tea frappe menu_category27_menu_item202 = SimpleMenuItem.create({name: "Green Tea frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea frappe",menu_item: menu_category27_menu_item202, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item202, price:3900.00, is_on_promotion:false}]) # KBanoffee menu_category27_menu_item203 = SimpleMenuItem.create({name: "Banoffee Frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Banoffee Frappe",menu_item: menu_category27_menu_item203, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item203, price:3900.00, is_on_promotion:false}]) # Butterscotch Popcorn frappe menu_category27_menu_item204 = SimpleMenuItem.create({name: "Butterscotch Popcorn Frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch Popcorn frappe",menu_item: menu_category27_menu_item204, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item204, price:3900.00, is_on_promotion:false}]) # Chocolate frappe menu_category27_menu_item206 = SimpleMenuItem.create({name: "Chocolate frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chocolate frappe",menu_item: menu_category27_menu_item206, price:3900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category27_menu_item206, price:3900.00, is_on_promotion:false}]) # Italian Soda menu_category2 = MenuCategory.create({menu: menu, name: "Italian Soda", alt_name: "Italian Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) @@ -927,16 +927,16 @@ menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "C menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) # Myanmar Premium Draft Beer menu_category18_menu_item200 = SimpleMenuItem.create({name: "Myanmar Premium Draft Beer", alt_name: " ",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Premium Draft Beer",menu_item: menu_category18_menu_item200, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item200, price:1500.00, is_on_promotion:false}]) # Kirin Ichiban Draft Beer menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kirin Ichiban Draft Beer",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) # Myanmar Beer menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Beer",menu_item: menu_category18_menu_item202, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item202, price:2000.00, is_on_promotion:false}]) # Tuborg Beer menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Tuborg Beer",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) # # Wine by the Glass # menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) @@ -945,19 +945,19 @@ menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) # Kha Ka Bora Fresh Shochu 18% 360ml menu_category25_menu_item203 = SimpleMenuItem.create({name: "Kha Ka Bora Fresh Shochu 18% 360ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kha Ka Bora Fresh Shochu 18% 360ml",menu_item: menu_category25_menu_item203, price:3200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item203, price:3200.00, is_on_promotion:false}]) # Shwe Yi Soba Shochu 36% 700ml menu_category25_menu_item204 = SimpleMenuItem.create({name: "Shwe Yi Soba Shochu 36% 700ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shwe Yi Soba Shochu 36% 700ml",menu_item: menu_category25_menu_item204, price:7500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item204, price:7500.00, is_on_promotion:false}]) # Sawanotsuru Fresh 300mml menu_category25_menu_item202 = SimpleMenuItem.create({name: "Sawanotsuru Fresh 300mml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sawanotsuru Fresh 300mml",menu_item: menu_category25_menu_item202, price:9000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item202, price:9000.00, is_on_promotion:false}]) # Kurokirishima Imo Shochu 720ml menu_category25_menu_item201 = SimpleMenuItem.create({name: "Kurokirishima Imo Shochu 720ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kurokirishima Imo Shochu 720ml",menu_item: menu_category25_menu_item201, price:29000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item201, price:29000.00, is_on_promotion:false}]) # Lichiko Silhouette 720ml menu_category25_menu_item200 = SimpleMenuItem.create({name: "Lichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lichiko Silhouette 720ml",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) # # Cocktail # menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) @@ -1083,16 +1083,16 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"}) # House Winw by the glass menu_category32_menu_item200 = SimpleMenuItem.create({name: "VHouse Winw by the glass", alt_name: " ",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VHouse Winw by the glass",menu_item: menu_category32_menu_item200, price:0.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:0.00, is_on_promotion:false}]) # Cabernet Sauvignon Viejo Vivedo menu_category32_menu_item201 = SimpleMenuItem.create({name: "Cabernet Sauvignon Viejo Vivedo(Argentina)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cabernet Sauvignon Viejo Vivedo",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) # Church lane (South Australia) menu_category32_menu_item202 = SimpleMenuItem.create({name: "Church lane (South Australia)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Church lane (South Australia)",menu_item: menu_category32_menu_item202, price:25000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:25000.00, is_on_promotion:false}]) # Chardonnay Layer Cake menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chardonnay Layer Cake(Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chardonnay Layer Cake(Napa Valley)",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) # Cocktail menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) @@ -1125,31 +1125,31 @@ menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "Spirits", order_by: 32, created_by: "SYSTEM DEFAULT"}) # Chivas 12 years menu_category32_menu_item200 = SimpleMenuItem.create({name: "Chivas 12 years", alt_name: " ",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chivas 12 years",menu_item: menu_category32_menu_item200, price:45000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:45000.00, is_on_promotion:false}]) # Johanny Walker Double Limited menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Double Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Double Limited",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) # Johanny Walker Black Limited menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Black Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Black Limited",menu_item: menu_category32_menu_item202, price:48000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:48000.00, is_on_promotion:false}]) # Glenffich 12 years menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 12 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Glenffich 12 years",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) # Glenffich 15 years menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 15 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Glenffich 15 years",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) # Chivas Extra menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chivas Extra", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chivas Extra",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) # Johanny Walker Gold Tin Pack menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Gold Tin Pack", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Gold Tin Pack",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) # Johanny Walker Platinum menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Platinum", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Platinum",menu_item: menu_category32_menu_item202, price:82000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:82000.00, is_on_promotion:false}]) # Johanny Walker Blue menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Blue", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Johanny Walker Blue",menu_item: menu_category32_menu_item202, price:200000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:200000.00, is_on_promotion:false}]) #discount # menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) From 4704632546d07c014dc3a41722298a31ff882e9a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 1 Aug 2017 15:18:44 +0630 Subject: [PATCH 050/246] update rake menu file --- lib/tasks/menu_osaka.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 906ba179..6c49c9c5 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -74,7 +74,7 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) # S3-Edamame menu_category1_menu_item36 = SimpleMenuItem.create({name: "S3-Edamame", alt_name: "S3-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2200.00, is_on_promotion:false}]) # S4-Glass Noodle Salad menu_category1_menu_item37 = SimpleMenuItem.create({name: "S4-Glass Noodle Salad", alt_name: "S4-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) @@ -463,7 +463,7 @@ menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udo menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:2500.00, is_on_promotion:false}]) # U8 Udon Salad menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8-Udon Salad", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:2500.00, is_on_promotion:false}]) # Grilled menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) From 20f344ce89451eeea2169b59dddd08470cd0961e Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 1 Aug 2017 16:33:36 +0630 Subject: [PATCH 051/246] filter with today in oqs --- app/controllers/oqs/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index d8731ecb..cef7c6b6 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -98,7 +98,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'") .group("assigned_order_items.assigned_order_item_id") .order("assigned_order_items.created_at") end From 8794352ed5f4fead1d44d59e6debfe4e551d85d7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 1 Aug 2017 16:33:41 +0630 Subject: [PATCH 052/246] update rake file --- lib/tasks/menu_osaka.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 6c49c9c5..b0fc72a9 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -509,7 +509,7 @@ menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sus # Grilled Salmon Roll menu_category30_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon Roll", alt_name: " ",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item200, price:7500.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item200, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(4-pcs)",menu_item: menu_category30_menu_item200, price:4000.00, is_on_promotion:false}]) # Sushi Tempura menu_category30_menu_item202 = SimpleMenuItem.create({name: "Sushi Tempura", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"(8-pcs)",menu_item: menu_category30_menu_item202, price:6500.00, is_on_promotion:false}]) From 23faf65af6079f5d80470883823e2dde079a67ca Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 1 Aug 2017 18:41:53 +0630 Subject: [PATCH 053/246] add shift id after req bill --- app/controllers/origami/request_bills_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 687c872f..7fa51da4 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,7 +5,7 @@ class Origami::RequestBillsController < BaseOrigamiController @sale = Sale.new sale_order=SaleOrder.new - if ShiftSale.current_open_shift(current_user.id) + if shift = ShiftSale.current_open_shift(current_user.id) order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id) @@ -20,6 +20,10 @@ class Origami::RequestBillsController < BaseOrigamiController @sale_data = Sale.find_by_sale_id(check_booking.sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) end + + # Bind shift sale id to sale + @sale_data.shift_sale_id = shift.id + @sale_data.save else @status = false @error_message = "No Current Open Shift for This Employee" From b0886b685cfbaaa346d651f2fe80ff7ce55c5174 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 2 Aug 2017 12:14:03 +0630 Subject: [PATCH 054/246] update clone --- app/controllers/oqs/home_controller.rb | 2 +- .../origami/request_bills_controller.rb | 6 +- app/models/ability.rb | 4 + app/views/layouts/_header.html.erb | 2 + app/views/origami/home/show.html.erb | 9 +- .../origami/room_invoices/index.html.erb | 10 +- app/views/origami/room_invoices/show.html.erb | 13 ++- app/views/origami/rooms/show.html.erb | 17 ++-- app/views/origami/sales/show.html.erb | 6 +- .../origami/table_invoices/index.html.erb | 10 +- .../origami/table_invoices/show.html.erb | 13 ++- app/views/reports/void_sale/index.html.erb | 7 +- app/views/reports/void_sale/index.xls.erb | 92 ++++++++++++------- 13 files changed, 127 insertions(+), 64 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index d8731ecb..cef7c6b6 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -98,7 +98,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'") .group("assigned_order_items.assigned_order_item_id") .order("assigned_order_items.created_at") end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 687c872f..7fa51da4 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,7 +5,7 @@ class Origami::RequestBillsController < BaseOrigamiController @sale = Sale.new sale_order=SaleOrder.new - if ShiftSale.current_open_shift(current_user.id) + if shift = ShiftSale.current_open_shift(current_user.id) order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id) @@ -20,6 +20,10 @@ class Origami::RequestBillsController < BaseOrigamiController @sale_data = Sale.find_by_sale_id(check_booking.sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) end + + # Bind shift sale id to sale + @sale_data.shift_sale_id = shift.id + @sale_data.save else @status = false @error_message = "No Current Open Shift for This Employee" diff --git a/app/models/ability.rb b/app/models/ability.rb index 00bb5b2c..1938fb45 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -37,6 +37,8 @@ class Ability can :index, :saleitem can :index, :receipt_no can :index, :shiftsale + can :index, :credit_payment + can :index, :void_sale can :get_customer, Customer can :add_customer, Customer @@ -113,6 +115,8 @@ class Ability can :index, :saleitem can :index, :receipt_no can :index, :shiftsale + can :index, :credit_payment + can :index, :void_sale elsif user.role == "supervisour" diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 2a328cc9..904749e6 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -43,6 +43,8 @@
  • <%= link_to "Sales Item Report", reports_saleitem_index_path, :tabindex =>"-1" %>
  • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %>
  • diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 206c8f20..726194d1 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -132,6 +132,7 @@ <% if @status_sale == 'sale' %> <%= @sale_array[0].receipt_no rescue '' %> + <% end %>

    • @@ -143,7 +144,10 @@
    - <%if @customer %> + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale_array[0].customer.name rescue '' %>

    + <%else%>

    Customer : <%= @customer.name rescue "" %>

    <%end%> @@ -302,10 +306,10 @@ <% if @dining.bookings.length >= 1 %> - <% if @status_order == 'order' && @status_sale != 'sale' %> + @@ -316,6 +320,7 @@ <% else %> + diff --git a/app/views/origami/room_invoices/index.html.erb b/app/views/origami/room_invoices/index.html.erb index 3d88622e..60baf85f 100644 --- a/app/views/origami/room_invoices/index.html.erb +++ b/app/views/origami/room_invoices/index.html.erb @@ -26,9 +26,15 @@

    Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    -

    Customer :

    + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale.customer.name rescue '-' %>

    + <%else%> + +

    Customer : <%= @customer.name rescue "-" %>

    + <%end%>
    diff --git a/app/views/origami/room_invoices/show.html.erb b/app/views/origami/room_invoices/show.html.erb index 86cb1789..c300d00f 100644 --- a/app/views/origami/room_invoices/show.html.erb +++ b/app/views/origami/room_invoices/show.html.erb @@ -32,12 +32,15 @@

    Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    - - -

    Customer : <%= @customer.name rescue "" %>

    - + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale.customer.name rescue '-' %>

    + <%else%> + +

    Customer : <%= @customer.name rescue "-" %>

    + <%end%>
    diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index d115b765..2a069af9 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -132,6 +132,7 @@

    Receipt No: <% if @status == 'sale' %> <%= @obj.receipt_no rescue '' %> + <% end %>

    @@ -139,12 +140,15 @@

    Date: <%= @obj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    - <%if @customer %> - -

    Customer : <%= @customer.name %>

    - <%end%> + <% if @status == 'sale' %> + +

    Customer : <%= @obj.customer.name rescue '-' %>

    + <%else%> + +

    Customer : <%= @customer.name rescue "-" %>

    + <%end%>
    @@ -284,10 +288,10 @@ <% if @room.bookings.length >= 1 %> - <% if @status == 'order' && @status != 'sale' %> + @@ -297,6 +301,7 @@ <% else %> + diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index dd58a577..4d4d1edb 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -120,9 +120,11 @@

    Date: <%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    -

    Customer :

    + +

    Customer : <%= @sale.customer.name rescue "-" %>

    +
    diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb index 834d5f36..5df7d18c 100644 --- a/app/views/origami/table_invoices/index.html.erb +++ b/app/views/origami/table_invoices/index.html.erb @@ -26,9 +26,15 @@

    Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    -

    Customer :

    + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale.customer.name rescue '-' %>

    + <%else%> + +

    Customer : <%= @customer.name rescue "-" %>

    + <%end%>
    diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb index b5769e02..aa087c9b 100644 --- a/app/views/origami/table_invoices/show.html.erb +++ b/app/views/origami/table_invoices/show.html.erb @@ -32,12 +32,15 @@

    Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    - - -

    Customer : <%= @customer.name rescue "" %>

    - + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale.customer.name rescue '-' %>

    + <%else%> + +

    Customer : <%= @customer.name rescue "-" %>

    + <%end%>
    diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 4e33c27d..d5d3c806 100644 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -44,8 +44,7 @@ Grand Total Rounding Adj. Grand Total +
    Rounding Adj. - Sale Status - Remarks + @@ -62,8 +61,8 @@ <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %> <%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%> - <%= item.sales_status rescue '-' %> - <%= item.remarks rescue '-' %> + + <% total_amount = total_amount.to_f + item.total_amount.to_f %> <% grand_total = grand_total.to_f + item.grand_total.to_f %> diff --git a/app/views/reports/void_sale/index.xls.erb b/app/views/reports/void_sale/index.xls.erb index 9597e3d9..40d8d956 100644 --- a/app/views/reports/void_sale/index.xls.erb +++ b/app/views/reports/void_sale/index.xls.erb @@ -1,39 +1,63 @@
    - <% unless @sale_data.blank? %> - - - - <% if !params[:from].blank?%> - - - - <% end %> - - - - - - - - - - <% @sale_data.each do |credit| %> - - - <% if @shift_from.nil? && @shift_to.nil? %> - - <% else %> - - <% end %> - - - - - - <% end %> - -
    From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
    Shift Name Receive No Cashier Name Customer Name Credit Amount
    <%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= credit.receipt_no rescue '-' %><%= credit.cashier_name rescue '-' %><%= credit.sale.customer.name rescue '-' %><%= credit.payment_amount rescue '-' %>
    + <% if @sale_data.count > 0 %> + + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift %> + <% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + <% total_amount = 0.0 %> + <% grand_total = 0.0 %> + <% rounding_adjustment = 0.0 %> + <% grand_rounding_adjustment = 0.0 %> + <% @sale_data.each do |result| %> + <% result[:items].each do |item| %> + + + + + + + + + + + <% total_amount = total_amount.to_f + item.total_amount.to_f %> + <% grand_total = grand_total.to_f + item.grand_total.to_f %> + <% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %> + <% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %> + <% end %> <% end %> + + + + + + + + +
    From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
    Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
    Receipt NoSale DateTotal AmountGrand TotalRounding Adj.Grand Total +
    Rounding Adj.
    <%= item.receipt_no rescue '-' %> <%= item.date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %><%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %><%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%>
    Total Void Amount :<%= total_amount rescue '-' %><%= grand_total rescue '-' %><%= rounding_adjustment rescue '-'%><%= grand_rounding_adjustment rescue '-'%>
    +<% end %>
    \ No newline at end of file From da5dfa1853cfdbc76e85ceefbff854a6c3b74f20 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 2 Aug 2017 12:19:18 +0630 Subject: [PATCH 055/246] void sale report update --- app/views/reports/void_sale/index.html.erb | 2 +- app/views/reports/void_sale/index.xls.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index d5d3c806..e85a0974 100644 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -56,7 +56,7 @@ <% result[:items].each do |item| %> <%= item.receipt_no rescue '-' %> - <%= item.date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %> + <%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %> <%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %> diff --git a/app/views/reports/void_sale/index.xls.erb b/app/views/reports/void_sale/index.xls.erb index 40d8d956..c73a4bde 100644 --- a/app/views/reports/void_sale/index.xls.erb +++ b/app/views/reports/void_sale/index.xls.erb @@ -35,7 +35,7 @@ <% result[:items].each do |item| %> <%= item.receipt_no rescue '-' %> - <%= item.date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %> + <%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %> <%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %> From c096e8214822090e02ad860fb4be94fa0849848d Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 2 Aug 2017 14:33:03 +0630 Subject: [PATCH 056/246] update shop in seed for osaka --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 2828648f..065b447c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -143,7 +143,7 @@ menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size" menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) -shop = Shop.create({id:1, name: "OSAKA OHSHO", address:'No. 256, Kyaikkasan Road, Tamwe Township, Yangon', township:"Tamwe",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"Tel: 09-258676611",reservation_no:"111",license:"123", +shop = Shop.create({id:1, name: "OSAKA OHSHO(Tamwe)", address:'No. 256, Kyaikkasan Road, Tamwe Township, Yangon', township:"Tamwe",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"Tel: 09-258676611",reservation_no:"111",license:"123", activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111",is_rounding_adj:"0"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From 266f60d2cbe91f05e43d1d990bc6ef31ccdefe9f Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 2 Aug 2017 15:15:05 +0630 Subject: [PATCH 057/246] dump --- dump.rdb | Bin 538 -> 650 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index 7c136cd5be957ca5c9ef9471e17b4c81905b8740..21fd36f9854ed4b111057dba3ff62a87176c74cc 100644 GIT binary patch delta 408 zcmZ{gF-yZh0EH7xv_*6ft<_=;r(;?!NporA($$}!AaZRk8c5SNcTr0b?cm~Kk8Y0s z1Kk9Npg1Y`H~a%G3Tj#?IOzCzkH`Dom2@HZVfMM-+x|#JlsJV3X*|5$F9=`4=d8&2 z>iR^w6*lXHQbNT{2M4wWbqm=pDw{;F8`yz$&X+SfiUnbgGR*98-ibxNljAQdr>{r( z>s?V0q<;z|sTR>rEJ!ti*}P^#4I!gs=tWpU6}^PycH|KzyV$2h@&dQ{SiPytDrk9*l1&X6RKW1QVolQHkSL}U zg*aeJb#N|jZ4AzQ(RP(ydW;B8CZ^gEiINkh9pd81XPhtP%LS;%qL3MJyV&!IW9v|} g3UKJ~%N){S^2^LGKaqdLt->(){eIY$pEk|g9}V4q_W%F@ delta 278 zcmeBToy9W2Kx0OCMdUAz(&E$<-Q3jNLlP0}4F4E@b22jU6_+HISQQlIC#MzzWhb7O zU@|hBY{{fB*@j7i$ Date: Wed, 2 Aug 2017 16:58:34 +0630 Subject: [PATCH 058/246] update total tax when other charges --- .../origami/other_charges_controller.rb | 3 ++- app/models/sale.rb | 3 +-- app/views/origami/rooms/show.html.erb | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index b0e6472c..9b94781d 100644 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -45,7 +45,8 @@ class Origami::OtherChargesController < BaseOrigamiController end # Re-calc All Amount in Sale - sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) + # sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) + sale.compute_without_void end dining = {:table_id => table_id, :table_type => table_type } diff --git a/app/models/sale.rb b/app/models/sale.rb index b23c630b..462c8c73 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -232,7 +232,6 @@ class Sale < ApplicationRecord end #compute rounding adjustment # adjust_rounding - sale.save! end @@ -315,7 +314,7 @@ class Sale < ApplicationRecord total_tax_amount = 0 #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") - + # #Creat new tax records tax_profiles.each do |tax| sale_tax = SaleTax.new(:sale => self) diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 2a069af9..27f73619 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -294,6 +294,7 @@ + @@ -304,6 +305,7 @@ + @@ -429,6 +431,25 @@ $(document).ready(function(){ return false; }); + // Add Other Charges + $('#other-charges').click(function() { + var sale = $('#sale_id').val(); + if (sale!="") { + var sale_id = sale + }else{ + var sale_id = $('#save_order_id').attr('data-order'); + } + + if(sale_id!=""){ + window.location.href = '/origami/' + sale_id + '/other_charges' + } + else { + alert("Please select an table!"); + } + + return false; + }); + }); // Print for first bill From 3bbf60b3ef319f4c7d6350e5bb1fb05849e43ca6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 2 Aug 2017 17:31:43 +0630 Subject: [PATCH 059/246] update total tax when other charges --- app/controllers/origami/other_charges_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index 9b94781d..b0e6472c 100644 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -45,8 +45,7 @@ class Origami::OtherChargesController < BaseOrigamiController end # Re-calc All Amount in Sale - # sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) - sale.compute_without_void + sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) end dining = {:table_id => table_id, :table_type => table_type } From ae5299bbe1bc108d5775a70826fd8c44c4308451 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 2 Aug 2017 17:32:23 +0630 Subject: [PATCH 060/246] dump --- dump.rdb | Bin 650 -> 650 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index 21fd36f9854ed4b111057dba3ff62a87176c74cc..6abdec7e13e8e5664a98cc1084089bdca1d49e15 100644 GIT binary patch delta 72 zcmV-O0Jr~&1&RfbFc?9Wfm!+pb#rB8Ep26O!r)vL0R8~`4FQuo0vVBEivx<+Gm-Bx e3^X`1GA=kUIXO5rGP5iJRsjf1$HYeTKIsp*#2J|Y delta 72 zcmV-O0Jr~&1&RfbFc`~_fm!+pb#rB8Ep26O!sxsd0R8~`4FQuo0vVBEiv!Ph9+B@c e3^Oz{GA=MQHaRjhHnS`NRsjh0c6$ZIJ2kT9s~OM$ From 16678b438b150645ed004995f2511e724c213fd5 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 2 Aug 2017 18:37:18 +0630 Subject: [PATCH 061/246] dump --- dump.rdb | Bin 650 -> 650 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index 6abdec7e13e8e5664a98cc1084089bdca1d49e15..f22c9267d01b0f6f3db4227aaa2871c8aabd3971 100644 GIT binary patch delta 254 zcmeBT?P8r^AknzLG4dBjX>n?bZfKlwAG#>Dw- zzJHp&Us)8($iToNR+*S*WoT+>X=Y`bVrZFaXpm@TkZj1pT3DKyTEd!^m{Xj}l9ZZQ zB4}u8U}$D;YHVqwXJlz$XlTfinU|J-*kRLT2SyEXb3=1W6Fmb%6AKe_V;!Y}%oGO+ zc0~%)v_d&7FPnDB+X)Iae!g6B9q}{X(lNab6q2YiHo%+CW>id fxQT(gxFoT}DlIWHCpF~&!~e}U1b1fI^sfK_9OF#n delta 264 zcmeBT?P8r^AmKQzG4dBjX>n?bZfl#`dVEEH@-FQ(fBLf4ASY=|Kl_7>M7M7&a z;>rUIEJ>+}B|?U#28L#4CKkp Date: Wed, 2 Aug 2017 18:38:03 +0630 Subject: [PATCH 062/246] dump --- dump.rdb | Bin 650 -> 616 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index f22c9267d01b0f6f3db4227aaa2871c8aabd3971..6e3e4bdb58d80e5ac055cb301f0b9693f2a197d4 100644 GIT binary patch delta 89 zcmV-f0H*(n1?U8jFc*}-fm!+pb#rB8Ep26O!dO}d0R8~`43S4?1G5&{k+Clm5-~L} vF*Y|fHa0RYG%+|gF*G=_@?8NK01I<;VRSlXVQFk-WWWIbmZjcG9Q>KMwSFN= delta 123 zcmV->0EGYO1d0WaFc*Qpfm!+pb#rB8Ep26O!eA~F0R8~`4UtD@1A_O|k+Cll5ivC| zF*Y|fGdVIYGC43YF)^|8T>(1+32<_6V`X!5Wpe=*d0}okF*PwcHaazAF*#*1Fkv<@ dV=({=b97;JI%Z*MY-MD?0ROYt5xHqRkEnG_D(wIO From 39a314bc9a43a1caa036d04f90c40d4a784b422d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 3 Aug 2017 11:22:23 +0630 Subject: [PATCH 063/246] update rome check all fun --- .../origami/moveroom_controller.rb | 15 ++++ app/controllers/origami/rooms_controller.rb | 63 ++++++++++--- app/views/origami/rooms/show.html.erb | 90 +++++++++---------- 3 files changed, 112 insertions(+), 56 deletions(-) diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index ef1c286a..dea36463 100644 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -35,5 +35,20 @@ class Origami::MoveroomController < BaseOrigamiController end end end + + def moving + change_to = params[:change_to] #new + change_from = params[:change_from] #original + bookings = Booking.where('dining_facility_id=?',change_from) + + booking_array = Array.new + bookings.each do | booking | + if booking.sale_id.nil? && booking.booking_status != 'moved' + booking_array.push(booking) + end + end + + @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) + end end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 823136b9..d7092692 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -1,36 +1,77 @@ class Origami::RoomsController < BaseOrigamiController + def index + @tables = Table.all.active.order('status desc') + @rooms = Room.all.active.order('status desc') + @complete = Sale.where("sale_status != 'new'") + @orders = Order.all.order('date desc') + # @shift = ShiftSale.current_open_shift(current_user.id) + end + def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') @room = DiningFacility.find(params[:room_id]) + + @status = "" @sale_array = Array.new - @room.bookings.each do |booking| - if booking.sale_id.nil? + + @room.bookings.active.each do |booking| + if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new - booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) - @obj = order - @customer = order.customer - order.order_items.each do |item| - @order_items.push(item) + if (order.status == "new") + @obj = order + @customer = order.customer + @date = order.created_at + order.order_items.each do |item| + @order_items.push(item) + end end end @status = 'order' else - sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" - @sale_array.push(sale) + if sale.sale_status != "completed" && sale.sale_status != 'void' + @sale_array.push(sale) + if @status == 'order' + @status = 'sale' + end + @date = sale.created_at @status = 'sale' @obj = sale @customer = sale.customer end end - end + end + + # @room.bookings.each do |booking| + # if booking.sale_id.nil? + # @order_items = Array.new + + # booking.booking_orders.each do |booking_order| + # order = Order.find(booking_order.order_id) + # @obj = order + # @customer = order.customer + # order.order_items.each do |item| + # @order_items.push(item) + # end + # end + # @status = 'order' + # else + + # sale = Sale.find(booking.sale_id) + # if sale.sale_status != "completed" + # @sale_array.push(sale) + # @status = 'sale' + # @obj = sale + # @customer = sale.customer + # end + # end + # end end diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 27f73619..c72ded6e 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -207,7 +207,7 @@ <%= sub_total %> - <%if @obj != nil && @status_sale == 'sale' && @obj.discount_type == 'member_discount'%> + <%if @obj != nil && @status == 'sale' && @obj.discount_type == 'member_discount'%> Member Discount: <%else%> Discount: @@ -232,52 +232,52 @@

    - <% - if @status == 'sale' - unless @order_items.nil? - %> - Pending New Order - - <% - count = 0 - @order_items.each do |order_item | - count += 1 - %> - - - - - - - - <% - end + <% + if @status == 'sale' + unless @order_items.nil? + %> + Pending New Order +
    <%= count %> - <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    + <% + count = 0 + @order_items.each do |order_item | + count += 1 %> -
    - - <% end %> - <% if @sale_array.size > 1 %> -

    - Pending Payment - <% end %> - <% @sale_array.each do |sale| - if @sale_array.size > 1 - unless sale.receipt_no == @sale_array[0].receipt_no - %> - - - - - -
    Receipt No - <%= sale.receipt_no %>
    - <% - end - end - end - end - %> + + <%= count %> + <%= order_item.item_name %> + <%= order_item.qty %> + <%= order_item.qty*order_item.price %> + + + <% + end + %> + + + <% end %> + <% if @sale_array.size > 1 %> +

    + Pending Payment + <% end %> + <% @sale_array.each do |sale| + if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no + %> + + + + + + +
    Receipt No - <%= sale.receipt_no %>
    + <% + end + end + end + end + %>
    From 518314c772803a074b805780d78db1c0d51c4150 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 3 Aug 2017 12:05:54 +0630 Subject: [PATCH 064/246] update room in origami --- app/controllers/origami/moveroom_controller.rb | 15 --------------- app/controllers/origami/rooms_controller.rb | 14 +++++++++++--- app/views/origami/moveroom/moving.json.jbuilder | 2 ++ 3 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 app/views/origami/moveroom/moving.json.jbuilder diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index dea36463..ef1c286a 100644 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -35,20 +35,5 @@ class Origami::MoveroomController < BaseOrigamiController end end end - - def moving - change_to = params[:change_to] #new - change_from = params[:change_from] #original - bookings = Booking.where('dining_facility_id=?',change_from) - - booking_array = Array.new - bookings.each do | booking | - if booking.sale_id.nil? && booking.booking_status != 'moved' - booking_array.push(booking) - end - end - - @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) - end end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index d7092692..de06ef62 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -1,5 +1,7 @@ class Origami::RoomsController < BaseOrigamiController + before_action :set_dining, only: [:show] + def index @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @@ -7,18 +9,19 @@ class Origami::RoomsController < BaseOrigamiController @orders = Order.all.order('date desc') # @shift = ShiftSale.current_open_shift(current_user.id) end - + def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') - @room = DiningFacility.find(params[:room_id]) + + # @room = DiningFacility.find(params[:room_id]) @status = "" @sale_array = Array.new - @room.bookings.active.each do |booking| + @dining.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new booking.booking_orders.each do |booking_order| @@ -74,5 +77,10 @@ class Origami::RoomsController < BaseOrigamiController # end end + private + +def set_dining + @dining = DiningFacility.find(params[:room_id]) +end end diff --git a/app/views/origami/moveroom/moving.json.jbuilder b/app/views/origami/moveroom/moving.json.jbuilder new file mode 100644 index 00000000..acdac2e9 --- /dev/null +++ b/app/views/origami/moveroom/moving.json.jbuilder @@ -0,0 +1,2 @@ +json.status true +json.get_type @get_type \ No newline at end of file From e71ca0dee83771a3e33bfa123aa15d6defbe1bb1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 3 Aug 2017 13:31:52 +0630 Subject: [PATCH 065/246] update room --- app/controllers/origami/rooms_controller.rb | 27 ++++----- app/views/origami/rooms/show.html.erb | 67 +++++++++++++-------- 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index de06ef62..23d64602 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -1,7 +1,5 @@ class Origami::RoomsController < BaseOrigamiController - before_action :set_dining, only: [:show] - def index @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @@ -16,18 +14,19 @@ class Origami::RoomsController < BaseOrigamiController @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') - # @room = DiningFacility.find(params[:room_id]) + @room = DiningFacility.find(params[:room_id]) - @status = "" + @status_order = "" + @status_sale = "" @sale_array = Array.new - @dining.bookings.active.each do |booking| + @room.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) if (order.status == "new") - @obj = order + @obj_order = order @customer = order.customer @date = order.created_at order.order_items.each do |item| @@ -35,17 +34,18 @@ class Origami::RoomsController < BaseOrigamiController end end end - @status = 'order' + @status_order = 'order' else sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" && sale.sale_status != 'void' + puts "enter" @sale_array.push(sale) - if @status == 'order' - @status = 'sale' + if @status_order == 'order' + @status_order = 'sale' end @date = sale.created_at - @status = 'sale' - @obj = sale + @status_sale = 'sale' + @obj_sale = sale @customer = sale.customer end end @@ -77,10 +77,5 @@ class Origami::RoomsController < BaseOrigamiController # end end - private - -def set_dining - @dining = DiningFacility.find(params[:room_id]) -end end diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index c72ded6e..39d55757 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -119,9 +119,9 @@
    - <% if @status == 'order' %> -
    ORDER DETAILS | Table <%= @room.name rescue "" %>
    - <% elsif @status == 'sale' %> + <% if @status_order == 'order' %> +
    ORDER DETAILS | Table <%= @room.name rescue "" %>
    + <% elsif @status_sale == 'sale' %>
    INVOICE DETAILS | Table <%= @room.name rescue "" %>
    <% end %> @@ -130,21 +130,21 @@

    Receipt No: - <% if @status == 'sale' %> - <%= @obj.receipt_no rescue '' %> + <% if @status_sale == 'sale' %> + <%= @obj_sale.receipt_no rescue '' %> <% end %>

    -

    Date: <%= @obj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    +

    Date: <%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    - <% if @status == 'sale' %> - -

    Customer : <%= @obj.customer.name rescue '-' %>

    + <% if @status_sale == 'sale' %> + +

    Customer : <%= @obj_sale_sale.customer.name rescue '-' %>

    <%else%>

    Customer : <%= @customer.name rescue "-" %>

    @@ -156,6 +156,7 @@ + <% + count = 0 sub_total = 0 - if @status == "sale" - @obj.sale_items.each do |sale_item| - sub_total = sub_total + sale_item.price + if @status_sale == "sale" + @sale_array[0].sale_items.each do |sale_item| + + sub_total = sub_total + sale_item.price %> - - <% unless sale_item.price == 0 %> + + <% + # Can't check for discount + unless sale_item.price == 0 + count += 1 + %> + + <% - end + + end end end - if @status == 'order' + if @status_order == 'order' && @status_sale != 'sale' unless @order_items.nil? + count = 0 @order_items.each do |order_item | + count += 1 sub_total = sub_total + (order_item.price * order_item.qty) unless order_item.price == 0 %> + <% + end end end @@ -207,25 +221,26 @@ - <%if @obj != nil && @status == 'sale' && @obj.discount_type == 'member_discount'%> + <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> <%else%> <%end%> - + + - <% if @status == "sale" %> + <% if @status_sale == "sale" %> - + - + - + <% end %> @@ -233,7 +248,7 @@
    <% - if @status == 'sale' + if @status_sale == 'sale' unless @order_items.nil? %> Pending New Order @@ -289,7 +304,7 @@ <% if @room.bookings.length >= 1 %> - <% if @status == 'order' && @status != 'sale' %> + <% if @status_order == 'order' && @status_sale != 'sale' %> @@ -520,7 +535,7 @@ $('#back').on('click',function(){ $('#add_invoice').on('click',function(){ var dining_id = "<%= @room.id %>" - var sale_id = "<%= @obj.sale_id rescue "" %>" + var sale_id = "<%= @obj_sale.sale_id rescue "" %>" var ajax_url = "/origami/sale/append_order"; $.ajax({ type: "POST", @@ -603,7 +618,7 @@ $('#add_invoice').on('click',function(){ $('#edit').on('click',function(){ var dining_id = "<%= @room.id %>" - var sale_id = "<%= @obj.sale_id rescue "" %>" + var sale_id = "<%= @obj_sale.sale_id rescue "" %>" window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit"; }); From a4d2fc53b056caee3f6b3ae51de85b2fc07cb92c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 4 Aug 2017 15:25:19 +0630 Subject: [PATCH 066/246] update --- app/models/order.rb | 3 +-- app/views/origami/payments/show.html.erb | 2 +- app/views/transactions/orders/index.html.erb | 21 ++++++++------------ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 714174fe..5f96e6d6 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -322,8 +322,7 @@ class Order < ApplicationRecord def self.search(search) if search - # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) - where("order_id LIKE ?", "%#{search}%") + where("order_id LIKE ? OR item_count ='#{search}'","%#{search}%",) else find(:all) end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 83373b8e..77fedb16 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -393,7 +393,7 @@ $( document ).ready(function() { $('#pay').text("Pay") $.confirm({ title: 'Infomation!', - content: 'Thank you !', + content: 'Thank you ! '+msg, buttons: { confirm: { text: 'Ok', diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 80befdc1..8463886f 100644 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -1,7 +1,7 @@
      -
    1. Home
      2. +
    2. Home
    3. Order
      4. @@ -9,24 +9,19 @@
    -
    -
    + <%= form_tag transactions_orders_path, :method => :get do %> +
    +   + +
    + <% end %>
    Items QTY Price @@ -163,35 +164,48 @@
    <%= count %> <%= sale_item.product_name %> <%= sale_item.qty %> <%= sale_item.price %>
    <%= count %> <%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
    <%= sub_total %>
    Member Discount:Discount:(<%=@obj.total_discount rescue 0%>)(<%= @obj_sale.total_discount rescue 0%>)
    Tax:<%= @obj.total_tax rescue 0%><%= @obj_sale.total_tax rescue 0%>
    Rounding Adj:<%= @obj.rounding_adjustment rescue 0%><%= @obj_sale.rounding_adjustment rescue 0%>
    Grand Total:<%= @obj.grand_total rescue 0%><%= @obj_sale.grand_total rescue 0%>
    - - - + From 35d1ec59cbaedc5267b850425d19b68c55c7c59e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 4 Aug 2017 18:29:45 +0630 Subject: [PATCH 067/246] update payment show --- app/views/origami/payments/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 77fedb16..83373b8e 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -393,7 +393,7 @@ $( document ).ready(function() { $('#pay').text("Pay") $.confirm({ title: 'Infomation!', - content: 'Thank you ! '+msg, + content: 'Thank you !', buttons: { confirm: { text: 'Ok', From 285ad93501dc01dd5aa35c8ad93b86210abb3d24 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 Aug 2017 09:43:58 +0630 Subject: [PATCH 068/246] update filter in sale and order and creditnote --- app/assets/javascripts/application.js | 12 +++++ app/assets/stylesheets/application.scss | 2 + .../transactions/credit_notes_controller.rb | 22 ++++++-- .../transactions/orders_controller.rb | 35 ++++++++----- .../transactions/sales_controller.rb | 51 ++++++++++++------- app/models/order.rb | 9 ++-- app/models/sale.rb | 43 ++++++++++++++-- .../transactions/credit_notes/index.html.erb | 39 +++++++++++++- app/views/transactions/orders/index.html.erb | 31 ++++++++--- app/views/transactions/sales/index.html.erb | 21 ++++++-- 10 files changed, 208 insertions(+), 57 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9adb6b75..1b22af09 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -30,3 +30,15 @@ function export_to(path) var form_params = $("#frm_report").serialize(); window.location = path+"?"+ form_params; } + + $(function () { + $('.datepicker').datepicker({ + format : 'dd-mm-yyyy', + autoclose: true + }); + $('.datepicker').attr('ReadOnly','true'); + $('.datepicker').css('cursor','pointer'); +}); + + + diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a4fa6b9f..1c5ada90 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -76,3 +76,5 @@ select.form-control { } /*--- Reset --- */ + + diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb index 0f370c96..b1a16c78 100644 --- a/app/controllers/transactions/credit_notes_controller.rb +++ b/app/controllers/transactions/credit_notes_controller.rb @@ -5,9 +5,25 @@ class Transactions::CreditNotesController < ApplicationController # GET /transactions/sales.json def index - @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING) - - + @customers = Customer.all + + filter = params[:filter] + customer = params[:customer] + from = params[:from] + to = params[:to] + + if filter.nil? && from.nil? && to.nil? && customer.nil? + @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING) + puts "cccccccccccc" + else + sale = Sale.search_credit_sales(customer,filter,from,to) + if sale.count > 0 + @sales = sale + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + else + @sales = 0 + end + end respond_to do |format| format.html # index.html.erb diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index de4be3c3..4df88787 100644 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -2,23 +2,30 @@ class Transactions::OrdersController < ApplicationController load_and_authorize_resource except: [:create] def index - filter = params[:filter] - if filter.nil? + filter = params[:filter] + from = params[:from] + to = params[:to] + + if filter.nil? || from.nil? || to.nil? orders = Order.order("order_id desc") else - order = Order.search(filter) - if order.count > 0 - orders = order - else - orders = Order.order("order_id desc") - - end + orders = Order.search(filter,from,to) + # if order.count > 0 + # orders = order + # else + # orders = Order.order("order_id desc") + # end end - @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50) - respond_to do |format| - format.html # index.html.erb - format.json { render json: @orders } - end + + if !orders.nil? + @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50) + else + @orders = [] + end + respond_to do |format| + format.html # index.html.erb + format.json { render json: @orders } + end end def show diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index eb058cac..8c33e1a3 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -6,28 +6,41 @@ class Transactions::SalesController < ApplicationController # GET /transactions/sales.json def index - search_date = params[:date] - receipt_no = params[:receipt_no] - today = Date.today - - if receipt_no.nil? && search_date.nil? - @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) - @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + receipt_no = params[:receipt_no] + from = params[:from] + to = params[:to] + + if receipt_no.nil? && from.nil? && to.nil? + @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) else - if !search_date.blank? && receipt_no.blank? - sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", search_date).order("sale_id desc").limit(500).page(params[:page]) - elsif !search_date.blank? && !receipt_no.blank? - sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page]) - else - sale = Sale.where("receipt_no LIKE ? and NOT sale_status = 'void' ", receipt_no).order("sale_id desc").limit(500).page(params[:page]) - end + sale = Sale.search(receipt_no,from,to) if sale.count > 0 - @sales = sale - @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) - else - @sales = 0 - end + @sales = sale + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + else + @sales = 0 + end end + + # if receipt_no.nil? && search_date.nil? + # @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) + # @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + # else + # if !search_date.blank? && receipt_no.blank? + # sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", search_date).order("sale_id desc").limit(500).page(params[:page]) + # elsif !search_date.blank? && !receipt_no.blank? + # sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page]) + # else + # sale = Sale.where("receipt_no LIKE ? and NOT sale_status = 'void' ", receipt_no).order("sale_id desc").limit(500).page(params[:page]) + # end + # if sale.count > 0 + # @sales = sale + # @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + # else + # @sales = 0 + # end + # end respond_to do |format| format.html # index.html.erb diff --git a/app/models/order.rb b/app/models/order.rb index 5f96e6d6..4d54f41f 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -320,11 +320,12 @@ class Order < ApplicationRecord end - def self.search(search) - if search - where("order_id LIKE ? OR item_count ='#{search}'","%#{search}%",) + def self.search(filter,from,to) + if !from.nil? && !to.nil? + Order.where("DATE_FORMAT(date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(date,'%d-%m-%Y') <= ?", from,to) else - find(:all) + # find(:all) + where("order_id LIKE ? OR item_count ='#{filter}'","%#{filter}%",) end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 462c8c73..4a4c451f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -378,13 +378,46 @@ class Sale < ApplicationRecord end end - def self.search(search) - if search - # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) - where("receipt_no LIKE ?", "%#{search}%",) + def self.search(filter,from,to) + + if filter.blank? + keyword = '' else - find(:all) + keyword = "receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%" end + + if from.present? && to.present? + sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'void' ", from,to) + query = sale.where(keyword) + else + where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%",) + end + + end + + def self.search_credit_sales(customer,filter,from,to) + + if filter.blank? + keyword = '' + else + keyword = "and receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%" + end + + if customer.blank? + custo = '' + else + custo = "and customer_id = '#{customer}'" + end + + if from.present? && to.present? + sale = Sale.all.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id") + .where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and sp.payment_method = 'creditnote' #{keyword} #{custo}", from,to) + else + sale = Sale.all.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id") + .where("sp.payment_method =? #{keyword} #{custo}",'creditnote') + + end + end def self.get_rounding_adjustment(num) diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb index fba0b52f..ac291115 100644 --- a/app/views/transactions/credit_notes/index.html.erb +++ b/app/views/transactions/credit_notes/index.html.erb @@ -16,6 +16,39 @@
    - <%= form_tag transactions_orders_path, :method => :get do %> -
    - - -
    - <% end %> -
    Order ID Type
    + + + @@ -27,6 +60,8 @@ + <% if @sales != 0 %> + <% @sales.each do |sale| %> @@ -39,7 +74,9 @@ <% end %> - + <% else %> + + <% end %>
    + <%= form_tag transactions_credit_notes_path, :method => :get do %> +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + + +
    + <% end %> +
    Sale Id Receipt no
    <%= link_to sale.sale_id, transactions_sale_path(sale) %> <%= sale.receipt_date.strftime("%d-%m-%Y") %>

    There is no data for search....

    diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 8463886f..21cae24a 100644 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -13,10 +13,28 @@
    <%= form_tag transactions_orders_path, :method => :get do %> -
    -   - -
    +
    + + +
    +
    + + + +
    +
    + + +
    +
    + + +
    + +
    + + +
    <% end %>
    @@ -49,7 +67,9 @@

    - <%= paginate @orders %> + <%if !@order.nil?%> + <%= paginate @orders %> + <%end%>
    @@ -57,6 +77,5 @@
    - diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index 2f437f3c..440989cb 100644 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -19,11 +19,22 @@ <%= form_tag transactions_sales_path, :method => :get do %> -
    - - - - +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    <% end %> From 5ed4a7f51a777d53f3a384f036305c4b94fe57c5 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 8 Aug 2017 11:48:50 +0630 Subject: [PATCH 069/246] rails updated --- Gemfile.lock | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index affb7b95..ba8f6a0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,39 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.1) - actionpack (= 5.1.1) + actioncable (5.1.3) + actionpack (= 5.1.3) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) + actionmailer (5.1.3) + actionpack (= 5.1.3) + actionview (= 5.1.3) + activejob (= 5.1.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.1) - actionview (= 5.1.1) - activesupport (= 5.1.1) + actionpack (5.1.3) + actionview (= 5.1.3) + activesupport (= 5.1.3) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.1) - activesupport (= 5.1.1) + actionview (5.1.3) + activesupport (= 5.1.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.1) - activesupport (= 5.1.1) + activejob (5.1.3) + activesupport (= 5.1.3) globalid (>= 0.3.6) - activemodel (5.1.1) - activesupport (= 5.1.1) - activerecord (5.1.1) - activemodel (= 5.1.1) - activesupport (= 5.1.1) + activemodel (5.1.3) + activesupport (= 5.1.3) + activerecord (5.1.3) + activemodel (= 5.1.3) + activesupport (= 5.1.3) arel (~> 8.0) - activesupport (5.1.1) + activesupport (5.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -64,7 +64,7 @@ GEM cups (0.0.7) database_cleaner (1.6.1) diff-lcs (1.3) - erubi (1.6.0) + erubi (1.6.1) execjs (2.7.0) factory_girl (4.8.0) activesupport (>= 3.0.0) @@ -81,7 +81,7 @@ GEM activesupport (>= 4.2.0) httparty (0.15.5) multi_xml (>= 0.5.2) - i18n (0.8.4) + i18n (0.8.6) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -115,7 +115,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.3) multi_json (1.12.1) multi_xml (0.6.0) mysql2 (0.4.6) @@ -136,26 +136,26 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.1.1) - actioncable (= 5.1.1) - actionmailer (= 5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) - activemodel (= 5.1.1) - activerecord (= 5.1.1) - activesupport (= 5.1.1) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.1) + rails (5.1.3) + actioncable (= 5.1.3) + actionmailer (= 5.1.3) + actionpack (= 5.1.3) + actionview (= 5.1.3) + activejob (= 5.1.3) + activemodel (= 5.1.3) + activerecord (= 5.1.3) + activesupport (= 5.1.3) + bundler (>= 1.3.0) + railties (= 5.1.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.1.1) - actionpack (= 5.1.1) - activesupport (= 5.1.1) + railties (5.1.3) + actionpack (= 5.1.3) + activesupport (= 5.1.3) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -288,4 +288,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.15.1 + 1.15.3 From f46d78685971d8ec060f78114b76d893cc260f10 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 8 Aug 2017 14:29:48 +0630 Subject: [PATCH 070/246] update crm --- app/pdf/receipt_bill_pdf.rb | 2 +- db/migrate/20170622050926_create_customers.rb | 2 ++ db/seeds.rb | 16 +++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index a2b726c9..2dca6d16 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -3,7 +3,7 @@ class ReceiptBillPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status) self.page_width = 210 - self.page_height = 7000 + self.page_height = 1450 self.margin = 5 self.price_width = 40 self.qty_width = 20 diff --git a/db/migrate/20170622050926_create_customers.rb b/db/migrate/20170622050926_create_customers.rb index 20ced7b0..28f38e15 100644 --- a/db/migrate/20170622050926_create_customers.rb +++ b/db/migrate/20170622050926_create_customers.rb @@ -16,6 +16,8 @@ class CreateCustomers < ActiveRecord::Migration[5.1] t.string :membership_id t.string :membership_type t.string :membership_authentication_code + t.string :customer_type, default => "Dinein" + t.json :tax_profiles end end end diff --git a/db/seeds.rb b/db/seeds.rb index 065b447c..4e39275d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -87,11 +87,17 @@ void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manag {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'}, {lookup_type:'void_reason', name: 'Waiter Mistake', value: 'Waiter Mistake'}]) - # sale void reason - float_value = Lookup.create([{lookup_type:'float_value', name: '500', value: '500'}, - {lookup_type:'float_value', name: '1000', value: '1000'}, - {lookup_type:'float_value', name: '5000', value: '5000'}, - {lookup_type:'float_value', name: '10000', value: '10000'}]) +# sale void reason +float_value = Lookup.create([{lookup_type:'float_value', name: '500', value: '500'}, + {lookup_type:'float_value', name: '1000', value: '1000'}, + {lookup_type:'float_value', name: '5000', value: '5000'}, + {lookup_type:'float_value', name: '10000', value: '10000'}]) + +# customer type +customer_type = Lookup.create([{lookup_type:'float_value', name: '500', value: '500'}, + {lookup_type:'float_value', name: '1000', value: '1000'}, + {lookup_type:'float_value', name: '5000', value: '5000'}, + {lookup_type:'float_value', name: '10000', value: '10000'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) From 1e38903d6d3a32bdbf515384c065abd94be94e4a Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 8 Aug 2017 17:51:03 +0630 Subject: [PATCH 071/246] CRM - Queue --- app/views/crm/dining_queues/index.html.erb | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 3d186efe..61f972dd 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -1,4 +1,4 @@ -
    +
    @@ -18,7 +18,7 @@
    - + <% @dining_queues.each do |queue| %> <% if queue.status == "Assign" @bg_color = "assign" @@ -27,10 +27,10 @@ else @bg_color = "normal" end - %> + %>
    - + Queue No : <%= queue.queue_no %> Seater : <%= queue.seater %>
    @@ -39,7 +39,7 @@ Remark : <%= queue.remark %>
    - + <% end %>
    @@ -48,8 +48,10 @@
    + <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-lg btn-block' %> +
    - +
    @@ -71,7 +73,7 @@ $(function(){ $("#cancel").val($(this).find(".queue-id").text()); }); //End Click - + }); $('#assign').click(function() { var id = $(this).val(); @@ -90,31 +92,31 @@ function cancel_queue(id,url) { title: 'Confirm!', content: 'Are You Sure to cancel this Queue!', buttons: { - cancel: function () { + cancel: function () { }, confirm: { text: 'Confirm', btnClass: 'btn-green', keys: ['enter', 'shift'], action: function(){ - $.ajax({ - type: "POST", + $.ajax({ + type: "POST", url: url , data: {id:id}, dataType: "json", success: function(data) { if(data.status == true) - { + { location.reload(); } - - } + + } }); } } - + } }); } - \ No newline at end of file + From a83b2c3acd9bf45ed143e0ccc8bf25a5b839fb5a Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 8 Aug 2017 17:55:03 +0630 Subject: [PATCH 072/246] CRM - Queue fix scroll --- app/views/crm/dining_queues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 61f972dd..ace0f703 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -12,7 +12,7 @@
    -
    +
    From 1685713ff5ea4eab99adb2c7de231bf54c9214b1 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 8 Aug 2017 18:02:05 +0630 Subject: [PATCH 073/246] add customer tax --- app/controllers/crm/customers_controller.rb | 11 +++- app/views/crm/customers/_new_form.html.erb | 60 ++++++++++++------- app/views/crm/customers/index.html.erb | 2 +- db/migrate/20170622050926_create_customers.rb | 2 +- db/seeds.rb | 7 +-- 5 files changed, 52 insertions(+), 30 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 49c64e52..cb2c6dd2 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -17,6 +17,8 @@ class Crm::CustomersController < BaseCrmController @crm_customer = Customer.new @count_customer = Customer.count_customer + @taxes = TaxProfile.all.order("order_by asc") + # if flash["errors"] # @crm_customer.valid? # end @@ -67,11 +69,14 @@ class Crm::CustomersController < BaseCrmController # POST /crm/customers # POST /crm/customers.json - def create + def create @crm_customers = Customer.new(customer_params) respond_to do |format| if @crm_customers.save + # update tax profile + customer = Customer.find(@crm_customers.customer_id) + customer.update_attributes(tax_profiles: params[:customer][:tax_profiles].to_json) name = customer_params[:name] phone = customer_params[:contact_no] email = customer_params[:email] @@ -346,7 +351,7 @@ end # Never trust parameters from the scary internet, only allow the white list through. def customer_params - params.require(:customer).permit(:name, :company, :contact_no, :email, - :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no) + params.require(:customer).permit(:id, :name, :company, :contact_no, :email, + :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type) end end diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 1eda0bec..13896e85 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -1,25 +1,7 @@
    <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> - -
    "> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['card_no']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end %> -
    - -
    - -
    - -
    -
    -
    + <%= f.hidden_field :id, :class => "form-control col-md-6 " %>

    @@ -102,6 +84,38 @@ <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
    +
    "> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['card_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end %> +
    + +
    + + +
    + +
    + <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> +
    + +
    + +
    + +
    +
    +
    +
    - +
    @@ -138,6 +151,11 @@ },100); } }); + + // $("#customer_card_no").click(function(){ + // var ab=$("#customer_tax_profiles").val(); + // console.log(JSON.stringify(ab)); + // }); }); diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 6f336158..f2d28b19 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -76,7 +76,7 @@
    - <%= render 'new_form', crm_customer: @crm_customer %> + <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>

    diff --git a/db/migrate/20170622050926_create_customers.rb b/db/migrate/20170622050926_create_customers.rb index 28f38e15..cb370bc1 100644 --- a/db/migrate/20170622050926_create_customers.rb +++ b/db/migrate/20170622050926_create_customers.rb @@ -16,7 +16,7 @@ class CreateCustomers < ActiveRecord::Migration[5.1] t.string :membership_id t.string :membership_type t.string :membership_authentication_code - t.string :customer_type, default => "Dinein" + t.string :customer_type, :default => "Dinein" t.json :tax_profiles end end diff --git a/db/seeds.rb b/db/seeds.rb index 4e39275d..1b63bcb0 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -94,10 +94,9 @@ float_value = Lookup.create([{lookup_type:'float_value', name: '500', value: '50 {lookup_type:'float_value', name: '10000', value: '10000'}]) # customer type -customer_type = Lookup.create([{lookup_type:'float_value', name: '500', value: '500'}, - {lookup_type:'float_value', name: '1000', value: '1000'}, - {lookup_type:'float_value', name: '5000', value: '5000'}, - {lookup_type:'float_value', name: '10000', value: '10000'}]) +customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', value: 'Dinein'}, + {lookup_type:'customer_type', name: 'Takeaway', value: 'Takeaway'}, + {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) From 644b94764e1547eea74cdca7924136c6fd721ab4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 Aug 2017 18:03:02 +0630 Subject: [PATCH 074/246] update closing receipt --- app/controllers/origami/shifts_controller.rb | 20 ++- app/models/printer/cashier_station_printer.rb | 4 +- app/models/sale.rb | 11 +- app/models/shift_sale.rb | 29 +++++ app/pdf/close_cashier_pdf.rb | 118 ++++++++++++++++-- 5 files changed, 156 insertions(+), 26 deletions(-) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index e03dd0fc..f7690fef 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -31,15 +31,27 @@ class Origami::ShiftsController < BaseOrigamiController unique_code = "CloseCashierPdf" shop_details = Shop.find(1) #get tax - shift_obj = ShiftSale.where('id =?',@shift.id) - @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') - + shift_obj = ShiftSale.where('id =?',@shift.id) + @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') + #other payment details for mpu or visa like card + @other_payment = ShiftSale.get_by_shift_other_payment(@shift) + #t details for mpu or visa like card + @other_payment = ShiftSale.get_by_shift_other_payment(@shift) + + # Calculate price_by_accounts + @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') + @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') + + + puts "sssssssssss" + puts @total_amount_by_account.to_json + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) printer = Printer::CashierStationPrinter.new(print_settings) - printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes) + printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account) end diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index 55bf8c39..b7bc34ae 100644 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -22,14 +22,14 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker # end #Bill Receipt Print - def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes) + def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount) #Use CUPS service #Generate PDF #Print cashier = shift_sale.employee.name shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") - pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes) + pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount) filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" pdf.render_file filename self.print(filename) diff --git a/app/models/sale.rb b/app/models/sale.rb index 4a4c451f..57794048 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -569,7 +569,7 @@ def self.get_item_query() query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id") - end +end def self.get_by_shift_items(shift_sale_range, shift, from, to, status) @@ -746,15 +746,6 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) end end -# def self.get_separate_tax(from,to,payment_method=nil) - -# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") -# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") -# .group("sale_taxes.tax_name") - -# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) -# end - def grand_total_after_rounding return self.old_grand_total.to_f + self.rounding_adjustment.to_f end diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index b7ce7299..af9d014d 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -88,4 +88,33 @@ class ShiftSale < ApplicationRecord closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash return closing_balance end + + def self.get_by_shift_other_payment(shift) + + other_payment = Sale.select("sale_payments.payment_method as name, + SUM(case when (sale_payments.payment_method='mpu') then (sale_payments.payment_amount) else 0 end) as mpu_amount, + SUM(case when (sale_payments.payment_method='visa') then (sale_payments.payment_amount) else 0 end) as visa_amount, + SUM(case when (sale_payments.payment_method='master') then (sale_payments.payment_amount) else 0 end) as master_amount, + SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='paypar') then (sale_payments.payment_amount) else 0 end) as paypar_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id =? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.id) + end + + def self.calculate_total_price_by_accounts(shift,type) + query = Sale.select("acc.title as account_name," + + "SUM(case when (acc.id=i.account_id) then (i.price) else 0 end) as total_price") + + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id "+ + "JOIN accounts acc ON acc.id = i.account_id" + + " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id") + if type == 'discount' + query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.is_taxable = false and i.remark = 'Discount'", shift.id) + .group("acc.title").order("acc.id") + else + query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id) + .group("acc.title").order("acc.id") + end + end + end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 4eadf007..b5325aac 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,6 +1,6 @@ class CloseCashierPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shift_sale,shop_details,sale_taxes) + def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) self.page_width = 210 self.page_height = 7000 self.margin = 5 @@ -32,7 +32,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule - shift_detail(shift_sale,sale_taxes) + shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) @@ -51,7 +51,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule end - def shift_detail(shift_sale,sale_taxes) + def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) move_down 7 y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do @@ -151,6 +151,10 @@ class CloseCashierPdf < Prawn::Document text "#{shift_sale.total_taxes}", :size => self.item_font_size, :align => :right end + move_down -5 + stroke_horizontal_rule + move_down 7 + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do text "Cash Payment :", :size => self.item_font_size, :align => :right @@ -166,14 +170,88 @@ class CloseCashierPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{shift_sale.credit_sales}", :size => self.item_font_size, :align => :right end +#start other payment details + if shift_sale.other_sales > 0 + + other_payment.each do |other| + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Other Payment Details", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "MPU Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.mpu_amount.round(2)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "VISA Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.visa_amount.round(2)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "JCB Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.master_amount.round(2)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Master Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.jcb_amount.round(2)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Reedem Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right + end + + end + + else + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Other Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.other_sales}", :size => self.item_font_size, :align => :right + end - y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Other Payment :", :size => self.item_font_size, :align => :right end - bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do - text "#{shift_sale.other_sales}", :size => self.item_font_size, :align => :right + # end other payment details + move_down -5 + stroke_horizontal_rule + move_down 7 + #start total amount by Account Like Food / Beverage /.. + total_amount_by_account.each do |amount| + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total #{amount.account_name} Amount:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right + end end + #end total amount by Account y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do @@ -183,14 +261,34 @@ class CloseCashierPdf < Prawn::Document text "#{shift_sale.total_revenue}", :size => self.item_font_size, :align => :right end + move_down -5 + stroke_horizontal_rule + move_down 7 + #start total amount by Account Like Food / Beverage /.. + total_discount_by_account.each do |amount| + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right + end + end + #end total amount by Account + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Discount Amount :", :size => self.item_font_size, :align => :right + text "Overall Discount Amount :", :size => self.item_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{shift_sale.total_discounts}", :size => self.item_font_size, :align => :right end - + + move_down -5 + stroke_horizontal_rule + move_down 7 + sale_taxes.each do |tax| y_position = cursor From fe8e24689845478df3a3a601025314bd89f3fa4b Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 8 Aug 2017 18:12:50 +0630 Subject: [PATCH 075/246] Remove BreadCrumb on CRM --- app/views/crm/customers/index.html.erb | 65 +++++++++++++------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 6f336158..4a4d13b8 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -1,4 +1,4 @@ -
    + +
    -
    +
    -->
    - +
    - + @@ -25,7 +25,7 @@ <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
    - + @@ -48,12 +48,12 @@
    <% @i = 0 %> <% @crm_customers.each do |crm_customer| %> - + @@ -62,15 +62,15 @@ - + - + <% end %> - +
    - <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> <%= @i += 1 %> <% end %> <%= crm_customer.contact_no %> <%= crm_customer.email %> <%= link_to 'Show', crm_customer_path(crm_customer) %>

    - + <%= paginate @crm_customers %>
    @@ -98,9 +98,9 @@ $(function() { $('.datepicker').css('cursor','pointer'); // Read Card Reader - $("#member_acc_no").on('click', function(e){ - var cardNo = ""; - $("#sxModal").show(); + $("#member_acc_no").on('click', function(e){ + var cardNo = ""; + $("#sxModal").show(); setTimeout(function(){ getCardNo(); $("#sxModal").hide(); @@ -120,16 +120,16 @@ $(document).on('click',".customer_tr",function(){ // var url = "/"+customer_id; update_sale(customer_id,sale_id); }else{ - + var url = "customers/"+customer_id; } - - $.ajax({ - type: "GET", - url: url, + + $.ajax({ + type: "GET", + url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { $('#customer_id').val(data.id); $('#customer_name').val(data.name); $('#customer_company').val(data.company); @@ -158,7 +158,7 @@ $(document).on('click',".customer_tr",function(){ }else{ $('.mdm').prop( "checked", true ) } - + $('.membership_authentication_code').val(data.membership_authentication_code); $('#update_customer').removeAttr('disabled').val(''); @@ -177,7 +177,7 @@ $(document).on('click',".customer_tr",function(){ } }); // }else{ - + // } }) @@ -186,44 +186,43 @@ $(document).on('click',".customer_tr",function(){ title: 'Confirm!', content: 'Are You Sure to assign this customer!', buttons: { - + cancel: function () { - + }, confirm: { text: 'Confirm', btnClass: 'btn-green', keys: ['enter', 'shift'], action: function(){ - $.ajax({ - type: "POST", + $.ajax({ + type: "POST", url: "update_sale/" , data: {customer_id:customer_id,sale_id:sale_id}, dataType: "json", success: function(data) { if(data.status == true) - { + { window.location.href = '/origami' }else{ alert('Record not found!'); location.reload(); } - - } + + } }); } } - + } }); } $('#reset').click(function() { - + window.location.href = '/crm/customers' return false; }); - \ No newline at end of file From cc6e422c8b933f0aadc29af29771d99f59919d6e Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 10:51:13 +0630 Subject: [PATCH 076/246] add customer type and tax profile in customer --- app/controllers/crm/customers_controller.rb | 4 +++- app/views/crm/customers/_new_form.html.erb | 7 +++---- app/views/crm/customers/index.html.erb | 10 +++++++++- app/views/crm/customers/show.json.jbuilder | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index cb2c6dd2..180901ad 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -69,7 +69,9 @@ class Crm::CustomersController < BaseCrmController # POST /crm/customers # POST /crm/customers.json - def create + def create + # Remove "" default first + params[:customer][:tax_profiles].delete_at(0) @crm_customers = Customer.new(customer_params) respond_to do |format| diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 13896e85..5f1d1b46 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -95,15 +95,14 @@
    - - <% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %> <%end %> -
    - +
    <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
    diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index f2d28b19..b1b1272b 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -129,7 +129,14 @@ $(document).on('click',".customer_tr",function(){ url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { + // Selected for Taxes + //var taxes = JSON.stringify(data.tax_profiles); + var parse_taxes = JSON.parse(data.tax_profiles); + $.each(parse_taxes, function(i, value){ + $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected"); + }); + $('#customer_id').val(data.id); $('#customer_name').val(data.name); $('#customer_company').val(data.company); @@ -138,6 +145,7 @@ $(document).on('click',".customer_tr",function(){ $('#customer_salutation').val(data.salutation); $('#customer_nrc_no').val(data.nrc_no); $('#customer_card_no').val(data.card_no); + $('#customer_type').val(data.customer_type); $('#paypar_account_no').val(data.paypar_account_no); $('#customer_address').val(data.address); $('#customer_date_of_birth').val(data.date_of_birth); diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder index 5fd0410a..ffc312a2 100644 --- a/app/views/crm/customers/show.json.jbuilder +++ b/app/views/crm/customers/show.json.jbuilder @@ -1,4 +1,4 @@ json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, - :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no + :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :tax_profiles json.url crm_customer_url(@crm_customer, format: :json) From 43ad4d9bc6f1698557ffbbc22332a0d7ee05b47f Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 11:10:18 +0630 Subject: [PATCH 077/246] apply inclusive tax by divided by 21 --- app/models/sale.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 4a4c451f..4553e2d2 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -279,12 +279,15 @@ class Sale < ApplicationRecord sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate - #include or execulive - # sale_tax.tax_payable_amount = total_taxable * tax.rate # substract , to give after discount total_tax = total_taxable - total_discount - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end #new taxable amount is standard rule for step by step # total_taxable = total_taxable + sale_tax.tax_payable_amount @@ -299,12 +302,6 @@ class Sale < ApplicationRecord # Tax Calculate def apply_tax(total_taxable) - #if tax is not apply create new record - # self.sale_taxes.each do |existing_tax| - # #delete existing and create new - # existing_tax.delete - # end - #if tax is not apply create new record SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax| #delete existing and create new @@ -320,10 +317,16 @@ class Sale < ApplicationRecord sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate - #include or execulive - # sale_tax.tax_payable_amount = total_taxable * tax.rate + + # substract , to give after discount total_tax = total_taxable - self.total_discount - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + #new taxable amount is standard rule for step by step # total_taxable = total_taxable + sale_tax.tax_payable_amount From 729daeba7b6cba7a0eff4278eb9e6dbd95b8383c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 Aug 2017 11:54:19 +0630 Subject: [PATCH 078/246] update filter order --- app/controllers/origami/shifts_controller.rb | 4 - .../transactions/orders_controller.rb | 14 +- app/models/order.rb | 16 +- app/models/sale.rb | 2 +- .../transactions/credit_notes/index.html.erb | 2 +- app/views/transactions/orders/index.html.erb | 138 +++++++++++++++++- 6 files changed, 154 insertions(+), 22 deletions(-) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index f7690fef..b9298a32 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -42,10 +42,6 @@ class Origami::ShiftsController < BaseOrigamiController @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') - - puts "sssssssssss" - puts @total_amount_by_account.to_json - # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index 4df88787..bd079d83 100644 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -3,18 +3,17 @@ class Transactions::OrdersController < ApplicationController def index filter = params[:filter] + count = params[:count] from = params[:from] to = params[:to] - if filter.nil? || from.nil? || to.nil? + if filter.nil? && from.nil? && to.nil? && count.nil? orders = Order.order("order_id desc") + puts "ssssss" else - orders = Order.search(filter,from,to) - # if order.count > 0 - # orders = order - # else - # orders = Order.order("order_id desc") - # end + orders = Order.search(filter,from,to,count) + puts "aaaaa" + end if !orders.nil? @@ -22,6 +21,7 @@ class Transactions::OrdersController < ApplicationController else @orders = [] end + puts @orders.to_json respond_to do |format| format.html # index.html.erb format.json { render json: @orders } diff --git a/app/models/order.rb b/app/models/order.rb index 4d54f41f..398fb0f2 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -320,12 +320,18 @@ class Order < ApplicationRecord end - def self.search(filter,from,to) - if !from.nil? && !to.nil? - Order.where("DATE_FORMAT(date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(date,'%d-%m-%Y') <= ?", from,to) + def self.search(filter,from,to,count) + if count.to_i > 0 + item_count = "and item_count = '#{count}'" else - # find(:all) - where("order_id LIKE ? OR item_count ='#{filter}'","%#{filter}%",) + item_count = '' + end + if from.present? && to.present? + Order.where("DATE_FORMAT(date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(date,'%d-%m-%Y') <= ? #{item_count}", from,to) + elsif !from.present? && !to.present? && count.present? + Order.where("item_count = '#{count}'") + else + Order.where("order_id LIKE ? OR status LIKE ? OR order_type LIKE ? OR source='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 57794048..b06dc54f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -414,7 +414,7 @@ class Sale < ApplicationRecord .where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and sp.payment_method = 'creditnote' #{keyword} #{custo}", from,to) else sale = Sale.all.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id") - .where("sp.payment_method =? #{keyword} #{custo}",'creditnote') + .where("sp.payment_method ='creditnote' #{keyword} #{custo}") end diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb index ac291115..19327139 100644 --- a/app/views/transactions/credit_notes/index.html.erb +++ b/app/views/transactions/credit_notes/index.html.erb @@ -43,7 +43,7 @@
    - +
    <% end %> diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 21cae24a..180c9d5b 100644 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -14,13 +14,17 @@
    <%= form_tag transactions_orders_path, :method => :get do %>
    - +
    - - +
    + + + 0 +
    +
    @@ -32,7 +36,7 @@
    - +
    <% end %> @@ -76,6 +80,132 @@
    + + From 38a0f787312fc403649fcfd496a99caebe68739c Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:28:17 +0630 Subject: [PATCH 079/246] add Product to account --- lib/tasks/menu_osaka.rake | 179 +++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index b0fc72a9..0acc4a1e 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -10,6 +10,7 @@ namespace :menu do menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) food = Account.create({title: "Food", account_type: "0"}) beverage = Account.create({title: "Beverage", account_type: "1"}) +product = Account.create({title: "Product", account_type: "2"}) # Gyoza menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) #Gyoza 6Pcs @@ -19,11 +20,11 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz #Gyoza 12 Pcs menu_category1_menu_item6 = SimpleMenuItem.create({name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) #Gyoza 30 Pcs menu_category1_menu_item20 = SimpleMenuItem.create({name: "Gyoza 30 Pcs", alt_name: "Gyoza 30 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) #Green Onion Gyoza 6Pcs menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:3500.0, is_on_promotion:false}]) @@ -32,7 +33,7 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3500.0, is_on_promotion:false}]) #White Onion Gyoza 6Pcs menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) @@ -47,22 +48,22 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:0.0, is_on_promotion:false}]) # Gyoza 2pcs # menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) # Gyoza dumpling soup with Udon menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) # # Gyoza dumpling soup with Udon # menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) # Gyoza dumpling soup menu_category1_menu_item22 = SimpleMenuItem.create({name: "Gyoza dumpling soup", alt_name: "Gyoza dumpling soup",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}]) # Gyoza dumpling tossed menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling tossed", alt_name: "Gyoza dumpling tossed",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}]) # Gyoza dumpling soup with Ramen menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Ramen", alt_name: "Gyoza dumpling soup with Ramen",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}]) # Salad menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) @@ -77,7 +78,7 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2200.00, is_on_promotion:false}]) # S4-Glass Noodle Salad menu_category1_menu_item37 = SimpleMenuItem.create({name: "S4-Glass Noodle Salad", alt_name: "S4-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) # Seaweed Salad menu_category1_menu_item28 = SimpleMenuItem.create({name: "S5-Seaweed Salad", alt_name: "S5-Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) @@ -90,16 +91,16 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala # S5-Otsumami Sansyu # menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) - + # Fried Tofu Salad menu_category1_menu_item31 = SimpleMenuItem.create({name: "S7-Fried Tofu Salad", alt_name: "S7-Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) #BBQ Pork Salad menu_category1_menu_item29 = SimpleMenuItem.create({ name: "S8-BBQ Pork Salad", alt_name: "S8-BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) # Seafood Salad menu_category1_menu_item30 = SimpleMenuItem.create({name: "S9-Seafood Salad", alt_name: "S9-Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) # Gyoza Salad # menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) @@ -126,18 +127,18 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # A6 Party Set A menu_category1_menu_item54 = SimpleMenuItem.create({name: "A6-Party Set A", alt_name: "A6-Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:0.00, is_on_promotion:false}]) - # A7 Party Set + # A7 Party Set menu_category1_menu_item55 = SimpleMenuItem.create({name: "A7-Party Set", alt_name: "A7-Party Set",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}]) # A8 Wakatori Spring Chicken menu_category1_menu_item56 = SimpleMenuItem.create({name: "A8-Wakatori Spring Chicken", alt_name: "A8-Wakatori Spring Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}]) # A9 Ohsho Fried Chicken menu_category1_menu_item57 = SimpleMenuItem.create({name: "A9-Ohsho Fried Chicken", alt_name: "A9-Ohsho Fried Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}]) # A10 Fish & Chip menu_category1_menu_item58 = SimpleMenuItem.create({name: "A10-Fish & Chip", alt_name: "A10-Fish & Chip",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}]) # A2 Kushi Katsu # menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) @@ -153,11 +154,11 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # # A6 Vegetable Tempura # menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) - + # # A 10 - Fried Potato # menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) - + # # A12 Chicken Cutlet # menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) @@ -175,7 +176,7 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) # # Grilled Shishamo # menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) # # Party Set A # menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) @@ -208,7 +209,7 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) # Salad # menu_category1_menu_item65 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) # A La Carte menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) @@ -242,16 +243,16 @@ menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) # F10 Green Pepper Steak menu_category1_menu_item72 = SimpleMenuItem.create({name: "F10-Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}]) # F11 Fried Eggplant with Pork menu_category1_menu_item68 = SimpleMenuItem.create({name: "F11-Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:0.00, is_on_promotion:false}]) # F12 Spicy Fried Beef menu_category1_menu_item69 = SimpleMenuItem.create({name: "F12-Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}]) # F13 Fried Egg with Beef menu_category1_menu_item66 = SimpleMenuItem.create({name: "F13-Fried Cabage with Konbu Taste", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}]) # Curry menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) @@ -285,19 +286,19 @@ menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Cur menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:7900.00, is_on_promotion:false}]) # C10-Fried Chicken Curry Tenshinhan menu_category12_menu_item6 = SimpleMenuItem.create({name: "C10-Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}]) # Rice menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) # R1-Fried Rice menu_category13_menu_item7 = SimpleMenuItem.create({name: "R1-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) # R2-Kimuchi Fried Rice menu_category13_menu_item8 = SimpleMenuItem.create({name: "R2-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}]) # R3-Beef Fried Rice menu_category13_menu_item11 = SimpleMenuItem.create({name: "R3-Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) # R4-Mabo Fried Rice menu_category13_menu_item12 = SimpleMenuItem.create({name: "R4-Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}]) @@ -339,23 +340,23 @@ menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) # # R6-Fried Prawn Don # menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) # # R7-Fried Rice # menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # # R9-Crab Tenshinhan # menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) # # R10-Crab Fried Rice # menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) # # Beef Fried Rice # menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) - - + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + + # # Mabo Tenshinhan # menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) @@ -367,16 +368,16 @@ menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) # # Fried Chicken Curry Tenshinhan # menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) # # Chicken Cutlet Curry Tenshinhan # menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) # Ramen -menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) +menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) # N1 - Sio Ramen menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1-Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) # N2 Syoyu Ramen menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2-Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) @@ -403,20 +404,20 @@ menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Rame menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:5500.00, is_on_promotion:false}]) # N10 Ramen Tossed menu_category1_menu_item83 = SimpleMenuItem.create({name: "N10-Ramen Tossed", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}]) # N11-Fried Noodle with Thick Sauce menu_category1_menu_item81 = SimpleMenuItem.create({name: "N11-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) # # N6 Spicy Curry Ramen # menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) - + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) + # N12 Cold Ramen menu_category1_menu_item79 = SimpleMenuItem.create({name: "N12-Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) # Ramen Topping -menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) +menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) # E1-Bamboo Shoot menu_category1_menu_item89 = SimpleMenuItem.create({name: "E1-Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) @@ -432,13 +433,13 @@ menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_nam # E5-Green Onion menu_category1_menu_item88 = SimpleMenuItem.create({name: "E5-Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:500.00, is_on_promotion:false}]) - + # # Half Egg # menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) # Udon -menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) +menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) # U1 Ebi Ten udon menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1-Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) @@ -472,7 +473,7 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item200, price:12000.00, is_on_promotion:false}]) # Grilled Garlic menu_category33_menu_item201 = SimpleMenuItem.create({name: "Y2-Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) # Grilled Shishamo menu_category33_menu_item202 = SimpleMenuItem.create({name: "Y3-Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item202, price:5500.00, is_on_promotion:false}]) @@ -487,10 +488,10 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item205, price:2500.00, is_on_promotion:false}]) # Yakitori menu_category33_menu_item206 = SimpleMenuItem.create({name: "Y7-Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) - menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}]) # Yakitori Assortment menu_category33_menu_item207 = SimpleMenuItem.create({name: "Y8-Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item207, price:4500.00, is_on_promotion:false}]) @@ -499,10 +500,10 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item208, price:3500.00, is_on_promotion:false}]) # Lady finger (1 piece) menu_category33_menu_item209 = SimpleMenuItem.create({name: "Y10-Lady finger", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) # Chicken Satay (1 piece) menu_category33_menu_item210 = SimpleMenuItem.create({name: "Y11-Chicken Satay", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) #Sushi menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) @@ -574,14 +575,14 @@ menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sus # # Soft Shell Crab Roll # menu_category30_menu_item207 = SimpleMenuItem.create({name: "Soft Shell Crab Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soft Shell Crab Roll",menu_item: menu_category30_menu_item207, price:5500.00, is_on_promotion:false}]) - + # # Apple Salad # menu_category30_menu_item209 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Apple Salad",menu_item: menu_category30_menu_item209, price:3500.00, is_on_promotion:false}]) # # Seaweed Salad # menu_category30_menu_item2010 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Salad",menu_item: menu_category30_menu_item2010, price:3000.00, is_on_promotion:false}]) - + # set menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) # Set A ( Soup + Gyoza 3 pcs) @@ -610,7 +611,7 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # D3-Seasonal Fruits menu_category11_menu_item202 = SimpleMenuItem.create({name: "D3-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) @@ -619,7 +620,7 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) # D5-Red Bean Gyoza menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) # D6-Peanuts Butter Gyoza menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}]) @@ -677,7 +678,7 @@ menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Ext # menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) # Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs) # menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) # # Kids Set B (Ramen+Fried Potato+Gyoza 2pcs) # menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) @@ -728,17 +729,17 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) # Cafe' latte menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) # Matcha latte menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) # Cafe' Mocha menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) # Flavor latte menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Almond)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butter scotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) # Roasted Almond Matchal latte @@ -746,7 +747,7 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) # Coconut Matcha latte menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) # Cold Drinks menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) @@ -800,19 +801,19 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item5, price:1500.00, is_on_promotion:false}]) # Papaya Juice menu_category20_menu_item6 = SimpleMenuItem.create({name: "Papaya Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) # Avocado Juice menu_category20_menu_item7 = SimpleMenuItem.create({name: "Avocado Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) # Kiwi Juice menu_category20_menu_item9 = SimpleMenuItem.create({name: "Kiwi Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) # Mango Juice menu_category20_menu_item10 = SimpleMenuItem.create({name: "Mango Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item10, price:2000.00, is_on_promotion:false}]) # Lime Soda menu_category20_menu_item11 = SimpleMenuItem.create({name: "Lime Soda", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) # # Ice # menu_category20_menu_item12 = SimpleMenuItem.create({name: "Ice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item12, price:500.00, is_on_promotion:false}]) @@ -821,7 +822,7 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item13, price:1500.00, is_on_promotion:false}]) # # Snow Tower # menu_category20_menu_item14 = SimpleMenuItem.create({name: "Snow Tower", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) #Smoothies menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) @@ -839,7 +840,7 @@ menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) # Mango Smoothie menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) # Blueberry smoothie menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) @@ -930,16 +931,16 @@ menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item200, price:1500.00, is_on_promotion:false}]) # Kirin Ichiban Draft Beer menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) # Myanmar Beer menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item202, price:2000.00, is_on_promotion:false}]) # Tuborg Beer menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) # # Wine by the Glass # menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) #Japanese Sake menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) @@ -958,9 +959,9 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # Lichiko Silhouette 720ml menu_category25_menu_item200 = SimpleMenuItem.create({name: "Lichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) - + # # Cocktail -# menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) +# menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) # # Moscow's Sky # menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}]) @@ -1035,7 +1036,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) -# menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # # D6-Seasonal Fruits # menu_category11_menu_item202 = SimpleMenuItem.create({name: "D6-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) @@ -1053,13 +1054,13 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item200, price:3000.00, is_on_promotion:false}]) # # D2-Red Bean Gyoza # menu_category15_menu_item201 = SimpleMenuItem.create({name: "D2-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) # # D3-Banana Gyoza # menu_category15_menu_item202 = SimpleMenuItem.create({name: "D3-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) # # Dessert Gyoza 2Pcs # menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) # # Green Tea # menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) @@ -1068,7 +1069,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Green Tea",menu_item: menu_category19_menu_item200, price:1500.00, is_on_promotion:false}]) # # Ice Green Tea # menu_category19_menu_item201 = SimpleMenuItem.create({name: "Ice Green Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}]) # # Chinese Tea # menu_category31 = MenuCategory.create({menu: menu, name: "Chinese Tea", alt_name: "Chinese Tea", order_by: 31, created_by: "SYSTEM DEFAULT"}) @@ -1077,7 +1078,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot China Tea",menu_item: menu_category19_menu_item200, price:500.00, is_on_promotion:false}]) # # Cold China Tea # menu_category19_menu_item201 = SimpleMenuItem.create({name: "Cold China Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}]) # Wine menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"}) @@ -1086,16 +1087,16 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:0.00, is_on_promotion:false}]) # Cabernet Sauvignon Viejo Vivedo menu_category32_menu_item201 = SimpleMenuItem.create({name: "Cabernet Sauvignon Viejo Vivedo(Argentina)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) # Church lane (South Australia) menu_category32_menu_item202 = SimpleMenuItem.create({name: "Church lane (South Australia)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:25000.00, is_on_promotion:false}]) # Chardonnay Layer Cake menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chardonnay Layer Cake(Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) # Cocktail -menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) +menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) # Crane at Lakeside menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside (Sake, Lime, Green, Apple)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}]) @@ -1116,10 +1117,10 @@ menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}]) # Kyoto Temptation menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation (Lichiko, Lime, Passion)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) # Tokyo Sunset menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset (Lichiko, Vodka, Lime, Strawberry)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) # Spirits menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "Spirits", order_by: 32, created_by: "SYSTEM DEFAULT"}) @@ -1128,22 +1129,22 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "S menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:45000.00, is_on_promotion:false}]) # Johanny Walker Double Limited menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Double Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) # Johanny Walker Black Limited menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Black Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:48000.00, is_on_promotion:false}]) # Glenffich 12 years menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 12 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) # Glenffich 15 years menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 15 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) # Chivas Extra menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chivas Extra", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) # Johanny Walker Gold Tin Pack menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Gold Tin Pack", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) # Johanny Walker Platinum menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Platinum", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:82000.00, is_on_promotion:false}]) From da690e00b87a2ac7d9fbade849fa5b1eb44ab840 Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:28:46 +0630 Subject: [PATCH 080/246] add s in Points --- app/views/settings/membership_settings/_form.html.erb | 8 ++++---- app/views/settings/membership_settings/index.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index 77a189c4..d2a25a29 100644 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -7,10 +7,10 @@ <%= f.input :gateway_communication_type %> <%= f.input :gateway_url %> <%= f.input :auth_token %> - <%= f.input :discount %> - <%= f.input :rebate %> - <%= f.input :bonus %> - <%= f.input :point %> +
    +
    +
    +
    diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index fa3b22ba..4ce72b69 100644 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -21,7 +21,7 @@ Discount Rebate Bonus - Point + Points From 7ce5ec93e465a01aecb6c48fade072132c94db64 Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:29:27 +0630 Subject: [PATCH 081/246] Change title for Cashin/Cashout --- app/views/origami/cash_ins/new.html.erb | 2 +- app/views/origami/cash_outs/new.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb index efc8a22b..b2922f63 100644 --- a/app/views/origami/cash_ins/new.html.erb +++ b/app/views/origami/cash_ins/new.html.erb @@ -1,7 +1,7 @@
    -

    Payment Credit

    +

    Cash In


    diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb index 9d628f24..e4d42b89 100644 --- a/app/views/origami/cash_outs/new.html.erb +++ b/app/views/origami/cash_outs/new.html.erb @@ -2,7 +2,7 @@
    -

    Payment Debit

    +

    Cash Out

    <%end%> + + <% if !@total_member_discount[0].member_discount.nil? + @member_discount = @total_member_discount[0].member_discount rescue 0.0 + @overall = @shift.total_discounts - @member_discount + %> - - - + + + + <%else @overall = @shift.total_discounts %> + + <%end%> + + + + + + + + + + <% @sale_taxes.each do |tax| %> @@ -98,6 +116,7 @@ <% @total_amount = 0 + @other_payment.each do |other| %> @@ -107,32 +126,32 @@ - - <% @total_amount = @total_amount+other.mpu_amount %> + + <% @total_amount = @total_amount+other.mpu_amount rescue 0.0 %> - - <% @total_amount = @total_amount+other.visa_amount %> + + <% @total_amount = @total_amount+other.visa_amount rescue 0.0 %> - - <% @total_amount = @total_amount+other.master_amount %> + + <% @total_amount = @total_amount+other.master_amount rescue 0.0 %> - - <% @total_amount = @total_amount+other.jcb_amount %> + + <% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %> - - <% @total_amount = @total_amount+other.paypar_amount %> + + <% @total_amount = @total_amount+other.paypar_amount rescue 0.0 %> <%end%> From 10aae022d23730964ecc484d086dc2510c319f5d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 16:47:57 +0630 Subject: [PATCH 117/246] update oqs --- app/assets/javascripts/OQS.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 19d0429e..801fd214 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -25,11 +25,12 @@ $(document).ready(function(){ // }, 10000); $(".nav-completed").on("click", function(){ $("#completed").removeClass('hide') - + $(".oqs_append").addClass('hide') }); $(".oqs_click").on("click", function(){ $("#completed").addClass('hide') + $(".oqs_append").removeClass('hide') var oqs_id = $(this).find(".oqs-id").text(); var url = 'oqs/get_items/'+oqs_id; show_details(url); From 03a6208a766c903acda8ff9611a08d490dca132e Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 17:41:10 +0630 Subject: [PATCH 118/246] add item set with scaffold --- .../javascripts/settings/item_sets.coffee | 3 + .../stylesheets/settings/item_sets.scss | 3 + .../settings/item_sets_controller.rb | 74 +++++++++ app/helpers/settings/item_sets_helper.rb | 2 + app/models/item_set.rb | 2 +- app/models/settings/item_set.rb | 2 + app/views/settings/item_sets/_form.html.erb | 13 ++ .../_settings_item_set.json.jbuilder | 2 + app/views/settings/item_sets/edit.html.erb | 6 + app/views/settings/item_sets/index.html.erb | 31 ++++ .../settings/item_sets/index.json.jbuilder | 1 + app/views/settings/item_sets/new.html.erb | 5 + app/views/settings/item_sets/show.html.erb | 19 +++ .../settings/item_sets/show.json.jbuilder | 1 + config/routes.rb | 3 + ....rb => 20170811071000_create_item_sets.rb} | 0 .../settings/item_sets_controller_spec.rb | 141 ++++++++++++++++++ .../helpers/settings/item_sets_helper_spec.rb | 15 ++ spec/models/settings/item_set_spec.rb | 5 + .../settings/settings_item_sets_spec.rb | 10 ++ .../settings/item_sets_routing_spec.rb | 39 +++++ .../settings/item_sets/edit.html.erb_spec.rb | 24 +++ .../settings/item_sets/index.html.erb_spec.rb | 25 ++++ .../settings/item_sets/new.html.erb_spec.rb | 24 +++ .../settings/item_sets/show.html.erb_spec.rb | 18 +++ test/system/item_sets_test.rb | 9 ++ 26 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/settings/item_sets.coffee create mode 100644 app/assets/stylesheets/settings/item_sets.scss create mode 100644 app/controllers/settings/item_sets_controller.rb create mode 100644 app/helpers/settings/item_sets_helper.rb create mode 100644 app/models/settings/item_set.rb create mode 100644 app/views/settings/item_sets/_form.html.erb create mode 100644 app/views/settings/item_sets/_settings_item_set.json.jbuilder create mode 100644 app/views/settings/item_sets/edit.html.erb create mode 100644 app/views/settings/item_sets/index.html.erb create mode 100644 app/views/settings/item_sets/index.json.jbuilder create mode 100644 app/views/settings/item_sets/new.html.erb create mode 100644 app/views/settings/item_sets/show.html.erb create mode 100644 app/views/settings/item_sets/show.json.jbuilder rename db/migrate/{20170811070634_create_item_sets.rb => 20170811071000_create_item_sets.rb} (100%) create mode 100644 spec/controllers/settings/item_sets_controller_spec.rb create mode 100644 spec/helpers/settings/item_sets_helper_spec.rb create mode 100644 spec/models/settings/item_set_spec.rb create mode 100644 spec/requests/settings/settings_item_sets_spec.rb create mode 100644 spec/routing/settings/item_sets_routing_spec.rb create mode 100644 spec/views/settings/item_sets/edit.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/index.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/new.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/show.html.erb_spec.rb create mode 100644 test/system/item_sets_test.rb diff --git a/app/assets/javascripts/settings/item_sets.coffee b/app/assets/javascripts/settings/item_sets.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/item_sets.coffee @@ -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/ diff --git a/app/assets/stylesheets/settings/item_sets.scss b/app/assets/stylesheets/settings/item_sets.scss new file mode 100644 index 00000000..004d8d6b --- /dev/null +++ b/app/assets/stylesheets/settings/item_sets.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Settings/ItemSets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb new file mode 100644 index 00000000..226071ef --- /dev/null +++ b/app/controllers/settings/item_sets_controller.rb @@ -0,0 +1,74 @@ +class Settings::ItemSetsController < ApplicationController + before_action :set_settings_item_set, only: [:show, :edit, :update, :destroy] + + # GET /settings/item_sets + # GET /settings/item_sets.json + def index + @settings_item_sets = ItemSet.all + end + + # GET /settings/item_sets/1 + # GET /settings/item_sets/1.json + def show + end + + # GET /settings/item_sets/new + def new + @settings_item_set = ItemSet.new + end + + # GET /settings/item_sets/1/edit + def edit + end + + # POST /settings/item_sets + # POST /settings/item_sets.json + def create + @settings_item_set = ItemSet.new(settings_item_set_params) + + respond_to do |format| + if @settings_item_set.save + format.html { redirect_to @settings_item_set, notice: 'Item set was successfully created.' } + format.json { render :show, status: :created, location: @settings_item_set } + else + format.html { render :new } + format.json { render json: @settings_item_set.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/item_sets/1 + # PATCH/PUT /settings/item_sets/1.json + def update + respond_to do |format| + if @settings_item_set.update(settings_item_set_params) + format.html { redirect_to @settings_item_set, notice: 'Item set was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_item_set } + else + format.html { render :edit } + format.json { render json: @settings_item_set.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/item_sets/1 + # DELETE /settings/item_sets/1.json + def destroy + @settings_item_set.destroy + respond_to do |format| + format.html { redirect_to settings_item_sets_url, notice: 'Item set was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_item_set + @settings_item_set = ItemSet.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_item_set_params + params.require(:settings_item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + end +end diff --git a/app/helpers/settings/item_sets_helper.rb b/app/helpers/settings/item_sets_helper.rb new file mode 100644 index 00000000..59c3b632 --- /dev/null +++ b/app/helpers/settings/item_sets_helper.rb @@ -0,0 +1,2 @@ +module Settings::ItemSetsHelper +end diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 379347a3..55bc0c6b 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -3,5 +3,5 @@ class ItemSet < ApplicationRecord has_many :menu_items, through: :menu_item_sets has_many :menu_instance_item_sets - has_many :menu_item_instances, through: :menu_item_sets + has_many :menu_item_instances, through: :menu_instance_item_sets end diff --git a/app/models/settings/item_set.rb b/app/models/settings/item_set.rb new file mode 100644 index 00000000..dcedbbca --- /dev/null +++ b/app/models/settings/item_set.rb @@ -0,0 +1,2 @@ +class Settings::ItemSet < ApplicationRecord +end diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb new file mode 100644 index 00000000..4e2760cd --- /dev/null +++ b/app/views/settings/item_sets/_form.html.erb @@ -0,0 +1,13 @@ +<%= simple_form_for(@settings_item_set) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :min_selectable_qty %> + <%= f.input :max_selectable_qty %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/item_sets/_settings_item_set.json.jbuilder b/app/views/settings/item_sets/_settings_item_set.json.jbuilder new file mode 100644 index 00000000..44a15ef8 --- /dev/null +++ b/app/views/settings/item_sets/_settings_item_set.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_item_set, :id, :name, :min_selectable_qty, :max_selectable_qty, :created_at, :updated_at +json.url settings_item_set_url(settings_item_set, format: :json) diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb new file mode 100644 index 00000000..75a7f10a --- /dev/null +++ b/app/views/settings/item_sets/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Settings Item Set

    + +<%= render 'form', settings_item_set: @settings_item_set %> + +<%= link_to 'Show', @settings_item_set %> | +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb new file mode 100644 index 00000000..f5b50ad6 --- /dev/null +++ b/app/views/settings/item_sets/index.html.erb @@ -0,0 +1,31 @@ +

    <%= notice %>

    + +

    Settings Item Sets

    + +
    Payment Reference From 813abe17336c9a505bb773b85fa31adee3cd137e Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:30:11 +0630 Subject: [PATCH 082/246] Regrouping Nav bar --- app/views/layouts/_header.html.erb | 40 +++++++++++++++++++----------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 904749e6..99971b63 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -8,22 +8,25 @@
    • +
    • <%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %>
      • +
      +
    • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %>
    • <%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %>
    • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
    • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
      • -
      -
    • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %>
      • -
      -
    • <%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
      • +
      +
    • <%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %>
    • <%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %>
    • <%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %>
      • -
      +
      +
    • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • @@ -33,7 +36,7 @@
    • <%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %>
    • <%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %>
  • @@ -42,9 +45,9 @@
  • <%= link_to "Daily Sale Report", reports_dailysale_index_path, :tabindex =>"-1" %>
  • <%= link_to "Sales Item Report", reports_saleitem_index_path, :tabindex =>"-1" %>
  • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %>
  • @@ -57,7 +60,7 @@
    • - + @@ -66,7 +69,7 @@
      <%if current_login_employee.role !="waiter" %>
    • <%= current_login_employee.name %>
      • - +
    • |
    • <%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
      • @@ -76,3 +79,10 @@ <% end %> + From 13359cecba5c8706a6b444369ef1bd85708beefe Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 Aug 2017 13:57:52 +0630 Subject: [PATCH 083/246] update void for bitp --- app/controllers/origami/void_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 73f89d13..1cf1ec65 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -6,18 +6,19 @@ class Origami::VoidController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) - sale.payment_status = 'void' - sale.sale_status = 'void' - sale.save - + # update count for shift sale - if(sale.sale_status == "void") + if(sale.sale_status == "completed") if sale.shift_sale_id != nil shift = ShiftSale.find(sale.shift_sale_id) shift.calculate(sale_id, "void") end end + sale.payment_status = 'void' + sale.sale_status = 'void' + sale.save + bookings = sale.bookings bookings.each do |booking| orders = booking.orders From a03e38179f85d0184810fde99d7d8dd0faeabc2f Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 15:23:55 +0630 Subject: [PATCH 084/246] UpdateHrLine --- app/views/layouts/_header.html.erb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 99971b63..bc5ce498 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -9,24 +9,24 @@
      • <%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %>
      • <%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %>
      • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
      • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %>
      • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %>
      • <%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %>
      • <%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %>
      • <%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
      @@ -80,9 +80,8 @@ From 1b14589927627e4db1abb17dd37686ed78621e7b Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 15:25:16 +0630 Subject: [PATCH 085/246] addCreatedAtInEmployee --- app/views/settings/employees/index.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index 0dbbcfe6..b44a2dcd 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -13,8 +13,9 @@ - - + + + @@ -24,13 +25,14 @@ + <% end %> From 0fc2fb1d9829fe5a7d7300baf218426ccac7db43 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 15:32:33 +0630 Subject: [PATCH 086/246] calc tax by user taxes --- app/models/sale.rb | 120 ++++++++++++++++++++++----------------------- db/seeds.rb | 5 +- 2 files changed, 62 insertions(+), 63 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 9fe8ad8f..672df8d1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -273,28 +273,33 @@ class Sale < ApplicationRecord total_tax_amount = 0 #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") + customer = Customer.find(sale.customer_id) # #Creat new tax records tax_profiles.each do |tax| - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + customer.tax_profiles.each do |cus_tax| + if cus_tax == tax.id + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + #new taxable amount is standard rule for step by step + # total_taxable = total_taxable + sale_tax.tax_payable_amount + + sale_tax.inclusive = tax.inclusive + sale_tax.save + + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end end - #new taxable amount is standard rule for step by step - # total_taxable = total_taxable + sale_tax.tax_payable_amount - - sale_tax.inclusive = tax.inclusive - sale_tax.save - - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end sale.total_tax = total_tax_amount @@ -312,32 +317,35 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") - # #Creat new tax records + customer = Customer.find(self.customer_id) + # #Create new tax records tax_profiles.each do |tax| - sale_tax = SaleTax.new(:sale => self) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + customer.tax_profiles.each do |cus_tax| + if cus_tax == tax.id + sale_tax = SaleTax.new(:sale => self) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - self.total_discount - #include or execulive - if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + # substract , to give after discount + total_tax = total_taxable - self.total_discount + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + + #new taxable amount is standard rule for step by step + # total_taxable = total_taxable + sale_tax.tax_payable_amount + + sale_tax.inclusive = tax.inclusive + sale_tax.save + + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end end - - #new taxable amount is standard rule for step by step - # total_taxable = total_taxable + sale_tax.tax_payable_amount - - sale_tax.inclusive = tax.inclusive - sale_tax.save - - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end - self.total_tax = total_tax_amount - end def product_get_unit_price(item_code) @@ -382,7 +390,6 @@ class Sale < ApplicationRecord end def self.search(filter,from,to) - if filter.blank? keyword = '' else @@ -399,7 +406,6 @@ class Sale < ApplicationRecord end def self.search_credit_sales(customer,filter,from,to) - if filter.blank? keyword = '' else @@ -518,31 +524,25 @@ class Sale < ApplicationRecord end def self.get_by_range_by_saleitems(from,to,status,report_type) + query = Sale.select(" + mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, + SUM(i.qty) as total_item," + + " i.unit_price as unit_price, + mi.name as product_name, + mc.name as menu_category_name, + mc.id as menu_category_id ") + .group('mi.id') + .order("mi.menu_category_id") - query = Sale.select(" - mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, - SUM(i.qty) as total_item," + - " i.unit_price as unit_price, - mi.name as product_name, - mc.name as menu_category_name, - mc.id as menu_category_id ") - .group('mi.id') - .order("mi.menu_category_id") - - query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id - JOIN menu_items mi ON i.product_code = mi.item_code" + - " JOIN menu_categories mc ON mc.id = mi.menu_category_id - JOIN employees ea ON ea.id = sales.cashier_id") - - - query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) - - + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id + JOIN menu_items mi ON i.product_code = mi.item_code" + + " JOIN menu_categories mc ON mc.id = mi.menu_category_id + JOIN employees ea ON ea.id = sales.cashier_id") + query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) end - def self.get_by_shiftsales(from,to,shift) if !shift.blank? ShiftSale.where("id =?",shift.id) diff --git a/db/seeds.rb b/db/seeds.rb index 1b63bcb0..1b024797 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,9 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"}) - +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[2,1]"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[1]"}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 14384745ad2f9ad141299012cebd8649f9a3ce64 Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 9 Aug 2017 15:37:28 +0630 Subject: [PATCH 087/246] Payment Methods - Isactive verification --- app/views/origami/others_payments/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 9ca152ac..b547fcda 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -2,7 +2,7 @@
      - <% @payment_method_setting.each do |payment_method|%> + <% @payment_method_setting.where("is_active = true").each do |payment_method|%>
      <%= payment_method.payment_method %>
      <% end %>
      From 2794103e52b45986b5706010751e3f229a270b67 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 17:54:22 +0630 Subject: [PATCH 088/246] update customer tax calc --- .../origami/customers_controller.rb | 4 +- app/models/sale.rb | 7 ++- app/views/crm/customers/_new_form.html.erb | 23 ++++---- app/views/origami/customers/index.html.erb | 57 +++++++++++++------ 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 026e59e3..ec826416 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -37,14 +37,14 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers = Customer.order("customer_id").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) else - @crm_customers = Customer.search(filter) - + @crm_customers = Customer.search(filter) end #@crm_customers = Customer.all @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50) @crm_customer = Customer.new @count_customer = Customer.count_customer + @taxes = TaxProfile.all.order("order_by asc") # if flash["errors"] # @crm_customer.valid? # end diff --git a/app/models/sale.rb b/app/models/sale.rb index 712584a5..b252fdf1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -277,8 +277,8 @@ class Sale < ApplicationRecord # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax == tax.id + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -318,10 +318,11 @@ class Sale < ApplicationRecord tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) + # #Create new tax records tax_profiles.each do |tax| customer.tax_profiles.each do |cus_tax| - if cus_tax == tax.id + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 5f1d1b46..35c3a46d 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -82,17 +82,7 @@
      <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> -
      - -
      "> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['card_no']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end %> -
      +
      @@ -103,10 +93,21 @@ <%end %>
      +
      <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
      +
      "> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['card_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end %> +
      +
      diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 3c22c2e4..c41e3cd6 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -81,23 +81,7 @@ <%= f.error_notification %> - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> -
      "> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
      -
      - -
      - -
      -
      -
      + <%= f.hidden_field :id, :class => "form-control col-md-6 " %>

      @@ -176,6 +160,37 @@ <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
      +
      + + +
      + +
      + <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> +
      + +
      "> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
      +
      + +
      + +
      +
      +
      +
      NameRoleNameRoleCreated At Action
      <%= link_to employee.name,settings_employee_path(employee) %> <%= employee.role %><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_employee_path(employee) %> + <%= link_to 'Edit', edit_settings_employee_path(employee) %> <%if employee.role != "administrator"%> - - + + | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %> - <%end%> + <%end%>
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Cashier Cashier Terminal Opening Date Opening float Received Amount Cast In Cast Out Total Receipt Dining Count Takeaway Count Total Void
      <%= @shift.employee.name%><%=@shift.cashier_terminal.name%><%= @shift.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %> + <%=@shift.opening_balance %><%=@shift.closing_balance %><%=@shift.cash_in %><%=@shift.cash_out %><%= @shift.total_receipt %><%= @shift.dining_count %><%= @shift.takeaway_count %>(<%= @shift.total_void.round(2) %>)
      + + <% @total_amount_by_account.each do |amount| %> + + + + + + <%end%> + + + + + + + <% @total_discount_by_account.each do |amount| %> + + + + + + <%end%> + + + + + + + <% @sale_taxes.each do |tax| %> + + + + + + <%end%> + + + + + + + + + + + + + + + +
      Total <%= amount.account_name %> Amount<%= amount.total_price.round(2) %>
      Net Sales<%=@shift.nett_sales %>
      Total <%= amount.account_name %> Discount<%= amount.total_price.round(2) %>
      Overall Discount Amount<%= @shift.total_discounts %>
      <%= tax.tax_name %> <%= tax.st_amount.round(2) %>
      Total Tax <%=@shift.total_taxes %>
      Rounding Adj <%= @shift.total_rounding.round(2) %>
      Grand Total <%= @shift.grand_total.round(2) %>
      +       		+ + + + + + + + + + + + <% @total_amount = 0 + @other_payment.each do |other| %> + + + + + + + + + + <% @total_amount = @total_amount+other.mpu_amount %> + + + + + + <% @total_amount = @total_amount+other.visa_amount %> + + + + + + <% @total_amount = @total_amount+other.master_amount %> + + + + + + <% @total_amount = @total_amount+other.jcb_amount %> + + + + + + <% @total_amount = @total_amount+other.paypar_amount %> + + <%end%> + + + + + + + + + + + + +
      Cash Payment <%=@shift.cash_sales %>
      Credit Payment <%=@shift.credit_sales %>
      Other Payment Detail
      MPU Payment <%=other.mpu_amount.round(2) %>
      VISA Payment <%=other.visa_amount.round(2) %>
      JCB Payment <%=other.master_amount.round(2) %>
      Master Payment <%=other.jcb_amount.round(2) %>
      Reedem Payment <%=other.paypar_amount.round(2) %>
      Total Other Payment <%=@shift.other_sales %>
      Total Payment <%= @total_amount+@shift.cash_sales+@shift.credit_sales %>
      +
      + + +
      +


      + + +
      + + + \ No newline at end of file diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb index 72d8b882..27b2305e 100644 --- a/db/migrate/20170530072247_create_shops.rb +++ b/db/migrate/20170530072247_create_shops.rb @@ -19,6 +19,7 @@ class CreateShops < ActiveRecord::Migration[5.1] t.string :owner_token t.string :id_prefix, :null => false, :limit => 3 t.boolean :is_rounding_adj, :default => false + t.boolean :quick_sale_summary, :default => false t.timestamps end diff --git a/db/seeds.rb b/db/seeds.rb index 1b63bcb0..328c9e54 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000",customer_type:"Dinein"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111",customer_type:"Takeaway"}) #Default ZOne @@ -149,7 +149,7 @@ menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) shop = Shop.create({id:1, name: "OSAKA OHSHO(Tamwe)", address:'No. 256, Kyaikkasan Road, Tamwe Township, Yangon', township:"Tamwe",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"Tel: 09-258676611",reservation_no:"111",license:"123", -activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111",is_rounding_adj:"0"}) +activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111",is_rounding_adj:"0",quick_sale_summary:"0"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) From 321c65d70baf65ed674d288248cb9b9d6e74c28c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 10 Aug 2017 13:37:31 +0630 Subject: [PATCH 090/246] update view --- app/views/origami/home/index.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 35aa4230..cdb76bd0 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -108,8 +108,11 @@ - + <%if current_login_employee.role == "cashier" %> + + <%end%> + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> + + + + <% + end + end + end + %> + + + + + + <% end %> + + + + + +
      +
      +
      +
      ORDER DETAILS - Table
      +
      +
      +
      + + + + + + + + + + + + + + + + + +
      Order ByOrder At + Customer +
      Table/Room
      +
      +
      + + + + + + + + + + +
      ItemsQTY
      +
      + +
      +
      +
      + + +
      + + + Back + + +
      + + diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 71077ec4..ed27aa13 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,29 +1,25 @@
      -
        -
      • Processed <%= @queue_completed_item.length %>
        • - <% - # For Tab Disable for Station is inactive + <% # For Tab Disable for Station is inactive status="" - @queue_stations_items.each do |qsi| - if qsi[:is_active] == false + @queue_stations.each do |qsi| + if qsi.is_active == false status="disabled" - end - %> + end %>
      • - role="tab" <%= status %>> + role="tab" <%= status %>> <%= qsi[:station_name] %> - > - <%= qsi[:item_count] %> + > + <%= qsi.assigned_order_items.count %> - <% if qsi[:is_ap] %> + <% if qsi.auto_print %> (ap) <% end %> From 1dbd6eb60acc5058eaacc7537bba0a445f25c41e Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 14:59:16 +0630 Subject: [PATCH 096/246] inclusive tax calc by rake --- app/models/sale.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 56f52b74..9f4ae9f7 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -287,7 +287,9 @@ class Sale < ApplicationRecord total_tax = total_taxable - total_discount #include or execulive if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value else sale_tax.tax_payable_amount = total_tax * tax.rate / 100 total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount @@ -330,7 +332,9 @@ class Sale < ApplicationRecord total_tax = total_taxable - self.total_discount #include or execulive if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value else sale_tax.tax_payable_amount = total_tax * tax.rate / 100 total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount From 3e0eebfa88f6bd382ca38286a029155afe56f3d6 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 16:24:56 +0630 Subject: [PATCH 097/246] nothing change before --- app/models/order.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 398fb0f2..0ef19729 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -65,7 +65,6 @@ class Order < ApplicationRecord end def adding_line_items - if self.items #re-order to ordered_list = re_order_items(self.items) From 99946deea358830c030ad1117900487f1f643020 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:01:37 +0630 Subject: [PATCH 098/246] update fix for customer --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 29834cb8..8bc16f74 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) # Default CUSTOMER -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[\"2\", \"1\"]"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[\"1\"]"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 338c4208505704f71c2bd97151df50780983c7cd Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:02:50 +0630 Subject: [PATCH 099/246] update fix for customer --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 29834cb8..8bc16f74 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) # Default CUSTOMER -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[\"2\", \"1\"]"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[\"1\"]"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 362789a93eb889cb52ddac82746595a2ab636a98 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 10 Aug 2017 18:19:07 +0630 Subject: [PATCH 100/246] update oqs --- app/assets/javascripts/OQS.js | 9 +- app/controllers/oqs/home_controller.rb | 18 ++- app/views/oqs/home/index.html.erb | 153 +++++++++++++++---------- config/routes.rb | 2 + 4 files changed, 113 insertions(+), 69 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 2097db44..d77a3a6a 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -24,7 +24,7 @@ $(document).ready(function(){ // window.location.reload(1); // }, 10000); - $('.queue_station').on('click',function(){ + $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); var assigned_item_id = $(this).children().find(".assigned-order-item").text(); @@ -68,19 +68,20 @@ $(document).ready(function(){ $(this).addClass('selected-item'); }); - $(".order-item-edit").on('click', function(){ + $(document).on('click', '.order-item-edit', function(event){ var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(5); window.location.href = '/oqs/'+ assigned_item_id + "/edit" }); // complete for queue item - $('.order-complete').on('click',function(e){ + + $(document).on('click', '.order-complete', function(event){ //e.preventDefault(); var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); var params = { 'id':assigned_item_id }; - + // Call update_delivery_status() for changed delivery and move to delivery $.ajax({ type: 'POST', diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index c4c801fa..0a120ce2 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -69,6 +69,12 @@ class Oqs::HomeController < BaseOqsController render :json => items.to_json end + def get_items_by_oqs + oqs_id = params[:id] + items = queue_items_query(false,oqs_id) + render :json => items.to_json + end + def show end @@ -88,8 +94,15 @@ class Oqs::HomeController < BaseOqsController render :json => removed_item.to_json end + + # Query for OQS with delivery status - def queue_items_query(status) + def queue_items_query(status,oqs_id=nil) + if oqs_id == nil + oqs = '' + else + oqs = " and assigned_order_items.order_queue_station_id = '#{oqs_id}' " + end AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id @@ -99,8 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'") - .group("assigned_order_items.assigned_order_item_id") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'#{oqs}") .order("assigned_order_items.created_at") end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index ed27aa13..857d9cb7 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -13,15 +13,15 @@ if qsi.is_active == false status="disabled" end %> -
      • - role="tab" <%= status %>> - <%= qsi[:station_name] %> - > - <%= qsi.assigned_order_items.count %> - - <% if qsi.auto_print %> - (ap) - <% end %> +
      • + + > + <%= qsi.station_name %> + <%= qsi.assigned_order_items.count %> + + <% if qsi.auto_print %> + (ap) + <% end %>
        • <% end %> @@ -76,63 +76,14 @@ - <% - @queue_stations_items.each do |qsi| - %> - -
        role="tabpanel"> + -
        - <% - @queue_items_details.each do |qid| - if qid.price != 0 - if qid.zone_id == qsi[:zone_id] && qid.station_name == qsi[:station_name] - %> -
        -
        -

        - <%= qid.type %> - - <%= qid.zone %> - <%= qid.order_id %> -

        -

        - <%= qid.item_name %> [x - <%= qid.qty %> ] -

        - -

        <%= qid.options == "[]"? "" : qid.options %>

        - -

        - Order at - - <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - - - - <%= qid.item_order_by %> - - -

        - - - -
        -
        - - -
        -
        - <% - end - end - end - %> +
        +
        -
        - - <% end %> - +
      @@ -193,4 +144,82 @@
      + diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..599ec8c8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -198,6 +198,8 @@ Rails.application.routes.draw do # Pass assigned_order_item_id get 'print/print/:id', to: "print#print" get 'print/print_order_summary/:id', to: "print#print_order_summary" + + get "/get_items/:id" =>"home#get_items_by_oqs", :as => "get_order_items_by_oqs" #dashboard # end From a368c4b0b690063452a16604a7bdbc78cab04a05 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:25:10 +0630 Subject: [PATCH 101/246] date convert oqs --- app/views/oqs/home/index.html.erb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 857d9cb7..02e5837f 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -77,13 +77,11 @@ - -
      - - - -
      - + +
      + +
      + @@ -175,7 +173,7 @@ function show_details(url){ options = data.options; } - var date = data[field]["created_at"]; + var date = new Date(data[field]["created_at"] + " UTC"); row ='
      ' +'
      ' @@ -194,7 +192,7 @@ function show_details(url){ +'

      ' +'Order at' - +''+ date +' - ' + +''+ date.toLocalString() +' - ' +''+ data[field]["item_order_by"] +' ' +' ' From d32fbf18e097d57875f586df57d7f95d175fd4ef Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:45:59 +0630 Subject: [PATCH 102/246] update oqs --- app/views/oqs/home/index.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 02e5837f..ad683d40 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -173,7 +173,8 @@ function show_details(url){ options = data.options; } - var date = new Date(data[field]["created_at"] + " UTC"); + var date = new Date(data[field]["created_at"]); + var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); row ='

      ' +'
      ' @@ -192,7 +193,7 @@ function show_details(url){ +'

      ' +'Order at' - +''+ date.toLocalString() +' - ' + +''+ show_date +' - ' +''+ data[field]["item_order_by"] +' ' +' ' From 5ffb715bd1c9ede50ad2acb81c4a972112cf53c2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:47:29 +0630 Subject: [PATCH 103/246] add menu_item_set --- db/migrate/20170810121704_menu_item_set.rb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 db/migrate/20170810121704_menu_item_set.rb diff --git a/db/migrate/20170810121704_menu_item_set.rb b/db/migrate/20170810121704_menu_item_set.rb new file mode 100644 index 00000000..5ab5a546 --- /dev/null +++ b/db/migrate/20170810121704_menu_item_set.rb @@ -0,0 +1,4 @@ +class MenuItemSet < ActiveRecord::Migration[5.1] + def change + end +end From 9eaf04778c0a305f2ba194c52fd1b0b7f3ce1ce4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 10:25:09 +0630 Subject: [PATCH 104/246] update oqs --- app/assets/javascripts/OQS.js | 86 +++++++++++++++++++++++++++++-- app/views/oqs/home/index.html.erb | 78 ---------------------------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index d77a3a6a..54e73fe1 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -24,6 +24,81 @@ $(document).ready(function(){ // window.location.reload(1); // }, 10000); + $(".oqs_click").on("click", function(){ + + var oqs_id = $(this).find(".oqs-id").text(); + var url = 'oqs/get_items/'+oqs_id; + show_details(url); + + }); //End Click + + function show_details(url){ + var oqs_append = $('.oqs_append'); + oqs_append.empty(); + + //Start Ajax + $.ajax({ + type: "GET", + url: url, + data: {}, + dataType: "json", + success: function(data) { + for(var field in data) { + var price = parseFloat(data[field].price).toFixed(2); + + if (data[field]["options"] == "[]") { + var options = ""; + }else{ + var options = data.options; + } + + var date = data[field]["created_at"]; + + row ='

      ' + +'
      ' + +'

      ' + +''+data[field]["zone"]+'- ' + +''+ data[field]["zone"] +'' + +''+ data[field]["order_id"] +'- ' + +'

      ' + + +'

      ' + +''+ data[field]["item_name"] +'- ' + +''+ data[field]["qty"] +'- ' + +'

      ' + + +'

      '+ options +'

      ' + + +'

      ' + +'Order at' + +''+ date +' - ' + + +''+ data[field]["item_order_by"] +' ' + +' ' + +'

      ' + + +' ' + +' ' + +'
      ' + + +'
      ' + +'' + +' ' + +'
      ' + + +'
      '; + + + + $('.oqs_append').append(row); + } + + } + }); + //end Ajax + + } + $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); @@ -41,7 +116,6 @@ $(document).ready(function(){ $('#order-from').text(orderZone); // clear order items $("#oqs-order-details-table").children("tbody").empty(); - // Call get_order_items() for Order Items by dining $.ajax({ type: 'GET', @@ -76,7 +150,7 @@ $(document).ready(function(){ // complete for queue item - $(document).on('click', '.order-complete', function(event){ + $(document).on('click', '.order-complete', function(event){ //e.preventDefault(); var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); @@ -118,10 +192,13 @@ $(document).ready(function(){ }); // Print Order Item - $('#print_order_item').on('click',function(){ + $(document).on('click', '#print_order_item', function(event){ var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text(); var options = $('.selected-item').children('.card-block').find('.item-options').text(); var params = { 'options':options }; + console.log(assigned_item_id); + console.log(options); + console.log(params); $.ajax({ type: 'GET', url: '/oqs/print/print/'+assigned_item_id, @@ -130,7 +207,8 @@ $(document).ready(function(){ }); // Print Order Summary - $('#print_order_summary').on('click',function(){ + // $('#print_order_summary').on('click',function(){ + $(document).on('click', '#print_order_summary', function(event){ var table_name=$('.selected-item').children().children().children('.order-zone').text().trim(); var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); var params = { 'table_name':table_name }; diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 857d9cb7..5642e4f7 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -144,82 +144,4 @@
      - From 2000eb2d6c054a47db5acb57e2d49de557285134 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 11:27:53 +0630 Subject: [PATCH 105/246] add pivot table for menu --- db/migrate/20170810121704_menu_item_set.rb | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 db/migrate/20170810121704_menu_item_set.rb diff --git a/db/migrate/20170810121704_menu_item_set.rb b/db/migrate/20170810121704_menu_item_set.rb deleted file mode 100644 index 5ab5a546..00000000 --- a/db/migrate/20170810121704_menu_item_set.rb +++ /dev/null @@ -1,4 +0,0 @@ -class MenuItemSet < ActiveRecord::Migration[5.1] - def change - end -end From b0f2bbe899efef62a875ee77d63c07389be7f6f0 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 11:28:13 +0630 Subject: [PATCH 106/246] add pivot table for menu --- db/migrate/20170810121704_create_item_sets.rb | 9 +++++++++ .../20170811121704_create_menu_instance_item_sets.rb | 8 ++++++++ db/migrate/20170811121704_create_menu_item_sets.rb | 8 ++++++++ 3 files changed, 25 insertions(+) create mode 100644 db/migrate/20170810121704_create_item_sets.rb create mode 100644 db/migrate/20170811121704_create_menu_instance_item_sets.rb create mode 100644 db/migrate/20170811121704_create_menu_item_sets.rb diff --git a/db/migrate/20170810121704_create_item_sets.rb b/db/migrate/20170810121704_create_item_sets.rb new file mode 100644 index 00000000..da7fc570 --- /dev/null +++ b/db/migrate/20170810121704_create_item_sets.rb @@ -0,0 +1,9 @@ +class CreateItemSets < ActiveRecord::Migration[5.1] + def change + create_table :item_sets do |t| + t.string :name, :null => false + t.integer :min_selectable_qty + t.integer :max_selectable_qty + t.timestamps + end +end diff --git a/db/migrate/20170811121704_create_menu_instance_item_sets.rb b/db/migrate/20170811121704_create_menu_instance_item_sets.rb new file mode 100644 index 00000000..1712065b --- /dev/null +++ b/db/migrate/20170811121704_create_menu_instance_item_sets.rb @@ -0,0 +1,8 @@ +class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_instance_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_instance_id, foreign_key: true + t.timestamps + end +end diff --git a/db/migrate/20170811121704_create_menu_item_sets.rb b/db/migrate/20170811121704_create_menu_item_sets.rb new file mode 100644 index 00000000..1cacad00 --- /dev/null +++ b/db/migrate/20170811121704_create_menu_item_sets.rb @@ -0,0 +1,8 @@ +class CreateMenuItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_id, foreign_key: true + t.timestamps + end +end From 0e93eb37651c9d5741db1274a968ec98605c7df5 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 12:13:30 +0630 Subject: [PATCH 107/246] fix for customer tax ui and calc tax after bind customer --- app/controllers/origami/customers_controller.rb | 2 ++ app/models/sale.rb | 14 ++++++++++---- app/views/crm/customers/index.html.erb | 6 ++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index ec826416..9c054378 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -89,6 +89,8 @@ class Origami::CustomersController < BaseOrigamiController if status == true render json: JSON.generate({:status => true}) + # Re-calc All Amount in Sale + sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount) else render json: JSON.generate({:status => false, :error_message => "Record not found"}) end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9f4ae9f7..7a4a7a62 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -274,11 +274,14 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(sale.customer_id) - +puts customer.tax_profiles # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax.to_i == tax.id + customer.tax_profiles.each do |cus_tax| +puts tax +puts cus_tax + if cus_tax.to_i == tax.id +puts "WALSS" sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -319,11 +322,14 @@ class Sale < ApplicationRecord tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) - +puts customer.tax_profiles # #Create new tax records tax_profiles.each do |tax| customer.tax_profiles.each do |cus_tax| +puts tax +puts cus_tax if cus_tax.to_i == tax.id +puts "WALSS" sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 34aaf51e..14e38822 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -124,18 +124,20 @@ $(document).on('click',".customer_tr",function(){ var url = "customers/" + customer_id + "/edit"; } + $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});; + $.ajax({ type: "GET", url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { // Selected for Taxes var taxes = JSON.stringify(data.tax_profiles); var parse_taxes = JSON.parse(taxes); console.log(parse_taxes); $.each(parse_taxes, function(i, value){ - $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected"); + $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); }); $('#customer_id').val(data.id); From ed793bd48cd0a8b698843fd916ffecf6fb626cca Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 12:15:47 +0630 Subject: [PATCH 108/246] remove puts in sale --- app/models/sale.rb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 7a4a7a62..a73667ba 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -274,14 +274,10 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(sale.customer_id) -puts customer.tax_profiles # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| -puts tax -puts cus_tax - if cus_tax.to_i == tax.id -puts "WALSS" + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -322,14 +318,10 @@ puts "WALSS" tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) -puts customer.tax_profiles # #Create new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| -puts tax -puts cus_tax - if cus_tax.to_i == tax.id -puts "WALSS" + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate From 2c7a641d47422d0426dfea8a3f179dbfc4ddce4b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 13:21:40 +0630 Subject: [PATCH 109/246] update oqs --- app/assets/javascripts/OQS.js | 8 +++++--- app/controllers/oqs/backhome_controller.rb | 2 +- app/controllers/oqs/home_controller.rb | 10 +++++++--- app/views/oqs/home/index.html.erb | 3 +-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index cad815bf..19d0429e 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -46,7 +46,8 @@ $(document).ready(function(){ url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { + for(var field in data) { var price = parseFloat(data[field].price).toFixed(2); @@ -62,7 +63,7 @@ $(document).ready(function(){ row ='
      ' +'
      ' +'

      ' - +''+data[field]["type"]+'- ' + +''+data[field]["table_type"]+'- ' +''+ data[field]["zone"] +'' +''+ data[field]["order_id"] +'- ' +'

      ' @@ -200,7 +201,8 @@ $(document).ready(function(){ $(document).on('click', '#print_order_item', function(event){ var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text(); var options = $('.selected-item').children('.card-block').find('.item-options').text(); - var params = { 'options':options }; + var params = { 'options':options }; + $.ajax({ type: 'GET', url: '/oqs/print/print/'+assigned_item_id, diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb index b09e4a2d..4ac5f0a2 100644 --- a/app/controllers/oqs/backhome_controller.rb +++ b/app/controllers/oqs/backhome_controller.rb @@ -89,7 +89,7 @@ class Oqs::HomeController < BaseOqsController # Query for OQS with delivery status def queue_items_query(status) - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") + AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join orders as od ON od.order_id = assigned_order_items.order_id diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index d25ab0ac..dfe648d0 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -95,7 +95,6 @@ class Oqs::HomeController < BaseOqsController end - # Query for OQS with delivery status def queue_items_query(status,oqs_id=nil) if oqs_id == nil @@ -103,7 +102,13 @@ class Oqs::HomeController < BaseOqsController else oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' " end - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") + AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, + oqs.id as station_id, oqs.station_name, + oqs.is_active, oqpz.zone_id, + df.name as zone, df.type as table_type, + odt.order_id, odt.item_code, odt.item_name, + odt.price, odt.qty, odt.item_order_by, odt.options, + cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join orders as od ON od.order_id = assigned_order_items.order_id @@ -114,7 +119,6 @@ class Oqs::HomeController < BaseOqsController left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs}") .group("assigned_order_items.assigned_order_item_id") - .order("assigned_order_items.created_at") end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index c6c35e1c..3ab1cf24 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -17,12 +17,11 @@ > <%= qsi.station_name %> - <%= qsi.assigned_order_items.count(:delivery_status) %> + <%= qsi.assigned_order_items.where("delivery_status=0").count %> <% if qsi.auto_print %> (ap) <% end %> - <%= qsi.assigned_order_items.where("delivery_status=0").count %> <% end %> From b0ad2049c591a89a3a14567a5500654dbc2fb177 Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 11 Aug 2017 13:34:30 +0630 Subject: [PATCH 110/246] dining_charges --- app/assets/javascripts/dining_charges.coffee | 3 + app/assets/stylesheets/dining_charges.scss | 3 + app/controllers/dining_charges_controller.rb | 74 +++++++++ app/helpers/dining_charges_helper.rb | 2 + app/models/dining_charge.rb | 2 + .../_dining_charge.json.jbuilder | 2 + app/views/dining_charges/_form.html.erb | 10 ++ app/views/dining_charges/edit.html.erb | 6 + app/views/dining_charges/index.html.erb | 25 ++++ app/views/dining_charges/index.json.jbuilder | 1 + app/views/dining_charges/new.html.erb | 5 + app/views/dining_charges/show.html.erb | 4 + app/views/dining_charges/show.json.jbuilder | 1 + config/routes.rb | 1 + db/migrate/20170622050926_create_customers.rb | 2 +- .../20170811052036_create_dining_charges.rb | 16 ++ .../dining_charges_controller_spec.rb | 141 ++++++++++++++++++ spec/helpers/dining_charges_helper_spec.rb | 15 ++ spec/models/dining_charge_spec.rb | 5 + spec/requests/dining_charges_spec.rb | 10 ++ spec/routing/dining_charges_routing_spec.rb | 39 +++++ .../dining_charges/edit.html.erb_spec.rb | 14 ++ .../dining_charges/index.html.erb_spec.rb | 14 ++ .../views/dining_charges/new.html.erb_spec.rb | 14 ++ .../dining_charges/show.html.erb_spec.rb | 11 ++ test/system/dining_charges_test.rb | 9 ++ 26 files changed, 428 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/dining_charges.coffee create mode 100644 app/assets/stylesheets/dining_charges.scss create mode 100644 app/controllers/dining_charges_controller.rb create mode 100644 app/helpers/dining_charges_helper.rb create mode 100644 app/models/dining_charge.rb create mode 100644 app/views/dining_charges/_dining_charge.json.jbuilder create mode 100644 app/views/dining_charges/_form.html.erb create mode 100644 app/views/dining_charges/edit.html.erb create mode 100644 app/views/dining_charges/index.html.erb create mode 100644 app/views/dining_charges/index.json.jbuilder create mode 100644 app/views/dining_charges/new.html.erb create mode 100644 app/views/dining_charges/show.html.erb create mode 100644 app/views/dining_charges/show.json.jbuilder create mode 100644 db/migrate/20170811052036_create_dining_charges.rb create mode 100644 spec/controllers/dining_charges_controller_spec.rb create mode 100644 spec/helpers/dining_charges_helper_spec.rb create mode 100644 spec/models/dining_charge_spec.rb create mode 100644 spec/requests/dining_charges_spec.rb create mode 100644 spec/routing/dining_charges_routing_spec.rb create mode 100644 spec/views/dining_charges/edit.html.erb_spec.rb create mode 100644 spec/views/dining_charges/index.html.erb_spec.rb create mode 100644 spec/views/dining_charges/new.html.erb_spec.rb create mode 100644 spec/views/dining_charges/show.html.erb_spec.rb create mode 100644 test/system/dining_charges_test.rb diff --git a/app/assets/javascripts/dining_charges.coffee b/app/assets/javascripts/dining_charges.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/dining_charges.coffee @@ -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/ diff --git a/app/assets/stylesheets/dining_charges.scss b/app/assets/stylesheets/dining_charges.scss new file mode 100644 index 00000000..b0d4ba51 --- /dev/null +++ b/app/assets/stylesheets/dining_charges.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the dining_charges controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/dining_charges_controller.rb b/app/controllers/dining_charges_controller.rb new file mode 100644 index 00000000..7b95af58 --- /dev/null +++ b/app/controllers/dining_charges_controller.rb @@ -0,0 +1,74 @@ +class DiningChargesController < ApplicationController + before_action :set_dining_charge, only: [:show, :edit, :update, :destroy] + + # GET /dining_charges + # GET /dining_charges.json + def index + @dining_charges = DiningCharge.all + end + + # GET /dining_charges/1 + # GET /dining_charges/1.json + def show + end + + # GET /dining_charges/new + def new + @dining_charge = DiningCharge.new + end + + # GET /dining_charges/1/edit + def edit + end + + # POST /dining_charges + # POST /dining_charges.json + def create + @dining_charge = DiningCharge.new(dining_charge_params) + + respond_to do |format| + if @dining_charge.save + format.html { redirect_to @dining_charge, notice: 'Dining charge was successfully created.' } + format.json { render :show, status: :created, location: @dining_charge } + else + format.html { render :new } + format.json { render json: @dining_charge.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /dining_charges/1 + # PATCH/PUT /dining_charges/1.json + def update + respond_to do |format| + if @dining_charge.update(dining_charge_params) + format.html { redirect_to @dining_charge, notice: 'Dining charge was successfully updated.' } + format.json { render :show, status: :ok, location: @dining_charge } + else + format.html { render :edit } + format.json { render json: @dining_charge.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /dining_charges/1 + # DELETE /dining_charges/1.json + def destroy + @dining_charge.destroy + respond_to do |format| + format.html { redirect_to dining_charges_url, notice: 'Dining charge was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_dining_charge + @dining_charge = DiningCharge.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def dining_charge_params + params.fetch(:dining_charge, {}) + end +end diff --git a/app/helpers/dining_charges_helper.rb b/app/helpers/dining_charges_helper.rb new file mode 100644 index 00000000..972a028c --- /dev/null +++ b/app/helpers/dining_charges_helper.rb @@ -0,0 +1,2 @@ +module DiningChargesHelper +end diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb new file mode 100644 index 00000000..9a6c5524 --- /dev/null +++ b/app/models/dining_charge.rb @@ -0,0 +1,2 @@ +class DiningCharge < ApplicationRecord +end diff --git a/app/views/dining_charges/_dining_charge.json.jbuilder b/app/views/dining_charges/_dining_charge.json.jbuilder new file mode 100644 index 00000000..045eb7ae --- /dev/null +++ b/app/views/dining_charges/_dining_charge.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! dining_charge, :id, :created_at, :updated_at +json.url dining_charge_url(dining_charge, format: :json) diff --git a/app/views/dining_charges/_form.html.erb b/app/views/dining_charges/_form.html.erb new file mode 100644 index 00000000..0d4232f9 --- /dev/null +++ b/app/views/dining_charges/_form.html.erb @@ -0,0 +1,10 @@ +<%= simple_form_for(@dining_charge) do |f| %> + <%= f.error_notification %> + +
      +
      + +
      + <%= f.button :submit %> +
      +<% end %> diff --git a/app/views/dining_charges/edit.html.erb b/app/views/dining_charges/edit.html.erb new file mode 100644 index 00000000..042b88d2 --- /dev/null +++ b/app/views/dining_charges/edit.html.erb @@ -0,0 +1,6 @@ +

      Editing Dining Charge

      + +<%= render 'form', dining_charge: @dining_charge %> + +<%= link_to 'Show', @dining_charge %> | +<%= link_to 'Back', dining_charges_path %> diff --git a/app/views/dining_charges/index.html.erb b/app/views/dining_charges/index.html.erb new file mode 100644 index 00000000..0b3424ac --- /dev/null +++ b/app/views/dining_charges/index.html.erb @@ -0,0 +1,25 @@ +

      <%= notice %>

      + +

      Dining Charges

      + + + + + + + + + + <% @dining_charges.each do |dining_charge| %> + + + + + + <% end %> + +
      <%= link_to 'Show', dining_charge %><%= link_to 'Edit', edit_dining_charge_path(dining_charge) %><%= link_to 'Destroy', dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %>
      + +
      + +<%= link_to 'New Dining Charge', new_dining_charge_path %> diff --git a/app/views/dining_charges/index.json.jbuilder b/app/views/dining_charges/index.json.jbuilder new file mode 100644 index 00000000..0bb9b37d --- /dev/null +++ b/app/views/dining_charges/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @dining_charges, partial: 'dining_charges/dining_charge', as: :dining_charge diff --git a/app/views/dining_charges/new.html.erb b/app/views/dining_charges/new.html.erb new file mode 100644 index 00000000..9f56e5d3 --- /dev/null +++ b/app/views/dining_charges/new.html.erb @@ -0,0 +1,5 @@ +

      New Dining Charge

      + +<%= render 'form', dining_charge: @dining_charge %> + +<%= link_to 'Back', dining_charges_path %> diff --git a/app/views/dining_charges/show.html.erb b/app/views/dining_charges/show.html.erb new file mode 100644 index 00000000..b37298ae --- /dev/null +++ b/app/views/dining_charges/show.html.erb @@ -0,0 +1,4 @@ +

      <%= notice %>

      + +<%= link_to 'Edit', edit_dining_charge_path(@dining_charge) %> | +<%= link_to 'Back', dining_charges_path %> diff --git a/app/views/dining_charges/show.json.jbuilder b/app/views/dining_charges/show.json.jbuilder new file mode 100644 index 00000000..a91128e1 --- /dev/null +++ b/app/views/dining_charges/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "dining_charges/dining_charge", dining_charge: @dining_charge diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..12e3f542 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ require 'sidekiq/web' Rails.application.routes.draw do + resources :dining_charges root 'home#index' mount Sidekiq::Web => '/kiq' diff --git a/db/migrate/20170622050926_create_customers.rb b/db/migrate/20170622050926_create_customers.rb index 28f38e15..cb370bc1 100644 --- a/db/migrate/20170622050926_create_customers.rb +++ b/db/migrate/20170622050926_create_customers.rb @@ -16,7 +16,7 @@ class CreateCustomers < ActiveRecord::Migration[5.1] t.string :membership_id t.string :membership_type t.string :membership_authentication_code - t.string :customer_type, default => "Dinein" + t.string :customer_type, :default => "Dinein" t.json :tax_profiles end end diff --git a/db/migrate/20170811052036_create_dining_charges.rb b/db/migrate/20170811052036_create_dining_charges.rb new file mode 100644 index 00000000..3a77ad18 --- /dev/null +++ b/db/migrate/20170811052036_create_dining_charges.rb @@ -0,0 +1,16 @@ +class CreateDiningCharges < ActiveRecord::Migration[5.1] + def change + create_table :dining_charges do |t| + t.references :dining_facility + t.string :item_code, :null => false + t.integer :unit_price, :default => 0 + t.boolean :taxable, :default => true + t.string :charge_type, :default => "hr" + t.time :minimum_free_time + t.time :charge_block + t.string :time_rounding, :default => "down" + t.time :time_rounding_block + t.timestamps + end + end +end diff --git a/spec/controllers/dining_charges_controller_spec.rb b/spec/controllers/dining_charges_controller_spec.rb new file mode 100644 index 00000000..2d92fe46 --- /dev/null +++ b/spec/controllers/dining_charges_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe DiningChargesController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # DiningCharge. As you add validations to DiningCharge, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # DiningChargesController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + dining_charge = DiningCharge.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + dining_charge = DiningCharge.create! valid_attributes + get :show, params: {id: dining_charge.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + dining_charge = DiningCharge.create! valid_attributes + get :edit, params: {id: dining_charge.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new DiningCharge" do + expect { + post :create, params: {dining_charge: valid_attributes}, session: valid_session + }.to change(DiningCharge, :count).by(1) + end + + it "redirects to the created dining_charge" do + post :create, params: {dining_charge: valid_attributes}, session: valid_session + expect(response).to redirect_to(DiningCharge.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {dining_charge: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested dining_charge" do + dining_charge = DiningCharge.create! valid_attributes + put :update, params: {id: dining_charge.to_param, dining_charge: new_attributes}, session: valid_session + dining_charge.reload + skip("Add assertions for updated state") + end + + it "redirects to the dining_charge" do + dining_charge = DiningCharge.create! valid_attributes + put :update, params: {id: dining_charge.to_param, dining_charge: valid_attributes}, session: valid_session + expect(response).to redirect_to(dining_charge) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + dining_charge = DiningCharge.create! valid_attributes + put :update, params: {id: dining_charge.to_param, dining_charge: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested dining_charge" do + dining_charge = DiningCharge.create! valid_attributes + expect { + delete :destroy, params: {id: dining_charge.to_param}, session: valid_session + }.to change(DiningCharge, :count).by(-1) + end + + it "redirects to the dining_charges list" do + dining_charge = DiningCharge.create! valid_attributes + delete :destroy, params: {id: dining_charge.to_param}, session: valid_session + expect(response).to redirect_to(dining_charges_url) + end + end + +end diff --git a/spec/helpers/dining_charges_helper_spec.rb b/spec/helpers/dining_charges_helper_spec.rb new file mode 100644 index 00000000..9592fc0b --- /dev/null +++ b/spec/helpers/dining_charges_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the DiningChargesHelper. For example: +# +# describe DiningChargesHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe DiningChargesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/dining_charge_spec.rb b/spec/models/dining_charge_spec.rb new file mode 100644 index 00000000..bc7b0d21 --- /dev/null +++ b/spec/models/dining_charge_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe DiningCharge, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/dining_charges_spec.rb b/spec/requests/dining_charges_spec.rb new file mode 100644 index 00000000..79ac650c --- /dev/null +++ b/spec/requests/dining_charges_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "DiningCharges", type: :request do + describe "GET /dining_charges" do + it "works! (now write some real specs)" do + get dining_charges_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/dining_charges_routing_spec.rb b/spec/routing/dining_charges_routing_spec.rb new file mode 100644 index 00000000..0cf8211b --- /dev/null +++ b/spec/routing/dining_charges_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe DiningChargesController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/dining_charges").to route_to("dining_charges#index") + end + + it "routes to #new" do + expect(:get => "/dining_charges/new").to route_to("dining_charges#new") + end + + it "routes to #show" do + expect(:get => "/dining_charges/1").to route_to("dining_charges#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/dining_charges/1/edit").to route_to("dining_charges#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/dining_charges").to route_to("dining_charges#create") + end + + it "routes to #update via PUT" do + expect(:put => "/dining_charges/1").to route_to("dining_charges#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/dining_charges/1").to route_to("dining_charges#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/dining_charges/1").to route_to("dining_charges#destroy", :id => "1") + end + + end +end diff --git a/spec/views/dining_charges/edit.html.erb_spec.rb b/spec/views/dining_charges/edit.html.erb_spec.rb new file mode 100644 index 00000000..d91e5fea --- /dev/null +++ b/spec/views/dining_charges/edit.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "dining_charges/edit", type: :view do + before(:each) do + @dining_charge = assign(:dining_charge, DiningCharge.create!()) + end + + it "renders the edit dining_charge form" do + render + + assert_select "form[action=?][method=?]", dining_charge_path(@dining_charge), "post" do + end + end +end diff --git a/spec/views/dining_charges/index.html.erb_spec.rb b/spec/views/dining_charges/index.html.erb_spec.rb new file mode 100644 index 00000000..1712a84f --- /dev/null +++ b/spec/views/dining_charges/index.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "dining_charges/index", type: :view do + before(:each) do + assign(:dining_charges, [ + DiningCharge.create!(), + DiningCharge.create!() + ]) + end + + it "renders a list of dining_charges" do + render + end +end diff --git a/spec/views/dining_charges/new.html.erb_spec.rb b/spec/views/dining_charges/new.html.erb_spec.rb new file mode 100644 index 00000000..91bb8ac2 --- /dev/null +++ b/spec/views/dining_charges/new.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "dining_charges/new", type: :view do + before(:each) do + assign(:dining_charge, DiningCharge.new()) + end + + it "renders new dining_charge form" do + render + + assert_select "form[action=?][method=?]", dining_charges_path, "post" do + end + end +end diff --git a/spec/views/dining_charges/show.html.erb_spec.rb b/spec/views/dining_charges/show.html.erb_spec.rb new file mode 100644 index 00000000..e3674b43 --- /dev/null +++ b/spec/views/dining_charges/show.html.erb_spec.rb @@ -0,0 +1,11 @@ +require 'rails_helper' + +RSpec.describe "dining_charges/show", type: :view do + before(:each) do + @dining_charge = assign(:dining_charge, DiningCharge.create!()) + end + + it "renders attributes in

      " do + render + end +end diff --git a/test/system/dining_charges_test.rb b/test/system/dining_charges_test.rb new file mode 100644 index 00000000..3ed188c5 --- /dev/null +++ b/test/system/dining_charges_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class DiningChargesTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit dining_charges_url + # + # assert_selector "h1", text: "DiningCharge" + # end +end From b7c49f5f60702e5c03fbee5a310dd6bdb7fde9c1 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 13:34:58 +0630 Subject: [PATCH 111/246] remove item set migrateion --- db/migrate/20170810121704_create_item_sets.rb | 9 --------- .../20170811121704_create_menu_instance_item_sets.rb | 8 -------- db/migrate/20170811121704_create_menu_item_sets.rb | 8 -------- 3 files changed, 25 deletions(-) delete mode 100644 db/migrate/20170810121704_create_item_sets.rb delete mode 100644 db/migrate/20170811121704_create_menu_instance_item_sets.rb delete mode 100644 db/migrate/20170811121704_create_menu_item_sets.rb diff --git a/db/migrate/20170810121704_create_item_sets.rb b/db/migrate/20170810121704_create_item_sets.rb deleted file mode 100644 index da7fc570..00000000 --- a/db/migrate/20170810121704_create_item_sets.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateItemSets < ActiveRecord::Migration[5.1] - def change - create_table :item_sets do |t| - t.string :name, :null => false - t.integer :min_selectable_qty - t.integer :max_selectable_qty - t.timestamps - end -end diff --git a/db/migrate/20170811121704_create_menu_instance_item_sets.rb b/db/migrate/20170811121704_create_menu_instance_item_sets.rb deleted file mode 100644 index 1712065b..00000000 --- a/db/migrate/20170811121704_create_menu_instance_item_sets.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] - def change - create_table :menu_instance_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_instance_id, foreign_key: true - t.timestamps - end -end diff --git a/db/migrate/20170811121704_create_menu_item_sets.rb b/db/migrate/20170811121704_create_menu_item_sets.rb deleted file mode 100644 index 1cacad00..00000000 --- a/db/migrate/20170811121704_create_menu_item_sets.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMenuItemSets < ActiveRecord::Migration[5.1] - def change - create_table :menu_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_id, foreign_key: true - t.timestamps - end -end From b7cde3125f7c74d5c777238e8954e9e6fa7bb6f3 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 13:44:25 +0630 Subject: [PATCH 112/246] add item set and relation --- app/models/item_set.rb | 2 ++ app/models/menu_instance_item_set.rb | 2 ++ app/models/menu_item_set.rb | 2 ++ db/migrate/20170811070634_create_item_sets.rb | 11 +++++++++++ db/migrate/20170811071108_create_menu_item_sets.rb | 10 ++++++++++ .../20170811071327_create_menu_instance_item_sets.rb | 10 ++++++++++ spec/models/item_set_spec.rb | 5 +++++ spec/models/menu_instance_item_set_spec.rb | 5 +++++ spec/models/menu_item_set_spec.rb | 5 +++++ 9 files changed, 52 insertions(+) create mode 100644 app/models/item_set.rb create mode 100644 app/models/menu_instance_item_set.rb create mode 100644 app/models/menu_item_set.rb create mode 100644 db/migrate/20170811070634_create_item_sets.rb create mode 100644 db/migrate/20170811071108_create_menu_item_sets.rb create mode 100644 db/migrate/20170811071327_create_menu_instance_item_sets.rb create mode 100644 spec/models/item_set_spec.rb create mode 100644 spec/models/menu_instance_item_set_spec.rb create mode 100644 spec/models/menu_item_set_spec.rb diff --git a/app/models/item_set.rb b/app/models/item_set.rb new file mode 100644 index 00000000..83c32c82 --- /dev/null +++ b/app/models/item_set.rb @@ -0,0 +1,2 @@ +class ItemSet < ApplicationRecord +end diff --git a/app/models/menu_instance_item_set.rb b/app/models/menu_instance_item_set.rb new file mode 100644 index 00000000..6674c0c2 --- /dev/null +++ b/app/models/menu_instance_item_set.rb @@ -0,0 +1,2 @@ +class MenuInstanceItemSet < ApplicationRecord +end diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb new file mode 100644 index 00000000..407924bd --- /dev/null +++ b/app/models/menu_item_set.rb @@ -0,0 +1,2 @@ +class MenuItemSet < ApplicationRecord +end diff --git a/db/migrate/20170811070634_create_item_sets.rb b/db/migrate/20170811070634_create_item_sets.rb new file mode 100644 index 00000000..d666222c --- /dev/null +++ b/db/migrate/20170811070634_create_item_sets.rb @@ -0,0 +1,11 @@ +class CreateItemSets < ActiveRecord::Migration[5.1] + def change + create_table :item_sets do |t| + t.string :name + t.integer :min_selectable_qty + t.integer :max_selectable_qty + + t.timestamps + end + end +end diff --git a/db/migrate/20170811071108_create_menu_item_sets.rb b/db/migrate/20170811071108_create_menu_item_sets.rb new file mode 100644 index 00000000..f423ea7b --- /dev/null +++ b/db/migrate/20170811071108_create_menu_item_sets.rb @@ -0,0 +1,10 @@ +class CreateMenuItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_id, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20170811071327_create_menu_instance_item_sets.rb b/db/migrate/20170811071327_create_menu_instance_item_sets.rb new file mode 100644 index 00000000..b25ba8b6 --- /dev/null +++ b/db/migrate/20170811071327_create_menu_instance_item_sets.rb @@ -0,0 +1,10 @@ +class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_instance_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_instance_id, foreign_key: true + + t.timestamps + end + end +end diff --git a/spec/models/item_set_spec.rb b/spec/models/item_set_spec.rb new file mode 100644 index 00000000..70c14cff --- /dev/null +++ b/spec/models/item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/menu_instance_item_set_spec.rb b/spec/models/menu_instance_item_set_spec.rb new file mode 100644 index 00000000..5711f7e7 --- /dev/null +++ b/spec/models/menu_instance_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MenuInstanceItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/menu_item_set_spec.rb b/spec/models/menu_item_set_spec.rb new file mode 100644 index 00000000..f3c82b26 --- /dev/null +++ b/spec/models/menu_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MenuItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 12d3e70b197efb866296bd041a4a264fc26db7ed Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 14:23:33 +0630 Subject: [PATCH 113/246] update model for menu --- app/models/item_set.rb | 5 +++++ app/models/menu_instance_item_set.rb | 2 ++ app/models/menu_item.rb | 3 +++ app/models/menu_item_set.rb | 2 ++ 4 files changed, 12 insertions(+) diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 83c32c82..379347a3 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -1,2 +1,7 @@ class ItemSet < ApplicationRecord + has_many :menu_item_sets + has_many :menu_items, through: :menu_item_sets + + has_many :menu_instance_item_sets + has_many :menu_item_instances, through: :menu_item_sets end diff --git a/app/models/menu_instance_item_set.rb b/app/models/menu_instance_item_set.rb index 6674c0c2..bc1d7aaf 100644 --- a/app/models/menu_instance_item_set.rb +++ b/app/models/menu_instance_item_set.rb @@ -1,2 +1,4 @@ class MenuInstanceItemSet < ApplicationRecord + belongs_to :item_set + belongs_to :menu_item_instance end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 1f1afbe4..0db0cda4 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -8,6 +8,9 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account + has_many :menu_item_sets + has_many :item_sets, through: :menu_item_sets + validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb index 407924bd..a39b8522 100644 --- a/app/models/menu_item_set.rb +++ b/app/models/menu_item_set.rb @@ -1,2 +1,4 @@ class MenuItemSet < ApplicationRecord + belongs_to :item_set + belongs_to :menu_item end From 3e6ea657f31807021ed60f7fb80e8ea9cab036e5 Mon Sep 17 00:00:00 2001 From: yamin Date: Fri, 11 Aug 2017 14:42:44 +0630 Subject: [PATCH 114/246] Set Footer in Dashboard --- app/views/home/dashboard.html.erb | 44 ++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 6b49c880..c2074720 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,12 +1,12 @@ - -

      +
      - + <% if current_login_employee.role = "admin" %> + <% elsif current_login_employee.role = "cashier" %> <%= link_to "Cashier Station", origami_path %> - <% elsif current_login_employee = "waiter" %> + <% elsif current_login_employee = "account" %> <%= link_to "Cashier Station", oishi_path %> <% else %> @@ -18,18 +18,30 @@ -
      -
      -

      <%= shop.name %>

      -
      -
      - <%= shop.address %> -
      -
      - <%= shop.phone_no %> -
      - -
      +
      +
      +
      +
      +
      +

      <%= shop.name %>

      +
      + <%= shop.address %> +
      +
      + <%= shop.phone_no %> +
      + +
      + From be71d187b0f1f83536051c972c6b985cc493aa1b Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 15:00:24 +0630 Subject: [PATCH 115/246] update menu --- app/models/menu_category.rb | 8 ++++---- app/models/menu_item.rb | 11 +++++------ app/models/menu_item_instance.rb | 10 +++++----- app/views/settings/menu_categories/show.html.erb | 2 +- db/migrate/20170811071108_create_menu_item_sets.rb | 4 ++-- .../20170811071327_create_menu_instance_item_sets.rb | 4 ++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 71ad42c8..29484bcc 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,5 +1,5 @@ class MenuCategory < ApplicationRecord - before_create :generate_menu_category_code + # before_create :generate_menu_category_code belongs_to :menu has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id" @@ -37,7 +37,7 @@ class MenuCategory < ApplicationRecord private - def generate_menu_category_code - self.code = SeedGenerator.generate_code(self.class.name, "C") - end + # def generate_menu_category_code + # self.code = SeedGenerator.generate_code(self.class.name, "C") + # end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 0db0cda4..4a661c14 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,5 @@ class MenuItem < ApplicationRecord - - before_create :generate_menu_item_code + # before_create :generate_menu_item_code belongs_to :menu_category, :optional => true has_many :menu_item_instances @@ -73,10 +72,10 @@ class MenuItem < ApplicationRecord end - private + # private - def generate_menu_item_code - self.item_code = SeedGenerator.generate_code(self.class.name, "I") - end + # def generate_menu_item_code + # self.item_code = SeedGenerator.generate_code(self.class.name, "I") + # end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index f39c29a2..579b7a5a 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,6 +1,6 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item - before_create :generate_menu_item_instance_code + # before_create :generate_menu_item_instance_code def self.findParentCategory(item) if item.menu_category_id @@ -11,9 +11,9 @@ class MenuItemInstance < ApplicationRecord end end - private + # private - def generate_menu_item_instance_code - self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") - end + # def generate_menu_item_instance_code + # self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") + # end end diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 25c3c9ba..7e1f44af 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,6 +1,6 @@
        -
      • Home
        • +
      • Home
      • Menus Categories
      • Details
        • diff --git a/db/migrate/20170811071108_create_menu_item_sets.rb b/db/migrate/20170811071108_create_menu_item_sets.rb index f423ea7b..1d4109f9 100644 --- a/db/migrate/20170811071108_create_menu_item_sets.rb +++ b/db/migrate/20170811071108_create_menu_item_sets.rb @@ -1,8 +1,8 @@ class CreateMenuItemSets < ActiveRecord::Migration[5.1] def change create_table :menu_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_id, foreign_key: true + t.references :item_set, foreign_key: true + t.references :menu_item, foreign_key: true t.timestamps end diff --git a/db/migrate/20170811071327_create_menu_instance_item_sets.rb b/db/migrate/20170811071327_create_menu_instance_item_sets.rb index b25ba8b6..89f08f41 100644 --- a/db/migrate/20170811071327_create_menu_instance_item_sets.rb +++ b/db/migrate/20170811071327_create_menu_instance_item_sets.rb @@ -1,8 +1,8 @@ class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] def change create_table :menu_instance_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_instance_id, foreign_key: true + t.references :item_set, foreign_key: true + t.references :menu_item_instance, foreign_key: true t.timestamps end From 79ca1428b9a2ca3f134bc801ef96e179b6a11f2e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 15:39:08 +0630 Subject: [PATCH 116/246] update close receipt for member discount --- app/controllers/origami/home_controller.rb | 2 +- app/controllers/origami/shifts_controller.rb | 8 ++-- app/models/printer/cashier_station_printer.rb | 4 +- app/models/shift_sale.rb | 6 +++ app/pdf/close_cashier_pdf.rb | 31 +++++++++++-- app/views/origami/home/index.html.erb | 2 +- .../origami/shifts/sale_summary.html.erb | 45 +++++++++++++------ 7 files changed, 74 insertions(+), 24 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 2e8aba2c..27822a17 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -7,6 +7,7 @@ class Origami::HomeController < BaseOrigamiController @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') @shop = Shop.find_by_id(1) + # @shift = ShiftSale.current_open_shift(current_user.id) end @@ -39,7 +40,6 @@ class Origami::HomeController < BaseOrigamiController else sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" && sale.sale_status != 'void' - puts "enter" @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index afb28714..e134a594 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -39,13 +39,13 @@ class Origami::ShiftsController < BaseOrigamiController # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') - + @total_member_discount = ShiftSale.get_total_member_discount(@shift) # get printer info - print_settings=PrintSetting.find_by_unique_code(unique_code) + print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::CashierStationPrinter.new(print_settings) - printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account) + printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount) end @@ -72,6 +72,8 @@ class Origami::ShiftsController < BaseOrigamiController # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') + @total_member_discount = ShiftSale.get_total_member_discount(@shift) + end end diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index b7bc34ae..91100145 100644 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -22,14 +22,14 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker # end #Bill Receipt Print - def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount) + def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount) #Use CUPS service #Generate PDF #Print cashier = shift_sale.employee.name shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") - pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount) + pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount) filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" pdf.render_file filename self.print(filename) diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 8a8c1469..168e63ff 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -125,6 +125,12 @@ class ShiftSale < ApplicationRecord query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id) .group("acc.title").order("acc.id") end + end + + def self.get_total_member_discount(shift) + query = Sale.select("SUM(sales.total_discount) as member_discount") + .where("shift_sale_id =? and sale_status = 'completed' and discount_type = 'member_discount'", shift.id) + end end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 1955bf74..51f905d6 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,6 +1,6 @@ class CloseCashierPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) + def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) self.page_width = 210 self.page_height = 7000 self.margin = 5 @@ -32,7 +32,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule - shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) + shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) @@ -51,7 +51,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule end - def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) + def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) move_down 7 y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do @@ -277,9 +277,32 @@ class CloseCashierPdf < Prawn::Document end #end total amount by Account + if total_member_discount[0].member_discount.present? + @member_discount = total_member_discount[0].member_discount rescue 0.0 + @overall = shift_sale.total_discounts - @member_discount + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Member Discount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{@member_discount}", :size => self.item_font_size, :align => :right + end + else + @overall = shift_sale.total_discounts + end + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Overall Discount Amount :", :size => self.item_font_size, :align => :right + text "Total Overall Discount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{@overall}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Discount Amount :", :size => self.item_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{shift_sale.total_discounts}", :size => self.item_font_size, :align => :right diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index cdb76bd0..e3193a98 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -108,7 +108,7 @@ - <%if current_login_employee.role == "cashier" %> + <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> <%end%> diff --git a/app/views/origami/shifts/sale_summary.html.erb b/app/views/origami/shifts/sale_summary.html.erb index c552d6b0..94e59924 100644 --- a/app/views/origami/shifts/sale_summary.html.erb +++ b/app/views/origami/shifts/sale_summary.html.erb @@ -55,11 +55,29 @@
    		<%= amount.total_price.round(2) %>
    Overall Discount Amount<%= @shift.total_discounts %> Total Member Discount<%= @member_discount %>
    Total Overall Discount<%= @overall %>
    Total Discount<%= @shift.total_discounts %>
    <%=@shift.credit_sales %>
    MPU Payment <%=other.mpu_amount.round(2) %><%=other.mpu_amount.round(2) rescue 0.0 %>
    VISA Payment <%=other.visa_amount.round(2) %><%=other.visa_amount.round(2) rescue 0.0 %>
    JCB Payment <%=other.master_amount.round(2) %><%=other.master_amount.round(2) rescue 0.0 %>
    Master Payment <%=other.jcb_amount.round(2) %><%=other.jcb_amount.round(2) rescue 0.0 %>
    Reedem Payment <%=other.paypar_amount.round(2) %><%=other.paypar_amount.round(2) rescue 0.0 %>
    + + + + + + + + + + + <% @settings_item_sets.each do |settings_item_set| %> + + + + + + + + + <% end %> + +
    NameMin selectable qtyMax selectable qty
    <%= settings_item_set.name %><%= settings_item_set.min_selectable_qty %><%= settings_item_set.max_selectable_qty %><%= link_to 'Show', settings_item_set %><%= link_to 'Edit', edit_settings_item_set_path(settings_item_set) %><%= link_to 'Destroy', settings_item_set, method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Settings Item Set', new_settings_item_set_path %> diff --git a/app/views/settings/item_sets/index.json.jbuilder b/app/views/settings/item_sets/index.json.jbuilder new file mode 100644 index 00000000..ae5e4391 --- /dev/null +++ b/app/views/settings/item_sets/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_item_sets, partial: 'settings_item_sets/settings_item_set', as: :settings_item_set diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb new file mode 100644 index 00000000..a2773f42 --- /dev/null +++ b/app/views/settings/item_sets/new.html.erb @@ -0,0 +1,5 @@ +

    New Settings Item Set

    + +<%= render 'form', settings_item_set: @settings_item_set %> + +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb new file mode 100644 index 00000000..5f7b01d0 --- /dev/null +++ b/app/views/settings/item_sets/show.html.erb @@ -0,0 +1,19 @@ +

    <%= notice %>

    + +

    + Name: + <%= @settings_item_set.name %> +

    + +

    + Min selectable qty: + <%= @settings_item_set.min_selectable_qty %> +

    + +

    + Max selectable qty: + <%= @settings_item_set.max_selectable_qty %> +

    + +<%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set) %> | +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.json.jbuilder b/app/views/settings/item_sets/show.json.jbuilder new file mode 100644 index 00000000..db3c9813 --- /dev/null +++ b/app/views/settings/item_sets/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_item_sets/settings_item_set", settings_item_set: @settings_item_set diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..4b5cd9f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,9 @@ require 'sidekiq/web' Rails.application.routes.draw do + namespace :settings do + resources :item_sets + end root 'home#index' mount Sidekiq::Web => '/kiq' diff --git a/db/migrate/20170811070634_create_item_sets.rb b/db/migrate/20170811071000_create_item_sets.rb similarity index 100% rename from db/migrate/20170811070634_create_item_sets.rb rename to db/migrate/20170811071000_create_item_sets.rb diff --git a/spec/controllers/settings/item_sets_controller_spec.rb b/spec/controllers/settings/item_sets_controller_spec.rb new file mode 100644 index 00000000..46593eff --- /dev/null +++ b/spec/controllers/settings/item_sets_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Settings::ItemSetsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Settings::ItemSet. As you add validations to Settings::ItemSet, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Settings::ItemSetsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :show, params: {id: item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :edit, params: {id: item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Settings::ItemSet" do + expect { + post :create, params: {settings_item_set: valid_attributes}, session: valid_session + }.to change(Settings::ItemSet, :count).by(1) + end + + it "redirects to the created settings_item_set" do + post :create, params: {settings_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(Settings::ItemSet.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {settings_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: new_attributes}, session: valid_session + item_set.reload + skip("Add assertions for updated state") + end + + it "redirects to the settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(item_set) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + expect { + delete :destroy, params: {id: item_set.to_param}, session: valid_session + }.to change(Settings::ItemSet, :count).by(-1) + end + + it "redirects to the settings_item_sets list" do + item_set = Settings::ItemSet.create! valid_attributes + delete :destroy, params: {id: item_set.to_param}, session: valid_session + expect(response).to redirect_to(settings_item_sets_url) + end + end + +end diff --git a/spec/helpers/settings/item_sets_helper_spec.rb b/spec/helpers/settings/item_sets_helper_spec.rb new file mode 100644 index 00000000..b34f883a --- /dev/null +++ b/spec/helpers/settings/item_sets_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::ItemSetsHelper. For example: +# +# describe Settings::ItemSetsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Settings::ItemSetsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/settings/item_set_spec.rb b/spec/models/settings/item_set_spec.rb new file mode 100644 index 00000000..fcaee254 --- /dev/null +++ b/spec/models/settings/item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::ItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/settings/settings_item_sets_spec.rb b/spec/requests/settings/settings_item_sets_spec.rb new file mode 100644 index 00000000..439abdaa --- /dev/null +++ b/spec/requests/settings/settings_item_sets_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Settings::ItemSets", type: :request do + describe "GET /settings_item_sets" do + it "works! (now write some real specs)" do + get settings_item_sets_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/settings/item_sets_routing_spec.rb b/spec/routing/settings/item_sets_routing_spec.rb new file mode 100644 index 00000000..45d308b7 --- /dev/null +++ b/spec/routing/settings/item_sets_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Settings::ItemSetsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/settings/item_sets").to route_to("settings/item_sets#index") + end + + it "routes to #new" do + expect(:get => "/settings/item_sets/new").to route_to("settings/item_sets#new") + end + + it "routes to #show" do + expect(:get => "/settings/item_sets/1").to route_to("settings/item_sets#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/settings/item_sets/1/edit").to route_to("settings/item_sets#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/settings/item_sets").to route_to("settings/item_sets#create") + end + + it "routes to #update via PUT" do + expect(:put => "/settings/item_sets/1").to route_to("settings/item_sets#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/settings/item_sets/1").to route_to("settings/item_sets#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/settings/item_sets/1").to route_to("settings/item_sets#destroy", :id => "1") + end + + end +end diff --git a/spec/views/settings/item_sets/edit.html.erb_spec.rb b/spec/views/settings/item_sets/edit.html.erb_spec.rb new file mode 100644 index 00000000..5add21aa --- /dev/null +++ b/spec/views/settings/item_sets/edit.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/edit", type: :view do + before(:each) do + @settings_item_set = assign(:settings_item_set, Settings::ItemSet.create!( + :name => "MyString", + :min_selectable_qty => 1, + :max_selectable_qty => 1 + )) + end + + it "renders the edit settings_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_item_set_path(@settings_item_set), "post" do + + assert_select "input[name=?]", "settings_item_set[name]" + + assert_select "input[name=?]", "settings_item_set[min_selectable_qty]" + + assert_select "input[name=?]", "settings_item_set[max_selectable_qty]" + end + end +end diff --git a/spec/views/settings/item_sets/index.html.erb_spec.rb b/spec/views/settings/item_sets/index.html.erb_spec.rb new file mode 100644 index 00000000..3dcf7fb2 --- /dev/null +++ b/spec/views/settings/item_sets/index.html.erb_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/index", type: :view do + before(:each) do + assign(:settings_item_sets, [ + Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + ), + Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + ) + ]) + end + + it "renders a list of settings/item_sets" do + render + assert_select "tr>td", :text => "Name".to_s, :count => 2 + assert_select "tr>td", :text => 2.to_s, :count => 2 + assert_select "tr>td", :text => 3.to_s, :count => 2 + end +end diff --git a/spec/views/settings/item_sets/new.html.erb_spec.rb b/spec/views/settings/item_sets/new.html.erb_spec.rb new file mode 100644 index 00000000..fc04e612 --- /dev/null +++ b/spec/views/settings/item_sets/new.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/new", type: :view do + before(:each) do + assign(:settings_item_set, Settings::ItemSet.new( + :name => "MyString", + :min_selectable_qty => 1, + :max_selectable_qty => 1 + )) + end + + it "renders new settings_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_item_sets_path, "post" do + + assert_select "input[name=?]", "settings_item_set[name]" + + assert_select "input[name=?]", "settings_item_set[min_selectable_qty]" + + assert_select "input[name=?]", "settings_item_set[max_selectable_qty]" + end + end +end diff --git a/spec/views/settings/item_sets/show.html.erb_spec.rb b/spec/views/settings/item_sets/show.html.erb_spec.rb new file mode 100644 index 00000000..4e4b9b2c --- /dev/null +++ b/spec/views/settings/item_sets/show.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/show", type: :view do + before(:each) do + @settings_item_set = assign(:settings_item_set, Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Name/) + expect(rendered).to match(/2/) + expect(rendered).to match(/3/) + end +end diff --git a/test/system/item_sets_test.rb b/test/system/item_sets_test.rb new file mode 100644 index 00000000..c162d36f --- /dev/null +++ b/test/system/item_sets_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Settings::ItemSetsTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit settings_item_sets_url + # + # assert_selector "h1", text: "Settings::ItemSet" + # end +end From 740038757d39326632a81f95313a29d2afec511b Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 11 Aug 2017 17:53:48 +0630 Subject: [PATCH 119/246] Dining Charges CRUD --- .../dining_charges_controller.rb | 29 +++++++++++++++---- app/models/dining_charge.rb | 2 ++ app/models/dining_facility.rb | 1 + app/views/dining_charges/_form.html.erb | 10 ------- app/views/dining_charges/edit.html.erb | 6 ---- app/views/dining_charges/new.html.erb | 5 ---- .../_dining_charge.json.jbuilder | 0 .../settings/dining_charges/_form.html.erb | 18 ++++++++++++ .../settings/dining_charges/edit.html.erb | 19 ++++++++++++ .../dining_charges/index.html.erb | 0 .../dining_charges/index.json.jbuilder | 0 .../settings/dining_charges/new.html.erb | 18 ++++++++++++ .../dining_charges/show.html.erb | 0 .../dining_charges/show.json.jbuilder | 0 app/views/settings/tables/_form.html.erb | 20 +++++++++++++ config/routes.rb | 10 +++++-- 16 files changed, 108 insertions(+), 30 deletions(-) rename app/controllers/{ => settings}/dining_charges_controller.rb (61%) delete mode 100644 app/views/dining_charges/_form.html.erb delete mode 100644 app/views/dining_charges/edit.html.erb delete mode 100644 app/views/dining_charges/new.html.erb rename app/views/{ => settings}/dining_charges/_dining_charge.json.jbuilder (100%) create mode 100644 app/views/settings/dining_charges/_form.html.erb create mode 100644 app/views/settings/dining_charges/edit.html.erb rename app/views/{ => settings}/dining_charges/index.html.erb (100%) rename app/views/{ => settings}/dining_charges/index.json.jbuilder (100%) create mode 100644 app/views/settings/dining_charges/new.html.erb rename app/views/{ => settings}/dining_charges/show.html.erb (100%) rename app/views/{ => settings}/dining_charges/show.json.jbuilder (100%) diff --git a/app/controllers/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb similarity index 61% rename from app/controllers/dining_charges_controller.rb rename to app/controllers/settings/dining_charges_controller.rb index 7b95af58..6de504bf 100644 --- a/app/controllers/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -1,6 +1,7 @@ -class DiningChargesController < ApplicationController +class Settings::DiningChargesController < ApplicationController before_action :set_dining_charge, only: [:show, :edit, :update, :destroy] - + before_action :set_settings_facility + before_action :set_settings_zone # GET /dining_charges # GET /dining_charges.json def index @@ -25,10 +26,10 @@ class DiningChargesController < ApplicationController # POST /dining_charges.json def create @dining_charge = DiningCharge.new(dining_charge_params) - + @dining_charge.dining_facility_id = @settings_dining_facility.id respond_to do |format| if @dining_charge.save - format.html { redirect_to @dining_charge, notice: 'Dining charge was successfully created.' } + format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' } format.json { render :show, status: :created, location: @dining_charge } else format.html { render :new } @@ -41,8 +42,9 @@ class DiningChargesController < ApplicationController # PATCH/PUT /dining_charges/1.json def update respond_to do |format| + @dining_charge.dining_facility_id = @settings_dining_facility.id if @dining_charge.update(dining_charge_params) - format.html { redirect_to @dining_charge, notice: 'Dining charge was successfully updated.' } + format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' } format.json { render :show, status: :ok, location: @dining_charge } else format.html { render :edit } @@ -67,8 +69,23 @@ class DiningChargesController < ApplicationController @dining_charge = DiningCharge.find(params[:id]) end + def set_settings_facility + if params[:table_id] + @table = true + @settings_dining_facility = Table.find(params[:table_id]) + elsif params[:room_id] + @room = true + @settings_dining_facility = Room.find(params[:room_id]) + end + end + + def set_settings_zone + @zone = Zone.find(params[:zone_id]) + end + # Never trust parameters from the scary internet, only allow the white list through. def dining_charge_params - params.fetch(:dining_charge, {}) + # params.fetch(:dining_charge, {}) + params.require(:dining_charge).permit(:item_code, :unit_price, :taxable, :charge_type,:minimum_free_time ,:charge_block,:time_rounding,:time_rounding_block, :zone_id) end end diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb index 9a6c5524..0c52811f 100644 --- a/app/models/dining_charge.rb +++ b/app/models/dining_charge.rb @@ -1,2 +1,4 @@ class DiningCharge < ApplicationRecord + belongs_to :table + belongs_to :room end diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 510da53d..f441612a 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -1,5 +1,6 @@ class DiningFacility < ApplicationRecord belongs_to :zone + has_many :dining_charges TABLE_TYPE = "Table" ROOM_TYPE = "Room" diff --git a/app/views/dining_charges/_form.html.erb b/app/views/dining_charges/_form.html.erb deleted file mode 100644 index 0d4232f9..00000000 --- a/app/views/dining_charges/_form.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<%= simple_form_for(@dining_charge) do |f| %> - <%= f.error_notification %> - -

    -
    - -
    - <%= f.button :submit %> -
    -<% end %> diff --git a/app/views/dining_charges/edit.html.erb b/app/views/dining_charges/edit.html.erb deleted file mode 100644 index 042b88d2..00000000 --- a/app/views/dining_charges/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

    Editing Dining Charge

    - -<%= render 'form', dining_charge: @dining_charge %> - -<%= link_to 'Show', @dining_charge %> | -<%= link_to 'Back', dining_charges_path %> diff --git a/app/views/dining_charges/new.html.erb b/app/views/dining_charges/new.html.erb deleted file mode 100644 index 9f56e5d3..00000000 --- a/app/views/dining_charges/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

    New Dining Charge

    - -<%= render 'form', dining_charge: @dining_charge %> - -<%= link_to 'Back', dining_charges_path %> diff --git a/app/views/dining_charges/_dining_charge.json.jbuilder b/app/views/settings/dining_charges/_dining_charge.json.jbuilder similarity index 100% rename from app/views/dining_charges/_dining_charge.json.jbuilder rename to app/views/settings/dining_charges/_dining_charge.json.jbuilder diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb new file mode 100644 index 00000000..47801ef6 --- /dev/null +++ b/app/views/settings/dining_charges/_form.html.erb @@ -0,0 +1,18 @@ +<%= simple_form_for([:settings,@zone,@settings_dining_facility,@dining_charge]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :item_code %> + <%= f.input :unit_price %> + <%= f.input :taxable %> + <%= f.input :charge_type %> + <%= f.input :minimum_free_time %> + <%= f.input :charge_block %> + <%= f.input :time_rounding %> + <%= f.input :time_rounding_block %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/dining_charges/edit.html.erb b/app/views/settings/dining_charges/edit.html.erb new file mode 100644 index 00000000..1b0eb406 --- /dev/null +++ b/app/views/settings/dining_charges/edit.html.erb @@ -0,0 +1,19 @@ + + +
    +
    + +
    + <%= render 'form', dining_charge: @dining_charge %> +
    diff --git a/app/views/dining_charges/index.html.erb b/app/views/settings/dining_charges/index.html.erb similarity index 100% rename from app/views/dining_charges/index.html.erb rename to app/views/settings/dining_charges/index.html.erb diff --git a/app/views/dining_charges/index.json.jbuilder b/app/views/settings/dining_charges/index.json.jbuilder similarity index 100% rename from app/views/dining_charges/index.json.jbuilder rename to app/views/settings/dining_charges/index.json.jbuilder diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb new file mode 100644 index 00000000..1caba288 --- /dev/null +++ b/app/views/settings/dining_charges/new.html.erb @@ -0,0 +1,18 @@ + +
    +
    + +
    + <%= render 'form', dining_charge: @dining_charge %> +
    diff --git a/app/views/dining_charges/show.html.erb b/app/views/settings/dining_charges/show.html.erb similarity index 100% rename from app/views/dining_charges/show.html.erb rename to app/views/settings/dining_charges/show.html.erb diff --git a/app/views/dining_charges/show.json.jbuilder b/app/views/settings/dining_charges/show.json.jbuilder similarity index 100% rename from app/views/dining_charges/show.json.jbuilder rename to app/views/settings/dining_charges/show.json.jbuilder diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb index 169e1601..3d641592 100644 --- a/app/views/settings/tables/_form.html.erb +++ b/app/views/settings/tables/_form.html.erb @@ -7,6 +7,26 @@ <%= f.input :seater %> <%= f.input :order_by %> <%= f.input :is_active %> + <% if @settings_table.dining_charges.length == 0 %> +
    +
    + <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %> +
    +
    + <% else %> + <% @settings_table.dining_charges.each do |dc| %> +
    +
    Dining Charge
    +
    item code : <%= dc.item_code %>
    +
    Unit price : <%= dc.unit_price %>
    +
    Charge type : <%= dc.charge_type %>
    +
    + <%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn btn-primary' %> + +
    +
    + <% end %> + <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index 12e3f542..b6af8698 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - resources :dining_charges root 'home#index' mount Sidekiq::Web => '/kiq' @@ -146,6 +145,7 @@ Rails.application.routes.draw do get 'sale/:sale_id/payment/others_payment/Master' => "master#index" get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index" get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index" + get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index" #---------Void --------------# post 'sale/:sale_id/void' => 'void#overall_void' @@ -254,9 +254,13 @@ Rails.application.routes.draw do #zones resources :zones do #tables - resources :tables + resources :tables do + resources :dining_charges + end #rooms - resources :rooms + resources :rooms do + resources :dining_charges + end end end From 5c2928166d0bc720303ab88f41b43c3bec00fd6f Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 11 Aug 2017 18:10:57 +0630 Subject: [PATCH 120/246] Voucher/Cuopon UI phrase 1 --- app/controllers/origami/voucher_controller.rb | 32 ++++ .../origami/voucher/create.json.jbuilder | 5 + app/views/origami/voucher/index.html.erb | 169 ++++++++++++++++++ lib/tasks/menu_osaka.rake | 1 + 4 files changed, 207 insertions(+) create mode 100644 app/controllers/origami/voucher_controller.rb create mode 100644 app/views/origami/voucher/create.json.jbuilder create mode 100644 app/views/origami/voucher/index.html.erb diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb new file mode 100644 index 00000000..a9bdcc2b --- /dev/null +++ b/app/controllers/origami/voucher_controller.rb @@ -0,0 +1,32 @@ +class Origami::VoucherController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + + # limit voucher_amount + sale_data = Sale.find_by_sale_id(@sale_id) + total = sale_data.grand_total + @vouchercount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "voucher" + @vouchercount = @vouchercount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_voucher = total - @vouchercount - others + + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "voucher") + end + end + +end diff --git a/app/views/origami/voucher/create.json.jbuilder b/app/views/origami/voucher/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/voucher/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb new file mode 100644 index 00000000..809793ce --- /dev/null +++ b/app/views/origami/voucher/index.html.erb @@ -0,0 +1,169 @@ + +
    + +
    +
    +
    +

    Voucher / Coupon

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @vouchercount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    + +
    + +
    +
    + + diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 0acc4a1e..117fdb5c 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -1224,6 +1224,7 @@ payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://staging.membership.paypar.ws"}) payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://staging.membership.paypar.ws"}) payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Voucher",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"}) #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From 646492fbd6fc9fefdb677f2861f54c0d6a14cd11 Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 14 Aug 2017 10:18:59 +0630 Subject: [PATCH 121/246] updateability --- app/models/ability.rb | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..ffd0dbaa 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -41,8 +41,8 @@ class Ability can :index, :void_sale can :get_customer, Customer - can :add_customer, Customer - can :update_sale_by_customer, Customer + can :add_customer, Customer + can :update_sale_by_customer, Customer can :index, :other_charge can :create, :other_charge @@ -57,7 +57,7 @@ class Ability can :reprint, :payment can :rounding_adj, :payment - can :move_dining, :movetable + can :move_dining, :movetable can :moving, :movetable can :move_dining, :moveroom @@ -71,14 +71,14 @@ class Ability can :overall_void, :void elsif user.role == "cashier" - + # can :overall_void, :void can :read, Order can :update, Order - - can :read, Sale - can :update, Sale + + can :read, Sale + can :update, Sale can :get_customer, Customer can :add_customer, Customer can :update_sale_by_customer, Customer @@ -97,7 +97,7 @@ class Ability can :reprint, :payment can :rounding_adj, :payment - can :move_dining, :movetable + can :move_dining, :movetable can :moving, :movetable can :move_dining, :moveroom @@ -108,7 +108,7 @@ class Ability can :reprint, :payment can :manage, DiningQueue - + elsif user.role == "account" can :index, :dailysale @@ -122,9 +122,18 @@ class Ability can :edit, :sale_edit can :item_void, :sale_edit + can :an :edit, :sale_edit + can :item_void, :sale_edit can :item_edit, :sale_edit can :item_void_cancel, :sale_edit - can :cancel_all_void, :sale_edit + can :cancel_all_void, :sale_edit + can :apply_void, :sale_edit + can :overall_void, :void + + can :first_bill, :payment + can :citem_edit, :sale_edit + can :item_void_cancel, :sale_edit + can :cancel_all_void, :sale_edit can :apply_void, :sale_edit can :overall_void, :void From f8c7630b97150d79e39855f28a0da15770c42c83 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 10:28:23 +0630 Subject: [PATCH 122/246] updating item_set --- app/models/settings/item_set.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app/models/settings/item_set.rb diff --git a/app/models/settings/item_set.rb b/app/models/settings/item_set.rb deleted file mode 100644 index dcedbbca..00000000 --- a/app/models/settings/item_set.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Settings::ItemSet < ApplicationRecord -end From 6f39a024cae8ddd88a83ce9a3739a54b03a0f435 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 14 Aug 2017 11:30:58 +0630 Subject: [PATCH 123/246] dining charge --- app/models/dining_charge.rb | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb index 9a6c5524..4aa47c6d 100644 --- a/app/models/dining_charge.rb +++ b/app/models/dining_charge.rb @@ -1,2 +1,39 @@ class DiningCharge < ApplicationRecord + + def amount_calculate(dining_charges_obj, checkin , checkout) + + if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil? + + minutes = ((checkin - checkout) * 24 * 60).to_i # stay minutes + dining_minutes = minutes - dining_charges_obj.minimum_free_time # stayminutes - free minutes + charge_type = dining_charges_obj.charge_type + if charge_type == 'hr' + + elsif charge_type == 'day' + price = charge_by_day + end + end + + end + + def charge_by_hour + + end + + def charge_by_day(chargesObj, dining_minutes) + minues_per_day = 12 * 60 + result = dining_minutes / minues_per_day + if result < 1 + return chargesObj.unit_price + elsif result > 1 + solid_price = result * chargesObj.unit_price + + remain_value = dining_minutes % minues_per_day + roundingblock = remain_value / chargesObj.time_rounding_block + if roundingblock > 1 + + end + end + end + end From 25ab7c9701eef0b883d9e46dc30a45dbbb026979 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 14 Aug 2017 13:41:18 +0630 Subject: [PATCH 124/246] Payment Voucher UI fix --- app/controllers/origami/voucher_controller.rb | 46 +++++++++++++++++-- app/views/origami/voucher/index.html.erb | 36 +++++++++------ config/routes.rb | 1 + 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb index a9bdcc2b..7eda6084 100644 --- a/app/controllers/origami/voucher_controller.rb +++ b/app/controllers/origami/voucher_controller.rb @@ -22,10 +22,50 @@ class Origami::VoucherController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] + sale_id = params[:refnumber] if(Sale.exists?(sale_id)) - saleObj = Sale.find(sale_id) - sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "voucher") + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + if customer_data + membership_id = customer_data.membership_id + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + if membership_setting.gateway_url + member_actions =MembershipAction.find_by_membership_type("get_account_balance") #need to modify here + if member_actions.gateway_url + campaign_type_id = member_actions.additional_parameter["campaign_type_id"] + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + merchant_uid= member_actions.merchant_account_id + auth_token = member_actions.auth_token.to_s + # membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token) + # if membership_data["status"]==true + begin + response = HTTParty.get(url, + :body => { app_token: token,membership_id:membership_id, + campaign_type_id:campaign_type_id,merchant_uid:merchant_uid, + auth_token:auth_token + }.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }, :timeout => 10 + ) + rescue Net::OpenTimeout + response = { status: false } + + rescue OpenURI::HTTPError + response = { status: false} + + rescue SocketError + response = { status: false} + end + # end + end + end + end + if( response["status"]==true ) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "voucher") + end end end diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb index 809793ce..db4de245 100644 --- a/app/views/origami/voucher/index.html.erb +++ b/app/views/origami/voucher/index.html.erb @@ -28,14 +28,15 @@
    - +
    -
    0.0
    + +
    @@ -103,12 +104,17 @@ $(document).ready(function() { } }); // number key pad +var float_value = "" +var total = 0 + +$(document).on('focusout', '.float-value', function(event){ + float_value = $(this).attr("data-value"); $(document).on('click', '.cashier_number', function(event){ event.stopPropagation(); event.preventDefault(); if(event.handled !== true) { var original_value; - original_value = $('#amount').text(); + original_value = $('#'+float_value).val(); var input_value = $(this).attr("data-value"); @@ -116,28 +122,28 @@ $(document).on('click', '.cashier_number', function(event){ switch (input_type) { case 'num': if (original_value == "0.0"){ - $('#amount').text(input_value); + $('#'+float_value).val(input_value); }else{ - $('#amount').append(input_value); + $('#'+float_value).val(original_value+input_value); } break; case 'add': var input_value = $(this).attr("data-value"); amount = parseInt(input_value) + parseInt(original_value); - $('#amount').html(amount); + $('#'+float_value).val(amount); break; case 'clr': - $('#amount').html("0.0"); + $('#'+float_value).val("0.0"); break; case 'del' : - var cash=$('#amount').text(); - $('#amount').text(cash.substr(0,cash.length-1)); + var cash=$('#'+float_value).val(); + $('#'+float_value).val(cash.substr(0,cash.length-1)); break; case 'nett': var remain_amount = $('#validamount').val(); - $('#amount').text(remain_amount); + $('#'+float_value).val(remain_amount); break; } @@ -146,15 +152,19 @@ $(document).on('click', '.cashier_number', function(event){ return false; } }); +}) $('#voucher_pay').on('click',function(){ - var amount = $('#amount').text(); + var amount = $('#amount').val(); + var refnumber = $("#<%=@sale_id %>").val(); var sale_id = "<%= @sale_id %>"; if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){ + // alert(amount); + // alert(refnumber); $.ajax({type: "POST", - url: "<%= origami_payment_jcb_path %>", - data: "amount="+ amount + "&sale_id="+ sale_id, + url: "<%= origami_payment_voucher_path %>", + data: "amount="+ amount + "&sale_id="+ sale_id+ "&refnumber="+ refnumber, success:function(result){ if(result){ alert("Payment success") diff --git a/config/routes.rb b/config/routes.rb index b6af8698..9e62023c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -137,6 +137,7 @@ Rails.application.routes.draw do post 'payment/visa' => "visa#create" post 'payment/paypar' => 'paypar_payments#create' post 'payment/credit' => 'credit_payments#create' + post 'payment/voucher' => 'voucher_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" From 069ad167332add09bc2d7266e9605385883186cf Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 13:42:47 +0630 Subject: [PATCH 125/246] update oqs filtring --- app/assets/javascripts/OQS.js | 8 ++-- app/controllers/oqs/home_controller.rb | 49 +++++++++++++++++++----- app/views/oqs/home/index.html.erb | 52 ++++++++++++++++++++------ 3 files changed, 84 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 801fd214..5ed26997 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -31,8 +31,9 @@ $(document).ready(function(){ $(".oqs_click").on("click", function(){ $("#completed").addClass('hide') $(".oqs_append").removeClass('hide') + var oqs_id = $(this).find(".oqs-id").text(); - var url = 'oqs/get_items/'+oqs_id; + var url = 'oqs/get_items/'+oqs_id; show_details(url); }); //End Click @@ -40,15 +41,14 @@ $(document).ready(function(){ function show_details(url){ var oqs_append = $('.oqs_append'); oqs_append.empty(); - + var filter = $('.filter').text(); //Start Ajax $.ajax({ type: "GET", url: url, - data: {}, + data: {'filter':filter}, dataType: "json", success: function(data) { - for(var field in data) { var price = parseFloat(data[field].price).toFixed(2); diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index dfe648d0..dae8b02f 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -7,7 +7,17 @@ class Oqs::HomeController < BaseOqsController # @queue_items_details = queue_items_query(false) # Query for OQS with delivery status true - @queue_completed_item = completed_order + + + @filter = params[:filter] + + @queue_completed_item = completed_order(@filter) + if !@filter.nil? + @count = queue_items_count_query(false,@filter) + @count.each do |count| + + end + end # @queue_stations_items=Array.new @@ -71,7 +81,8 @@ class Oqs::HomeController < BaseOqsController def get_items_by_oqs oqs_id = params[:id] - items = queue_items_query(false,oqs_id) + filter = params[:filter] + items = queue_items_query(false,oqs_id,filter) render :json => items.to_json end @@ -96,13 +107,14 @@ class Oqs::HomeController < BaseOqsController # Query for OQS with delivery status - def queue_items_query(status,oqs_id=nil) + def queue_items_query(status,oqs_id=nil,filter) if oqs_id == nil oqs = '' else oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' " end - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, + + query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as table_type, @@ -117,14 +129,15 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs}") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ") + query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) .group("assigned_order_items.assigned_order_item_id") end # Completed Order - def completed_order - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") + def completed_order(filter) + query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join orders as od ON od.order_id = assigned_order_items.order_id @@ -134,12 +147,28 @@ class Oqs::HomeController < BaseOqsController left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") - .group("assigned_order_items.order_id") - .limit(20) - .order("assigned_order_items.created_at") + query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) + .group("assigned_order_items.order_id") + .limit(20) + .order("assigned_order_items.created_at") # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); end + def queue_items_count_query(status,filter) + query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id") + .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id + left join orders as od ON od.order_id = assigned_order_items.order_id + left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id + left join customers as cus ON cus.customer_id = od.customer_id + left join booking_orders as bo on bo.order_id = assigned_order_items.order_id + left join bookings as bk on bk.booking_id = bo.booking_id + left join dining_facilities as df on df.id = bk.dining_facility_id") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ") + query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) + .group("oqs.id") + + end + end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 3ab1cf24..81e14467 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,10 +1,26 @@
    - +
    + <%= form_tag oqs_root_path, :method => :get do %> +
    + +
    + +
    + +
    +<% end %> +
    +
    + +
    +
    +
    <% @@ -73,13 +101,12 @@ %>
    + + - - -
    - +
    @@ -142,3 +169,6 @@
    + \ No newline at end of file From 497a1b60f713fa1dd5022b85f31dc68d74bad657 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 14 Aug 2017 14:04:39 +0630 Subject: [PATCH 126/246] add Updated_at to Employee Listing --- app/views/settings/employees/index.html.erb | 2 ++ app/views/settings/employees/show.html.erb | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index b44a2dcd..7c1f2eb7 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -16,6 +16,7 @@ Name Role Created At + Updated At Action @@ -26,6 +27,7 @@ <%= link_to employee.name,settings_employee_path(employee) %> <%= employee.role %> <%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> + <%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_employee_path(employee) %> <%if employee.role != "administrator"%> diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index cad7a6ad..1869fcde 100644 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -2,7 +2,7 @@ @@ -15,7 +15,8 @@ Name Role - + Created At + Updated At Action @@ -24,6 +25,8 @@ <%= @employee.name %> <%= @employee.role %> + <%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> + <%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_employee_path(@employee) %> @@ -34,4 +37,3 @@
    - From fa68bcff69e0226a5695ca30b34e846e5d409afc Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 14 Aug 2017 14:26:16 +0630 Subject: [PATCH 127/246] removeDBcolsanddbparams --- app/controllers/print_settings_controller.rb | 2 +- app/models/ability.rb | 4 +--- app/views/print_settings/_form.html.erb | 4 ---- app/views/print_settings/index.html.erb | 12 ++---------- app/views/print_settings/show.html.erb | 16 ---------------- ...4041543_remove_d_bcols_from_print_settings.rb | 8 ++++++++ 6 files changed, 12 insertions(+), 34 deletions(-) create mode 100644 db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index 8efb9dd5..5bf654ef 100644 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController # 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,:precision,:delimiter,:heading_space) + params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space) end end diff --git a/app/models/ability.rb b/app/models/ability.rb index ffd0dbaa..444795dd 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -122,11 +122,9 @@ class Ability can :edit, :sale_edit can :item_void, :sale_edit - can :an :edit, :sale_edit - can :item_void, :sale_edit can :item_edit, :sale_edit can :item_void_cancel, :sale_edit - can :cancel_all_void, :sale_edit + can :cancel_all_void, :sale_edit can :apply_void, :sale_edit can :overall_void, :void diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index ba703aae..f9079f99 100644 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -5,10 +5,6 @@ <%= 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 %> diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index 9c8ce0b0..c16a28c2 100644 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -16,11 +16,7 @@ Name Unique code - + Template Printer name Api settings Page width @@ -38,11 +34,7 @@ <%= print_setting.name %> <%= print_setting.unique_code %> - + <%= print_setting.template %> <%= print_setting.printer_name %> <%= print_setting.api_settings %> <%= print_setting.page_width %> diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index 71d74950..46126c4b 100644 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -29,22 +29,6 @@ Template <%= @print_setting.template %> - - Db name - <%= @print_setting.db_name %> - - - Db type - <%= @print_setting.db_type %> - - - Db username - <%= @print_setting.db_username %> - - - Db password - <%= @print_setting.db_password %> - Printer name <%= @print_setting.printer_name %> diff --git a/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb b/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb new file mode 100644 index 00000000..48a7de5d --- /dev/null +++ b/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb @@ -0,0 +1,8 @@ +class RemoveDBcolsFromPrintSettings < ActiveRecord::Migration[5.1] + def change + remove_column :print_settings, :db_name, :string + remove_column :print_settings, :db_type, :string + remove_column :print_settings, :db_username, :string + remove_column :print_settings, :db_password, :string + end +end From 74d7adbaef3f19df278c4588fd6ad2fa15057e54 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 14:27:37 +0630 Subject: [PATCH 128/246] deving item sets --- app/controllers/settings/item_sets_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 226071ef..ace39027 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -14,7 +14,7 @@ class Settings::ItemSetsController < ApplicationController # GET /settings/item_sets/new def new - @settings_item_set = ItemSet.new + @settings_item_set = ItemSet.new end # GET /settings/item_sets/1/edit From 3c54f4da89a1346ee853ec587ca2dba5f1a54a70 Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 14 Aug 2017 14:29:03 +0630 Subject: [PATCH 129/246] addQueryforwidthandheight --- app/pdf/close_cashier_pdf.rb | 4 ++-- app/pdf/crm_order_pdf.rb | 4 ++-- app/pdf/order_item_pdf.rb | 4 ++-- app/pdf/order_summary_pdf.rb | 4 ++-- app/pdf/queue_no_pdf.rb | 4 ++-- app/pdf/receipt_bill_pdf.rb | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 4eadf007..133d9c48 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,8 +1,8 @@ class CloseCashierPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width def initialize(printer_settings, shift_sale,shop_details,sale_taxes) - self.page_width = 210 - self.page_height = 7000 + self.page_width = PrintSetting.where("name = ?","Close Cashier").first.page_width + self.page_height = PrintSetting.where("name = ?","Close Cashier").first.page_height self.margin = 5 self.price_width = 40 self.qty_width = 20 diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index 55d08ecc..a7f85098 100644 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -1,8 +1,8 @@ class CrmOrderPdf < Prawn::Document attr_accessor :receipt_width,:price_column_width,:p_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_column_width,:item_description_width def initialize(booking,order_items,printer_settings) - self.p_width = 200 - self.page_height = 1450 + self.page_width = PrintSetting.where("name = ?","CRM Order").first.page_width + self.page_height = PrintSetting.where("name = ?","CRM Order").first.page_height self.margin = 10 # self.price_width = self.p_width / 2 self.price_width=80 diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 20a4537c..7b2e350b 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -2,8 +2,8 @@ class OrderItemPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order_item, print_status, options, alt_name) - self.page_width = 185 - self.page_height = 1450 + self.page_width = PrintSetting.where("name = ?","OrderItemPdf").first.page_width + self.page_height = PrintSetting.where("name = ?","OrderItemPdf").first.page_height self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 244fbdfa..902c68ad 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -2,8 +2,8 @@ class OrderSummaryPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order, print_status, order_items = nil,alt_name) - self.page_width = 190 - self.page_height = 1450 + self.page_width = PrintSetting.where("name = ?","Order Summary").first.page_width + self.page_height = PrintSetting.where("name = ?","Order Summary").first.page_height self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb index 0963f55e..cda410ca 100644 --- a/app/pdf/queue_no_pdf.rb +++ b/app/pdf/queue_no_pdf.rb @@ -1,8 +1,8 @@ class QueueNoPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(printer_settings, queue) - self.page_width = 210 - self.page_height = 1450 + self.page_width = PrintSetting.where("name = ?","Queue No").first.page_width + self.page_height = PrintSetting.where("name = ?","Queue No").first.page_height self.margin = 5 self.price_width = 35 self.qty_width = 20 diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 2dca6d16..3027fb60 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -2,8 +2,8 @@ class ReceiptBillPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status) - self.page_width = 210 - self.page_height = 1450 + self.page_width = PrintSetting.where("name = ?","Receipt Bill").first.page_width + self.page_height = PrintSetting.where("name = ?","Receipt Bill").first.page_height self.margin = 5 self.price_width = 40 self.qty_width = 20 From a691eb8d648931d503072584e656df43c6bd298d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 15:01:44 +0630 Subject: [PATCH 130/246] update --- app/controllers/origami/customers_controller.rb | 5 +++-- app/models/sale.rb | 2 +- app/views/oqs/home/index.html.erb | 17 ++++++++++------- app/views/origami/home/index.html.erb | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index ec826416..c67fece5 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -60,6 +60,7 @@ class Origami::CustomersController < BaseOrigamiController id = params[:sale_id][0,3] customer_id = params[:customer_id] + customer = Customer.find(customer_id) # Check and find with card no # if(!customer_id.include? "CUS") @@ -74,7 +75,7 @@ class Origami::CustomersController < BaseOrigamiController status = sale.update_attributes(customer_id: customer_id) sale.sale_orders.each do |sale_order| order = Order.find(sale_order.order_id) - status = order.update_attributes(customer_id: customer_id) + status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type) end else @booking = BookingOrder.find_by_order_id(params[:sale_id]) @@ -82,7 +83,7 @@ class Origami::CustomersController < BaseOrigamiController @orders.each do |bo| order = Order.find(bo.order_id) - status = order.update_attributes(customer_id: customer_id) + status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type) end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9f4ae9f7..1e47af6f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -91,7 +91,7 @@ class Sale < ApplicationRecord add_item(item) end - # link_order_sale(order.id) + link_order_sale(order.id) end self.save! diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 81e14467..824618e6 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,16 +1,19 @@ +
    <%= form_tag oqs_root_path, :method => :get do %> -
    - -
    +
    + +
    -
    - -
    -<% end %> +
    + +
    + + <% end %>
    +
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index e3193a98..05094504 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -109,7 +109,7 @@ <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> - + <%end%> From 5a5e654dbcb78db75e995e06683e940d5894371b Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 15:26:04 +0630 Subject: [PATCH 131/246] move css to css file --- app/assets/stylesheets/settings.scss | 17 ++++++++++++++++- app/views/home/dashboard.html.erb | 5 ----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index 37064f07..ba6ba39d 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -26,7 +26,22 @@ ul.dropdown-menu li a{ background-color: transparent !important; margin-bottom: 0px !important; } + .page-header{ border-bottom :0px solid #000 !important; margin :0px !important; -} \ No newline at end of file +} + +.card-block { + text-align:center; + background-color:#ddd; +} + +.footer { + position: fixed; + bottom: 0; + left: 0; + height: auto; + background-color: #ef404a; + width: 100%; + } \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index c2074720..82b99cf0 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -14,11 +14,6 @@ <% end %> <% shop = Shop.first %> - - - - -
    From af3a7c1d88571d6e2560c372499acd15b5dcc58b Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 14 Aug 2017 15:33:13 +0630 Subject: [PATCH 132/246] Room Charges Bug Fix --- .../settings/dining_charges_controller.rb | 12 ++++++++-- app/views/settings/rooms/_form.html.erb | 22 +++++++++++++++++++ app/views/settings/tables/_form.html.erb | 12 +++++----- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 6de504bf..2c8e3b7e 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -29,7 +29,11 @@ class Settings::DiningChargesController < ApplicationController @dining_charge.dining_facility_id = @settings_dining_facility.id respond_to do |format| if @dining_charge.save - format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' } + if @table + format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' } + else + format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' } + end format.json { render :show, status: :created, location: @dining_charge } else format.html { render :new } @@ -44,7 +48,11 @@ class Settings::DiningChargesController < ApplicationController respond_to do |format| @dining_charge.dining_facility_id = @settings_dining_facility.id if @dining_charge.update(dining_charge_params) - format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' } + if @table + format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' } + else + format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' } + end format.json { render :show, status: :ok, location: @dining_charge } else format.html { render :edit } diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb index 25af618c..a0118e61 100644 --- a/app/views/settings/rooms/_form.html.erb +++ b/app/views/settings/rooms/_form.html.erb @@ -7,6 +7,28 @@ <%= f.input :seater %> <%= f.input :order_by %> <%= f.input :is_active %> + <% if @settings_room.dining_charges.length == 0 %> + <% if @settings_room.id != nil %> +
    +
    + <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn btn-primary' %> +
    +
    + <% end %> + <% else %> + <% @settings_room.dining_charges.each do |dc| %> +
    +
    Dining Charge
    +
    item code : <%= dc.item_code %>
    +
    Unit price : <%= dc.unit_price %>
    +
    Charge type : <%= dc.charge_type %>
    +
    + <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn btn-primary' %> + +
    +
    + <% end %> + <% end %>
    diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb index 3d641592..9736f523 100644 --- a/app/views/settings/tables/_form.html.erb +++ b/app/views/settings/tables/_form.html.erb @@ -8,11 +8,13 @@ <%= f.input :order_by %> <%= f.input :is_active %> <% if @settings_table.dining_charges.length == 0 %> -
    -
    - <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %> -
    -
    + <% if @settings_table.id != nil %> +
    +
    + <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %> +
    +
    + <% end %> <% else %> <% @settings_table.dining_charges.each do |dc| %>
    From ac47d7d8f03b165533448d54d5343f0c835326ea Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 15:57:34 +0630 Subject: [PATCH 133/246] update dashbiard ui --- app/assets/stylesheets/settings.scss | 11 ++++++-- app/views/home/dashboard.html.erb | 38 +++++++++++----------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index ba6ba39d..7c449de5 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -32,7 +32,7 @@ ul.dropdown-menu li a{ margin :0px !important; } -.card-block { +.center-text { text-align:center; background-color:#ddd; } @@ -44,4 +44,11 @@ ul.dropdown-menu li a{ height: auto; background-color: #ef404a; width: 100%; - } \ No newline at end of file + } + + .footer-header { + color : #ef404a; + font-weight:bold; + font-style:italic; + margin-bottom:0px; + } \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 82b99cf0..d9595c70 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -16,27 +16,19 @@ <% shop = Shop.first %>
    -
    -
    -
    -

    <%= shop.name %>

    -
    -
    - <%= shop.address %> -
    -
    - <%= shop.phone_no %> -
    - -
    +
    +
    +
    +

    + <%= shop.name %> +

    - +
    + <%= shop.address %> +
    +
    + <%= shop.phone_no %> +
    +
    +
    + \ No newline at end of file From 7dae1c2c27f1d44c80fad0876c5513f3c3cf2740 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Mon, 14 Aug 2017 16:43:35 +0630 Subject: [PATCH 134/246] dashboard link --- .gitignore | 3 + .idea/.generators | 2 +- .idea/.rakeTasks | 2 +- .idea/sxrestaurant.iml | 28 +- .idea/workspace.xml | 910 +++++++++++------------------- app/models/ability.rb | 208 +++---- app/views/home/dashboard.html.erb | 304 +++++++++- app/views/home/show.html.erb | 131 ++--- 8 files changed, 811 insertions(+), 777 deletions(-) diff --git a/.gitignore b/.gitignore index 5dafee53..3d6c48d5 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ dump.rdb # Fonts public/fonts/* + +# Ruby-Mine IDE folder +.idea diff --git a/.idea/.generators b/.idea/.generators index 16189766..d2c02fb2 100644 --- a/.idea/.generators +++ b/.idea/.generators @@ -5,4 +5,4 @@ You are allowed to: 2. Remove generators 3. Add installed generators To add new installed generators automatically delete this file and reload the project. ---> +--> diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks index 3577d8ad..bc783dc5 100644 --- a/.idea/.rakeTasks +++ b/.idea/.rakeTasks @@ -4,4 +4,4 @@ You are allowed to: 1. Remove rake task 2. Add existing rake tasks To add existing rake tasks automatically delete this file and reload the project. ---> +--> diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index 586fd380..169f839c 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -124,14 +124,14 @@ - - - - - - - - + + + + + + + + @@ -142,6 +142,7 @@ + @@ -150,7 +151,7 @@ - + @@ -160,7 +161,7 @@ - + @@ -175,7 +176,7 @@ - + @@ -190,10 +191,10 @@ - + - + @@ -228,6 +229,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 34b4f3b1..958de2f8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,14 @@ - + + + + + + + + @@ -18,141 +25,65 @@ - - + + - - + + - - + + - - - + + + + + + + - + - - + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -165,6 +96,7 @@ origami table_invoice sale_id + oqs @@ -184,6 +116,11 @@ @@ -194,15 +131,16 @@ DEFINITION_ORDER + - + @@ -217,355 +155,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -578,6 +167,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -585,6 +301,7 @@ + - - + - + - - + + + @@ -948,11 +667,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -960,7 +727,6 @@ - @@ -968,7 +734,6 @@ - @@ -976,7 +741,6 @@ - @@ -984,7 +748,6 @@ - @@ -992,7 +755,6 @@ - @@ -1000,15 +762,6 @@ - - - - - - - - - @@ -1030,7 +783,6 @@ - @@ -1038,7 +790,6 @@ - @@ -1046,7 +797,6 @@ - @@ -1054,7 +804,6 @@ - @@ -1062,7 +811,6 @@ - @@ -1070,7 +818,6 @@ - @@ -1078,7 +825,6 @@ - @@ -1086,7 +832,6 @@ - @@ -1094,7 +839,6 @@ - @@ -1102,7 +846,6 @@ - @@ -1110,15 +853,6 @@ - - - - - - - - - @@ -1126,7 +860,6 @@ - @@ -1134,7 +867,6 @@ - @@ -1142,7 +874,6 @@ - @@ -1150,113 +881,162 @@ - - - - + + - - - + + - - - - - + + - - - + + - + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..6965ab05 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -4,135 +4,135 @@ class Ability def initialize(user) user ||= Employee.new - if user.role == "administrator" + if user.role == 'administrator' - can :manage, :all + can :manage, :all - elsif user.role == "manager" + elsif user.role == 'manager' - can :manage, Menu - can :manage, MenuCategory - can :manage, MenuItemAttribute - can :manage, MenuItemInstance - can :manage, MenuItemOption - can :manage, SetMenuItem - can :manage, OrderQueueStation - can :manage, Zone - can :manage, CashierTerminal - can :manage, Employee - # can :manage, MembershipSetting - # can :manage, MembershipAction - # can :manage, PaymentMethodSetting - can :manage, TaxProfile - can :manage, PrintSetting - can :manage, Account + can :manage, Menu + can :manage, MenuCategory + can :manage, MenuItemAttribute + can :manage, MenuItemInstance + can :manage, MenuItemOption + can :manage, SetMenuItem + can :manage, OrderQueueStation + can :manage, Zone + can :manage, CashierTerminal + can :manage, Employee + # can :manage, MembershipSetting + # can :manage, MembershipAction + # can :manage, PaymentMethodSetting + can :manage, TaxProfile + can :manage, PrintSetting + can :manage, Account - can :manage, Order - can :manage, Sale + can :manage, Order + can :manage, Sale - can :manage, Customer - can :manage, DiningQueue + can :manage, Customer + can :manage, DiningQueue - can :index, :dailysale - can :index, :saleitem - can :index, :receipt_no - can :index, :shiftsale - can :index, :credit_payment - can :index, :void_sale + can :index, :dailysale + can :index, :saleitem + can :index, :receipt_no + can :index, :shiftsale + can :index, :credit_payment + can :index, :void_sale - can :get_customer, Customer - can :add_customer, Customer - can :update_sale_by_customer, Customer + can :get_customer, Customer + can :add_customer, Customer + can :update_sale_by_customer, Customer - can :index, :other_charge - can :create, :other_charge - can :index, :discount - can :create, :discount - can :remove_discount_items, :discount - can :remove_all_discount, :discount + can :index, :other_charge + can :create, :other_charge + can :index, :discount + can :create, :discount + can :remove_discount_items, :discount + can :remove_all_discount, :discount - can :first_bill, :payment - can :show, :payment - can :create, :payment - can :reprint, :payment - can :rounding_adj, :payment + can :first_bill, :payment + can :show, :payment + can :create, :payment + can :reprint, :payment + can :rounding_adj, :payment - can :move_dining, :movetable - can :moving, :movetable + can :move_dining, :movetable + can :moving, :movetable - can :move_dining, :moveroom + can :move_dining, :moveroom - can :edit, :sale_edit - can :item_void, :sale_edit - can :item_void_cancel, :sale_edit - can :cancel_all_void, :sale_edit - can :apply_void, :sale_edit + can :edit, :sale_edit + can :item_void, :sale_edit + can :item_void_cancel, :sale_edit + can :cancel_all_void, :sale_edit + can :apply_void, :sale_edit - can :overall_void, :void + can :overall_void, :void - elsif user.role == "cashier" - - # can :overall_void, :void + elsif user.role == 'cashier' - can :read, Order - can :update, Order - - can :read, Sale - can :update, Sale - can :get_customer, Customer - can :add_customer, Customer - can :update_sale_by_customer, Customer + # can :overall_void, :void - can :index, :other_charge - can :create, :other_charge - can :index, :discount - can :create, :discount - can :remove_discount_items, :discount - can :remove_all_discount, :discount - can :member_discount, :discount + can :read, Order + can :update, Order - can :first_bill, :payment - can :show, :payment - can :create, :payment - can :reprint, :payment - can :rounding_adj, :payment + can :read, Sale + can :update, Sale + can :get_customer, Customer + can :add_customer, Customer + can :update_sale_by_customer, Customer - can :move_dining, :movetable - can :moving, :movetable + can :index, :other_charge + can :create, :other_charge + can :index, :discount + can :create, :discount + can :remove_discount_items, :discount + can :remove_all_discount, :discount + can :member_discount, :discount - can :move_dining, :moveroom + can :first_bill, :payment + can :show, :payment + can :create, :payment + can :reprint, :payment + can :rounding_adj, :payment - can :first_bill, :payment - can :show, :payment - can :create, :payment - can :reprint, :payment + can :move_dining, :movetable + can :moving, :movetable - can :manage, DiningQueue - - elsif user.role == "account" + can :move_dining, :moveroom - can :index, :dailysale - can :index, :saleitem - can :index, :receipt_no - can :index, :shiftsale - can :index, :credit_payment - can :index, :void_sale + can :first_bill, :payment + can :show, :payment + can :create, :payment + can :reprint, :payment - elsif user.role == "supervisour" + can :manage, DiningQueue - can :edit, :sale_edit - can :item_void, :sale_edit - can :item_edit, :sale_edit - can :item_void_cancel, :sale_edit - can :cancel_all_void, :sale_edit - can :apply_void, :sale_edit - can :overall_void, :void + elsif user.role == 'account' - can :first_bill, :payment - can :create, :payment - can :show, :payment - can :reprint, :payment - can :rounding_adj, :payment + can :index, :dailysale + can :index, :saleitem + can :index, :receipt_no + can :index, :shiftsale + can :index, :credit_payment + can :index, :void_sale + + elsif user.role == 'supervisour' + + can :edit, :sale_edit + can :item_void, :sale_edit + can :item_edit, :sale_edit + can :item_void_cancel, :sale_edit + can :cancel_all_void, :sale_edit + can :apply_void, :sale_edit + can :overall_void, :void + + can :first_bill, :payment + can :create, :payment + can :show, :payment + can :reprint, :payment + can :rounding_adj, :payment end end diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index c2074720..571360c3 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,47 +1,291 @@ -
    -
    +
    +
    - <% if current_login_employee.role = "admin" %> + <% if current_login_employee.role = "admin" %> - <% elsif current_login_employee.role = "cashier" %> - <%= link_to "Cashier Station", origami_path %> + <% elsif current_login_employee.role = "cashier" %> + <%= link_to "Cashier Station", origami_path %> - <% elsif current_login_employee = "account" %> - <%= link_to "Cashier Station", oishi_path %> + <% elsif current_login_employee = "account" %> + <%= link_to "Cashier Station", oishi_path %> - <% else %> - <%= link_to "Cashier Station", oishi_path %> + <% else %> + <%= link_to "Cashier Station", oishi_path %> - <% end %> - <% shop = Shop.first %> + <% end %> + <% shop = Shop.first %> - - - - -
    +
    -
    -
    -
    -

    <%= shop.name %>

    -
    -
    - <%= shop.address %> -
    -
    - <%= shop.phone_no %> -
    +
    +
    +
    +
    +
    + OQS +
    - + + .card { + margin-top: 10px; + box-sizing: border-box; + border-radius: 2px; + background-clip: padding-box; + transition: 0.3s ease; + background-color: white; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); + } + + .card span.card-title { + color: purple; + font-size: 28px; + font-weight: 400; + text-transform: uppercase; + transition: color 0.3s ease; + line-height: 48px; + } + + .card .card-content { + padding: 15%; + border-radius: 0 0 2px 2px; + background-clip: padding-box; + box-sizing: border-box; + height: 120px; + transition: color 0.3s ease; + text-align: center; + } + + .card .card-content p { + margin: 0; + color: inherit; + } + + .card:hover { + box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.16), 0 10px 20px 0 rgba(0, 0, 0, 0.12); + } + + diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 7a19a68f..84593142 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -1,86 +1,91 @@
    -
    - <%= simple_form_for(@login_form, url: emp_login_update_path, method: "PATCH") do |f| %> -
    -
    -
    - <%= f.input :emp_id,as: :hidden, label: "Access PIN", required: false, class: "form-control" %> +
    + <%= simple_form_for(@login_form, url: emp_login_update_path, method: "PATCH") do |f| %> +
    +
    +
    + <%= f.input :emp_id, as: :hidden, label: "Access PIN", required: false, class: "form-control" %> - <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %> -
    -
    -
    -
    -
    -
    1
    -
    2
    -
    3
    -
    -
    -
    4
    -
    5
    -
    6
    -
    -
    -
    7
    -
    8
    -
    9
    -
    -
    -
    CLR
    -
    0
    -
    ENT
    -
    + <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %> +
    +
    +
    +
    +
    +
    1
    +
    2
    +
    3
    -
    - -
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    CLR
    +
    0
    +
    ENT
    +
    +
    +
    - <% end %> +
    + + <% end %>
    +
    From 5fc485615cf98490f5a4555bdbf1038030d8c09f Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 14 Aug 2017 16:49:39 +0630 Subject: [PATCH 135/246] UpdateDiningCharges --- .../settings/dining_charges_controller.rb | 3 +++ app/views/settings/dining_charges/_form.html.erb | 5 +++-- app/views/settings/dining_charges/new.html.erb | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 2c8e3b7e..31763b02 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -16,6 +16,9 @@ class Settings::DiningChargesController < ApplicationController # GET /dining_charges/new def new @dining_charge = DiningCharge.new + @dining_charge.minimum_free_time="00:30" + @dining_charge.charge_block="02:00" + @dining_charge.time_rounding_block="00:15" end # GET /dining_charges/1/edit diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index 47801ef6..2349025a 100644 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -2,10 +2,10 @@ <%= f.error_notification %>
    - <%= f.input :item_code %> + <%= f.input :item_code, :input_html => { :id => 'item_code' } %> <%= f.input :unit_price %> <%= f.input :taxable %> - <%= f.input :charge_type %> + <%= f.input :charge_type, :collection => [:hr, :day] %> <%= f.input :minimum_free_time %> <%= f.input :charge_block %> <%= f.input :time_rounding %> @@ -16,3 +16,4 @@ <%= f.button :submit %>
    <% end %> + diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb index 1caba288..2aa13a4b 100644 --- a/app/views/settings/dining_charges/new.html.erb +++ b/app/views/settings/dining_charges/new.html.erb @@ -16,3 +16,17 @@
    <%= render 'form', dining_charge: @dining_charge %>
    + \ No newline at end of file From 997cc0733c10ef7991bde879b611b867f8e6eb43 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 17:57:55 +0630 Subject: [PATCH 136/246] add item set and menu item set CRUD --- .../settings/menu_item_sets.coffee | 3 + .../stylesheets/settings/menu_item_sets.scss | 3 + .../settings/item_sets_controller.rb | 6 +- .../settings/menu_item_sets_controller.rb | 74 +++++++++ app/helpers/settings/menu_item_sets_helper.rb | 2 + app/models/item_set.rb | 2 + app/models/menu_item_set.rb | 5 + app/views/layouts/_header.html.erb | 2 + app/views/settings/item_sets/_form.html.erb | 8 +- app/views/settings/item_sets/edit.html.erb | 4 +- app/views/settings/item_sets/index.html.erb | 63 ++++---- app/views/settings/item_sets/new.html.erb | 2 +- app/views/settings/item_sets/show.html.erb | 45 ++++-- .../settings/menu_item_sets/_form.html.erb | 12 ++ .../_settings_menu_item_set.json.jbuilder | 2 + .../settings/menu_item_sets/edit.html.erb | 5 + .../settings/menu_item_sets/index.html.erb | 37 +++++ .../menu_item_sets/index.json.jbuilder | 1 + .../settings/menu_item_sets/new.html.erb | 5 + .../settings/menu_item_sets/show.html.erb | 32 ++++ .../menu_item_sets/show.json.jbuilder | 1 + config/routes.rb | 7 +- .../menu_item_sets_controller_spec.rb | 141 ++++++++++++++++++ .../settings/menu_item_sets_helper_spec.rb | 15 ++ spec/models/settings/menu_item_set_spec.rb | 5 + .../settings/settings_menu_item_sets_spec.rb | 10 ++ .../settings/menu_item_sets_routing_spec.rb | 39 +++++ .../menu_item_sets/edit.html.erb_spec.rb | 21 +++ .../menu_item_sets/index.html.erb_spec.rb | 22 +++ .../menu_item_sets/new.html.erb_spec.rb | 21 +++ .../menu_item_sets/show.html.erb_spec.rb | 16 ++ test/system/menu_item_sets_test.rb | 9 ++ 32 files changed, 563 insertions(+), 57 deletions(-) create mode 100644 app/assets/javascripts/settings/menu_item_sets.coffee create mode 100644 app/assets/stylesheets/settings/menu_item_sets.scss create mode 100644 app/controllers/settings/menu_item_sets_controller.rb create mode 100644 app/helpers/settings/menu_item_sets_helper.rb create mode 100644 app/views/settings/menu_item_sets/_form.html.erb create mode 100644 app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder create mode 100644 app/views/settings/menu_item_sets/edit.html.erb create mode 100644 app/views/settings/menu_item_sets/index.html.erb create mode 100644 app/views/settings/menu_item_sets/index.json.jbuilder create mode 100644 app/views/settings/menu_item_sets/new.html.erb create mode 100644 app/views/settings/menu_item_sets/show.html.erb create mode 100644 app/views/settings/menu_item_sets/show.json.jbuilder create mode 100644 spec/controllers/settings/menu_item_sets_controller_spec.rb create mode 100644 spec/helpers/settings/menu_item_sets_helper_spec.rb create mode 100644 spec/models/settings/menu_item_set_spec.rb create mode 100644 spec/requests/settings/settings_menu_item_sets_spec.rb create mode 100644 spec/routing/settings/menu_item_sets_routing_spec.rb create mode 100644 spec/views/settings/menu_item_sets/edit.html.erb_spec.rb create mode 100644 spec/views/settings/menu_item_sets/index.html.erb_spec.rb create mode 100644 spec/views/settings/menu_item_sets/new.html.erb_spec.rb create mode 100644 spec/views/settings/menu_item_sets/show.html.erb_spec.rb create mode 100644 test/system/menu_item_sets_test.rb diff --git a/app/assets/javascripts/settings/menu_item_sets.coffee b/app/assets/javascripts/settings/menu_item_sets.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/menu_item_sets.coffee @@ -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/ diff --git a/app/assets/stylesheets/settings/menu_item_sets.scss b/app/assets/stylesheets/settings/menu_item_sets.scss new file mode 100644 index 00000000..7f56c1b8 --- /dev/null +++ b/app/assets/stylesheets/settings/menu_item_sets.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Settings/Menu_item_sets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index ace39027..5c089c31 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -28,7 +28,7 @@ class Settings::ItemSetsController < ApplicationController respond_to do |format| if @settings_item_set.save - format.html { redirect_to @settings_item_set, notice: 'Item set was successfully created.' } + format.html { redirect_to settings_item_sets_path, notice: 'Item set was successfully created.' } format.json { render :show, status: :created, location: @settings_item_set } else format.html { render :new } @@ -42,7 +42,7 @@ class Settings::ItemSetsController < ApplicationController def update respond_to do |format| if @settings_item_set.update(settings_item_set_params) - format.html { redirect_to @settings_item_set, notice: 'Item set was successfully updated.' } + format.html { redirect_to settings_item_sets_path, notice: 'Item set was successfully updated.' } format.json { render :show, status: :ok, location: @settings_item_set } else format.html { render :edit } @@ -69,6 +69,6 @@ class Settings::ItemSetsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_item_set_params - params.require(:settings_item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + params.require(:item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) end end diff --git a/app/controllers/settings/menu_item_sets_controller.rb b/app/controllers/settings/menu_item_sets_controller.rb new file mode 100644 index 00000000..917e5330 --- /dev/null +++ b/app/controllers/settings/menu_item_sets_controller.rb @@ -0,0 +1,74 @@ +class Settings::MenuItemSetsController < ApplicationController + before_action :set_settings_menu_item_set, only: [:show, :edit, :update, :destroy] + + # GET /settings/menu_item_sets + # GET /settings/menu_item_sets.json + def index + @settings_menu_item_sets = MenuItemSet.all + end + + # GET /settings/menu_item_sets/1 + # GET /settings/menu_item_sets/1.json + def show + end + + # GET /settings/menu_item_sets/new + def new + @settings_menu_item_set = MenuItemSet.new + end + + # GET /settings/menu_item_sets/1/edit + def edit + end + + # POST /settings/menu_item_sets + # POST /settings/menu_item_sets.json + def create + @settings_menu_item_set = MenuItemSet.new(settings_menu_item_set_params) + + respond_to do |format| + if @settings_menu_item_set.save + format.html { redirect_to settings_menu_item_sets_path, notice: 'Menu item set was successfully created.' } + format.json { render :show, status: :created, location: @settings_menu_item_set } + else + format.html { render :new } + format.json { render json: @settings_menu_item_set.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/menu_item_sets/1 + # PATCH/PUT /settings/menu_item_sets/1.json + def update + respond_to do |format| + if @settings_menu_item_set.update(settings_menu_item_set_params) + format.html { redirect_to settings_menu_item_sets_path, notice: 'Menu item set was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_menu_item_set } + else + format.html { render :edit } + format.json { render json: @settings_menu_item_set.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/menu_item_sets/1 + # DELETE /settings/menu_item_sets/1.json + def destroy + @settings_menu_item_set.destroy + respond_to do |format| + format.html { redirect_to settings_menu_item_sets_url, notice: 'Menu item set 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_set + @settings_menu_item_set = MenuItemSet.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_menu_item_set_params + params.require(:menu_item_set).permit(:item_set_id, :menu_item_id) + end +end diff --git a/app/helpers/settings/menu_item_sets_helper.rb b/app/helpers/settings/menu_item_sets_helper.rb new file mode 100644 index 00000000..3e909848 --- /dev/null +++ b/app/helpers/settings/menu_item_sets_helper.rb @@ -0,0 +1,2 @@ +module Settings::MenuItemSetsHelper +end diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 55bc0c6b..e4dca315 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -4,4 +4,6 @@ class ItemSet < ApplicationRecord has_many :menu_instance_item_sets has_many :menu_item_instances, through: :menu_instance_item_sets + + validates_presence_of :name end diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb index a39b8522..7cd94bcb 100644 --- a/app/models/menu_item_set.rb +++ b/app/models/menu_item_set.rb @@ -2,3 +2,8 @@ class MenuItemSet < ApplicationRecord belongs_to :item_set belongs_to :menu_item end + +# class Settings::MenuItemSet < ApplicationRecord +# belongs_to :item_set_id +# belongs_to :menu_item_id +# end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bc5ce498..3a25b101 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -13,6 +13,8 @@
  • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
  • <%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Item Sets ", settings_item_sets_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Menu Item Sets ", settings_menu_item_sets_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index 4e2760cd..e28cab09 100644 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -1,13 +1,13 @@ -<%= simple_form_for(@settings_item_set) do |f| %> +<%= simple_form_for([:settings,@settings_item_set]) do |f| %> <%= f.error_notification %>
    <%= f.input :name %> - <%= f.input :min_selectable_qty %> - <%= f.input :max_selectable_qty %> + <%= f.input :min_selectable_qty,input_html: {value: f.object.min_selectable_qty || '0'} %> + <%= f.input :max_selectable_qty,input_html: {value: f.object.max_selectable_qty || '0'} %>
    - <%= f.button :submit %> + <%= f.button :submit ,:class=>'btn btn-success'%>
    <% end %> diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb index 75a7f10a..2f0d54ba 100644 --- a/app/views/settings/item_sets/edit.html.erb +++ b/app/views/settings/item_sets/edit.html.erb @@ -1,6 +1,4 @@

    Editing Settings Item Set

    <%= render 'form', settings_item_set: @settings_item_set %> - -<%= link_to 'Show', @settings_item_set %> | -<%= link_to 'Back', settings_item_sets_path %> +<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index f5b50ad6..80db10b9 100644 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -1,31 +1,38 @@ -

    <%= notice %>

    - -

    Settings Item Sets

    - - - - - - - - - - - - - <% @settings_item_sets.each do |settings_item_set| %> - - - - - - - - - <% end %> - -
    NameMin selectable qtyMax selectable qty
    <%= settings_item_set.name %><%= settings_item_set.min_selectable_qty %><%= settings_item_set.max_selectable_qty %><%= link_to 'Show', settings_item_set %><%= link_to 'Edit', edit_settings_item_set_path(settings_item_set) %><%= link_to 'Destroy', settings_item_set, method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
      +
    • Home
      • +
    • Item Set
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_item_set_path,:class => 'btn btn-primary btn-md' %> + +
    +

    +
    + + + + + + + + + + + + <% @settings_item_sets.each do |item| %> + + + + + + + <% end %> + + +
    NameMin selectable qtyMax selectable qtyAction
    <%= item.name %><%= item.min_selectable_qty %><%= item.max_selectable_qty %><%= link_to 'Show', settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to 'Edit', edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%>
    +
    -<%= link_to 'New Settings Item Set', new_settings_item_set_path %> diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb index a2773f42..ff581dc6 100644 --- a/app/views/settings/item_sets/new.html.erb +++ b/app/views/settings/item_sets/new.html.erb @@ -2,4 +2,4 @@ <%= render 'form', settings_item_set: @settings_item_set %> -<%= link_to 'Back', settings_item_sets_path %> +<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb index 5f7b01d0..f863b5fc 100644 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -1,19 +1,34 @@ -

    <%= notice %>

    -

    - Name: - <%= @settings_item_set.name %> -

    +
    +
      +
    • Home
      • +
    • Item Set
      • -

      - Min selectable qty: - <%= @settings_item_set.min_selectable_qty %> -

      + + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    Name:<%= @settings_item_set.name %>
    Min selectable qty: <%= @settings_item_set.min_selectable_qty %>
    Max selectable qty:<%= @settings_item_set.max_selectable_qty %>
    + <%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set),:class=>'btn btn-primary' %> + <%= link_to 'Back', settings_item_sets_path,:class=>'btn btn-danger' %> +
    -

    - Max selectable qty: - <%= @settings_item_set.max_selectable_qty %> -

    -<%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set) %> | -<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/menu_item_sets/_form.html.erb b/app/views/settings/menu_item_sets/_form.html.erb new file mode 100644 index 00000000..c0d239b4 --- /dev/null +++ b/app/views/settings/menu_item_sets/_form.html.erb @@ -0,0 +1,12 @@ +<%= simple_form_for([:settings,@settings_menu_item_set]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.association :item_set %> + <%= f.association :menu_item %> +
    + +
    + <%= f.button :submit,:class=>'btn btn-success' %> +
    +<% end %> diff --git a/app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder b/app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder new file mode 100644 index 00000000..76c133fe --- /dev/null +++ b/app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_menu_item_set, :id, :item_set_id_id, :menu_item_id_id, :created_at, :updated_at +json.url settings_menu_item_set_url(settings_menu_item_set, format: :json) diff --git a/app/views/settings/menu_item_sets/edit.html.erb b/app/views/settings/menu_item_sets/edit.html.erb new file mode 100644 index 00000000..ddd912ce --- /dev/null +++ b/app/views/settings/menu_item_sets/edit.html.erb @@ -0,0 +1,5 @@ +

    Editing Settings Menu Item Set

    + +<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> + +<%= link_to 'Back', settings_menu_item_sets_path,:class => 'btn btn-danger' %> \ No newline at end of file diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb new file mode 100644 index 00000000..dfa94bcc --- /dev/null +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -0,0 +1,37 @@ + +
    +
      +
    • Home
      • +
    • Menu Item Set
      • + + <%= link_to 'New Settings Menu Item Set', new_settings_menu_item_set_path ,:class=>'btn btn-primary btn-sm pull-right'%> +
    +
    + +
    +
    + + + + + + + + + + + <% @settings_menu_item_sets.each do |item| %> + + + + + + <% end %> + +
    Item setMenu item
    <%= item.item_set.name %><%= item.menu_item_id %><%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%>
    + +
    + + diff --git a/app/views/settings/menu_item_sets/index.json.jbuilder b/app/views/settings/menu_item_sets/index.json.jbuilder new file mode 100644 index 00000000..3ac7917b --- /dev/null +++ b/app/views/settings/menu_item_sets/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_menu_item_sets, partial: 'settings_menu_item_sets/settings_menu_item_set', as: :settings_menu_item_set diff --git a/app/views/settings/menu_item_sets/new.html.erb b/app/views/settings/menu_item_sets/new.html.erb new file mode 100644 index 00000000..259e7bed --- /dev/null +++ b/app/views/settings/menu_item_sets/new.html.erb @@ -0,0 +1,5 @@ +

    New Settings Menu Item Set

    + +<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> + +<%= link_to 'Back', settings_menu_item_sets_path,:class=>'btn btn-danger' %> diff --git a/app/views/settings/menu_item_sets/show.html.erb b/app/views/settings/menu_item_sets/show.html.erb new file mode 100644 index 00000000..f7353ca3 --- /dev/null +++ b/app/views/settings/menu_item_sets/show.html.erb @@ -0,0 +1,32 @@ +
    + +
    + +
    + + + + + + + + + + + + + + + + +
    Name:<%= @settings_menu_item_set.item_set_id %>
    Min selectable qty:<%= @settings_menu_item_set.menu_item_id %>
    Create At<%= @settings_menu_item_set.created_at %>
    + <%= link_to 'Edit', edit_settings_menu_item_set_path(@settings_menu_item_set),:class=>'btn btn-primary' %> + <%= link_to 'Back', settings_menu_item_sets_path,:class=>'btn btn-danger' %> +
    + diff --git a/app/views/settings/menu_item_sets/show.json.jbuilder b/app/views/settings/menu_item_sets/show.json.jbuilder new file mode 100644 index 00000000..4cb1ec44 --- /dev/null +++ b/app/views/settings/menu_item_sets/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_menu_item_sets/settings_menu_item_set", settings_menu_item_set: @settings_menu_item_set diff --git a/config/routes.rb b/config/routes.rb index bebb89bf..9dc1c2f2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :item_sets - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -219,6 +216,10 @@ Rails.application.routes.draw do resources :menu_categories, only: [:new, :create, :edit,:delete] end + resources :item_sets + + resources :menu_item_sets + #accounts resources :accounts diff --git a/spec/controllers/settings/menu_item_sets_controller_spec.rb b/spec/controllers/settings/menu_item_sets_controller_spec.rb new file mode 100644 index 00000000..e2446dbb --- /dev/null +++ b/spec/controllers/settings/menu_item_sets_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Settings::MenuItemSetsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Settings::MenuItemSet. As you add validations to Settings::MenuItemSet, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Settings::MenuItemSetsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + get :show, params: {id: menu_item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + get :edit, params: {id: menu_item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Settings::MenuItemSet" do + expect { + post :create, params: {settings_menu_item_set: valid_attributes}, session: valid_session + }.to change(Settings::MenuItemSet, :count).by(1) + end + + it "redirects to the created settings_menu_item_set" do + post :create, params: {settings_menu_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(Settings::MenuItemSet.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {settings_menu_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested settings_menu_item_set" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + put :update, params: {id: menu_item_set.to_param, settings_menu_item_set: new_attributes}, session: valid_session + menu_item_set.reload + skip("Add assertions for updated state") + end + + it "redirects to the settings_menu_item_set" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + put :update, params: {id: menu_item_set.to_param, settings_menu_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(menu_item_set) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + put :update, params: {id: menu_item_set.to_param, settings_menu_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested settings_menu_item_set" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + expect { + delete :destroy, params: {id: menu_item_set.to_param}, session: valid_session + }.to change(Settings::MenuItemSet, :count).by(-1) + end + + it "redirects to the settings_menu_item_sets list" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + delete :destroy, params: {id: menu_item_set.to_param}, session: valid_session + expect(response).to redirect_to(settings_menu_item_sets_url) + end + end + +end diff --git a/spec/helpers/settings/menu_item_sets_helper_spec.rb b/spec/helpers/settings/menu_item_sets_helper_spec.rb new file mode 100644 index 00000000..04329a19 --- /dev/null +++ b/spec/helpers/settings/menu_item_sets_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::MenuItemSetsHelper. For example: +# +# describe Settings::MenuItemSetsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Settings::MenuItemSetsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/settings/menu_item_set_spec.rb b/spec/models/settings/menu_item_set_spec.rb new file mode 100644 index 00000000..e53b1208 --- /dev/null +++ b/spec/models/settings/menu_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::MenuItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/settings/settings_menu_item_sets_spec.rb b/spec/requests/settings/settings_menu_item_sets_spec.rb new file mode 100644 index 00000000..a0d9776c --- /dev/null +++ b/spec/requests/settings/settings_menu_item_sets_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Settings::MenuItemSets", type: :request do + describe "GET /settings_menu_item_sets" do + it "works! (now write some real specs)" do + get settings_menu_item_sets_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/settings/menu_item_sets_routing_spec.rb b/spec/routing/settings/menu_item_sets_routing_spec.rb new file mode 100644 index 00000000..f319e6e6 --- /dev/null +++ b/spec/routing/settings/menu_item_sets_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Settings::MenuItemSetsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/settings/menu_item_sets").to route_to("settings/menu_item_sets#index") + end + + it "routes to #new" do + expect(:get => "/settings/menu_item_sets/new").to route_to("settings/menu_item_sets#new") + end + + it "routes to #show" do + expect(:get => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/settings/menu_item_sets/1/edit").to route_to("settings/menu_item_sets#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/settings/menu_item_sets").to route_to("settings/menu_item_sets#create") + end + + it "routes to #update via PUT" do + expect(:put => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#destroy", :id => "1") + end + + end +end diff --git a/spec/views/settings/menu_item_sets/edit.html.erb_spec.rb b/spec/views/settings/menu_item_sets/edit.html.erb_spec.rb new file mode 100644 index 00000000..044ebf7d --- /dev/null +++ b/spec/views/settings/menu_item_sets/edit.html.erb_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/edit", type: :view do + before(:each) do + @settings_menu_item_set = assign(:settings_menu_item_set, Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + )) + end + + it "renders the edit settings_menu_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_menu_item_set_path(@settings_menu_item_set), "post" do + + assert_select "input[name=?]", "settings_menu_item_set[item_set_id_id]" + + assert_select "input[name=?]", "settings_menu_item_set[menu_item_id_id]" + end + end +end diff --git a/spec/views/settings/menu_item_sets/index.html.erb_spec.rb b/spec/views/settings/menu_item_sets/index.html.erb_spec.rb new file mode 100644 index 00000000..efbb5448 --- /dev/null +++ b/spec/views/settings/menu_item_sets/index.html.erb_spec.rb @@ -0,0 +1,22 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/index", type: :view do + before(:each) do + assign(:settings_menu_item_sets, [ + Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + ), + Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + ) + ]) + end + + it "renders a list of settings/menu_item_sets" do + render + assert_select "tr>td", :text => nil.to_s, :count => 2 + assert_select "tr>td", :text => nil.to_s, :count => 2 + end +end diff --git a/spec/views/settings/menu_item_sets/new.html.erb_spec.rb b/spec/views/settings/menu_item_sets/new.html.erb_spec.rb new file mode 100644 index 00000000..e755cff1 --- /dev/null +++ b/spec/views/settings/menu_item_sets/new.html.erb_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/new", type: :view do + before(:each) do + assign(:settings_menu_item_set, Settings::MenuItemSet.new( + :item_set_id => nil, + :menu_item_id => nil + )) + end + + it "renders new settings_menu_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_menu_item_sets_path, "post" do + + assert_select "input[name=?]", "settings_menu_item_set[item_set_id_id]" + + assert_select "input[name=?]", "settings_menu_item_set[menu_item_id_id]" + end + end +end diff --git a/spec/views/settings/menu_item_sets/show.html.erb_spec.rb b/spec/views/settings/menu_item_sets/show.html.erb_spec.rb new file mode 100644 index 00000000..ca9e5d5c --- /dev/null +++ b/spec/views/settings/menu_item_sets/show.html.erb_spec.rb @@ -0,0 +1,16 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/show", type: :view do + before(:each) do + @settings_menu_item_set = assign(:settings_menu_item_set, Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(//) + expect(rendered).to match(//) + end +end diff --git a/test/system/menu_item_sets_test.rb b/test/system/menu_item_sets_test.rb new file mode 100644 index 00000000..35949a53 --- /dev/null +++ b/test/system/menu_item_sets_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Settings::MenuItemSetsTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit settings_menu_item_sets_url + # + # assert_selector "h1", text: "Settings::MenuItemSet" + # end +end From f018a56027c317eec2ec093564ab23b37cf18455 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 18:53:39 +0630 Subject: [PATCH 137/246] add CarrierWave gems for menu image upload --- Gemfile | 3 +++ Gemfile.lock | 5 ++++ .../settings/simple_menu_items_controller.rb | 5 ++-- app/models/menu_item.rb | 3 +++ .../settings/set_menu_items/_form.html.erb | 27 ++++++++++++------- .../settings/simple_menu_items/_form.html.erb | 27 ++++++++++++------- .../settings/simple_menu_items/new.html.erb | 1 - config/application.rb | 2 ++ 8 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index fa2990ad..67348308 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,9 @@ gem 'tether-rails' gem "font-awesome-rails" gem 'rack-cors' +# image upload +gem 'carrierwave', '~> 1.0' + #Report and Printing gems gem 'cups', '~> 0.0.7' gem 'prawn' diff --git a/Gemfile.lock b/Gemfile.lock index ba8f6a0c..45b9b826 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,10 @@ GEM builder (3.2.3) byebug (9.0.6) cancancan (1.17.0) + carrierwave (1.1.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) chronic (0.10.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -250,6 +254,7 @@ DEPENDENCIES bootstrap-datepicker-rails byebug cancancan (~> 1.10) + carrierwave (~> 1.0) coffee-rails (~> 4.2) cups (~> 0.0.7) database_cleaner diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 05952d0d..526ef248 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -16,7 +16,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/new def new - @settings_menu_item = MenuItem.new + @settings_menu_item = MenuItem.new end # GET /settings/menu_items/1/edit @@ -27,6 +27,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # POST /settings/menu_items.json def create @settings_menu_item = MenuItem.new(settings_menu_item_params) + # @settings_menu_item.image_path = params[:image_path] if params[:simple_menu_item][:menu_item_id] == '' @settings_menu_item.menu_category_id = params[:menu_category_id] end @@ -78,6 +79,6 @@ class Settings::SimpleMenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 1f1afbe4..569d3126 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -15,6 +15,9 @@ class MenuItem < ApplicationRecord scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') } scope :set_menu_item, -> { where(type: 'SetMenuItem') } + # Item Image Uploader + mount_uploader :image_path, MenuItemImageUploader + def self.collection MenuItem.select("id, name").map { |e| [e.name, e.id] } end diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index aeae0f5c..aef41ab1 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,17 +1,24 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> +

    +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %> +
    +
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> +
    +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> + <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> + <%= f.input :min_qty %> + <%= f.input :min_selectable_item %> + <%= f.input :max_selectable_item %> +
    diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 01c5b482..9b90fec8 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,16 +1,23 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> +
    +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %> +
    +
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> +
    +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> + <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> + <%= f.input :min_qty %> + <%= f.input :min_selectable_item %> + <%= f.input :max_selectable_item %> +
    diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index 5781850d..9e18525b 100644 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -2,7 +2,6 @@ <%= render 'form', settings_menu_item: @settings_menu_item %>--> -
      diff --git a/config/application.rb b/config/application.rb index 7e16975c..78ff63dc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -6,6 +6,8 @@ require 'rails/all' # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) +require 'carrierwave/orm/activerecord' + module SXRestaurants class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. From 3bfc7f0f53ef26d771559a95d82194050dadce7b Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 18:53:54 +0630 Subject: [PATCH 138/246] add CarrierWave gems for menu image upload --- app/uploaders/menu_item_image_uploader.rb | 50 ++++++++++++++++++ .../image/menu_images/icons8-Food-100.png | Bin 0 -> 5031 bytes 2 files changed, 50 insertions(+) create mode 100644 app/uploaders/menu_item_image_uploader.rb create mode 100644 public/public/image/menu_images/icons8-Food-100.png diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb new file mode 100644 index 00000000..b35b6a6c --- /dev/null +++ b/app/uploaders/menu_item_image_uploader.rb @@ -0,0 +1,50 @@ +class MenuItemImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "public/image/menu_images" + # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url(*args) + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process scale: [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process resize_to_fit: [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + def extension_whitelist + %w(jpg jpeg gif png) + end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/public/public/image/menu_images/icons8-Food-100.png b/public/public/image/menu_images/icons8-Food-100.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e616915a0092eebe86fb03492d432df762dd9 GIT binary patch literal 5031 zcmV;Y6IkqtP)=6J8S`pvvI{d)Rc zqnXhtMORTsdVT-;JNo;&zb3eo3Tg&OLG|WNXK)9Q0$T*GfNWX6<9QJBLV@+$TX!fb z2+*cdy!wx?)wg*oWS{HbH#F4+D4wSTwVBpMDB1!lUVZro^%rDy*aGs(#-<9Yl0B5t zd6_m|P~|k#H@sHAGt)k8-O#idz;`n(FO=)mfT#bVvA#vD&lZp^8=AHe;P124fr6+e z5XTI=mFd*MEgPEF65!Wa9z<^-jt9m5*aEV3L(@$F6|56e@0*U`O6W=IaZrEPGjqi^X5S>>7?;9DP{g=@xLRkMV9B#*G-AeDDlVaeAL6VKA_t#6t?+m!+6o`%MC zb*_MHUEj131h24+<)4~_mET&8V8B)W`xs*WvR=N}jr~7(%WSZrvEJ7}{_Ulv1xf%% zjS5ybJY&{%ZvQE?A2_Z5?gR*r#k zTZ3r%@ow7%B3&(8H|%Huh)#cZKQb40e|8=ifs8FuP#ge?6#}I|DJH5?L{y5QI7K+F z=>tFV+OHA4J*fYz0V`zMjUCPM+LcHJJcZ0$dLL#jn`2gU@aKEbbGbVW5Rsj!8Xn|T zaycODo6aMtYtMdWIVxw}oj)FvgO*Od{to&sT{CL_=Z405rowtkytX-Y&ZjVc^+RU4 z!@Kt5+Q*;hzdHePU)_AvE}AK&9&v%#P)JIM&H2VEU5C} z)ceQKaim>JJv^%u7f2c)ybvoYAA^N2Jw56Hxqa~(PW|j1V;sE=jr9|}4vJTKdEv~; zJIM(r`NFHqqUxIl2rtCSrcc8C&#m&>_kztAxix^J-`{2S&#UU|r1G-L-f8>|;*pqC zaPxpnx_1f|tzBle@1**s0kUQNj-7;%=UM5=i$9GSD;F2+MEmI&uljn`w0Le2EDB=P zx7S#jT@QWQ&$tUVuSL`HXlQg&dD%dDKvr#d3c=!# zIsU8dT{zNwK>uA-m&LNY>MLVerVXohw@w0ZMU^r4IvFZ$gbkrTt=g z$4<72iI3iB!OiwgBflrr*Gc6SCzap9vu`|Gk^#bR9C?bB0b<&1Mid3EaR$h|b*UY4 z&)G{j`>X$R?B47ze-4$ir<-{$e{dX^_x&mHJEhGH+t;mi8=sTPd;8ig?E8;*%_^J# zVU)uth)=viz^lF%Kt!XWTZi-c{fjdyFeVhxo7~sghpvHyFttlHWkq;+$~g1$gJTr zq*yhx-cSizqYAF534p{@8PM=Zv5JXGir87+x5Gg*s~1hnN#*4MVW#&-ziHJ*nfArB zFe8b8*r~o&KscjfO%cIk6H-EoQVKO32Biu6&}d9M`%`kr&B!RKyrR%{lM!rwc%kn| zL7dgs3ds5$yFiGp+btZcV9_|mGVhuihdMMg8nMv({Ca-~vE;c9H`P~U-%cxBCbUIB zc%KOSW~cfJ6p~VTmzM`IyEL68s6&I$)X_;LyTd_TO|dygP0LN?b=qebE7obBA_8Wp zz9P#qneLMlLYPvNZhKT?QD{-Qx>@L?b1gxdI=%=u{_y6gn`l%qnK41KoRJu)3)9V zE4ZY(??c>F-fS*3QT4UmsV^-H;(;-8M)1a9%2?`TT;u_<+l6O~N*GJ)I(5;g&I*X- z#0deIV0TMr`l9$CxlbHND84ebFe&Du8o>W1&F_@bj!oOw*kg5y74J8=Q|;S!5m4Cm&Oa0W&LcR2vNgy>fw+B&$igOMUUZd z0qH!^f#bh74)3LGYw3V+UPGqde!bedA2B-eR!`j_XD5bZQ5UG86TYaxnV{Eq`AhgBMI$2(Jn40Y;hMUsBptM5?kp-+zX@Ic1g=&mm zFgjxA7r7A8aNu?vWeUNniXe&u1iWdUt;QaWpfW%$8_eMjCX@2bgCX415<_)kSA6}9 zbrDK;@t{n*zXtOj&-|>~@wY!j=gAJU8MZ()O6rUg@KOQ63$<|pg0EN0*_Lc_n6D%p zjpFUW5PB#NB+%Y%UJzNQtqR2-DP^+cnTa8cQ|vV^qoorA zDh~9g43G~OshCq_HAuRx%4~hN8Wa6r*5UiXSh*J0K`}29GE)dMEE;zXW&LI*7Ip#D zI0Nj)Hf?8ElqEIA0X$ZbIz}UFJfczj^m>XKri6giW8xMcJUhbk`*4ByF;G^#xLV4-L~E{IuZxD~xa7riT6O~77y$E?{P&FnAdIU1 zx+Hl5;*Tq)S0_&4ajCPd zy}I+rIsHNj6W)}NwQkqxTzQbFkJ}x7F#5r?udXP??2-VgxJ@N9vvh`|*xjG9k9{de z6tZ_nL3^A#!X&v5?sf9*^6?(U&#ZnJWp`DkW$irLj;^-Er5&&G%M}ojb+MJtKyli^ z+YO@SRt)Ec5_^}s6iweqW;w|41M*P)1z1%jl` zZAYFdP$Lcq>$vPNwws_A2h0S2SumY2*)dfbi}?nI(cA|^L0pQbWD~RIYLu+aMo1V*L@N~D)6U*W|#V7@ovTJXNfFA&uO1!L0@w88ITagSHEi$BQWNwL>)DI0QDW{WO zAh(pkTF4L(csX(J8xWaHVSi&RZ0=Y^Kcqd}8VORT~qVZ2fMsHAQLBQ zcyyV)V$%HEl#?%K6e3|^+Xx}4>qS`r#$q{k1cL4f#K{Yp1SZQA9R8Tl)F~>~JY{dI z`~DA0%x1h8HZx*b;z0DhN*tSI5$H0d7zW5tG-^u`OmKscjhh_HZ?mPiX8Eu$XiFYDR< zasUy0^*kWg|MX{k{JTW37O%d8tk1N^3i+7Ez9_^)NRPZyh-h-)0kH-d^B48a<2+_9 zn-}Ml(b(0K9k_TX5lYs}LK`tal%fzG`p&cFB=LY`8t^!4GwxE67t^~@gDw>>Yk5d);^ff<+x`6w7bqqmNM`Z@)re&5mTO@r%WP;W@(;1S7Twj8BmB@oUXi52!EFP7P|7xL@Eo*}T^@ zFuINF4j{hZ04(m?1v4@2!PKh5ZZJP>c+a_P6$<`-FLM%hj2a?FHkdK1-B` z&o9IT4{xh<96XI{r_6hWj^oO+3~_!a#_AJscjkDRz-;I7;|np`_T!`)F+k?lKam!n zod?7%CStZH+G~A&d?7MG+-`D>7$CBjdq#uT(2p-fP9e^|o;!eeC5>c0FBf&hD*asC z$r~VE-nQyFcNu5jG@dLiOs}CIUx)#WA177b0O5^tqPNiKxW!53!FS+uaSuDYUtfp} z5I1jV-T>k4Saxq)iEl-@8RCXL!#*qU>kE-nh_g>5FMuQ?L$LQ`_2+t=o>Jmp<)px_ zO^x*h^GqBMNN8*c7CdWtSJ)QbXkQq|-blS3?d0ppIUvbFu(!x{Fc`a9xPEQg6Gp~p ztjB@$nBY4DA-p_N2dnv6&cqjDl=teS$_XIf`}U6I8YS%ZD|;B;vW&bu+QOTZs-UZ_bxz3uVS&o*7FbpQVE|A{>L^er0>BUG-Y+gi_1t@0IXCmK zGf)Pv*@U#BxB#Gqg0|!npiF!rGC-Uxz8L|Myr9G0I!vPg*=#c*KK--veZQ&8Hj1CL zo-v(Pwn!!cBA~mzvwdB&E8-bu-~p+aUX58R7kRGf@PEDwEta_YmQ_H!zEf2^r4l7m zt5G^*3W}=AJ$GEps6}H4pTB}|=XFH7Zb0o1JJ!Y2N+pC9xsW+LAQSJMihDjc&-1uW z?AnL$&A#jcVt4zLgn}rUIuS)x6)2uorT?6(r1lMBsOttI-M0|w>PGBF;t_d1x#{|u z_O0Mp7Vn%1m5sr;x%Z%WYSpkPAk)b)$}tLJloS4Q7y8d$PF3e2(52tDdG4ST1u_4t zbzuLyrNN#)oNV4_X3Lt|%bN|RJ+~4{ne_<=w~podd(Znv(f`pUy_sBCi^V`ZUL92D z-aCTci`NpvcR2y?OQ`dJOkVRyuIJZx{rzVyVju~Kmy_nc8vq~%Fmt<(U_Jdl%m8L$ zhxuUrnG7b+Wpd(i6sd%bi5+y9Jg3&ezS!=(0gfQ+uoV*1(-D?J>nU0&aS Date: Tue, 15 Aug 2017 10:16:25 +0630 Subject: [PATCH 139/246] update receipt bill pdf for foc and credit --- app/pdf/receipt_bill_pdf.rb | 39 ++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 1dbea502..00ef0a7b 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -54,8 +54,9 @@ class ReceiptBillPdf < Prawn::Document end items_account(item_price_by_accounts,printer_settings.precision,delimiter) + + sign(sale_data) - footer(printed_status) end @@ -409,6 +410,42 @@ class ReceiptBillPdf < Prawn::Document end end + def sign(sale_data) + SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment| + if payment.payment_method == "creditnote" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 35 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 38 + text "Approved By" , :size => self.item_font_size,:align => :center + end + end + end + if sale_data.sale_status == "FOC" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 35 + stroke_horizontal_rule + end + + bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do + move_down 38 + text "Acknowledged By", :size => self.item_font_size,:align => :center + end + end + + end + def footer(printed_status) move_down 5 stroke_horizontal_rule From e5a685f36ef36738e6bdbbda27829ecf5947a7dc Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 15 Aug 2017 11:14:38 +0630 Subject: [PATCH 140/246] room charges --- app/models/dining_charge.rb | 75 +++++++++---- app/models/sale.rb | 104 +++++++++++------- .../20170811052036_create_dining_charges.rb | 1 + 3 files changed, 119 insertions(+), 61 deletions(-) diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb index e1d70278..75cf7d7b 100644 --- a/app/models/dining_charge.rb +++ b/app/models/dining_charge.rb @@ -2,40 +2,75 @@ class DiningCharge < ApplicationRecord belongs_to :table belongs_to :room - def amount_calculate(dining_charges_obj, checkin , checkout) + def self.amount_calculate(dining_charges_obj, checkin , checkout) if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil? - - minutes = ((checkin - checkout) * 24 * 60).to_i # stay minutes - dining_minutes = minutes - dining_charges_obj.minimum_free_time # stayminutes - free minutes + price = 0 + minutes = DiningCharge.time_diff(checkout, checkin) + free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.strftime('%H:%M')) + dining_minutes = minutes - free_time # stayminutes - free minutes charge_type = dining_charges_obj.charge_type if charge_type == 'hr' - + price = DiningCharge.charges(dining_charges_obj, dining_minutes, 'hr') elsif charge_type == 'day' - price = charge_by_day + price = charges(dining_charges_obj, dining_minutes, 'day') end + + return price + else + puts "<<<<<<<< NO" end end - def charge_by_hour - - end - - def charge_by_day(chargesObj, dining_minutes) - minues_per_day = 12 * 60 - result = dining_minutes / minues_per_day - if result < 1 + def self.charges(chargesObj, dining_minutes, type) + solid_price = 0 + block = DiningCharge.convert_to_minutes(chargesObj.charge_block.strftime('%H:%M')) + result = dining_minutes / block + if result.to_i < 1 return chargesObj.unit_price - elsif result > 1 + elsif result.to_i >= 1 solid_price = result * chargesObj.unit_price - - remain_value = dining_minutes % minues_per_day - roundingblock = remain_value / chargesObj.time_rounding_block - if roundingblock > 1 - + remain_value = dining_minutes % block + rounding_block = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.strftime('%H:%M')) + roundingblock = remain_value / rounding_block + if roundingblock.to_i < 1 + return DiningCharge.check_rounding(chargesObj, solid_price) + else + solid_price += roundingblock * chargesObj.time_rounding_block_price + remain_rounding = dining_minutes % block + if remain_rounding.to_i < 1 + return DiningCharge.check_rounding(chargesObj, solid_price) + else + return solid_price + end end end end + def self.check_rounding(chargesObj) + if chargesObj.time_rounding == "down" + return solid_price + else + return solid_price += chargesObj.time_rounding_block_price + end + end + + def self.time_diff(start_time, end_time) + seconds_diff = (start_time - end_time).to_i.abs + hours = seconds_diff / 3600 + seconds_diff -= hours * 3600 + + minutes = seconds_diff / 60 + seconds_diff -= minutes * 60 + + seconds = seconds_diff + return hours * 60 + minutes + end + + def self.convert_to_minutes(time) + arr = time.split(":") + hour = arr[0].to_i * 60 + return hour + arr[1].to_i + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 4a4c451f..133b2dfe 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -109,6 +109,14 @@ class Sale < ApplicationRecord booking.checkout_by = requested_by.name booking.save + # dining charges + charges = DiningCharge.where('dining_facility_id=?',booking.dining_facility_id).take + if !charges.nil? + diningprice = DiningCharge.amount_calculate(charges, booking.checkin_at, booking.checkout_at) + dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s + create_saleitem_diningcharges(charges, diningprice, booking.dining_facility.name, dining_time) + end + return true, self.id end @@ -162,6 +170,20 @@ class Sale < ApplicationRecord self.sale_items << sale_item end + def create_saleitem_diningcharges(chargeObj, diningprice, dining_name, dining_time) + sale_item = SaleItem.new + sale_item.product_code = chargeObj.item_code + sale_item.product_name = dining_name.to_s + " ( " + dining_time.to_s + " )" + # sale_item.account_id = item.account_id + sale_item.product_alt_name = "-" + sale_item.qty = 1 + sale_item.unit_price = chargeObj.unit_price + sale_item.taxable_price = diningprice + sale_item.is_taxable = chargeObj.taxable + sale_item.sale_id = self.id + sale_item.price = diningprice + sale_item.save + end def update_item (item) #save sale_audit @@ -314,7 +336,7 @@ class Sale < ApplicationRecord total_tax_amount = 0 #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") - + # #Creat new tax records tax_profiles.each do |tax| sale_tax = SaleTax.new(:sale => self) @@ -385,7 +407,7 @@ class Sale < ApplicationRecord else keyword = "receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%" end - + if from.present? && to.present? sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'void' ", from,to) query = sale.where(keyword) @@ -552,67 +574,67 @@ def self.get_by_shift_sale(from,to,status) query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date, shift_closed_at As closing_date," + " grand_total AS grand_total, cash_sales AS cash," + - "total_taxes AS total_tax,total_discounts As total_discount") + "total_taxes AS total_tax,total_discounts As total_discount") .order("shift_sales.id DESC") return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to) end def self.get_item_query() - query = Sale.select("acc.title as account_name,mi.account_id, mi.item_code as item_code, " + + query = Sale.select("acc.title as account_name,mi.account_id, mi.item_code as item_code, " + "(SUM(i.qty * i.unit_price)) as grand_total,SUM(i.qty) as total_item," + " i.unit_price as unit_price,mi.name as product_name, mc.name as" + " menu_category_name,mc.id as menu_category_id ") - - query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code" + + + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code" + " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id JOIN menu_categories mc ON mc.id = mi.menu_category_id ") # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ") query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id") - end - - + end + + def self.get_by_shift_items(shift_sale_range, shift, from, to, status) - + # date_type_selection = get_sql_function_for_report_type(report_type) - + query = self.get_item_query() discount_query = 0 total_card_amount = 0 total_cash_amount = 0 total_credit_amount = 0 total_foc_amount = 0 - total_grand_total = 0 + total_grand_total = 0 if shift.present? query = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) - discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount) - change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed) + discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount) + change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed) sale_cash = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount, - SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, - SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a) + .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a) sale_cash.each do |s_c| total_cash_amount += s_c.cash_amount.to_f total_card_amount += s_c.card_amount.to_f total_credit_amount += s_c.credit_amount.to_f total_foc_amount += s_c.foc_amount.to_f end - total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f - + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + ### => get all sales range in shift_sales elsif shift_sale_range.present? query = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a) discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount) change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed) sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount, - SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, - SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a) + .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a) sale_cash.each do |s_c| total_cash_amount += s_c.cash_amount.to_f total_card_amount += s_c.card_amount.to_f @@ -620,17 +642,17 @@ def self.get_item_query() total_foc_amount += s_c.foc_amount.to_f end total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f - + else query = query.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount) change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed) sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount, - SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, - SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to) + .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to) sale_cash.each do |s_c| total_cash_amount += s_c.cash_amount.to_f total_card_amount += s_c.card_amount.to_f @@ -638,11 +660,11 @@ def self.get_item_query() total_foc_amount += s_c.foc_amount.to_f end total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f - + end return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount -end +end def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type) ## => left join -> show all sales although no orders @@ -655,7 +677,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty payment_type = " and sale_payments.payment_method = '#{payment_type}'" end end - + query = Sale.all if shift.present? @@ -674,10 +696,10 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - end + end end -def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) +def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) query = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date, s.cashier_name as cashier_name") .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id") @@ -689,16 +711,16 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) else query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) end -end +end def self.get_void_sale(shift,from,to) sale_arr = Array.new - + query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment") # .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id") - # .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? + # .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? # OR sh.shift_closed_at between ? and ? )", from ,to, from, to) - + if shift.present? query = query.where("sales.sale_status = 'void' and sales.shift_sale_id in (?)",shift.to_a) else @@ -725,10 +747,10 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) if shift.present? query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") - .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) .group("sale_taxes.tax_name") - .order("sale_taxes.sale_tax_id asc") + .order("sale_taxes.sale_tax_id asc") elsif shift_sale_range.present? query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") @@ -743,15 +765,15 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", from,to) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") - end + end end # def self.get_separate_tax(from,to,payment_method=nil) - + # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") # .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") # .group("sale_taxes.tax_name") - + # return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) # end diff --git a/db/migrate/20170811052036_create_dining_charges.rb b/db/migrate/20170811052036_create_dining_charges.rb index 3a77ad18..d4ef2a2c 100644 --- a/db/migrate/20170811052036_create_dining_charges.rb +++ b/db/migrate/20170811052036_create_dining_charges.rb @@ -10,6 +10,7 @@ class CreateDiningCharges < ActiveRecord::Migration[5.1] t.time :charge_block t.string :time_rounding, :default => "down" t.time :time_rounding_block + t.integer :time_rounding_block_price, :default => 0 t.timestamps end end From 655b3ccef9127e43c8f755f6d750a9db8548df7b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 14:26:22 +0630 Subject: [PATCH 141/246] update menu item --- app/views/settings/menu_item_sets/index.html.erb | 2 +- app/views/settings/menu_item_sets/show.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb index dfa94bcc..95b5dbe9 100644 --- a/app/views/settings/menu_item_sets/index.html.erb +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -23,7 +23,7 @@ <% @settings_menu_item_sets.each do |item| %> <%= item.item_set.name %> - <%= item.menu_item_id %> + <%= item.menu_item.name %> <%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> diff --git a/app/views/settings/menu_item_sets/show.html.erb b/app/views/settings/menu_item_sets/show.html.erb index f7353ca3..a22b2cdb 100644 --- a/app/views/settings/menu_item_sets/show.html.erb +++ b/app/views/settings/menu_item_sets/show.html.erb @@ -13,12 +13,12 @@ - Name: - <%= @settings_menu_item_set.item_set_id %> + Item Set Name: + <%= @settings_menu_item_set.item_set.name %> - Min selectable qty: - <%= @settings_menu_item_set.menu_item_id %> + Menu Item Name: + <%= @settings_menu_item_set.menu_item.name %> Create At From 74b15465f7eff2cf87793018769c79ea52dcac33 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Tue, 15 Aug 2017 15:13:44 +0630 Subject: [PATCH 142/246] item foc in sale edit --- .gitignore | 2 +- .idea/workspace.xml | 660 ++++-------------- .../origami/sale_edit_controller.rb | 159 +++-- app/models/sale.rb | 2 +- app/views/origami/sale_edit/edit.html.erb | 415 +++++------ config/routes.rb | 1 + 6 files changed, 430 insertions(+), 809 deletions(-) diff --git a/.gitignore b/.gitignore index 3d6c48d5..42a48b40 100644 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,4 @@ dump.rdb public/fonts/* # Ruby-Mine IDE folder -.idea +/.idea diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4cdbe61f..f494bdeb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,27 +2,11 @@ - + - - - - - - - - - - - - - - - - - - - + + + @@ -39,45 +23,41 @@ - - + + - - + + - - - - - - - - - - - - - - - + - - + + - - + + - - + + + + + + + + + + + + @@ -86,54 +66,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -147,6 +81,7 @@ table_invoice sale_id oqs + void @@ -155,7 +90,6 @@ @@ -183,8 +121,8 @@ @@ -205,6 +143,21 @@ + + + + + + + + + + + @@ -217,46 +170,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -676,21 +556,22 @@ + - - + - + - + - + @@ -717,279 +598,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1004,112 +648,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 209ec4c0..900b0431 100644 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -1,31 +1,50 @@ class Origami::SaleEditController < BaseOrigamiController authorize_resource :class => false - # Index for sale item void OR edit - def edit - sale_id = params[:sale_id] - @table_id = params[:table_id] - @saleobj = Sale.find(sale_id) - end + # Index for sale item void OR edit + def edit + sale_id = params[:sale_id] + @table_id = params[:table_id] + @saleobj = Sale.find(sale_id) + end - # create item void. make duplicate old record and update qty and price - def item_void - saleitemId = params[:sale_item_id] - saleitemObj = SaleItem.find(saleitemId) - saleitemObj.remark = 'void' - saleitemObj.save - @newsaleitem = SaleItem.new - @newsaleitem = saleitemObj.dup - @newsaleitem.save - @newsaleitem.qty = saleitemObj.qty * -1 - @newsaleitem.price = saleitemObj.price * -1 - @newsaleitem.is_taxable = 1 - @newsaleitem.product_name = saleitemObj.product_name + " - void" - @newsaleitem.save + # create item void. make duplicate old record and update qty and price + def item_void + saleitemId = params[:sale_item_id] + saleitemObj = SaleItem.find(saleitemId) + saleitemObj.remark = 'void' + saleitemObj.save + @newsaleitem = SaleItem.new + @newsaleitem = saleitemObj.dup + @newsaleitem.save + @newsaleitem.qty = saleitemObj.qty * -1 + @newsaleitem.price = saleitemObj.price * -1 + @newsaleitem.is_taxable = 1 + @newsaleitem.product_name = saleitemObj.product_name + " - void" + @newsaleitem.save - # re-calc tax - saleObj = Sale.find(saleitemObj.sale_id) - saleObj.compute_without_void - end + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void + end + + def item_foc + saleitemId = params[:sale_item_id] + saleitemObj = SaleItem.find(saleitemId) + saleitemObj.remark = 'foc' + saleitemObj.save + @newsaleitem = SaleItem.new + @newsaleitem = saleitemObj.dup + @newsaleitem.save + @newsaleitem.qty = saleitemObj.qty * -1 + @newsaleitem.price = saleitemObj.price * -1 + @newsaleitem.is_taxable = 1 + @newsaleitem.product_name = saleitemObj.product_name + ' foc' + @newsaleitem.save + + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void + end # def item_edit # saleitemId = params[:sale_item_id] @@ -48,63 +67,63 @@ class Origami::SaleEditController < BaseOrigamiController # end def item_edit - saleitemId = params[:sale_item_id] - update_qty = params[:update_qty] + saleitemId = params[:sale_item_id] + update_qty = params[:update_qty] update_price = params[:update_price] - saleitemObj = SaleItem.find(saleitemId) + saleitemObj = SaleItem.find(saleitemId) - saleitemObj.qty = update_qty - saleitemObj.price = update_qty.to_f * update_price.to_f - saleitemObj.unit_price = update_price + saleitemObj.qty = update_qty + saleitemObj.price = update_qty.to_f * update_price.to_f + saleitemObj.unit_price = update_price saleitemObj.taxable_price = update_qty.to_f * update_price.to_f # saleitemObj.remark = 'edit' - saleitemObj.product_name = saleitemObj.product_name + " - updated" + saleitemObj.product_name = saleitemObj.product_name + " - updated" saleitemObj.save - # re-calc tax - saleObj = Sale.find(saleitemObj.sale_id) - saleObj.compute_without_void + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void end - # make cancel void item - def item_void_cancel - saleitemId = params[:sale_item_id] - saleitemObj = SaleItem.find(saleitemId) - both = SaleItem.where('product_code=?',saleitemObj.product_code) - both.each do |item| - if item.qty.to_i > 0 - item.remark = nil - item.save - end - end - saleitemObj.destroy + # make cancel void item + def item_void_cancel + saleitemId = params[:sale_item_id] + saleitemObj = SaleItem.find(saleitemId) + both = SaleItem.where('product_code=?', saleitemObj.product_code) + both.each do |item| + if item.qty.to_i > 0 + item.remark = nil + item.save + end + end + saleitemObj.destroy - # re-calc tax - saleObj = Sale.find(saleitemObj.sale_id) - saleObj.compute_without_void - end + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void + end - # remove all void items - def cancel_all_void - sale_id = params[:sale_id] - saleObj = Sale.find(sale_id) - saleObj.sale_items.each do |item| - if item.qty.to_i < 0 - item.destroy - else - item.remark = nil - end - item.save - end + # remove all void items + def cancel_all_void + sale_id = params[:sale_id] + saleObj = Sale.find(sale_id) + saleObj.sale_items.each do |item| + if item.qty.to_i < 0 + item.destroy + else + item.remark = nil + end + item.save + end - # re-calc tax - saleObj.compute_without_void - end + # re-calc tax + saleObj.compute_without_void + end - def apply_void - sale_id = params[:sale_id] - saleObj = Sale.find(sale_id) - saleObj.compute_without_void - end + def apply_void + sale_id = params[:sale_id] + saleObj = Sale.find(sale_id) + saleObj.compute_without_void + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 133b2dfe..b19aef3d 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -267,7 +267,7 @@ class Sale < ApplicationRecord rounding_adjustment = 0 sales_items.each do |item| - if item.remark != 'void' + if item.remark != 'void' && item.remark != 'foc' #compute each item and added to total subtotal_price = subtotal_price + item.price total_taxable = total_taxable + item.price diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb index 6ba861a8..bdcf2069 100644 --- a/app/views/origami/sale_edit/edit.html.erb +++ b/app/views/origami/sale_edit/edit.html.erb @@ -1,216 +1,235 @@
      - +
      -
      -
      -
      INVOICE DETAILS
      -
      -
      -
      -
      -

      Receipt No: +

      +
      +
      INVOICE DETAILS
      +
      +
      +
      +
      +

      Receipt No: <%= @saleobj.receipt_no rescue '' %>

      -
      -
      -

      Date: <%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      -
      -
      -
      -
      -

      Customer :

      -
      +
      +
      +

      Date: + <%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %> +

      +
      +
      +
      +
      +

      Customer :

      +
      -
      -
      - - - - - - - - - - <% - count = 0 - sub_total = 0 - @saleobj.sale_items.each do |sale_item| - count += 1 - sub_total = sub_total + sale_item.price - %> - - <% - # Can't check for discount - unless sale_item.price == 0 + +
      +
      #ItemsQTY - Price - - Action
      + + + + + + + + + <% + count = 0 + sub_total = 0 + @saleobj.sale_items.each do |sale_item| + count += 1 + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 %> - - - - <% if sale_item.remark != 'void' && sale_item.remark != 'edit' %> - - - - + - <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %> - - - - - <% else %> - - - - <% end %> - - <% - end - end - %> - -
      #ItemsQTY + + Price + + + Action
      <%= count %> - <%= sale_item.product_name %> - - - - - - - - + + + + - - - - - - - - - -
      -
      -
      - - - - - - -
      Sub Total:<%= sub_total %>
      -
      -
      -
      + + + + <% else %> + + + + + + + + <% end %> + + <% + end + end + %> + + +
      +
      + + + + + + +
      Sub Total:<%= sub_total %>
      +
      +
      +
      - -
      - - - - -
      + +
      + + + + +
      diff --git a/config/routes.rb b/config/routes.rb index 9e62023c..35cd6233 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -80,6 +80,7 @@ Rails.application.routes.draw do post 'moving' => "movetable#moving" get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit" post 'item_void' => "sale_edit#item_void" + post 'item_foc' => "sale_edit#item_foc" post 'item_edit' => "sale_edit#item_edit" post 'item_void_cancel' => "sale_edit#item_void_cancel" post 'cancel_all_void' => 'sale_edit#cancel_all_void' From e4a2d58e5e5749a2b5d0c8ce291f6ab4462f4926 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 15:14:55 +0630 Subject: [PATCH 143/246] update foc and pdf --- .../origami/payments_controller.rb | 29 ++++++++ app/controllers/origami/shifts_controller.rb | 2 - app/models/ability.rb | 8 +-- app/models/sale_payment.rb | 26 ++++++- app/models/shift_sale.rb | 3 +- app/pdf/close_cashier_pdf.rb | 8 +++ app/pdf/receipt_bill_pdf.rb | 23 +++--- app/views/origami/payments/show.html.erb | 72 ++++++++++++++----- .../origami/shifts/sale_summary.html.erb | 6 ++ config/routes.rb | 8 ++- 10 files changed, 146 insertions(+), 39 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 8c328030..109138a5 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -163,6 +163,35 @@ class Origami::PaymentsController < BaseOrigamiController printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print") end + def foc + cash = params[:cash] + sale_id = params[:sale_id] + sub_total = params[:sub_total] + member_info = nil + rebate_amount = nil + + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + sale_payment.process_payment(saleObj, @user, cash, "foc") + + unique_code = "ReceiptBillPdf" + customer= Customer.find(saleObj.customer_id) + + #shop detail + shop_details = Shop.find(1) + + # get printer info + print_settings=PrintSetting.find_by_unique_code(unique_code) + # Calculate Food and Beverage Total + item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) + discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) + + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC") + end + end + def rounding_adj saleObj = Sale.find(params[:sale_id]) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index e134a594..31c68edf 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -66,8 +66,6 @@ class Origami::ShiftsController < BaseOrigamiController @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') #other payment details for mpu or visa like card @other_payment = ShiftSale.get_by_shift_other_payment(@shift) - #t details for mpu or visa like card - @other_payment = ShiftSale.get_by_shift_other_payment(@shift) # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..7b9ba1de 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -56,6 +56,8 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment + can :move_dining, :movetable can :moving, :movetable @@ -96,17 +98,13 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment can :move_dining, :movetable can :moving, :movetable can :move_dining, :moveroom - can :first_bill, :payment - can :show, :payment - can :create, :payment - can :reprint, :payment - can :manage, DiningQueue elsif user.role == "account" diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index ff2f6e2f..3435190d 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -46,6 +46,8 @@ class SalePayment < ApplicationRecord payment_status = giftcard_payment when "paypar" payment_status = paypar_payment + when "foc" + payment_status = foc_payment else puts "it was something else" end @@ -164,6 +166,17 @@ class SalePayment < ApplicationRecord return payment_status end + def foc_payment + payment_status = false + self.payment_method = "foc" + self.payment_amount = self.received_amount + self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f + self.payment_status = "paid" + payment_method = self.save! + sale_update_payment_status(self.received_amount) + return payment_status + end + def creditnote_payment(customer_id) payment_status = false @@ -257,11 +270,15 @@ class SalePayment < ApplicationRecord all_received_amount = 0.0 sObj = Sale.find(self.sale_id) is_credit = 0 + is_foc = 0 sObj.sale_payments.each do |spay| all_received_amount += spay.payment_amount.to_f if spay.payment_method == "creditnote" is_credit = 1 end + if spay.payment_method == "foc" + is_foc = 1 + end end if (self.sale.grand_total <= all_received_amount) if is_credit == 0 @@ -269,9 +286,16 @@ class SalePayment < ApplicationRecord else self.sale.payment_status = "outstanding" end + + if is_foc == 0 + self.sale.payment_status = "paid" + else + self.sale.payment_status = "foc" + end + self.sale.sale_status = "completed" - if MembershipSetting.find_by_rebate(1) + if MembershipSetting.find_by_rebate(1) && is_foc == 0 response = rebat(sObj) if !response.nil? diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 168e63ff..68c64cff 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -105,7 +105,8 @@ class ShiftSale < ApplicationRecord SUM(case when (sale_payments.payment_method='mpu') then (sale_payments.payment_amount) else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='visa') then (sale_payments.payment_amount) else 0 end) as visa_amount, SUM(case when (sale_payments.payment_method='master') then (sale_payments.payment_amount) else 0 end) as master_amount, - SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount, SUM(case when (sale_payments.payment_method='paypar') then (sale_payments.payment_amount) else 0 end) as paypar_amount") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .where("sales.shift_sale_id =? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.id) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 51f905d6..73db5e9d 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -223,6 +223,14 @@ class CloseCashierPdf < Prawn::Document text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right end + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "FOC :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.foc_amount.round(2)}", :size => self.item_font_size, :align => :right + end + end else diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 00ef0a7b..de18adc9 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -418,32 +418,33 @@ class ReceiptBillPdf < Prawn::Document stroke_horizontal_rule bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 35 + move_down 70 stroke_horizontal_rule end bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 38 + move_down 73 text "Approved By" , :size => self.item_font_size,:align => :center end end end - if sale_data.sale_status == "FOC" + if sale_data.payment_status == "foc" y_position = cursor stroke_horizontal_rule bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 35 - stroke_horizontal_rule - end - - bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do - move_down 38 - text "Acknowledged By", :size => self.item_font_size,:align => :center + move_down 70 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 73 + text "Acknowledged By" , :size => self.item_font_size,:align => :center end end + end def footer(printed_status) @@ -453,7 +454,7 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do - text "#{printed_status}", :size => self.item_font_size,:align => :left + text "#{printed_status}",:style => :bold, :size => self.header_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Thank You! See you Again", :left_margin => -10, :size => self.item_font_size,:align => :left diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 83373b8e..68f843a7 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -41,24 +41,24 @@ <% sub_total = 0 count = 0 %> - <% @sale_data.sale_items.each do |sale_item| + <% @sale_data.sale_items.each do |sale_item| count += 1 %> - <% sub_total += sale_item.price%> - + <% sub_total += sale_item.price%> + <%= count %> - - <%=sale_item.product_name%>@<%=sale_item.unit_price%> - - - <%=sale_item.qty%> - - - <%=(sale_item.price)%> - - - <%end %> + + <%=sale_item.product_name%>@<%=sale_item.unit_price%> + + + <%=sale_item.qty%> + + + <%=(sale_item.price)%> + + + <%end %>
    @@ -75,7 +75,7 @@ <%else%> (Discount) <%end%> - + (<%=@sale_data.total_discount rescue 0%>) @@ -258,7 +258,7 @@ - +
    @@ -443,4 +443,44 @@ function update_balance(){ $('#balance').text(result.toFixed(2)); } +$('#foc').click(function() { + + $( "#loading_wrapper" ).show(); + // payment + var cash = $('#amount_due').text(); + var sub_total = $('#sub-total').text(); + var sale_id = $('#sale_id').text(); + var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total }; + $.ajax({type: "POST", + url: "<%= origami_payment_foc_path %>", + data: params, + success:function(result){ + localStorage.removeItem("cash"); + if (result.status) { + var msg = result.message; + } + else{ + var msg = ''; + } + $( "#loading_wrapper" ).hide(); + + $.confirm({ + title: 'Infomation!', + content: 'Thank you !', + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + window.location.href = '/origami'; + } + } + } + }); + + } + }); + + }); + \ No newline at end of file diff --git a/app/views/origami/shifts/sale_summary.html.erb b/app/views/origami/shifts/sale_summary.html.erb index 94e59924..ad9631a0 100644 --- a/app/views/origami/shifts/sale_summary.html.erb +++ b/app/views/origami/shifts/sale_summary.html.erb @@ -153,6 +153,12 @@ <%=other.paypar_amount.round(2) rescue 0.0 %> <% @total_amount = @total_amount+other.paypar_amount rescue 0.0 %> + + + FOC + <%=other.foc_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.foc_amount rescue 0.0 %> + <%end%> diff --git a/config/routes.rb b/config/routes.rb index bebb89bf..4286303d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :item_sets - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -133,6 +130,7 @@ Rails.application.routes.draw do get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' } get 'sale/:sale_id/payment' => 'payments#show' + post 'payment/foc' => 'payments#foc', :defaults => { :format => 'json' } post 'payment/cash' => 'payments#create' post 'payment/mpu' => "mpu#create" post 'payment/jcb' => "jcb#create" @@ -219,6 +217,10 @@ Rails.application.routes.draw do resources :menu_categories, only: [:new, :create, :edit,:delete] end + resources :item_sets + + resources :menu_item_sets + #accounts resources :accounts From e69eeadb6efb297f3e99865918e633132a548fdd Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 15 Aug 2017 16:27:40 +0630 Subject: [PATCH 144/246] add bootstrap file input and menu item img implemented --- app/assets/javascripts/application.js | 46 +++++++++++++----- app/assets/javascripts/fileinput.min.js | 12 +++++ app/assets/stylesheets/fileinput.min.css | 12 +++++ app/assets/stylesheets/settings.scss | 5 ++ .../settings/set_menu_items_controller.rb | 6 +-- .../settings/simple_menu_items_controller.rb | 5 +- app/uploaders/menu_item_image_uploader.rb | 10 +++- app/views/layouts/application.html.erb | 8 +-- .../settings/set_menu_items/_form.html.erb | 11 ++++- .../settings/simple_menu_items/_form.html.erb | 11 ++++- config/initializers/assets.rb | 6 +++ config/initializers/carrier_wave.rb | 1 + public/image/menu_images/default.png | Bin 0 -> 5031 bytes 13 files changed, 111 insertions(+), 22 deletions(-) create mode 100755 app/assets/javascripts/fileinput.min.js create mode 100755 app/assets/stylesheets/fileinput.min.css create mode 100644 config/initializers/carrier_wave.rb create mode 100644 public/image/menu_images/default.png diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1b22af09..bd7c9761 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,25 +20,47 @@ //= require jquery-ui //= require bootstrap-datepicker -$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ +$(document).on('turbolinks:load', function() { + $('.datepicker').datepicker({ + format : 'dd-mm-yyyy', + autoclose: true + }); + $('.datepicker').attr('ReadOnly','true'); + $('.datepicker').css('cursor','pointer'); + + // Image Upload + $("#simple_menu_item_image_path").fileinput({ + previewFileType: "image", + allowedFileExtensions: ["jpg", "gif", "png"], + browseClass: "btn btn-success", + browseLabel: "Pick Image", + browseIcon: " ", + removeClass: "btn btn-danger", + removeLabel: "Delete", + removeIcon: " ", + showUpload: false, + // uploadClass: "btn btn-info", + // uploadLabel: "Upload", + // uploadIcon: " ", + previewTemplates: { + image: '
    \n' + + ' {caption}\n' + + '
    \n', + } + }); +}); + + $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); - $('.dropdown-toggle').dropdown(); + $('.dropdown-toggle').dropdown(); }); function export_to(path) { - var form_params = $("#frm_report").serialize(); - window.location = path+"?"+ form_params; + var form_params = $("#frm_report").serialize(); + window.location = path+"?"+ form_params; } - $(function () { - $('.datepicker').datepicker({ - format : 'dd-mm-yyyy', - autoclose: true - }); - $('.datepicker').attr('ReadOnly','true'); - $('.datepicker').css('cursor','pointer'); -}); diff --git a/app/assets/javascripts/fileinput.min.js b/app/assets/javascripts/fileinput.min.js new file mode 100755 index 00000000..d6d3ff94 --- /dev/null +++ b/app/assets/javascripts/fileinput.min.js @@ -0,0 +1,12 @@ +/*! + * bootstrap-fileinput v4.4.3 + * http://plugins.krajee.com/file-input + * + * Author: Kartik Visweswaran + * Copyright: 2014 - 2017, Kartik Visweswaran, Krajee.com + * + * Licensed under the BSD 3-Clause + * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md + */!function(e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&module.exports?module.exports=e(require("jquery")):e(window.jQuery)}(function(e){"use strict";e.fn.fileinputLocales={},e.fn.fileinputThemes={},String.prototype.setTokens=function(e){var i,t,a=this.toString();for(i in e)e.hasOwnProperty(i)&&(t=new RegExp("{"+i+"}","g"),a=a.replace(t,e[i]));return a};var i,t;i={FRAMES:".kv-preview-thumb",SORT_CSS:"file-sortable",STYLE_SETTING:'style="width:{width};height:{height};"',OBJECT_PARAMS:'\n\n\n\n\n\n',DEFAULT_PREVIEW:'
    \n{previewFileIcon}\n
    ',MODAL_ID:"kvFileinputModal",MODAL_EVENTS:["show","shown","hide","hidden","loaded"],objUrl:window.URL||window.webkitURL,compare:function(e,i,t){return void 0!==e&&(t?e===i:e.match(i))},isIE:function(e){if("Microsoft Internet Explorer"!==navigator.appName)return!1;if(10===e)return new RegExp("msie\\s"+e,"i").test(navigator.userAgent);var i,t=document.createElement("div");return t.innerHTML="",i=t.getElementsByTagName("i").length,document.body.appendChild(t),t.parentNode.removeChild(t),i},initModal:function(i){var t=e("body");t.length&&i.appendTo(t)},isEmpty:function(i,t){return void 0===i||null===i||0===i.length||t&&""===e.trim(i)},isArray:function(e){return Array.isArray(e)||"[object Array]"===Object.prototype.toString.call(e)},ifSet:function(e,i,t){return t=t||"",i&&"object"==typeof i&&e in i?i[e]:t},cleanArray:function(e){return e instanceof Array||(e=[]),e.filter(function(e){return void 0!==e&&null!==e})},spliceArray:function(e,i){var t,a=0,n=[];if(!(e instanceof Array))return[];for(t=0;t=0?atob(e.split(",")[1]):decodeURIComponent(e.split(",")[1]),a=new ArrayBuffer(t.length),n=new Uint8Array(a),r=0;r/g,">").replace(/"/g,""").replace(/'/g,"'")},replaceTags:function(i,t){var a=i;return t?(e.each(t,function(e,i){"function"==typeof i&&(i=i()),a=a.split(e).join(i)}),a):a},cleanMemory:function(e){var t=e.is("img")?e.attr("src"):e.find("source").attr("src");i.objUrl.revokeObjectURL(t)},findFileName:function(e){var i=e.lastIndexOf("/");return-1===i&&(i=e.lastIndexOf("\\")),e.split(e.substring(i,i+1)).pop()},checkFullScreen:function(){return document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement},toggleFullScreen:function(e){var t=document,a=t.documentElement;a&&e&&!i.checkFullScreen()?a.requestFullscreen?a.requestFullscreen():a.msRequestFullscreen?a.msRequestFullscreen():a.mozRequestFullScreen?a.mozRequestFullScreen():a.webkitRequestFullscreen&&a.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT):t.exitFullscreen?t.exitFullscreen():t.msExitFullscreen?t.msExitFullscreen():t.mozCancelFullScreen?t.mozCancelFullScreen():t.webkitExitFullscreen&&t.webkitExitFullscreen()},moveArray:function(e,i,t){if(t>=e.length)for(var a=t-e.length;a--+1;)e.push(void 0);return e.splice(t,0,e.splice(i,1)[0]),e},cleanZoomCache:function(e){var i=e.closest(".kv-zoom-cache-theme");i.length||(i=e.closest(".kv-zoom-cache")),i.remove()},setOrientation:function(e,i){var t,a,n,r=new DataView(e),o=0,l=1;if(65496!==r.getUint16(o)||e.length<2)return void(i&&i());for(o+=2,t=r.byteLength;t-2>o;)switch(a=r.getUint16(o),o+=2,a){case 65505:n=r.getUint16(o),t=n-o,o+=2;break;case 274:l=r.getUint16(o+6,!1),t=0}i&&i(l)},validateOrientation:function(e,t){if(window.FileReader&&window.DataView){var a,n=new FileReader;n.onloadend=function(){a=n.result,i.setOrientation(a,t)},n.readAsArrayBuffer(e)}},adjustOrientedImage:function(e,i){var t,a,n;if(e.hasClass("is-portrait-gt4")){if(i)return void e.css({width:e.parent().height()});e.css({height:"auto",width:e.height()}),t=e.parent().offset().top,a=e.offset().top,n=t-a,e.css("margin-top",n)}}},t=function(t,a){var n=this;n.$element=e(t),n._validate()&&(n.isPreviewable=i.hasFileAPISupport(),n.isIE9=i.isIE(9),n.isIE10=i.isIE(10),n.isPreviewable||n.isIE9?(n._init(a),n._listen()):n.$element.removeClass("file-loading"))},t.prototype={constructor:t,_cleanup:function(){var e=this;e.reader=null,e.formdata={},e.uploadCount=0,e.uploadStatus={},e.uploadLog=[],e.uploadAsyncCount=0,e.loadedImages=[],e.totalImagesCount=0,e.ajaxRequests=[],e.clearStack(),e.fileInputCleared=!1,e.fileBatchCompleted=!0,e.isPreviewable||(e.showPreview=!1),e.isError=!1,e.ajaxAborted=!1,e.cancelling=!1},_init:function(t){var a,n,r,o=this,l=o.$element;o.options=t,e.each(t,function(e,t){switch(e){case"minFileCount":case"maxFileCount":case"minFileSize":case"maxFileSize":case"maxFilePreviewSize":case"resizeImageQuality":case"resizeIfSizeMoreThan":case"progressUploadThreshold":case"initialPreviewCount":case"zoomModalHeight":case"minImageHeight":case"maxImageHeight":case"minImageWidth":case"maxImageWidth":o[e]=i.getNum(t);break;default:o[e]=t}}),o.rtl&&(r=o.previewZoomButtonIcons.prev,o.previewZoomButtonIcons.prev=o.previewZoomButtonIcons.next,o.previewZoomButtonIcons.next=r),o._cleanup(),o.$form=l.closest("form"),o._initTemplateDefaults(),o.uploadFileAttr=i.isEmpty(l.attr("name"))?"file_data":l.attr("name"),n=o._getLayoutTemplate("progress"),o.progressTemplate=n.replace("{class}",o.progressClass),o.progressCompleteTemplate=n.replace("{class}",o.progressCompleteClass),o.progressErrorTemplate=n.replace("{class}",o.progressErrorClass),o.dropZoneEnabled=i.hasDragDropSupport()&&o.dropZoneEnabled,o.isDisabled=l.attr("disabled")||l.attr("readonly"),o.isDisabled&&l.attr("disabled",!0),o.isUploadable=i.hasFileUploadSupport()&&!i.isEmpty(o.uploadUrl),o.isClickable=o.browseOnZoneClick&&o.showPreview&&(o.isUploadable&&o.dropZoneEnabled||!i.isEmpty(o.defaultPreviewContent)),o.slug="function"==typeof t.slugCallback?t.slugCallback:o._slugDefault,o.mainTemplate=o.showCaption?o._getLayoutTemplate("main1"):o._getLayoutTemplate("main2"),o.captionTemplate=o._getLayoutTemplate("caption"),o.previewGenericTemplate=o._getPreviewTemplate("generic"),o.resizeImage&&(o.maxImageWidth||o.maxImageHeight)&&(o.imageCanvas=document.createElement("canvas"),o.imageCanvasContext=o.imageCanvas.getContext("2d")),i.isEmpty(l.attr("id"))&&l.attr("id",i.uniqId()),o.namespace=".fileinput_"+l.attr("id").replace(/-/g,"_"),void 0===o.$container?o.$container=o._createContainer():o._refreshContainer(),a=o.$container,o.$dropZone=a.find(".file-drop-zone"),o.$progress=a.find(".kv-upload-progress"),o.$btnUpload=a.find(".fileinput-upload"),o.$captionContainer=i.getElement(t,"elCaptionContainer",a.find(".file-caption")),o.$caption=i.getElement(t,"elCaptionText",a.find(".file-caption-name")),o.$previewContainer=i.getElement(t,"elPreviewContainer",a.find(".file-preview")),o.$preview=i.getElement(t,"elPreviewImage",a.find(".file-preview-thumbnails")),o.$previewStatus=i.getElement(t,"elPreviewStatus",a.find(".file-preview-status")),o.$errorContainer=i.getElement(t,"elErrorContainer",o.$previewContainer.find(".kv-fileinput-error")),i.isEmpty(o.msgErrorClass)||i.addCss(o.$errorContainer,o.msgErrorClass),o.$errorContainer.hide(),o.previewInitId="preview-"+i.uniqId(),o._initPreviewCache(),o._initPreview(!0),o._initPreviewActions(),o._setFileDropZoneTitle(),l.removeClass("file-loading"),l.attr("disabled")&&o.disable(),o._initZoom(),o.hideThumbnailContent&&i.addCss(o.$preview,"hide-content")},_initTemplateDefaults:function(){var t,a,n,r,o,l,s,d,c,u,p,f,m,v,h,g,w,_,b,C,y,T,E,x,F,S,I,k,P,z,A,$,D,U,j,B,L=this;t='{preview}\n
    \n
    \n {caption}\n
    \n {remove}\n {cancel}\n {upload}\n {browse}\n
    \n
    ',a='{preview}\n
    \n{remove}\n{cancel}\n{upload}\n{browse}\n',n='
    \n {close}
    \n
    \n
    \n
    \n
    \n
    \n
    ',o='
    ×
    \n',r='',l='
    \n
    \n
    \n',s='',d='{icon} {label}',c='
    {icon} {label}
    ',u='',p='
    \n
    \n
    \n
    {toggleheader}{fullscreen}{borderless}{close}
    \n

    {heading}

    \n
    \n
    \n
    \n
    \n{prev} {next}\n
    \n
    \n
    \n',f='
    \n
    \n {status}\n
    \n
    ',m=" ({sizeText})",v='
    \n
    {caption}
    {size}
    \n {progress} {indicator} {actions}\n
    ',h='{drag}\n
    \n
    \n {upload} {delete} {zoom} {other}
    \n
    \n
    ',g='\n',w='',_='',b='{dragIcon}',C='
    {indicator}
    ',y='
    \n',E=y+' title="{caption}">
    \n',x="
    {footer}\n
    \n",F="{content}\n",S='
    {data}
    \n",I='{caption}\n",k='\n",P='\n",z='
    \n",A='\n'+i.OBJECT_PARAMS+" "+i.DEFAULT_PREVIEW+"\n\n",$='\n\n'+i.OBJECT_PARAMS+" "+i.DEFAULT_PREVIEW+"\n\n",D='\n',U='
    \n'+i.DEFAULT_PREVIEW+"\n
    \n",j='',B={width:"100%",height:"100%","min-height":"480px"},L.defaults={layoutTemplates:{main1:t,main2:a,preview:n,close:o,fileIcon:r,caption:l,modalMain:u,modal:p,progress:f,size:m,footer:v,indicator:C,actions:h,actionDelete:g,actionUpload:w,actionZoom:_,actionDrag:b,btnDefault:s,btnLink:d,btnBrowse:c,zoomCache:j},previewMarkupTags:{tagBefore1:T,tagBefore2:E,tagAfter:x},previewContentTemplates:{generic:F,html:S,image:I,text:k,video:P,audio:z,flash:A,object:$,pdf:D,other:U},allowedPreviewTypes:["image","html","text","video","audio","flash","pdf","object"],previewTemplates:{},previewSettings:{image:{width:"auto",height:"160px"},html:{width:"213px",height:"160px"},text:{width:"213px",height:"160px"},video:{width:"auto",height:"100%","max-width":"100%"},audio:{width:"100%",height:"30px"},flash:{width:"auto",height:"100%","max-width":"100%"},object:{height:"100%"},pdf:{width:"160px",height:"160px"},other:{width:"160px",height:"160px"}},previewZoomSettings:{image:{width:"auto",height:"auto","max-width":"100%","max-height":"100%"},html:B,text:B,video:{width:"auto",height:"100%","max-width":"100%"},audio:{width:"100%",height:"30px"},flash:{width:"auto",height:"480px"},object:{width:"auto",height:"100%","max-width":"100%","min-height":"480px"},pdf:B,other:{width:"auto",height:"100%","min-height":"480px"}},fileTypeSettings:{image:function(e,t){return i.compare(e,"image.*")||i.compare(t,/\.(gif|png|jpe?g)$/i)},html:function(e,t){return i.compare(e,"text/html")||i.compare(t,/\.(htm|html)$/i)},text:function(e,t){return i.compare(e,"text.*")||i.compare(t,/\.(xml|javascript)$/i)||i.compare(t,/\.(txt|md|csv|nfo|ini|json|php|js|css)$/i)},video:function(e,t){return i.compare(e,"video.*")&&(i.compare(e,/(ogg|mp4|mp?g|mov|webm|3gp)$/i)||i.compare(t,/\.(og?|mp4|webm|mp?g|mov|3gp)$/i))},audio:function(e,t){return i.compare(e,"audio.*")&&(i.compare(t,/(ogg|mp3|mp?g|wav)$/i)||i.compare(t,/\.(og?|mp3|mp?g|wav)$/i))},flash:function(e,t){return i.compare(e,"application/x-shockwave-flash",!0)||i.compare(t,/\.(swf)$/i)},pdf:function(e,t){return i.compare(e,"application/pdf",!0)||i.compare(t,/\.(pdf)$/i)},object:function(){return!0},other:function(){return!0}},fileActionSettings:{showRemove:!0,showUpload:!0,showZoom:!0,showDrag:!0,removeIcon:'',removeClass:"btn btn-xs btn-default",removeTitle:"Remove file",uploadIcon:'',uploadClass:"btn btn-xs btn-default",uploadTitle:"Upload file",zoomIcon:'',zoomClass:"btn btn-xs btn-default",zoomTitle:"View Details",dragIcon:'',dragClass:"text-info",dragTitle:"Move / Rearrange",dragSettings:{},indicatorNew:'',indicatorSuccess:'',indicatorError:'',indicatorLoading:'',indicatorNewTitle:"Not uploaded yet",indicatorSuccessTitle:"Uploaded",indicatorErrorTitle:"Upload Error",indicatorLoadingTitle:"Uploading ..."}},e.each(L.defaults,function(i,t){return"allowedPreviewTypes"===i?void(void 0===L.allowedPreviewTypes&&(L.allowedPreviewTypes=t)):void(L[i]=e.extend(!0,{},t,L[i]))}),L._initPreviewTemplates()},_initPreviewTemplates:function(){var t,a=this,n=a.defaults,r=a.previewMarkupTags,o=r.tagAfter;e.each(n.previewContentTemplates,function(e,n){i.isEmpty(a.previewTemplates[e])&&(t=r.tagBefore2,"generic"!==e&&"image"!==e&&"html"!==e&&"text"!==e||(t=r.tagBefore1),a.previewTemplates[e]=t+n+o)})},_initPreviewCache:function(){var t=this;t.previewCache={data:{},init:function(){var e=t.initialPreview;e.length>0&&!i.isArray(e)&&(e=e.split(t.initialPreviewDelimiter)),t.previewCache.data={content:e,config:t.initialPreviewConfig,tags:t.initialPreviewThumbTags}},fetch:function(){return t.previewCache.data.content.filter(function(e){return null!==e})},count:function(e){return t.previewCache.data&&t.previewCache.data.content?e?t.previewCache.data.content.length:t.previewCache.fetch().length:0},get:function(a,n){var r,o,l,s,d,c,u,p="init_"+a,f=t.previewCache.data,m=f.config[a],v=f.content[a],h=t.previewInitId+"-"+p,g=i.ifSet("previewAsData",m,t.initialPreviewAsData),w=function(e,a,n,r,o,l,s,d,c){return d=" file-preview-initial "+i.SORT_CSS+(d?" "+d:""),t._generatePreviewTemplate(e,a,n,r,o,!1,null,d,l,s,c)};return v?(n=void 0===n?!0:n,l=i.ifSet("type",m,t.initialPreviewFileType||"generic"),d=i.ifSet("filename",m,i.ifSet("caption",m)),c=i.ifSet("filetype",m,l),s=t.previewCache.footer(a,n,m&&m.size||null),u=i.ifSet("frameClass",m),r=g?w(l,v,d,c,h,s,p,u):w("generic",v,d,c,h,s,p,u,l).setTokens({content:f.content[a]}),f.tags.length&&f.tags[a]&&(r=i.replaceTags(r,f.tags[a])),i.isEmpty(m)||i.isEmpty(m.frameAttr)||(o=e(document.createElement("div")).html(r),o.find(".file-preview-initial").attr(m.frameAttr),r=o.html(),o.remove()),r):""},add:function(e,a,n,r){var o,l=t.previewCache.data;return i.isArray(e)||(e=e.split(t.initialPreviewDelimiter)),r?(o=l.content.push(e)-1,l.config[o]=a,l.tags[o]=n):(o=e.length-1,l.content=e,l.config=a,l.tags=n),t.previewCache.data=l,o},set:function(e,a,n,r){var o,l,s=t.previewCache.data;if(e&&e.length&&(i.isArray(e)||(e=e.split(t.initialPreviewDelimiter)),l=e.filter(function(e){return null!==e}),l.length)){if(void 0===s.content&&(s.content=[]),void 0===s.config&&(s.config=[]),void 0===s.tags&&(s.tags=[]),r){for(o=0;oi;i++)a+=t.previewCache.get(i);return e=t._getMsgSelected(t.previewCache.count()),{content:a,caption:e}},footer:function(e,a,n){var r=t.previewCache.data;if(!r||!r.config||0===r.config.length||i.isEmpty(r.config[e]))return"";a=void 0===a?!0:a;var o,l=r.config[e],s=i.ifSet("caption",l),d=i.ifSet("width",l,"auto"),c=i.ifSet("url",l,!1),u=i.ifSet("key",l,null),p=t.fileActionSettings,f=t.initialPreviewShowDelete||!1,m=i.ifSet("showDelete",l,i.ifSet("showDelete",p,f)),v=i.ifSet("showZoom",l,i.ifSet("showZoom",p,!0)),h=i.ifSet("showDrag",l,i.ifSet("showDrag",p,!0)),g=c===!1&&a;return o=t._renderFileActions(!1,m,v,h,g,c,u,!0),t._getLayoutTemplate("footer").setTokens({progress:t._renderThumbProgress(),actions:o,caption:s,size:t._getSize(n),width:d,indicator:""})}},t.previewCache.init()},_handler:function(e,i,t){var a=this,n=a.namespace,r=i.split(" ").join(n+" ")+n;e&&e.length&&e.off(r).on(r,t)},_log:function(e){var i=this,t=i.$element.attr("id");t&&(e='"'+t+'": '+e),"undefined"!=typeof window.console.log?window.console.log(e):window.alert(e)},_validate:function(){var e=this,i="file"===e.$element.attr("type");return i||e._log('The input "type" must be set to "file" for initializing the "bootstrap-fileinput" plugin.'),i},_errorsExist:function(){var i,t=this;return t.$errorContainer.find("li").length?!0:(i=e(document.createElement("div")).html(t.$errorContainer.html()),i.find("span.kv-error-close").remove(),i.find("ul").remove(),!!e.trim(i.text()).length)},_errorHandler:function(e,i){var t=this,a=e.target.error,n=function(e){t._showError(e.replace("{name}",i))};n(a.code===a.NOT_FOUND_ERR?t.msgFileNotFound:a.code===a.SECURITY_ERR?t.msgFileSecured:a.code===a.NOT_READABLE_ERR?t.msgFileNotReadable:a.code===a.ABORT_ERR?t.msgFilePreviewAborted:t.msgFilePreviewError)},_addError:function(e){var i=this,t=i.$errorContainer;e&&t.length&&(t.html(i.errorCloseButton+e),i._handler(t.find(".kv-error-close"),"click",function(){t.fadeOut("slow")}))},_resetErrors:function(e){var i=this,t=i.$errorContainer;i.isError=!1,i.$container.removeClass("has-error"),t.html(""),e?t.fadeOut("slow"):t.hide()},_showFolderError:function(e){var t,a=this,n=a.$errorContainer;e&&(t=a.msgFoldersNotAllowed.replace("{n}",e),a._addError(t),i.addCss(a.$container,"has-error"),n.fadeIn(800),a._raise("filefoldererror",[e,t]))},_showUploadError:function(e,t,a){var n=this,r=n.$errorContainer,o=a||"fileuploaderror",l=t&&t.id?'
  • '+e+"
    • ":"
  • "+e+"
    • ";return 0===r.find("ul").length?n._addError("
      "+l+"
    "):r.find("ul").append(l),r.fadeIn(800),n._raise(o,[t,e]),n.$container.removeClass("file-input-new"),i.addCss(n.$container,"has-error"),!0},_showError:function(e,t,a){var n=this,r=n.$errorContainer,o=a||"fileerror";return t=t||{},t.reader=n.reader,n._addError(e),r.fadeIn(800),n._raise(o,[t,e]),n.isUploadable||n._clearFileInput(),n.$container.removeClass("file-input-new"),i.addCss(n.$container,"has-error"),n.$btnUpload.attr("disabled",!0),!0},_noFilesError:function(e){var t=this,a=t.minFileCount>1?t.filePlural:t.fileSingle,n=t.msgFilesTooLess.replace("{n}",t.minFileCount).replace("{files}",a),r=t.$errorContainer;t._addError(n),t.isError=!0,t._updateFileDetails(0),r.fadeIn(800),t._raise("fileerror",[e,n]),t._clearFileInput(),i.addCss(t.$container,"has-error")},_parseError:function(i,t,a,n){var r,o=this,l=e.trim(a+""),s=void 0!==t.responseJSON&&void 0!==t.responseJSON.error?t.responseJSON.error:t.responseText;return o.cancelling&&o.msgUploadAborted&&(l=o.msgUploadAborted),o.showAjaxErrorDetails&&s&&(s=e.trim(s.replace(/\n\s*\n/g,"\n")),r=s.length?"
    "+s+"
    ":"",l+=l?r:s),l||(l=o.msgAjaxError.replace("{operation}",i)),o.cancelling=!1,n?""+n+": "+l:l},_parseFileType:function(e){var t,a,n,r,o=this,l=o.allowedPreviewTypes||[];for(r=0;r-1&&(t=i.split(".").pop(),a.previewFileIconSettings&&(n=a.previewFileIconSettings[t]||a.previewFileIconSettings[t.toLowerCase()]||null),a.previewFileExtSettings&&e.each(a.previewFileExtSettings,function(e,i){return a.previewFileIconSettings[e]&&i(t)?void(n=a.previewFileIconSettings[e]):void 0})),n},_parseFilePreviewIcon:function(e,i){var t=this,a=t._getPreviewIcon(i)||t.previewFileIcon,n=e;return n.indexOf("{previewFileIcon}")>-1&&(n=n.setTokens({previewFileIconClass:t.previewFileIconClass,previewFileIcon:a})),n},_raise:function(i,t){var a=this,n=e.Event(i);if(void 0!==t?a.$element.trigger(n,t):a.$element.trigger(n),n.isDefaultPrevented()||n.result===!1)return!1;switch(i){case"filebatchuploadcomplete":case"filebatchuploadsuccess":case"fileuploaded":case"fileclear":case"filecleared":case"filereset":case"fileerror":case"filefoldererror":case"fileuploaderror":case"filebatchuploaderror":case"filedeleteerror":case"filecustomerror":case"filesuccessremove":break;default:a.ajaxAborted||(a.ajaxAborted=n.result)}return!0},_listenFullScreen:function(e){var i,t,a=this,n=a.$modal;n&&n.length&&(i=n&&n.find(".btn-fullscreen"),t=n&&n.find(".btn-borderless"),i.length&&t.length&&(i.removeClass("active").attr("aria-pressed","false"),t.removeClass("active").attr("aria-pressed","false"),e?i.addClass("active").attr("aria-pressed","true"):t.addClass("active").attr("aria-pressed","true"),n.hasClass("file-zoom-fullscreen")?a._maximizeZoomDialog():e?a._maximizeZoomDialog():t.removeClass("active").attr("aria-pressed","false")))},_listen:function(){var t,a=this,n=a.$element,r=a.$form,o=a.$container;a._handler(n,"change",e.proxy(a._change,a)),a.showBrowse&&a._handler(a.$btnFile,"click",e.proxy(a._browse,a)),a._handler(o.find(".fileinput-remove:not([disabled])"),"click",e.proxy(a.clear,a)),a._handler(o.find(".fileinput-cancel"),"click",e.proxy(a.cancel,a)),a._initDragDrop(),a._handler(r,"reset",e.proxy(a.reset,a)),a.isUploadable||a._handler(r,"submit",e.proxy(a._submitForm,a)),a._handler(a.$container.find(".fileinput-upload"),"click",e.proxy(a._uploadClick,a)),a._handler(e(window),"resize",function(){a._listenFullScreen(screen.width===window.innerWidth&&screen.height===window.innerHeight)}),t="webkitfullscreenchange mozfullscreenchange fullscreenchange MSFullscreenChange",a._handler(e(document),t,function(){a._listenFullScreen(i.checkFullScreen())}),a._initClickable()},_initClickable:function(){var t,a=this;a.isClickable&&(t=a.isUploadable?a.$dropZone:a.$preview.find(".file-default-preview"),i.addCss(t,"clickable"),t.attr("tabindex",-1),a._handler(t,"click",function(i){var n=e(i.target);n.parents(".file-preview-thumbnails").length&&!n.parents(".file-default-preview").length||(a.$element.trigger("click"),t.blur())}))},_initDragDrop:function(){var i=this,t=i.$dropZone;i.isUploadable&&i.dropZoneEnabled&&i.showPreview&&(i._handler(t,"dragenter dragover",e.proxy(i._zoneDragEnter,i)),i._handler(t,"dragleave",e.proxy(i._zoneDragLeave,i)),i._handler(t,"drop",e.proxy(i._zoneDrop,i)),i._handler(e(document),"dragenter dragover drop",i._zoneDragDropInit))},_zoneDragDropInit:function(e){e.stopPropagation(),e.preventDefault()},_zoneDragEnter:function(t){var a=this,n=e.inArray("Files",t.originalEvent.dataTransfer.types)>-1;return a._zoneDragDropInit(t),a.isDisabled||!n?(t.originalEvent.dataTransfer.effectAllowed="none",void(t.originalEvent.dataTransfer.dropEffect="none")):void i.addCss(a.$dropZone,"file-highlighted")},_zoneDragLeave:function(e){var i=this;i._zoneDragDropInit(e),i.isDisabled||i.$dropZone.removeClass("file-highlighted")},_zoneDrop:function(e){var t=this;e.preventDefault(),t.isDisabled||i.isEmpty(e.originalEvent.dataTransfer.files)||(t._change(e,"dragdrop"),t.$dropZone.removeClass("file-highlighted"))},_uploadClick:function(e){var t,a=this,n=a.$container.find(".fileinput-upload"),r=!n.hasClass("disabled")&&i.isEmpty(n.attr("disabled"));if(!e||!e.isDefaultPrevented()){if(!a.isUploadable)return void(r&&"submit"!==n.attr("type")&&(t=n.closest("form"),t.length&&t.trigger("submit"),e.preventDefault()));e.preventDefault(),r&&a.upload()}},_submitForm:function(){var e=this;return e._isFileSelectionValid()&&!e._abort({})},_clearPreview:function(){var t=this,a=t.$preview,n=t.showUploadedThumbs?t.getFrames(":not(.file-preview-success)"):t.getFrames();n.each(function(){var t=e(this);t.remove(),i.cleanZoomCache(a.find("#zoom-"+t.attr("id")))}),t.getFrames().length&&t.showPreview||t._resetUpload(),t._validateDefaultPreview()},_initSortable:function(){var t,a=this,n=a.$preview,r="."+i.SORT_CSS;window.KvSortable&&0!==n.find(r).length&&(t={handle:".drag-handle-init",dataIdAttr:"data-preview-id",scroll:!1,draggable:r,onSort:function(t){var n,r,o=t.oldIndex,l=t.newIndex;a.initialPreview=i.moveArray(a.initialPreview,o,l),a.initialPreviewConfig=i.moveArray(a.initialPreviewConfig,o,l),a.previewCache.init();for(var s=0;s
    <% end %> - <%= yield %> - + <%= yield %>
    diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index aef41ab1..1ac499fd 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,7 +1,16 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %>
    -
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    <%= f.file_field :image_path, :class => "img-thumbnail" %>
    diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 9b90fec8..2edc1e50 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,7 +1,16 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %>
    -
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    <%= f.file_field :image_path, :class => "img-thumbnail" %>
    diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 461f6489..adb297d1 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -19,6 +19,9 @@ Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( settings.css ) +# --- Image Uploader ---- +Rails.application.config.assets.precompile += %w( fileinput.min.css ) + # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( CRM.css ) Rails.application.config.assets.precompile += %w( CRM.js ) @@ -26,3 +29,6 @@ Rails.application.config.assets.precompile += %w( CRM.js ) # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( jquery-confirm.css ) Rails.application.config.assets.precompile += %w( jquery-confirm.js ) + +# --- Image Uploader ---- +Rails.application.config.assets.precompile += %w( fileinput.min.js ) diff --git a/config/initializers/carrier_wave.rb b/config/initializers/carrier_wave.rb new file mode 100644 index 00000000..57807870 --- /dev/null +++ b/config/initializers/carrier_wave.rb @@ -0,0 +1 @@ +require 'carrierwave/orm/activerecord' \ No newline at end of file diff --git a/public/image/menu_images/default.png b/public/image/menu_images/default.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e616915a0092eebe86fb03492d432df762dd9 GIT binary patch literal 5031 zcmV;Y6IkqtP)=6J8S`pvvI{d)Rc zqnXhtMORTsdVT-;JNo;&zb3eo3Tg&OLG|WNXK)9Q0$T*GfNWX6<9QJBLV@+$TX!fb z2+*cdy!wx?)wg*oWS{HbH#F4+D4wSTwVBpMDB1!lUVZro^%rDy*aGs(#-<9Yl0B5t zd6_m|P~|k#H@sHAGt)k8-O#idz;`n(FO=)mfT#bVvA#vD&lZp^8=AHe;P124fr6+e z5XTI=mFd*MEgPEF65!Wa9z<^-jt9m5*aEV3L(@$F6|56e@0*U`O6W=IaZrEPGjqi^X5S>>7?;9DP{g=@xLRkMV9B#*G-AeDDlVaeAL6VKA_t#6t?+m!+6o`%MC zb*_MHUEj131h24+<)4~_mET&8V8B)W`xs*WvR=N}jr~7(%WSZrvEJ7}{_Ulv1xf%% zjS5ybJY&{%ZvQE?A2_Z5?gR*r#k zTZ3r%@ow7%B3&(8H|%Huh)#cZKQb40e|8=ifs8FuP#ge?6#}I|DJH5?L{y5QI7K+F z=>tFV+OHA4J*fYz0V`zMjUCPM+LcHJJcZ0$dLL#jn`2gU@aKEbbGbVW5Rsj!8Xn|T zaycODo6aMtYtMdWIVxw}oj)FvgO*Od{to&sT{CL_=Z405rowtkytX-Y&ZjVc^+RU4 z!@Kt5+Q*;hzdHePU)_AvE}AK&9&v%#P)JIM&H2VEU5C} z)ceQKaim>JJv^%u7f2c)ybvoYAA^N2Jw56Hxqa~(PW|j1V;sE=jr9|}4vJTKdEv~; zJIM(r`NFHqqUxIl2rtCSrcc8C&#m&>_kztAxix^J-`{2S&#UU|r1G-L-f8>|;*pqC zaPxpnx_1f|tzBle@1**s0kUQNj-7;%=UM5=i$9GSD;F2+MEmI&uljn`w0Le2EDB=P zx7S#jT@QWQ&$tUVuSL`HXlQg&dD%dDKvr#d3c=!# zIsU8dT{zNwK>uA-m&LNY>MLVerVXohw@w0ZMU^r4IvFZ$gbkrTt=g z$4<72iI3iB!OiwgBflrr*Gc6SCzap9vu`|Gk^#bR9C?bB0b<&1Mid3EaR$h|b*UY4 z&)G{j`>X$R?B47ze-4$ir<-{$e{dX^_x&mHJEhGH+t;mi8=sTPd;8ig?E8;*%_^J# zVU)uth)=viz^lF%Kt!XWTZi-c{fjdyFeVhxo7~sghpvHyFttlHWkq;+$~g1$gJTr zq*yhx-cSizqYAF534p{@8PM=Zv5JXGir87+x5Gg*s~1hnN#*4MVW#&-ziHJ*nfArB zFe8b8*r~o&KscjfO%cIk6H-EoQVKO32Biu6&}d9M`%`kr&B!RKyrR%{lM!rwc%kn| zL7dgs3ds5$yFiGp+btZcV9_|mGVhuihdMMg8nMv({Ca-~vE;c9H`P~U-%cxBCbUIB zc%KOSW~cfJ6p~VTmzM`IyEL68s6&I$)X_;LyTd_TO|dygP0LN?b=qebE7obBA_8Wp zz9P#qneLMlLYPvNZhKT?QD{-Qx>@L?b1gxdI=%=u{_y6gn`l%qnK41KoRJu)3)9V zE4ZY(??c>F-fS*3QT4UmsV^-H;(;-8M)1a9%2?`TT;u_<+l6O~N*GJ)I(5;g&I*X- z#0deIV0TMr`l9$CxlbHND84ebFe&Du8o>W1&F_@bj!oOw*kg5y74J8=Q|;S!5m4Cm&Oa0W&LcR2vNgy>fw+B&$igOMUUZd z0qH!^f#bh74)3LGYw3V+UPGqde!bedA2B-eR!`j_XD5bZQ5UG86TYaxnV{Eq`AhgBMI$2(Jn40Y;hMUsBptM5?kp-+zX@Ic1g=&mm zFgjxA7r7A8aNu?vWeUNniXe&u1iWdUt;QaWpfW%$8_eMjCX@2bgCX415<_)kSA6}9 zbrDK;@t{n*zXtOj&-|>~@wY!j=gAJU8MZ()O6rUg@KOQ63$<|pg0EN0*_Lc_n6D%p zjpFUW5PB#NB+%Y%UJzNQtqR2-DP^+cnTa8cQ|vV^qoorA zDh~9g43G~OshCq_HAuRx%4~hN8Wa6r*5UiXSh*J0K`}29GE)dMEE;zXW&LI*7Ip#D zI0Nj)Hf?8ElqEIA0X$ZbIz}UFJfczj^m>XKri6giW8xMcJUhbk`*4ByF;G^#xLV4-L~E{IuZxD~xa7riT6O~77y$E?{P&FnAdIU1 zx+Hl5;*Tq)S0_&4ajCPd zy}I+rIsHNj6W)}NwQkqxTzQbFkJ}x7F#5r?udXP??2-VgxJ@N9vvh`|*xjG9k9{de z6tZ_nL3^A#!X&v5?sf9*^6?(U&#ZnJWp`DkW$irLj;^-Er5&&G%M}ojb+MJtKyli^ z+YO@SRt)Ec5_^}s6iweqW;w|41M*P)1z1%jl` zZAYFdP$Lcq>$vPNwws_A2h0S2SumY2*)dfbi}?nI(cA|^L0pQbWD~RIYLu+aMo1V*L@N~D)6U*W|#V7@ovTJXNfFA&uO1!L0@w88ITagSHEi$BQWNwL>)DI0QDW{WO zAh(pkTF4L(csX(J8xWaHVSi&RZ0=Y^Kcqd}8VORT~qVZ2fMsHAQLBQ zcyyV)V$%HEl#?%K6e3|^+Xx}4>qS`r#$q{k1cL4f#K{Yp1SZQA9R8Tl)F~>~JY{dI z`~DA0%x1h8HZx*b;z0DhN*tSI5$H0d7zW5tG-^u`OmKscjhh_HZ?mPiX8Eu$XiFYDR< zasUy0^*kWg|MX{k{JTW37O%d8tk1N^3i+7Ez9_^)NRPZyh-h-)0kH-d^B48a<2+_9 zn-}Ml(b(0K9k_TX5lYs}LK`tal%fzG`p&cFB=LY`8t^!4GwxE67t^~@gDw>>Yk5d);^ff<+x`6w7bqqmNM`Z@)re&5mTO@r%WP;W@(;1S7Twj8BmB@oUXi52!EFP7P|7xL@Eo*}T^@ zFuINF4j{hZ04(m?1v4@2!PKh5ZZJP>c+a_P6$<`-FLM%hj2a?FHkdK1-B` z&o9IT4{xh<96XI{r_6hWj^oO+3~_!a#_AJscjkDRz-;I7;|np`_T!`)F+k?lKam!n zod?7%CStZH+G~A&d?7MG+-`D>7$CBjdq#uT(2p-fP9e^|o;!eeC5>c0FBf&hD*asC z$r~VE-nQyFcNu5jG@dLiOs}CIUx)#WA177b0O5^tqPNiKxW!53!FS+uaSuDYUtfp} z5I1jV-T>k4Saxq)iEl-@8RCXL!#*qU>kE-nh_g>5FMuQ?L$LQ`_2+t=o>Jmp<)px_ zO^x*h^GqBMNN8*c7CdWtSJ)QbXkQq|-blS3?d0ppIUvbFu(!x{Fc`a9xPEQg6Gp~p ztjB@$nBY4DA-p_N2dnv6&cqjDl=teS$_XIf`}U6I8YS%ZD|;B;vW&bu+QOTZs-UZ_bxz3uVS&o*7FbpQVE|A{>L^er0>BUG-Y+gi_1t@0IXCmK zGf)Pv*@U#BxB#Gqg0|!npiF!rGC-Uxz8L|Myr9G0I!vPg*=#c*KK--veZQ&8Hj1CL zo-v(Pwn!!cBA~mzvwdB&E8-bu-~p+aUX58R7kRGf@PEDwEta_YmQ_H!zEf2^r4l7m zt5G^*3W}=AJ$GEps6}H4pTB}|=XFH7Zb0o1JJ!Y2N+pC9xsW+LAQSJMihDjc&-1uW z?AnL$&A#jcVt4zLgn}rUIuS)x6)2uorT?6(r1lMBsOttI-M0|w>PGBF;t_d1x#{|u z_O0Mp7Vn%1m5sr;x%Z%WYSpkPAk)b)$}tLJloS4Q7y8d$PF3e2(52tDdG4ST1u_4t zbzuLyrNN#)oNV4_X3Lt|%bN|RJ+~4{ne_<=w~podd(Znv(f`pUy_sBCi^V`ZUL92D z-aCTci`NpvcR2y?OQ`dJOkVRyuIJZx{rzVyVju~Kmy_nc8vq~%Fmt<(U_Jdl%m8L$ zhxuUrnG7b+Wpd(i6sd%bi5+y9Jg3&ezS!=(0gfQ+uoV*1(-D?J>nU0&aS Date: Tue, 15 Aug 2017 17:04:46 +0630 Subject: [PATCH 145/246] update show for foc --- app/views/origami/payments/show.html.erb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 68f843a7..36c4cc0e 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -454,17 +454,12 @@ $('#foc').click(function() { $.ajax({type: "POST", url: "<%= origami_payment_foc_path %>", data: params, - success:function(result){ - localStorage.removeItem("cash"); - if (result.status) { - var msg = result.message; - } - else{ - var msg = ''; - } - $( "#loading_wrapper" ).hide(); + success:function(result){ - $.confirm({ + $( "#loading_wrapper" ).hide(); + + if (cash > 0) { + $.confirm({ title: 'Infomation!', content: 'Thank you !', buttons: { @@ -477,6 +472,7 @@ $('#foc').click(function() { } } }); + } } }); From 67c005a836b776b4676d430e29b7cf618d93abd5 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 15 Aug 2017 17:23:14 +0630 Subject: [PATCH 146/246] fixed --- app/pdf/close_cashier_pdf.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 8e56bed3..34a9779c 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,7 +1,7 @@ class CloseCashierPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shift_sale,shop_details,sale_taxes) + def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height self.margin = 5 @@ -27,16 +27,11 @@ class CloseCashierPdf < Prawn::Document self.header_font_size = 10 self.item_font_size = 8 - - header( shop_details) stroke_horizontal_rule - shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) - - - + shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) end def header (shop_details) From b2f00358f102134d09b5e0ac48dffc08c13b1ece Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 17:24:06 +0630 Subject: [PATCH 147/246] update ability for setmenu --- app/controllers/settings/item_sets_controller.rb | 2 +- app/controllers/settings/menu_item_sets_controller.rb | 2 +- app/models/ability.rb | 2 ++ app/views/settings/menu_item_sets/index.html.erb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 5c089c31..5564ed98 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -1,6 +1,6 @@ class Settings::ItemSetsController < ApplicationController before_action :set_settings_item_set, only: [:show, :edit, :update, :destroy] - + load_and_authorize_resource except: [:create] # GET /settings/item_sets # GET /settings/item_sets.json def index diff --git a/app/controllers/settings/menu_item_sets_controller.rb b/app/controllers/settings/menu_item_sets_controller.rb index 917e5330..eb710e8c 100644 --- a/app/controllers/settings/menu_item_sets_controller.rb +++ b/app/controllers/settings/menu_item_sets_controller.rb @@ -1,6 +1,6 @@ class Settings::MenuItemSetsController < ApplicationController before_action :set_settings_menu_item_set, only: [:show, :edit, :update, :destroy] - + load_and_authorize_resource except: [:create] # GET /settings/menu_item_sets # GET /settings/menu_item_sets.json def index diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..d94fef43 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -16,6 +16,8 @@ class Ability can :manage, MenuItemInstance can :manage, MenuItemOption can :manage, SetMenuItem + can :manage, ItemSet + can :manage, MenuItemSet can :manage, OrderQueueStation can :manage, Zone can :manage, CashierTerminal diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb index 95b5dbe9..0a2e50d2 100644 --- a/app/views/settings/menu_item_sets/index.html.erb +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -26,7 +26,7 @@ <%= item.menu_item.name %> <%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> - <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> + <%= link_to 'Destroy', settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> <% end %> From 3e9b9c6b8b3a428818b16da5be0c50d99947489b Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 16 Aug 2017 10:46:03 +0630 Subject: [PATCH 148/246] CalculatePriceInDiningCharges --- .../settings/dining_charges_controller.rb | 2 +- .../settings/dining_charges/_form.html.erb | 43 +++++++++++++++++-- .../settings/dining_charges/new.html.erb | 6 +-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 31763b02..854354c2 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -97,6 +97,6 @@ class Settings::DiningChargesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def dining_charge_params # params.fetch(:dining_charge, {}) - params.require(:dining_charge).permit(:item_code, :unit_price, :taxable, :charge_type,:minimum_free_time ,:charge_block,:time_rounding,:time_rounding_block, :zone_id) + params.require(:dining_charge).permit(:item_code, :unit_price, :taxable, :charge_type,:minimum_free_time ,:charge_block,:time_rounding,:time_rounding_block, :zone_id, :time_rounding_block_price) end end diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index 2349025a..5cc25062 100644 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -3,13 +3,14 @@
    <%= f.input :item_code, :input_html => { :id => 'item_code' } %> - <%= f.input :unit_price %> + <%= f.input :unit_price, :input_html => { :id => 'unit_price'} %> <%= f.input :taxable %> <%= f.input :charge_type, :collection => [:hr, :day] %> <%= f.input :minimum_free_time %> - <%= f.input :charge_block %> + <%= f.input :charge_block, :input_html => { :id => 'charge_block'} %> <%= f.input :time_rounding %> - <%= f.input :time_rounding_block %> + <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %> + <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %>
    @@ -17,3 +18,39 @@
    <% end %> + diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb index 2aa13a4b..bece2a2e 100644 --- a/app/views/settings/dining_charges/new.html.erb +++ b/app/views/settings/dining_charges/new.html.erb @@ -16,8 +16,9 @@
    <%= render 'form', dining_charge: @dining_charge %>
    + \ No newline at end of file From db43ae186c45812bc9213e58f320ca5fae1d15e1 Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 16 Aug 2017 11:00:37 +0630 Subject: [PATCH 149/246] DB for promtion, promotion product,product --- config/routes.rb | 3 +++ db/migrate/20170815044557_create_promotion.rb | 18 ++++++++++++++++++ .../20170815051517_create_promotion_product.rb | 13 +++++++++++++ db/migrate/20170816042256_create_product.rb | 17 +++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 db/migrate/20170815044557_create_promotion.rb create mode 100644 db/migrate/20170815051517_create_promotion_product.rb create mode 100644 db/migrate/20170816042256_create_product.rb diff --git a/config/routes.rb b/config/routes.rb index 9e62023c..241c3826 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -264,6 +264,9 @@ Rails.application.routes.draw do end end + #promotion + resources :promotions + end #--------- Transactions Sections ------------# diff --git a/db/migrate/20170815044557_create_promotion.rb b/db/migrate/20170815044557_create_promotion.rb new file mode 100644 index 00000000..124ad8d9 --- /dev/null +++ b/db/migrate/20170815044557_create_promotion.rb @@ -0,0 +1,18 @@ +class CreatePromotion < ActiveRecord::Migration[5.1] + def change + create_table :promotions do |t| + t.string :promo_code, :limit => 16 + + t.datetime :promo_start_date, :null => false + t.datetime :promo_end_date, :null => false + t.time :promo_start_hour, :null => false + t.time :promo_end_hour, :null => false + t.string :promo_day, :null => false, :default => "[0,1,2,3,4,5,6]" + t.string :promo_type, :null => false, :default => "Quantity" + t.string :original_product + t.integer :min_qty + t.string :created_by, :null => false + t.timestamps + end + end +end diff --git a/db/migrate/20170815051517_create_promotion_product.rb b/db/migrate/20170815051517_create_promotion_product.rb new file mode 100644 index 00000000..dbbc198a --- /dev/null +++ b/db/migrate/20170815051517_create_promotion_product.rb @@ -0,0 +1,13 @@ +class CreatePromotionProduct < ActiveRecord::Migration[5.1] + def change + create_table :promotion_products do |t| + t.references :promotion, foreign_key: true + t.string :item_code, :null => false + t.integer :min_qty + t.integer :net_off + t.integer :net_price + t.integer :percentage + t.timestamps + end + end +end diff --git a/db/migrate/20170816042256_create_product.rb b/db/migrate/20170816042256_create_product.rb new file mode 100644 index 00000000..a329d69b --- /dev/null +++ b/db/migrate/20170816042256_create_product.rb @@ -0,0 +1,17 @@ +class CreateProduct < ActiveRecord::Migration[5.1] + def change + create_table :products do |t| + t.string :item_code, :limit => 16 + + t.string :name, :null => false + t.string :alt_name + t.integer :unit_price + t.string :image_path + t.string :description + t.string :information + t.boolean :taxable + t.string :created_by, :null => false + t.timestamps + end + end +end From 4fc748e877512213d373b132e292fe70c8807994 Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 16 Aug 2017 18:19:20 +0630 Subject: [PATCH 150/246] CRUDforProducts --- .../settings/products_controller.rb | 76 +++++++++++++++++++ app/models/product.rb | 3 + app/views/layouts/_header.html.erb | 2 + app/views/settings/products/_form.html.erb | 18 +++++ .../products/_settings_product.json.jbuilder | 2 + app/views/settings/products/edit.html.erb | 10 +++ app/views/settings/products/index.html.erb | 45 +++++++++++ .../settings/products/index.json.jbuilder | 1 + app/views/settings/products/new.html.erb | 26 +++++++ app/views/settings/products/show.html.erb | 33 ++++++++ .../settings/products/show.json.jbuilder | 1 + config/routes.rb | 2 + ...rb => 20170816042256_settings_products.rb} | 2 +- 13 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 app/controllers/settings/products_controller.rb create mode 100644 app/models/product.rb create mode 100644 app/views/settings/products/_form.html.erb create mode 100644 app/views/settings/products/_settings_product.json.jbuilder create mode 100644 app/views/settings/products/edit.html.erb create mode 100644 app/views/settings/products/index.html.erb create mode 100644 app/views/settings/products/index.json.jbuilder create mode 100644 app/views/settings/products/new.html.erb create mode 100644 app/views/settings/products/show.html.erb create mode 100644 app/views/settings/products/show.json.jbuilder rename db/migrate/{20170816042256_create_product.rb => 20170816042256_settings_products.rb} (87%) diff --git a/app/controllers/settings/products_controller.rb b/app/controllers/settings/products_controller.rb new file mode 100644 index 00000000..0c2fa15d --- /dev/null +++ b/app/controllers/settings/products_controller.rb @@ -0,0 +1,76 @@ +class Settings::ProductsController < ApplicationController + before_action :set_settings_product, only: [:show, :edit, :update, :destroy] + + # GET /settings/products + # GET /settings/products.json + def index + @settings_products = Product.all + end + + # GET /settings/products/1 + # GET /settings/products/1.json + def show + end + + # GET /settings/products/new + def new + @settings_product = Product.new + end + + # GET /settings/products/1/edit + def edit + end + + # POST /settings/products + # POST /settings/products.json + def create + + @settings_product = Product.new(settings_product_params) + @settings_product.created_by = current_user.name + respond_to do |format| + if @settings_product.save + format.html { redirect_to settings_products_path, notice: 'Product was successfully created.' } + format.json { render :show, status: :created, location: @settings_product } + else + format.html { render :new } + format.json { render json: @settings_product.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/products/1 + # PATCH/PUT /settings/products/1.json + def update + respond_to do |format| + if @settings_product.update(settings_product_params) + format.html { redirect_to settings_product_path, notice: 'Product was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_product } + else + format.html { render :edit } + format.json { render json: @settings_product.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/products/1 + # DELETE /settings/products/1.json + def destroy + @settings_product.destroy + respond_to do |format| + format.html { redirect_to settings_products_path, notice: 'Product was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_product + @settings_product = Product.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_product_params + params.require(:product).permit(:item_code, :name, :alt_name, :unit_price, :image_path, :description, :information, :taxable,:created_by) + end + +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 00000000..042e1730 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,3 @@ +class Product < ApplicationRecord + validates_presence_of :name +end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bc5ce498..441cfe91 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -28,6 +28,8 @@
  • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
  • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • +
    +
  • <%= link_to "Products", settings_products_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb new file mode 100644 index 00000000..37a049c6 --- /dev/null +++ b/app/views/settings/products/_form.html.erb @@ -0,0 +1,18 @@ +<%= simple_form_for([:settings,@settings_product]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :item_code, :input_html => { :id => 'item_code' } %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :unit_price %> + <%= f.input :image_path %> + <%= f.input :description %> + <%= f.input :information %> + +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/products/_settings_product.json.jbuilder b/app/views/settings/products/_settings_product.json.jbuilder new file mode 100644 index 00000000..608fdefb --- /dev/null +++ b/app/views/settings/products/_settings_product.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_product, :id, :created_at, :updated_at +json.url settings_product_url(settings_product, format: :json) diff --git a/app/views/settings/products/edit.html.erb b/app/views/settings/products/edit.html.erb new file mode 100644 index 00000000..634381df --- /dev/null +++ b/app/views/settings/products/edit.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', settings_product: @settings_product %> +
    diff --git a/app/views/settings/products/index.html.erb b/app/views/settings/products/index.html.erb new file mode 100644 index 00000000..3f49a401 --- /dev/null +++ b/app/views/settings/products/index.html.erb @@ -0,0 +1,45 @@ +
    +
      +
    • Home
      • +
    • Product
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_product_path,:class => 'btn btn-primary btn-sm' %> + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + <% @settings_products.each do |settings_product| %> + + + + + + + + + + + + + <% end %> + +
    Item CodeNameAlt NameUnit PriceDescriptionInformationTaxable
    <%= settings_product.item_code %><%= settings_product.name %><%= settings_product.alt_name %><%= settings_product.unit_price %><%= settings_product.description %><%= settings_product.information %><%= settings_product.taxable %><%= link_to 'Show', settings_product_path(settings_product) %><%= link_to 'Edit', edit_settings_product_path(settings_product) %><%= link_to 'Destroy', settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/products/index.json.jbuilder b/app/views/settings/products/index.json.jbuilder new file mode 100644 index 00000000..bc08f2a7 --- /dev/null +++ b/app/views/settings/products/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_products, partial: 'settings_products/settings_product', as: :settings_product diff --git a/app/views/settings/products/new.html.erb b/app/views/settings/products/new.html.erb new file mode 100644 index 00000000..e971f70d --- /dev/null +++ b/app/views/settings/products/new.html.erb @@ -0,0 +1,26 @@ +
    +
    + +
    + <%= render 'form', settings_product: @settings_product %> +
    + + diff --git a/app/views/settings/products/show.html.erb b/app/views/settings/products/show.html.erb new file mode 100644 index 00000000..f16b5426 --- /dev/null +++ b/app/views/settings/products/show.html.erb @@ -0,0 +1,33 @@ +
    + +
    +
    +
    +

    Product

    + + + + + + + + + + + + + + + + +
    Item code<%= @settings_product.item_code %>
    Name<%= @settings_product.name %>
    Alt name<%= @settings_product.alt_name %>
    Unit price<%= @settings_product.unit_price %>
    Image path<%= image_tag @settings_product.image_path, :size => '200x200'%>
    Description<%= @settings_product.description %>
    Information<%= @settings_product.information %>
    Taxable<%= @settings_product.taxable %>
    <%= link_to 'Edit', edit_settings_product_path(@settings_product) %><%= link_to 'Destroy', settings_product_path(@settings_product), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    + +
    diff --git a/app/views/settings/products/show.json.jbuilder b/app/views/settings/products/show.json.jbuilder new file mode 100644 index 00000000..aef1705d --- /dev/null +++ b/app/views/settings/products/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_products/settings_product", settings_product: @settings_product diff --git a/config/routes.rb b/config/routes.rb index 51431474..93a7985a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -237,6 +237,8 @@ Rails.application.routes.draw do resources :menu_item_options #tax_profiles resources :tax_profiles + #products + resources :products #lookups resources :lookups #cashier_terminals diff --git a/db/migrate/20170816042256_create_product.rb b/db/migrate/20170816042256_settings_products.rb similarity index 87% rename from db/migrate/20170816042256_create_product.rb rename to db/migrate/20170816042256_settings_products.rb index a329d69b..69c790fc 100644 --- a/db/migrate/20170816042256_create_product.rb +++ b/db/migrate/20170816042256_settings_products.rb @@ -1,4 +1,4 @@ -class CreateProduct < ActiveRecord::Migration[5.1] +class SettingsProducts < ActiveRecord::Migration[5.1] def change create_table :products do |t| t.string :item_code, :limit => 16 From 0eee1fd0af3f1a0c0f1fc734326c457c07c2fa4e Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 16 Aug 2017 18:26:30 +0630 Subject: [PATCH 151/246] menu ui update --- app/assets/stylesheets/settings.scss | 4 ++ .../settings/set_menu_items_controller.rb | 58 +++++++++++++-- .../settings/simple_menu_items_controller.rb | 59 +++++++++++++-- app/models/menu_item.rb | 6 +- app/views/crm/customers/_form.html.erb | 1 - app/views/crm/customers/index.html.erb | 3 +- app/views/settings/item_sets/_form.html.erb | 1 + app/views/settings/item_sets/edit.html.erb | 1 - app/views/settings/item_sets/new.html.erb | 1 - .../settings/set_menu_items/_form.html.erb | 68 +++++++++++------- .../settings/set_menu_items/edit.html.erb | 26 ++++++- .../settings/set_menu_items/new.html.erb | 2 +- .../settings/simple_menu_items/_form.html.erb | 67 ++++++++++------- .../settings/simple_menu_items/edit.html.erb | 28 ++++++-- .../settings/simple_menu_items/new.html.erb | 6 +- .../20170331024749_create_menu_items.rb | 11 +-- .../20170628103624_create_print_settings.rb | 6 +- ...1543_remove_d_bcols_from_print_settings.rb | 8 --- ...d_Dome_dish_kitchen_restaurant_1886917.png | Bin 0 -> 6195 bytes 19 files changed, 260 insertions(+), 96 deletions(-) delete mode 100644 db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb create mode 100644 public/image/menu_images/if_Dish_food_Dome_dish_kitchen_restaurant_1886917.png diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index 2660d836..ec02f7c4 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -56,4 +56,8 @@ ul.dropdown-menu li a{ .menu-item-img { margin: 10px; text-align: center; + } + + .padding-10 { + padding: 10px; } \ No newline at end of file diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 73e8b4eb..64b9c945 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -1,6 +1,8 @@ class Settings::SetMenuItemsController < 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_item_attribute, only: [:index, :show, :edit, :new, :update ,:create] + before_action :set_settings_item_option, only: [:index, :show, :edit, :new, :update ,:create] # GET /settings/menu_items # GET /settings/menu_items.json def index @@ -18,22 +20,43 @@ class Settings::SetMenuItemsController < ApplicationController def new @settings_menu_item = MenuItem.new @settings_menu_item.type = "SetMenuItem" + @item_sets = ItemSet.all end # GET /settings/menu_items/1/edit def edit + @item_sets = ItemSet.all end # POST /settings/menu_items # POST /settings/menu_items.json def create @settings_menu_item = MenuItem.new(settings_menu_item_params) - if params[:simple_menu_item][:menu_item_id] == '' - @settings_menu_item.menu_category_id = params[:menu_category_id] - end + + # if params[:simple_menu_item][:menu_item_id] == '' + @settings_menu_item.menu_category_id = params[:menu_category_id] + # end @settings_menu_item.created_by = current_login_employee.name + + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) respond_to do |format| if @settings_menu_item.save + menu_item = MenuItem.find(@settings_menu_item.id) + menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } else @@ -46,8 +69,27 @@ class Settings::SetMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1 # PATCH/PUT /settings/menu_items/1.json def update + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) + + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + @settings_menu_item.menu_category_id = params[:menu_category_id] + respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) + @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item } else @@ -79,8 +121,16 @@ class Settings::SetMenuItemsController < ApplicationController @category = MenuCategory.find(params[:menu_category_id]) end + def set_settings_item_attribute + @item_attributes = MenuItemAttribute.all.order("id asc").map{|a| [a.name, a.value]} + end + + def set_settings_item_option + @item_options = MenuItemOption.all + end + # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) end end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 3fa1945d..9d3ac5ed 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -1,6 +1,8 @@ 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 ,:create] + before_action :set_settings_item_attribute, only: [:index, :show, :edit, :new, :update ,:create] + before_action :set_settings_item_option, only: [:index, :show, :edit, :new, :update ,:create] # GET /settings/menu_items # GET /settings/menu_items.json def index @@ -16,11 +18,13 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/new def new - @settings_menu_item = MenuItem.new + @settings_menu_item = MenuItem.new + @item_sets = ItemSet.all end # GET /settings/menu_items/1/edit - def edit + def edit + @item_sets = ItemSet.all end # POST /settings/menu_items @@ -28,13 +32,30 @@ class Settings::SimpleMenuItemsController < ApplicationController def create @settings_menu_item = MenuItem.new(settings_menu_item_params) - if params[:simple_menu_item][:menu_item_id] == '' - @settings_menu_item.menu_category_id = params[:menu_category_id] - end + # if params[:simple_menu_item][:menu_item_id] == '' + @settings_menu_item.menu_category_id = params[:menu_category_id] + # end @settings_menu_item.created_by = current_login_employee.name + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) respond_to do |format| if @settings_menu_item.save + menu_item = MenuItem.find(@settings_menu_item.id) + menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } else @@ -47,8 +68,26 @@ class Settings::SimpleMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1 # PATCH/PUT /settings/menu_items/1.json def update + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) + + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + @settings_menu_item.menu_category_id = params[:menu_category_id] + respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) + @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item } else @@ -80,8 +119,16 @@ class Settings::SimpleMenuItemsController < ApplicationController @category = MenuCategory.find(params[:menu_category_id]) end + def set_settings_item_attribute + @item_attributes = MenuItemAttribute.all.order("id asc") #.map{|a| [a.name, a.value]} + end + + def set_settings_item_option + @item_options = MenuItemOption.all + end + # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 2f575d9f..8213ae88 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -3,14 +3,14 @@ class MenuItem < ApplicationRecord 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" + # belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true + # has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account has_many :menu_item_sets has_many :item_sets, through: :menu_item_sets - validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item + validates_presence_of :name, :type, :min_qty, :taxable default_scope { order('item_code asc') } diff --git a/app/views/crm/customers/_form.html.erb b/app/views/crm/customers/_form.html.erb index c913651a..e9cef629 100644 --- a/app/views/crm/customers/_form.html.erb +++ b/app/views/crm/customers/_form.html.erb @@ -1,4 +1,3 @@ - <%= simple_form_for([:crm,@crm_customer]) do |f| %> <%= f.error_notification %> diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 14e38822..71772c92 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -124,7 +124,7 @@ $(document).on('click',".customer_tr",function(){ var url = "customers/" + customer_id + "/edit"; } - $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});; + $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'}); $.ajax({ type: "GET", @@ -135,7 +135,6 @@ $(document).on('click',".customer_tr",function(){ // Selected for Taxes var taxes = JSON.stringify(data.tax_profiles); var parse_taxes = JSON.parse(taxes); - console.log(parse_taxes); $.each(parse_taxes, function(i, value){ $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); }); diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index e28cab09..28441ea5 100644 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -9,5 +9,6 @@
    <%= f.button :submit ,:class=>'btn btn-success'%> + <%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %>
    <% end %> diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb index 2f0d54ba..55a86645 100644 --- a/app/views/settings/item_sets/edit.html.erb +++ b/app/views/settings/item_sets/edit.html.erb @@ -1,4 +1,3 @@

    Editing Settings Item Set

    <%= render 'form', settings_item_set: @settings_item_set %> -<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb index ff581dc6..003b758d 100644 --- a/app/views/settings/item_sets/new.html.erb +++ b/app/views/settings/item_sets/new.html.erb @@ -2,4 +2,3 @@ <%= render 'form', settings_item_set: @settings_item_set %> -<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index 1ac499fd..f243fb74 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,36 +1,52 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> -
    + +
    -
    - <% if f.object.image_path? %> -

    <%= f.object.name %>

    - <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> - <% else %> -

    Menu Item Image

    - <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :min_qty %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> +
    +
    + <%= f.input :is_available, :class => "form-control" %> + + <%= f.input :is_sub_item, :class => "form-control" %> + + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true }, :class => "form-control item_attributes" %> + + <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true }, :class => "form-control item_options" %> +
    +
    +
    + +
    +
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %>
    - <%= f.file_field :image_path, :class => "img-thumbnail" %>
    -
    -
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> +
    +
    + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
    -
    -
    - <%= f.button :submit %> +
    + <%= f.button :submit %> +
    <% end %> diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index 158b7c1c..6a4eb567 100644 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -1,5 +1,3 @@ - -
      @@ -8,5 +6,27 @@
    • Edit
    - <%= render 'form', settings_set_menu_item: @settings_menu_item %> + + <%= render 'form', settings_set_menu_item: @settings_menu_item, item_sets: @item_sets %>
    + + \ No newline at end of file diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb index c7d277bf..f0eaf2df 100644 --- a/app/views/settings/set_menu_items/new.html.erb +++ b/app/views/settings/set_menu_items/new.html.erb @@ -11,5 +11,5 @@
  • New
    • - <%= render 'form', settings_set_menu_item: @settings_menu_item %> + <%= render 'form', settings_set_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>
    diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 2edc1e50..721c7230 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,35 +1,52 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> -
    + +
    -
    - <% if f.object.image_path? %> -

    <%= f.object.name %>

    - <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> - <% else %> -

    Menu Item Image

    - <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :min_qty %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> +
    +
    + <%= f.input :is_available, :class => "form-control" %> + + <%= f.input :is_sub_item, :class => "form-control" %> + + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true }, :class => "form-control item_attributes" %> + + <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true }, :class => "form-control item_options" %> +
    +
    +
    + +
    +
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %>
    - <%= f.file_field :image_path, :class => "img-thumbnail" %>
    -
    -
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> +
    +
    + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
    -
    -
    - <%= f.button :submit %> +
    + <%= f.button :submit %> +
    <% end %> diff --git a/app/views/settings/simple_menu_items/edit.html.erb b/app/views/settings/simple_menu_items/edit.html.erb index 07849c07..84c60e04 100644 --- a/app/views/settings/simple_menu_items/edit.html.erb +++ b/app/views/settings/simple_menu_items/edit.html.erb @@ -1,7 +1,3 @@ - -
      @@ -10,5 +6,27 @@
    • Edit
    - <%= render 'form', settings_simple_menu_item: @settings_menu_item %> + + <%= render 'form', settings_simple_menu_item: @settings_menu_item, item_sets: @item_sets %>
    + + diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index 9e18525b..158e7d52 100644 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -10,5 +10,9 @@
  • New
    • - <%= render 'form', settings_simple_menu_item: @settings_menu_item %> +
    +
    + <%= render 'form', settings_simple_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %> +
    +
    diff --git a/db/migrate/20170331024749_create_menu_items.rb b/db/migrate/20170331024749_create_menu_items.rb index ce6d1486..75897d52 100644 --- a/db/migrate/20170331024749_create_menu_items.rb +++ b/db/migrate/20170331024749_create_menu_items.rb @@ -1,4 +1,3 @@ - class CreateMenuItems < ActiveRecord::Migration[5.1] def change create_table :menu_items do |t| @@ -10,12 +9,16 @@ class CreateMenuItems < ActiveRecord::Migration[5.1] t.string :information t.string :type, :null => false, :default => "SimpleMenuItem" t.references :menu_category, foreign_key: true - t.references :menu_item, foreign_key: true + t.json :item_attributes + t.json :item_options + # t.references :menu_item, foreign_key: true t.references :account, foreign_key: true t.integer :min_qty, :null => false, :default => 1 t.boolean :taxable, :null => false, :default => true - t.integer :min_selectable_item, :null => false, :default => 1 - t.integer :max_selectable_item, :null => false, :default => 1 + t.boolean :is_sub_item, :null => false, :default => false + t.boolean :is_available, :null => false, :default => true + # t.integer :min_selectable_item, :null => false, :default => 1 + # t.integer :max_selectable_item, :null => false, :default => 1 t.string :created_by t.timestamps diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb index aca49a0d..28c0ae57 100644 --- a/db/migrate/20170628103624_create_print_settings.rb +++ b/db/migrate/20170628103624_create_print_settings.rb @@ -3,11 +3,7 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1] create_table :print_settings do |t| t.string :name, :null => false t.string :unique_code, :null => false - t.string :template - t.string :db_name - t.string :db_type - t.string :db_username - t.string :db_password + t.string :template t.string :printer_name, :null => false t.string :api_settings t.decimal :page_width, :null => false, :default => 200 diff --git a/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb b/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb deleted file mode 100644 index 48a7de5d..00000000 --- a/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class RemoveDBcolsFromPrintSettings < ActiveRecord::Migration[5.1] - def change - remove_column :print_settings, :db_name, :string - remove_column :print_settings, :db_type, :string - remove_column :print_settings, :db_username, :string - remove_column :print_settings, :db_password, :string - end -end diff --git a/public/image/menu_images/if_Dish_food_Dome_dish_kitchen_restaurant_1886917.png b/public/image/menu_images/if_Dish_food_Dome_dish_kitchen_restaurant_1886917.png new file mode 100644 index 0000000000000000000000000000000000000000..0c364b22b1963415a7b33961eed94b45ebbdc97d GIT binary patch literal 6195 zcmV-37|iF1P)5n?m~f-uAMv-+O1fAn=(fYB=n8| zI|;lKjMw*^`OdBtD^_r&ud$e*N_U`8{OHQoF_$>3KN=w(r|P22jnOE)imx7gQIPV_kfti5h+O*HI2Uop?oM01qjxa3KR z|0l`g6i5mM@+Cm}LHw8I9ir4G61}N5;CiunYjZf?YpVqM1OeKvX!9JfBD0mCiG@C; zfcmV0t^fhj(!m|9)h~$9wy&=KnH3wGq7E;$?5Ju2th%ywGAOnPg6jx08~{?KSbYRI z{6|CfD#pXwQmdCeb;FKcF12E)IsyoUR?lnwB#FKqq%KO_;qJn#ZURWkes*L@gA`87Cg}b`fRsOf6qdV}KC@^uDvXK}VAZ^zoMb8f4nVUqZcu+GK-U3p)|!^z z_S~ZFs1PbbfJd%=q&6nj*R{y43d%~osYez81OQ^1;zc7p!GsP zuT)UuB}2$vN8JyKNdU=A&P+(Dy*va!ybJucu(f#Eb2n~58BsO@tX%wr-yP_@55P@{ zw2}}&1S|sK!wn>aOw@I`DOa6LOGzgXKq=(ts*gqDb(VwxUCAup9c;VrESEy5ECg6{ z^@dXgvOz&kNFRQaNBI+g0cM71fw07dMnIPsvkTjh0Esk8IS}b;M+=x4;NlVh0)Y8d zQP%ur&))bdN{o^dVC^-n*JzDZN}(om_{^IC0_d0q$2cwo5K`q>N&*}%7f)kmaEzg2 zI@z~m_wywH1k4DM$iijMFWG<+qGSYUnel>a?3mpTD8en-1PwSR0LK{Gjtf4Cgs>|_ zfYdaOY3L|}H5W{P!|C$CF++xYscB=AMhQ?70<6B_=k+QYc#KHR0kR7^S9&%A=%|Jr zjX|^^r?9Jl0Lf87Gh$H<9n~nD002aOX)E9SFFt#107XX839x>_`jJs`J*^0*CDQUG zKrE_Zhi!l*rKi7T7@>+SY{-0MPnPVr%Bot;MrJC>jACzP5FuhCHvJ#%A{1 zlmNnlNFWMrcfIZ?dF%T$0TP|lwniing|OsDfOx_#hMu{6%gt}22vEhSWZgAwV>u!G zJYk1p2p$Y|y*K+OERO|$gAeW+S0UAm7g$>!nz3qhG5S<60oE^AKay2!OTNMv7KGZv z@h2mb@%<1)fVb8I-{2aM%5MNxz<4IT<-rSnIHJ)06hwg4H~hR_E7#KmbzJYcyCW9W z2!0ss*H3*eSRM=hA%0jME58bqn#|BoeS6j;wT1K}Zvwo~@`6k0@MBPPTJO2LBNB)r z)E?@ti$8)uir^dUgSXa`UwP0pmmO+tyP_>m78O8%zyE#j0}7bqxS$|DT>9?5efQ?uc3uQncim&x0Jz0zIblKIU8=NzVA)p@>uW>^W`-;6kyGRGrm97X*ov(Sh@HK zzX&z}sBuzGSPQV^*bhkQp&HDYHgXZ){$%+5x^4(eH)+?oRo|0Yy9yI zZF31~mXlTk9|q&godYN;ND=%)oy`YG;o=8A@n0AAlqV+vT3T9^K)&Im!N{QqVgp*f zlEGc$hPTeyd_V)=6iCijeNF;Q{Ktux0m^uxhhvP;!9Eomp-;lsP~+%Tpp-iE{&WBP z(wyhBB?^Qf^ff0P3miDISN6&UQUw1Hho6RomRzGiR@0RA3)?;kp;Jujw?j7UD*WX8 z^nc8Og}T^%jsAohNo6MTjZV<29Mtjca6(jGK%4;82>%d2+TZUm&aVV_00snDcVp{hFfKB!IAO%u>(f;M z?B96+mRljBqlkYTAMT^C&Wj;O4*>vt`2GPz0+FmEKr~|Gt^GToNa5IFc^N*H1TK#S zZ>1JjR28)nGLAnrWJ-d`o?G9#G#V_q^p8Q)*sU?-!X$mq24_;Tz;dv@>Fq zS1C23vzBK8csiMunt=&TrVZO6d%(J<3gGg(;Bw$+AV`;Sk^pP3TU#S6pEj*1a>$Hz z11LRe9IO@+^JgBK{ZO(%k^pX1cfL}p&ZH92Vm|vEK*`~$^O&2EDK*#*dd^M!OpYC_ z%uT$LGtcULE#`!`&Wrk^YT;|}VdP1NooXhXF%hg8b+LMII}q)xKBZPqAR>7D9z+c1 z0)Wf`@GOu*0AkD$LltvhvFRT&rUB#58jX=tMxgQ7p{Q%j?nET;wOgY`yBB$|3i48*P8f!7-qRE(i-b4&Ky1u9TV2qC4hp=Po+j!&ow-D^odY0QD zB<1qE{-l4YK!E*!Kak>i3;>eF^B52al&E8t|N3+9y8u92>SMj!gCwfe%xl>AAvkOP z>6mcN*u0%Cb79cY^_X_$sW|=eQ?Tphcks$j|B8d}9xQ4b1%u+t#nGVI=&U6+9l%dr z0KibwO>dcL1LZ>fQFZue^I4em@d+iLlPHUD>_^98!Z~B{w{5%d`$zwTz=7(qe)9Ou z2|%F31Q3z4Ol{Ds#jT5oaPp-m;+*TI!Cm9-y+D!MKJMcaFm~E#{Qf8Zi|x0wbMKbnH3QZNgX1N#Ka%kHVb0 zF335fuM|4=9>Vhv{s#MZ9-bhVbrRT>*1o#~(LiFJmU|Ki0VKxbm16f4(~GRM>UYfP zqj1@`=2V^V0btNk^_cswGjY@jjTP;O%i|#Yj8an+AQMdU$D);c|4;bHSX^??EV#S{ z#n&k*JU$O*fBAe2pE|T+eQBE9B_Nxm~+QW z)Q$C5q!o#;=)L>kE&#e4o=~Mu2uNxPCc^1@=^0%#A4xC2_<%B6$HLsZXF6K#sut8W)MD1M^AO?k+Ds@*nJdBsjY>d9vliCnfBHYM=pz_5 zz5Yr zm(^#2j2%a~Q88dNTPf%8uPlWbHybZcR5geQmwtXW_H@2qwl+;i06_Va0*tH*%gNxW zb5Fp~aea5_&&23Sqj2oG;}DD%J=%MAn1+^7@G7tw0m`N8RxX8UO{bQpu`*)Tf(!7^ zj`tvCxRK`ahqoxfqKk>+&!338;nk<<4#f!{pM(R!4=df3G$<&Tt{;{Kr+n(9 z@-$QdeB!d{*n4PC$wvXxw>1M1#V{j4J`pUPV#w&hIBIfbb?K$VgpL;?)#H0tDx5L%bnNT=prmcE@fRD16qxs$WK~w_2{8VwF(q%K z(m3%W$0HaGlvFt+#!5T2Pl+N!0+e>X=<&NT{J3EyZKE16_JlF;c-=S{I#9AUOqF&- z*r!NfG#-(nlD-B;P8m^_*G#2hxh#x7X&gGj=Dz(-z?#iZ1z@LXfl@BXHjExzvbw7c!^boNkdkNyorLBU!Y)N1 zV*)rbH*$!f*sB zBC+BVz=_$OhV`0ybL?MtF{9I@fD=D-r*QkqYujH*c>Qq$m#8kjlZ~<826OwJ+ZO*r ztyr;w0WsRAURkPSc6rro>{)DhYT~1v=Hl8|#-iGM*?Qg?oJK4+RpG?=7w4d3X)w+dy%eJ7Eb-#d&a*6-D z70=d}!^hdWOh|oFi>UY#XCr`Cye+K<>lQxtCV?g;DofUz5gz~m+TTAE4-H!a*RZz_ z>_AwD($b6wkWIE3*^5emZvI=DE?zm@z*5qD9zP}xKfWlgVbP$Cj@^gizk7)fz%1Lp z_?w%j04Whdl+Y$2Oo9Qtb)J&N2A()%QjflY-GrTu0I8!wHUi`#MUI=BjR3_A5K#=6 zhlc?`*pxU->UM=>Q}*25;jQ%)yZ-|y03zb({VysD0dy?*A_GP%6r>2AJU2WZK=Bdn zj2eIbG2>w1gT|KK){0gUSJv5aAB<;hzYPuXw#Fsewvc-V?Ig zOe=ENxJs%T9)KBQk(i^9_M|9H#%TobwaYUsyw|j{n!y93K&26CcQE;5?5^viEvZRq z1ZdjW6b0yE)B3!APf2YA2GBFKtsMpJ5+!Sw{BcRzY_XeO*Ui>yt@ukuH4@-!@S$^m z;p^H9R(&>6r88vt9(Pnc-=cZ8n<(-4SByWpaw6z(lPvt%bhEJ^9_W z*$I%|!HnZ<1Ta$tXL|&URKeNOa@E@d0h~fulJSa-Vd0)^!cXf@w}v3JzIo&C1(;?s z0ziQ9p-6HQseDI(G@%_KYXMG1fZ%~3!krl#MfEfSu>5ZMOE-Nq7Xfm9!x2cJMEt$c{0OH&9I1SY=O5K%9_&_hahhMwq%FO_8cG94KsQ-v?@F+J}i}S$Lf+y~H z@pD^x%F??QN6B)Ax$&B^6l#Z7CPrR=M&QGsSq$JVFxc+eEwo4UN`ULu%-^m+-!X0( z@pXa$HF5C}Y7aZ!!j^=-z3io%cJ!9dNRJzK`&+>Bwv!Ij)O+FaA33Jpr9w1lJKmv9 zfE^vE`MOD7BLXa0^{F637CY(%0Dpt;h%)ysHe!)jUR(1jk;N;vHXG@QjaPD-*UjGo z$afv}gn-&%zCID-x7whi8iD2n&IkMU>AYk$>A5k~}QUe_G9ESV2xN8cl)2(?28NMM4b@Er!`WT2Bo&tJNE zsiO&lCq^vDA%D%aJ1ZhxrDqhx2mZmnBU)`NEC?M8 z?WGoSL7$AW)|zfbK3QY^%x8o>iWXgfdI zvB-86b6v9J$t4BtTv@P1=b|-N?QzHKnPBY7r#vZ&zY=OaWr;>wX^03SfhfZ5;k-le z3-eBp%v$=Jg#|~PEQ(3*HIH8Nu6FC0oF@r@`1*mrp{8Gt20E${JQyx$_f=-zNsJ3_ zfBvTTiqWT{K5{?0zIBW+J*Pw_r>0AafkJoB<+^0)=E8^lR21E-W6_4I_JktVc>tV$B4)tySnv&suPT;0RBbWA znh_1!2p@{%J;_Uj2tV$t!TH4&K2U-YAc3|k+N^*#b}xvQ=Q{$Vo)dI!UL9p{Eaj$F z(FnjX9q*s!lm|Ke!kmr(0^B=lNW)hP`PAzPC7*V$y?VnuVZ8=Q`3ogLGFN{F(2cdfp9!&Jq(6^f=7g#cX#0sss! zb9`eyL+64-jN-*+zhjb7><$+F|KO01*gC? zsusZ~P;~@I#Sbrkt9;2v8njmfRqq@jsThX!DZ`5DhtzvWI73*&5)A`sP8Vk9D;U4 z0PXNw#M_9iZC`l0d3Uj|shsHZ1jvLyXwAPoI#yF`3Wz2MV*-K3F-xN;Gy>d6 zqI|^c1(Y{V0FFSZ2x|@z)IL(YPeA*GWfugy2x_MVdTsHO*Z!m0CUJ%0{{hwQkqJSM RX(|8!002ovPDHLkV1j2Bx55Ab literal 0 HcmV?d00001 From fc2927b341a7a55d8bd24f1bbbbaaa6a5ce51468 Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 16 Aug 2017 18:36:23 +0630 Subject: [PATCH 152/246] Promotion CRUD --- .../settings/promotions_controller.rb | 76 +++++++++++++++++++ app/helpers/settings/promotions_helper.rb | 2 + app/models/promotion.rb | 2 + app/views/layouts/_header.html.erb | 2 + app/views/settings/promotions/_form.html.erb | 48 ++++++++++++ .../promotions/_promotion.json.jbuilder | 2 + app/views/settings/promotions/edit.html.erb | 10 +++ app/views/settings/promotions/index.html.erb | 58 ++++++++++++++ .../settings/promotions/index.json.jbuilder | 1 + app/views/settings/promotions/new.html.erb | 17 +++++ app/views/settings/promotions/show.html.erb | 4 + .../settings/promotions/show.json.jbuilder | 1 + db/migrate/20170815044557_create_promotion.rb | 4 +- 13 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 app/controllers/settings/promotions_controller.rb create mode 100644 app/helpers/settings/promotions_helper.rb create mode 100644 app/models/promotion.rb create mode 100644 app/views/settings/promotions/_form.html.erb create mode 100644 app/views/settings/promotions/_promotion.json.jbuilder create mode 100644 app/views/settings/promotions/edit.html.erb create mode 100644 app/views/settings/promotions/index.html.erb create mode 100644 app/views/settings/promotions/index.json.jbuilder create mode 100644 app/views/settings/promotions/new.html.erb create mode 100644 app/views/settings/promotions/show.html.erb create mode 100644 app/views/settings/promotions/show.json.jbuilder diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb new file mode 100644 index 00000000..277cf62d --- /dev/null +++ b/app/controllers/settings/promotions_controller.rb @@ -0,0 +1,76 @@ +class Settings::PromotionsController < ApplicationController + before_action :set_promotion, only: [:show, :edit, :update, :destroy] + + # GET /promotions + # GET /promotions.json + def index + @promotions = Promotion.all + end + + # GET /promotions/1 + # GET /promotions/1.json + def show + end + + # GET /promotions/new + def new + @promotion = Promotion.new + @promotion.promo_start_date = DateTime.now + @promotion.promo_end_date = DateTime.now + end + + # GET /promotions/1/edit + def edit + end + + # POST /promotions + # POST /promotions.json + def create + @promotion = Promotion.new(promotion_params) + @promotion.created_by = current_login_employee.id + respond_to do |format| + if @promotion.save + format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully created.' } + format.json { render :show, status: :created, location: @promotion } + else + format.html { render :new } + format.json { render json: @promotion.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /promotions/1 + # PATCH/PUT /promotions/1.json + def update + respond_to do |format| + if @promotion.update(promotion_params) + format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully updated.' } + format.json { render :show, status: :ok, location: @promotion } + else + format.html { render :edit } + format.json { render json: @promotion.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /promotions/1 + # DELETE /promotions/1.json + def destroy + @promotion.destroy + respond_to do |format| + format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_promotion + @promotion = Promotion.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def promotion_params + params.require(:promotion).permit(:promo_code, :promo_start_date, :promo_end_date, :promo_start_hour,:promo_end_hour ,:promo_day, :promo_type,:original_product ,:min_qty ,:created_by) + end +end diff --git a/app/helpers/settings/promotions_helper.rb b/app/helpers/settings/promotions_helper.rb new file mode 100644 index 00000000..787c2194 --- /dev/null +++ b/app/helpers/settings/promotions_helper.rb @@ -0,0 +1,2 @@ +module Settings::PromotionsHelper +end diff --git a/app/models/promotion.rb b/app/models/promotion.rb new file mode 100644 index 00000000..9b5c4c12 --- /dev/null +++ b/app/models/promotion.rb @@ -0,0 +1,2 @@ +class Promotion < ApplicationRecord +end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bc5ce498..df1e13ce 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -28,6 +28,8 @@
  • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
  • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • +
    +
  • <%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb new file mode 100644 index 00000000..98dbb7fe --- /dev/null +++ b/app/views/settings/promotions/_form.html.erb @@ -0,0 +1,48 @@ +<%= simple_form_for([:settings,@promotion]) do |f| %> + <%= f.error_notification %> + +
    +
    +
    +
    <%= f.input :promo_code %>
    +
    +
    +
    +
    + Promo Start Date + <%= f.date_field :promo_start_date, :placeholder => "From Date" , :class => "form-control"%> +
    +
    +
    + Promo End Date + <%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control"%> +
    +
    +
    +
    + <%= f.input :promo_start_hour %> + +
    +
    <%= f.input :promo_end_hour %>
    +
    +
    +
    <%= f.input :promo_day %>
    +
    +
    +
    + <%= f.input :promo_type,input_html: { class: "" }, + collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "" %> +
    +
    +
    +
    <%= f.input :original_product,collection: MenuItem.order("name desc"),input_html: { selected: 2 } %>
    +
    <%= f.input :min_qty %>
    +
    +
    +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/promotions/_promotion.json.jbuilder b/app/views/settings/promotions/_promotion.json.jbuilder new file mode 100644 index 00000000..d9b08aef --- /dev/null +++ b/app/views/settings/promotions/_promotion.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! promotion, :id, :created_at, :updated_at +json.url promotion_url(promotion, format: :json) diff --git a/app/views/settings/promotions/edit.html.erb b/app/views/settings/promotions/edit.html.erb new file mode 100644 index 00000000..47a01b80 --- /dev/null +++ b/app/views/settings/promotions/edit.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', promotion: @promotion %> +
    diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb new file mode 100644 index 00000000..606b138b --- /dev/null +++ b/app/views/settings/promotions/index.html.erb @@ -0,0 +1,58 @@ +

    <%= notice %>

    + + +
    +
      +
    • Home
      • +
    • Promotions
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_promotion_path,:class => 'btn btn-primary btn-sm' %> + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + <% @promotions.each do |pro| %> + + + + + + + + + <% if Employee.exists?(pro.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    Promotion CodeStart DateEnd DateStart TimeEnd TimePromotion DayOriginal ProductCreated ByCreated At
    <%= link_to pro.promo_code, settings_promotion_path(pro) %><%= pro.promo_start_date %><%= pro.promo_end_date %><%= pro.promo_start_hour.strftime("%I:%M %P") rescue "-" %><%= pro.promo_end_hour.strftime("%I:%M %P") rescue "-" %><%= pro.promo_day %> + <% if MenuItem.exists?(pro.original_product) %> + <%= MenuItem.find(pro.original_product).name %> + <% end %> + <%= Employee.find(pro.created_by).name %><%= pro.created_by %><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_promotion_path(pro) %><%= link_to 'Destroy', settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/promotions/index.json.jbuilder b/app/views/settings/promotions/index.json.jbuilder new file mode 100644 index 00000000..1c9c5f97 --- /dev/null +++ b/app/views/settings/promotions/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @promotions, partial: 'promotions/promotion', as: :promotion diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb new file mode 100644 index 00000000..c7748bb6 --- /dev/null +++ b/app/views/settings/promotions/new.html.erb @@ -0,0 +1,17 @@ + +
    +
    + +
    + <%= render 'form', promotion: @promotion %> +
    + diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb new file mode 100644 index 00000000..4dd7e593 --- /dev/null +++ b/app/views/settings/promotions/show.html.erb @@ -0,0 +1,4 @@ +

    <%= notice %>

    + +<%= link_to 'Edit', edit_promotion_path(@promotion) %> | +<%= link_to 'Back', promotions_path %> diff --git a/app/views/settings/promotions/show.json.jbuilder b/app/views/settings/promotions/show.json.jbuilder new file mode 100644 index 00000000..52507108 --- /dev/null +++ b/app/views/settings/promotions/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "promotions/promotion", promotion: @promotion diff --git a/db/migrate/20170815044557_create_promotion.rb b/db/migrate/20170815044557_create_promotion.rb index 124ad8d9..fddf293b 100644 --- a/db/migrate/20170815044557_create_promotion.rb +++ b/db/migrate/20170815044557_create_promotion.rb @@ -3,8 +3,8 @@ class CreatePromotion < ActiveRecord::Migration[5.1] create_table :promotions do |t| t.string :promo_code, :limit => 16 - t.datetime :promo_start_date, :null => false - t.datetime :promo_end_date, :null => false + t.date :promo_start_date, :null => false + t.date :promo_end_date, :null => false t.time :promo_start_hour, :null => false t.time :promo_end_hour, :null => false t.string :promo_day, :null => false, :default => "[0,1,2,3,4,5,6]" From 88eb1d6c64e18828fff6aefc5293989e8f9a5e77 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 17 Aug 2017 10:43:45 +0630 Subject: [PATCH 153/246] update seed --- db/seeds.rb | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 8bc16f74..5ab0d36d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -175,4 +175,75 @@ queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"}) cashier_terminal3 = CashierTerminal.create({name:"Terminal 3"}) + +zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"62", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"53", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"54", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"24", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"25", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"26", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"34", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"35", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"45", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"46", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"47", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"48", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + +zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"51", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"52", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"11", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"12", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"21", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"22", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"23", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"31", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"32", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"33", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"41", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"42", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"43", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"44", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) +zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"71", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"72", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"73", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"74", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"75", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"76", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, +]) + +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + +#Default Order Queue stations +order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) + +# QueueStationZone +zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone}) +zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone2}) +zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone3}) + puts " Finished System Default Set Up Data " From 7f2bfa2348e60757af7e92d20d78042a4369dfed Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 17 Aug 2017 13:51:01 +0630 Subject: [PATCH 154/246] update add order and calculate subtotal --- .../restaurant/menu_categories_controller.rb | 2 - .../restaurant/menu/_menu_item.json.jbuilder | 4 +- .../menu_categories/show.json.jbuilder | 10 +-- app/views/origami/addorders/show.html.erb | 84 +++++++++++++------ 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/app/controllers/api/restaurant/menu_categories_controller.rb b/app/controllers/api/restaurant/menu_categories_controller.rb index 5ab10ff5..f1f3e6d0 100644 --- a/app/controllers/api/restaurant/menu_categories_controller.rb +++ b/app/controllers/api/restaurant/menu_categories_controller.rb @@ -13,9 +13,7 @@ class Api::Restaurant::MenuCategoriesController < Api::ApiController # This API show current order details # Input Params - menu_id def show - puts "SSSSSSSSSSSSS" @menu = menu_detail(params[:id]) - puts @menu.to_json end diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index c93c3b12..d86624b5 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -32,8 +32,8 @@ elsif item.menu_item_instances.count > 1 then end #Child Menu items -if (item.children) then - json.set_items item.children.each do |item| +if (item.menu_item_sets) then + json.set_items item.menu_item_sets.each do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder index d7a6d581..f48f6c77 100644 --- a/app/views/api/restaurant/menu_categories/show.json.jbuilder +++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder @@ -6,8 +6,8 @@ if @menu.menu_items json.alt_name item.alt_name json.type item.type json.min_qty item.min_qty - json.min_selectable_item item.min_selectable_item - json.max_selectable_item item.max_selectable_item + # json.min_selectable_item item.min_selectable_item + # json.max_selectable_item item.max_selectable_item #Item instance if item.menu_item_instances.count == 1 then @@ -33,11 +33,11 @@ if @menu.menu_items end #Child Menu items - if (item.children) then - json.set_items item.children.each do |item| + if (item.menu_item_sets) then + json.set_items item.menu_item_sets.each do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end - end + end end end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index c7aa4455..638da002 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -23,7 +23,7 @@
    -
    +
    @@ -42,7 +42,7 @@
    - +
    Sub Total:222220.00
    @@ -53,14 +53,16 @@ $(function(){ + //click menu sidebar menu category $(".menu_category").on("click", function(){ var menu_id = $(this).find(".menu-id").text(); var url = $(this).attr('data-ref'); show_menu_item_list(url); - }); //End menu category Click - + }); + //End menu category Click + + //show menu item list when click menu category function show_menu_item_list(url_item){ - var menu_list = $('.menu_items_list'); menu_list.empty(); @@ -74,7 +76,7 @@ $(function(){ var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); menu_items = data.menu_items; - + console.log(data); for(var field in menu_items) { if (menu_items[field].item_instances){ var price = parseFloat(menu_items[field].item_instances[1].price).toFixed(2); @@ -130,47 +132,75 @@ $(function(){ } //end show detail function + // click plus icon for add $(document).on('click', '.add_icon', function(event){ var item_data = $(this); - show_item_detail(item_data); + show_item_detail(item_data); + calculate_sub_total(); }); //End Add Icon Click function show_item_detail(data){ + qty = 1; + append = 0; + price = data.attr('data-price'); + instance_code = data.attr('data-instance'); - price = data.attr('data-price'); - - if (data.attr('data-qty') === undefined){ - qty = 1; - }else{ - qty = data.attr('data-qty'); - } - - if (data.attr('data-instance') == "undefined"){ + if (instance_code == "undefined"){ instance = ''; }else{ - instance = data.attr('data-instance'); + instance = "("+data.attr('data-instance')+")"; } + var rowCount = $('.summary-items tbody tr').length+1; + var item_row = $('.summary-items tbody tr'); + + $(item_row).each(function(i){ + if ($(item_row[i]).attr('data-code') == data.attr('data-item-code')) { + qty = parseInt($(item_row[i]).children('#item_qty').text()) +1; + $(item_row[i]).children('#item_qty').text(qty); + $(item_row[i]).children('#item_price').text(price*qty); + append = 1; + }else{ + qty = 1; + } + }); - - var rowCount = $('.summary-items tbody'); - console.log(rowCount); - for(var field in rowCount) { - // console.log(rowCount[field].attr('data-code')); - } - - row ='' + if (append===0) { + row ="" +''+rowCount+'' - +'' + data.attr('data-name')+ ' ' + instance + '' + +'' + data.attr('data-name')+ ' ' + instance + '' +'' + qty + '' +'' + parseFloat(price).toFixed(2) +'' +''; - $(".summary-items tbody").append(row); + $(".summary-items tbody").append(row); + } } + function calculate_sub_total(){ + var total_price = 0; + var taxable_amount = 0; + var item_row = $('.summary-items tbody tr'); + + $(item_row).each(function(i){ + // var taxable = $(item_row[i]).attr('data-taxable'); + var unit_price = parseFloat($(item_row[i]).attr('data-price')); + var qty = parseFloat($(item_row[i]).children('#item_qty').text()); + // if(taxable == 'true'){ + // taxable_amount += qty*unit_price; + // } + total_price += qty*unit_price; + }); + var fixed_total_price = parseFloat(total_price).toFixed(2); + var fixed_taxable_amount = parseFloat(taxable_amount).toFixed(2); + $('#sub_total').empty(); + $('#sub_total').append(fixed_total_price); + // $('#sub_total').attr('taxable_amount',fixed_taxable_amount); + // $('#show_sub').text(fixed_total_price); +} + }); From 9702299fa7b88df75a6936a3cbd027133b38b2f5 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 17 Aug 2017 17:40:18 +0630 Subject: [PATCH 155/246] Update --- app/models/shop.rb | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/app/models/shop.rb b/app/models/shop.rb index 1cf1119c..dbb0930e 100644 --- a/app/models/shop.rb +++ b/app/models/shop.rb @@ -1,2 +1,116 @@ class Shop < ApplicationRecord + + def promo_activate + current_day = Time.now.strftime("%Y-%d-%m") + current_time = Time.now.strftime('%H:%M') + day = Date.today.wday + promoList = is_between_promo_datetime(current_day,current_time) + if promoList.size > 0 + itemList = combine_item(saleObj) + is_promo_day(promoList,day, itemList) + end + end + + def is_between_promo_datetime(current_day,current_time) + promoList = Promotion.where('( promo_start_date < ? AND promo_end_date > ?) AND (promo_start_time < ? AND promo_end_time > ?)', current_day, current_day, current_time, current_time) + return promoList + end + + def combine_item(saleObj) + itemList = saleObj.sale_items.group(:product_code).sum(:qty) + end + + def is_promo_day(promoList, day, orderitemList) + promoList.each do |promo| + dayresult = promo.promo_day.include?(day) + if dayresult + orderitemList.each do |item| + find_promo_item(promo, item) + end + end + end + end + + def find_promo_item(promo, orderitem) + if promo.prouduct_item == orderitem + if promo.minmum_qty < orderitem.qty + return false + else + same, promo_item_code = check_giveaway_product(promo, orderitem) + if same + give_promotion_same_product + else + find_promo_item_in_orderlist + end + end + end + end + + def check_giveaway_product(promo, orderitem) + promo.promotion_products.each do |promo_product| + if promo_product.item_code == orderitem.item_code + return true, promo_product.item_code + else + return false, promo_product.item_code + end + end + end + + def self.give_promotion_same_product(qty, promoqty, foc_min_qty) + multiple = qty / promoqty # loop count + charge_qty = 0 + foc_qty = 0 + if multiple > 0 + multiple.times.each do |key| + if qty >= promoqty + charge_qty += promoqty + different = qty - promoqty + qty = different + if different == 0 + Shop.add_promotion_item + foc_qty += foc_min_qty + else + foc_qty += foc_min_qty + qty = qty - foc_min_qty + end + else + if multiple == foc_qty + charge_qty += qty + else + charge_qty += qty + end + end + end + else + charge_qty = qty + end + puts "Charged - " + charge_qty.to_s + puts "FOC - " + foc_qty.to_s + end + + def find_promo_item_in_orderlist(promo_item_code, orderitemList) + orderitemList.each do |item| + if item.item_code == promo_item_code + give_promotion_second_product(item) + else + add_promotion_second_item + end + end + end + + def give_promotion_second_product(item, foc_min_qty) + if item.qty > foc_min_qty + + else + + end + end + + def self.add_promotion_item + + end + + def self.add_promotion_second_item + + end end From 29b3f945737f81045514552dcaa01b0c9f6e7904 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 17 Aug 2017 18:55:13 +0630 Subject: [PATCH 156/246] add menu api --- .../api/restaurant/item_sets_controller.rb | 9 +++ .../api/restaurant/menu_controller.rb | 3 +- .../menu_item_attributes_controller.rb | 4 -- .../concerns/token_verification.rb | 3 +- .../settings/item_sets_controller.rb | 2 +- .../settings/menu_categories_controller.rb | 2 +- .../settings/set_menu_items_controller.rb | 2 +- .../settings/simple_menu_items_controller.rb | 2 +- app/models/employee.rb | 1 - .../restaurant/item_sets/index.json.jbuilder | 6 ++ .../api/restaurant/menu/_menu.json.jbuilder | 5 +- .../restaurant/menu/_menu_item.json.jbuilder | 60 ++++++++++-------- .../api/restaurant/menu/index.json.jbuilder | 12 ++-- app/views/layouts/_header.html.erb | 2 +- app/views/settings/item_sets/_form.html.erb | 1 + app/views/settings/item_sets/index.html.erb | 2 + app/views/settings/item_sets/show.html.erb | 4 ++ .../settings/menu_categories/_form.html.erb | 4 +- .../settings/menu_categories/index.html.erb | 2 + .../settings/menu_categories/show.html.erb | 2 + .../settings/set_menu_items/show.html.erb | 57 ----------------- .../settings/simple_menu_items/show.html.erb | 62 +------------------ config/routes.rb | 1 + .../20170327152733_create_menu_categories.rb | 2 +- db/migrate/20170811071000_create_item_sets.rb | 1 + .../20170816042256_settings_products.rb | 1 - 26 files changed, 84 insertions(+), 168 deletions(-) create mode 100644 app/controllers/api/restaurant/item_sets_controller.rb create mode 100644 app/views/api/restaurant/item_sets/index.json.jbuilder diff --git a/app/controllers/api/restaurant/item_sets_controller.rb b/app/controllers/api/restaurant/item_sets_controller.rb new file mode 100644 index 00000000..a7ad9efc --- /dev/null +++ b/app/controllers/api/restaurant/item_sets_controller.rb @@ -0,0 +1,9 @@ +class Api::Restaurant::ItemSetsController < Api::ApiController + + #Description + # Pull the default menu details and also other available (active) menus + # Input Params - order_id + def index + @item_sets = ItemSet.all + end +end diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index fe7983ea..f6f2902b 100644 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -5,8 +5,7 @@ class Api::Restaurant::MenuController < Api::ApiController # Input Params - order_id def index @menus = Menu.all - @current_menu = Menu.current_menu - + # @current_menu = Menu.current_menu end #Description diff --git a/app/controllers/api/restaurant/menu_item_attributes_controller.rb b/app/controllers/api/restaurant/menu_item_attributes_controller.rb index f2aead8f..1b6a48d4 100644 --- a/app/controllers/api/restaurant/menu_item_attributes_controller.rb +++ b/app/controllers/api/restaurant/menu_item_attributes_controller.rb @@ -6,8 +6,4 @@ class Api::Restaurant::MenuItemAttributesController < Api::ApiController def index @menu_attributes = MenuItemAttribute.all end - - - - end diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index 0cc6c263..66658b6a 100644 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -14,10 +14,9 @@ module TokenVerification end def authenticate_token - authenticate_with_http_token do |token, options| + authenticate_with_http_token do |token, options| #@current_user = User.find_by(api_key: token) Rails.logger.debug "token - " + token.to_s - @user = Employee.authenticate_by_token(token) if @user return true diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 5564ed98..cbd74edb 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -69,6 +69,6 @@ class Settings::ItemSetsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_item_set_params - params.require(:item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + params.require(:item_set).permit(:name, :alt_name, :min_selectable_qty, :max_selectable_qty) end end diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index 8ca9cfb4..a15cca20 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -89,6 +89,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(:menu_category).permit(:code, :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, :is_available) end end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 64b9c945..60fa3b7d 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -12,7 +12,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) + # @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 diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 9d3ac5ed..60949618 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -12,7 +12,7 @@ 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) + # @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 diff --git a/app/models/employee.rb b/app/models/employee.rb index 7693c448..85aeaec1 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -35,7 +35,6 @@ class Employee < ApplicationRecord end def self.authenticate_by_token(session_token) - if (session_token) user = Employee.find_by_token_session(session_token) if user && user.session_expiry.utc > DateTime.now.utc diff --git a/app/views/api/restaurant/item_sets/index.json.jbuilder b/app/views/api/restaurant/item_sets/index.json.jbuilder new file mode 100644 index 00000000..eb39022d --- /dev/null +++ b/app/views/api/restaurant/item_sets/index.json.jbuilder @@ -0,0 +1,6 @@ +json.array! @item_sets do |set| + json.name set.name + json.alt_name set.alt_name + json.min_selectable_qty set.min_selectable_qty + json.max_selectable_qty set.max_selectable_qty +end diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder index 43721ff0..cfa950d7 100644 --- a/app/views/api/restaurant/menu/_menu.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu.json.jbuilder @@ -5,13 +5,14 @@ json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M") if (menu.menu_categories) - json.menu_categories menu.menu_categories do |category| + json.categories menu.menu_categories do |category| json.id category.id json.name category.name json.alt_name category.alt_name + json.is_available category.is_available if category.menu_items - json.menu_items category.menu_items do |item| + json.items category.menu_items do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end end diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index c93c3b12..f0b790b7 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,40 +1,46 @@ #Menu Item Information -json.item_code item.item_code -json.name item.name -json.alt_name item.alt_name -json.type item.type -json.min_qty item.min_qty -json.min_selectable_item item.min_selectable_item -json.max_selectable_item item.max_selectable_item +json.id item.id +json.item_code item.item_code +json.name item.name +json.alt_name item.alt_name +json.image item.image_path.url +json.description item.description +json.Information item.information +json.type item.type +json.account_id item.account_id +json.min_qty item.min_qty +json.is_available item.is_available +json.is_sub_item item.is_sub_item +json.attributes item.item_attributes +json.options item.item_options +# json.min_selectable_item item.min_selectable_item +# json.max_selectable_item item.max_selectable_item #Item instance -if item.menu_item_instances.count == 1 then +# if item.menu_item_instances.count == 1 then +# item_instance = item.menu_item_instances[0] +# json.price = item_instance.price +# json.is_available = item_instance.is_available +# json.is_on_promotion = item_instance.is_on_promotion +# json.promotion_price = item_instance.promotion_price +# json.item_attributes = item_instance.item_attributes - item_instance = item.menu_item_instances[0] - json.price = item_instance.price - json.is_available = item_instance.is_available - json.is_on_promotion = item_instance.is_on_promotion - json.promotion_price = item_instance.promotion_price - json.item_attributes = item_instance.item_attributes - -elsif item.menu_item_instances.count > 1 then - - json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code = is.item_instance_code - json.item_instance_name = is.item_instance_name +# elsif item.menu_item_instances.count > 1 then + json.instances item.menu_item_instances do |is| + json.code = is.item_instance_code + json.name = is.item_instance_name json.price = is.price json.is_available = is.is_available json.is_on_promotion = is.is_on_promotion json.promotion_price = is.promotion_price json.item_attributes = is.item_attributes - end + # end end #Child Menu items -if (item.children) then - json.set_items item.children.each do |item| - json.partial! 'api/restaurant/menu/menu_item', item: item - end - -end +# if (item.children) then +# json.set_items item.children.each do |item| +# json.partial! 'api/restaurant/menu/menu_item', item: item +# end +# end diff --git a/app/views/api/restaurant/menu/index.json.jbuilder b/app/views/api/restaurant/menu/index.json.jbuilder index b4241854..55e876f6 100644 --- a/app/views/api/restaurant/menu/index.json.jbuilder +++ b/app/views/api/restaurant/menu/index.json.jbuilder @@ -4,9 +4,11 @@ json.array! @menus do |menu| json.valid_days menu.valid_days json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M") - if (@current_menu) - json.current_menu do - json.partial! 'api/restaurant/menu/menu', menu: @current_menu - end - end + + json.partial! 'api/restaurant/menu/menu', menu: menu + # if (@current_menu) + # json.current_menu do + # json.partial! 'api/restaurant/menu/menu', menu: @current_menu + # end + # end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index d7ccedaf..0daa8f5f 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -31,7 +31,7 @@
  • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %>
    • ] +
  • <%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %>
  • <%= link_to "Products", settings_products_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index 28441ea5..8eb23795 100644 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -3,6 +3,7 @@
    <%= f.input :name %> + <%= f.input :alt_name %> <%= f.input :min_selectable_qty,input_html: {value: f.object.min_selectable_qty || '0'} %> <%= f.input :max_selectable_qty,input_html: {value: f.object.max_selectable_qty || '0'} %>
    diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index 80db10b9..b530a018 100644 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -14,6 +14,7 @@ Name + Alt Name Min selectable qty Max selectable qty Action @@ -24,6 +25,7 @@ <% @settings_item_sets.each do |item| %> <%= item.name %> + <%= item.alt_name %> <%= item.min_selectable_qty %> <%= item.max_selectable_qty %> <%= link_to 'Show', settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb index f863b5fc..21e5f132 100644 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -17,6 +17,10 @@ Name: <%= @settings_item_set.name %> + + Alt Name: + <%= @settings_item_set.alt_name %> + Min selectable qty: <%= @settings_item_set.min_selectable_qty %> diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb index 6a48555d..b611b397 100644 --- a/app/views/settings/menu_categories/_form.html.erb +++ b/app/views/settings/menu_categories/_form.html.erb @@ -2,13 +2,13 @@ <%= f.error_notification %>
    - <%= f.input :menu_id, as: :hidden %> + <%= f.input :menu_id, as: :hidden %> <%= f.input :code, label: "Category Code" %> <%= f.input :name %> <%= f.input :alt_name %> + <%= f.input :is_available %> <%= f.input :order_by %> <%= f.association :parent %> -
    diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 8ac80a16..9345469c 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -17,6 +17,7 @@ Menu Name Alt name + Is Available Order by Parent @@ -31,6 +32,7 @@ <%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %> <%= settings_menu_category.alt_name rescue ''%> + <%= settings_menu_category.is_available rescue false%> <%= settings_menu_category.order_by rescue ''%> <%= settings_menu_category.parent.name rescue ''%> <%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %> | <%= link_to 'Destroy', settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 7e1f44af..737709cd 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -16,6 +16,7 @@ Menu Name Alt name + Is Available Order by Created At Action @@ -27,6 +28,7 @@ <%= @settings_menu_category.menu.name %> <%= @settings_menu_category.name rescue "-" %> <%= @settings_menu_category.alt_name %> + <%= settings_menu_category.is_available rescue false%> <%= @settings_menu_category.order_by %> <%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category) %> diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index a5762fc3..6cec8cab 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -21,10 +21,7 @@ Type Account Type Menu category - Menu item Min qty - Min selectable item - Max selectable item Created At Action @@ -38,10 +35,7 @@ <%= @settings_menu_item.type %> <%= @settings_menu_item.account.title %> <%= @settings_menu_item.menu_category_id %> - <%= @settings_menu_item.menu_item_id %> <%= @settings_menu_item.min_qty %> - <%= @settings_menu_item.min_selectable_item %> - <%= @settings_menu_item.max_selectable_item %> <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %> @@ -51,58 +45,7 @@
    -<% if @sub_menu.count > 0 %> -
    -
    -
    -

    Sub Menu Items

    - - - - - - - - - - - - - - - - - <% @sub_menu.each do |settings_menu_item| %> - - - - - - - - - - - <% if settings_menu_item.type == "SimpleMenuItem" %> - - - - <% else %> - - - - <% end %> - - <% end %> - -
    Item codeNameAlt nameTypeParent ItemCreated byCreated at
    <%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
    -
    -
    - <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> - -<% end %> -

    Menu Item Instances diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 9bfae1b0..d9961c92 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -23,10 +23,10 @@ Type Accout Menu category - Menu item + Min qty - Min selectable item - Max selectable item + Created At Action @@ -40,10 +40,7 @@ <%= @settings_menu_item.type %> <%= @settings_menu_item.account.title %> <%= @settings_menu_item.menu_category_id %> - <%= @settings_menu_item.menu_item_id %> <%= @settings_menu_item.min_qty %> - <%= @settings_menu_item.min_selectable_item %> - <%= @settings_menu_item.max_selectable_item %> <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> @@ -54,60 +51,7 @@

    -<% if @sub_menu.count > 0 %> -
    -
    -
    -

    Sub Menu Items

    - - - - - - - - - - - - - - - - - <% @sub_menu.each do |settings_menu_item| %> - - - - - - - - - - - - <% if settings_menu_item.type == "SimpleMenuItem" %> - - - - <% else %> - - - - <% end %> - - <% end %> - -
    Item codeNameAlt nameTypeParent ItemCreated byCreated at
    <%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
    -
    -
    - <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> - -<% end %> - -

    Menu Item Instances diff --git a/config/routes.rb b/config/routes.rb index 631f1316..619295eb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,6 +35,7 @@ Rails.application.routes.draw do resources :menu_item_attributes, only: [:index] resources :menu_item_options, only: [:index] resources :menu_sold_out, only: [:index] + get "item_sets" => "item_sets#index" end #User request move table or bills diff --git a/db/migrate/20170327152733_create_menu_categories.rb b/db/migrate/20170327152733_create_menu_categories.rb index 59e3a8c9..3b978654 100644 --- a/db/migrate/20170327152733_create_menu_categories.rb +++ b/db/migrate/20170327152733_create_menu_categories.rb @@ -8,7 +8,7 @@ class CreateMenuCategories < ActiveRecord::Migration[5.1] t.integer :order_by t.string :created_by, :null => false t.references :menu_category, :null => true - + t.boolean :is_available, :null => false, :default => true t.timestamps end end diff --git a/db/migrate/20170811071000_create_item_sets.rb b/db/migrate/20170811071000_create_item_sets.rb index d666222c..07b42355 100644 --- a/db/migrate/20170811071000_create_item_sets.rb +++ b/db/migrate/20170811071000_create_item_sets.rb @@ -2,6 +2,7 @@ class CreateItemSets < ActiveRecord::Migration[5.1] def change create_table :item_sets do |t| t.string :name + t.string :alt_name t.integer :min_selectable_qty t.integer :max_selectable_qty diff --git a/db/migrate/20170816042256_settings_products.rb b/db/migrate/20170816042256_settings_products.rb index 69c790fc..73535db3 100644 --- a/db/migrate/20170816042256_settings_products.rb +++ b/db/migrate/20170816042256_settings_products.rb @@ -2,7 +2,6 @@ class SettingsProducts < ActiveRecord::Migration[5.1] def change create_table :products do |t| t.string :item_code, :limit => 16 - t.string :name, :null => false t.string :alt_name t.integer :unit_price From e448265a48291b4e7b5fb1325134b472e6853f66 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 17 Aug 2017 18:55:29 +0630 Subject: [PATCH 157/246] update add oreder --- app/views/origami/addorders/show.html.erb | 57 ++++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 638da002..1c400d0d 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -23,7 +23,7 @@

    -
    +
    @@ -49,6 +49,51 @@ + + + From 3b8a5183577c63dde12587548761782ac22e9e78 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 18 Aug 2017 19:09:09 +0630 Subject: [PATCH 160/246] update addorder --- .../restaurant/menu/_menu_item.json.jbuilder | 14 +- .../menu_categories/show.json.jbuilder | 61 ++++---- app/views/origami/addorders/show.html.erb | 141 ++++++++++++------ 3 files changed, 132 insertions(+), 84 deletions(-) diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index ffad3dc2..6446169f 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -28,13 +28,13 @@ json.options item.item_options # elsif item.menu_item_instances.count > 1 then json.instances item.menu_item_instances do |is| - json.code = is.item_instance_code - json.name = is.item_instance_name - json.price = is.price - json.is_available = is.is_available - json.is_on_promotion = is.is_on_promotion - json.promotion_price = is.promotion_price - json.item_attributes = is.item_attributes + json.code is.item_instance_code + json.name is.item_instance_name + json.price is.price + json.is_available is.is_available + json.is_on_promotion is.is_on_promotion + json.promotion_price is.promotion_price + json.item_attributes is.item_attributes # end end diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder index f48f6c77..ad05acbf 100644 --- a/app/views/api/restaurant/menu_categories/show.json.jbuilder +++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder @@ -1,43 +1,48 @@ if @menu.menu_items json.menu_items @menu.menu_items do |item| #Menu Item Information - json.item_code item.item_code - json.name item.name - json.alt_name item.alt_name - json.type item.type - json.min_qty item.min_qty + # json.item_code item.item_code + # json.name item.name + # json.alt_name item.alt_name + # json.type item.type + # json.min_qty item.min_qty # json.min_selectable_item item.min_selectable_item # json.max_selectable_item item.max_selectable_item #Item instance - if item.menu_item_instances.count == 1 then + # if item.menu_item_instances.count == 1 then - item_instance = item.menu_item_instances[0] - json.price item_instance.price - json.is_available item_instance.is_available - json.is_on_promotion item_instance.is_on_promotion - json.promotion_price item_instance.promotion_price - json.item_attributes item_instance.item_attributes + # item_instance = item.menu_item_instances[0] + # json.price item_instance.price + # json.is_available item_instance.is_available + # json.is_on_promotion item_instance.is_on_promotion + # json.promotion_price item_instance.promotion_price + # json.item_attributes item_instance.item_attributes - elsif item.menu_item_instances.count > 1 then + # elsif item.menu_item_instances.count > 1 then - json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code is.item_instance_code - json.item_instance_name is.item_instance_name - json.price is.price - json.is_available is.is_available - json.is_on_promotion is.is_on_promotion - json.promotion_price is.promotion_price - json.item_attributes is.item_attributes - end + # json.item_instances item.menu_item_instances do |is| + # json.item_instance_item_code is.item_instance_code + # json.item_instance_name is.item_instance_name + # json.price is.price + # json.is_available is.is_available + # json.is_on_promotion is.is_on_promotion + # json.promotion_price is.promotion_price + # json.item_attributes is.item_attributes + # end - end + # end #Child Menu items - if (item.menu_item_sets) then - json.set_items item.menu_item_sets.each do |item| - json.partial! 'api/restaurant/menu/menu_item', item: item - end + # if (item.menu_item_sets) then + # json.set_items item.menu_item_sets.each do |item| + # json.partial! 'api/restaurant/menu/menu_item', item: item + # end - end + #end + # if category.menu_items + # json.items category.menu_items do |item| + json.partial! 'api/restaurant/menu/menu_item', item: item + # end + # end end end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index f30d8b84..0e8a8163 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -49,9 +49,51 @@ + + + + + -
    - - - - - - - - - - - - - - -
    Item NameQuantity
    - - - -
    - -
    + + + + + + + + + + + + + + + +
    Item NameQuantity
    + + + +
    +
    @@ -114,28 +154,21 @@ $(function(){ data: {}, dataType: "json", success: function(data) { + console.log(data); var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); menu_items = data.menu_items; console.log(data); for(var field in menu_items) { - if (menu_items[field].item_instances){ - var price = parseFloat(menu_items[field].item_instances[1].price).toFixed(2); - var is_available = menu_items[field].item_instances[1].is_available - var is_on_promotion = menu_items[field].item_instances[1].is_on_promotion - var item_attributes = menu_items[field].item_instances[1].item_attributes - var item_instance_code = menu_items[field].item_instances[1].item_instance_item_code - var item_instance_name = menu_items[field].item_instances[1].item_instance_name - var promotion_price = menu_items[field].item_instances[1].promotion_price - }else{ - var price = parseFloat(menu_items[field].price).toFixed(2); - var is_available = menu_items[field].is_available - var is_on_promotion = menu_items[field].is_on_promotion - var item_attributes = menu_items[field].item_attributes - var item_instance_code = menu_items[field].item_instance_item_code - var item_instance_name = menu_items[field].item_instance_name - var promotion_price = menu_items[field].promotion_price - } + + var code = menu_items[field].instances[0].code + var name = menu_items[field].instances[0].name + var price = parseFloat(menu_items[field].instances[0].price).toFixed(2); + var is_available = menu_items[field].instances[0].is_available + var is_on_promotion = menu_items[field].instances[0].is_on_promotion + var item_attributes = menu_items[field].instances[0].item_attributes + var promotion_price = menu_items[field].instances[0].promotion_price + row = '
    ' +'
    ' @@ -148,8 +181,8 @@ $(function(){ +'data-available="'+ is_available +'"' +'data-promotion="'+ is_on_promotion +'"' +'data-attributes="'+ item_attributes +'"' - +'data-instance-code="'+ item_instance_code +'"' - +'data-instance="'+ item_instance_name +'"' + +'data-instance-code="'+ code +'"' + +'data-instance="'+ name +'"' +'data-promotion-price="'+ promotion_price +'"' +'>' +'
    ' +'
    ' - +'
    ' - +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' - +'
    ' + +'
    ' + +'
    ' + +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' + +'
    ' - +'
    ' - +''+ price +'' + +'
    ' + +''+ price +'' + +'
    ' +'
    '; $('.menu_items_list').append(row); } @@ -230,6 +265,14 @@ $(function(){ $('#modal-qty').val(qty); }); + //click item row for update qty + $(document).on('click', '.menu_item_box', function(event){ + + data = $(this).parent().children().children('.add_icon'); + $('#title_name').text(data.attr('data-name')); + console.log(data); + }); + //click remove buttom in modal box $('#sx_itemModal').on('click','#remove', function(){ $('.summary-items tr').filter(function(){ @@ -359,7 +402,7 @@ $(function(){ .modal-dialog { left:auto; right: auto; - width: 600px; + width: 100%; padding-top: 100px; } From a1df5a0dbc73c5248a078aff6f568cd7f76896c7 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 18 Aug 2017 19:46:43 +0630 Subject: [PATCH 161/246] update menu_sync --- .../menu_item_instances_controller.rb | 30 ++++++++++++-- .../settings/set_menu_items_controller.rb | 33 ++++++++-------- .../settings/simple_menu_items_controller.rb | 37 +++++++++++++++--- app/helpers/application_helper.rb | 1 - app/models/menu_item_attribute.rb | 2 +- app/models/menu_item_instance.rb | 3 ++ .../restaurant/menu/_menu_item.json.jbuilder | 31 +++++++++++++-- .../menu_item_instances/_form.html.erb | 33 ++++++++++------ .../menu_item_instances/edit.html.erb | 2 +- .../settings/menu_item_instances/new.html.erb | 2 +- .../menu_item_instances/show.html.erb | 5 ++- ...170402084230_create_menu_item_instances.rb | 1 + db/seeds.rb | 1 + public/image/menu_images/icons8-Food-100.png | Bin 0 -> 5031 bytes 14 files changed, 135 insertions(+), 46 deletions(-) create mode 100644 public/image/menu_images/icons8-Food-100.png diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index fd651e5e..0d276602 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -21,12 +21,14 @@ class Settings::MenuItemInstancesController < ApplicationController id = MenuItemInstance.findParentCategory(@item) @category = MenuCategory.find(id) @settings_menu_item_instances = MenuItemInstance.new + @item_sets = ItemSet.all end # GET /settings/menu_item_instances/1/edit def edit id = MenuItemInstance.findParentCategory(@item) @category = MenuCategory.find(id) + @item_sets = ItemSet.all end # POST /settings/menu_item_instances @@ -45,6 +47,18 @@ class Settings::MenuItemInstancesController < ApplicationController id = MenuItemInstance.findParentCategory(catID) category = MenuCategory.find(id) + + # Bind for Item Sets + if params[:menu_item_instance][:item_sets].count > 1 + params[:menu_item_instance][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:menu_item_instance][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + respond_to do |format| if @settings_menu_item_instances.save @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?) @@ -70,6 +84,18 @@ class Settings::MenuItemInstancesController < ApplicationController id = MenuItemInstance.findParentCategory(catID) category = MenuCategory.find(id) + + # Bind for Item Sets + if params[:menu_item_instance][:item_sets].count > 1 + params[:menu_item_instance][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:menu_item_instance][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + respond_to do |format| if @settings_menu_item_instances.update(settings_menu_item_instance_params) @@ -122,8 +148,6 @@ class Settings::MenuItemInstancesController < ApplicationController # 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, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id) - + params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id, :is_default, :item_sets) end end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 60fa3b7d..4f451de5 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -33,29 +33,30 @@ class Settings::SetMenuItemsController < ApplicationController def create @settings_menu_item = MenuItem.new(settings_menu_item_params) - # if params[:simple_menu_item][:menu_item_id] == '' + # if params[:set_menu_item][:menu_item_id] == '' @settings_menu_item.menu_category_id = params[:menu_category_id] # end @settings_menu_item.created_by = current_login_employee.name + # Remove "" default first + params[:set_menu_item][:item_attributes].delete_at(0) + params[:set_menu_item][:item_options].delete_at(0) + # Bind for Item Sets - if params[:simple_menu_item][:item_sets].count > 1 - params[:simple_menu_item][:item_sets].delete_at(0) + if params[:set_menu_item][:item_sets].count > 1 + params[:set_menu_item][:item_sets].delete_at(0) - sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + sets = ItemSet.find(params[:set_menu_item][:item_sets]) if sets.count > 0 @settings_menu_item.item_sets = sets end end - - # Remove "" default first - params[:simple_menu_item][:item_attributes].delete_at(0) - params[:simple_menu_item][:item_options].delete_at(0) + respond_to do |format| if @settings_menu_item.save menu_item = MenuItem.find(@settings_menu_item.id) - menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + menu_item.update_attributes(item_attributes: params[:set_menu_item][:item_attributes], item_options: params[:set_menu_item][:item_options]) format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } @@ -70,14 +71,14 @@ class Settings::SetMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1.json def update # Remove "" default first - params[:simple_menu_item][:item_attributes].delete_at(0) - params[:simple_menu_item][:item_options].delete_at(0) + params[:set_menu_item][:item_attributes].delete_at(0) + params[:set_menu_item][:item_options].delete_at(0) # Bind for Item Sets - if params[:simple_menu_item][:item_sets].count > 1 - params[:simple_menu_item][:item_sets].delete_at(0) + if params[:set_menu_item][:item_sets].count > 1 + params[:set_menu_item][:item_sets].delete_at(0) - sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + sets = ItemSet.find(params[:set_menu_item][:item_sets]) if sets.count > 0 @settings_menu_item.item_sets = sets @@ -88,7 +89,7 @@ class Settings::SetMenuItemsController < ApplicationController respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) - @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + @settings_menu_item.update_attributes(item_attributes: params[:set_menu_item][:item_attributes], item_options: params[:set_menu_item][:item_options]) format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item } @@ -131,6 +132,6 @@ class Settings::SetMenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) + params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets) end end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 60949618..4cf9318c 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -37,6 +37,34 @@ class Settings::SimpleMenuItemsController < ApplicationController # end @settings_menu_item.created_by = current_login_employee.name + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) + + # attr_format = [] + # param_count = params[:simple_menu_item][:item_attributes].count + # # Format for attributes json + # params[:simple_menu_item][:item_attributes].each do|attr_id| + # menu_attr = MenuItemAttribute.find(attr_id) + # if attr_format.count == 0 + # attr_format.push({ type: menu_attr.attribute_type, value: [] }) + # end + + # attr_format.each do |af| + # if menu_attr.attribute_type == af[:type] + # af[:value].push(menu_attr.value) + # else + # new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] } + # attr_format.push(new_attr) + # end + + # break if attr_format.count > param_count + # end + + # param_count -= 1 + # end + # @settings_menu_item.item_attributes = attr_format + # Bind for Item Sets if params[:simple_menu_item][:item_sets].count > 1 params[:simple_menu_item][:item_sets].delete_at(0) @@ -47,14 +75,11 @@ class Settings::SimpleMenuItemsController < ApplicationController @settings_menu_item.item_sets = sets end end - - # Remove "" default first - params[:simple_menu_item][:item_attributes].delete_at(0) - params[:simple_menu_item][:item_options].delete_at(0) + respond_to do |format| if @settings_menu_item.save menu_item = MenuItem.find(@settings_menu_item.id) - menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + menu_item.update_attributes(item_options: params[:simple_menu_item][:item_options]) format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } @@ -129,6 +154,6 @@ class Settings::SimpleMenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) + params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets) end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ae3934e4..037767c9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,4 @@ module ApplicationHelper - def flash_class(level) case level when :notice then "alert alert-info fade-in" diff --git a/app/models/menu_item_attribute.rb b/app/models/menu_item_attribute.rb index a2fd0d1c..54d2f34e 100644 --- a/app/models/menu_item_attribute.rb +++ b/app/models/menu_item_attribute.rb @@ -1,6 +1,6 @@ class MenuItemAttribute < ApplicationRecord validates_presence_of :attribute_type, :name, :value def self.collection - MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] } + MenuItemAttribute.select("name, value").map { |e| [e.name, e.value] } end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index 579b7a5a..de5be7b5 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,5 +1,8 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item + + has_many :menu_instance_item_sets + has_many :item_sets, through: :menu_instance_item_sets # before_create :generate_menu_item_instance_code def self.findParentCategory(item) diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index ffad3dc2..297e7932 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,3 +1,26 @@ +# Format for attributes json +attr_format = [] +param_count = item.item_attributes.count +# Format for attributes json +item.item_attributes.each do|attr_id| + menu_attr = MenuItemAttribute.find(attr_id) + if attr_format.count == 0 + attr_format.push({ type: menu_attr.attribute_type, value: [] }) + end + + attr_format.each do |af| + if menu_attr.attribute_type == af[:type] + af[:value].push(menu_attr.value) + else + new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] } + attr_format.push(new_attr) + end + + break if attr_format.count > param_count + end + + param_count -= 1 +end #Menu Item Information json.id item.id @@ -12,7 +35,8 @@ json.account_id item.account_id json.min_qty item.min_qty json.is_available item.is_available json.is_sub_item item.is_sub_item -json.attributes item.item_attributes +json.item_sets item.item_sets +json.attributes attr_format json.options item.item_options # json.min_selectable_item item.min_selectable_item # json.max_selectable_item item.max_selectable_item @@ -26,17 +50,16 @@ json.options item.item_options # json.promotion_price = item_instance.promotion_price # json.item_attributes = item_instance.item_attributes -# elsif item.menu_item_instances.count > 1 then json.instances item.menu_item_instances do |is| json.code = is.item_instance_code json.name = is.item_instance_name json.price = is.price json.is_available = is.is_available + json.is_default = is.is_default json.is_on_promotion = is.is_on_promotion json.promotion_price = is.promotion_price json.item_attributes = is.item_attributes - # end - + json.item_sets is.item_sets end #Child Menu items diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index 54edfab4..c86ff780 100644 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -3,21 +3,32 @@ <%= f.error_notification %> -
    - <%= f.input :item_instance_code %> - <%= f.input :item_instance_name %> - <%= f.input :price %> +
    +
    + <%= f.input :item_instance_code %> + <%= f.input :item_instance_name %> + <%= f.input :price %> - <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> + <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> - - <%= f.input :is_on_promotion %> - <%= f.input :promotion_price %> - <%= f.input :is_available %> + <%= f.input :is_on_promotion %> + <%= f.input :promotion_price %> +
    -
    - <%= f.button :submit %> +
    +
    +
    + <%= f.input :is_available %> + <%= f.input :is_default %> + + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
    +
    + +
    + <%= f.button :submit %> +
    <% end %> diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index 01a47cc0..d5884474 100644 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -11,6 +11,6 @@
  • Edit
    • - <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances %> + <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
    diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index ccbc8fe8..9b1c5331 100644 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -14,6 +14,6 @@
  • New Menu Item Instance
    • - <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances %> + <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
    diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 40383b51..2fb1ca39 100644 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -24,8 +24,8 @@ On Promotion Promotion Price Available - Created At - + Is Default + Created At @@ -38,6 +38,7 @@ <%= @settings_menu_item_instances.is_on_promotion %> <%= @settings_menu_item_instances.promotion_price %> <%= @settings_menu_item_instances.is_available %> + <%= @settings_menu_item_instances.is_default %> <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if params[:simple_menu_item_id] %> <%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %> diff --git a/db/migrate/20170402084230_create_menu_item_instances.rb b/db/migrate/20170402084230_create_menu_item_instances.rb index c79cb322..8e95f8f5 100644 --- a/db/migrate/20170402084230_create_menu_item_instances.rb +++ b/db/migrate/20170402084230_create_menu_item_instances.rb @@ -9,6 +9,7 @@ class CreateMenuItemInstances < ActiveRecord::Migration[5.1] t.boolean :is_on_promotion, :null => false, :default => false t.decimal :promotion_price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.boolean :is_available, :null => false, :default => true + t.boolean :is_default, :null => false, :default => true t.timestamps end end diff --git a/db/seeds.rb b/db/seeds.rb index 2a9e422a..bf458f2a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -125,6 +125,7 @@ product = Account.create({title: "Product", account_type: "2"}) #Default Menu Options menu_options = MenuItemOption.create([{option_type: "Spicy", name: "Less Spicy", value: "less_spicy"},{option_type: "Spicy", name: "Spicy", value: "spicy"},{option_type: "Spicy", name: "Super Spicy", value: "super_spicy"}]) menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{option_type: "Sweet", name: "Less Sweet", value: "less_sweet"}]) +menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle", value: "Bottle"},{option_type: "Package", name: "Can", value: "can"}]) # #Default Menu Category menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"}) diff --git a/public/image/menu_images/icons8-Food-100.png b/public/image/menu_images/icons8-Food-100.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e616915a0092eebe86fb03492d432df762dd9 GIT binary patch literal 5031 zcmV;Y6IkqtP)=6J8S`pvvI{d)Rc zqnXhtMORTsdVT-;JNo;&zb3eo3Tg&OLG|WNXK)9Q0$T*GfNWX6<9QJBLV@+$TX!fb z2+*cdy!wx?)wg*oWS{HbH#F4+D4wSTwVBpMDB1!lUVZro^%rDy*aGs(#-<9Yl0B5t zd6_m|P~|k#H@sHAGt)k8-O#idz;`n(FO=)mfT#bVvA#vD&lZp^8=AHe;P124fr6+e z5XTI=mFd*MEgPEF65!Wa9z<^-jt9m5*aEV3L(@$F6|56e@0*U`O6W=IaZrEPGjqi^X5S>>7?;9DP{g=@xLRkMV9B#*G-AeDDlVaeAL6VKA_t#6t?+m!+6o`%MC zb*_MHUEj131h24+<)4~_mET&8V8B)W`xs*WvR=N}jr~7(%WSZrvEJ7}{_Ulv1xf%% zjS5ybJY&{%ZvQE?A2_Z5?gR*r#k zTZ3r%@ow7%B3&(8H|%Huh)#cZKQb40e|8=ifs8FuP#ge?6#}I|DJH5?L{y5QI7K+F z=>tFV+OHA4J*fYz0V`zMjUCPM+LcHJJcZ0$dLL#jn`2gU@aKEbbGbVW5Rsj!8Xn|T zaycODo6aMtYtMdWIVxw}oj)FvgO*Od{to&sT{CL_=Z405rowtkytX-Y&ZjVc^+RU4 z!@Kt5+Q*;hzdHePU)_AvE}AK&9&v%#P)JIM&H2VEU5C} z)ceQKaim>JJv^%u7f2c)ybvoYAA^N2Jw56Hxqa~(PW|j1V;sE=jr9|}4vJTKdEv~; zJIM(r`NFHqqUxIl2rtCSrcc8C&#m&>_kztAxix^J-`{2S&#UU|r1G-L-f8>|;*pqC zaPxpnx_1f|tzBle@1**s0kUQNj-7;%=UM5=i$9GSD;F2+MEmI&uljn`w0Le2EDB=P zx7S#jT@QWQ&$tUVuSL`HXlQg&dD%dDKvr#d3c=!# zIsU8dT{zNwK>uA-m&LNY>MLVerVXohw@w0ZMU^r4IvFZ$gbkrTt=g z$4<72iI3iB!OiwgBflrr*Gc6SCzap9vu`|Gk^#bR9C?bB0b<&1Mid3EaR$h|b*UY4 z&)G{j`>X$R?B47ze-4$ir<-{$e{dX^_x&mHJEhGH+t;mi8=sTPd;8ig?E8;*%_^J# zVU)uth)=viz^lF%Kt!XWTZi-c{fjdyFeVhxo7~sghpvHyFttlHWkq;+$~g1$gJTr zq*yhx-cSizqYAF534p{@8PM=Zv5JXGir87+x5Gg*s~1hnN#*4MVW#&-ziHJ*nfArB zFe8b8*r~o&KscjfO%cIk6H-EoQVKO32Biu6&}d9M`%`kr&B!RKyrR%{lM!rwc%kn| zL7dgs3ds5$yFiGp+btZcV9_|mGVhuihdMMg8nMv({Ca-~vE;c9H`P~U-%cxBCbUIB zc%KOSW~cfJ6p~VTmzM`IyEL68s6&I$)X_;LyTd_TO|dygP0LN?b=qebE7obBA_8Wp zz9P#qneLMlLYPvNZhKT?QD{-Qx>@L?b1gxdI=%=u{_y6gn`l%qnK41KoRJu)3)9V zE4ZY(??c>F-fS*3QT4UmsV^-H;(;-8M)1a9%2?`TT;u_<+l6O~N*GJ)I(5;g&I*X- z#0deIV0TMr`l9$CxlbHND84ebFe&Du8o>W1&F_@bj!oOw*kg5y74J8=Q|;S!5m4Cm&Oa0W&LcR2vNgy>fw+B&$igOMUUZd z0qH!^f#bh74)3LGYw3V+UPGqde!bedA2B-eR!`j_XD5bZQ5UG86TYaxnV{Eq`AhgBMI$2(Jn40Y;hMUsBptM5?kp-+zX@Ic1g=&mm zFgjxA7r7A8aNu?vWeUNniXe&u1iWdUt;QaWpfW%$8_eMjCX@2bgCX415<_)kSA6}9 zbrDK;@t{n*zXtOj&-|>~@wY!j=gAJU8MZ()O6rUg@KOQ63$<|pg0EN0*_Lc_n6D%p zjpFUW5PB#NB+%Y%UJzNQtqR2-DP^+cnTa8cQ|vV^qoorA zDh~9g43G~OshCq_HAuRx%4~hN8Wa6r*5UiXSh*J0K`}29GE)dMEE;zXW&LI*7Ip#D zI0Nj)Hf?8ElqEIA0X$ZbIz}UFJfczj^m>XKri6giW8xMcJUhbk`*4ByF;G^#xLV4-L~E{IuZxD~xa7riT6O~77y$E?{P&FnAdIU1 zx+Hl5;*Tq)S0_&4ajCPd zy}I+rIsHNj6W)}NwQkqxTzQbFkJ}x7F#5r?udXP??2-VgxJ@N9vvh`|*xjG9k9{de z6tZ_nL3^A#!X&v5?sf9*^6?(U&#ZnJWp`DkW$irLj;^-Er5&&G%M}ojb+MJtKyli^ z+YO@SRt)Ec5_^}s6iweqW;w|41M*P)1z1%jl` zZAYFdP$Lcq>$vPNwws_A2h0S2SumY2*)dfbi}?nI(cA|^L0pQbWD~RIYLu+aMo1V*L@N~D)6U*W|#V7@ovTJXNfFA&uO1!L0@w88ITagSHEi$BQWNwL>)DI0QDW{WO zAh(pkTF4L(csX(J8xWaHVSi&RZ0=Y^Kcqd}8VORT~qVZ2fMsHAQLBQ zcyyV)V$%HEl#?%K6e3|^+Xx}4>qS`r#$q{k1cL4f#K{Yp1SZQA9R8Tl)F~>~JY{dI z`~DA0%x1h8HZx*b;z0DhN*tSI5$H0d7zW5tG-^u`OmKscjhh_HZ?mPiX8Eu$XiFYDR< zasUy0^*kWg|MX{k{JTW37O%d8tk1N^3i+7Ez9_^)NRPZyh-h-)0kH-d^B48a<2+_9 zn-}Ml(b(0K9k_TX5lYs}LK`tal%fzG`p&cFB=LY`8t^!4GwxE67t^~@gDw>>Yk5d);^ff<+x`6w7bqqmNM`Z@)re&5mTO@r%WP;W@(;1S7Twj8BmB@oUXi52!EFP7P|7xL@Eo*}T^@ zFuINF4j{hZ04(m?1v4@2!PKh5ZZJP>c+a_P6$<`-FLM%hj2a?FHkdK1-B` z&o9IT4{xh<96XI{r_6hWj^oO+3~_!a#_AJscjkDRz-;I7;|np`_T!`)F+k?lKam!n zod?7%CStZH+G~A&d?7MG+-`D>7$CBjdq#uT(2p-fP9e^|o;!eeC5>c0FBf&hD*asC z$r~VE-nQyFcNu5jG@dLiOs}CIUx)#WA177b0O5^tqPNiKxW!53!FS+uaSuDYUtfp} z5I1jV-T>k4Saxq)iEl-@8RCXL!#*qU>kE-nh_g>5FMuQ?L$LQ`_2+t=o>Jmp<)px_ zO^x*h^GqBMNN8*c7CdWtSJ)QbXkQq|-blS3?d0ppIUvbFu(!x{Fc`a9xPEQg6Gp~p ztjB@$nBY4DA-p_N2dnv6&cqjDl=teS$_XIf`}U6I8YS%ZD|;B;vW&bu+QOTZs-UZ_bxz3uVS&o*7FbpQVE|A{>L^er0>BUG-Y+gi_1t@0IXCmK zGf)Pv*@U#BxB#Gqg0|!npiF!rGC-Uxz8L|Myr9G0I!vPg*=#c*KK--veZQ&8Hj1CL zo-v(Pwn!!cBA~mzvwdB&E8-bu-~p+aUX58R7kRGf@PEDwEta_YmQ_H!zEf2^r4l7m zt5G^*3W}=AJ$GEps6}H4pTB}|=XFH7Zb0o1JJ!Y2N+pC9xsW+LAQSJMihDjc&-1uW z?AnL$&A#jcVt4zLgn}rUIuS)x6)2uorT?6(r1lMBsOttI-M0|w>PGBF;t_d1x#{|u z_O0Mp7Vn%1m5sr;x%Z%WYSpkPAk)b)$}tLJloS4Q7y8d$PF3e2(52tDdG4ST1u_4t zbzuLyrNN#)oNV4_X3Lt|%bN|RJ+~4{ne_<=w~podd(Znv(f`pUy_sBCi^V`ZUL92D z-aCTci`NpvcR2y?OQ`dJOkVRyuIJZx{rzVyVju~Kmy_nc8vq~%Fmt<(U_Jdl%m8L$ zhxuUrnG7b+Wpd(i6sd%bi5+y9Jg3&ezS!=(0gfQ+uoV*1(-D?J>nU0&aS Date: Fri, 18 Aug 2017 20:05:25 +0630 Subject: [PATCH 162/246] update addorder --- app/views/origami/addorders/show.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 0e8a8163..19452e96 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -51,7 +51,6 @@
    -
    - - - -
    + + + + @@ -207,6 +214,6 @@ $(document).on('turbolinks:load', function() { - + diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 813d46b2..7b094582 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -61,7 +61,7 @@
  • - +
  • diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index c60e8917..a79c1ce1 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1,585 +1,596 @@
    - -
    + +
    - + - + +
    + -
    -
    - <% @complete.each do |sale| %> -
    -
    - <%= sale.receipt_no %> - <%= sale.sale_status %> -
    -
    - <% end %> -
    -
    +
    +
    + <% @complete.each do |sale| %> +
    +
    + <%= sale.receipt_no %> + <%= sale.sale_status %> +
    +
    + <% end %> +
    +
    - -
    -
    - <% @tables.each do |table| %> - <% if table.status == 'occupied' %> + +
    +
    + <% @tables.each do |table| %> + <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> -
    -
    - <%= table.name %> - billed -
    -
    -
    - <% else %> -
    -
    - <%= table.name %> - new -
    -
    - <% end %> - <% else %> -
    -
    - <%= table.name %> -
    -
    - <% end %> - <% end %> -
    -
    - - -
    -
    - <% @rooms.each do |room| %> - <% if room.status == 'occupied' %> - -
    -
    - <%= room.name %> - <% if room.get_booking.nil? %> - billed + <% if table.get_booking.nil? %> +
    +
    + <%= table.name %> + billed +
    +
    +
    + <% else %> +
    +
    + <%= table.name %> + new +
    +
    + <% end %> <% else %> - new +
    +
    + <%= table.name %> +
    +
    <% end %> -
    -
    - <% else %> -
    -
    - <%= room.name %> -
    -
    - <% end %> - <% end %> -
    -
    + <% end %> +
    +
    - -
    -
    + +
    +
    + <% @rooms.each do |room| %> + <% if room.status == 'occupied' %> - <% @orders.each do |order| %> -
    -
    - <%= order.order_id %> -
    -
    - <% end %> -
    -
    -
    - -
    - +
    +
    + <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %> +
    +
    + <% else %> +
    +
    + <%= room.name %> +
    +
    + <% end %> + <% end %> +
    +
    - + +
    +
    + + <% @orders.each do |order| %> +
    +
    + <%= order.order_id %> +
    +
    + <% end %> +
    +
    +
    + +
    + + +
    -
    -
    +
    +
    - <% if @status_order == 'order' && @status_sale != 'sale' %> -
    ORDER DETAILS | Table <%= @dining.name rescue "" %>
    - <% elsif @status_sale == 'sale' %> -
    INVOICE DETAILS | Table <%= @dining.name rescue "" %>
    - <% end %> -
    -
    -
    -
    -

    Receipt No: + <% if @status_order == 'order' && @status_sale != 'sale' %> +

    + ORDER DETAILS | Table <%= @dining.name rescue "" %>
    + <% elsif @status_sale == 'sale' %> +
    INVOICE DETAILS | Table <%= @dining.name rescue "" %>
    + <% end %> +
    +
    +
    +
    +

    Receipt No: <% if @status_sale == 'sale' %> <%= @sale_array[0].receipt_no rescue '' %> - + <% end %>

    -
    -
    +
    +
    -

    Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    -
    +

    Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %> +

    +
    +
    -
    -
    - <% if @status_sale == 'sale' %> - -

    Customer : <%= @sale_array[0].customer.name rescue '' %>

    - <%else%> - -

    Customer : <%= @customer.name rescue "" %>

    - <%end%> -
    -
    -
    - - - +
    +
    + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale_array[0].customer.name rescue '' %>

    + <% else %> + +

    Customer : <%= @customer.name rescue "" %>

    + <% end %> +
    +
    +
    +
    + + - - - - - - <% - count = 0 - sub_total = 0 - if @status_sale == "sale" - @sale_array[0].sale_items.each do |sale_item| + + + + + + <% + count = 0 + sub_total = 0 + if @status_sale == "sale" + @sale_array[0].sale_items.each do |sale_item| - sub_total = sub_total + sale_item.price - %> - - <% - # Can't check for discount - unless sale_item.price == 0 - count += 1 - %> - - - - - - - - <% - - end - end - end - - if @status_order == 'order' && @status_sale != 'sale' - unless @order_items.nil? - count = 0 - @order_items.each do |order_item | + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 count += 1 - sub_total = sub_total + (order_item.price * order_item.qty) + %> + + + + + + - unless order_item.price == 0 %> - - - - - - - <% + <% - end - end - end - end - %> - -
    #ItemsQTY - Price -
    #ItemsQTY + + Price + +
    <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
    <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
    <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    -
    -
    - - - - - - - <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> - - <%else%> - - <%end%> + end + end + end - - - <% if @status_sale == "sale" %> - - - - - - - - - - - - + if @status_order == 'order' && @status_sale != 'sale' + unless @order_items.nil? + count = 0 + @order_items.each do |order_item| + count += 1 + sub_total = sub_total + (order_item.price * order_item.qty) + + unless order_item.price == 0 %> + + + + + + + <% + + end + end + end + end + %> + +
    Sub Total:<%= sub_total %>
    Member Discount:Discount:(<%= @obj_sale.total_discount rescue 0%>)
    Tax:<%= @obj_sale.total_tax rescue 0%>
    Rounding Adj:<%= @obj_sale.rounding_adjustment rescue 0%>
    Grand Total:<%= @obj_sale.grand_total rescue 0%>
    <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    +
    +
    + + + + + + + <% if @obj_sale != nil && @obj_sale.discount_type == 'member_discount' %> + + <% else %> + <% end %> - -
    Sub Total:<%= sub_total %>
    Member Discount:Discount:
    -
    -
    - <% - if @status_sale == 'sale' - unless @order_items.nil? - %> - Pending New Order - + + + <% if @status_sale == "sale" %> + + + + + + + + + + + + + <% end %> + +
    (<%= @obj_sale.total_discount rescue 0 %>)
    Tax:<%= @obj_sale.total_tax rescue 0 %>
    Rounding Adj: + <%= @obj_sale.rounding_adjustment rescue 0 %>
    Grand Total:<%= @obj_sale.grand_total rescue 0 %> +
    +
    +
    + + <% + if @status_sale == 'sale' + unless @order_items.nil? + %> + Pending New Order + <% - count = 0 - @order_items.each do |order_item | - count += 1 + count = 0 + @order_items.each do |order_item| + count += 1 %> - - - - - + + + + + <% - end - %> -
    <%= count %> - <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    <%= count %> + <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    - - <% end %> - <% if @sale_array.size > 1 %> -

    - Pending Payment - <% end %> - <% @sale_array.each do |sale| - if @sale_array.size > 1 - unless sale.receipt_no == @sale_array[0].receipt_no - %> + end + %> + + + <% end %> + <% if @sale_array.size > 1 %> +

    + Pending Payment + <% end %> + <% @sale_array.each do |sale| + if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no + %> - +
    Receipt No - <%= sale.receipt_no %> + +
    - <% - end - end - end - end - %> -
    -
    + <% + end + end + end + end + %> +
    +
    • - -
    - + +
    + - - - <% if @dining.bookings.length >= 1 %> - - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - - - - - <% else %> - - - - - - - - - <% end %> - + + + <% if @dining.bookings.length >= 1 %> + + <% if @status_order == 'order' && @status_sale != 'sale' %> + + + + + + + + + <% else %> + + + + + + + + + + <% end %> + - - <% end %> -
    + + <% end %> +
    diff --git a/app/views/origami/product_commissions/_form.html.erb b/app/views/origami/product_commissions/_form.html.erb new file mode 100644 index 00000000..8dc34795 --- /dev/null +++ b/app/views/origami/product_commissions/_form.html.erb @@ -0,0 +1,10 @@ +<%= simple_form_for(@product_commission) do |f| %> + <%= f.error_notification %> + +
    +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/origami/product_commissions/_product_commission.json.jbuilder b/app/views/origami/product_commissions/_product_commission.json.jbuilder new file mode 100644 index 00000000..62361604 --- /dev/null +++ b/app/views/origami/product_commissions/_product_commission.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! product_commission, :id, :created_at, :updated_at +json.url product_commission_url(product_commission, format: :json) diff --git a/app/views/origami/product_commissions/edit.html.erb b/app/views/origami/product_commissions/edit.html.erb new file mode 100644 index 00000000..021c55c0 --- /dev/null +++ b/app/views/origami/product_commissions/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Product Commission

    + +<%= render 'form', product_commission: @product_commission %> + +<%= link_to 'Show', @product_commission %> | +<%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/index.html.erb b/app/views/origami/product_commissions/index.html.erb new file mode 100644 index 00000000..d64dc18f --- /dev/null +++ b/app/views/origami/product_commissions/index.html.erb @@ -0,0 +1,25 @@ +

    <%= notice %>

    + +

    Product Commissions

    + + + + + + + + + + <% @product_commissions.each do |product_commission| %> + + + + + + <% end %> + +
    <%= link_to 'Show', product_commission %><%= link_to 'Edit', edit_product_commission_path(product_commission) %><%= link_to 'Destroy', product_commission, method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Product Commission', new_product_commission_path %> diff --git a/app/views/origami/product_commissions/index.json.jbuilder b/app/views/origami/product_commissions/index.json.jbuilder new file mode 100644 index 00000000..e79e1dff --- /dev/null +++ b/app/views/origami/product_commissions/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @product_commissions, partial: 'product_commissions/product_commission', as: :product_commission diff --git a/app/views/origami/product_commissions/new.html.erb b/app/views/origami/product_commissions/new.html.erb new file mode 100644 index 00000000..68a3f804 --- /dev/null +++ b/app/views/origami/product_commissions/new.html.erb @@ -0,0 +1,5 @@ +

    New Product Commission

    + +<%= render 'form', product_commission: @product_commission %> + +<%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/show.html.erb b/app/views/origami/product_commissions/show.html.erb new file mode 100644 index 00000000..054447a1 --- /dev/null +++ b/app/views/origami/product_commissions/show.html.erb @@ -0,0 +1,4 @@ +

    <%= notice %>

    + +<%= link_to 'Edit', edit_product_commission_path(@product_commission) %> | +<%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/show.json.jbuilder b/app/views/origami/product_commissions/show.json.jbuilder new file mode 100644 index 00000000..634630c7 --- /dev/null +++ b/app/views/origami/product_commissions/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "product_commissions/product_commission", product_commission: @product_commission diff --git a/db/migrate/20170822034139_create_product_commissions.rb b/db/migrate/20170822034139_create_product_commissions.rb new file mode 100644 index 00000000..95f9442d --- /dev/null +++ b/db/migrate/20170822034139_create_product_commissions.rb @@ -0,0 +1,12 @@ +class CreateProductCommissions < ActiveRecord::Migration[5.1] + def change + create_table :product_commissions do |t| + t.string :product_code + t.integer :commission_id + t.integer :qty + t.string :sale_id + t.string :sale_item_id + t.timestamps + end + end +end diff --git a/spec/controllers/origami/product_commissions_controller_spec.rb b/spec/controllers/origami/product_commissions_controller_spec.rb new file mode 100644 index 00000000..dc69b3d2 --- /dev/null +++ b/spec/controllers/origami/product_commissions_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Origami::ProductCommissionsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # ProductCommission. As you add validations to ProductCommission, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Origami::ProductCommissionsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + product_commission = ProductCommission.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + product_commission = ProductCommission.create! valid_attributes + get :show, params: {id: product_commission.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + product_commission = ProductCommission.create! valid_attributes + get :edit, params: {id: product_commission.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new ProductCommission" do + expect { + post :create, params: {origami_product_commission: valid_attributes}, session: valid_session + }.to change(ProductCommission, :count).by(1) + end + + it "redirects to the created origami_product_commission" do + post :create, params: {origami_product_commission: valid_attributes}, session: valid_session + expect(response).to redirect_to(ProductCommission.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {origami_product_commission: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested origami_product_commission" do + product_commission = ProductCommission.create! valid_attributes + put :update, params: {id: product_commission.to_param, origami_product_commission: new_attributes}, session: valid_session + product_commission.reload + skip("Add assertions for updated state") + end + + it "redirects to the origami_product_commission" do + product_commission = ProductCommission.create! valid_attributes + put :update, params: {id: product_commission.to_param, origami_product_commission: valid_attributes}, session: valid_session + expect(response).to redirect_to(product_commission) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + product_commission = ProductCommission.create! valid_attributes + put :update, params: {id: product_commission.to_param, origami_product_commission: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested origami_product_commission" do + product_commission = ProductCommission.create! valid_attributes + expect { + delete :destroy, params: {id: product_commission.to_param}, session: valid_session + }.to change(ProductCommission, :count).by(-1) + end + + it "redirects to the product_commissions list" do + product_commission = ProductCommission.create! valid_attributes + delete :destroy, params: {id: product_commission.to_param}, session: valid_session + expect(response).to redirect_to(product_commissions_url) + end + end + +end diff --git a/spec/helpers/origami/product_commissions_helper_spec.rb b/spec/helpers/origami/product_commissions_helper_spec.rb new file mode 100644 index 00000000..59a4bdfc --- /dev/null +++ b/spec/helpers/origami/product_commissions_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::ProductCommissionsHelper. For example: +# +# describe Origami::ProductCommissionsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::ProductCommissionsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/product_commission_spec.rb b/spec/models/product_commission_spec.rb new file mode 100644 index 00000000..11393dd9 --- /dev/null +++ b/spec/models/product_commission_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ProductCommission, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/origami/origami_product_commissions_spec.rb b/spec/requests/origami/origami_product_commissions_spec.rb new file mode 100644 index 00000000..a4827434 --- /dev/null +++ b/spec/requests/origami/origami_product_commissions_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Origami::ProductCommissions", type: :request do + describe "GET /origami_product_commissions" do + it "works! (now write some real specs)" do + get origami_product_commissions_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/origami/product_commissions_routing_spec.rb b/spec/routing/origami/product_commissions_routing_spec.rb new file mode 100644 index 00000000..1f6fed66 --- /dev/null +++ b/spec/routing/origami/product_commissions_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Origami::ProductCommissionsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/origami/product_commissions").to route_to("origami/product_commissions#index") + end + + it "routes to #new" do + expect(:get => "/origami/product_commissions/new").to route_to("origami/product_commissions#new") + end + + it "routes to #show" do + expect(:get => "/origami/product_commissions/1").to route_to("origami/product_commissions#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/origami/product_commissions/1/edit").to route_to("origami/product_commissions#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/origami/product_commissions").to route_to("origami/product_commissions#create") + end + + it "routes to #update via PUT" do + expect(:put => "/origami/product_commissions/1").to route_to("origami/product_commissions#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/origami/product_commissions/1").to route_to("origami/product_commissions#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/origami/product_commissions/1").to route_to("origami/product_commissions#destroy", :id => "1") + end + + end +end diff --git a/spec/views/origami/product_commissions/edit.html.erb_spec.rb b/spec/views/origami/product_commissions/edit.html.erb_spec.rb new file mode 100644 index 00000000..5a19033a --- /dev/null +++ b/spec/views/origami/product_commissions/edit.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/edit", type: :view do + before(:each) do + @origami_product_commission = assign(:origami_product_commission, ProductCommission.create!()) + end + + it "renders the edit origami_product_commission form" do + render + + assert_select "form[action=?][method=?]", origami_product_commission_path(@origami_product_commission), "post" do + end + end +end diff --git a/spec/views/origami/product_commissions/index.html.erb_spec.rb b/spec/views/origami/product_commissions/index.html.erb_spec.rb new file mode 100644 index 00000000..655db3a8 --- /dev/null +++ b/spec/views/origami/product_commissions/index.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/index", type: :view do + before(:each) do + assign(:product_commissions, [ + ProductCommission.create!(), + ProductCommission.create!() + ]) + end + + it "renders a list of origami/product_commissions" do + render + end +end diff --git a/spec/views/origami/product_commissions/new.html.erb_spec.rb b/spec/views/origami/product_commissions/new.html.erb_spec.rb new file mode 100644 index 00000000..37e78caa --- /dev/null +++ b/spec/views/origami/product_commissions/new.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/new", type: :view do + before(:each) do + assign(:origami_product_commission, ProductCommission.new()) + end + + it "renders new origami_product_commission form" do + render + + assert_select "form[action=?][method=?]", product_commissions_path, "post" do + end + end +end diff --git a/spec/views/origami/product_commissions/show.html.erb_spec.rb b/spec/views/origami/product_commissions/show.html.erb_spec.rb new file mode 100644 index 00000000..a74efa8a --- /dev/null +++ b/spec/views/origami/product_commissions/show.html.erb_spec.rb @@ -0,0 +1,11 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/show", type: :view do + before(:each) do + @origami_product_commission = assign(:origami_product_commission, ProductCommission.create!()) + end + + it "renders attributes in

    " do + render + end +end From a400bb5a0e01e8c3e9425f61660d4487214bf908 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 22 Aug 2017 11:44:31 +0630 Subject: [PATCH 181/246] remove extra menu image --- .../public/image/menu_images/icons8-Food-100.png | Bin 5031 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/public/image/menu_images/icons8-Food-100.png diff --git a/public/public/image/menu_images/icons8-Food-100.png b/public/public/image/menu_images/icons8-Food-100.png deleted file mode 100644 index a77e616915a0092eebe86fb03492d432df762dd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5031 zcmV;Y6IkqtP)=6J8S`pvvI{d)Rc zqnXhtMORTsdVT-;JNo;&zb3eo3Tg&OLG|WNXK)9Q0$T*GfNWX6<9QJBLV@+$TX!fb z2+*cdy!wx?)wg*oWS{HbH#F4+D4wSTwVBpMDB1!lUVZro^%rDy*aGs(#-<9Yl0B5t zd6_m|P~|k#H@sHAGt)k8-O#idz;`n(FO=)mfT#bVvA#vD&lZp^8=AHe;P124fr6+e z5XTI=mFd*MEgPEF65!Wa9z<^-jt9m5*aEV3L(@$F6|56e@0*U`O6W=IaZrEPGjqi^X5S>>7?;9DP{g=@xLRkMV9B#*G-AeDDlVaeAL6VKA_t#6t?+m!+6o`%MC zb*_MHUEj131h24+<)4~_mET&8V8B)W`xs*WvR=N}jr~7(%WSZrvEJ7}{_Ulv1xf%% zjS5ybJY&{%ZvQE?A2_Z5?gR*r#k zTZ3r%@ow7%B3&(8H|%Huh)#cZKQb40e|8=ifs8FuP#ge?6#}I|DJH5?L{y5QI7K+F z=>tFV+OHA4J*fYz0V`zMjUCPM+LcHJJcZ0$dLL#jn`2gU@aKEbbGbVW5Rsj!8Xn|T zaycODo6aMtYtMdWIVxw}oj)FvgO*Od{to&sT{CL_=Z405rowtkytX-Y&ZjVc^+RU4 z!@Kt5+Q*;hzdHePU)_AvE}AK&9&v%#P)JIM&H2VEU5C} z)ceQKaim>JJv^%u7f2c)ybvoYAA^N2Jw56Hxqa~(PW|j1V;sE=jr9|}4vJTKdEv~; zJIM(r`NFHqqUxIl2rtCSrcc8C&#m&>_kztAxix^J-`{2S&#UU|r1G-L-f8>|;*pqC zaPxpnx_1f|tzBle@1**s0kUQNj-7;%=UM5=i$9GSD;F2+MEmI&uljn`w0Le2EDB=P zx7S#jT@QWQ&$tUVuSL`HXlQg&dD%dDKvr#d3c=!# zIsU8dT{zNwK>uA-m&LNY>MLVerVXohw@w0ZMU^r4IvFZ$gbkrTt=g z$4<72iI3iB!OiwgBflrr*Gc6SCzap9vu`|Gk^#bR9C?bB0b<&1Mid3EaR$h|b*UY4 z&)G{j`>X$R?B47ze-4$ir<-{$e{dX^_x&mHJEhGH+t;mi8=sTPd;8ig?E8;*%_^J# zVU)uth)=viz^lF%Kt!XWTZi-c{fjdyFeVhxo7~sghpvHyFttlHWkq;+$~g1$gJTr zq*yhx-cSizqYAF534p{@8PM=Zv5JXGir87+x5Gg*s~1hnN#*4MVW#&-ziHJ*nfArB zFe8b8*r~o&KscjfO%cIk6H-EoQVKO32Biu6&}d9M`%`kr&B!RKyrR%{lM!rwc%kn| zL7dgs3ds5$yFiGp+btZcV9_|mGVhuihdMMg8nMv({Ca-~vE;c9H`P~U-%cxBCbUIB zc%KOSW~cfJ6p~VTmzM`IyEL68s6&I$)X_;LyTd_TO|dygP0LN?b=qebE7obBA_8Wp zz9P#qneLMlLYPvNZhKT?QD{-Qx>@L?b1gxdI=%=u{_y6gn`l%qnK41KoRJu)3)9V zE4ZY(??c>F-fS*3QT4UmsV^-H;(;-8M)1a9%2?`TT;u_<+l6O~N*GJ)I(5;g&I*X- z#0deIV0TMr`l9$CxlbHND84ebFe&Du8o>W1&F_@bj!oOw*kg5y74J8=Q|;S!5m4Cm&Oa0W&LcR2vNgy>fw+B&$igOMUUZd z0qH!^f#bh74)3LGYw3V+UPGqde!bedA2B-eR!`j_XD5bZQ5UG86TYaxnV{Eq`AhgBMI$2(Jn40Y;hMUsBptM5?kp-+zX@Ic1g=&mm zFgjxA7r7A8aNu?vWeUNniXe&u1iWdUt;QaWpfW%$8_eMjCX@2bgCX415<_)kSA6}9 zbrDK;@t{n*zXtOj&-|>~@wY!j=gAJU8MZ()O6rUg@KOQ63$<|pg0EN0*_Lc_n6D%p zjpFUW5PB#NB+%Y%UJzNQtqR2-DP^+cnTa8cQ|vV^qoorA zDh~9g43G~OshCq_HAuRx%4~hN8Wa6r*5UiXSh*J0K`}29GE)dMEE;zXW&LI*7Ip#D zI0Nj)Hf?8ElqEIA0X$ZbIz}UFJfczj^m>XKri6giW8xMcJUhbk`*4ByF;G^#xLV4-L~E{IuZxD~xa7riT6O~77y$E?{P&FnAdIU1 zx+Hl5;*Tq)S0_&4ajCPd zy}I+rIsHNj6W)}NwQkqxTzQbFkJ}x7F#5r?udXP??2-VgxJ@N9vvh`|*xjG9k9{de z6tZ_nL3^A#!X&v5?sf9*^6?(U&#ZnJWp`DkW$irLj;^-Er5&&G%M}ojb+MJtKyli^ z+YO@SRt)Ec5_^}s6iweqW;w|41M*P)1z1%jl` zZAYFdP$Lcq>$vPNwws_A2h0S2SumY2*)dfbi}?nI(cA|^L0pQbWD~RIYLu+aMo1V*L@N~D)6U*W|#V7@ovTJXNfFA&uO1!L0@w88ITagSHEi$BQWNwL>)DI0QDW{WO zAh(pkTF4L(csX(J8xWaHVSi&RZ0=Y^Kcqd}8VORT~qVZ2fMsHAQLBQ zcyyV)V$%HEl#?%K6e3|^+Xx}4>qS`r#$q{k1cL4f#K{Yp1SZQA9R8Tl)F~>~JY{dI z`~DA0%x1h8HZx*b;z0DhN*tSI5$H0d7zW5tG-^u`OmKscjhh_HZ?mPiX8Eu$XiFYDR< zasUy0^*kWg|MX{k{JTW37O%d8tk1N^3i+7Ez9_^)NRPZyh-h-)0kH-d^B48a<2+_9 zn-}Ml(b(0K9k_TX5lYs}LK`tal%fzG`p&cFB=LY`8t^!4GwxE67t^~@gDw>>Yk5d);^ff<+x`6w7bqqmNM`Z@)re&5mTO@r%WP;W@(;1S7Twj8BmB@oUXi52!EFP7P|7xL@Eo*}T^@ zFuINF4j{hZ04(m?1v4@2!PKh5ZZJP>c+a_P6$<`-FLM%hj2a?FHkdK1-B` z&o9IT4{xh<96XI{r_6hWj^oO+3~_!a#_AJscjkDRz-;I7;|np`_T!`)F+k?lKam!n zod?7%CStZH+G~A&d?7MG+-`D>7$CBjdq#uT(2p-fP9e^|o;!eeC5>c0FBf&hD*asC z$r~VE-nQyFcNu5jG@dLiOs}CIUx)#WA177b0O5^tqPNiKxW!53!FS+uaSuDYUtfp} z5I1jV-T>k4Saxq)iEl-@8RCXL!#*qU>kE-nh_g>5FMuQ?L$LQ`_2+t=o>Jmp<)px_ zO^x*h^GqBMNN8*c7CdWtSJ)QbXkQq|-blS3?d0ppIUvbFu(!x{Fc`a9xPEQg6Gp~p ztjB@$nBY4DA-p_N2dnv6&cqjDl=teS$_XIf`}U6I8YS%ZD|;B;vW&bu+QOTZs-UZ_bxz3uVS&o*7FbpQVE|A{>L^er0>BUG-Y+gi_1t@0IXCmK zGf)Pv*@U#BxB#Gqg0|!npiF!rGC-Uxz8L|Myr9G0I!vPg*=#c*KK--veZQ&8Hj1CL zo-v(Pwn!!cBA~mzvwdB&E8-bu-~p+aUX58R7kRGf@PEDwEta_YmQ_H!zEf2^r4l7m zt5G^*3W}=AJ$GEps6}H4pTB}|=XFH7Zb0o1JJ!Y2N+pC9xsW+LAQSJMihDjc&-1uW z?AnL$&A#jcVt4zLgn}rUIuS)x6)2uorT?6(r1lMBsOttI-M0|w>PGBF;t_d1x#{|u z_O0Mp7Vn%1m5sr;x%Z%WYSpkPAk)b)$}tLJloS4Q7y8d$PF3e2(52tDdG4ST1u_4t zbzuLyrNN#)oNV4_X3Lt|%bN|RJ+~4{ne_<=w~podd(Znv(f`pUy_sBCi^V`ZUL92D z-aCTci`NpvcR2y?OQ`dJOkVRyuIJZx{rzVyVju~Kmy_nc8vq~%Fmt<(U_Jdl%m8L$ zhxuUrnG7b+Wpd(i6sd%bi5+y9Jg3&ezS!=(0gfQ+uoV*1(-D?J>nU0&aS Date: Tue, 22 Aug 2017 14:11:13 +0630 Subject: [PATCH 182/246] nested form --- app/assets/javascripts/application.js | 21 +++---- .../settings/promotions_controller.rb | 3 +- app/views/settings/promotions/_form.html.erb | 56 ++++--------------- 3 files changed, 22 insertions(+), 58 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index eb4b4963..cd056d1c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,7 @@ // about supported directives. // //= require jquery +//= require jquery_nested_form //= require tether //= require bootstrap //= require jquery_ujs @@ -26,14 +27,14 @@ $(document).on('turbolinks:load', function() { autoclose: true }); $('.datepicker').attr('ReadOnly','true'); - $('.datepicker').css('cursor','pointer'); + $('.datepicker').css('cursor','pointer'); // Image Upload $("#simple_menu_item_image_path").fileinput({ previewFileType: "image", allowedFileExtensions: ["jpg", "gif", "png"], browseClass: "btn btn-success", - browseLabel: "Pick Image", + browseLabel: "Pick Image", browseIcon: " ", removeClass: "btn btn-danger", removeLabel: "Delete", @@ -41,10 +42,10 @@ $(document).on('turbolinks:load', function() { showUpload: false, // uploadClass: "btn btn-info", // uploadLabel: "Upload", - // uploadIcon: " ", + // uploadIcon: " ", previewTemplates: { image: '

    \n' + - ' {caption}\n' + + ' {caption}\n' + '
    \n', } }); @@ -53,7 +54,7 @@ $(document).on('turbolinks:load', function() { previewFileType: "image", allowedFileExtensions: ["jpg", "gif", "png"], browseClass: "btn btn-success", - browseLabel: "Pick Image", + browseLabel: "Pick Image", browseIcon: " ", removeClass: "btn btn-danger", removeLabel: "Delete", @@ -61,10 +62,10 @@ $(document).on('turbolinks:load', function() { showUpload: false, // uploadClass: "btn btn-info", // uploadLabel: "Upload", - // uploadIcon: " ", + // uploadIcon: " ", previewTemplates: { image: '
    \n' + - ' {caption}\n' + + ' {caption}\n' + '
    \n', } }); @@ -72,7 +73,7 @@ $(document).on('turbolinks:load', function() { $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); - $('.dropdown-toggle').dropdown(); + $('.dropdown-toggle').dropdown(); }); function export_to(path) @@ -80,7 +81,3 @@ function export_to(path) var form_params = $("#frm_report").serialize(); window.location = path+"?"+ form_params; } - - - - diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb index 63773b01..246bd51b 100644 --- a/app/controllers/settings/promotions_controller.rb +++ b/app/controllers/settings/promotions_controller.rb @@ -71,6 +71,7 @@ class Settings::PromotionsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def promotion_params - params.require(:promotion).permit(:promo_code, :promo_start_date, :promo_end_date, :promo_start_hour,:promo_end_hour ,:promo_day, :promo_type,:original_product ,:min_qty ,:created_by,:promotion_products_attributes => [:item_code, :min_qty, :net_off, :net_price, :percentage, :_destroy]) + params.require(:promotion).permit(:promo_code, :promo_start_date, :promo_end_date, :promo_start_hour,:promo_end_hour ,:promo_day, :promo_type,:original_product ,:min_qty ,:created_by, + :promotion_products_attributes => [:item_code, :min_qty, :net_off, :net_price, :percentage, :_destroy]) end end diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index dfdd40c2..474dcb3d 100644 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -39,54 +39,20 @@
    <%= f.input :original_product,collection: MenuItem.order("name desc"),input_html: { selected: 2 } %>
    <%= f.input :min_qty %>
    - -
    - - - - - - - - - - - - <% @promotion.promotion_products.each do |pp| %> - - - - - - - - - - - +

    <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %>

    +
    + <%= f.fields_for :promotion_products do |p| %> +
    +
    <%= p.input :item_code , :class => "form-control" %>
    +
    <%= p.input :min_qty , :class => "form-control" %>
    +
    <%= p.input :net_off , :class => "form-control" %>
    +
    <%= p.input :net_price , :class => "form-control" %>
    +
    <%= p.input :percentage , :class => "form-control" %>
    +
    <%= p.link_to_remove "X"%>
    +
    <% end %> - <%= f.fields_for :promotion_products, PromotionProduct.new do |pro| %> - - - - - - - - - - - <% end %> - -
    Item CodeMin QtyNet offNet PricePercentage<%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %>
    <%= pp.item_code %><%= pp.min_qty %><%= pp.net_off %><%= pp.net_price %><%= pp.percentage %><%= link_to 'Edit', edit_settings_promotion_promotion_product_path(@promotion,pp) %><%= link_to 'Destroy', settings_promotion_promotion_product_path(@promotion,pp), method: :delete, data: { confirm: 'Are you sure?' } %>
    <%= pro.input :item_code , :class => "form-control" %><%= pro.input :min_qty , :class => "form-control"%><%= pro.input :net_off , :class => "form-control" %><%= pro.input :net_price , :class => "form-control" %><%= pro.input :percentage , :class => "form-control" %><%= pro.link_to_remove "X" %>
    From c3e511c8ed1930a1e77511be6489fc0c36cb2b77 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 22 Aug 2017 14:11:25 +0630 Subject: [PATCH 183/246] fix menu edit --- app/controllers/settings/menu_item_instances_controller.rb | 4 ++-- app/views/settings/set_menu_items/edit.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index 0d276602..fbe1b672 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -55,7 +55,7 @@ class Settings::MenuItemInstancesController < ApplicationController sets = ItemSet.find(params[:menu_item_instance][:item_sets]) if sets.count > 0 - @settings_menu_item.item_sets = sets + @settings_menu_item_instances.item_sets = sets end end @@ -92,7 +92,7 @@ class Settings::MenuItemInstancesController < ApplicationController sets = ItemSet.find(params[:menu_item_instance][:item_sets]) if sets.count > 0 - @settings_menu_item.item_sets = sets + @settings_menu_item_instances.item_sets = sets end end diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index 6a4eb567..bc9bc62b 100644 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -16,13 +16,13 @@ $(function(){ <% @settings_menu_item.item_sets.each do |set| %> - $("#simple_menu_item_item_sets option[value='" + <%= set.id %> + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); + $("#set_menu_item_item_sets option[value='" + <%= set.id %> + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); <% end %> // After loaded - $("#simple_menu_item_item_sets").on('click', 'option', function(e){ + $("#set_menu_item_item_sets").on('click', 'option', function(e){ if($(this).attr("selected")){ $(this).removeAttr("selected"); $(this).css({'color':'#000','background':'#fff'}); From ee869c9ded967dfeb7be0fbaa04bf2f918e8d3e3 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 22 Aug 2017 16:08:48 +0630 Subject: [PATCH 184/246] update add order --- app/views/origami/addorders/show.html.erb | 37 ++++++++++++++--------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index dd192fe7..2a01d664 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -181,7 +181,7 @@ $(function(){ code = instances[i].code; } }); - + row = '
    ' +'
    ' +''+ menu_items[field].name +'' @@ -212,29 +212,28 @@ $(function(){ //click item row for add order $(document).on('click', '.menu_item_box', function(event){ + $('.option-list').empty(); data = $(this).parent().children().children('.add_icon'); attributes = $(this).data('id'); selected_item = $(this).data('item'); - + console.log(attributes); for(var field in attributes) { value = attributes[field]["value"]; - + type = attributes[field]["type"] row = "

    "+attributes[field]["type"]+"

    " $(value).each(function(i){ - $(selected_item).each(function(item){ - if (value[i] == selected_item[item]) { - $('.custom-btn').addClass('selected-option'); - }else{ - $('.custom-btn').removeClass('selected-option'); - } - }); - console.log(jQuery.inArray(value[i], selected_item)); + status =""; + if(parseInt(jQuery.inArray(value[i], selected_item))!== -1){ + status = "selected-option"; + } - row +=''; - }); + row +=''; + + }); + $(".option-list").append(row); - $(".option-list").append(row); + } $('#change_qty').val(1); $('#title_name').text(data.attr('data-name')); @@ -242,6 +241,16 @@ $(function(){ $('#unit_price').text(data.attr('data-price')); }); + // click select option icon for add + $(document).on('click', '.custom-btn', function(event){ + type = $(this).data('type'); + $('+ type +').removeClass('selected-option'); + $(this).addClass('selected-option'); + + + }); //End selecct Click + + // click plus icon for add $(document).on('click', '.add_icon', function(event){ var item_data = $(this); From 94cc126969fa6b0f5df2e8ae5dd232e925dd02cb Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 22 Aug 2017 18:02:16 +0630 Subject: [PATCH 185/246] fix for pdf print setting --- app/pdf/order_item_pdf.rb | 4 ++-- app/pdf/order_summary_pdf.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 4b9fb821..64df3adb 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -2,8 +2,8 @@ class OrderItemPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order_item, print_status, options, alt_name) - self.page_width = printer_settings.page_width - self.page_height = printer_settings.page_height + self.page_width = print_settings.page_width + self.page_height = print_settings.page_height self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 53248ebb..d23f2677 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -2,8 +2,8 @@ class OrderSummaryPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order, print_status, order_items = nil,alt_name) - self.page_width = printer_settings.page_width - self.page_height = printer_settings.page_height + self.page_width = print_settings.page_width + self.page_height = print_settings.page_height self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 From 28dab9d3e06e27cc5829a851ae0225092251318e Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 23 Aug 2017 09:48:15 +0630 Subject: [PATCH 186/246] promotion --- app/models/promotion.rb | 147 ++++++++++++++++++++++++++++++++++++++++ app/models/shop.rb | 112 ------------------------------ 2 files changed, 147 insertions(+), 112 deletions(-) diff --git a/app/models/promotion.rb b/app/models/promotion.rb index b255ceec..3b4b61ed 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -9,4 +9,151 @@ class Promotion < ApplicationRecord PROMO_TYPE2 = "Net_off" PROMO_TYPE3 = "Net_price" PROMO_TYPE4 = "Percentage" + + def self.promo_activate + saleObj = Sale.first # Test + current_day = Time.now.strftime("%Y-%m-%d") + current_time = Time.now.strftime('%H:%M:%S') + day = Date.today.wday + promoList = is_between_promo_datetime(current_day,current_time) + puts "promoList - " + promoList.size.to_s + if promoList.size > 0 + itemList = combine_item(saleObj) + is_promo_day(promoList,day, itemList) + end + end + + def self.is_between_promo_datetime(current_day,current_time) #database is not local time + promoList = Promotion.where("(TO_CHAR(promo_start_date, 'YYYY-MM-DD') <=? AND TO_CHAR(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time) + return promoList + end + + def self.combine_item(saleObj) + itemList = saleObj.sale_items.group(:product_code).sum(:qty) + end + + def self.is_promo_day(promoList, day, orderitemList) + puts "Today date - " + day.to_s + promoList.each do |promo| + dayresult = promo.promo_day.include?(day.to_s) + if dayresult + orderitemList.each do |item| + find_promo_item(promo, item) + end + end + end + end + + def self.find_promo_item(promo, orderitem) + if promo.original_product.to_s == orderitem[0].to_s + if promo.min_qty.to_i > orderitem[1].to_i + return false + else + check_promo_type(promo,orderitem) + end + end + end + + def self.check_promo_type(promo, orderitem) + if promo.promo_type == Promotion::PROMO_TYPE1 + same, foc_min_qty = check_giveaway_product(promo, orderitem[0]) + if same + give_promotion_same_product(orderitem[1], promo.min_qty, foc_min_qty, orderitem) + else + find_promo_item_in_orderlist + end + elsif promo.promo_type == Promotion::PROMO_TYPE2 + + elsif promo.promo_type == Promotion::PROMO_TYPE3 + + elsif promo.promo_type == Promotion::PROMO_TYPE4 + + end + end + + def self.check_giveaway_product(promo, orderitem) + promo.promotion_products.each do |promo_product| + if promo_product.item_code == orderitem + return true, promo_product.min_qty.to_i + else + return false, 0 + end + end + end + + def self.give_promotion_same_product(qty, promoqty, foc_min_qty, orderitem) + puts " Order qty: " + qty.to_s + " / promoqty: " + promoqty.to_s + " / giveaway: " + foc_min_qty.to_s + multiple = qty.to_i / promoqty.to_i # loop count + charge_qty = 0 + foc_qty = 0 + if multiple > 0 + multiple.times.each do |key| + if qty >= promoqty + charge_qty += promoqty + different = qty - promoqty + qty = different + if different == 0 + foc_qty += foc_min_qty + else + foc_qty += foc_min_qty + qty = qty - foc_min_qty + end + else + if multiple == foc_qty + charge_qty += qty + else + charge_qty += qty + end + end + end + else + charge_qty = qty + end + if qty == promoqty + update_existing_item(foc_qty, orderitem) + else + update_existing_item(foc_qty, orderitem) + end + puts "Charged - " + charge_qty.to_s + puts "FOC - " + foc_qty.to_s + end + + def find_promo_item_in_orderlist(promo_item_code, orderitemList) + orderitemList.each do |item| + if item.item_code == promo_item_code + give_promotion_second_product(item) + else + add_promotion_second_item + end + end + end + + def give_promotion_second_product(item, foc_min_qty) + if item.qty > foc_min_qty + + else + + end + end + + def self.update_existing_item(foc_qty, item) + + sale_item = SaleItem.new + sale_item.product_code = item.item_code + sale_item.product_name = item.item_name + " (promotion)" + sale_item.product_alt_name = item.alt_name + sale_item.account_id = item.account_id + sale_item.remark = " Promotion " + + sale_item.qty = foc_qty + sale_item.unit_price = item.price + sale_item.taxable_price = item.price + sale_item.is_taxable = item.taxable + + sale_item.price = foc_qty * item.price + end + + def self.add_promotion_second_item + + end end diff --git a/app/models/shop.rb b/app/models/shop.rb index dbb0930e..24f4bc1e 100644 --- a/app/models/shop.rb +++ b/app/models/shop.rb @@ -1,116 +1,4 @@ class Shop < ApplicationRecord - def promo_activate - current_day = Time.now.strftime("%Y-%d-%m") - current_time = Time.now.strftime('%H:%M') - day = Date.today.wday - promoList = is_between_promo_datetime(current_day,current_time) - if promoList.size > 0 - itemList = combine_item(saleObj) - is_promo_day(promoList,day, itemList) - end - end - def is_between_promo_datetime(current_day,current_time) - promoList = Promotion.where('( promo_start_date < ? AND promo_end_date > ?) AND (promo_start_time < ? AND promo_end_time > ?)', current_day, current_day, current_time, current_time) - return promoList - end - - def combine_item(saleObj) - itemList = saleObj.sale_items.group(:product_code).sum(:qty) - end - - def is_promo_day(promoList, day, orderitemList) - promoList.each do |promo| - dayresult = promo.promo_day.include?(day) - if dayresult - orderitemList.each do |item| - find_promo_item(promo, item) - end - end - end - end - - def find_promo_item(promo, orderitem) - if promo.prouduct_item == orderitem - if promo.minmum_qty < orderitem.qty - return false - else - same, promo_item_code = check_giveaway_product(promo, orderitem) - if same - give_promotion_same_product - else - find_promo_item_in_orderlist - end - end - end - end - - def check_giveaway_product(promo, orderitem) - promo.promotion_products.each do |promo_product| - if promo_product.item_code == orderitem.item_code - return true, promo_product.item_code - else - return false, promo_product.item_code - end - end - end - - def self.give_promotion_same_product(qty, promoqty, foc_min_qty) - multiple = qty / promoqty # loop count - charge_qty = 0 - foc_qty = 0 - if multiple > 0 - multiple.times.each do |key| - if qty >= promoqty - charge_qty += promoqty - different = qty - promoqty - qty = different - if different == 0 - Shop.add_promotion_item - foc_qty += foc_min_qty - else - foc_qty += foc_min_qty - qty = qty - foc_min_qty - end - else - if multiple == foc_qty - charge_qty += qty - else - charge_qty += qty - end - end - end - else - charge_qty = qty - end - puts "Charged - " + charge_qty.to_s - puts "FOC - " + foc_qty.to_s - end - - def find_promo_item_in_orderlist(promo_item_code, orderitemList) - orderitemList.each do |item| - if item.item_code == promo_item_code - give_promotion_second_product(item) - else - add_promotion_second_item - end - end - end - - def give_promotion_second_product(item, foc_min_qty) - if item.qty > foc_min_qty - - else - - end - end - - def self.add_promotion_item - - end - - def self.add_promotion_second_item - - end end From eedf6c39a1c33abb99fd6e516eb499a45734e8fc Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 23 Aug 2017 10:12:41 +0630 Subject: [PATCH 187/246] promotion + merge with master --- app/controllers/api/bill_controller.rb | 1 + app/models/promotion.rb | 3 +-- app/models/sale.rb | 24 ++++++++++++------------ app/views/origami/home/index.html.erb | 14 ++++++-------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index eba40816..7ee80f00 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -24,6 +24,7 @@ class Api::BillController < Api::ApiController @sale = Sale.new @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier) end + # Promotion.promo_activate(@sale) else @status = false @error_message = "No Current Open Shift" diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 3b4b61ed..778f7638 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -10,8 +10,7 @@ class Promotion < ApplicationRecord PROMO_TYPE3 = "Net_price" PROMO_TYPE4 = "Percentage" - def self.promo_activate - saleObj = Sale.first # Test + def self.promo_activate(saleObj) current_day = Time.now.strftime("%Y-%m-%d") current_time = Time.now.strftime('%H:%M:%S') day = Date.today.wday diff --git a/app/models/sale.rb b/app/models/sale.rb index 71994ca1..9927251d 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -298,8 +298,8 @@ class Sale < ApplicationRecord customer = Customer.find(sale.customer_id) # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax.to_i == tax.id + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -311,7 +311,7 @@ class Sale < ApplicationRecord rate = tax.rate divided_value = (100 + rate)/rate sale_tax.tax_payable_amount = total_tax / divided_value - else + else sale_tax.tax_payable_amount = total_tax * tax.rate / 100 total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end @@ -319,7 +319,7 @@ class Sale < ApplicationRecord # total_taxable = total_taxable + sale_tax.tax_payable_amount sale_tax.inclusive = tax.inclusive - sale_tax.save + sale_tax.save end end end @@ -338,13 +338,13 @@ class Sale < ApplicationRecord total_tax_amount = 0 #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") - - customer = Customer.find(self.customer_id) + customer = Customer.find(self.customer_id) + puts customer #Create new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax.to_i == tax.id + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -356,16 +356,16 @@ class Sale < ApplicationRecord rate = tax.rate divided_value = (100 + rate)/rate sale_tax.tax_payable_amount = total_tax / divided_value - else + else sale_tax.tax_payable_amount = total_tax * tax.rate / 100 total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end - + #new taxable amount is standard rule for step by step # total_taxable = total_taxable + sale_tax.tax_payable_amount sale_tax.inclusive = tax.inclusive - sale_tax.save + sale_tax.save end end end @@ -596,7 +596,7 @@ def self.get_item_query() query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id") -end +end def self.get_by_shift_items(shift_sale_range, shift, from, to, status) # date_type_selection = get_sql_function_for_report_type(report_type) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 05094504..2742f249 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -108,17 +108,15 @@ - <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> - - <%end%> + - - - <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> - <%end%> - +
    From fd1bfb7c0e9ebd0c7463af632d4ec96309791829 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Wed, 23 Aug 2017 10:24:26 +0630 Subject: [PATCH 188/246] load commissioner --- .idea/workspace.xml | 671 ++++++++++++------ .../origami/commissions_controller.rb | 15 + app/models/commission.rb | 2 + app/models/commissioner.rb | 4 +- app/models/employee.rb | 3 +- app/models/product.rb | 3 +- .../_commissioners_form.html.erb | 16 + .../origami/commissioners/_form.html.erb | 5 +- .../origami/commissioners/index.html.erb | 40 +- app/views/origami/commissioners/show.html.erb | 8 +- .../commissions/load_commissioners.html.erb | 217 ++++++ app/views/origami/home/show.html.erb | 6 + config/routes.rb | 3 + 13 files changed, 738 insertions(+), 255 deletions(-) create mode 100644 app/views/origami/commissioners/_commissioners_form.html.erb create mode 100644 app/views/origami/commissions/load_commissioners.html.erb diff --git a/.idea/workspace.xml b/.idea/workspace.xml index de9b54ce..feb2e6c0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,10 +3,16 @@ - - - + + + + + + + + + @@ -23,74 +29,91 @@ - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + + + + + + + + + + + @@ -106,6 +129,13 @@ void red origami + order + orders + table + tables + sale_edit#edit + @saleobj + edit @@ -132,25 +162,31 @@ @@ -161,10 +197,10 @@ DEFINITION_ORDER - @@ -184,8 +220,21 @@ - + + + + + + + + + + @@ -297,11 +346,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + @@ -397,6 +589,7 @@ + @@ -732,35 +925,37 @@ - + + + - - + - + - + - - + - + - - + + - + + @@ -774,14 +969,6 @@ - - - - - - - - @@ -805,13 +992,6 @@ - - - - - - - @@ -819,13 +999,6 @@ - - - - - - - @@ -842,14 +1015,6 @@ - - - - - - - - @@ -857,27 +1022,10 @@ - - - - - - - - - - - - - - - - - @@ -885,15 +1033,6 @@ - - - - - - - - - @@ -905,59 +1044,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -965,7 +1055,6 @@ - @@ -973,7 +1062,6 @@ - @@ -981,7 +1069,6 @@ - @@ -989,31 +1076,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1021,7 +1083,6 @@ - @@ -1029,7 +1090,6 @@ - @@ -1037,7 +1097,6 @@ - @@ -1045,17 +1104,185 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/commissions_controller.rb b/app/controllers/origami/commissions_controller.rb index fdd1bf73..a10e59c6 100644 --- a/app/controllers/origami/commissions_controller.rb +++ b/app/controllers/origami/commissions_controller.rb @@ -61,6 +61,21 @@ class Origami::CommissionsController < BaseOrigamiController end end + def load_commissioners + sale_id = params[:sale_id] + @table_id = params[:table_id] + @saleobj = Sale.find(sale_id) + + @commissioners = [] + end + + def select_sale_item + byebug + sale_item_id = params[:sale_item_id] + @sale_item = SaleItem.find_by_sale_item_id(sale_item_id) + @commissioners = Commissioner.active.all + end + private # Use callbacks to share common setup or constraints between actions. def set_commission diff --git a/app/models/commission.rb b/app/models/commission.rb index 8d14db70..48f73f87 100644 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -1,2 +1,4 @@ class Commission < ApplicationRecord + belongs_to :product, foreign_key: 'product_id' + has_many :commissioners end diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb index c6d4ab4c..ac199468 100644 --- a/app/models/commissioner.rb +++ b/app/models/commissioner.rb @@ -1,3 +1,5 @@ class Commissioner < ApplicationRecord - has_many :employees + belongs_to :employee, foreign_key: 'emp_id' + belongs_to :commission, foreign_key: 'commission_type' + scope :active, -> { where(is_active: true) } end diff --git a/app/models/employee.rb b/app/models/employee.rb index a6b52f21..a12521cb 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -1,7 +1,8 @@ class Employee < ApplicationRecord has_secure_password - belongs_to :commissioner + has_many :commissioners has_many :shit_sales + validates_presence_of :name, :role validates_presence_of :password, :on => [:create] validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true diff --git a/app/models/product.rb b/app/models/product.rb index 8f6811e2..fed8ee97 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,6 +1,7 @@ class Product < ApplicationRecord validates_presence_of :name - + has_many :commissions + # Product Image Uploader mount_uploader :image_path, ProductImageUploader end diff --git a/app/views/origami/commissioners/_commissioners_form.html.erb b/app/views/origami/commissioners/_commissioners_form.html.erb new file mode 100644 index 00000000..10637a82 --- /dev/null +++ b/app/views/origami/commissioners/_commissioners_form.html.erb @@ -0,0 +1,16 @@ +
    +
    +
    COMMISSIONERS
    +
    +
    +
    + <% @commissioners.each do |commissioner| %> +
    +
    + <%= commissioner.name %> +
    +
    + <% end %> +
    +
    +
    diff --git a/app/views/origami/commissioners/_form.html.erb b/app/views/origami/commissioners/_form.html.erb index 4c2a17f8..3923d564 100644 --- a/app/views/origami/commissioners/_form.html.erb +++ b/app/views/origami/commissioners/_form.html.erb @@ -5,8 +5,9 @@
    <%= f.input :name %> <%= f.label :emp_id %> - <%= f.collection_select :emp_id, Employee.all.order('name asc'), :emp_id, :name, {prompt: "Select an Employee"}, {class: "form-control"} %>
    - <%= f.input :commission_type %> + <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
    + <%= f.label :commission_type %> + <%= f.collection_select :commission_type, Commission.all, :id, :product_id, {prompt: 'Select Commission Type'}, class: 'form-control' %>
    diff --git a/app/views/origami/commissioners/index.html.erb b/app/views/origami/commissioners/index.html.erb index baadb225..cf06ed6d 100644 --- a/app/views/origami/commissioners/index.html.erb +++ b/app/views/origami/commissioners/index.html.erb @@ -1,11 +1,11 @@
    -
      -
    • Home
      • -
    • Commissioner
      • - - <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commissioner_path ,:class => 'btn btn-primary btn-sm' %> +
        +
      • Home
        • +
      • Commissioner
        • + + <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commissioner_path, :class => 'btn btn-primary btn-sm' %> -
      +

    @@ -23,22 +23,18 @@ <% @commissioners.each do |commissioner| %> - - <%= commissioner.name %> - - <% if Employee.exists? %> - <% employee = Employee.where('emp_id=?',commissioner.emp_id) %> - <%= employee[0].name %> - <% end %> - - - <%= commissioner.commission_type %> - <%= commissioner.is_active %> - <%= link_to 'Show', origami_commissioner_path(commissioner) %> - <%= link_to 'Edit', edit_origami_commissioner_path(commissioner) %> - <%= link_to 'Destroy', origami_commissioner_path(commissioner), method: :delete, data: { confirm: 'Are you sure?' } %> - + + <%= commissioner.name %> + + <%= commissioner.employee.name rescue '-' %> + + <%= commissioner.commission.product.name rescue '-' %> + <%= commissioner.is_active %> + <%= link_to 'Show', origami_commissioner_path(commissioner) %> + <%= link_to 'Edit', edit_origami_commissioner_path(commissioner) %> + <%= link_to 'Destroy', origami_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'} %> + <% end %> - +
    diff --git a/app/views/origami/commissioners/show.html.erb b/app/views/origami/commissioners/show.html.erb index 83d5442b..1f9b2780 100644 --- a/app/views/origami/commissioners/show.html.erb +++ b/app/views/origami/commissioners/show.html.erb @@ -21,16 +21,12 @@ Employee Name - <% if Employee.exists? %> - <% employee = Employee.where('emp_id=?', @commissioner.emp_id) %> - <%= employee[0].name %> - <% end %> - + <%= @commissioner.employee.name rescue '-' %> Commission Type - <%= @commissioner.commission_type %> + <%= @commissioner.commission.product.name rescue '-' %> Active diff --git a/app/views/origami/commissions/load_commissioners.html.erb b/app/views/origami/commissions/load_commissioners.html.erb new file mode 100644 index 00000000..5252b1bd --- /dev/null +++ b/app/views/origami/commissions/load_commissioners.html.erb @@ -0,0 +1,217 @@ +
    + +
    + <%= render 'origami/commissioners/commissioners_form', commissioners: @commissioners %> +
    + + +
    +
    +
    +
    INVOICE DETAILS
    +
    +
    +
    +
    +

    Receipt No: + <%= @saleobj.receipt_no rescue '' %> +

    +
    +
    +

    Date: + <%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %> +

    +
    +
    +
    +
    +

    Customer :

    +
    + +
    +
    + + + + + + + + + <% + count = 0 + sub_total = 0 + @saleobj.sale_items.each do |sale_item| + count += 1 + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 + %> + + + + + + + <% + end + end + %> + +
    #ItemsQTY + + Price + +
    <%= count %> + <%= sale_item.product_name %> + + <%= sale_item.qty %> + + <%= sale_item.unit_price %> +
    +
    +
    + + + + + + +
    Sub Total:<%= sub_total %>
    +
    +
    +
    +
    + + +
    + + + +
    +
    + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index a79c1ce1..1e39bd8d 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -572,6 +572,12 @@ window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit"; }); + $('#commissions').on('click', function () { + var dining_id = "<%= @dining.id %>" + var sale_id = "<%= @obj_sale.sale_id rescue "" %>" + window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners"; + }); + $('#void').on('click', function () { var sure = confirm("Are you sure want to Void"); if (sure == true) { diff --git a/config/routes.rb b/config/routes.rb index 7276e31f..8277e58f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -86,6 +86,9 @@ Rails.application.routes.draw do post 'item_void_cancel' => "sale_edit#item_void_cancel" post 'cancel_all_void' => 'sale_edit#cancel_all_void' post 'apply_void' => 'sale_edit#apply_void' + # commissions + get '/table/:table_id/sale/:sale_id/load_commissioners' => 'commissions#load_commissioners', as: 'load_commissioners' + post 'select_sale_item' => 'commissions#select_sale_item' get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" From 3132bc7c3448d414dfec198c3487aa02aec2c231 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Wed, 23 Aug 2017 11:14:24 +0630 Subject: [PATCH 189/246] commission update --- .idea/sxrestaurant.iml | 1 + .idea/workspace.xml | 302 ++++++++++-------- Gemfile | 1 + Gemfile.lock | 3 + app/assets/javascripts/application.js | 2 + app/assets/stylesheets/application.scss | 3 +- .../origami/commissions_controller.rb | 2 + app/models/commission.rb | 2 +- app/models/menu_item.rb | 2 + app/models/product.rb | 1 - app/views/origami/commissions/_form.html.erb | 6 +- app/views/origami/commissions/index.html.erb | 38 +-- app/views/origami/commissions/show.html.erb | 7 +- 13 files changed, 204 insertions(+), 166 deletions(-) diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index e1c0cfaa..23c2b8f5 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -210,6 +210,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index feb2e6c0..1e51bfe8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,17 +2,19 @@ + + + + + - - + - - - - - + + + @@ -29,31 +31,51 @@ - - + + - - + + - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,58 +84,41 @@ - - + + - - + + - - + + - - + + - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + @@ -163,12 +168,9 @@ @@ -927,12 +936,12 @@ - + - @@ -943,19 +952,19 @@ + + - - @@ -969,16 +978,6 @@ - - - - - - - - - - @@ -1058,20 +1057,6 @@ - - - - - - - - - - - - - - @@ -1178,28 +1163,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1208,14 +1171,6 @@ - - - - - - - - @@ -1263,14 +1218,6 @@ - - - - - - - - @@ -1280,9 +1227,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + diff --git a/Gemfile b/Gemfile index 7b2cdca5..06b49df2 100644 --- a/Gemfile +++ b/Gemfile @@ -116,3 +116,4 @@ gem 'httparty', '~> 0.15.5' # # gem 'momentjs-rails', '>= 2.9.0' # gem 'bootstrap3-datetimepicker-rails'z gem 'bootstrap-datepicker-rails' +gem 'select2-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 912f79ef..602a5b15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,6 +196,8 @@ GEM tilt (>= 1.1, < 3) schema_to_scaffold (0.8.0) activesupport (>= 3.2.1) + select2-rails (4.0.3) + thor (~> 0.14) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) sidekiq (5.0.3) @@ -280,6 +282,7 @@ DEPENDENCIES rspec-rails (~> 3.5) sass-rails (~> 5.0) schema_to_scaffold + select2-rails shoulda-matchers (~> 3.1) sidekiq simple_form diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cd056d1c..e0e5eba8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,6 +20,8 @@ //= require settings/processing_items //= require jquery-ui //= require bootstrap-datepicker +//= require select2 +//= require select2-full $(document).on('turbolinks:load', function() { $('.datepicker').datepicker({ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1c5ada90..03e049b4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,7 +4,8 @@ @import "theme"; @import "jquery-ui"; @import "bootstrap-datepicker3"; - +@import "select2"; +@import "select2-bootstrap"; /* Show it is fixed to the top */ // body { diff --git a/app/controllers/origami/commissions_controller.rb b/app/controllers/origami/commissions_controller.rb index a10e59c6..f18bd11e 100644 --- a/app/controllers/origami/commissions_controller.rb +++ b/app/controllers/origami/commissions_controller.rb @@ -15,10 +15,12 @@ class Origami::CommissionsController < BaseOrigamiController # GET /commissions/new def new @commission = Commission.new + @products = MenuItem.all end # GET /commissions/1/edit def edit + @products = MenuItem.all end # POST /commissions diff --git a/app/models/commission.rb b/app/models/commission.rb index 48f73f87..df11eb24 100644 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -1,4 +1,4 @@ class Commission < ApplicationRecord - belongs_to :product, foreign_key: 'product_id' + belongs_to :menu_item, foreign_key: 'product_id' has_many :commissioners end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 8213ae88..c581a7b0 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -3,6 +3,8 @@ class MenuItem < ApplicationRecord belongs_to :menu_category, :optional => true has_many :menu_item_instances + has_many :commissions + # belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true # has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account diff --git a/app/models/product.rb b/app/models/product.rb index fed8ee97..5aff41f5 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,6 +1,5 @@ class Product < ApplicationRecord validates_presence_of :name - has_many :commissions # Product Image Uploader mount_uploader :image_path, ProductImageUploader diff --git a/app/views/origami/commissions/_form.html.erb b/app/views/origami/commissions/_form.html.erb index a5c0d2c0..1f7fee4a 100644 --- a/app/views/origami/commissions/_form.html.erb +++ b/app/views/origami/commissions/_form.html.erb @@ -4,11 +4,11 @@
    <%= f.label :product_id %> - <%= f.collection_select :product_id, Product.all.order('name asc'), :id, :name, {prompt: "Select a Product"}, {class: "form-control"} %>
    + <%= f.collection_select :product_id, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %>
    <%= f.input :amount %> - <%= f.input :commission_type, :collection => [:percentage, :net_amount] %> + <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %> -
    +

    <%= link_to 'Back', origami_commissions_path, class: 'btn btn-success' %> <%= f.button :submit, class: 'btn btn-info' %> diff --git a/app/views/origami/commissions/index.html.erb b/app/views/origami/commissions/index.html.erb index e5a83639..da589347 100644 --- a/app/views/origami/commissions/index.html.erb +++ b/app/views/origami/commissions/index.html.erb @@ -1,11 +1,11 @@
    -
      -
    • Home
      • -
    • Commissions
      • - - <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commission_path ,:class => 'btn btn-primary btn-sm' %> +
        +
      • Home
        • +
      • Commissions
        • + + <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commission_path, :class => 'btn btn-primary btn-sm' %> -
      +

    @@ -23,22 +23,16 @@ <% @commissions.each do |commission| %> - - - <% if Product.exists? %> - <% product = Product.find(commission.product_id) %> - <%= product.name %> - <% end %> - - - <%= commission.amount %> - <%= commission.commission_type %> - <%= commission.is_active %> - <%= link_to 'Show', origami_commission_path(commission) %> - <%= link_to 'Edit', edit_origami_commission_path(commission) %> - <%= link_to 'Destroy', origami_commission_path(commission), method: :delete, data: { confirm: 'Are you sure?' } %> - + + <%= commission.menu_item.name rescue '-' %> + <%= commission.amount rescue '-' %> + <%= commission.commission_type rescue '-' %> + <%= commission.is_active rescue '-' %> + <%= link_to 'Show', origami_commission_path(commission) %> + <%= link_to 'Edit', edit_origami_commission_path(commission) %> + <%= link_to 'Destroy', origami_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %> + <% end %> - +
    diff --git a/app/views/origami/commissions/show.html.erb b/app/views/origami/commissions/show.html.erb index da04710e..439e2c45 100644 --- a/app/views/origami/commissions/show.html.erb +++ b/app/views/origami/commissions/show.html.erb @@ -16,12 +16,7 @@ Product Name - - <% if Product.exists? %> - <% product = Product.find(@commission.product_id) %> - <%= product.name %> - <% end %> - + <%= @commission.menu_item.name rescue '-' %> Amount From d6b8e8bdee6acd49ab18489ef2d10e7e0ebaebe0 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Wed, 23 Aug 2017 11:36:36 +0630 Subject: [PATCH 190/246] update commissioner --- .idea/sxrestaurant.iml | 1 - .idea/workspace.xml | 281 +++++++----------- Gemfile | 1 - Gemfile.lock | 3 - app/assets/javascripts/application.js | 2 - app/assets/stylesheets/application.scss | 2 - .../origami/commissioners/index.html.erb | 2 +- 7 files changed, 113 insertions(+), 179 deletions(-) diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index 23c2b8f5..e1c0cfaa 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -210,7 +210,6 @@ - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1e51bfe8..70f67cc7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,13 +8,7 @@ - - - - - - - + @@ -31,94 +25,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -180,7 +121,6 @@ @@ -206,7 +147,7 @@ DEFINITION_ORDER - - - + @@ -1149,13 +1090,6 @@ - - - - - - - @@ -1171,14 +1105,6 @@ - - - - - - - - @@ -1242,57 +1168,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1312,15 +1187,83 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gemfile b/Gemfile index 06b49df2..7b2cdca5 100644 --- a/Gemfile +++ b/Gemfile @@ -116,4 +116,3 @@ gem 'httparty', '~> 0.15.5' # # gem 'momentjs-rails', '>= 2.9.0' # gem 'bootstrap3-datetimepicker-rails'z gem 'bootstrap-datepicker-rails' -gem 'select2-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 602a5b15..912f79ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,8 +196,6 @@ GEM tilt (>= 1.1, < 3) schema_to_scaffold (0.8.0) activesupport (>= 3.2.1) - select2-rails (4.0.3) - thor (~> 0.14) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) sidekiq (5.0.3) @@ -282,7 +280,6 @@ DEPENDENCIES rspec-rails (~> 3.5) sass-rails (~> 5.0) schema_to_scaffold - select2-rails shoulda-matchers (~> 3.1) sidekiq simple_form diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e0e5eba8..cd056d1c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,8 +20,6 @@ //= require settings/processing_items //= require jquery-ui //= require bootstrap-datepicker -//= require select2 -//= require select2-full $(document).on('turbolinks:load', function() { $('.datepicker').datepicker({ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 03e049b4..2db849ab 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,8 +4,6 @@ @import "theme"; @import "jquery-ui"; @import "bootstrap-datepicker3"; -@import "select2"; -@import "select2-bootstrap"; /* Show it is fixed to the top */ // body { diff --git a/app/views/origami/commissioners/index.html.erb b/app/views/origami/commissioners/index.html.erb index cf06ed6d..dfef0320 100644 --- a/app/views/origami/commissioners/index.html.erb +++ b/app/views/origami/commissioners/index.html.erb @@ -28,7 +28,7 @@ <%= commissioner.employee.name rescue '-' %> - <%= commissioner.commission.product.name rescue '-' %> + <%= commissioner.commission.menu_item.name rescue '-' %> <%= commissioner.is_active %> <%= link_to 'Show', origami_commissioner_path(commissioner) %> <%= link_to 'Edit', edit_origami_commissioner_path(commissioner) %> From 911b941793266eb495d7b7be0d319f33f6c60d8f Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 23 Aug 2017 13:43:31 +0630 Subject: [PATCH 191/246] fix member sync and menu json --- app/models/customer.rb | 61 +++++++++++-------- .../restaurant/menu/_menu_item.json.jbuilder | 49 +++++++++++++-- 2 files changed, 78 insertions(+), 32 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index dff92ba2..b33b13b4 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -91,41 +91,50 @@ class Customer < ApplicationRecord auth_token = memberaction.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - @customers = Customer.where("membership_type IS NOT NULL AND membership_id IS NULL") + @customers = Customer.where("membership_type IS NOT NULL AND membership_id IS NULL") @customers.each do |customer| - begin - response = HTTParty.post(url, - :body => - { name: customer.name,phone: customer.contact_no, - email: customer.email,dob: customer.date_of_birth, - address: customer.address,nrc:customer.nrc_no, - card_no:customer.card_no,member_group_id: customer.membership_type, - merchant_uid:merchant_uid,auth_token:auth_token - }.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - }) - rescue Net::OpenTimeout - response = { status: false, message: "Server Time out" } - - rescue OpenURI::HTTPError - response = { status: false, message: "Can't connect server"} + member_params = { name: customer.name,phone: customer.contact_no, + email: customer.email,dob: customer.date_of_birth, + address: customer.address,nrc:customer.nrc_no, + card_no:customer.card_no,member_group_id: customer.membership_type, + merchant_uid:merchant_uid,auth_token:auth_token}.to_json - rescue SocketError - response = { status: false, message: "Can't connect server"} - end + # Check for paypar account exists + # if paypar_account_no != nil || paypar_account_no != '' + if paypar_account_no.present? + member_params = { name: customer.name,phone: customer.contact_no, + email: customer.email,dob: customer.date_of_birth, + address: customer.address,nrc:customer.nrc_no, + paypar_account_no: customer.paypar_account_no, + card_no:customer.card_no,member_group_id: customer.membership_type, + merchant_uid:merchant_uid,auth_token:auth_token}.to_json + end - if response["status"] == true - status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - end + begin + response = HTTParty.post(url, + :body => member_params, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) + rescue Net::OpenTimeout + response = { status: false, message: "Server Time out" } + + rescue OpenURI::HTTPError + response = { status: false, message: "Can't connect server"} + rescue SocketError + response = { status: false, message: "Can't connect server"} + end + + if response["status"] == true + status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) + end end end def self.update_rebate - sales = Sale.where("rebate_status = 'false'") sales.each do |sale| if sale.customer.membership_id diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index 7a450850..c76a4808 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -22,23 +22,59 @@ item.item_attributes.each do|attr_id| param_count -= 1 end +# Format for option json +opt_format = [] +param_count = item.item_options.count +# Format for attributes json +item.item_options.each do|opt| + menu_opt = MenuItemOption.find(opt) + if opt_format.count == 0 + opt_format.push({ type: menu_opt.option_type, value: [] }) + end + + opt_format.each do |af| + if menu_opt.option_type == af[:type] + af[:value].push(menu_opt.value) + else + new_attr = {type: menu_opt.option_type, value: [ menu_opt.value ] } + opt_format.push(new_attr) + end + + break if opt_format.count > param_count + end + + param_count -= 1 +end + #Menu Item Information json.id item.id -json.item_code item.item_code +json.code item.item_code json.name item.name json.alt_name item.alt_name json.image item.image_path.url json.description item.description -json.Information item.information +json.information item.information json.type item.type json.account_id item.account_id json.min_qty item.min_qty json.is_available item.is_available json.is_sub_item item.is_sub_item json.unit item.unit -json.item_sets item.item_sets + +# Item Sets of Menu Item +json.item_sets item.item_sets do |its| + json.id its.id + json.name its.name + json.alt_name its.alt_name + json.min_selectable_qty its.min_selectable_qty + json.max_selectable_qty its.max_selectable_qty + json.instances its.menu_item_instances do |i| + json.id i.id + end +end + json.attributes attr_format -json.options item.item_options +json.options opt_format # json.min_selectable_item item.min_selectable_item # json.max_selectable_item item.max_selectable_item @@ -52,6 +88,7 @@ json.options item.item_options # json.item_attributes = item_instance.item_attributes json.instances item.menu_item_instances do |is| + json.id is.id json.code is.item_instance_code json.name is.item_instance_name json.price is.price @@ -59,8 +96,8 @@ json.options item.item_options json.is_default is.is_default json.is_on_promotion is.is_on_promotion json.promotion_price is.promotion_price - json.item_attributes is.item_attributes - json.item_sets is.item_sets + json.values is.item_attributes + # json.item_sets is.item_sets end #Child Menu items From 248b80763389ef8bfba19c0b027c873c1f17deed Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 23 Aug 2017 13:59:27 +0630 Subject: [PATCH 192/246] Dining Charges Fix for free time --- app/models/dining_charge.rb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb index 75cf7d7b..b7be007d 100644 --- a/app/models/dining_charge.rb +++ b/app/models/dining_charge.rb @@ -3,19 +3,22 @@ class DiningCharge < ApplicationRecord belongs_to :room def self.amount_calculate(dining_charges_obj, checkin , checkout) - + # note :: the first Charge Block will cost all, the Time rounding block will included in 2nd Charge Block if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil? price = 0 minutes = DiningCharge.time_diff(checkout, checkin) - free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.strftime('%H:%M')) + free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.utc.localtime.strftime('%H:%M')) dining_minutes = minutes - free_time # stayminutes - free minutes - charge_type = dining_charges_obj.charge_type - if charge_type == 'hr' - price = DiningCharge.charges(dining_charges_obj, dining_minutes, 'hr') - elsif charge_type == 'day' - price = charges(dining_charges_obj, dining_minutes, 'day') + if dining_minutes <= 0 + price = 0 + else + charge_type = dining_charges_obj.charge_type + if charge_type == 'hr' + price = DiningCharge.charges(dining_charges_obj, dining_minutes, 'hr') + elsif charge_type == 'day' + price = charges(dining_charges_obj, dining_minutes, 'day') + end end - return price else puts "<<<<<<<< NO" @@ -25,14 +28,15 @@ class DiningCharge < ApplicationRecord def self.charges(chargesObj, dining_minutes, type) solid_price = 0 - block = DiningCharge.convert_to_minutes(chargesObj.charge_block.strftime('%H:%M')) + block = DiningCharge.convert_to_minutes(chargesObj.charge_block.utc.localtime.strftime('%H:%M')) + result = dining_minutes / block if result.to_i < 1 return chargesObj.unit_price elsif result.to_i >= 1 solid_price = result * chargesObj.unit_price remain_value = dining_minutes % block - rounding_block = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.strftime('%H:%M')) + rounding_block = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.localtime.strftime('%H:%M')) roundingblock = remain_value / rounding_block if roundingblock.to_i < 1 return DiningCharge.check_rounding(chargesObj, solid_price) @@ -48,7 +52,7 @@ class DiningCharge < ApplicationRecord end end - def self.check_rounding(chargesObj) + def self.check_rounding(chargesObj,solid_price) if chargesObj.time_rounding == "down" return solid_price else From 874a9b60bec90d40b500b3ed927092435ceec744 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Wed, 23 Aug 2017 15:02:27 +0630 Subject: [PATCH 193/246] create InJuty --- .idea/.generators | 2 +- .idea/workspace.xml | 828 ++++++------------ .../origami/commissions_controller.rb | 91 -- .../origami/in_juties_controller.rb | 74 ++ app/helpers/origami/in_juties_helper.rb | 2 + app/models/in_juty.rb | 2 + app/views/origami/in_juties/_form.html.erb | 10 + .../origami/in_juties/_in_juty.json.jbuilder | 2 + app/views/origami/in_juties/edit.html.erb | 6 + app/views/origami/in_juties/index.html.erb | 25 + .../origami/in_juties/index.json.jbuilder | 1 + app/views/origami/in_juties/new.html.erb | 5 + app/views/origami/in_juties/show.html.erb | 4 + .../origami/in_juties/show.json.jbuilder | 1 + config/routes.rb | 1 + db/migrate/20170823081747_create_in_juties.rb | 11 + .../origami/in_juties_controller_spec.rb | 141 +++ spec/helpers/origami/in_juties_helper_spec.rb | 15 + spec/models/in_juty_spec.rb | 5 + .../origami/origami_in_juties_spec.rb | 10 + .../routing/origami/in_juties_routing_spec.rb | 39 + .../origami/in_juties/edit.html.erb_spec.rb | 14 + .../origami/in_juties/index.html.erb_spec.rb | 14 + .../origami/in_juties/new.html.erb_spec.rb | 14 + .../origami/in_juties/show.html.erb_spec.rb | 11 + 25 files changed, 692 insertions(+), 636 deletions(-) delete mode 100644 app/controllers/origami/commissions_controller.rb create mode 100644 app/controllers/origami/in_juties_controller.rb create mode 100644 app/helpers/origami/in_juties_helper.rb create mode 100644 app/models/in_juty.rb create mode 100644 app/views/origami/in_juties/_form.html.erb create mode 100644 app/views/origami/in_juties/_in_juty.json.jbuilder create mode 100644 app/views/origami/in_juties/edit.html.erb create mode 100644 app/views/origami/in_juties/index.html.erb create mode 100644 app/views/origami/in_juties/index.json.jbuilder create mode 100644 app/views/origami/in_juties/new.html.erb create mode 100644 app/views/origami/in_juties/show.html.erb create mode 100644 app/views/origami/in_juties/show.json.jbuilder create mode 100644 db/migrate/20170823081747_create_in_juties.rb create mode 100644 spec/controllers/origami/in_juties_controller_spec.rb create mode 100644 spec/helpers/origami/in_juties_helper_spec.rb create mode 100644 spec/models/in_juty_spec.rb create mode 100644 spec/requests/origami/origami_in_juties_spec.rb create mode 100644 spec/routing/origami/in_juties_routing_spec.rb create mode 100644 spec/views/origami/in_juties/edit.html.erb_spec.rb create mode 100644 spec/views/origami/in_juties/index.html.erb_spec.rb create mode 100644 spec/views/origami/in_juties/new.html.erb_spec.rb create mode 100644 spec/views/origami/in_juties/show.html.erb_spec.rb diff --git a/.idea/.generators b/.idea/.generators index 98526fe7..16189766 100644 --- a/.idea/.generators +++ b/.idea/.generators @@ -5,4 +5,4 @@ You are allowed to: 2. Remove generators 3. Add installed generators To add new installed generators automatically delete this file and reload the project. ---> +--> diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 70f67cc7..0ba2fcb2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + @@ -25,11 +43,51 @@ - - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + @@ -38,28 +96,18 @@ - - + + - - + + - - - - - - - - - - - - + + @@ -123,13 +171,11 @@ @@ -170,368 +221,49 @@ - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 2a01d664..fdea2efc 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -114,8 +114,9 @@
    +
    +
    -

    @@ -164,7 +165,7 @@ $(function(){ menu_items_list.empty(); menu_items = data.menu_items; - + for(var field in menu_items) { instances = menu_items[field].instances ; @@ -191,7 +192,7 @@ $(function(){ +'
    ' +'
    ' - +"
    '" + +"
    '" +'
    ' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' @@ -212,11 +213,14 @@ $(function(){ //click item row for add order $(document).on('click', '.menu_item_box', function(event){ - $('.option-list').empty(); + $('.attributes-list').empty(); + $('.attributes-list').empty(); + data = $(this).parent().children().children('.add_icon'); attributes = $(this).data('id'); selected_item = $(this).data('item'); - console.log(attributes); + instances = $(this).data('instance'); + for(var field in attributes) { value = attributes[field]["value"]; type = attributes[field]["type"] @@ -228,13 +232,12 @@ $(function(){ status = "selected-option"; } - row +=''; + row +=""; }); - $(".option-list").append(row); - - + $(".attributes-list").append(row); } + $('#change_qty').val(1); $('#title_name').text(data.attr('data-name')); $('#total_price').text(data.attr('data-price')); @@ -242,11 +245,29 @@ $(function(){ }); // click select option icon for add - $(document).on('click', '.custom-btn', function(event){ - type = $(this).data('type'); - $('+ type +').removeClass('selected-option'); + $(document).on('click', '.attribute_btn', function(event){ + value = $(this).data('value'); + type = $(this).data('type'); + instances = $(this).data('instances'); + if ($(".attribute_btn").attr("data-type")==type){ + $('.'+type).removeClass("selected-option"); + } + $(this).addClass('selected-option'); + + selected_item = $('.selected-option').text(); + qty = $('#change_qty').val(); + + // for(var field in instances) { + // item_attr = instances[field].item_attributes; + + // status =""; + // if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){ + // status = "selected-option"; + // } + + // } }); //End selecct Click @@ -445,7 +466,7 @@ $(function(){ color: #fff !important; background-color: green !important; } -.custom-btn { +.attribute_btn { white-space: normal !important; height: 60px; width: 90px; diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 6f4f53df..a3fe9264 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -22,6 +22,7 @@ <%= form_tag path, :id => "filter_form", :method => :get do %>
    +
    <% end %> @@ -258,9 +259,14 @@ $.ajax({ type: "POST", url: "get_customer" , - data: { filter : customer_mamber_card_no }, + data: { filter : customer_mamber_card_no ,type :"card"}, dataType: "json", - success: function(data) { + success: function(data) { + if (data.status == false) { + alert(data.message) + } + + customer_id = data[0].customer_id; customer_name = data[0].name; update_sale(customer_id, customer_name,sale_id); @@ -282,6 +288,7 @@ if(cardNo.length == 16){ $("#paypar_account_no").val(cardNo); $("#search").val(cardNo); + $("#type").val("card") } } From 352037641b21586fbdd5c98940448d0dd9e885be Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 23 Aug 2017 19:55:17 +0630 Subject: [PATCH 202/246] update jade integration --- app/controllers/origami/customers_controller.rb | 2 +- app/views/origami/customers/index.html.erb | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index a8048ff1..9dfae470 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -29,7 +29,7 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers.date_of_birth = response["customer_data"]["DOB"] @crm_customers.nrc_no = response["customer_data"]["NRC"] @crm_customers.address = response["customer_data"]["address"] - @crm_customers.card_no = 121212 + @crm_customers.card_no = response["customer_data"]["customer_card_no"] @crm_customers.paypar_account_no = filter @crm_customers.membership_id = response["customer_data"]["id"] @crm_customers.membership_type = response["customer_data"]["member_group_id"] diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index a3fe9264..04b5225f 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -263,13 +263,19 @@ dataType: "json", success: function(data) { if (data.status == false) { - alert(data.message) + $.alert({ + title: 'Alert!', + content: data.message, + type: 'red', + typeAnimated: true, + btnClass: 'btn-danger', + }); } - - + if (data.status == undefined) { customer_id = data[0].customer_id; customer_name = data[0].name; update_sale(customer_id, customer_name,sale_id); + } } }); } From f2ddcb9e4bcf019530cbf90e4fcb2cc24e2cf7d1 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Thu, 24 Aug 2017 10:05:07 +0630 Subject: [PATCH 203/246] readded commission --- .idea/workspace.xml | 258 ++++++++++-------- .../origami/commissions_controller.rb | 5 + .../_commissioners.html.erb} | 2 +- .../commissions/load_commissioners.html.erb | 8 +- app/views/origami/home/show.html.erb | 63 ++--- 5 files changed, 189 insertions(+), 147 deletions(-) rename app/views/origami/{commissioners/_commissioners_form.html.erb => commissions/_commissioners.html.erb} (72%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e58b34db..2cb0533a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,11 @@ + + + + @@ -19,81 +23,53 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151,13 +127,11 @@ @@ -234,6 +211,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -591,22 +605,21 @@ - + - - - + @@ -633,8 +646,6 @@ - - @@ -765,13 +776,6 @@ - - - - - - - @@ -786,13 +790,6 @@ - - - - - - - @@ -836,13 +833,6 @@ - - - - - - - @@ -930,14 +920,6 @@ - - - - - - - - @@ -962,14 +944,6 @@ - - - - - - - - @@ -986,10 +960,68 @@ + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/commissions_controller.rb b/app/controllers/origami/commissions_controller.rb index 3e4f3301..f5a91ad9 100644 --- a/app/controllers/origami/commissions_controller.rb +++ b/app/controllers/origami/commissions_controller.rb @@ -76,6 +76,11 @@ class Origami::CommissionsController < BaseOrigamiController sale_item_id = params[:sale_item_id] @sale_item = SaleItem.find_by_sale_item_id(sale_item_id) @commissioners = Commissioner.active.all + + respond_to do |format| + format.json {render json: @commissioners} + # format.html {render @commissioners} + end end private diff --git a/app/views/origami/commissioners/_commissioners_form.html.erb b/app/views/origami/commissions/_commissioners.html.erb similarity index 72% rename from app/views/origami/commissioners/_commissioners_form.html.erb rename to app/views/origami/commissions/_commissioners.html.erb index 10637a82..ed9da369 100644 --- a/app/views/origami/commissioners/_commissioners_form.html.erb +++ b/app/views/origami/commissions/_commissioners.html.erb @@ -3,7 +3,7 @@
    COMMISSIONERS
    -
    +
    <% @commissioners.each do |commissioner| %>
    diff --git a/app/views/origami/commissions/load_commissioners.html.erb b/app/views/origami/commissions/load_commissioners.html.erb index 5252b1bd..748fb4ef 100644 --- a/app/views/origami/commissions/load_commissioners.html.erb +++ b/app/views/origami/commissions/load_commissioners.html.erb @@ -1,7 +1,7 @@
    - <%= render 'origami/commissioners/commissioners_form', commissioners: @commissioners %> + <%= render 'origami/commissions/commissioners', commissioners: @commissioners %>
    @@ -210,7 +210,11 @@ url: ajax_url, data: 'sale_item_id=' + sale_item_id, success: function (result) { -// window.location.href = '/origami/table/' + table_id; + $('#commissioners').empty(); + result.forEach(function (t) { + sale_item = "
    " + "
    " + t.name + "
    " + "
    " + $('#commissioners').append(sale_item); + }) } }); }) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index dfaa9e45..e08f5d3d 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -310,39 +310,40 @@
    - -
    - + +
    + - - - <% if @dining.bookings.length >= 1 %> - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - - - - - - <% else %> - - - - - - - - - - <% end %> - + + + <% if @dining.bookings.length >= 1 %> + <% if @status_order == 'order' && @status_sale != 'sale' %> + + + + + + + + + + <% else %> + + + + + + + + + + + <% end %> + - - <% end %> -
    + + <% end %> +
    \ No newline at end of file diff --git a/app/views/origami/in_juties/_edit_form.html.erb b/app/views/origami/in_juties/_edit_form.html.erb new file mode 100644 index 00000000..61f6512f --- /dev/null +++ b/app/views/origami/in_juties/_edit_form.html.erb @@ -0,0 +1,59 @@ +
    +<%= simple_form_for([:origami,@in_juty]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.label :dinning_id %> +
    + <%= @table.name %> +
    + + <%= f.label :commissioner_ids %> + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} ,:value => @in_juty.commissioner.name %>
    + + <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker" ,:value => @in_juty.in_time %>
    + + <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker" ,:value => @in_juty.out_time %> +

    +
    +
    +
    + <%= link_to 'Back', origami_index_in_juty_path, class: 'btn btn-success' %> +
    +
    + +
    +
    +
    +<% end %> +
    + + \ No newline at end of file diff --git a/app/views/origami/in_juties/assign_in_juty.html.erb b/app/views/origami/in_juties/assign_in_juty.html.erb new file mode 100644 index 00000000..09dd646a --- /dev/null +++ b/app/views/origami/in_juties/assign_in_juty.html.erb @@ -0,0 +1,3 @@ +
    + <%= render 'assign_in_juty', in_juty: @in_juty %> +
    \ No newline at end of file diff --git a/app/views/origami/in_juties/edit_in_juty.html.erb b/app/views/origami/in_juties/edit_in_juty.html.erb new file mode 100644 index 00000000..3a6fc774 --- /dev/null +++ b/app/views/origami/in_juties/edit_in_juty.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', in_juty: @in_juty %> +
    \ No newline at end of file diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb new file mode 100644 index 00000000..29e4ebab --- /dev/null +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -0,0 +1,37 @@ +
    +
      +
    • Home
      • +
    • In Juties
      • + + <%= link_to t('.new', :default => t("helpers.links.new")), origami_assign_in_juty_path, :class => 'btn btn-primary btn-sm', :flag => 'new' %> + +
    +
    + +
    +
    + + + + + + + + + + + + + <% @juties_in.each do |in_juty| %> + + + + + + + + + <% end %> + +
    Dining Facility NameCommissioner IdsIn timeOut time
    <%= in_juty.dining_facility.name rescue '-' %><%= in_juty.commissioner.name rescue '-' %><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Edit', origami_edit_in_juty_path(in_juty) %><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty), method: :delete, data: {confirm: 'Are you sure?'} %>
    +
    diff --git a/config/routes.rb b/config/routes.rb index b5af4fe2..a4693c12 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,6 +89,15 @@ Rails.application.routes.draw do # commissions get '/table/:table_id/sale/:sale_id/load_commissioners' => 'commissions#load_commissioners', as: 'load_commissioners' post 'select_sale_item' => 'commissions#select_sale_item' + # in_juties + get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty' + post 'assign_in_juty' => 'in_juties#create_for_in_juty', as: 'create_for_in_juty' + get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty' + get '/in_juty/:in_juty_id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty' + put '/edit_in_juty/:in_juty_id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty' + delete '/destroy_in_juty/:in_juty_id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty' + + get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" From 8b33a94d930e0e54e3e13f60448a2c202534d018 Mon Sep 17 00:00:00 2001 From: Phyo Date: Thu, 24 Aug 2017 18:31:53 +0630 Subject: [PATCH 213/246] Promotion Tax bug fix --- app/models/promotion.rb | 10 ++++++++-- app/models/sale.rb | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 87b90613..282d6798 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -120,6 +120,10 @@ class Promotion < ApplicationRecord def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id) puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty + foc_qty = find_second_item_qty(sale_id, promo_product) + if (foc_qty < promotion_qty) + promotion_qty = foc_qty + end item = OrderItem.find_by_item_code(promo_product) update_existing_item(promotion_qty, item, sale_id, "promotion", item.price) end @@ -135,13 +139,15 @@ class Promotion < ApplicationRecord sale_item.qty = foc_qty * (-1) sale_item.unit_price = item_price * (-1) - sale_item.taxable_price = item_price + sale_item.taxable_price = item_price * (-1) sale_item.price = foc_qty * item_price * (-1) - sale_item.is_taxable = item.taxable + sale_item.is_taxable = false sale_item.sale_id = sale_id sale_item.save + sale = Sale.find(sale_id). + sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9927251d..500e28ef 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -183,6 +183,7 @@ class Sale < ApplicationRecord sale_item.sale_id = self.id sale_item.price = diningprice sale_item.save + self.compute end def update_item (item) @@ -214,10 +215,11 @@ class Sale < ApplicationRecord sales_items.each do |item| #compute each item and added to total + puts "item.sales_item_id ddd" + puts item.sale_item_id subtotal_price = subtotal_price + item.price total_taxable = total_taxable + (item.taxable_price * item.qty) end - apply_tax (total_taxable) self.total_amount = subtotal_price self.total_discount = total_discount From b99c503afa6ae5c1d43c725691d2d90b4e52a8db Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 25 Aug 2017 09:40:59 +0630 Subject: [PATCH 214/246] inventory --- app/controllers/base_inventory_controller.rb | 17 ++++++++++ .../inventory/inventory_controller.rb | 6 ++++ .../inventory_definitions_controller.rb | 2 +- .../inventory_definitions_helper.rb | 0 .../stock_check_items_helper.rb | 0 .../{inventory => }/stock_checks_helper.rb | 0 .../{inventory => }/stock_journals_helper.rb | 0 app/views/home/dashboard.html.erb | 12 ++++++- app/views/inventory/inventory/index.html.erb | 17 ++++++++++ app/views/layouts/inventory.html.erb | 34 +++++++++++++++++++ config/routes.rb | 1 + 11 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 app/controllers/base_inventory_controller.rb create mode 100644 app/controllers/inventory/inventory_controller.rb rename app/helpers/{inventory => }/inventory_definitions_helper.rb (100%) rename app/helpers/{inventory => }/stock_check_items_helper.rb (100%) rename app/helpers/{inventory => }/stock_checks_helper.rb (100%) rename app/helpers/{inventory => }/stock_journals_helper.rb (100%) create mode 100644 app/views/inventory/inventory/index.html.erb create mode 100644 app/views/layouts/inventory.html.erb diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb new file mode 100644 index 00000000..4059ac25 --- /dev/null +++ b/app/controllers/base_inventory_controller.rb @@ -0,0 +1,17 @@ +class BaseInventoryController < ActionController::Base + include LoginVerification + layout "inventory" + + #before_action :check_installation + protect_from_forgery with: :exception + + rescue_from CanCan::AccessDenied do |exception| + flash[:warning] = exception.message + redirect_to root_path + end + + def current_user + @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] + end + +end diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb new file mode 100644 index 00000000..525f0277 --- /dev/null +++ b/app/controllers/inventory/inventory_controller.rb @@ -0,0 +1,6 @@ +class Inventory::InventoryController < BaseInventoryController + + def index + + end +end diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb index 7c7288df..8a3f3a40 100644 --- a/app/controllers/inventory/inventory_definitions_controller.rb +++ b/app/controllers/inventory/inventory_definitions_controller.rb @@ -1,4 +1,4 @@ -class InventoryDefinitionsController < ApplicationController +class Inventory::InventoryDefinitionsController < BaseInventoryController before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy] # GET /inventory_definitions diff --git a/app/helpers/inventory/inventory_definitions_helper.rb b/app/helpers/inventory_definitions_helper.rb similarity index 100% rename from app/helpers/inventory/inventory_definitions_helper.rb rename to app/helpers/inventory_definitions_helper.rb diff --git a/app/helpers/inventory/stock_check_items_helper.rb b/app/helpers/stock_check_items_helper.rb similarity index 100% rename from app/helpers/inventory/stock_check_items_helper.rb rename to app/helpers/stock_check_items_helper.rb diff --git a/app/helpers/inventory/stock_checks_helper.rb b/app/helpers/stock_checks_helper.rb similarity index 100% rename from app/helpers/inventory/stock_checks_helper.rb rename to app/helpers/stock_checks_helper.rb diff --git a/app/helpers/inventory/stock_journals_helper.rb b/app/helpers/stock_journals_helper.rb similarity index 100% rename from app/helpers/inventory/stock_journals_helper.rb rename to app/helpers/stock_journals_helper.rb diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 08991091..8a922573 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -55,6 +55,17 @@
    + +
    +
    +
    +
    + Inventory +
    +
    +
    +
    +
    @@ -274,4 +285,3 @@ } - diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb new file mode 100644 index 00000000..e8826240 --- /dev/null +++ b/app/views/inventory/inventory/index.html.erb @@ -0,0 +1,17 @@ +# Hello Inventory +
    +
    + +
    +
    + + + + + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> + + <%end%> + +
    +
    diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb new file mode 100644 index 00000000..5bcf7e0a --- /dev/null +++ b/app/views/layouts/inventory.html.erb @@ -0,0 +1,34 @@ + + + + + + + + + SmartSales : Restaurant + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'inventory', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %> + + + + <%= render 'layouts/header_orgiami' %> +
    + <% flash.each do |type, message| %> + <% if !flash["errors"]%> +
    + + <%=message%> +
    + <% end %> + + <% end %> + <%= yield %> + +
    + + diff --git a/config/routes.rb b/config/routes.rb index 69d3096c..8dfae73f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -318,6 +318,7 @@ Rails.application.routes.draw do # ----------- Inventory --------------------------- namespace :inventory do + get 'inventory' => 'inventory#index' resources :stock_check_items resources :stock_checks resources :stock_journals From 29a5062b85802f3b7895f8b77f73140a955d08e3 Mon Sep 17 00:00:00 2001 From: yamin Date: Fri, 25 Aug 2017 13:06:25 +0630 Subject: [PATCH 215/246] InJutiesUpdate --- app/controllers/origami/in_juties_controller.rb | 12 ++++++++---- .../origami/in_juties/_assign_in_juty.html.erb | 12 ++++++------ ..._edit_form.html.erb => _edit_in_juty.html.erb} | 14 +++++++------- .../origami/in_juties/assign_in_juty.html.erb | 3 +++ app/views/origami/in_juties/edit_in_juty.html.erb | 8 ++------ .../origami/in_juties/index_in_juty.html.erb | 15 +++++++++++++-- config/routes.rb | 6 +++--- 7 files changed, 42 insertions(+), 28 deletions(-) rename app/views/origami/in_juties/{_edit_form.html.erb => _edit_in_juty.html.erb} (82%) diff --git a/app/controllers/origami/in_juties_controller.rb b/app/controllers/origami/in_juties_controller.rb index f13c6fb6..4106b77a 100644 --- a/app/controllers/origami/in_juties_controller.rb +++ b/app/controllers/origami/in_juties_controller.rb @@ -1,5 +1,5 @@ class Origami::InJutiesController < BaseOrigamiController - before_action :set_in_juty, only: [:show, :edit, :update,:edit_in_juty, :update_for_in_juty , :destroy ,:destroy_in_juty] + before_action :set_in_juty, only: [:show, :edit, :update, :edit_in_juty, :update_for_in_juty , :destroy ,:destroy_in_juty] # GET /in_juties # GET /in_juties.json @@ -9,6 +9,8 @@ class Origami::InJutiesController < BaseOrigamiController def index_in_juty @juties_in= InJuty.where("dinning_id=?",params[:table_id]) + @table = params[:table_id] + end # GET /in_juties/1 # GET /in_juties/1.json @@ -49,7 +51,7 @@ class Origami::InJutiesController < BaseOrigamiController end def create_for_in_juty - + @in_juty = InJuty.new @in_juty.dinning_id = params[:dining_id] @in_juty.commissioner_ids = params[:commissioner_ids] @in_juty.in_time = params[:in_time] @@ -77,7 +79,7 @@ class Origami::InJutiesController < BaseOrigamiController @in_juty.commissioner_ids = params[:commissioner_ids] @in_juty.in_time = params[:in_time] @in_juty.out_time = params[:out_time] - @in_juty.update + @in_juty.save end # DELETE /in_juties/1 @@ -91,9 +93,11 @@ class Origami::InJutiesController < BaseOrigamiController end def destroy_in_juty + @table_id = params[:table_id] @in_juty.destroy + respond_to do |format| - format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully destroyed.' } + format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index 14469fde..8463c191 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -3,13 +3,13 @@ <%= f.error_notification %>
    - <%= f.label :dinning_id %> -
    + <%= @table.name %>
    +
    - <%= f.label :commissioner_ids %> - <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
    + + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>

    <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
    @@ -18,7 +18,7 @@
    - <%= link_to 'Back', origami_path(@table.id), class: 'btn btn-success' %> + <%= link_to 'Back', origami_index_in_juty_path(@table.id), class: 'btn btn-success' %>
    @@ -50,7 +50,7 @@ $(function() { url: ajax_url, data: 'dining_id=' + dining_id + "&commissioner_ids=" + commissioner_ids +'&in_time=' + in_time + "&out_time=" + out_time, success: function (result) { - window.location.href = '/origami/table/' + dining_id; + window.location.href = '/origami/assign_in_juty/'+ dining_id; } }); }) diff --git a/app/views/origami/in_juties/_edit_form.html.erb b/app/views/origami/in_juties/_edit_in_juty.html.erb similarity index 82% rename from app/views/origami/in_juties/_edit_form.html.erb rename to app/views/origami/in_juties/_edit_in_juty.html.erb index 61f6512f..86622c66 100644 --- a/app/views/origami/in_juties/_edit_form.html.erb +++ b/app/views/origami/in_juties/_edit_in_juty.html.erb @@ -3,13 +3,13 @@ <%= f.error_notification %>
    - <%= f.label :dinning_id %> -
    + <%= @table.name %>
    +
    - <%= f.label :commissioner_ids %> - <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} ,:value => @in_juty.commissioner.name %>
    + + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {class: 'form-control'} ,:value => @in_juty.commissioner.name %>

    <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker" ,:value => @in_juty.in_time %>
    @@ -18,7 +18,7 @@
    - <%= link_to 'Back', origami_index_in_juty_path, class: 'btn btn-success' %> + <%= link_to 'Back', origami_index_in_juty_path(@table.id), class: 'btn btn-success' %>
    @@ -49,9 +49,9 @@ $(function() { $.ajax({ type: "PUT", url: ajax_url, - data: 'dining_id=' + dining_id + "&commissioner_ids=" + commissioner_ids +'&in_time=' + in_time + "&out_time=" + out_time, + data: 'dining_id=' + dining_id + "&commissioner_ids=" + commissioner_ids +'&in_time=' + in_time + "&out_time=" + out_time + "&table_id=" + dining_id, success: function (result) { - window.location.href = '/origami/assign_in_juty'; + window.location.href = '/origami/assign_in_juty/'+ dining_id; } }); }) diff --git a/app/views/origami/in_juties/assign_in_juty.html.erb b/app/views/origami/in_juties/assign_in_juty.html.erb index 09dd646a..93dd4745 100644 --- a/app/views/origami/in_juties/assign_in_juty.html.erb +++ b/app/views/origami/in_juties/assign_in_juty.html.erb @@ -1,3 +1,6 @@
    +
    +

    Create In Juty

    +
    <%= render 'assign_in_juty', in_juty: @in_juty %>
    \ No newline at end of file diff --git a/app/views/origami/in_juties/edit_in_juty.html.erb b/app/views/origami/in_juties/edit_in_juty.html.erb index 3a6fc774..473071d0 100644 --- a/app/views/origami/in_juties/edit_in_juty.html.erb +++ b/app/views/origami/in_juties/edit_in_juty.html.erb @@ -1,10 +1,6 @@
    - +

    Update In Juty

    - <%= render 'form', in_juty: @in_juty %> + <%= render 'edit_in_juty', in_juty: @in_juty %>
    \ No newline at end of file diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb index 29e4ebab..fc5128bb 100644 --- a/app/views/origami/in_juties/index_in_juty.html.erb +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -28,10 +28,21 @@ <%= in_juty.commissioner.name rescue '-' %> <%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %> <%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %> - <%= link_to 'Edit', origami_edit_in_juty_path(in_juty) %> - <%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty), method: :delete, data: {confirm: 'Are you sure?'} %> + <%= link_to 'Back', origami_path(in_juty.dining_facility.id) %> + <%= link_to 'Edit', origami_edit_in_juty_path(in_juty.dining_facility.id,in_juty) %> + <%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id,in_juty),method: :delete, data: {confirm: 'Are you sure?'} %> <% end %>
    + + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3e8caa28..3552d8f3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -94,9 +94,9 @@ Rails.application.routes.draw do get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty' post 'assign_in_juty' => 'in_juties#create_for_in_juty', as: 'create_for_in_juty' get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty' - get '/in_juty/:in_juty_id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty' - put '/edit_in_juty/:in_juty_id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty' - delete '/destroy_in_juty/:in_juty_id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty' + get 'table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty' + put '/edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty' + delete 'table/:table_id/destroy_in_juty/:id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty' From b4eb27b8a932735b74b7d4f828173c66a0933f47 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Fri, 25 Aug 2017 13:44:22 +0630 Subject: [PATCH 216/246] commission in sale edit --- .idea/sxrestaurant.iml | 101 +---- .idea/workspace.xml | 387 +++++++++++------- .../origami/commissions_controller.rb | 15 +- .../origami/product_commissions_controller.rb | 79 +++- app/models/commission.rb | 1 + app/models/commissioner.rb | 1 + app/models/menu_item.rb | 1 + app/models/product_commission.rb | 9 + app/models/sale.rb | 1 + app/models/sale_item.rb | 3 +- .../commissions/_commissioners.html.erb | 16 - .../commissions/load_commissioners.html.erb | 193 ++++----- app/views/origami/home/index_bk.html.erb | 2 +- config/routes.rb | 2 + ...170822034139_create_product_commissions.rb | 12 - ...170823034141_create_product_commissions.rb | 16 + 16 files changed, 417 insertions(+), 422 deletions(-) delete mode 100644 app/views/origami/commissions/_commissioners.html.erb delete mode 100644 db/migrate/20170822034139_create_product_commissions.rb create mode 100644 db/migrate/20170823034141_create_product_commissions.rb diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index e1c0cfaa..2a0f8404 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -11,106 +11,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -164,6 +64,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2cb0533a..0b106937 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,22 @@ - + + + + + + + + + + + - + + @@ -20,26 +31,16 @@ - - + - - - - - - - - - - - - + + - + + @@ -48,28 +49,88 @@ - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,6 +153,8 @@ sale_edit#edit @saleobj edit + sale_item + commissioner @@ -100,12 +163,6 @@ @@ -211,6 +274,12 @@ + + + + + + @@ -605,24 +674,26 @@ - + - + - + + - + @@ -631,7 +702,6 @@ - @@ -646,50 +716,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -747,14 +773,6 @@ - - - - - - - - @@ -801,6 +819,7 @@ + @@ -822,13 +841,6 @@ - - - - - - - @@ -840,14 +852,6 @@ - - - - - - - - @@ -873,6 +877,7 @@ + @@ -887,13 +892,7 @@ - - - - - - - + @@ -901,13 +900,6 @@ - - - - - - - @@ -936,14 +928,6 @@ - - - - - - - - @@ -976,23 +960,39 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1002,26 +1002,107 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/commissions_controller.rb b/app/controllers/origami/commissions_controller.rb index f5a91ad9..db49a188 100644 --- a/app/controllers/origami/commissions_controller.rb +++ b/app/controllers/origami/commissions_controller.rb @@ -74,13 +74,18 @@ class Origami::CommissionsController < BaseOrigamiController def select_sale_item # byebug sale_item_id = params[:sale_item_id] - @sale_item = SaleItem.find_by_sale_item_id(sale_item_id) + @selected_sale_item = SaleItem.find_by_sale_item_id(sale_item_id) + @product_commission = ProductCommission.find_by_sale_item_id(@selected_sale_item.id) + unless @product_commission.nil? + selected_commissioner = @product_commission.commissioner + end @commissioners = Commissioner.active.all - respond_to do |format| - format.json {render json: @commissioners} - # format.html {render @commissioners} - end + # respond_to do |format| + # format.json {render json: {[@commissioners],[@selected_sale_item]}} + # # format.html {render @commissioners} + # end + render json: {commissioner: @commissioners, selected_commissioner: selected_commissioner} end private diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb index f3f05ab9..e2cba46c 100644 --- a/app/controllers/origami/product_commissions_controller.rb +++ b/app/controllers/origami/product_commissions_controller.rb @@ -28,11 +28,11 @@ class Origami::ProductCommissionsController < ApplicationController respond_to do |format| if @product_commission.save - format.html { redirect_to @product_commission, notice: 'Product commission was successfully created.' } - format.json { render :show, status: :created, location: @product_commission } + format.html {redirect_to @product_commission, notice: 'Product commission was successfully created.'} + format.json {render :show, status: :created, location: @product_commission} else - format.html { render :new } - format.json { render json: @product_commission.errors, status: :unprocessable_entity } + format.html {render :new} + format.json {render json: @product_commission.errors, status: :unprocessable_entity} end end end @@ -42,11 +42,11 @@ class Origami::ProductCommissionsController < ApplicationController def update respond_to do |format| if @product_commission.update(product_commission_params) - format.html { redirect_to @product_commission, notice: 'Product commission was successfully updated.' } - format.json { render :show, status: :ok, location: @product_commission } + format.html {redirect_to @product_commission, notice: 'Product commission was successfully updated.'} + format.json {render :show, status: :ok, location: @product_commission} else - format.html { render :edit } - format.json { render json: @product_commission.errors, status: :unprocessable_entity } + format.html {render :edit} + format.json {render json: @product_commission.errors, status: :unprocessable_entity} end end end @@ -56,19 +56,62 @@ class Origami::ProductCommissionsController < ApplicationController def destroy @product_commission.destroy respond_to do |format| - format.html { redirect_to product_commissions_url, notice: 'Product commission was successfully destroyed.' } - format.json { head :no_content } + format.html {redirect_to product_commissions_url, notice: 'Product commission was successfully destroyed.'} + format.json {head :no_content} + end + end + + def set_commissioner_to_sale_item + deselect = false + sale_item_id = params[:sale_item_id] + commissioner_id = params[:commissioner_id] + @sale_item = SaleItem.find(sale_item_id) + @menu_item = MenuItem.find_by_item_code(@sale_item.product_code) + @commission = Commission.where('product_id = ? AND is_active = ?', @menu_item.id, true).take + @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take + @product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take + # byebug + if !@product_commission.nil? + if @product_commission.commissioner_id == @commissioner.id + @product_commission.destroy + deselect = true + else + @product_commission.commissioner_id = @commissioner.id + deselect = false + end + else + @product_commission = ProductCommission.new + @product_commission.product_id = @menu_item.id + unless @commission.nil? + @product_commission.commission_id = @commission.id + if @commission.commission_type == 'Percentage' + @product_commission.price = @sale_item.unit_price * (@commission.amount / 100.0) + @product_commission.amount = @product_commission.price * @sale_item.qty + elsif @commission.commission_type == 'Net Amount' + @product_commission.price = @commission.amount + @product_commission.amount = @product_commission.price * @sale_item.qty + end + end + @product_commission.commissioner_id = @commissioner.id + @product_commission.qty = @sale_item.qty + @product_commission.sale_id = @sale_item.sale_id + @product_commission.sale_item_id = @sale_item.sale_item_id + end + if @product_commission.save + render json: {status: true, deselect: deselect} + else + render json: {status: false, deselect: deselect} end end private - # Use callbacks to share common setup or constraints between actions. - def set_product_commission - @product_commission = ProductCommission.find(params[:id]) - end + # Use callbacks to share common setup or constraints between actions. + def set_product_commission + @product_commission = ProductCommission.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def product_commission_params - params.fetch(:product_commission, {}) - end + # Never trust parameters from the scary internet, only allow the white list through. + def product_commission_params + params.fetch(:product_commission, {}) + end end diff --git a/app/models/commission.rb b/app/models/commission.rb index df11eb24..943bb5c1 100644 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -1,4 +1,5 @@ class Commission < ApplicationRecord belongs_to :menu_item, foreign_key: 'product_id' has_many :commissioners + has_many :product_commissions end diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb index dd22278a..8bec411d 100644 --- a/app/models/commissioner.rb +++ b/app/models/commissioner.rb @@ -2,5 +2,6 @@ class Commissioner < ApplicationRecord belongs_to :employee, foreign_key: 'emp_id' belongs_to :commission, foreign_key: 'commission_type' has_many :in_juties + has_many :product_commissions scope :active, -> { where(is_active: true) } end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index c581a7b0..e7f53dcd 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -4,6 +4,7 @@ class MenuItem < ApplicationRecord belongs_to :menu_category, :optional => true has_many :menu_item_instances has_many :commissions + has_many :product_commissions # belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true # has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" diff --git a/app/models/product_commission.rb b/app/models/product_commission.rb index 70de81f8..59e64b79 100644 --- a/app/models/product_commission.rb +++ b/app/models/product_commission.rb @@ -1,2 +1,11 @@ class ProductCommission < ApplicationRecord + belongs_to :commission, foreign_key: 'commission_id' + belongs_to :commissioner, foreign_key: 'commissioner_id' + belongs_to :menu_item, foreign_key: 'product_id' + belongs_to :sale_item, foreign_key: 'sale_item_id' + belongs_to :sale, foreign_key: 'sale_id' + + def self.check_product_commission(sale_item_id) + + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9927251d..5544d1b8 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -13,6 +13,7 @@ class Sale < ApplicationRecord has_many :sale_payments has_many :sale_orders has_many :bookings + has_many :product_commissions scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") } diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index af2230de..b8ae456d 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -5,6 +5,7 @@ class SaleItem < ApplicationRecord before_create :generate_custom_id belongs_to :sale + has_many :product_commissions #compute items - discount, tax, price_change def compute_item @@ -80,7 +81,7 @@ class SaleItem < ApplicationRecord account_price[:amount] = account_price[:amount] + si.price price = price + si.price end - + end rebate_arr.push(account_price) end diff --git a/app/views/origami/commissions/_commissioners.html.erb b/app/views/origami/commissions/_commissioners.html.erb deleted file mode 100644 index ed9da369..00000000 --- a/app/views/origami/commissions/_commissioners.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -
    -
    -
    COMMISSIONERS
    -
    -
    -
    - <% @commissioners.each do |commissioner| %> -
    -
    - <%= commissioner.name %> -
    -
    - <% end %> -
    -
    -
    diff --git a/app/views/origami/commissions/load_commissioners.html.erb b/app/views/origami/commissions/load_commissioners.html.erb index 748fb4ef..b0bb5e63 100644 --- a/app/views/origami/commissions/load_commissioners.html.erb +++ b/app/views/origami/commissions/load_commissioners.html.erb @@ -1,11 +1,26 @@
    - <%= render 'origami/commissions/commissioners', commissioners: @commissioners %> +
    +
    +
    COMMISSIONERS
    +
    +
    +
    + <% @commissioners.each do |commissioner| %> +
    +
    + <%= commissioner.name %> +
    +
    + <% end %> +
    +
    +
    -
    +
    INVOICE DETAILS
    @@ -34,11 +49,10 @@ # - Items - QTY - - Price - + Items + QTY + Price + Commissioner @@ -49,22 +63,26 @@ count += 1 sub_total = sub_total + sale_item.price %> - + <% # Can't check for discount unless sale_item.price == 0 %> - + <%= count %> - + <%= sale_item.product_name %> - + <%= sale_item.qty %> - + <%= sale_item.unit_price %> + + <% product_commission = ProductCommission.find_by_sale_item_id(sale_item.id) %> + <%= product_commission.commissioner.name rescue '-' %> + <% end @@ -87,135 +105,78 @@
    -
    +
    - +
    diff --git a/app/views/origami/home/index_bk.html.erb b/app/views/origami/home/index_bk.html.erb index ce2b3a94..281478b6 100644 --- a/app/views/origami/home/index_bk.html.erb +++ b/app/views/origami/home/index_bk.html.erb @@ -243,7 +243,7 @@ -

    <%= odr.table_name %>

    <%= odr.table_name %>

    Receipt No : diff --git a/config/routes.rb b/config/routes.rb index b5af4fe2..fecc8d77 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,6 +89,8 @@ Rails.application.routes.draw do # commissions get '/table/:table_id/sale/:sale_id/load_commissioners' => 'commissions#load_commissioners', as: 'load_commissioners' post 'select_sale_item' => 'commissions#select_sale_item' + # product_commission + post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item' get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" diff --git a/db/migrate/20170822034139_create_product_commissions.rb b/db/migrate/20170822034139_create_product_commissions.rb deleted file mode 100644 index 95f9442d..00000000 --- a/db/migrate/20170822034139_create_product_commissions.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateProductCommissions < ActiveRecord::Migration[5.1] - def change - create_table :product_commissions do |t| - t.string :product_code - t.integer :commission_id - t.integer :qty - t.string :sale_id - t.string :sale_item_id - t.timestamps - end - end -end diff --git a/db/migrate/20170823034141_create_product_commissions.rb b/db/migrate/20170823034141_create_product_commissions.rb new file mode 100644 index 00000000..cb0e5a3f --- /dev/null +++ b/db/migrate/20170823034141_create_product_commissions.rb @@ -0,0 +1,16 @@ +class CreateProductCommissions < ActiveRecord::Migration[5.1] + # rake db:migrate:down VERSION=20170823034141 + def change + create_table :product_commissions do |t| + t.string :product_id + t.integer :commission_id + t.integer :commissioner_id + t.decimal :qty, :precision => 10, :scale => 2, :default => 0.00 + t.string :sale_id + t.string :sale_item_id + t.decimal :price, :precision => 10, :scale => 2, :default => 0.00 + t.decimal :amount, :precision => 10, :scale => 2, :default => 0.00 + t.timestamps + end + end +end From 57d668d1221139aced16d89eeb752bb5f0d6f95b Mon Sep 17 00:00:00 2001 From: yamin Date: Fri, 25 Aug 2017 18:48:34 +0630 Subject: [PATCH 217/246] InJutyIndexform --- .../origami/in_juties_controller.rb | 27 ++++- .../in_juties/_assign_in_juty.html.erb | 38 ++---- .../origami/in_juties/_edit_in_juty.html.erb | 61 ++-------- .../origami/in_juties/assign_in_juty.html.erb | 62 +++++++++- .../origami/in_juties/index_in_juty.html.erb | 113 +++++++++++------- 5 files changed, 171 insertions(+), 130 deletions(-) diff --git a/app/controllers/origami/in_juties_controller.rb b/app/controllers/origami/in_juties_controller.rb index 4106b77a..821aa409 100644 --- a/app/controllers/origami/in_juties_controller.rb +++ b/app/controllers/origami/in_juties_controller.rb @@ -9,7 +9,8 @@ class Origami::InJutiesController < BaseOrigamiController def index_in_juty @juties_in= InJuty.where("dinning_id=?",params[:table_id]) - @table = params[:table_id] + @table = DiningFacility.find(params[:table_id]) + @in_juty = InJuty.new end # GET /in_juties/1 @@ -24,9 +25,11 @@ class Origami::InJutiesController < BaseOrigamiController # GET /in_juties/1/edit def edit + end def edit_in_juty + @in_juty = InJuty.find(params[:id]) @table = DiningFacility.find(params[:table_id]) end @@ -52,11 +55,23 @@ class Origami::InJutiesController < BaseOrigamiController def create_for_in_juty @in_juty = InJuty.new - @in_juty.dinning_id = params[:dining_id] - @in_juty.commissioner_ids = params[:commissioner_ids] - @in_juty.in_time = params[:in_time] - @in_juty.out_time = params[:out_time] - @in_juty.save + + @in_juty.dinning_id = in_juty_params[:dinning_id] + @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] + @in_juty.in_time = in_juty_params[:in_time] + @in_juty.out_time = in_juty_params[:out_time] + + + respond_to do |format| + if @in_juty.save + format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully created.' } + format.json { render :show, status: :created, location: @in_juty } + else + format.html { render :new } + format.json { render json: @in_juty.errors, status: :unprocessable_entity } + end + end + end # PATCH/PUT /in_juties/1 diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index 8463c191..f2f0ed16 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -1,8 +1,9 @@ -

    -<%= simple_form_for([:origami,@in_juty]) do |f| %> +<%= simple_form_for @in_juty,:url => origami_create_for_in_juty_path, :method => :post do |f| %> + <%= f.error_notification %>
    + <%= f.hidden_field :dinning_id,:value => @table.id, :class => "form-control col-md-6 " %> <%= @table.name %>
    @@ -15,18 +16,15 @@ <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>

    -
    -
    -
    - <%= link_to 'Back', origami_index_in_juty_path(@table.id), class: 'btn btn-success' %> -
    -
    - -
    -
    + +
    + <%= f.button :submit, "Create",:class => 'btn btn-primary ', :id => 'create' %> + <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'disabled', :id => 'update' %> + <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
    + <% end %> -
    + \ No newline at end of file diff --git a/app/views/origami/in_juties/_edit_in_juty.html.erb b/app/views/origami/in_juties/_edit_in_juty.html.erb index 86622c66..a2405f58 100644 --- a/app/views/origami/in_juties/_edit_in_juty.html.erb +++ b/app/views/origami/in_juties/_edit_in_juty.html.erb @@ -1,59 +1,14 @@ -
    <%= simple_form_for([:origami,@in_juty]) do |f| %> <%= f.error_notification %>
    - - <%= @table.name %> -
    -
    - - - <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {class: 'form-control'} ,:value => @in_juty.commissioner.name %>

    - - <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker" ,:value => @in_juty.in_time %>
    - - <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker" ,:value => @in_juty.out_time %> -

    + <%= f.input :dinning_id %> + <%= f.input :commissioner_ids %> + <%= f.input :in_time %> + <%= f.input :out_time %> +
    +
    -
    -
    - <%= link_to 'Back', origami_index_in_juty_path(@table.id), class: 'btn btn-success' %> -
    -
    - -
    + <%= f.button :submit %>
    -
    -<% end %> -
    - - \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/origami/in_juties/assign_in_juty.html.erb b/app/views/origami/in_juties/assign_in_juty.html.erb index 93dd4745..7176dea6 100644 --- a/app/views/origami/in_juties/assign_in_juty.html.erb +++ b/app/views/origami/in_juties/assign_in_juty.html.erb @@ -2,5 +2,63 @@

    Create In Juty

    - <%= render 'assign_in_juty', in_juty: @in_juty %> -
    \ No newline at end of file +
    + <%= simple_form_for([:origami,@in_juty]) do |f| %> + <%= f.error_notification %> + +
    + + <%= @table.name %> +
    +
    + + + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>

    + + <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
    + + <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%> +

    +
    +
    +
    + <%= link_to 'Back', origami_index_in_juty_path(@table.id), class: 'btn btn-success' %> +
    +
    + +
    +
    +
    + <% end %> +
    +
    + + + \ No newline at end of file diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb index fc5128bb..0141af05 100644 --- a/app/views/origami/in_juties/index_in_juty.html.erb +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -1,48 +1,79 @@ -
    -
      -
    • Home
      • -
    • In Juties
      • - - <%= link_to t('.new', :default => t("helpers.links.new")), origami_assign_in_juty_path, :class => 'btn btn-primary btn-sm', :flag => 'new' %> - -
    +
    + +
    + + + + + + + + + + + + + <% @juties_in.each do |in_juty| %> + + + + + + + + + + + <% end %> + +
    Dining Facility NameCommissioner IdsIn timeOut time
    + <%= in_juty.dining_facility.name rescue '-' %><%= in_juty.commissioner.name rescue '-' %><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Back', origami_path(in_juty.dining_facility.id) %><%= link_to 'Edit', origami_edit_in_juty_path(in_juty.dining_facility.id,in_juty) %><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id,in_juty),method: :delete, data: {confirm: 'Are you sure?'} %>
    +
    + +
    + <%= render 'assign_in_juty', in_juty: @in_juty ,table: @table %> +
    -
    -
    - - - - - - - - - - - - - <% @juties_in.each do |in_juty| %> - - - - - - - - - - <% end %> - -
    Dining Facility NameCommissioner IdsIn timeOut time
    <%= in_juty.dining_facility.name rescue '-' %><%= in_juty.commissioner.name rescue '-' %><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Back', origami_path(in_juty.dining_facility.id) %><%= link_to 'Edit', origami_edit_in_juty_path(in_juty.dining_facility.id,in_juty) %><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id,in_juty),method: :delete, data: {confirm: 'Are you sure?'} %>
    -
    \ No newline at end of file From 44105a5f3b84483fabbf7dc7d24cc2f7ecf60044 Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 25 Aug 2017 18:52:35 +0630 Subject: [PATCH 218/246] Dining Charges Bug Fix --- app/controllers/settings/dining_charges_controller.rb | 4 ++++ app/models/promotion.rb | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 854354c2..1d34f9c9 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -51,6 +51,10 @@ class Settings::DiningChargesController < ApplicationController respond_to do |format| @dining_charge.dining_facility_id = @settings_dining_facility.id if @dining_charge.update(dining_charge_params) + # @dining_charge.minimum_free_time = @dining_charge.minimum_free_time.to_datetime.advance(hours: +6, minutes: +30) + # @dining_charge.charge_block = @dining_charge.charge_block.to_datetime.advance(hours: +6, minutes: +30) + # @dining_charge.time_rounding_block = @dining_charge.time_rounding_block.to_datetime.advance(hours: +6, minutes: +30) + # @dining_charge.save if @table format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' } else diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 282d6798..025abd4b 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -146,7 +146,7 @@ class Promotion < ApplicationRecord sale_item.sale_id = sale_id sale_item.save - sale = Sale.find(sale_id). + sale = Sale.find(sale_id) sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) end @@ -207,6 +207,7 @@ class Promotion < ApplicationRecord return item[1] end end + return 0 end def self.calculate_discount(total, discount) From 25229500196401db05ca6486ad30f0422f67a261 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 25 Aug 2017 18:55:34 +0630 Subject: [PATCH 219/246] update create order function --- app/controllers/api/orders_controller.rb | 2 +- .../origami/addorders_controller.rb | 1 + app/views/origami/addorders/show.html.erb | 633 ++++++++++-------- 3 files changed, 362 insertions(+), 274 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 8c7d7396..fe5d1d90 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -1,5 +1,5 @@ class Api::OrdersController < Api::ApiController - + skip_before_action :authenticate #Description # This API show current order details # Input Params - order_id diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index e65b24b7..3a95dc6c 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -11,6 +11,7 @@ class Origami::AddordersController < BaseOrigamiController def show @menu = MenuCategory.all @table_id = params[:id] + @table_type = DiningFacility.find(@table_id).type end private diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 8f9b1c08..1cc58af9 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -20,6 +20,8 @@
    ORDER DETAILS | Table <%=@table_id%> + +
    @@ -111,6 +113,11 @@

    Total

    + + + + +
    @@ -134,309 +141,389 @@
    From 8b79cdef7b5aa5bff82ea99034bc3e429a9507f6 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 25 Aug 2017 18:56:46 +0630 Subject: [PATCH 220/246] add doc in readme.md --- README.md | 62 ++++++++++++++++++++++++++++++++++++-- app/models/sale_payment.rb | 1 - 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 85739c2a..ee9eb1e6 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,18 @@ # README -SXRestuarant is a new Dedicate project for SmartSales Restaurant. It is improvement from v1.2 with upgrade to latest Bootstrap and Rails 5. The API is better define and route are refactor. +SXRestuarant is a new Dedicate project for SmartSales Restaurant. It is improvement from v1.2 with upgrade to latest Bootstrap and Rails 5.2. The API is better define and route are refactor. Things you may want to cover: * Ruby version -ruby 2.3.2p217 +ruby 2.4.1p111 * ToDo list + +1. Cloud Sync +2. Action Cable +3. Shop Setup +4. Payment Integation * System dependencies @@ -23,4 +28,55 @@ ruby 2.3.2p217 * Deployment instructions -* ... + +* Features + +1. OQS + + 1. Filter + 2. Order Item to each Stations + 3. Edit Order Item + +2. Origami(Sale) + + 1. Sale + 2. Add Customer for membership + 3. Discount and Member Discount for Sale + 4. Assign Commissioner + 5. Add other charges to Sale + +3. CRM + + 1. Customer Management + + 2. Queue Management + +4. Backend + + 1. Dining Setup + + 2. Queue Station Setup + + 3. Menu Setup + + 4. Cashier Terminal Setup + + 5. Tax Profile Setup + + 6. Printer Setup + + 7. Payment Integration + + 8. Employee Management + + 9. Promotion Setup + + 10. Commissioner Setup + + 11. Membership Integration + + +5. Inventory + + +6. Report diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3435190d..4719e546 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -324,7 +324,6 @@ class SalePayment < ApplicationRecord update_shift end end - end # update for cashier shift From 83ec17a3df45ef2ba9fd90e0295e0683661fa4ab Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 28 Aug 2017 09:37:36 +0630 Subject: [PATCH 221/246] inventory development --- .../inventory/inventory_controller.rb | 2 +- .../inventory_definitions_controller.rb | 4 +- .../inventory/stock_checks_controller.rb | 2 +- app/jobs/inventory_job.rb | 8 ++ app/models/inventory_definition.rb | 37 ++++++++++ app/models/sale.rb | 1 + app/models/stock_journal.rb | 22 ++++++ app/views/home/dashboard.html.erb | 2 +- .../inventory/_inventory_list.html.erb | 40 ++++++++++ app/views/inventory/inventory/index.html.erb | 27 ++++--- .../inventory_definitions/_form.html.erb | 7 +- .../inventory_definitions/new.html.erb | 14 +++- .../inventory/stock_checks/index.html.erb | 74 +++++++++++++------ app/views/layouts/inventory.html.erb | 2 +- config/routes.rb | 2 +- ...0824110103_create_inventory_definitions.rb | 2 + 16 files changed, 200 insertions(+), 46 deletions(-) create mode 100644 app/jobs/inventory_job.rb create mode 100644 app/views/inventory/inventory/_inventory_list.html.erb diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb index 525f0277..673cf943 100644 --- a/app/controllers/inventory/inventory_controller.rb +++ b/app/controllers/inventory/inventory_controller.rb @@ -1,6 +1,6 @@ class Inventory::InventoryController < BaseInventoryController def index - + @products = InventoryDefinition.all.active.order('created_at desc') end end diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb index 8a3f3a40..7a8f17e1 100644 --- a/app/controllers/inventory/inventory_definitions_controller.rb +++ b/app/controllers/inventory/inventory_definitions_controller.rb @@ -28,7 +28,7 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController respond_to do |format| if @inventory_definition.save - format.html { redirect_to @inventory_definition, notice: 'Inventory definition was successfully created.' } + format.html { redirect_to inventory_path, notice: 'Inventory definition was successfully created.' } format.json { render :show, status: :created, location: @inventory_definition } else format.html { render :new } @@ -69,6 +69,6 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController # Never trust parameters from the scary internet, only allow the white list through. def inventory_definition_params - params.fetch(:inventory_definition, {}) + params.require(:inventory_definition).permit(:item_code, :min_order_level, :max_stock_level) end end diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb index e8620ca1..0e36ee62 100644 --- a/app/controllers/inventory/stock_checks_controller.rb +++ b/app/controllers/inventory/stock_checks_controller.rb @@ -1,4 +1,4 @@ -class StockChecksController < ApplicationController +class Inventory::StockChecksController < BaseInventoryController before_action :set_stock_check, only: [:show, :edit, :update, :destroy] # GET /stock_checks diff --git a/app/jobs/inventory_job.rb b/app/jobs/inventory_job.rb new file mode 100644 index 00000000..0f5b1a51 --- /dev/null +++ b/app/jobs/inventory_job.rb @@ -0,0 +1,8 @@ +class InventoryJob < ApplicationJob + queue_as :default + + def perform(sale_id) + saleObj = Sale.find(sale_id) + end + +end diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb index 150ae6a9..af81c941 100644 --- a/app/models/inventory_definition.rb +++ b/app/models/inventory_definition.rb @@ -1,2 +1,39 @@ class InventoryDefinition < ApplicationRecord + + scope :active, -> {where(:is_active => true)} + + def calculate_product_count(saleObj) + saleObj.sale_items.each do |item| + found, inventory_definition = find_product_in_inventory(item) + if found + check_balance(item,inventory_definition) + end + end + end + + def self.find_product_in_inventory(item) + product = InventoryDefinition.find_by_item_code(item.product_code) + if product.nil? + return false, nil + else + return true, product + end + end + + def self.check_balance(item,inventory_definition) + stock = StockJournal.where('item_code=?', item.item_code).order('created_at desc').take + unless stock.nil? + modify_balance(item, stock.balance, inventory_definition) + end + end + + def self.modify_balance(item, stock_balance, inventory_definition) + if stock.balance.to_i >= item.qty + puts ">> stock is greater than orde qty" + add_to_journal(item, balance, "ok", inventory_definition) + else + puts " << stock is less than order qty" + add_to_journal(item, balance, "out of stock", inventory_definition) + end + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 500e28ef..c8ceb696 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -117,6 +117,7 @@ class Sale < ApplicationRecord create_saleitem_diningcharges(charges, diningprice, booking.dining_facility.name, dining_time) end + InventoryJob.perform_later(self.id) return true, self.id end diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb index ee6efe79..106a9bf5 100644 --- a/app/models/stock_journal.rb +++ b/app/models/stock_journal.rb @@ -1,2 +1,24 @@ class StockJournal < ApplicationRecord + + SALES_TRANS = "sale" + STOCK_CHECK_TRANS = "stock_check" + + def add_to_journal(item, balance, stock_message, inventory_definition) + + balance = calculate_balance(balance, item.qty) + + journal = StockJournal.new + journal.item_code = item.item_code + journal.inventory_definition_id = inventory_definition.id + journal.debit = item.qty + journal.balance = balance + journal.remark = stock_message + journal.trans_ref = item.id + journal.trans_type = StockJournal::SALES_TRANS + end + + def self.calculate_balance(balance, qty) + return balance.to_i - qty.to_i + end + end diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 8a922573..83874328 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -58,7 +58,7 @@
    -
    +
    Inventory
    diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb new file mode 100644 index 00000000..115c80c5 --- /dev/null +++ b/app/views/inventory/inventory/_inventory_list.html.erb @@ -0,0 +1,40 @@ + +
    +

    Inventoy Product Lists

    +
    +
    + +
    +
    + + + + + + + + + + <% + count = 0 + @products.each do |item| + count += 1 + %> + + + + + + + + + <% end %> +
    #ProductMin OrderMax StockCreated byCreated Time
    <%= count %><%= item.item_code rescue ""%><%= item.min_order_level %><%= item.max_stock_level %><%= item.created_by%><%= item.created_at%>
    +
    +
    + + diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb index e8826240..f275a96d 100644 --- a/app/views/inventory/inventory/index.html.erb +++ b/app/views/inventory/inventory/index.html.erb @@ -1,17 +1,22 @@ -# Hello Inventory -
    -
    +
    +
    + <%= render 'inventory_list' %>
    -
    - - - - +
    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> - + <%end%> - + +
    + + diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index 4c716bac..36b80822 100644 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -1,10 +1,15 @@ -<%= simple_form_for(@inventory_definition) do |f| %> + +<%= simple_form_for([:inventory,@inventory_definition]) do |f| %> <%= f.error_notification %>
    + <%= f.input :item_code %> + <%= f.input :min_order_level %> + <%= f.input :max_stock_level %>
    <%= f.button :submit %>
    + <% end %> diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb index a67b973a..ce290607 100644 --- a/app/views/inventory/inventory_definitions/new.html.erb +++ b/app/views/inventory/inventory_definitions/new.html.erb @@ -1,5 +1,11 @@ -

    New Inventory Definition

    -<%= render 'form', inventory_definition: @inventory_definition %> - -<%= link_to 'Back', inventory_definitions_path %> +
    +
    + +
    + <%= render 'form', inventory: @inventory_definition %> +
    diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb index 05b802eb..f5f8eb9a 100644 --- a/app/views/inventory/stock_checks/index.html.erb +++ b/app/views/inventory/stock_checks/index.html.erb @@ -1,25 +1,53 @@ -

    <%= notice %>

    +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + +
    #ProductBalance
    +
    +
    +
    +
    +
    + +
    +
    + +
    -

    Stock Checks

    +
    + +
    +
    +
    - - - - - - - - - <% @stock_checks.each do |stock_check| %> - - - - - - <% end %> - -
    <%= link_to 'Show', stock_check %><%= link_to 'Edit', edit_stock_check_path(stock_check) %><%= link_to 'Destroy', stock_check, method: :delete, data: { confirm: 'Are you sure?' } %>
    - -
    - -<%= link_to 'New Stock Check', new_stock_check_path %> +
    +
    +
    + + + + + + + +
    #ProductBalanceDifferent
    +
    +
    +
    +
    + +
    +
    +
    +
    diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb index 5bcf7e0a..d6bbf436 100644 --- a/app/views/layouts/inventory.html.erb +++ b/app/views/layouts/inventory.html.erb @@ -9,7 +9,7 @@ SmartSales : Restaurant <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'inventory', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %> diff --git a/config/routes.rb b/config/routes.rb index 3e8caa28..980980cb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -327,7 +327,7 @@ Rails.application.routes.draw do # ----------- Inventory --------------------------- namespace :inventory do - get 'inventory' => 'inventory#index' + get '/' => 'inventory#index' resources :stock_check_items resources :stock_checks resources :stock_journals diff --git a/db/migrate/20170824110103_create_inventory_definitions.rb b/db/migrate/20170824110103_create_inventory_definitions.rb index 4278ce89..c73fd0bd 100644 --- a/db/migrate/20170824110103_create_inventory_definitions.rb +++ b/db/migrate/20170824110103_create_inventory_definitions.rb @@ -4,6 +4,8 @@ class CreateInventoryDefinitions < ActiveRecord::Migration[5.1] t.string :item_code t.integer :min_order_level, :default => 0 t.integer :max_stock_level, :default => 0 + t.integer :created_by + t.boolean :is_active, :default => true t.timestamps end end From 3131823ae00674260457ebca5aac3ac062ec9809 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Mon, 28 Aug 2017 09:46:36 +0630 Subject: [PATCH 222/246] commission update -> change route under settings --- .idea/workspace.xml | 1344 +++++++++-------- app/assets/stylesheets/settings.scss | 29 +- .../origami/product_commissions_controller.rb | 8 +- .../commissioners_controller.rb | 10 +- .../commissions_controller.rb | 11 +- app/models/commission.rb | 2 +- app/models/commissioner.rb | 2 +- app/views/layouts/_header.html.erb | 4 +- .../origami/commissioners/_form.html.erb | 21 - .../commissioners/_commissioner.json.jbuilder | 0 .../settings/commissioners/_form.html.erb | 22 + .../commissioners/edit.html.erb | 4 +- .../commissioners/index.html.erb | 10 +- .../commissioners/index.json.jbuilder | 0 .../commissioners/new.html.erb | 4 +- .../commissioners/show.html.erb | 10 +- .../commissioners/show.json.jbuilder | 0 .../commissions/_commission.json.jbuilder | 0 .../commissions/_form.html.erb | 10 +- .../commissions/edit.html.erb | 4 +- .../commissions/index.html.erb | 10 +- .../commissions/index.json.jbuilder | 0 .../commissions/load_commissioners.html.erb | 0 .../commissions/new.html.erb | 4 +- .../commissions/show.html.erb | 10 +- .../commissions/show.json.jbuilder | 0 config/routes.rb | 91 +- .../20170818090115_create_commissioners.rb | 12 - ...170823034141_create_product_commissions.rb | 16 - ...170825034141_create_product_commissions.rb | 17 + .../20170825090115_create_commissioners.rb | 15 + ...b => 20170825093252_create_commissions.rb} | 8 +- 32 files changed, 861 insertions(+), 817 deletions(-) rename app/controllers/{origami => settings}/commissioners_controller.rb (79%) rename app/controllers/{origami => settings}/commissions_controller.rb (81%) delete mode 100644 app/views/origami/commissioners/_form.html.erb rename app/views/{origami => settings}/commissioners/_commissioner.json.jbuilder (100%) create mode 100644 app/views/settings/commissioners/_form.html.erb rename app/views/{origami => settings}/commissioners/edit.html.erb (57%) rename app/views/{origami => settings}/commissioners/index.html.erb (65%) rename app/views/{origami => settings}/commissioners/index.json.jbuilder (100%) rename app/views/{origami => settings}/commissioners/new.html.erb (53%) rename app/views/{origami => settings}/commissioners/show.html.erb (67%) rename app/views/{origami => settings}/commissioners/show.json.jbuilder (100%) rename app/views/{origami => settings}/commissions/_commission.json.jbuilder (100%) rename app/views/{origami => settings}/commissions/_form.html.erb (58%) rename app/views/{origami => settings}/commissions/edit.html.erb (54%) rename app/views/{origami => settings}/commissions/index.html.erb (65%) rename app/views/{origami => settings}/commissions/index.json.jbuilder (100%) rename app/views/{origami => settings}/commissions/load_commissioners.html.erb (100%) rename app/views/{origami => settings}/commissions/new.html.erb (54%) rename app/views/{origami => settings}/commissions/show.html.erb (63%) rename app/views/{origami => settings}/commissions/show.json.jbuilder (100%) delete mode 100644 db/migrate/20170818090115_create_commissioners.rb delete mode 100644 db/migrate/20170823034141_create_product_commissions.rb create mode 100644 db/migrate/20170825034141_create_product_commissions.rb create mode 100644 db/migrate/20170825090115_create_commissioners.rb rename db/migrate/{20170821093252_create_commissions.rb => 20170825093252_create_commissions.rb} (57%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5eaab1be..aa32b1ed 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,121 +2,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + @@ -131,26 +44,39 @@ + + + + + + + @@ -522,8 +519,15 @@ + + + + + + + @@ -551,7 +555,7 @@ - + @@ -559,10 +563,10 @@ - - + + - + @@ -590,6 +594,25 @@ + + + + + + + + + + + + + + + + + + + project @@ -780,6 +803,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -826,12 +873,20 @@ - - - - - + + + + + + + + + + + + + - + + + + + + + + - - + - - + + - - - - + + + - + - + + @@ -893,215 +957,21 @@
    -
    -
    - - - - - - - - - - - +}); \ No newline at end of file diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss new file mode 100644 index 00000000..01e01e15 --- /dev/null +++ b/app/assets/stylesheets/addorder.scss @@ -0,0 +1,102 @@ +@import "bootstrap"; +@import "font-awesome"; +@import "theme"; +@import "jquery-ui"; +@import "bootstrap-datepicker3"; + +.card-head{ + height: 40px; + background-color: #54A5AF; + padding:5px; + color :#fff; + } + .card-block { + padding: 0.3rem !important; + } + @media (min-width: 34em) { + .card-columns { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + } + } + + @media (min-width: 48em) { + .card-columns { + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + } + } + + @media (min-width: 62em) { + .card-columns { + -webkit-column-count: 4; + -moz-column-count: 4; + column-count: 4; + } + } + + @media (min-width: 75em) { + .card-columns { + -webkit-column-count: 4; + -moz-column-count: 4; + column-count: 4; + } + } + +.nav-tabs .nav-item { + border-bottom: 1px solid #fff; + border-left: 1px solid #54A5AF; + border-right: 1px solid #54A5AF; +} +.nav > li > a{ + color:#54A5AF; +} +.nav-tabs { + background-color: #eeeeee; +} +.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { + background-color: #fff; + border-left: 6px solid #111; + color:#54A5AF; + font-weight: bold; + border-color: #fff #fff #fff #54A5AF; +} + +.modal-dialog { + left:auto; + right: auto; + width: 100%; + padding-top: 200px; + +} +.selected-attribute { + color: #fff !important; + background-color: green !important; +} +.selected-option { + color: #fff !important; + background-color: green !important; +} +.attribute_btn { + white-space: normal !important; + height: 40px; + /*width: 80px;*/ + margin-bottom: 5px; + margin-right: 5px; +} + +.option_btn { + white-space: normal !important; + height: 40px; + /*width: 80px;*/ + margin-bottom: 5px; + margin-right: 5px; +} +#logo{ + margin: auto; + width: 50%; + border: 1px solid #54A5AF; + padding: 10px; +} \ No newline at end of file diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 3a95dc6c..23a7bc26 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -1,5 +1,5 @@ class Origami::AddordersController < BaseOrigamiController - before_action :set_dining, only: [:show] + # before_action :set_dining, only: [:detail] def index @tables = Table.all.active.order('zone_id asc').group("zone_id") @@ -8,16 +8,134 @@ class Origami::AddordersController < BaseOrigamiController @all_room = Room.all.active.order('status desc') end - def show + def detail @menu = MenuCategory.all @table_id = params[:id] - @table_type = DiningFacility.find(@table_id).type + @table = DiningFacility.find(@table_id) + @booking = @table.get_booking + if @booking + @booking_id = @booking.booking_id + @order_items = Array.new + @booking.booking_orders.each do |booking_order| + order = Order.find(booking_order.order_id) + if (order.status == "new") + @obj_order = order + @customer = order.customer + @date = order.created_at + order.order_items.each do |item| + @order_items.push(item) + end + end + end + else + @booking = nil + end + + + end + + def create + Rails.logger.debug "Order Source - " + params[:order_source].to_s + Rails.logger.debug "Table ID - " + params[:table_id].to_s + items_arr = [] + JSON.parse(params[:order_items]).each { |i| + items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]} + items_arr.push(items) + } + # begin + @order = Order.new + @order.source = params[:order_source] + @order.order_type = params[:order_type] + @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile + @order.items = items_arr + @order.guest = params[:guest_info] + @order.table_id = params[:table_id] # this is dining facilities's id + @order.new_booking = true + @order.employee_name = current_login_employee.name + #Create Table Booking or Room Booking + if !params["booking_id"].nil? + # check booking id is already completed. + booking = Booking.find(params[:booking_id]) + if booking + if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved' + if !booking.sale_id.nil? + sale_status = check_order_with_booking(booking) + # puts "WWwwWWWWWWww" + # puts sale_status + if sale_status + return return_json_status_with_code(400, "bill requested") + end + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + end + else + sale_status = check_order_with_table(params[:table_id]) + # puts "OOOOOOOOO" + # puts sale_status + if sale_status + return return_json_status_with_code(400, "bill requested") + end + end + end #booking exists + else + sale_status = check_order_with_table(params[:table_id]) + # puts "MMMMMMMM" + # puts sale_status + if sale_status + # return false , @message = "bill requested" + return return_json_status_with_code(400, "bill requested") + end + end + + @status, @booking = @order.generate + + end + + # render json for http status code + def return_json_status_with_code(code, msg) + render status: code, json: { + message: msg, + booking_id: booking_id + }.to_json + end + + def check_order_with_table(table_id) + table = DiningFacility.find(table_id) + if table + booking = table.get_current_booking + # puts booking + if booking + if !booking.sale_id.nil? + if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new" + @order.new_booking = true + return false + end + else + @order.new_booking = false + @order.booking_id = booking.booking_id + return false + end + end + end + end + + # this can always true + def check_order_with_booking(booking) + if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new" + @order.new_booking = true + return false + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + return false + end end private - def set_dining - @dining = DiningFacility.find(params[:id]) - end + # def set_dining + # @dining = DiningFacility.find(params[:id]) + # end end diff --git a/app/models/order.rb b/app/models/order.rb index 0ef19729..fc9b1cf9 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -134,6 +134,8 @@ class Order < ApplicationRecord def re_order_items(form_items) #reorder inputs items as parents and child parent_id = Array.new parents = Array.new + puts form_items + puts "hhhhh" parents_and_children_items = Array.new new_items_list = Array.new diff --git a/app/views/origami/addorders/create.json.jbuilder b/app/views/origami/addorders/create.json.jbuilder new file mode 100644 index 00000000..175e6e94 --- /dev/null +++ b/app/views/origami/addorders/create.json.jbuilder @@ -0,0 +1,15 @@ +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 +else + json.status :error + if @error_messages + json.error_messages @error_messages + else + json.error_messages @order.errors + end +end diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb new file mode 100644 index 00000000..a8534f94 --- /dev/null +++ b/app/views/origami/addorders/detail.html.erb @@ -0,0 +1,147 @@ +<%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %> +<%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> +
    +
    +
      + <% @menu.each do |menu| %> +
    • + + <%= menu.name%> + +
      • + <% end %> +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + ORDER DETAILS | Table <%=@table_id%> + + + +
    +
    +
    +
    + + + + + + + + + + + + +
    #ItemsQTYPrice
    +
    +
    + + + + + +
    Sub Total:0.00
    + +
    +
    +
    + + + + + + + + + diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index adb297d1..bcb83367 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -32,3 +32,7 @@ Rails.application.config.assets.precompile += %w( jquery-confirm.js ) # --- Image Uploader ---- Rails.application.config.assets.precompile += %w( fileinput.min.js ) + +# --- Customer/ Customer - Crm ---- +Rails.application.config.assets.precompile += %w( addorder.css ) +Rails.application.config.assets.precompile += %w( addorder.js ) diff --git a/config/routes.rb b/config/routes.rb index b5af4fe2..64341edf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -171,7 +171,9 @@ Rails.application.routes.draw do post '/:sale_id/get_customer' => "customers#get_customer" - resources :addorders + get '/:addorders/:id' => "addorders#detail" + post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' } + resources :commissions resources :commissioners resources :in_juties From e84c080552ea49e90ff683a748d20108689ba7c7 Mon Sep 17 00:00:00 2001 From: yamin Date: Tue, 29 Aug 2017 13:20:32 +0630 Subject: [PATCH 229/246] DataetimepickerInJuty --- Gemfile | 6 +- Gemfile.lock | 18 + app/assets/javascripts/application.js | 4 + app/assets/javascripts/origami.js | 1 + app/assets/stylesheets/application.scss | 1 + app/assets/stylesheets/origami.scss | 2 + app/inputs/date_picker_input.rb | 66 + app/inputs/datetime_picker_input.rb | 13 + app/inputs/time_picker_input.rb | 15 + .../in_juties/_assign_in_juty.html.erb | 24 +- .../initializers/ranged_datetime_wrapper.rb | 13 + .../javascripts/bootstrap-datetimepicker.js | 2053 +++++++++++++++++ vendor/assets/javascripts/pickers.js | 42 + .../stylesheets/bootstrap-datetimepicker.css | 366 +++ .../bootstrap-datetimepicker.min.css | 366 +++ 15 files changed, 2973 insertions(+), 17 deletions(-) create mode 100644 app/inputs/date_picker_input.rb create mode 100644 app/inputs/datetime_picker_input.rb create mode 100644 app/inputs/time_picker_input.rb create mode 100644 config/initializers/ranged_datetime_wrapper.rb create mode 100644 vendor/assets/javascripts/bootstrap-datetimepicker.js create mode 100644 vendor/assets/javascripts/pickers.js create mode 100644 vendor/assets/stylesheets/bootstrap-datetimepicker.css create mode 100644 vendor/assets/stylesheets/bootstrap-datetimepicker.min.css diff --git a/Gemfile b/Gemfile index c0783d50..e307f67b 100644 --- a/Gemfile +++ b/Gemfile @@ -113,8 +113,8 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'httparty', '~> 0.15.5' # gem 'momentjs-rails', '>= 2.9.0' -# gem 'bootstrap-datepicker-rails' -# # gem 'momentjs-rails', '>= 2.9.0' -# gem 'bootstrap3-datetimepicker-rails'z +# gem 'bootstrap3-datetimepicker-rails' +gem 'momentjs-rails', '~> 2.9', :github => 'derekprior/momentjs-rails' +gem 'datetimepicker-rails', github: 'zpaulovics/datetimepicker-rails', branch: 'master', submodules: true gem 'bootstrap-datepicker-rails' gem 'jquery-datetimepicker-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 8fca836c..c0f4c3ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,19 @@ +GIT + remote: https://github.com/derekprior/momentjs-rails.git + revision: ea58a20b7b2c901831dd01f34e0054ef6c75bde8 + specs: + momentjs-rails (2.17.1) + railties (>= 3.1) + +GIT + remote: https://github.com/zpaulovics/datetimepicker-rails.git + revision: 36d21cec5da7f5b214925804f60e63c61c747023 + branch: master + submodules: true + specs: + datetimepicker-rails (4.7.16) + momentjs-rails (>= 2.9.0) + GEM remote: https://rubygems.org/ specs: @@ -265,6 +281,7 @@ DEPENDENCIES coffee-rails (~> 4.2) cups (~> 0.0.7) database_cleaner + datetimepicker-rails! factory_girl_rails (~> 4.0) faker filterrific @@ -277,6 +294,7 @@ DEPENDENCIES jquery-ui-rails kaminari (~> 1.0.1) listen (~> 3.0.5) + momentjs-rails (~> 2.9)! mysql2 (>= 0.3.18, < 0.5) nested_form pg diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 89f95729..0b5358ce 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -22,6 +22,10 @@ //= require bootstrap-datepicker //= require jquery.datetimepicker //= require dataTables/jquery.dataTables +//= require moment +//= require bootstrap-datetimepicker +//= require pickers + $(document).on('turbolinks:load', function() { $('.datepicker').datepicker({ diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 0886d04e..6b2af56b 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -6,6 +6,7 @@ //= require cable //= require jquery-ui //= require bootstrap-datepicker +//= require jquery.datetimepicker $(document).ready(function(){ // auto refresh every 60 seconds diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6cd24771..046a5000 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -6,6 +6,7 @@ @import "bootstrap-datepicker3"; @import "jquery.datetimepicker"; @import "dataTables/jquery.dataTables"; +@import "bootstrap-datetimepicker"; /* Show it is fixed to the top */ // body { diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 10e2b319..63e64159 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -4,6 +4,8 @@ @import "jquery-ui"; @import "bootstrap-datepicker3"; +@import "jquery.datetimepicker"; + /* Show it is fixed to the top */ // body { // min-height: 75rem; diff --git a/app/inputs/date_picker_input.rb b/app/inputs/date_picker_input.rb new file mode 100644 index 00000000..3acf410e --- /dev/null +++ b/app/inputs/date_picker_input.rb @@ -0,0 +1,66 @@ +class DatePickerInput < SimpleForm::Inputs::StringInput + def input(wrapper_options) + set_html_options + set_value_html_option + + template.content_tag :div, class: 'input-group date datetimepicker' do + input = super(wrapper_options) # leave StringInput do the real rendering + input + input_button + end + end + + def input_html_classes + super.push '' # 'form-control' + end + + private + + def input_button + template.content_tag :span, class: 'input-group-btn' do + template.content_tag :button, class: 'btn btn-default', type: 'button' do + template.content_tag :span, '', class: 'fa fa-calendar' + end + end + end + + def set_html_options + input_html_options[:type] = 'text' + input_html_options[:data] ||= {} + input_html_options[:data].merge!(date_options: date_options) + end + + def set_value_html_option + return unless value.present? + input_html_options[:value] ||= I18n.localize(value, format: display_pattern) + end + + def value + object.send(attribute_name) if object.respond_to? attribute_name + end + + def display_pattern + I18n.t('datepicker.dformat', default: '%d/%m/%Y') + end + + def picker_pattern + I18n.t('datepicker.pformat', default: 'DD/MM/YYYY') + end + + def date_view_header_format + I18n.t('dayViewHeaderFormat', default: 'MMMM YYYY') + end + + def date_options_base + { + locale: I18n.locale.to_s, + format: picker_pattern, + dayViewHeaderFormat: date_view_header_format + } + end + + def date_options + custom_options = input_html_options[:data][:date_options] || {} + date_options_base.merge!(custom_options) + end + +end diff --git a/app/inputs/datetime_picker_input.rb b/app/inputs/datetime_picker_input.rb new file mode 100644 index 00000000..f66b02ec --- /dev/null +++ b/app/inputs/datetime_picker_input.rb @@ -0,0 +1,13 @@ +class DatetimePickerInput < DatePickerInput + private + + def display_pattern + I18n.t('datepicker.dformat', default: '%d/%m/%Y') + ' ' + + I18n.t('timepicker.dformat', default: '%R') + end + + def picker_pattern + I18n.t('datepicker.pformat', default: 'DD/MM/YYYY') + ' ' + + I18n.t('timepicker.pformat', default: 'HH:mm') + end +end diff --git a/app/inputs/time_picker_input.rb b/app/inputs/time_picker_input.rb new file mode 100644 index 00000000..2f5c70bf --- /dev/null +++ b/app/inputs/time_picker_input.rb @@ -0,0 +1,15 @@ +class TimePickerInput < DatePickerInput + private + + def display_pattern + I18n.t('timepicker.dformat', default: '%R') + end + + def picker_pattern + I18n.t('timepicker.pformat', default: 'HH:mm') + end + + def date_options + date_options_base + end +end diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index 258c5eb7..81af7d29 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -14,10 +14,10 @@ <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>

    - - <%= f.text_field :in_time, :value=>'',:class=>"form-control datepicker"%>
    - - <%= f.text_field :out_time, :value=>'',:class=>"form-control datepicker"%> + + <%= f.input :in_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%> + + <%= f.input :out_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>

    @@ -31,20 +31,16 @@ \ No newline at end of file diff --git a/config/initializers/ranged_datetime_wrapper.rb b/config/initializers/ranged_datetime_wrapper.rb new file mode 100644 index 00000000..c70a7681 --- /dev/null +++ b/config/initializers/ranged_datetime_wrapper.rb @@ -0,0 +1,13 @@ +SimpleForm.setup do |config| + config.wrappers :ranged_datetime, tag: 'div', class: 'form-group col-md-6', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + + b.use :label, class: 'control-label' + b.use :input, class: 'form-control' + + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end +end diff --git a/vendor/assets/javascripts/bootstrap-datetimepicker.js b/vendor/assets/javascripts/bootstrap-datetimepicker.js new file mode 100644 index 00000000..74241c3c --- /dev/null +++ b/vendor/assets/javascripts/bootstrap-datetimepicker.js @@ -0,0 +1,2053 @@ +/*! version : 4.7.15 + ========================================================= + bootstrap-datetimejs + https://github.com/Eonasdan/bootstrap-datetimepicker + Copyright (c) 2015 Jonathan Peterson + ========================================================= + */ +/* + The MIT License (MIT) + + Copyright (c) 2015 Jonathan Peterson + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ +/*global define:false */ +/*global exports:false */ +/*global require:false */ +/*global jQuery:false */ +/*global moment:false */ +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // AMD is used - Register as an anonymous module. + define(['jquery', 'moment'], factory); + } else if (typeof exports === 'object') { + factory(require('jquery'), require('moment')); + } else { + // Neither AMD nor CommonJS used. Use global variables. + if (typeof jQuery === 'undefined') { + throw 'bootstrap-datetimepicker requires jQuery to be loaded first'; + } + if (typeof moment === 'undefined') { + throw 'bootstrap-datetimepicker requires Moment.js to be loaded first'; + } + factory(jQuery, moment); + } +}(function ($, moment) { + 'use strict'; + if (!moment) { + throw new Error('bootstrap-datetimepicker requires Moment.js to be loaded first'); + } + + var dateTimePicker = function (element, options) { + var picker = {}, + date = moment().startOf('d'), + viewDate = date.clone(), + unset = true, + input, + component = false, + widget = false, + use24Hours, + minViewModeNumber = 0, + actualFormat, + parseFormats, + currentViewMode, + datePickerModes = [ + { + clsName: 'days', + navFnc: 'M', + navStep: 1 + }, + { + clsName: 'months', + navFnc: 'y', + navStep: 1 + }, + { + clsName: 'years', + navFnc: 'y', + navStep: 10 + } + ], + viewModes = ['days', 'months', 'years'], + verticalModes = ['top', 'bottom', 'auto'], + horizontalModes = ['left', 'right', 'auto'], + toolbarPlacements = ['default', 'top', 'bottom'], + keyMap = { + 'up': 38, + 38: 'up', + 'down': 40, + 40: 'down', + 'left': 37, + 37: 'left', + 'right': 39, + 39: 'right', + 'tab': 9, + 9: 'tab', + 'escape': 27, + 27: 'escape', + 'enter': 13, + 13: 'enter', + 'pageUp': 33, + 33: 'pageUp', + 'pageDown': 34, + 34: 'pageDown', + 'shift': 16, + 16: 'shift', + 'control': 17, + 17: 'control', + 'space': 32, + 32: 'space', + 't': 84, + 84: 't', + 'delete': 46, + 46: 'delete' + }, + keyState = {}, + + /******************************************************************************** + * + * Private functions + * + ********************************************************************************/ + isEnabled = function (granularity) { + if (typeof granularity !== 'string' || granularity.length > 1) { + throw new TypeError('isEnabled expects a single character string parameter'); + } + switch (granularity) { + case 'y': + return actualFormat.indexOf('Y') !== -1; + case 'M': + return actualFormat.indexOf('M') !== -1; + case 'd': + return actualFormat.toLowerCase().indexOf('d') !== -1; + case 'h': + case 'H': + return actualFormat.toLowerCase().indexOf('h') !== -1; + case 'm': + return actualFormat.indexOf('m') !== -1; + case 's': + return actualFormat.indexOf('s') !== -1; + default: + return false; + } + }, + + hasTime = function () { + return (isEnabled('h') || isEnabled('m') || isEnabled('s')); + }, + + hasDate = function () { + return (isEnabled('y') || isEnabled('M') || isEnabled('d')); + }, + + getDatePickerTemplate = function () { + var headTemplate = $('') + .append($('') + .append($('').addClass('prev').attr('data-action', 'previous') + .append($('').addClass(options.icons.previous)) + ) + .append($('').addClass('picker-switch').attr('data-action', 'pickerSwitch').attr('colspan', (options.calendarWeeks ? '6' : '5'))) + .append($('').addClass('next').attr('data-action', 'next') + .append($('').addClass(options.icons.next)) + ) + ), + contTemplate = $('') + .append($('') + .append($('').attr('colspan', (options.calendarWeeks ? '8' : '7'))) + ); + + return [ + $('
    ').addClass('datepicker-days') + .append($('').addClass('table-condensed') + .append(headTemplate) + .append($('')) + ), + $('
    ').addClass('datepicker-months') + .append($('
    ').addClass('table-condensed') + .append(headTemplate.clone()) + .append(contTemplate.clone()) + ), + $('
    ').addClass('datepicker-years') + .append($('
    ').addClass('table-condensed') + .append(headTemplate.clone()) + .append(contTemplate.clone()) + ) + ]; + }, + + getTimePickerMainTemplate = function () { + var topRow = $(''), + middleRow = $(''), + bottomRow = $(''); + + if (isEnabled('h')) { + topRow.append($('
    ') + .append($('').attr({href: '#', tabindex: '-1'}).addClass('btn').attr('data-action', 'incrementHours') + .append($('').addClass(options.icons.up)))); + middleRow.append($('') + .append($('').addClass('timepicker-hour').attr('data-time-component', 'hours').attr('data-action', 'showHours'))); + bottomRow.append($('') + .append($('').attr({href: '#', tabindex: '-1'}).addClass('btn').attr('data-action', 'decrementHours') + .append($('').addClass(options.icons.down)))); + } + if (isEnabled('m')) { + if (isEnabled('h')) { + topRow.append($('').addClass('separator')); + middleRow.append($('').addClass('separator').html(':')); + bottomRow.append($('').addClass('separator')); + } + topRow.append($('') + .append($('').attr({href: '#', tabindex: '-1'}).addClass('btn').attr('data-action', 'incrementMinutes') + .append($('').addClass(options.icons.up)))); + middleRow.append($('') + .append($('').addClass('timepicker-minute').attr('data-time-component', 'minutes').attr('data-action', 'showMinutes'))); + bottomRow.append($('') + .append($('').attr({href: '#', tabindex: '-1'}).addClass('btn').attr('data-action', 'decrementMinutes') + .append($('').addClass(options.icons.down)))); + } + if (isEnabled('s')) { + if (isEnabled('m')) { + topRow.append($('').addClass('separator')); + middleRow.append($('').addClass('separator').html(':')); + bottomRow.append($('').addClass('separator')); + } + topRow.append($('') + .append($('').attr({href: '#', tabindex: '-1'}).addClass('btn').attr('data-action', 'incrementSeconds') + .append($('').addClass(options.icons.up)))); + middleRow.append($('') + .append($('').addClass('timepicker-second').attr('data-time-component', 'seconds').attr('data-action', 'showSeconds'))); + bottomRow.append($('') + .append($('').attr({href: '#', tabindex: '-1'}).addClass('btn').attr('data-action', 'decrementSeconds') + .append($('').addClass(options.icons.down)))); + } + + if (!use24Hours) { + topRow.append($('').addClass('separator')); + middleRow.append($('') + .append($('').addClass('separator')); + } + + return $('
    ').addClass('timepicker-picker') + .append($('').addClass('table-condensed') + .append([topRow, middleRow, bottomRow])); + }, + + getTimePickerTemplate = function () { + var hoursView = $('
    ').addClass('timepicker-hours') + .append($('
    ').addClass('table-condensed')), + minutesView = $('
    ').addClass('timepicker-minutes') + .append($('
    ').addClass('table-condensed')), + secondsView = $('
    ').addClass('timepicker-seconds') + .append($('
    ').addClass('table-condensed')), + ret = [getTimePickerMainTemplate()]; + + if (isEnabled('h')) { + ret.push(hoursView); + } + if (isEnabled('m')) { + ret.push(minutesView); + } + if (isEnabled('s')) { + ret.push(secondsView); + } + + return ret; + }, + + getToolbar = function () { + var row = []; + if (options.showTodayButton) { + row.push($(' - + <% end %> @@ -30,13 +30,14 @@ <%= paginate @juties_in %> -
    - <%= render 'assign_in_juty', in_juty: @in_juty, table: @table %> +
    + <%= render 'form', in_juty: @in_juty, table: @table %>
    -
    - +
    +      +
    diff --git a/app/views/origami/in_juties/new.html.erb b/app/views/origami/in_juties/new.html.erb index eb34f01c..f59ff6fd 100644 --- a/app/views/origami/in_juties/new.html.erb +++ b/app/views/origami/in_juties/new.html.erb @@ -6,5 +6,5 @@
  • New
    • - <%= render 'form', in_juty: @in_juty %> + <%= render 'form', in_juty: @in_juty, table: @table %> diff --git a/dump.rdb b/dump.rdb index 332310c7de18a2a63f99b8eafc63674d6ba26c52..c5350a135cafb3a36ab94837ae372b8c4e343ffa 100644 GIT binary patch delta 70 zcmV-M0J;C22Au|wFc=<$rdj$3b#rB8Ep26O!f@dg0R8~`5do2$8nI%N0R&a|bTYH~ c0S^HcI5jXaIW9OkGB`Cg|D3(96aWZdT&QgsAOHXW delta 70 zcmV-M0J;C22Au|wFc|$irdj$3b#rB8Ep26O!m#`u0R8~`5do2$8nI%N0R%8CTQRfw c0S^HcHa0aiGA=SVF*Y(c|1I=AZ{h1@H^Y4zS^xk5 From bf9f0cdbe7ddf1f8bdc2820e5acca4bc8204c49c Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 30 Aug 2017 18:22:22 +0630 Subject: [PATCH 241/246] CRUD Update for Promotion --- .../settings/promotions_controller.rb | 11 ++ app/models/menu_item.rb | 1 + app/views/settings/promotions/_form.html.erb | 114 ++++++++++++++++-- config/routes.rb | 1 + 4 files changed, 119 insertions(+), 8 deletions(-) diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb index ef972df9..af8bedc1 100644 --- a/app/controllers/settings/promotions_controller.rb +++ b/app/controllers/settings/promotions_controller.rb @@ -76,6 +76,17 @@ class Settings::PromotionsController < ApplicationController end end + def find_item_instance + item = MenuItem.find_by_item_code(params[:item_code]) + if item.nil? + product = Product.where("item_code = ?",params[:item_code]).pluck(:name,:item_code) + render json: product + else + menu_instance = MenuItemInstance.where("menu_item_id = ?",item.id).pluck(:item_instance_name,:item_instance_code) + render json: menu_instance + end + end + private # Use callbacks to share common setup or constraints between actions. def set_promotion diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index e7f53dcd..7ea5c3ad 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -19,6 +19,7 @@ class MenuItem < ApplicationRecord scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') } scope :set_menu_item, -> { where(type: 'SetMenuItem') } + scope :active, -> { where(is_available: true) } # Item Image Uploader mount_uploader :image_path, MenuItemImageUploader diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index 1e4a3f86..7ac413d0 100644 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -49,32 +49,79 @@
    -
    <%= f.input :original_product,collection: MenuItem.order("name desc").pluck(:name,:item_code),input_html: { selected: 2 } %>
    + <% arr = MenuItem.active.order("name desc").pluck(:name,:item_code) %> + <% Product.order("name desc").pluck(:name,:item_code).each do |p| %> + <% arr.push(p) %> + <% end %> +
    + + + +
    + + <% sample = [] %> + <% if !@promotion.original_product.nil? %> + <% if !MenuItemInstance.find_by_item_instance_code(@promotion.original_product).nil? %> + <% sample = MenuItemInstance.where("item_instance_code=?",@promotion.original_product).pluck(:item_instance_name,:item_instance_code)%> + <% else %> + <% sample = Product.where("item_code=?",@promotion.original_product).pluck(:name,:item_code)%> + <% end %> + <% end %> +
    <%= f.input :original_product,collection: sample %>
    +
    <%= f.input :min_qty %>

    -
    Item Code
    +
    Item Code
    Min Qty
    Net off
    Net Price
    -
    Percentage
    -
    +
    Percentage
    +
    <%= f.fields_for :promotion_products do |pro| %>
    -
    <%= pro.input :item_code, label: false,collection: MenuItem.order("name desc").pluck(:name,:item_code)%>
    + <% arr = MenuItem.active.order("name desc").pluck(:name,:item_code) %> + <% Product.order("name desc").pluck(:name,:item_code).each do |p| %> + <% arr.push(p) %> + <% end %> +
    + +
    + <% sample = [] %> +
    <%= pro.input :item_code, :class => 'promoproduct', collection: sample,input_html: { selected: 2 }, label: false %>
    <%= pro.input :min_qty , label: false%>
    <%= pro.input :net_off , label: false %>
    <%= pro.input :net_price , label: false %>
    -
    <%= pro.input :percentage , label: false %>
    -
    <%= pro.link_to_remove "X" %>
    +
    <%= pro.input :percentage , label: false %>
    +
    <%= pro.link_to_remove "X" %>
    <% end %>
    -
    <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %>
    +
    <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary addProduct' %>
    @@ -103,5 +150,56 @@ $(document).ready(function(){ datepicker:false, format:'H:m' }); + $("#promotion_original_product").select2(); + $(".item_code_place").select2(); + $(".item_code_place").on('change', function(event) { + var ajax_url = "<%= settings_find_item_instance_path %>"; + var item_code = this.value; + $.ajax({ + type: "GET", + url: ajax_url, + data: 'item_code=' + item_code, + success: function (result) { + $("#promotion_original_product").empty(); + var itemlist; + for (var i = 0; i < result.length; i++) { + itemlist += "" + } + $("#promotion_original_product").append(itemlist); + $("#promotion_original_product").select2(); + } + }); + }); + $(".promotion_promotion_products_item_code select").select2(); + $(".item_code_place1").select2(); + callforpromoproduct(); + $(".addProduct").on('click', function(event) { + setTimeout(function(){ + $(".promotion_promotion_products_item_code select").select2(); + callforpromoproduct(); + }, 0); + }); + function callforpromoproduct(){ + $(".item_code_place1").select2(); + $(".item_code_place1").on('change', function(event) { + id = $(this).parent().next().find("select").attr("id"); + var ajax_url = "<%= settings_find_item_instance_path %>"; + var item_code = this.value; + $.ajax({ + type: "GET", + url: ajax_url, + data: 'item_code=' + item_code, + success: function (result) { + $("#"+id).empty(); + var itemlist; + for (var i = 0; i < result.length; i++) { + itemlist += "" + } + $("#"+id).append(itemlist); + $("#"+id).select2(); + } + }); + }); + } }); diff --git a/config/routes.rb b/config/routes.rb index 1130bf36..b095e099 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -292,6 +292,7 @@ Rails.application.routes.draw do resources :promotions do resources :promotion_products end + get '/find_item_instance' => 'promotions#find_item_instance', as:'find_item_instance' # commission resources :commissions From 84d483cad23dd2295754bd6e9606330ce68a11f4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 30 Aug 2017 18:41:54 +0630 Subject: [PATCH 242/246] update addorder --- app/assets/javascripts/addorder.js | 169 ++++++++++++++---- app/assets/stylesheets/addorder.scss | 41 ++++- .../menu_item_instances_controller.rb | 9 + .../origami/addorders_controller.rb | 1 + .../menu_item_instances/show.json.jbuilder | 39 ++++ app/views/origami/addorders/detail.html.erb | 30 ++-- .../get_instance.json.jbuilder | 26 +++ config/routes.rb | 3 +- 8 files changed, 265 insertions(+), 53 deletions(-) create mode 100644 app/controllers/api/restaurant/menu_item_instances_controller.rb create mode 100644 app/views/api/restaurant/menu_item_instances/show.json.jbuilder diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 54b1c7b6..158246d4 100644 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -12,6 +12,12 @@ $(function(){ qty = $(this).val(); price = $("#unit_price").text(); $("#total_price").text(qty*price); + }); + + $("#set_change_qty").change(function(){ + qty = $(this).val(); + price = $("#set_total_price").text(); + $("#set_total_price").text(qty*price); }); //show menu item list when click menu category @@ -98,23 +104,13 @@ $(function(){ //end Ajax } //end show list function - //click item row for add order + //click item row for item set $(document).on('click', '.set_item_box', function(event){ $(".instance-list").empty(); + $(".options-list").empty(); + data = $(this).parent().children().children('.add_icon'); - item_options = $(this).data('option'); - for(var field in item_options) { - value = item_options[field]["values"]; - type = item_options[field]["type"]; - row = "

    "+type+"

    " - $(value).each(function(i){ - row +=""; - }); - $(".opt-list").append(row); - } - instances = $(this).data('instance'); item_sets = $(this).data('item-sets'); @@ -123,21 +119,25 @@ $(function(){ $(value).each(function(i){ $.ajax({ type: "GET", - url: '../../settings/menu_item_instances/get_instance/'+value[i]["id"], + url: '../../api/restaurant/menu_item_instances/'+value[i]["id"], data: {id:value[i]}, - success:function(result){ - // var image_path = "" - console.log(result) - row = '
    ' - +'
    ' + success:function(result){ + + row = '
    ' + +"
    " +'
    ' +''+result["name"]+'' +'
    ' +'
    ' - +'' + +'' +'
    ' +'
    ' +' '+result["price"]+'' + +' ' +'
    ' +'
    ' +'
    ' @@ -146,16 +146,97 @@ $(function(){ } }); }); - } - $('#change_qty').val(1); - $('#item_instances').text(instances); - $('#title_name').text(data.attr('data-name')); - $('#item_code').text(data.attr('data-item-code')); - $('#total_price').text(data.attr('data-price')); - $('#unit_price').text(data.attr('data-price')); + $('#set_change_qty').val(1); + $('#set_item_instances').text(instances); + $('#set_name').text(data.attr('data-name')); + $('#set_item_code').text(data.attr('data-item-code')); + $('#set_total_price').text(data.attr('data-price')); + $('#set_unit_price').text(data.attr('data-price')); }); + // click instance for add item set + $(document).on('click', '.instance_box', function(event){ + + $(".options-list").empty(); + + item_options = $(this).data('option'); + code = $(this).data('code'); + + for(var field in item_options) { + value = item_options[field]["values"]; + type = item_options[field]["type"]; + row = "

    "+type+"

    " + $(value).each(function(i){ + row +=""; + }); + $(".options-list").append(row); + } + + if($(this).hasClass('selected-instance') == true){ + sub_total = $('#set_total_price').text(); + name = $(this).data('name'); + price = $(this).data('price'); + qty = $('#set_change_qty').val(); + total = qty*price; + var total_price = +sub_total - +total; + $(this).removeClass('selected-instance'); + $(".options-list").empty(); + $(this).removeAttr('data-options'); + $('#instance_option').text('') + }else { + sub_total = $('#set_total_price').text(); + name = $(this).data('name'); + price = $(this).data('price'); + qty = $('#set_change_qty').val(); + total = qty*price; + var total_price = +sub_total + +total; + $(this).addClass('selected-instance'); + } + $('#set_total_price').text(total_price); + }); //End selecct attribute buttom + + // click add order + $(document).on('click', '.set_order', function(event){ + total_price = $('#set_total_price').text(); + qty = parseInt($('#set_change_qty').val()); + item_code = $('#set_item_code').text(); + item_name = $('#set_name').text(); + + var items = $('.selected-instance'); + + attribute_arr = [] + option_arr = [] + var rowCount = $('.summary-items tbody tr').length+1; + $(items).each(function(i){ + code = $(items[i]).attr('data-code'); + name = $(items[i]).attr('data-name'); + price = $(items[i]).attr('data-price'); + option = $(items[i]).attr('data-options'); + total = qty * price ; + option_arr.push(option); + row ="
    " + +'' + +'' + +'' + +'' + +''; + $(".summary-items tbody").append(row); + rowCount = rowCount + 1; + }); + calculate_sub_total(); + + }); //End add order Click + //click item row for add order $(document).on('click', '.menu_item_box', function(event){ $('.attributes-list').empty(); @@ -214,8 +295,8 @@ $(function(){ type = item_options[field]["type"]; row = "

    "+type+"

    " $(value).each(function(i){ - row +=""; + row +=""; }); $(".options-list").append(row); } @@ -271,13 +352,27 @@ $(function(){ $(document).on('click', '.option_btn', function(event){ value = $(this).data('value'); type = $(this).data('type'); - options = $(".option_btn"); + group = $(this).data('group'); + options = $(".option_btn"); $(options).each(function(i){ if ($(options[i]).attr('data-type')==type){ $('.'+type).removeClass("selected-option"); } }); $(this).addClass('selected-option'); + + if(group == "set_menu"){ + code = $(this).data('code'); + value = $(this).data('value'); + + instance = $(".selected-instance"); + $(instance).each(function(i){ + if ($(instance[i]).attr('data-code')==code){ + $(instance[i]).attr('data-options',value); + $(instance[i]).children().children('#instance_option').text(value); + } + }); + } }); //End selecct attribute buttom @@ -310,7 +405,7 @@ $(function(){ show_item_detail(item_data); calculate_sub_total(); - }); //End Add Icon Click + }); //End add order Click // click plus icon for add $(document).on('click', '.add_icon', function(event){ @@ -320,6 +415,7 @@ $(function(){ }); //End Add Icon Click function show_item_detail(data){ + console.log(data) qty = parseInt(data.attr('data-qty')); append = 0; price = parseFloat(data.attr('data-price')).toFixed(2); @@ -376,11 +472,11 @@ $(function(){ // Pay Discount for Payment $("#create_order").on('click', function(e){ e.preventDefault(); - $( "#loading_wrapper" ).show(); + $("#loading_wrapper").show(); var table_id = $('#table_id').text(); var booking_id = $('#booking_id').text(); if (!booking_id.length > 0) { - console.log("hi") + var params = {'order_source': "cashier", 'order_type': "dine_in", 'customer_id': "", 'guest_info': "",'booking_id':booking_id, 'table_id': table_id, @@ -390,7 +486,7 @@ $(function(){ var order_items = JSON.stringify(get_order_item_rows()); var ajax_url = '../addorders/create'; - console.log(ajax_url) + var params = {'order_source': "cashier", 'order_type': "dine_in", 'customer_id': "", 'guest_info': "", @@ -403,10 +499,10 @@ $(function(){ data: params, dataType: "json", success:function(result){ - $( "#loading_wrapper" ).show(); + $("#loading_wrapper").hide(); $.confirm({ title: 'Infomation!', - content: "result.status", + content: "Order has been successfully created", buttons: { confirm: { text: 'Ok', @@ -501,6 +597,7 @@ $(function(){ var item_row = $('.summary-items tbody tr'); $(item_row).each(function(i){ var order_item = {}; + console.log($(item_row[i]).attr('data-options')); order_item.order_item_id = $(item_row[i]).attr('data-row'); order_item.item_instance_code = $(item_row[i]).attr('data-instance-code'); order_item.quantity = $(item_row[i]).children('#item_qty').text(); diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 29ca7156..b819b47d 100644 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -87,9 +87,16 @@ element.style { color: #fff !important; background-color: green !important; } +.card { + border: 2px solid rgba(0, 0, 0, 0.125) !important; + } +.selected-instance { + border: 2px solid #7a62d3 !important; +} + .attribute_btn { white-space: normal !important; - height: 40px; + /*width: 80px;*/ margin-bottom: 5px; margin-right: 5px; @@ -97,7 +104,7 @@ element.style { .option_btn { white-space: normal !important; - height: 40px; + /*width: 80px;*/ margin-bottom: 5px; margin-right: 5px; @@ -115,4 +122,34 @@ element.style { height: 80px; border: 1px solid #54A5AF; padding: 10px; +} + +.card-footer{ + padding:0.35rem 1.25rem !important; +} + +/*Loading gif for payment*/ + +#loading_wrapper{ + + position: fixed; + background-color: #C8C8C8 ; + height: 100%; + width: 100%; + left: 0; + opacity: 0.6; + top: 0; + z-index: 9999999; +} +#loading{ + position: relative; + height: 100%; + width: 100%; + background-image: url('../../../image/loading-ajax.gif'); + background-position: center center; + background-repeat: no-repeat; + opacity: 1; + filter: alpha(opacity=100); /* ie */ + -moz-opacity: 1; /* mozilla */ + } \ No newline at end of file diff --git a/app/controllers/api/restaurant/menu_item_instances_controller.rb b/app/controllers/api/restaurant/menu_item_instances_controller.rb new file mode 100644 index 00000000..be38f782 --- /dev/null +++ b/app/controllers/api/restaurant/menu_item_instances_controller.rb @@ -0,0 +1,9 @@ +class Api::Restaurant::MenuItemInstancesController < Api::ApiController + skip_before_action :authenticate + #Description + # Pull the default menu details and also other available (active) menus + # Input Params - order_id + def show + @id = MenuItemInstance.find(params[:id]) + end +end diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 23a7bc26..1f9d70f3 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -37,6 +37,7 @@ class Origami::AddordersController < BaseOrigamiController def create Rails.logger.debug "Order Source - " + params[:order_source].to_s Rails.logger.debug "Table ID - " + params[:table_id].to_s + puts params[:order_items] items_arr = [] JSON.parse(params[:order_items]).each { |i| items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]} diff --git a/app/views/api/restaurant/menu_item_instances/show.json.jbuilder b/app/views/api/restaurant/menu_item_instances/show.json.jbuilder new file mode 100644 index 00000000..69302b8e --- /dev/null +++ b/app/views/api/restaurant/menu_item_instances/show.json.jbuilder @@ -0,0 +1,39 @@ +if(@id) + menu_item = MenuItem.find(@id.menu_item_id) + # Format for option json + opt_format = [] + # Format for attributes json + menu_item.item_options.each do|opt| + menu_opt = MenuItemOption.find(opt) + if opt_format.count == 0 + opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] }) + next + end + + opt_format.each do |of| + if menu_opt.option_type.in? opt_format.map {|k| k[:type]} + if menu_opt.option_type == of[:type] + of[:values].push(menu_opt.name) + end + else + new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] } + opt_format.push(new_opt) + break + end + end + end + + json.success true + json.id @id.id + json.name @id.item_instance_name + json.code @id.item_instance_code + + json.item_id @id.menu_item_id + json.attributes @id.item_attributes + json.price @id.price + json.is_default @id.is_default + + json.options opt_format +else + json.success false +end diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index b7f0cf1d..a1bd22dc 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -147,39 +147,41 @@
    - +
    -
    +
    +

    <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %>

    - +
    - - - - - - + + + + + +

    -
    -

    Options

    +



    +
    +
    -
    +
    -

    Total :

    +

    Total :

    - +
    diff --git a/app/views/settings/menu_item_instances/get_instance.json.jbuilder b/app/views/settings/menu_item_instances/get_instance.json.jbuilder index 136c1ff1..69302b8e 100644 --- a/app/views/settings/menu_item_instances/get_instance.json.jbuilder +++ b/app/views/settings/menu_item_instances/get_instance.json.jbuilder @@ -1,4 +1,28 @@ if(@id) + menu_item = MenuItem.find(@id.menu_item_id) + # Format for option json + opt_format = [] + # Format for attributes json + menu_item.item_options.each do|opt| + menu_opt = MenuItemOption.find(opt) + if opt_format.count == 0 + opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] }) + next + end + + opt_format.each do |of| + if menu_opt.option_type.in? opt_format.map {|k| k[:type]} + if menu_opt.option_type == of[:type] + of[:values].push(menu_opt.name) + end + else + new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] } + opt_format.push(new_opt) + break + end + end + end + json.success true json.id @id.id json.name @id.item_instance_name @@ -8,6 +32,8 @@ if(@id) json.attributes @id.item_attributes json.price @id.price json.is_default @id.is_default + + json.options opt_format else json.success false end diff --git a/config/routes.rb b/config/routes.rb index fb4f70e6..87b69834 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,6 +35,7 @@ Rails.application.routes.draw do resources :menu_item_attributes, only: [:index] resources :menu_item_options, only: [:index] resources :menu_sold_out, only: [:index] + resources :menu_item_instances, only: [:show] get "item_sets" => "item_sets#index" end @@ -291,7 +292,7 @@ Rails.application.routes.draw do resources :promotion_products end - get 'menu_item_instances/get_instance/:id' => 'menu_item_instances#get_instance',:as => "show_instance" + # get 'menu_item_instances/get_instance/:id' => 'menu_item_instances#get_instance',:as => "show_instance" end #--------- Transactions Sections ------------# From 883f5f575a495160d31b808b0b3b6b99ffb4ec8e Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 30 Aug 2017 18:57:35 +0630 Subject: [PATCH 243/246] Promotion by Instance --- app/models/promotion.rb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/models/promotion.rb b/app/models/promotion.rb index d60f25a9..dfab86e9 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -23,7 +23,7 @@ class Promotion < ApplicationRecord end def self.is_between_promo_datetime(current_day,current_time) #database is not local time - promoList = Promotion.where("(date_format(promo_start_date, 'YYYY-MM-DD') <=? AND date_format(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time) + promoList = Promotion.where("(TO_CHAR(promo_start_date, 'YYYY-MM-DD') <=? AND TO_CHAR(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time) return promoList end @@ -45,8 +45,8 @@ class Promotion < ApplicationRecord end def self.find_promo_item(promo, orderitem, sale_id) - item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code - if promo.original_product.to_s == item_code + # item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code + if promo.original_product.to_s == orderitem[0] if promo.min_qty.to_i > orderitem[1].to_i return false else @@ -77,7 +77,7 @@ class Promotion < ApplicationRecord def self.check_giveaway_product(promo, orderitem) promo.promotion_products.each do |promo_product| - if promo_product.item_code == OrderItem.find_by_item_instance_code(orderitem).item_code + if promo_product.item_code == orderitem return true, promo_product else return false, promo_product @@ -113,12 +113,11 @@ class Promotion < ApplicationRecord charge_qty += qty end item = OrderItem.find_by_item_instance_code(orderitem[0]) - byebug - # if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_code - # item = OrderItem.find_by_item_instance_code(orderitem[0]) - # else - # item = OrderItem.find_by_item_code(promo_product) - # end + if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_code + item = OrderItem.find_by_item_instance_code(orderitem[0]) + else + item = OrderItem.find_by_item_code(promo_product) + end update_existing_item(foc_qty, item, sale_id, "promotion", item.price) puts "Charged - " + charge_qty.to_s @@ -127,12 +126,13 @@ class Promotion < ApplicationRecord # AA - 10 # 3 # BB # orderList, #S34345 def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id) puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s + byebug promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty foc_qty = find_second_item_qty(sale_id, promo_product) if (foc_qty < promotion_qty) promotion_qty = foc_qty end - item = OrderItem.find_by_item_instance_code(promo_product,orderID) + item = OrderItem.find_by_item_instance_code(promo_product) update_existing_item(promotion_qty, item, sale_id, "promotion", item.price) end @@ -152,7 +152,6 @@ class Promotion < ApplicationRecord sale_item.is_taxable = false sale_item.sale_id = sale_id - sale_item.save sale = Sale.find(sale_id) sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) @@ -163,7 +162,7 @@ class Promotion < ApplicationRecord puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s if same - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[1].to_i / foc_min_qty item = OrderItem.find_by_item_instance_code(orderitem[0]) update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off) else @@ -213,7 +212,7 @@ class Promotion < ApplicationRecord saleObj = Sale.find_by_sale_id(sale_id) itemList = combine_item(saleObj) itemList.each do |item| - if OrderItem.find_by_item_instance_code(item[0]).item_code == promo_item + if item[0] == promo_item return item[1] end end From 3e8ead6a324d597ce3ad891b06629b835eeddae8 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 30 Aug 2017 19:04:06 +0630 Subject: [PATCH 244/246] ui code review and edited --- app/assets/javascripts/application.js | 41 -- app/assets/stylesheets/origami.scss | 50 ++- app/assets/stylesheets/settings.scss | 134 +++++- app/views/home/dashboard.html.erb | 425 ++++++++---------- app/views/home/index.html.erb | 52 +-- app/views/home/show.html.erb | 39 +- app/views/layouts/application.html.erb | 45 ++ app/views/origami/discounts/index.html.erb | 2 +- app/views/origami/home/index.html.erb | 23 +- app/views/origami/home/show.html.erb | 69 ++- .../in_juties/_assign_in_juty.html.erb | 2 + .../origami/in_juties/index_in_juty.html.erb | 4 - .../origami/other_charges/index.html.erb | 2 +- app/views/origami/rooms/show.html.erb | 30 +- app/views/origami/sale_edit/edit.html.erb | 2 +- 15 files changed, 454 insertions(+), 466 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b1879bba..77dbb850 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -33,47 +33,6 @@ $(document).on('turbolinks:load', function() { }); $('.datepicker').attr('ReadOnly','true'); $('.datepicker').css('cursor','pointer'); - - // Image Upload - $("#simple_menu_item_image_path").fileinput({ - previewFileType: "image", - allowedFileExtensions: ["jpg", "gif", "png"], - browseClass: "btn btn-success", - browseLabel: "Pick Image", - browseIcon: " ", - removeClass: "btn btn-danger", - removeLabel: "Delete", - removeIcon: " ", - showUpload: false, - // uploadClass: "btn btn-info", - // uploadLabel: "Upload", - // uploadIcon: " ", - previewTemplates: { - image: '
    \n' + - ' {caption}\n' + - '
    \n', - } - }); - - $("#product_image_path").fileinput({ - previewFileType: "image", - allowedFileExtensions: ["jpg", "gif", "png"], - browseClass: "btn btn-success", - browseLabel: "Pick Image", - browseIcon: " ", - removeClass: "btn btn-danger", - removeLabel: "Delete", - removeIcon: " ", - showUpload: false, - // uploadClass: "btn btn-info", - // uploadLabel: "Upload", - // uploadIcon: " ", - previewTemplates: { - image: '
    \n' + - ' {caption}\n' + - '
    \n', - } - }); }); $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 63e64159..f0db5df8 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -11,10 +11,38 @@ // min-height: 75rem; // padding-top: 4.5rem; // } + +/* Reset */ +.table { + margin-bottom: 0px; +} + +select.form-control { + height: inherit !important; +} + +.form-horizontal .form-group { + margin-right: 0px !important; +} + .card-columns { font-size: 18px !important; } +/* End Reset */ + +.dining { + min-height:470px; + max-height:570px; + overflow:auto +} + +.order-info { + min-height:300px; + max-height:500px; + overflow:auto +} + .others-payment{ line-height:100px; text-align:center; @@ -62,6 +90,10 @@ margin-top:5px; } +.font-12 { + font-size: 12px; +} + .cash-color{ background-color:#80CBC4; } @@ -84,6 +116,12 @@ margin-bottom: 5px; } +.radius-btn { + border-radius:5px; + color:#fff; + background-color:red; +} + .bottom-5 { margin-bottom: 5px; } @@ -186,16 +224,6 @@ margin-bottom: 1px; } -/*----- Reset -----*/ - -select.form-control { - height: inherit !important; -} - -.form-horizontal .form-group { - margin-right: 0px !important; -} - /* Discount */ .discount-item-row { @@ -248,7 +276,6 @@ tr.discount-item-row:hover { /*Loading gif for payment*/ #loading_wrapper{ - position: fixed; background-color: #C8C8C8 ; height: 100%; @@ -258,6 +285,7 @@ tr.discount-item-row:hover { top: 0; z-index: 9999999; } + #loading{ position: relative; height: 100%; diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index e17a0f93..cd7a48af 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -46,23 +46,27 @@ ul.dropdown-menu li a{ width: 100%; } - .footer-header { - color : #ef404a; - font-weight:bold; - font-style:italic; - margin-bottom:0px; - } +.footer-header { + color : #ef404a; + font-weight:bold; + font-style:italic; + margin-bottom:0px; +} - .menu-item-img { +.menu-item-img { margin: 10px; text-align: center; - } +} - .padding-10 { +.padding-10 { padding: 10px; - } +} /* Colors */ +.white { + color: #fff; +} + .purple { background-color:#7a62d3; } @@ -79,7 +83,7 @@ ul.dropdown-menu li a{ background-color: #009900; } -.orange{ +.yellow { background-color: #FF8C00; } @@ -87,4 +91,110 @@ ul.dropdown-menu li a{ background-color: blue; } -/* End Colors */ \ No newline at end of file +/* End Colors */ + +.pin_pad { + width: 33%; + height: 70px; + line-height: 70px; + text-align: center; + background: #54A5AF; + font-size: 20px; + color: white; +} + +.bottom { + margin-bottom: 1px; +} + +.left { + margin-left: 1px; +} + +.card { + margin-top: 10px; + box-sizing: border-box; + border-radius: 2px; + background-clip: padding-box; + transition: 0.3s ease; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + +.card-footer { + padding: 0; + background-color: #fff; + border-top: none; +} + +.dashboard-nav { + cursor: pointer; + color: #7a62d3; + padding: 10px; + font-size: 24px; + font-weight: bold; + border-radius: 0 0 2px 2px; + background-clip: padding-box; + box-sizing: border-box; + transition: color 0.3s ease; + text-align: center; +} + +.card:hover { + box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.16), 0 10px 20px 0 rgba(0, 0, 0, 0.12); +} + +#admin ul { + line-height: 25px; +} + +.panel-body { + padding: 5px !important; +} + +.panel-title .glyphicon { + float: right; +} + +@media screen and (min-height: 800px){ + .card .card-content { + padding: 30px !important; + } +} + +@media screen and (min-height: 540px){ + .card .card-content { + padding: 20px !important; + } +} + +@media (min-width: 34em) { + .card-columns { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + } +} + +@media (min-width: 48em) { + .card-columns { + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + } +} + +@media (min-width: 62em) { + .card-columns { + -webkit-column-count: 4; + -moz-column-count: 4; + column-count: 4; + } +} + +@media (min-width: 75em) { + .card-columns { + -webkit-column-count: 5; + -moz-column-count: 5; + column-count: 5; + } +} \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 8a922573..33f9fc2d 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -15,220 +15,192 @@
    -
    -
    -
    -
    -
    - OQS -
    -
    +
    +
    +

    Role Features

    + +
    + <% if current_user.role == 'administrator' %> +
    +
    +

    + Administrator +

    +
    +
    +
    +
      +
    • All Settings
      • +
        +
      • Zone
        • +
      • OQS
        • +
      • Menu
        • +
      • Cashier Terminal
        • +
      • Payment
        • +
      • Merbership
        • +
      • Print
        • +
      • Employees
        • +
      • Accounts
        • +
      +
    +
      +
    • Transactions
      • +
        +
      • Order
        • +
      • Sale
        • +
      • Credit Note
        • +

      +
    • Reports
      • +
        +
      • Daily Sale
        • +
      • Sale Item
        • +
      • Receipt
        • +
      • Shift Sale
        • +
      • Credit Sale
        • +
      • Void Sale
        • +
      +
    +
      +
    • OQS

      • +
    • Cashier

      • +
    • CRM
      • +
    +
    +
    +
    + <% elsif current_user.role == 'manager' %> +
    +
    +

    + Manager +

    +
    +
    +
    +
      +
    • All Settings
      • +
        +
      • Zone
        • +
      • OQS
        • +
      • Menu
        • +
      • Cashier Terminal
        • +
      • Print
        • +
      • Employees
        • +
      • Accounts
        • +
      +
    +
      +
    • Transactions
      • +
        +
      • Order
        • +
      • Sale
        • +
      • Credit Note
        • +

      +
    • Reports
      • +
        +
      • Daily Sale
        • +
      • Sale Item
        • +
      • Receipt
        • +
      • Shift Sale
        • +
      • Credit Sale
        • +
      • Void Sale
        • +
      +
    +
      +
    • OQS

      • +
    • Cashier

      • +
    • CRM
      • +
    +
    +
    +
    + <% elsif current_user.role == 'supervisour' %> +
    +
    +

    + Supervisor +

    +
    +
    +
    +
      +
    • OQS
      • +
        +
      • Void
        • +
      • FOC
        • +
      • Edit
        • +
      • Credit
        • +
      • Payment
        • +
      +
    +
    +
    +
    + <% elsif current_user.role == 'cashier' %> +
    +
    +

    + Cashier +

    +
    +
    +
    +
      +
    • Cashier Panel except Edit and Void
      • +
    • Sale and Order
      • +
    • and Queue in CRM
      • +
    +
    +
    +
    + <% elsif current_user.role == 'account' %> +
    +
    +

    + Accountant +

    +
    +
    +
    +
      +
    • Daily Sale Report
      • +
    • Sale Item Report
      • +
    • Receipt No Report
      • +
    • ShiftSale Report
      • +
    +
    +
    +
    + <% end %>
    -
    -
    -
    -
    - Cashier -
    +
    +
    +
    OQS
    +
    + +
    +
    Cashier
    +
    + +
    +
    CRM
    +
    + + + +
    +
    Inventory
    - -
    -
    -
    -
    - CRM -
    -
    -
    -
    - -
    -
    -
    -
    - Backend -
    -
    -
    -
    - -
    -
    -
    -
    - Inventory -
    -
    -
    -
    -
    -
    -
    -

    Role Features

    - -
    - <% if current_user.role == 'administrator' %> -
    -
    -

    - Administrator -

    -
    -
    -
    -
      -
    • All Settings
      • -
        -
      • Zone
        • -
      • OQS
        • -
      • Menu
        • -
      • Cashier Terminal
        • -
      • Payment
        • -
      • Merbership
        • -
      • Print
        • -
      • Employees
        • -
      • Accounts
        • -
      -
    -
      -
    • Transactions
      • -
        -
      • Order
        • -
      • Sale
        • -
      • Credit Note
        • -

      -
    • Reports
      • -
        -
      • Daily Sale
        • -
      • Sale Item
        • -
      • Receipt
        • -
      • Shift Sale
        • -
      • Credit Sale
        • -
      • Void Sale
        • -
      -
    -
      -
    • OQS

      • -
    • Cashier

      • -
    • CRM
      • -
    -
    -
    -
    - <% elsif current_user.role == 'manager' %> -
    -
    -

    - Manager -

    -
    -
    -
    -
      -
    • All Settings
      • -
        -
      • Zone
        • -
      • OQS
        • -
      • Menu
        • -
      • Cashier Terminal
        • -
      • Print
        • -
      • Employees
        • -
      • Accounts
        • -
      -
    -
      -
    • Transactions
      • -
        -
      • Order
        • -
      • Sale
        • -
      • Credit Note
        • -

      -
    • Reports
      • -
        -
      • Daily Sale
        • -
      • Sale Item
        • -
      • Receipt
        • -
      • Shift Sale
        • -
      • Credit Sale
        • -
      • Void Sale
        • -
      -
    -
      -
    • OQS

      • -
    • Cashier

      • -
    • CRM
      • -
    -
    -
    -
    - <% elsif current_user.role == 'supervisour' %> -
    -
    -

    - Supervisor -

    -
    -
    -
    -
      -
    • OQS
      • -
        -
      • Void
        • -
      • FOC
        • -
      • Edit
        • -
      • Credit
        • -
      • Payment
        • -
      -
    -
    -
    -
    - <% elsif current_user.role == 'cashier' %> -
    -
    -

    - Cashier -

    -
    -
    -
    -
      -
    • Cashier Panel except Edit and Void
      • -
    • Sale and Order
      • -
    • and Queue in CRM
      • -
    -
    -
    -
    - <% elsif current_user.role == 'account' %> -
    -
    -

    - Accountant -

    -
    -
    -
    -
      -
    • Daily Sale Report
      • -
    • Sale Item Report
      • -
    • Receipt No Report
      • -
    • ShiftSale Report
      • -
    -
    -
    -
    - <% end %> -
    -
    -
    -
    @@ -244,44 +216,3 @@
    - - diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 2a1d9fd3..83d43ea8 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -29,7 +29,7 @@ <% @employees.each do |employee| %> -
    +

    @@ -48,8 +48,8 @@

    -
    -

    Role Features

    +
    +

    Role Features

    @@ -141,52 +141,6 @@
    - diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index ba7bf989..378bcbe3 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -17,7 +17,7 @@

    Date: <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    ').append($('').attr('data-action', 'today').append($('').addClass(options.icons.today)))); + } + if (!options.sideBySide && hasDate() && hasTime()) { + row.push($('').append($('').attr('data-action', 'togglePicker').append($('').addClass(options.icons.time)))); + } + if (options.showClear) { + row.push($('').append($('').attr('data-action', 'clear').append($('').addClass(options.icons.clear)))); + } + if (options.showClose) { + row.push($('').append($('').attr('data-action', 'close').append($('').addClass(options.icons.close)))); + } + return $('').addClass('table-condensed').append($('').append($('').append(row))); + }, + + getTemplate = function () { + var template = $('
    ').addClass('bootstrap-datetimepicker-widget dropdown-menu'), + dateView = $('
    ').addClass('datepicker').append(getDatePickerTemplate()), + timeView = $('
    ').addClass('timepicker').append(getTimePickerTemplate()), + content = $('
      ').addClass('list-unstyled'), + toolbar = $('
    • ').addClass('picker-switch' + (options.collapse ? ' accordion-toggle' : '')).append(getToolbar()); + + if (options.inline) { + template.removeClass('dropdown-menu'); + } + + if (use24Hours) { + template.addClass('usetwentyfour'); + } + if (options.sideBySide && hasDate() && hasTime()) { + template.addClass('timepicker-sbs'); + template.append( + $('
      ').addClass('row') + .append(dateView.addClass('col-sm-6')) + .append(timeView.addClass('col-sm-6')) + ); + template.append(toolbar); + return template; + } + + if (options.toolbarPlacement === 'top') { + content.append(toolbar); + } + if (hasDate()) { + content.append($('
    • ').addClass((options.collapse && hasTime() ? 'collapse in' : '')).append(dateView)); + } + if (options.toolbarPlacement === 'default') { + content.append(toolbar); + } + if (hasTime()) { + content.append($('
    • ').addClass((options.collapse && hasDate() ? 'collapse' : '')).append(timeView)); + } + if (options.toolbarPlacement === 'bottom') { + content.append(toolbar); + } + return template.append(content); + }, + + dataToOptions = function () { + var eData, + dataOptions = {}; + + if (element.is('input') || options.inline) { + eData = element.data(); + } else { + eData = element.find('input').data(); + } + + if (eData.dateOptions && eData.dateOptions instanceof Object) { + dataOptions = $.extend(true, dataOptions, eData.dateOptions); + } + + $.each(options, function (key) { + var attributeName = 'date' + key.charAt(0).toUpperCase() + key.slice(1); + if (eData[attributeName] !== undefined) { + dataOptions[key] = eData[attributeName]; + } + }); + return dataOptions; + }, + + place = function () { + var position = (component || element).position(), + offset = (component || element).offset(), + vertical = options.widgetPositioning.vertical, + horizontal = options.widgetPositioning.horizontal, + parent; + + if (options.widgetParent) { + parent = options.widgetParent.append(widget); + } else if (element.is('input')) { + parent = element.parent().append(widget); + } else if (options.inline) { + parent = element.append(widget); + return; + } else { + parent = element; + element.children().first().after(widget); + } + + // Top and bottom logic + if (vertical === 'auto') { + if (offset.top + widget.height() * 1.5 >= $(window).height() + $(window).scrollTop() && + widget.height() + element.outerHeight() < offset.top) { + vertical = 'top'; + } else { + vertical = 'bottom'; + } + } + + // Left and right logic + if (horizontal === 'auto') { + if (parent.width() < offset.left + widget.outerWidth() / 2 && + offset.left + widget.outerWidth() > $(window).width()) { + horizontal = 'right'; + } else { + horizontal = 'left'; + } + } + + if (vertical === 'top') { + widget.addClass('top').removeClass('bottom'); + } else { + widget.addClass('bottom').removeClass('top'); + } + + if (horizontal === 'right') { + widget.addClass('pull-right'); + } else { + widget.removeClass('pull-right'); + } + + // find the first parent element that has a relative css positioning + if (parent.css('position') !== 'relative') { + parent = parent.parents().filter(function () { + return $(this).css('position') === 'relative'; + }).first(); + } + + if (parent.length === 0) { + throw new Error('datetimepicker component should be placed within a relative positioned container'); + } + + widget.css({ + top: vertical === 'top' ? 'auto' : position.top + element.outerHeight(), + bottom: vertical === 'top' ? position.top + element.outerHeight() : 'auto', + left: horizontal === 'left' ? parent.css('padding-left') : 'auto', + right: horizontal === 'left' ? 'auto' : parent.width() - element.outerWidth() + }); + }, + + notifyEvent = function (e) { + if (e.type === 'dp.change' && ((e.date && e.date.isSame(e.oldDate)) || (!e.date && !e.oldDate))) { + return; + } + element.trigger(e); + }, + + showMode = function (dir) { + if (!widget) { + return; + } + if (dir) { + currentViewMode = Math.max(minViewModeNumber, Math.min(2, currentViewMode + dir)); + } + widget.find('.datepicker > div').hide().filter('.datepicker-' + datePickerModes[currentViewMode].clsName).show(); + }, + + fillDow = function () { + var row = $('
    '), + currentDate = viewDate.clone().startOf('w'); + + if (options.calendarWeeks === true) { + row.append($(''); + if (options.calendarWeeks) { + row.append(''); + } + html.push(row); + } + clsName = ''; + if (currentDate.isBefore(viewDate, 'M')) { + clsName += ' old'; + } + if (currentDate.isAfter(viewDate, 'M')) { + clsName += ' new'; + } + if (currentDate.isSame(date, 'd') && !unset) { + clsName += ' active'; + } + if (!isValid(currentDate, 'd')) { + clsName += ' disabled'; + } + if (currentDate.isSame(moment(), 'd')) { + clsName += ' today'; + } + if (currentDate.day() === 0 || currentDate.day() === 6) { + clsName += ' weekend'; + } + row.append(''); + currentDate.add(1, 'd'); + } + + daysView.find('tbody').empty().append(html); + + updateMonths(); + + updateYears(); + }, + + fillHours = function () { + var table = widget.find('.timepicker-hours table'), + currentHour = viewDate.clone().startOf('d'), + html = [], + row = $(''); + + if (viewDate.hour() > 11 && !use24Hours) { + currentHour.hour(12); + } + while (currentHour.isSame(viewDate, 'd') && (use24Hours || (viewDate.hour() < 12 && currentHour.hour() < 12) || viewDate.hour() > 11)) { + if (currentHour.hour() % 4 === 0) { + row = $(''); + html.push(row); + } + row.append(''); + currentHour.add(1, 'h'); + } + table.empty().append(html); + }, + + fillMinutes = function () { + var table = widget.find('.timepicker-minutes table'), + currentMinute = viewDate.clone().startOf('h'), + html = [], + row = $(''), + step = options.stepping === 1 ? 5 : options.stepping; + + while (viewDate.isSame(currentMinute, 'h')) { + if (currentMinute.minute() % (step * 4) === 0) { + row = $(''); + html.push(row); + } + row.append(''); + currentMinute.add(step, 'm'); + } + table.empty().append(html); + }, + + fillSeconds = function () { + var table = widget.find('.timepicker-seconds table'), + currentSecond = viewDate.clone().startOf('m'), + html = [], + row = $(''); + + while (viewDate.isSame(currentSecond, 'm')) { + if (currentSecond.second() % 20 === 0) { + row = $(''); + html.push(row); + } + row.append(''); + currentSecond.add(5, 's'); + } + + table.empty().append(html); + }, + + fillTime = function () { + var timeComponents = widget.find('.timepicker span[data-time-component]'); + if (!use24Hours) { + widget.find('.timepicker [data-action=togglePeriod]').text(date.format('A')); + } + timeComponents.filter('[data-time-component=hours]').text(date.format(use24Hours ? 'HH' : 'hh')); + timeComponents.filter('[data-time-component=minutes]').text(date.format('mm')); + timeComponents.filter('[data-time-component=seconds]').text(date.format('ss')); + + fillHours(); + fillMinutes(); + fillSeconds(); + }, + + update = function () { + if (!widget) { + return; + } + fillDate(); + fillTime(); + }, + + setValue = function (targetMoment) { + var oldDate = unset ? null : date; + + // case of calling setValue(null or false) + if (!targetMoment) { + unset = true; + input.val(''); + element.data('date', ''); + notifyEvent({ + type: 'dp.change', + date: null, + oldDate: oldDate + }); + update(); + return; + } + + targetMoment = targetMoment.clone().locale(options.locale); + + if (options.stepping !== 1) { + targetMoment.minutes((Math.round(targetMoment.minutes() / options.stepping) * options.stepping) % 60).seconds(0); + } + + if (isValid(targetMoment)) { + date = targetMoment; + viewDate = date.clone(); + input.val(date.format(actualFormat)); + element.data('date', date.format(actualFormat)); + update(); + unset = false; + notifyEvent({ + type: 'dp.change', + date: date.clone(), + oldDate: oldDate + }); + } else { + if (!options.keepInvalid) { + input.val(unset ? '' : date.format(actualFormat)); + } + notifyEvent({ + type: 'dp.error', + date: targetMoment + }); + } + }, + + hide = function () { + var transitioning = false; + if (!widget) { + return picker; + } + // Ignore event if in the middle of a picker transition + widget.find('.collapse').each(function () { + var collapseData = $(this).data('collapse'); + if (collapseData && collapseData.transitioning) { + transitioning = true; + return false; + } + return true; + }); + if (transitioning) { + return picker; + } + if (component && component.hasClass('btn')) { + component.toggleClass('active'); + } + widget.hide(); + + $(window).off('resize', place); + widget.off('click', '[data-action]'); + widget.off('mousedown', false); + + widget.remove(); + widget = false; + + notifyEvent({ + type: 'dp.hide', + date: date.clone() + }); + return picker; + }, + + clear = function () { + setValue(null); + }, + + /******************************************************************************** + * + * Widget UI interaction functions + * + ********************************************************************************/ + actions = { + next: function () { + viewDate.add(datePickerModes[currentViewMode].navStep, datePickerModes[currentViewMode].navFnc); + fillDate(); + }, + + previous: function () { + viewDate.subtract(datePickerModes[currentViewMode].navStep, datePickerModes[currentViewMode].navFnc); + fillDate(); + }, + + pickerSwitch: function () { + showMode(1); + }, + + selectMonth: function (e) { + var month = $(e.target).closest('tbody').find('span').index($(e.target)); + viewDate.month(month); + if (currentViewMode === minViewModeNumber) { + setValue(date.clone().year(viewDate.year()).month(viewDate.month())); + if (!options.inline) { + hide(); + } + } else { + showMode(-1); + fillDate(); + } + }, + + selectYear: function (e) { + var year = parseInt($(e.target).text(), 10) || 0; + viewDate.year(year); + if (currentViewMode === minViewModeNumber) { + setValue(date.clone().year(viewDate.year())); + if (!options.inline) { + hide(); + } + } else { + showMode(-1); + fillDate(); + } + }, + + selectDay: function (e) { + var day = viewDate.clone(); + if ($(e.target).is('.old')) { + day.subtract(1, 'M'); + } + if ($(e.target).is('.new')) { + day.add(1, 'M'); + } + setValue(day.date(parseInt($(e.target).text(), 10))); + if (!hasTime() && !options.keepOpen && !options.inline) { + hide(); + } + }, + + incrementHours: function () { + setValue(date.clone().add(1, 'h')); + }, + + incrementMinutes: function () { + setValue(date.clone().add(options.stepping, 'm')); + }, + + incrementSeconds: function () { + setValue(date.clone().add(1, 's')); + }, + + decrementHours: function () { + setValue(date.clone().subtract(1, 'h')); + }, + + decrementMinutes: function () { + setValue(date.clone().subtract(options.stepping, 'm')); + }, + + decrementSeconds: function () { + setValue(date.clone().subtract(1, 's')); + }, + + togglePeriod: function () { + setValue(date.clone().add((date.hours() >= 12) ? -12 : 12, 'h')); + }, + + togglePicker: function (e) { + var $this = $(e.target), + $parent = $this.closest('ul'), + expanded = $parent.find('.in'), + closed = $parent.find('.collapse:not(.in)'), + collapseData; + + if (expanded && expanded.length) { + collapseData = expanded.data('collapse'); + if (collapseData && collapseData.transitioning) { + return; + } + if (expanded.collapse) { // if collapse plugin is available through bootstrap.js then use it + expanded.collapse('hide'); + closed.collapse('show'); + } else { // otherwise just toggle in class on the two views + expanded.removeClass('in'); + closed.addClass('in'); + } + if ($this.is('span')) { + $this.toggleClass(options.icons.time + ' ' + options.icons.date); + } else { + $this.find('span').toggleClass(options.icons.time + ' ' + options.icons.date); + } + + // NOTE: uncomment if toggled state will be restored in show() + //if (component) { + // component.find('span').toggleClass(options.icons.time + ' ' + options.icons.date); + //} + } + }, + + showPicker: function () { + widget.find('.timepicker > div:not(.timepicker-picker)').hide(); + widget.find('.timepicker .timepicker-picker').show(); + }, + + showHours: function () { + widget.find('.timepicker .timepicker-picker').hide(); + widget.find('.timepicker .timepicker-hours').show(); + }, + + showMinutes: function () { + widget.find('.timepicker .timepicker-picker').hide(); + widget.find('.timepicker .timepicker-minutes').show(); + }, + + showSeconds: function () { + widget.find('.timepicker .timepicker-picker').hide(); + widget.find('.timepicker .timepicker-seconds').show(); + }, + + selectHour: function (e) { + var hour = parseInt($(e.target).text(), 10); + + if (!use24Hours) { + if (date.hours() >= 12) { + if (hour !== 12) { + hour += 12; + } + } else { + if (hour === 12) { + hour = 0; + } + } + } + setValue(date.clone().hours(hour)); + actions.showPicker.call(picker); + }, + + selectMinute: function (e) { + setValue(date.clone().minutes(parseInt($(e.target).text(), 10))); + actions.showPicker.call(picker); + }, + + selectSecond: function (e) { + setValue(date.clone().seconds(parseInt($(e.target).text(), 10))); + actions.showPicker.call(picker); + }, + + clear: clear, + + today: function () { + setValue(moment()); + }, + + close: hide + }, + + doAction = function (e) { + if ($(e.currentTarget).is('.disabled')) { + return false; + } + actions[$(e.currentTarget).data('action')].apply(picker, arguments); + return false; + }, + + show = function () { + var currentMoment, + useCurrentGranularity = { + 'year': function (m) { + return m.month(0).date(1).hours(0).seconds(0).minutes(0); + }, + 'month': function (m) { + return m.date(1).hours(0).seconds(0).minutes(0); + }, + 'day': function (m) { + return m.hours(0).seconds(0).minutes(0); + }, + 'hour': function (m) { + return m.seconds(0).minutes(0); + }, + 'minute': function (m) { + return m.seconds(0); + } + }; + + if (input.prop('disabled') || (!options.ignoreReadonly && input.prop('readonly')) || widget) { + return picker; + } + if (options.useCurrent && unset && ((input.is('input') && input.val().trim().length === 0) || options.inline)) { + currentMoment = moment(); + if (typeof options.useCurrent === 'string') { + currentMoment = useCurrentGranularity[options.useCurrent](currentMoment); + } + setValue(currentMoment); + } + + widget = getTemplate(); + + fillDow(); + fillMonths(); + + widget.find('.timepicker-hours').hide(); + widget.find('.timepicker-minutes').hide(); + widget.find('.timepicker-seconds').hide(); + + update(); + showMode(); + + $(window).on('resize', place); + widget.on('click', '[data-action]', doAction); // this handles clicks on the widget + widget.on('mousedown', false); + + if (component && component.hasClass('btn')) { + component.toggleClass('active'); + } + widget.show(); + place(); + + if (!input.is(':focus')) { + input.focus(); + } + + notifyEvent({ + type: 'dp.show' + }); + return picker; + }, + + toggle = function () { + return (widget ? hide() : show()); + }, + + parseInputDate = function (inputDate) { + if (moment.isMoment(inputDate) || inputDate instanceof Date) { + inputDate = moment(inputDate); + } else { + inputDate = moment(inputDate, parseFormats, options.useStrict); + } + inputDate.locale(options.locale); + return inputDate; + }, + + keydown = function (e) { + //if (e.keyCode === 27 && widget) { // allow escape to hide picker + // hide(); + // return false; + //} + //if (e.keyCode === 40 && !widget) { // allow down to show picker + // show(); + // e.preventDefault(); + //} + //return true; + + var handler = null, + index, + index2, + pressedKeys = [], + pressedModifiers = {}, + currentKey = e.which, + keyBindKeys, + allModifiersPressed, + pressed = 'p'; + + keyState[currentKey] = pressed; + + for (index in keyState) { + if (keyState.hasOwnProperty(index) && keyState[index] === pressed) { + pressedKeys.push(index); + if (parseInt(index, 10) !== currentKey) { + pressedModifiers[index] = true; + } + } + } + + for (index in options.keyBinds) { + if (options.keyBinds.hasOwnProperty(index) && typeof (options.keyBinds[index]) === 'function') { + keyBindKeys = index.split(' '); + if (keyBindKeys.length === pressedKeys.length && keyMap[currentKey] === keyBindKeys[keyBindKeys.length - 1]) { + allModifiersPressed = true; + for (index2 = keyBindKeys.length - 2; index2 >= 0; index2--) { + if (!(keyMap[keyBindKeys[index2]] in pressedModifiers)) { + allModifiersPressed = false; + break; + } + } + if (allModifiersPressed) { + handler = options.keyBinds[index]; + break; + } + } + } + } + + if (handler) { + handler.call(picker, widget); + e.stopPropagation(); + e.preventDefault(); + } + }, + + keyup = function (e) { + keyState[e.which] = 'r'; + e.stopPropagation(); + e.preventDefault(); + }, + + change = function (e) { + var val = $(e.target).val().trim(), + parsedDate = val ? parseInputDate(val) : null; + setValue(parsedDate); + e.stopImmediatePropagation(); + return false; + }, + + attachDatePickerElementEvents = function () { + input.on({ + 'change': change, + 'blur': options.debug ? '' : hide, + 'keydown': keydown, + 'keyup': keyup + }); + + if (element.is('input')) { + input.on({ + 'focus': show + }); + } else if (component) { + component.on('click', toggle); + component.on('mousedown', false); + } + }, + + detachDatePickerElementEvents = function () { + input.off({ + 'change': change, + 'blur': hide, + 'keydown': keydown, + 'keyup': keyup + }); + + if (element.is('input')) { + input.off({ + 'focus': show + }); + } else if (component) { + component.off('click', toggle); + component.off('mousedown', false); + } + }, + + indexGivenDates = function (givenDatesArray) { + // Store given enabledDates and disabledDates as keys. + // This way we can check their existence in O(1) time instead of looping through whole array. + // (for example: options.enabledDates['2014-02-27'] === true) + var givenDatesIndexed = {}; + $.each(givenDatesArray, function () { + var dDate = parseInputDate(this); + if (dDate.isValid()) { + givenDatesIndexed[dDate.format('YYYY-MM-DD')] = true; + } + }); + return (Object.keys(givenDatesIndexed).length) ? givenDatesIndexed : false; + }, + + initFormatting = function () { + var format = options.format || 'L LT'; + + actualFormat = format.replace(/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g, function (formatInput) { + var newinput = date.localeData().longDateFormat(formatInput) || formatInput; + return newinput.replace(/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g, function (formatInput2) { //temp fix for #740 + return date.localeData().longDateFormat(formatInput2) || formatInput2; + }); + }); + + + parseFormats = options.extraFormats ? options.extraFormats.slice() : []; + if (parseFormats.indexOf(format) < 0 && parseFormats.indexOf(actualFormat) < 0) { + parseFormats.push(actualFormat); + } + + use24Hours = (actualFormat.toLowerCase().indexOf('a') < 1 && actualFormat.indexOf('h') < 1); + + if (isEnabled('y')) { + minViewModeNumber = 2; + } + if (isEnabled('M')) { + minViewModeNumber = 1; + } + if (isEnabled('d')) { + minViewModeNumber = 0; + } + + currentViewMode = Math.max(minViewModeNumber, currentViewMode); + + if (!unset) { + setValue(date); + } + }; + + /******************************************************************************** + * + * Public API functions + * ===================== + * + * Important: Do not expose direct references to private objects or the options + * object to the outer world. Always return a clone when returning values or make + * a clone when setting a private variable. + * + ********************************************************************************/ + picker.destroy = function () { + hide(); + detachDatePickerElementEvents(); + element.removeData('DateTimePicker'); + element.removeData('date'); + }; + + picker.toggle = toggle; + + picker.show = show; + + picker.hide = hide; + + picker.disable = function () { + hide(); + if (component && component.hasClass('btn')) { + component.addClass('disabled'); + } + input.prop('disabled', true); + return picker; + }; + + picker.enable = function () { + if (component && component.hasClass('btn')) { + component.removeClass('disabled'); + } + input.prop('disabled', false); + return picker; + }; + + picker.ignoreReadonly = function (ignoreReadonly) { + if (arguments.length === 0) { + return options.ignoreReadonly; + } + if (typeof ignoreReadonly !== 'boolean') { + throw new TypeError('ignoreReadonly () expects a boolean parameter'); + } + options.ignoreReadonly = ignoreReadonly; + return picker; + }; + + picker.options = function (newOptions) { + if (arguments.length === 0) { + return $.extend(true, {}, options); + } + + if (!(newOptions instanceof Object)) { + throw new TypeError('options() options parameter should be an object'); + } + $.extend(true, options, newOptions); + $.each(options, function (key, value) { + if (picker[key] !== undefined) { + picker[key](value); + } else { + throw new TypeError('option ' + key + ' is not recognized!'); + } + }); + return picker; + }; + + picker.date = function (newDate) { + if (arguments.length === 0) { + if (unset) { + return null; + } + return date.clone(); + } + + if (newDate !== null && typeof newDate !== 'string' && !moment.isMoment(newDate) && !(newDate instanceof Date)) { + throw new TypeError('date() parameter must be one of [null, string, moment or Date]'); + } + + setValue(newDate === null ? null : parseInputDate(newDate)); + return picker; + }; + + picker.format = function (newFormat) { + if (arguments.length === 0) { + return options.format; + } + + if ((typeof newFormat !== 'string') && ((typeof newFormat !== 'boolean') || (newFormat !== false))) { + throw new TypeError('format() expects a sting or boolean:false parameter ' + newFormat); + } + + options.format = newFormat; + if (actualFormat) { + initFormatting(); // reinit formatting + } + return picker; + }; + + picker.dayViewHeaderFormat = function (newFormat) { + if (arguments.length === 0) { + return options.dayViewHeaderFormat; + } + + if (typeof newFormat !== 'string') { + throw new TypeError('dayViewHeaderFormat() expects a string parameter'); + } + + options.dayViewHeaderFormat = newFormat; + return picker; + }; + + picker.extraFormats = function (formats) { + if (arguments.length === 0) { + return options.extraFormats; + } + + if (formats !== false && !(formats instanceof Array)) { + throw new TypeError('extraFormats() expects an array or false parameter'); + } + + options.extraFormats = formats; + if (parseFormats) { + initFormatting(); // reinit formatting + } + return picker; + }; + + picker.disabledDates = function (dates) { + if (arguments.length === 0) { + return (options.disabledDates ? $.extend({}, options.disabledDates) : options.disabledDates); + } + + if (!dates) { + options.disabledDates = false; + update(); + return picker; + } + if (!(dates instanceof Array)) { + throw new TypeError('disabledDates() expects an array parameter'); + } + options.disabledDates = indexGivenDates(dates); + options.enabledDates = false; + update(); + return picker; + }; + + picker.enabledDates = function (dates) { + if (arguments.length === 0) { + return (options.enabledDates ? $.extend({}, options.enabledDates) : options.enabledDates); + } + + if (!dates) { + options.enabledDates = false; + update(); + return picker; + } + if (!(dates instanceof Array)) { + throw new TypeError('enabledDates() expects an array parameter'); + } + options.enabledDates = indexGivenDates(dates); + options.disabledDates = false; + update(); + return picker; + }; + + picker.daysOfWeekDisabled = function (daysOfWeekDisabled) { + if (arguments.length === 0) { + return options.daysOfWeekDisabled.splice(0); + } + + if (!(daysOfWeekDisabled instanceof Array)) { + throw new TypeError('daysOfWeekDisabled() expects an array parameter'); + } + options.daysOfWeekDisabled = daysOfWeekDisabled.reduce(function (previousValue, currentValue) { + currentValue = parseInt(currentValue, 10); + if (currentValue > 6 || currentValue < 0 || isNaN(currentValue)) { + return previousValue; + } + if (previousValue.indexOf(currentValue) === -1) { + previousValue.push(currentValue); + } + return previousValue; + }, []).sort(); + update(); + return picker; + }; + + picker.maxDate = function (maxDate) { + if (arguments.length === 0) { + return options.maxDate ? options.maxDate.clone() : options.maxDate; + } + + if ((typeof maxDate === 'boolean') && maxDate === false) { + options.maxDate = false; + update(); + return picker; + } + + if (typeof maxDate === 'string') { + if (maxDate === 'now' || maxDate === 'moment') { + maxDate = moment(); + } + } + + var parsedDate = parseInputDate(maxDate); + + if (!parsedDate.isValid()) { + throw new TypeError('maxDate() Could not parse date parameter: ' + maxDate); + } + if (options.minDate && parsedDate.isBefore(options.minDate)) { + throw new TypeError('maxDate() date parameter is before options.minDate: ' + parsedDate.format(actualFormat)); + } + options.maxDate = parsedDate; + if (options.maxDate.isBefore(maxDate)) { + setValue(options.maxDate); + } + if (viewDate.isAfter(parsedDate)) { + viewDate = parsedDate.clone(); + } + update(); + return picker; + }; + + picker.minDate = function (minDate) { + if (arguments.length === 0) { + return options.minDate ? options.minDate.clone() : options.minDate; + } + + if ((typeof minDate === 'boolean') && minDate === false) { + options.minDate = false; + update(); + return picker; + } + + if (typeof minDate === 'string') { + if (minDate === 'now' || minDate === 'moment') { + minDate = moment(); + } + } + + var parsedDate = parseInputDate(minDate); + + if (!parsedDate.isValid()) { + throw new TypeError('minDate() Could not parse date parameter: ' + minDate); + } + if (options.maxDate && parsedDate.isAfter(options.maxDate)) { + throw new TypeError('minDate() date parameter is after options.maxDate: ' + parsedDate.format(actualFormat)); + } + options.minDate = parsedDate; + if (options.minDate.isAfter(minDate)) { + setValue(options.minDate); + } + if (viewDate.isBefore(parsedDate)) { + viewDate = parsedDate.clone(); + } + update(); + return picker; + }; + + picker.defaultDate = function (defaultDate) { + if (arguments.length === 0) { + return options.defaultDate ? options.defaultDate.clone() : options.defaultDate; + } + if (!defaultDate) { + options.defaultDate = false; + return picker; + } + + if (typeof defaultDate === 'string') { + if (defaultDate === 'now' || defaultDate === 'moment') { + defaultDate = moment(); + } + } + + var parsedDate = parseInputDate(defaultDate); + if (!parsedDate.isValid()) { + throw new TypeError('defaultDate() Could not parse date parameter: ' + defaultDate); + } + if (!isValid(parsedDate)) { + throw new TypeError('defaultDate() date passed is invalid according to component setup validations'); + } + + options.defaultDate = parsedDate; + + if (options.defaultDate && input.val().trim() === '' && input.attr('placeholder') === undefined) { + setValue(options.defaultDate); + } + return picker; + }; + + picker.locale = function (locale) { + if (arguments.length === 0) { + return options.locale; + } + + if (!moment.localeData(locale)) { + throw new TypeError('locale() locale ' + locale + ' is not loaded from moment locales!'); + } + + options.locale = locale; + date.locale(options.locale); + viewDate.locale(options.locale); + + if (actualFormat) { + initFormatting(); // reinit formatting + } + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.stepping = function (stepping) { + if (arguments.length === 0) { + return options.stepping; + } + + stepping = parseInt(stepping, 10); + if (isNaN(stepping) || stepping < 1) { + stepping = 1; + } + options.stepping = stepping; + return picker; + }; + + picker.useCurrent = function (useCurrent) { + var useCurrentOptions = ['year', 'month', 'day', 'hour', 'minute']; + if (arguments.length === 0) { + return options.useCurrent; + } + + if ((typeof useCurrent !== 'boolean') && (typeof useCurrent !== 'string')) { + throw new TypeError('useCurrent() expects a boolean or string parameter'); + } + if (typeof useCurrent === 'string' && useCurrentOptions.indexOf(useCurrent.toLowerCase()) === -1) { + throw new TypeError('useCurrent() expects a string parameter of ' + useCurrentOptions.join(', ')); + } + options.useCurrent = useCurrent; + return picker; + }; + + picker.collapse = function (collapse) { + if (arguments.length === 0) { + return options.collapse; + } + + if (typeof collapse !== 'boolean') { + throw new TypeError('collapse() expects a boolean parameter'); + } + if (options.collapse === collapse) { + return picker; + } + options.collapse = collapse; + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.icons = function (icons) { + if (arguments.length === 0) { + return $.extend({}, options.icons); + } + + if (!(icons instanceof Object)) { + throw new TypeError('icons() expects parameter to be an Object'); + } + $.extend(options.icons, icons); + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.useStrict = function (useStrict) { + if (arguments.length === 0) { + return options.useStrict; + } + + if (typeof useStrict !== 'boolean') { + throw new TypeError('useStrict() expects a boolean parameter'); + } + options.useStrict = useStrict; + return picker; + }; + + picker.sideBySide = function (sideBySide) { + if (arguments.length === 0) { + return options.sideBySide; + } + + if (typeof sideBySide !== 'boolean') { + throw new TypeError('sideBySide() expects a boolean parameter'); + } + options.sideBySide = sideBySide; + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.viewMode = function (viewMode) { + if (arguments.length === 0) { + return options.viewMode; + } + + if (typeof viewMode !== 'string') { + throw new TypeError('viewMode() expects a string parameter'); + } + + if (viewModes.indexOf(viewMode) === -1) { + throw new TypeError('viewMode() parameter must be one of (' + viewModes.join(', ') + ') value'); + } + + options.viewMode = viewMode; + currentViewMode = Math.max(viewModes.indexOf(viewMode), minViewModeNumber); + + showMode(); + return picker; + }; + + picker.toolbarPlacement = function (toolbarPlacement) { + if (arguments.length === 0) { + return options.toolbarPlacement; + } + + if (typeof toolbarPlacement !== 'string') { + throw new TypeError('toolbarPlacement() expects a string parameter'); + } + if (toolbarPlacements.indexOf(toolbarPlacement) === -1) { + throw new TypeError('toolbarPlacement() parameter must be one of (' + toolbarPlacements.join(', ') + ') value'); + } + options.toolbarPlacement = toolbarPlacement; + + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.widgetPositioning = function (widgetPositioning) { + if (arguments.length === 0) { + return $.extend({}, options.widgetPositioning); + } + + if (({}).toString.call(widgetPositioning) !== '[object Object]') { + throw new TypeError('widgetPositioning() expects an object variable'); + } + if (widgetPositioning.horizontal) { + if (typeof widgetPositioning.horizontal !== 'string') { + throw new TypeError('widgetPositioning() horizontal variable must be a string'); + } + widgetPositioning.horizontal = widgetPositioning.horizontal.toLowerCase(); + if (horizontalModes.indexOf(widgetPositioning.horizontal) === -1) { + throw new TypeError('widgetPositioning() expects horizontal parameter to be one of (' + horizontalModes.join(', ') + ')'); + } + options.widgetPositioning.horizontal = widgetPositioning.horizontal; + } + if (widgetPositioning.vertical) { + if (typeof widgetPositioning.vertical !== 'string') { + throw new TypeError('widgetPositioning() vertical variable must be a string'); + } + widgetPositioning.vertical = widgetPositioning.vertical.toLowerCase(); + if (verticalModes.indexOf(widgetPositioning.vertical) === -1) { + throw new TypeError('widgetPositioning() expects vertical parameter to be one of (' + verticalModes.join(', ') + ')'); + } + options.widgetPositioning.vertical = widgetPositioning.vertical; + } + update(); + return picker; + }; + + picker.calendarWeeks = function (calendarWeeks) { + if (arguments.length === 0) { + return options.calendarWeeks; + } + + if (typeof calendarWeeks !== 'boolean') { + throw new TypeError('calendarWeeks() expects parameter to be a boolean value'); + } + + options.calendarWeeks = calendarWeeks; + update(); + return picker; + }; + + picker.showTodayButton = function (showTodayButton) { + if (arguments.length === 0) { + return options.showTodayButton; + } + + if (typeof showTodayButton !== 'boolean') { + throw new TypeError('showTodayButton() expects a boolean parameter'); + } + + options.showTodayButton = showTodayButton; + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.showClear = function (showClear) { + if (arguments.length === 0) { + return options.showClear; + } + + if (typeof showClear !== 'boolean') { + throw new TypeError('showClear() expects a boolean parameter'); + } + + options.showClear = showClear; + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.widgetParent = function (widgetParent) { + if (arguments.length === 0) { + return options.widgetParent; + } + + if (typeof widgetParent === 'string') { + widgetParent = $(widgetParent); + } + + if (widgetParent !== null && (typeof widgetParent !== 'string' && !(widgetParent instanceof $))) { + throw new TypeError('widgetParent() expects a string or a jQuery object parameter'); + } + + options.widgetParent = widgetParent; + if (widget) { + hide(); + show(); + } + return picker; + }; + + picker.keepOpen = function (keepOpen) { + if (arguments.length === 0) { + return options.keepOpen; + } + + if (typeof keepOpen !== 'boolean') { + throw new TypeError('keepOpen() expects a boolean parameter'); + } + + options.keepOpen = keepOpen; + return picker; + }; + + picker.inline = function (inline) { + if (arguments.length === 0) { + return options.inline; + } + + if (typeof inline !== 'boolean') { + throw new TypeError('inline() expects a boolean parameter'); + } + + options.inline = inline; + return picker; + }; + + picker.clear = function () { + clear(); + return picker; + }; + + picker.keyBinds = function (keyBinds) { + options.keyBinds = keyBinds; + return picker; + }; + + picker.debug = function (debug) { + if (typeof debug !== 'boolean') { + throw new TypeError('debug() expects a boolean parameter'); + } + + options.debug = debug; + return picker; + }; + + picker.showClose = function (showClose) { + if (arguments.length === 0) { + return options.showClose; + } + + if (typeof showClose !== 'boolean') { + throw new TypeError('showClose() expects a boolean parameter'); + } + + options.showClose = showClose; + return picker; + }; + + picker.keepInvalid = function (keepInvalid) { + if (arguments.length === 0) { + return options.keepInvalid; + } + + if (typeof keepInvalid !== 'boolean') { + throw new TypeError('keepInvalid() expects a boolean parameter'); + } + options.keepInvalid = keepInvalid; + return picker; + }; + + picker.datepickerInput = function (datepickerInput) { + if (arguments.length === 0) { + return options.datepickerInput; + } + + if (typeof datepickerInput !== 'string') { + throw new TypeError('datepickerInput() expects a string parameter'); + } + + options.datepickerInput = datepickerInput; + return picker; + }; + + // initializing element and component attributes + if (element.is('input')) { + input = element; + } else { + input = element.find(options.datepickerInput); + if (input.size() === 0) { + input = element.find('input'); + } else if (!input.is('input')) { + throw new Error('CSS class "' + options.datepickerInput + '" cannot be applied to non input element'); + } + } + + if (element.hasClass('input-group')) { + // in case there is more then one 'input-group-addon' Issue #48 + if (element.find('.datepickerbutton').size() === 0) { + component = element.find('[class^="input-group-"]'); + } else { + component = element.find('.datepickerbutton'); + } + } + + if (!options.inline && !input.is('input')) { + throw new Error('Could not initialize DateTimePicker without an input element'); + } + + $.extend(true, options, dataToOptions()); + + picker.options(options); + + initFormatting(); + + attachDatePickerElementEvents(); + + if (input.prop('disabled')) { + picker.disable(); + } + if (input.is('input') && input.val().trim().length !== 0) { + setValue(parseInputDate(input.val().trim())); + } + else if (options.defaultDate && input.attr('placeholder') === undefined) { + setValue(options.defaultDate); + } + if (options.inline) { + show(); + } + return picker; + }; + + /******************************************************************************** + * + * jQuery plugin constructor and defaults object + * + ********************************************************************************/ + + $.fn.datetimepicker = function (options) { + return this.each(function () { + var $this = $(this); + if (!$this.data('DateTimePicker')) { + // create a private copy of the defaults object + options = $.extend(true, {}, $.fn.datetimepicker.defaults, options); + $this.data('DateTimePicker', dateTimePicker($this, options)); + } + }); + }; + + $.fn.datetimepicker.defaults = { + format: false, + dayViewHeaderFormat: 'MMMM YYYY', + extraFormats: false, + stepping: 1, + minDate: false, + maxDate: false, + useCurrent: true, + collapse: true, + locale: moment.locale(), + defaultDate: false, + disabledDates: false, + enabledDates: false, + icons: { + time: 'glyphicon glyphicon-time', + date: 'glyphicon glyphicon-calendar', + up: 'glyphicon glyphicon-chevron-up', + down: 'glyphicon glyphicon-chevron-down', + previous: 'glyphicon glyphicon-chevron-left', + next: 'glyphicon glyphicon-chevron-right', + today: 'glyphicon glyphicon-screenshot', + clear: 'glyphicon glyphicon-trash', + close: 'glyphicon glyphicon-remove' + }, + useStrict: false, + sideBySide: false, + daysOfWeekDisabled: [], + calendarWeeks: false, + viewMode: 'days', + toolbarPlacement: 'default', + showTodayButton: false, + showClear: false, + showClose: false, + widgetPositioning: { + horizontal: 'auto', + vertical: 'auto' + }, + widgetParent: null, + ignoreReadonly: false, + keepOpen: false, + inline: false, + keepInvalid: false, + datepickerInput: '.datepickerinput', + keyBinds: { + up: function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().subtract(7, 'd')); + } else { + this.date(d.clone().add(1, 'm')); + } + }, + down: function (widget) { + if (!widget) { + this.show(); + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().add(7, 'd')); + } else { + this.date(d.clone().subtract(1, 'm')); + } + }, + 'control up': function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().subtract(1, 'y')); + } else { + this.date(d.clone().add(1, 'h')); + } + }, + 'control down': function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().add(1, 'y')); + } else { + this.date(d.clone().subtract(1, 'h')); + } + }, + left: function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().subtract(1, 'd')); + } + }, + right: function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().add(1, 'd')); + } + }, + pageUp: function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().subtract(1, 'M')); + } + }, + pageDown: function (widget) { + if (!widget) { + return; + } + var d = this.date() || moment(); + if (widget.find('.datepicker').is(':visible')) { + this.date(d.clone().add(1, 'M')); + } + }, + enter: function () { + this.hide(); + }, + escape: function () { + this.hide(); + }, + //tab: function (widget) { //this break the flow of the form. disabling for now + // var toggle = widget.find('.picker-switch a[data-action="togglePicker"]'); + // if(toggle.length > 0) toggle.click(); + //}, + 'control space': function (widget) { + if (widget.find('.timepicker').is(':visible')) { + widget.find('.btn[data-action="togglePeriod"]').click(); + } + }, + t: function () { + this.date(moment()); + }, + 'delete': function () { + this.clear(); + } + }, + debug: false + }; +})); diff --git a/vendor/assets/javascripts/pickers.js b/vendor/assets/javascripts/pickers.js new file mode 100644 index 00000000..63c9a7ba --- /dev/null +++ b/vendor/assets/javascripts/pickers.js @@ -0,0 +1,42 @@ +$(document).on('ready page:change', function() { + $('.datetimepicker').datetimepicker({ + // put here your custom picker options, that should be applied for all pickers + icons: { + date: 'fa fa-calendar', + time: 'fa fa-clock-o', + up: 'fa fa-chevron-up', + down: 'fa fa-chevron-down', + previous: 'fa fa-chevron-left', + next: 'fa fa-chevron-right', + today: 'fa fa-crosshairs', + clear: 'fa fa-trash-o', + close: 'fa fa-times' + } + }); + + $('.datetimerange').each(function(){ + var $this = $(this) + var range1 = $($this.find('.input-group')[0]) + var range2 = $($this.find('.input-group')[1]) + + if(range1.data("DateTimePicker").date() != null) + range2.data("DateTimePicker").minDate(range1.data("DateTimePicker").date()); + + if(range2.data("DateTimePicker").date() != null) + range1.data("DateTimePicker").maxDate(range2.data("DateTimePicker").date()); + + range1.on("dp.change",function (e) { + if(e.date) + range2.data("DateTimePicker").minDate(e.date); + else + range2.data("DateTimePicker").minDate(false); + }); + + range2.on("dp.change",function (e) { + if(e.date) + range1.data("DateTimePicker").maxDate(e.date); + else + range1.data("DateTimePicker").maxDate(false); + }); + }) +}); diff --git a/vendor/assets/stylesheets/bootstrap-datetimepicker.css b/vendor/assets/stylesheets/bootstrap-datetimepicker.css new file mode 100644 index 00000000..c7021619 --- /dev/null +++ b/vendor/assets/stylesheets/bootstrap-datetimepicker.css @@ -0,0 +1,366 @@ +/*! + * Datetimepicker for Bootstrap 3 + * ! version : 4.7.14 + * https://github.com/Eonasdan/bootstrap-datetimepicker/ + */ +.bootstrap-datetimepicker-widget { + list-style: none; +} +.bootstrap-datetimepicker-widget.dropdown-menu { + margin: 2px 0; + padding: 4px; + width: 19em; +} +@media (min-width: 768px) { + .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs { + width: 38em; + } +} +@media (min-width: 992px) { + .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs { + width: 38em; + } +} +@media (min-width: 1200px) { + .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs { + width: 38em; + } +} +.bootstrap-datetimepicker-widget.dropdown-menu:before, +.bootstrap-datetimepicker-widget.dropdown-menu:after { + content: ''; + display: inline-block; + position: absolute; +} +.bootstrap-datetimepicker-widget.dropdown-menu.bottom:before { + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #cccccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + top: -7px; + left: 7px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.bottom:after { + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid white; + top: -6px; + left: 8px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.top:before { + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-top: 7px solid #cccccc; + border-top-color: rgba(0, 0, 0, 0.2); + bottom: -7px; + left: 6px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.top:after { + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-top: 6px solid white; + bottom: -6px; + left: 7px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:before { + left: auto; + right: 6px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:after { + left: auto; + right: 7px; +} +.bootstrap-datetimepicker-widget .list-unstyled { + margin: 0; +} +.bootstrap-datetimepicker-widget a[data-action] { + padding: 6px 0; +} +.bootstrap-datetimepicker-widget a[data-action]:active { + box-shadow: none; +} +.bootstrap-datetimepicker-widget .timepicker-hour, +.bootstrap-datetimepicker-widget .timepicker-minute, +.bootstrap-datetimepicker-widget .timepicker-second { + width: 54px; + font-weight: bold; + font-size: 1.2em; + margin: 0; +} +.bootstrap-datetimepicker-widget button[data-action] { + padding: 6px; +} +.bootstrap-datetimepicker-widget .btn[data-action="incrementHours"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Increment Hours"; +} +.bootstrap-datetimepicker-widget .btn[data-action="incrementMinutes"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Increment Minutes"; +} +.bootstrap-datetimepicker-widget .btn[data-action="decrementHours"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Decrement Hours"; +} +.bootstrap-datetimepicker-widget .btn[data-action="decrementMinutes"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Decrement Minutes"; +} +.bootstrap-datetimepicker-widget .btn[data-action="showHours"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Show Hours"; +} +.bootstrap-datetimepicker-widget .btn[data-action="showMinutes"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Show Minutes"; +} +.bootstrap-datetimepicker-widget .btn[data-action="togglePeriod"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Toggle AM/PM"; +} +.bootstrap-datetimepicker-widget .btn[data-action="clear"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Clear the picker"; +} +.bootstrap-datetimepicker-widget .btn[data-action="today"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Set the date to today"; +} +.bootstrap-datetimepicker-widget .picker-switch { + text-align: center; +} +.bootstrap-datetimepicker-widget .picker-switch::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Toggle Date and Time Screens"; +} +.bootstrap-datetimepicker-widget .picker-switch td { + padding: 0; + margin: 0; + height: auto; + width: auto; + line-height: inherit; +} +.bootstrap-datetimepicker-widget .picker-switch td span { + line-height: 2.5; + height: 2.5em; + width: 100%; +} +.bootstrap-datetimepicker-widget table { + width: 100%; + margin: 0; +} +.bootstrap-datetimepicker-widget table td, +.bootstrap-datetimepicker-widget table th { + text-align: center; + border-radius: 4px; +} +.bootstrap-datetimepicker-widget table th { + height: 20px; + line-height: 20px; + width: 20px; +} +.bootstrap-datetimepicker-widget table th.picker-switch { + width: 145px; +} +.bootstrap-datetimepicker-widget table th.disabled, +.bootstrap-datetimepicker-widget table th.disabled:hover { + background: none; + color: #777777; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget table th.prev::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Previous Month"; +} +.bootstrap-datetimepicker-widget table th.next::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Next Month"; +} +.bootstrap-datetimepicker-widget table thead tr:first-child th { + cursor: pointer; +} +.bootstrap-datetimepicker-widget table thead tr:first-child th:hover { + background: #eeeeee; +} +.bootstrap-datetimepicker-widget table td { + height: 54px; + line-height: 54px; + width: 54px; +} +.bootstrap-datetimepicker-widget table td.cw { + font-size: .8em; + height: 20px; + line-height: 20px; + color: #777777; +} +.bootstrap-datetimepicker-widget table td.day { + height: 20px; + line-height: 20px; + width: 20px; +} +.bootstrap-datetimepicker-widget table td.day:hover, +.bootstrap-datetimepicker-widget table td.hour:hover, +.bootstrap-datetimepicker-widget table td.minute:hover, +.bootstrap-datetimepicker-widget table td.second:hover { + background: #eeeeee; + cursor: pointer; +} +.bootstrap-datetimepicker-widget table td.old, +.bootstrap-datetimepicker-widget table td.new { + color: #777777; +} +.bootstrap-datetimepicker-widget table td.today { + position: relative; +} +.bootstrap-datetimepicker-widget table td.today:before { + content: ''; + display: inline-block; + border: 0 0 7px 7px solid transparent; + border-bottom-color: #337ab7; + border-top-color: rgba(0, 0, 0, 0.2); + position: absolute; + bottom: 4px; + right: 4px; +} +.bootstrap-datetimepicker-widget table td.active, +.bootstrap-datetimepicker-widget table td.active:hover { + background-color: #337ab7; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.bootstrap-datetimepicker-widget table td.active.today:before { + border-bottom-color: #fff; +} +.bootstrap-datetimepicker-widget table td.disabled, +.bootstrap-datetimepicker-widget table td.disabled:hover { + background: none; + color: #777777; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget table td span { + display: inline-block; + width: 54px; + height: 54px; + line-height: 54px; + margin: 2px 1.5px; + cursor: pointer; + border-radius: 4px; +} +.bootstrap-datetimepicker-widget table td span:hover { + background: #eeeeee; +} +.bootstrap-datetimepicker-widget table td span.active { + background-color: #337ab7; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.bootstrap-datetimepicker-widget table td span.old { + color: #777777; +} +.bootstrap-datetimepicker-widget table td span.disabled, +.bootstrap-datetimepicker-widget table td span.disabled:hover { + background: none; + color: #777777; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget.usetwentyfour td.hour { + height: 27px; + line-height: 27px; +} +.input-group.date .input-group-addon { + cursor: pointer; +} +.sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} diff --git a/vendor/assets/stylesheets/bootstrap-datetimepicker.min.css b/vendor/assets/stylesheets/bootstrap-datetimepicker.min.css new file mode 100644 index 00000000..c7021619 --- /dev/null +++ b/vendor/assets/stylesheets/bootstrap-datetimepicker.min.css @@ -0,0 +1,366 @@ +/*! + * Datetimepicker for Bootstrap 3 + * ! version : 4.7.14 + * https://github.com/Eonasdan/bootstrap-datetimepicker/ + */ +.bootstrap-datetimepicker-widget { + list-style: none; +} +.bootstrap-datetimepicker-widget.dropdown-menu { + margin: 2px 0; + padding: 4px; + width: 19em; +} +@media (min-width: 768px) { + .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs { + width: 38em; + } +} +@media (min-width: 992px) { + .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs { + width: 38em; + } +} +@media (min-width: 1200px) { + .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs { + width: 38em; + } +} +.bootstrap-datetimepicker-widget.dropdown-menu:before, +.bootstrap-datetimepicker-widget.dropdown-menu:after { + content: ''; + display: inline-block; + position: absolute; +} +.bootstrap-datetimepicker-widget.dropdown-menu.bottom:before { + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #cccccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + top: -7px; + left: 7px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.bottom:after { + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid white; + top: -6px; + left: 8px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.top:before { + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-top: 7px solid #cccccc; + border-top-color: rgba(0, 0, 0, 0.2); + bottom: -7px; + left: 6px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.top:after { + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-top: 6px solid white; + bottom: -6px; + left: 7px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:before { + left: auto; + right: 6px; +} +.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:after { + left: auto; + right: 7px; +} +.bootstrap-datetimepicker-widget .list-unstyled { + margin: 0; +} +.bootstrap-datetimepicker-widget a[data-action] { + padding: 6px 0; +} +.bootstrap-datetimepicker-widget a[data-action]:active { + box-shadow: none; +} +.bootstrap-datetimepicker-widget .timepicker-hour, +.bootstrap-datetimepicker-widget .timepicker-minute, +.bootstrap-datetimepicker-widget .timepicker-second { + width: 54px; + font-weight: bold; + font-size: 1.2em; + margin: 0; +} +.bootstrap-datetimepicker-widget button[data-action] { + padding: 6px; +} +.bootstrap-datetimepicker-widget .btn[data-action="incrementHours"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Increment Hours"; +} +.bootstrap-datetimepicker-widget .btn[data-action="incrementMinutes"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Increment Minutes"; +} +.bootstrap-datetimepicker-widget .btn[data-action="decrementHours"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Decrement Hours"; +} +.bootstrap-datetimepicker-widget .btn[data-action="decrementMinutes"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Decrement Minutes"; +} +.bootstrap-datetimepicker-widget .btn[data-action="showHours"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Show Hours"; +} +.bootstrap-datetimepicker-widget .btn[data-action="showMinutes"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Show Minutes"; +} +.bootstrap-datetimepicker-widget .btn[data-action="togglePeriod"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Toggle AM/PM"; +} +.bootstrap-datetimepicker-widget .btn[data-action="clear"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Clear the picker"; +} +.bootstrap-datetimepicker-widget .btn[data-action="today"]::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Set the date to today"; +} +.bootstrap-datetimepicker-widget .picker-switch { + text-align: center; +} +.bootstrap-datetimepicker-widget .picker-switch::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Toggle Date and Time Screens"; +} +.bootstrap-datetimepicker-widget .picker-switch td { + padding: 0; + margin: 0; + height: auto; + width: auto; + line-height: inherit; +} +.bootstrap-datetimepicker-widget .picker-switch td span { + line-height: 2.5; + height: 2.5em; + width: 100%; +} +.bootstrap-datetimepicker-widget table { + width: 100%; + margin: 0; +} +.bootstrap-datetimepicker-widget table td, +.bootstrap-datetimepicker-widget table th { + text-align: center; + border-radius: 4px; +} +.bootstrap-datetimepicker-widget table th { + height: 20px; + line-height: 20px; + width: 20px; +} +.bootstrap-datetimepicker-widget table th.picker-switch { + width: 145px; +} +.bootstrap-datetimepicker-widget table th.disabled, +.bootstrap-datetimepicker-widget table th.disabled:hover { + background: none; + color: #777777; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget table th.prev::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Previous Month"; +} +.bootstrap-datetimepicker-widget table th.next::after { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + content: "Next Month"; +} +.bootstrap-datetimepicker-widget table thead tr:first-child th { + cursor: pointer; +} +.bootstrap-datetimepicker-widget table thead tr:first-child th:hover { + background: #eeeeee; +} +.bootstrap-datetimepicker-widget table td { + height: 54px; + line-height: 54px; + width: 54px; +} +.bootstrap-datetimepicker-widget table td.cw { + font-size: .8em; + height: 20px; + line-height: 20px; + color: #777777; +} +.bootstrap-datetimepicker-widget table td.day { + height: 20px; + line-height: 20px; + width: 20px; +} +.bootstrap-datetimepicker-widget table td.day:hover, +.bootstrap-datetimepicker-widget table td.hour:hover, +.bootstrap-datetimepicker-widget table td.minute:hover, +.bootstrap-datetimepicker-widget table td.second:hover { + background: #eeeeee; + cursor: pointer; +} +.bootstrap-datetimepicker-widget table td.old, +.bootstrap-datetimepicker-widget table td.new { + color: #777777; +} +.bootstrap-datetimepicker-widget table td.today { + position: relative; +} +.bootstrap-datetimepicker-widget table td.today:before { + content: ''; + display: inline-block; + border: 0 0 7px 7px solid transparent; + border-bottom-color: #337ab7; + border-top-color: rgba(0, 0, 0, 0.2); + position: absolute; + bottom: 4px; + right: 4px; +} +.bootstrap-datetimepicker-widget table td.active, +.bootstrap-datetimepicker-widget table td.active:hover { + background-color: #337ab7; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.bootstrap-datetimepicker-widget table td.active.today:before { + border-bottom-color: #fff; +} +.bootstrap-datetimepicker-widget table td.disabled, +.bootstrap-datetimepicker-widget table td.disabled:hover { + background: none; + color: #777777; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget table td span { + display: inline-block; + width: 54px; + height: 54px; + line-height: 54px; + margin: 2px 1.5px; + cursor: pointer; + border-radius: 4px; +} +.bootstrap-datetimepicker-widget table td span:hover { + background: #eeeeee; +} +.bootstrap-datetimepicker-widget table td span.active { + background-color: #337ab7; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.bootstrap-datetimepicker-widget table td span.old { + color: #777777; +} +.bootstrap-datetimepicker-widget table td span.disabled, +.bootstrap-datetimepicker-widget table td span.disabled:hover { + background: none; + color: #777777; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget.usetwentyfour td.hour { + height: 27px; + line-height: 27px; +} +.input-group.date .input-group-addon { + cursor: pointer; +} +.sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} From e87209093ba04bed90f30a5b9375dba99664a4bf Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 29 Aug 2017 13:58:13 +0630 Subject: [PATCH 230/246] date format for promotion and add sync sql --- app/models/promotion.rb | 2 +- db/sym_master.sql | 130 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 db/sym_master.sql diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 482d2c3b..7613dff9 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -23,7 +23,7 @@ class Promotion < ApplicationRecord end def self.is_between_promo_datetime(current_day,current_time) #database is not local time - promoList = Promotion.where("(TO_CHAR(promo_start_date, 'YYYY-MM-DD') <=? AND TO_CHAR(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time) + promoList = Promotion.where("(Date_Format(promo_start_date, 'YYYY-MM-DD') <=? AND Date_Format(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time) return promoList end diff --git a/db/sym_master.sql b/db/sym_master.sql new file mode 100644 index 00000000..3663c603 --- /dev/null +++ b/db/sym_master.sql @@ -0,0 +1,130 @@ +-- +-- Licensed to JumpMind Inc under one or more contributor +-- license agreements. See the NOTICE file distributed +-- with this work for additional information regarding +-- copyright ownership. JumpMind Inc licenses this file +-- to you under the GNU General Public License, version 3.0 (GPLv3) +-- (the "License"); you may not use this file except in compliance +-- with the License. +-- +-- You should have received a copy of the GNU General Public License, +-- version 3.0 (GPLv3) along with this library; if not, see +-- . +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + +------------------------------------------------------------------------------ +-- Sample Data +------------------------------------------------------------------------------ +-- insert into item (item_id, name) values (11000001, 'Yummy Gum'); +-- insert into item_selling_price (item_id, store_id, price, cost) values (11000001, '001',0.20, 0.10); +-- insert into item_selling_price (item_id, store_id, price, cost) values (11000001, '002',0.30, 0.20); + +-- insert into sale_transaction (tran_id, store_id, workstation, day, seq) +-- values (900, '001', '3', '2012-12-01', 90); +-- insert into sale_return_line_item (tran_id, item_id, price, quantity, returned_quantity) +-- values (900, 11000001, 0.20, 1, 0); + +------------------------------------------------------------------------------ +-- Sample Symmetric Configuration +------------------------------------------------------------------------------ + +delete from sym_trigger_router; +delete from sym_trigger; +delete from sym_router; +delete from sym_channel where channel_id in ('sale_transaction', 'item'); +delete from sym_node_group_link; +delete from sym_node_group; +delete from sym_node_host; +delete from sym_node_identity; +delete from sym_node_security; +delete from sym_node; + + +# Create Channels for logically grouped tables +insert into sym_channel +(channel_id, processing_order, max_batch_size, enabled, description) +values('dining', 1, 100000, 1, 'sale_transactional data from register and back office'); + +insert into sym_channel +(channel_id, processing_order, max_batch_size, enabled, description) +values('menu', 1, 100000, 1, 'Item and pricing data'); + +# Create Node Groups and Links +insert into sym_node_group (node_group_id) values ('corp'); +insert into sym_node_group (node_group_id) values ('store'); + +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('corp', 'store', 'W'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('store', 'corp', 'P'); + +# Create Trigger for Tables +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('zones','zones','dining',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('menus','menus','menus',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('menu_categories','menu_categories','menus',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('accounts','accounts','menus',current_timestamp,current_timestamp); + + +# Create Routers for Nodes +insert into sym_router +(router_id,source_node_group_id,target_node_group_id,router_type,create_time,last_update_time) +values('corp_2_store', 'corp', 'store', 'default',current_timestamp, current_timestamp); + +insert into sym_router +(router_id,source_node_group_id,target_node_group_id,router_type,create_time,last_update_time) +values('store_2_corp', 'store', 'corp', 'default',current_timestamp, current_timestamp); + +insert into sym_router +(router_id,source_node_group_id,target_node_group_id,router_type,router_expression,create_time,last_update_time) +values('corp_2_one_store', 'corp', 'store', 'column','STORE_ID=:EXTERNAL_ID or OLD_STORE_ID=:EXTERNAL_ID',current_timestamp, current_timestamp); + + +# Add triggers for tables wi th router +insert into sym_trigger_router +(trigger_id,router_id,initial_load_order,last_update_time,create_time) +values('item','corp_2_store', 100, current_timestamp, current_timestamp); + +insert into sym_trigger_router +(trigger_id,router_id,initial_load_order,initial_load_select,last_update_time,create_time) +values('item_selling_price','corp_2_one_store',100,'store_id=''$(externalId)''',current_timestamp,current_timestamp); + +insert into sym_trigger_router +(trigger_id,router_id,initial_load_order,last_update_time,create_time) +values('sale_transaction','store_2_corp', 200, current_timestamp, current_timestamp); + +insert into sym_trigger_router +(trigger_id,router_id,initial_load_order,last_update_time,create_time) +values('sale_return_line_item','store_2_corp', 200, current_timestamp, current_timestamp); + +-- insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) +-- values ('000','corp','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); +insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) + values ('001','store','001',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); +insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) + values ('002','store','002',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); + + +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) + values ('000','5d1c92bbacbe2edb9e1ca5dbb0e481',0,current_timestamp,0,current_timestamp,'000'); +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) + values ('001','5d1c92bbacbe2edb9e1ca5dbb0e481',1,null,1,null,'000'); +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) + values ('002','5d1c92bbacbe2edb9e1ca5dbb0e481',1,null,1,null,'000'); + +insert into sym_node_identity values ('000'); From a9b606730c7c99bef114ff8a2dfc746f5d890696 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 29 Aug 2017 14:44:07 +0630 Subject: [PATCH 231/246] fix for oqs print copy and update sym sql --- app/models/printer/order_queue_printer.rb | 15 ++--- db/sym_master.sql | 70 ++++++++++++++++------- 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index f66f1bc9..da2ab986 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -15,10 +15,10 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker if oqs.print_copy self.print(filename, oqs.printer_name) - + self.print(filename, oqs.printer_name) #For print copy - pdf.render_file filename.gsub(".","-copy.") - self.print(filename.gsub(".","-copy."), oqs.printer_name) + # pdf.render_file filename.gsub(".","-copy.") + # self.print(filename.gsub(".","-copy."), oqs.printer_name) else self.print(filename, oqs.printer_name) end @@ -46,7 +46,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy self.print(filename, oqs.printer_name) - self.print(filename.gsub(".","-copy."), oqs.printer_name) + self.print(filename, oqs.printer_name) + # self.print(filename.gsub(".","-copy."), oqs.printer_name) else self.print(filename, oqs.printer_name) end @@ -59,10 +60,10 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy self.print(filename, oqs.printer_name) - + self.print(filename, oqs.printer_name) #For print copy - pdf.render_file filename.gsub(".","-copy.") - self.print(filename.gsub(".","-copy."), oqs.printer_name) + # pdf.render_file filename.gsub(".","-copy.") + # self.print(filename.gsub(".","-copy."), oqs.printer_name) else self.print(filename, oqs.printer_name) end diff --git a/db/sym_master.sql b/db/sym_master.sql index 3663c603..d0e3980d 100644 --- a/db/sym_master.sql +++ b/db/sym_master.sql @@ -38,7 +38,7 @@ delete from sym_trigger_router; delete from sym_trigger; delete from sym_router; -delete from sym_channel where channel_id in ('sale_transaction', 'item'); +delete from sym_channel where channel_id in ('orders', 'order_items'); delete from sym_node_group_link; delete from sym_node_group; delete from sym_node_host; @@ -56,12 +56,16 @@ insert into sym_channel (channel_id, processing_order, max_batch_size, enabled, description) values('menu', 1, 100000, 1, 'Item and pricing data'); +insert into sym_channel +(channel_id, processing_order, max_batch_size, enabled, description) +values('order', 1, 100000, 1, 'Item and pricing data'); + # Create Node Groups and Links -insert into sym_node_group (node_group_id) values ('corp'); +insert into sym_node_group (node_group_id) values ('sx'); insert into sym_node_group (node_group_id) values ('store'); -insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('corp', 'store', 'W'); -insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('store', 'corp', 'P'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('sx', 'store', 'W'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('store', 'sx', 'P'); # Create Trigger for Tables insert into sym_trigger @@ -70,50 +74,74 @@ values('zones','zones','dining',current_timestamp,current_timestamp); insert into sym_trigger (trigger_id,source_table_name,channel_id,last_update_time,create_time) -values('menus','menus','menus',current_timestamp,current_timestamp); +values('menus','menus','menu',current_timestamp,current_timestamp); insert into sym_trigger (trigger_id,source_table_name,channel_id,last_update_time,create_time) -values('menu_categories','menu_categories','menus',current_timestamp,current_timestamp); +values('menu_categories','menu_categories','menu',current_timestamp,current_timestamp); insert into sym_trigger (trigger_id,source_table_name,channel_id,last_update_time,create_time) -values('accounts','accounts','menus',current_timestamp,current_timestamp); +values('accounts','accounts','menu',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('menu_items','menu_items','menu',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('menu_item_attributes','menu_item_attributes','menu',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('menu_item_options','menu_item_options','menu',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('menu_item_instances','menu_item_instances','menu',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('orders','orders','order',current_timestamp,current_timestamp); + +insert into sym_trigger +(trigger_id,source_table_name,channel_id,last_update_time,create_time) +values('order_items','order_items','order',current_timestamp,current_timestamp); # Create Routers for Nodes insert into sym_router (router_id,source_node_group_id,target_node_group_id,router_type,create_time,last_update_time) -values('corp_2_store', 'corp', 'store', 'default',current_timestamp, current_timestamp); +values('sx_2_store', 'sx', 'store', 'default',current_timestamp, current_timestamp); insert into sym_router (router_id,source_node_group_id,target_node_group_id,router_type,create_time,last_update_time) -values('store_2_corp', 'store', 'corp', 'default',current_timestamp, current_timestamp); +values('store_2_sx', 'store', 'sx', 'default',current_timestamp, current_timestamp); insert into sym_router (router_id,source_node_group_id,target_node_group_id,router_type,router_expression,create_time,last_update_time) -values('corp_2_one_store', 'corp', 'store', 'column','STORE_ID=:EXTERNAL_ID or OLD_STORE_ID=:EXTERNAL_ID',current_timestamp, current_timestamp); +values('sx_2_one_store', 'sx', 'store', 'column','STORE_ID=:EXTERNAL_ID or OLD_STORE_ID=:EXTERNAL_ID',current_timestamp, current_timestamp); -# Add triggers for tables wi th router +# Add triggers for tables with router insert into sym_trigger_router (trigger_id,router_id,initial_load_order,last_update_time,create_time) -values('item','corp_2_store', 100, current_timestamp, current_timestamp); +values('accounts','sx_2_store', 100, current_timestamp, current_timestamp); insert into sym_trigger_router (trigger_id,router_id,initial_load_order,initial_load_select,last_update_time,create_time) -values('item_selling_price','corp_2_one_store',100,'store_id=''$(externalId)''',current_timestamp,current_timestamp); +values('accounts','sx_2_one_store',100,'store_id=''$(externalId)''',current_timestamp,current_timestamp); insert into sym_trigger_router (trigger_id,router_id,initial_load_order,last_update_time,create_time) -values('sale_transaction','store_2_corp', 200, current_timestamp, current_timestamp); +values('orders','store_2_sx', 200, current_timestamp, current_timestamp); insert into sym_trigger_router (trigger_id,router_id,initial_load_order,last_update_time,create_time) -values('sale_return_line_item','store_2_corp', 200, current_timestamp, current_timestamp); +values('order_items','store_2_sx', 200, current_timestamp, current_timestamp); --- insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) --- values ('000','corp','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); +insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) + values ('000','sx','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) values ('001','store','001',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) @@ -121,10 +149,10 @@ insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,sc insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) - values ('000','5d1c92bbacbe2edb9e1ca5dbb0e481',0,current_timestamp,0,current_timestamp,'000'); + values ('000','acd36ce830d1fda466eec921433f38',0,current_timestamp,0,current_timestamp,'000'); insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) - values ('001','5d1c92bbacbe2edb9e1ca5dbb0e481',1,null,1,null,'000'); + values ('001','acd36ce830d1fda466eec921433f38',1,null,1,null,'000'); insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) - values ('002','5d1c92bbacbe2edb9e1ca5dbb0e481',1,null,1,null,'000'); + values ('002','acd36ce830d1fda466eec921433f38',1,null,1,null,'000'); -insert into sym_node_identity values ('000'); +-- insert into sym_node_identity values ('000'); From 2e48c1529ee7c9048a312ea8e1cbf209ef4a2475 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 29 Aug 2017 17:58:34 +0630 Subject: [PATCH 232/246] update addorder --- app/assets/javascripts/addorder.js | 181 +++++++++++++----- app/assets/stylesheets/addorder.scss | 22 ++- .../menu_item_instances_controller.rb | 6 + app/views/origami/addorders/detail.html.erb | 57 +++++- .../get_instance.json.jbuilder | 13 ++ config/routes.rb | 1 + 6 files changed, 220 insertions(+), 60 deletions(-) create mode 100644 app/views/settings/menu_item_instances/get_instance.json.jbuilder diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index b9219c52..54b1c7b6 100644 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -30,61 +30,132 @@ $(function(){ menu_items = data.menu_items; for(var field in menu_items) { - instances = menu_items[field].instances ; - $(instances).each(function(i){ - if (instances[i].is_default === true) { - code = instances[i].code; - name = instances[i].name; - price = parseFloat(instances[i].price).toFixed(2); - is_available = instances[i].is_available ; - is_on_promotion = instances[i].is_on_promotion; - item_attributes = instances[i].values; - promotion_price = instances[i].promotion_price; - code = instances[i].code; - } - }); + if (menu_items[field].is_sub_item == false) { + instances = menu_items[field].instances ; + $(instances).each(function(i){ + if (instances[i].is_default === true) { + code = instances[i].code; + name = instances[i].name; + price = parseFloat(instances[i].price).toFixed(2); + is_available = instances[i].is_available ; + is_on_promotion = instances[i].is_on_promotion; + item_attributes = instances[i].values; + promotion_price = instances[i].promotion_price; + code = instances[i].code; + } + }); + + qty = 1; + options = []; - qty = 1; - options = []; + if (JSON.stringify(menu_items[field].item_sets)!='[]') { + fa_plus = ''; + menu_item_box = 'set_item_box'; + data_target = 'sx_item_set_detailModal'; + }else{ + fa_plus = 'fa-plus'; + menu_item_box = 'menu_item_box'; + data_target = 'sx_item_detailModal' + } - row = '
    ' - +'
    ' - +''+ menu_items[field].name +'' - +"
    " - +'' - +'
    ' - +'
    ' + row = '
    ' + +'
    ' + +''+ menu_items[field].name +'' + +"
    " + +"' + +'
    ' + +'
    ' - +"
    " + +"
    " - +'
    ' - +'' + +"
    " + +"" - +'
    ' + +"
    " - +'
    ' - +''+ price +'' - +'
    ' - +'
    '; - $('.menu_items_list').append(row); + +'
    ' + +''+ price +'' + +'
    ' + +'
    '; + $('.menu_items_list').append(row); + } } } }); //end Ajax } //end show list function + //click item row for add order + $(document).on('click', '.set_item_box', function(event){ + $(".instance-list").empty(); + data = $(this).parent().children().children('.add_icon'); + item_options = $(this).data('option'); + for(var field in item_options) { + value = item_options[field]["values"]; + type = item_options[field]["type"]; + row = "

    "+type+"

    " + $(value).each(function(i){ + row +=""; + }); + $(".opt-list").append(row); + } + + instances = $(this).data('instance'); + item_sets = $(this).data('item-sets'); + + for(var field in item_sets) { + value = item_sets[field]["instances"]; + $(value).each(function(i){ + $.ajax({ + type: "GET", + url: '../../settings/menu_item_instances/get_instance/'+value[i]["id"], + data: {id:value[i]}, + success:function(result){ + // var image_path = "" + console.log(result) + row = '
    ' + +'
    ' + +'
    ' + +''+result["name"]+'' + +'
    ' + +'
    ' + +'' + +'
    ' + +'
    ' + +' '+result["price"]+'' + +'
    ' + +'
    ' + +'
    ' + + $(".instance-list").append(row); + } + }); + }); + + } + + $('#change_qty').val(1); + $('#item_instances').text(instances); + $('#title_name').text(data.attr('data-name')); + $('#item_code').text(data.attr('data-item-code')); + $('#total_price').text(data.attr('data-price')); + $('#unit_price').text(data.attr('data-price')); + }); //click item row for add order $(document).on('click', '.menu_item_box', function(event){ $('.attributes-list').empty(); @@ -162,10 +233,19 @@ $(function(){ value = $(this).data('value'); type = $(this).data('type'); instances = $(this).data('instances'); - if ($(".attribute_btn").attr("data-type")==type){ - $('.'+type).removeClass("selected-attribute"); - } + + attributes = $(".attribute_btn"); + $(attributes).each(function(i){ + if ($(attributes[i]).attr('data-type')==type){ + $('.'+type).removeClass("selected-attribute"); + } + }); $(this).addClass('selected-attribute'); + + // if ($(".attribute_btn").attr("data-type")==type){ + // $('.'+type).removeClass("selected-attribute"); + // } + // $(this).addClass('selected-attribute'); var selected_attr = get_selected_attributes('selected-attribute'); @@ -191,9 +271,12 @@ $(function(){ $(document).on('click', '.option_btn', function(event){ value = $(this).data('value'); type = $(this).data('type'); - if ($(".option_btn").attr("data-type")==type){ - $('.'+type).removeClass("selected-option"); - } + options = $(".option_btn"); + $(options).each(function(i){ + if ($(options[i]).attr('data-type')==type){ + $('.'+type).removeClass("selected-option"); + } + }); $(this).addClass('selected-option'); }); //End selecct attribute buttom @@ -228,7 +311,7 @@ $(function(){ calculate_sub_total(); }); //End Add Icon Click - + // click plus icon for add $(document).on('click', '.add_icon', function(event){ var item_data = $(this); diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 01e01e15..29ca7156 100644 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -10,7 +10,10 @@ padding:5px; color :#fff; } - .card-block { + .instance_box{ + margin-bottom:10px; + } + .card-block { padding: 0.3rem !important; } @media (min-width: 34em) { @@ -68,7 +71,12 @@ left:auto; right: auto; width: 100%; - padding-top: 200px; + +} +element.style { + padding-top: 0px !important; +} +.item-modal{ } .selected-attribute { @@ -93,10 +101,18 @@ /*width: 80px;*/ margin-bottom: 5px; margin-right: 5px; -} +} #logo{ margin: auto; width: 50%; border: 1px solid #54A5AF; padding: 10px; +} + +#instance_img{ + margin: auto; + width: 80px; + height: 80px; + border: 1px solid #54A5AF; + padding: 10px; } \ No newline at end of file diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index fbe1b672..6b5f8652 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -24,6 +24,12 @@ class Settings::MenuItemInstancesController < ApplicationController @item_sets = ItemSet.all end + def get_instance + @id = MenuItemInstance.find(params[:id]) + puts "iddddddddd" + puts @id.to_json + end + # GET /settings/menu_item_instances/1/edit def edit id = MenuItemInstance.findParentCategory(@item) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index a8534f94..b7f0cf1d 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -56,7 +56,7 @@
    -
    ').addClass('cw').text('#')); + } + + while (currentDate.isBefore(viewDate.clone().endOf('w'))) { + row.append($('').addClass('dow').text(currentDate.format('dd'))); + currentDate.add(1, 'd'); + } + widget.find('.datepicker-days thead').append(row); + }, + + isInDisabledDates = function (testDate) { + return options.disabledDates[testDate.format('YYYY-MM-DD')] === true; + }, + + isInEnabledDates = function (testDate) { + return options.enabledDates[testDate.format('YYYY-MM-DD')] === true; + }, + + isValid = function (targetMoment, granularity) { + if (!targetMoment.isValid()) { + return false; + } + if (options.disabledDates && isInDisabledDates(targetMoment) && granularity !== 'M') { + return false; + } + if (options.enabledDates && !isInEnabledDates(targetMoment) && granularity !== 'M') { + return false; + } + if (options.minDate && targetMoment.isBefore(options.minDate, granularity)) { + return false; + } + if (options.maxDate && targetMoment.isAfter(options.maxDate, granularity)) { + return false; + } + if (granularity === 'd' && options.daysOfWeekDisabled.indexOf(targetMoment.day()) !== -1) { //widget && widget.find('.datepicker-days').length > 0 + return false; + } + return true; + }, + + fillMonths = function () { + var spans = [], + monthsShort = viewDate.clone().startOf('y').hour(12); // hour is changed to avoid DST issues in some browsers + while (monthsShort.isSame(viewDate, 'y')) { + spans.push($('').attr('data-action', 'selectMonth').addClass('month').text(monthsShort.format('MMM'))); + monthsShort.add(1, 'M'); + } + widget.find('.datepicker-months td').empty().append(spans); + }, + + updateMonths = function () { + var monthsView = widget.find('.datepicker-months'), + monthsViewHeader = monthsView.find('th'), + months = monthsView.find('tbody').find('span'); + + monthsView.find('.disabled').removeClass('disabled'); + + if (!isValid(viewDate.clone().subtract(1, 'y'), 'y')) { + monthsViewHeader.eq(0).addClass('disabled'); + } + + monthsViewHeader.eq(1).text(viewDate.year()); + + if (!isValid(viewDate.clone().add(1, 'y'), 'y')) { + monthsViewHeader.eq(2).addClass('disabled'); + } + + months.removeClass('active'); + if (date.isSame(viewDate, 'y')) { + months.eq(date.month()).addClass('active'); + } + + months.each(function (index) { + if (!isValid(viewDate.clone().month(index), 'M')) { + $(this).addClass('disabled'); + } + }); + }, + + updateYears = function () { + var yearsView = widget.find('.datepicker-years'), + yearsViewHeader = yearsView.find('th'), + startYear = viewDate.clone().subtract(5, 'y'), + endYear = viewDate.clone().add(6, 'y'), + html = ''; + + yearsView.find('.disabled').removeClass('disabled'); + + if (options.minDate && options.minDate.isAfter(startYear, 'y')) { + yearsViewHeader.eq(0).addClass('disabled'); + } + + yearsViewHeader.eq(1).text(startYear.year() + '-' + endYear.year()); + + if (options.maxDate && options.maxDate.isBefore(endYear, 'y')) { + yearsViewHeader.eq(2).addClass('disabled'); + } + + while (!startYear.isAfter(endYear, 'y')) { + html += '' + startYear.year() + ''; + startYear.add(1, 'y'); + } + + yearsView.find('td').html(html); + }, + + fillDate = function () { + var daysView = widget.find('.datepicker-days'), + daysViewHeader = daysView.find('th'), + currentDate, + html = [], + row, + clsName, + i; + + if (!hasDate()) { + return; + } + + daysView.find('.disabled').removeClass('disabled'); + daysViewHeader.eq(1).text(viewDate.format(options.dayViewHeaderFormat)); + + if (!isValid(viewDate.clone().subtract(1, 'M'), 'M')) { + daysViewHeader.eq(0).addClass('disabled'); + } + if (!isValid(viewDate.clone().add(1, 'M'), 'M')) { + daysViewHeader.eq(2).addClass('disabled'); + } + + currentDate = viewDate.clone().startOf('M').startOf('week'); + + // while (!viewDate.clone().endOf('M').endOf('w').isBefore(currentDate, 'd')) { + for (i = 0; i < 42; i++) { //always display 42 days (should show 6 weeks) + if (currentDate.weekday() === 0) { + row = $('
    ' + currentDate.week() + '' + currentDate.date() + '
    ' + currentHour.format(use24Hours ? 'HH' : 'hh') + '
    ' + currentMinute.format('mm') + '
    ' + currentSecond.format('ss') + '
    - + - <% if @shift_from %> - - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - - - - - - + + + + + + - <% void = 0%> - <% cash = 0%> - <% credit = 0%> - <% accept_credit = 0%> - <% foc = 0%> - <% card = 0%> - <% total = 0%> - <% rounding_adj = 0%> - <% g_total = 0 %> + <% total_qty = 0 %> + <% total_price = 0 %> + <% total_amount = 0 %> - <% @sale_data.each do |result|%> + <% @transaction.each do |result| %> - - - - - - - - - - - <% grand_total = result.grand_total.to_f %> - + + + + - <% cash += result.cash_sales.to_f %> - <% credit += result.credit_sales.to_f %> - <% card += result.other_sales.to_f %> - - <% total += result.grand_total.to_f %> - <% g_total += grand_total.to_f %> - + <% total_qty += result.qty.to_f %> + <% total_price += result.price.to_f %> + <% total_amount += result.amount.to_f %> <% end %> - - - - - - - - - - + + + + +
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> - - From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    Cashier StationCashier NameShift NameCash PaymentCredit PaymentOther PaymentGrand TotalCommissioner NameProduct NameQtyCommission PriceCommission AmountDate
    - <%= result.cashier_terminal.name rescue '-'%> + <%= result.commissioner.name rescue '-' %> - <%= result.employee.name rescue '-'%> + <%= result.commission.menu_item.name rescue '-' %> <%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - - <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= sprintf "%.2f",result.cash_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.credit_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.other_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.grand_total.to_f.to_d rescue '-'%><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %>
    <%= sprintf("%.2f",cash) rescue '-'%><%= sprintf("%.2f",credit) rescue '-'%><%= sprintf("%.2f",card) rescue '-'%><%= sprintf("%.2f",g_total) rescue '-'%><%= sprintf("%.2f", total_qty) rescue '-' %><%= sprintf("%.2f", total_price) rescue '-' %><%= sprintf("%.2f", total_amount) rescue '-' %>
    @@ -119,91 +73,7 @@ diff --git a/app/views/reports/commission/index.xls.erb b/app/views/reports/commission/index.xls.erb index e3daaca2..4ea1f2f0 100644 --- a/app/views/reports/commission/index.xls.erb +++ b/app/views/reports/commission/index.xls.erb @@ -1,100 +1,52 @@
    -
    - + - <% if @shift_from %> - - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - - - - - - - + + + + + + - <% void = 0%> - <% cash = 0%> - <% credit = 0%> - <% accept_credit = 0%> - <% foc = 0%> - <% card = 0%> - <% total = 0%> - <% rounding_adj = 0%> - <% g_total = 0 %> + <% total_qty = 0 %> + <% total_price = 0 %> + <% total_amount = 0 %> - <% @sale_data.each do |result|%> + <% @transaction.each do |result| %> - - - - - - - - - - - <% grand_total = result.grand_total.to_f %> - + + + + - <% cash += result.cash_sales.to_f %> - <% credit += result.credit_sales.to_f %> - <% card += result.other_sales.to_f %> - - <% total += result.grand_total.to_f %> - <% g_total += grand_total.to_f %> - + <% total_qty += result.qty.to_f %> + <% total_price += result.price.to_f %> + <% total_amount += result.amount.to_f %> <% end %> - - - - - - - - - - + + + + +
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> - - From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    Cashier StationCashier NameShift NameCash PaymentCredit PaymentOther PaymentGrand TotalCommissioner NameProduct NameQtyCommission PriceCommission AmountDate
    - <%= result.cashier_terminal.name rescue '-'%> + <%= result.commissioner.name rescue '-' %> - <%= result.employee.name rescue '-'%> + <%= result.commission.menu_item.name rescue '-' %> <%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - - <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= sprintf "%.2f",result.cash_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.credit_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.other_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.grand_total.to_f.to_d rescue '-'%><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %>
    <%= sprintf("%.2f",cash) rescue '-'%><%= sprintf("%.2f",credit) rescue '-'%><%= sprintf("%.2f",card) rescue '-'%><%= sprintf("%.2f",g_total) rescue '-'%><%= sprintf("%.2f", total_qty) rescue '-' %><%= sprintf("%.2f", total_price) rescue '-' %><%= sprintf("%.2f", total_amount) rescue '-' %>
    -
    \ No newline at end of file + diff --git a/dump.rdb b/dump.rdb index 6e3e4bdb58d80e5ac055cb301f0b9693f2a197d4..3826c8c680e6f574d0deefd76b08b063e554adee 100644 GIT binary patch delta 443 zcma)&y-LGS0ELqpTk9_ltx+kKtB6QbZqlU5&0@iKDE@$Yo7~z!n$+9`tRjj}(9p%r zMOSebA?O2$Zf-j1GpMLRanQ;28_qf3dFGyaJCI*oI$eJ03n(##CTU((PR5vb=5>S( zI}6Ygjgi=D;=^e|lEvMCJyG7eIu&qmqgcQAmW!0>S zq^2PhcE-CmEYGQeRE`64g9FsZzFxllIO5yxm(=0*$PTLI{+;7g)Q+1boP`uLzd{OdEY7v5xe8A44`v|?F-Wh84K=hd0{ I!|KufC#n^X)&Kwi delta 366 zcmY+AJ4?er0LOFn+6aoE)wVvM@dl@~HC@#-xvJorj+Gj8eW&wc-kVS5Q*_h`nNQjj87PfJA_^G^ z7`2;(Ap%vj&9D^)4AD*C2~j$PX<@oBY)7&#R5sqiGAf(oO6_)IX%R>!xZAfUe0 zLx!x1=BUr5$Le#}Qo2*`s8 cuA~9@;!L`f84hthY7e=e>$|tDwb9MvFJlXERR910 From 4b97cd530e13b9ae7189ccbec1e95d9c2139201c Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Tue, 29 Aug 2017 23:05:03 +0630 Subject: [PATCH 235/246] commission report export excel --- .idea/sxrestaurant.iml | 1 + .idea/workspace.xml | 241 +++++++----------- .../reports/commission_controller.rb | 10 +- .../_commission_report_filter.html.erb | 46 ++-- dump.rdb | Bin 741 -> 742 bytes 5 files changed, 139 insertions(+), 159 deletions(-) diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index 7db49a58..6c1240f7 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -52,6 +52,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e3687c57..1c0d6110 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,18 +5,8 @@ - - - - - - - - - - @@ -58,10 +48,10 @@ - + - + @@ -82,34 +72,21 @@ - + - - + + - - - - - - - - - - - - - - - + + @@ -125,36 +102,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -189,7 +136,6 @@ @@ -264,10 +211,9 @@ - @@ -336,6 +282,21 @@ + + + + + + + + + + + + + + + + <% if @daterange %> + + <% else %> + + <% end %>
    +
    + +
    <% end %> @@ -35,21 +46,26 @@ placeholder: 'Select Commissioner' }); + $('#clear_filter').click(function () { + $('#daterange').val(''); + $('#commissioner').val('').text(''); + }); + $('input[name="daterange"]').daterangepicker({ - autoUpdateInput: false, - ranges: { - 'Today': [moment(), moment()], - 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], - 'Last 7 Days': [moment().subtract(6, 'days'), moment()], - 'Last 30 Days': [moment().subtract(29, 'days'), moment()], - 'This Month': [moment().startOf('month'), moment().endOf('month')], - 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] + autoUpdateInput: false, + ranges: { + 'Today': [moment(), moment()], + 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], + 'Last 7 Days': [moment().subtract(6, 'days'), moment()], + 'Last 30 Days': [moment().subtract(29, 'days'), moment()], + 'This Month': [moment().startOf('month'), moment().endOf('month')], + 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] + }, + locale: { + format: 'YYYY-MM-DD' + } }, - locale: { - format: 'YYYY-MM-DD' - } - }, - function(start, end, label) { + function (start, end, label) { $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD')); }); diff --git a/dump.rdb b/dump.rdb index 569086721543bccef2d9a99dfea5def07e5e1b65..dfef99fa9e38d3f64010e723188ff089a36840af 100644 GIT binary patch delta 76 zcmV-S0JHz)1?B~iFc@K%rCIt2b#rB8Ep26O!f@af0R8~`4*`*X7qMSo0R&()*eIjq(>$MjJ=~ delta 75 zcmV-R0JQ(+1?2^hFc@%IrCIt2b#rB8Ep26O!a%4Q0R8~`4*`*X7qMSo0R+B7<}I_r h0SN&b5HU3{G%zqYH8nUcIW#gdHviTV*MILVLMkk88n*xd From 2208b8a526d00535508cc73640ae01b2f664bd8e Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 30 Aug 2017 09:20:35 +0630 Subject: [PATCH 236/246] Promo Phrase 1 --- app/models/promotion.rb | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 482d2c3b..98321078 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -28,7 +28,8 @@ class Promotion < ApplicationRecord end def self.combine_item(saleObj) - itemList = saleObj.sale_items.group(:product_code).sum(:qty) + order_id = saleObj.sale_orders[0].order_id + itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty) end def self.is_promo_day(promoList, day, orderitemList, sale_id) @@ -44,7 +45,8 @@ class Promotion < ApplicationRecord end def self.find_promo_item(promo, orderitem, sale_id) - if promo.original_product.to_s == orderitem[0].to_s + item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code + if promo.original_product.to_s == item_code if promo.min_qty.to_i > orderitem[1].to_i return false else @@ -75,7 +77,7 @@ class Promotion < ApplicationRecord def self.check_giveaway_product(promo, orderitem) promo.promotion_products.each do |promo_product| - if promo_product.item_code == orderitem + if promo_product.item_code == OrderItem.find_by_item_instance_code(orderitem).item_code return true, promo_product else return false, promo_product @@ -110,7 +112,13 @@ class Promotion < ApplicationRecord else charge_qty += qty end - item = OrderItem.find_by_item_code(orderitem[0]) + item = OrderItem.find_by_item_instance_code(orderitem[0]) + byebug + # if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_code + # item = OrderItem.find_by_item_instance_code(orderitem[0]) + # else + # item = OrderItem.find_by_item_code(promo_product) + # end update_existing_item(foc_qty, item, sale_id, "promotion", item.price) puts "Charged - " + charge_qty.to_s @@ -124,7 +132,7 @@ class Promotion < ApplicationRecord if (foc_qty < promotion_qty) promotion_qty = foc_qty end - item = OrderItem.find_by_item_code(promo_product) + item = OrderItem.find_by_item_instance_code(promo_product,orderID) update_existing_item(promotion_qty, item, sale_id, "promotion", item.price) end @@ -156,11 +164,11 @@ class Promotion < ApplicationRecord if same foc_qty = orderitem[1].to_i / foc_min_qty - item = OrderItem.find_by_item_code(orderitem[0]) + item = OrderItem.find_by_item_instance_code(orderitem[0]) update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off) else foc_qty = find_second_item_qty(sale_id, promo_product.item_code) - item = OrderItem.find_by_item_code(promo_product.item_code) + item = OrderItem.find_by_item_instance_code(promo_product.item_code) update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off) end end @@ -170,12 +178,12 @@ class Promotion < ApplicationRecord if same foc_qty = orderitem[1].to_i / foc_min_qty - item = OrderItem.find_by_item_code(orderitem[0]) # need to specify with menu item instance + item = OrderItem.find_by_item_instance_code(orderitem[0]) # need to specify with menu item instance price = item.price.to_i - promo_product.net_price.to_i update_existing_item(foc_qty, item, sale_id, "promotion nett price", price) else foc_qty = find_second_item_qty(sale_id, promo_product.item_code) - item = OrderItem.find_by_item_code(promo_product.item_code) + item = OrderItem.find_by_item_instance_code(promo_product.item_code) price = item.price - promo_product.net_price update_existing_item(foc_qty, item, sale_id, "promotion nett price", price) end @@ -186,14 +194,14 @@ class Promotion < ApplicationRecord if same foc_qty = orderitem[1].to_i / foc_min_qty - item = OrderItem.find_by_item_code(orderitem[0]) + item = OrderItem.find_by_item_instance_code(orderitem[0]) # total = orderitem[1].to_i * item.price total = item.price price = calculate_discount(total, promo_product.percentage) update_existing_item(foc_qty, item, sale_id, "promotion discount", price) else foc_qty = find_second_item_qty(sale_id, promo_product.item_code) - item = OrderItem.find_by_item_code(promo_product.item_code) + item = OrderItem.find_by_item_instance_code(promo_product.item_code) # total = item.price * foc_qty total = item.price price = calculate_discount(total, promo_product.percentage) @@ -205,7 +213,7 @@ class Promotion < ApplicationRecord saleObj = Sale.find_by_sale_id(sale_id) itemList = combine_item(saleObj) itemList.each do |item| - if item[0] == promo_item + if OrderItem.find_by_item_instance_code(item[0]).item_code == promo_item return item[1] end end From df4caa288d1db5e5f02feb3674dbdb0c601fad50 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Wed, 30 Aug 2017 10:46:46 +0630 Subject: [PATCH 237/246] jquery date-time picker --- .idea/.generators | 2 +- .idea/sxrestaurant.iml | 4 +- .idea/workspace.xml | 315 +++++++++++------- Gemfile | 16 +- Gemfile.lock | 29 +- app/assets/javascripts/application.js | 5 +- app/assets/stylesheets/application.scss | 4 +- .../origami/in_juties_controller.rb | 19 +- .../in_juties/_assign_in_juty.html.erb | 73 ++-- .../origami/in_juties/index_in_juty.html.erb | 87 +++-- app/views/settings/promotions/new.html.erb | 1 - dump.rdb | Bin 742 -> 797 bytes 12 files changed, 283 insertions(+), 272 deletions(-) diff --git a/.idea/.generators b/.idea/.generators index 16189766..98526fe7 100644 --- a/.idea/.generators +++ b/.idea/.generators @@ -5,4 +5,4 @@ You are allowed to: 2. Remove generators 3. Add installed generators To add new installed generators automatically delete this file and reload the project. ---> +--> diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index 6c1240f7..53fef9e5 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -52,7 +52,6 @@ - @@ -66,7 +65,6 @@ - @@ -82,7 +80,7 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1c0d6110..705b1a97 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,10 +3,17 @@ + - - + + + + + + + + @@ -21,7 +28,7 @@ - + @@ -48,55 +55,85 @@     - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -136,12 +173,8 @@ @@ -211,6 +248,7 @@ + - + - - + + - - + + - - + + - + - - + + - - + + - - + + + + + + + + + + + + @@ -98,42 +105,23 @@ - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + + - - + + - - + + @@ -173,10 +161,6 @@ @@ -756,12 +744,12 @@ - + - @@ -774,7 +762,6 @@ - @@ -784,9 +771,9 @@ - + - + @@ -804,51 +791,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1088,7 +1035,7 @@ - + @@ -1106,7 +1053,7 @@ - + @@ -1151,18 +1098,18 @@ - + - - + + - + - - + + @@ -1179,42 +1126,87 @@ - + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + diff --git a/app/controllers/origami/in_juties_controller.rb b/app/controllers/origami/in_juties_controller.rb index 6ac04659..ff76d3b1 100644 --- a/app/controllers/origami/in_juties_controller.rb +++ b/app/controllers/origami/in_juties_controller.rb @@ -1,5 +1,5 @@ class Origami::InJutiesController < BaseOrigamiController - before_action :set_in_juty, only: [:show, :edit, :update, :edit_in_juty, :update_for_in_juty , :destroy ,:destroy_in_juty] + before_action :set_in_juty, only: %i[show edit update edit_in_juty update_for_in_juty destroy destroy_in_juty] # GET /in_juties # GET /in_juties.json @@ -8,11 +8,12 @@ class Origami::InJutiesController < BaseOrigamiController end def index_in_juty - @juty_in= InJuty.where("dinning_id=?",params[:table_id]) + @juty_in = InJuty.where('dinning_id=?', params[:table_id]) @table = DiningFacility.find(params[:table_id]) - @in_juty = InJuty.new + @in_juty = InJuty.new @juties_in = Kaminari.paginate_array(@juty_in).page(params[:page]).per(10) end + # GET /in_juties/1 # GET /in_juties/1.json def show @@ -20,12 +21,15 @@ class Origami::InJutiesController < BaseOrigamiController # GET /in_juties/new def new + # this one use for new @in_juty = InJuty.new + @table = DiningFacility.find(params[:table_id]) + @commissioner = @in_juty.commissioner + render partial: 'form' end # GET /in_juties/1/edit def edit - end def edit_in_juty @@ -33,13 +37,15 @@ class Origami::InJutiesController < BaseOrigamiController @table = DiningFacility.find(params[:table_id]) @commissioner = @in_juty.commissioner - render json: {in_juty: @in_juty, commissioner: @commissioner} + # render json: {in_juty: @in_juty, commissioner: @commissioner} + render partial: 'form' end def assign_in_juty @in_juty = InJuty.new @table = DiningFacility.find(params[:table_id]) end + # POST /in_juties # POST /in_juties.json def create @@ -57,32 +63,53 @@ class Origami::InJutiesController < BaseOrigamiController end def create_for_in_juty + # this one use for create and update + in_juty = in_juty_params + in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i + in_time = in_time.change(offset: '+06:30') + out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i + out_time = out_time.change(offset: '+06:30') @in_juty = InJuty.new + in_juty_id = in_juty[:id] + unless in_juty_id.nil? + @in_juty = InJuty.find(in_juty_id.to_i) + end @in_juty.dinning_id = in_juty_params[:dinning_id] @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] - @in_juty.in_time = in_juty_params[:in_time] - @in_juty.out_time = in_juty_params[:out_time] - + @in_juty.in_time = in_time + @in_juty.out_time = out_time respond_to do |format| if @in_juty.save - format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully created.' } - format.json { render :show, status: :created, location: @in_juty } + if in_juty_id.nil? + format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully created.' } + format.json { render :show, status: :created, location: @in_juty } + else + format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' } + format.json { render :show, status: :created, location: @in_juty } + end else format.html { render :new } format.json { render json: @in_juty.errors, status: :unprocessable_entity } end end - end # PATCH/PUT /in_juties/1 # PATCH/PUT /in_juties/1.json def update + in_juty = in_juty_params + in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i + in_time = in_time.change(offset: '+06:30') + out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i + out_time = out_time.change(offset: '+06:30') + @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] + @in_juty.in_time = in_time + @in_juty.out_time = out_time respond_to do |format| - if @in_juty.update(in_juty_params) - format.html { redirect_to origami_in_juty_path(@in_juty), notice: 'In juty was successfully updated.' } + if @in_juty.save + format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' } format.json { render :show, status: :ok, location: @in_juty } else format.html { render :edit } @@ -91,28 +118,32 @@ class Origami::InJutiesController < BaseOrigamiController end end - - def update_for_in_juty - @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] - @in_juty.in_time = in_juty_params[:in_time] - @in_juty.out_time = in_juty_params[:out_time] - respond_to do |format| - if @in_juty.save - format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' } - format.json { render :show, status: :ok, location: @in_juty } - else - format.html { render :edit } - format.json { render json: @in_juty.errors, status: :unprocessable_entity } - end - end + def update_for_in_juty + in_juty = in_juty_params + in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i + in_time = in_time.change(offset: '+06:30') + out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i + out_time = out_time.change(offset: '+06:30') + @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] + @in_juty.in_time = in_time + @in_juty.out_time = out_time + respond_to do |format| + if @in_juty.save + format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' } + format.json { render :show, status: :ok, location: @in_juty } + else + format.html { render :edit } + format.json { render json: @in_juty.errors, status: :unprocessable_entity } + end end + end # DELETE /in_juties/1 # DELETE /in_juties/1.json def destroy @in_juty.destroy respond_to do |format| - format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully destroyed.' } + format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully removed.' } format.json { head :no_content } end end @@ -122,19 +153,20 @@ class Origami::InJutiesController < BaseOrigamiController @in_juty.destroy respond_to do |format| - format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully destroyed.' } + format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully removed.' } format.json { head :no_content } end end private - # Use callbacks to share common setup or constraints between actions. - def set_in_juty - @in_juty = InJuty.find(params[:id]) - end - # Never trust parameters from the scary internet, only allow the white list through. - def in_juty_params - params.require(:in_juty).permit(:id,:dinning_id,:commissioner_ids,:in_time,:out_time) - end + # Use callbacks to share common setup or constraints between actions. + def set_in_juty + @in_juty = InJuty.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def in_juty_params + params.require(:in_juty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time) + end end diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index 62531529..b6363195 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -18,7 +18,7 @@ <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %> - <%= f.input :out_time, :placeholder => "From Date", :class => "form-control" %> + <%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
    diff --git a/app/views/origami/in_juties/_edit_in_juty.html.erb b/app/views/origami/in_juties/_edit_in_juty.html.erb index 9eaf8353..a297ac65 100644 --- a/app/views/origami/in_juties/_edit_in_juty.html.erb +++ b/app/views/origami/in_juties/_edit_in_juty.html.erb @@ -1,13 +1,14 @@ -<%= simple_form_for([:origami,@in_juty]) do |f| %> - <%= f.error_notification %> +<%= simple_form_for([:origami, @in_juty]) do |f| %> + <%= f.error_notification %> -
    - <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>

    - <%= f.input :in_time %> - <%= f.input :out_time %> -
    +
    + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %> +

    + <%= f.input :in_time %> + <%= f.input :out_time %> +
    -
    - <%= f.button :submit %> -
    -<% end %> \ No newline at end of file +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/origami/in_juties/_form.html.erb b/app/views/origami/in_juties/_form.html.erb index d67df51b..9bed9152 100644 --- a/app/views/origami/in_juties/_form.html.erb +++ b/app/views/origami/in_juties/_form.html.erb @@ -1,33 +1,43 @@ -
    -<%= simple_form_for([:origami,@in_juty]) do |f| %> - <%= f.error_notification %> +<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %> + + <%= f.error_notification %> + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> + +
    + + <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %> + + + <%= @table.name %> +
    +
    + + + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %> +

    + + <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %> + + <%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %> + +

    + +
    + <% f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %> + <% f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %> + <% f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %> +
    +
    + <%= f.button :submit, :class => 'btn btn-primary' %> +
    -
    - <%= f.label :dinning_id %> - <%= f.collection_select :dinning_id, DiningFacility.all, :id, :name, {prompt: 'Select Dining Facilities'}, {class: 'form-control'} %>
    - <%= f.label :commissioner_ids %> - <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
    - - <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
    - - <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%> -

    -
    - <%= link_to 'Back', origami_in_juties_path, class: 'btn btn-success' %> - <%= f.button :submit, class: 'btn btn-info' %> -
    <% end %> -
    + \ No newline at end of file + }); + + diff --git a/app/views/origami/in_juties/index.html.erb b/app/views/origami/in_juties/index.html.erb index 6efeb999..ff5a0fd3 100644 --- a/app/views/origami/in_juties/index.html.erb +++ b/app/views/origami/in_juties/index.html.erb @@ -1,38 +1,91 @@ -
    -
      -
    • Home
      • -
    • In Juties
      • - +
      + +
      + + + + + + + + + + + + + + <% @juties_in.each do |in_juty| %> + + + + + + + + + <% end %> + +
      SelectDining Facility NameCommissioner IdsIn timeOut time
      + <%= in_juty.dining_facility.name rescue '-' %><%= in_juty.commissioner.name rescue '-' %><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %>
      + <%= paginate @juties_in %> +
      + +
      + <%= render 'form', in_juty: @in_juty, table: @table %> +
      + <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_juty_path, :class => 'btn btn-primary btn-sm' %> -
    -
    -
    - - - - - - - - - - - - - <% @in_juties.each do |in_juty| %> - - - - - - - - - - <% end %> - -
    Dining Facility NameCommissioner IdsIn timeOut time
    <%= in_juty.dining_facility.name rescue '-' %><%= in_juty.commissioner.name rescue '-' %><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Show', origami_in_juty_path(in_juty) %><%= link_to 'Edit', edit_origami_in_juty_path(in_juty) %><%= link_to 'Destroy', origami_in_juty_path(in_juty), method: :delete, data: {confirm: 'Are you sure?'} %>
    +
    +
    + + + diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb index bbb9912b..52d79c89 100644 --- a/app/views/origami/in_juties/index_in_juty.html.erb +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -22,7 +22,7 @@
    		<%= in_juty.commissioner.name rescue '-' %> <%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %> <%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %><%= link_to 'Remove', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %>
    '+rowCount+'' + item_name+ ' ' + name +'' + qty + '' + + parseFloat(total).toFixed(2) + +'
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 2742f249..4cdcf01d 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -21,13 +21,13 @@
    -
    -
    +
    +
    <% @complete.each do |sale| %>
    <%= sale.receipt_no %> - <%= sale.sale_status %> + <%= sale.sale_status %>
    <% end %> @@ -35,8 +35,8 @@
    -
    -
    +
    +
    <% @tables.each do |table| %> <% if table.status == 'occupied' %> <% if table.get_booking.nil? %> @@ -67,8 +67,8 @@
    -
    -
    +
    +
    <% @rooms.each do |room| %> <% if room.status == 'occupied' %>
    @@ -88,8 +88,8 @@
    -
    -
    +
    +
    <% @orders.each do |order| %>
    @@ -104,13 +104,12 @@
    - + - - + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
    @@ -251,10 +249,9 @@ <% end %> - +
    -
    <% if @status_sale == 'sale' @@ -314,7 +311,7 @@
    - + <% if @dining.bookings.length >= 1 %> <% if @status_order == 'order' && @status_sale != 'sale' %> diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index 62531529..84e1e629 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -26,6 +26,8 @@ <%= f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %> <%= f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %> <%= f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %> + +
    <% end %> diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb index bbb9912b..c9247acd 100644 --- a/app/views/origami/in_juties/index_in_juty.html.erb +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -35,10 +35,6 @@ -
    - -
    -