Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: (71 commits)
  Update
  Coupon / Voucher data change
  update menu_sync
  update addorder
  update addorder view
  add fields for Menu Sync
  update add oreder
  add menu api
  update add order and calculate subtotal
  update seed
  menu ui update
  update ability for setmenu
  fixed
  update show for foc
  add bootstrap file input and menu item img implemented
  update foc and pdf
  update menu item
  update receipt bill pdf for foc and credit
  add CarrierWave gems for menu image upload
  add CarrierWave gems for menu image upload
  ...

spec/controllers/origami/addorders_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::AddordersController, type: :controller do
+
+end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 <p>" do
+    render
+    expect(rendered).to match(/Name/)
+    expect(rendered).to match(/2/)
+    expect(rendered).to match(/3/)
+  end
+end

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

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

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

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 <p>" do
+    render
+    expect(rendered).to match(//)
+    expect(rendered).to match(//)
+  end
+end