+
+ <% # For Tab Disable for Station is inactive
+ status=""
+ @queue_stations_items.each do |qsi|
+ if qsi[:is_active] == false
+ status="disabled"
+ end
+ %>
+
- <%
- # 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
- %>
-
diff --git a/config/routes.rb b/config/routes.rb
index 4b5cd9f5..bebb89bf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -140,6 +140,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"
@@ -148,6 +149,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'
@@ -201,6 +203,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
@@ -256,9 +260,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
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/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"})
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