diff --git a/Gemfile b/Gemfile index 0f13a68e..663d66d5 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ gem 'whenever', :require => false # XML parser #gem 'nokogiri', '~> 1.6' - +gem "select2-rails" # Pagination gem 'kaminari', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index d780a96d..4e13e61f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM builder (3.2.4) byebug (11.1.1) cancancan (1.17.0) - capistrano (3.12.0) + capistrano (3.12.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -171,7 +171,7 @@ GEM net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) nio4r (2.5.2) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) pdf-core (0.7.0) pdfjs_viewer-rails (0.3.1) @@ -187,7 +187,7 @@ GEM rqrcode (>= 1.0.0) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - puma (3.12.2) + puma (3.12.4) rack (2.0.9) rack-cors (1.1.1) rack (>= 2.0.0) @@ -235,13 +235,13 @@ GEM rqrcode_core (0.1.1) rspec-core (3.9.1) rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-rails (3.9.0) + rspec-rails (3.9.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -265,6 +265,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.3) activesupport (>= 4.0.0) sidekiq (5.2.8) @@ -288,12 +290,12 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.20.0) + sshkit (1.21.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) tether-rails (1.4.0) rails (>= 3.1) - thor (1.0.1) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) to_xls-rails (1.3.1) @@ -368,6 +370,7 @@ DEPENDENCIES rubyzip (= 1.0.0) sass-rails (~> 5.0) schema_to_scaffold + select2-rails shoulda-matchers (~> 3.1) sidekiq simple_form @@ -385,4 +388,4 @@ RUBY VERSION ruby 2.6.5p114 BUNDLED WITH - 2.0.2 + 2.1.4 diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 6ea9abf6..0c319877 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -619,7 +619,7 @@ $(function() { for(var field in attributes) { value = attributes[field]["values"]; - type = attributes[field]["type"] + type = attributes[field]["type"]; row = "
"+attributes[field]["type"]+"
"; $(value).each(function(i){ @@ -830,6 +830,7 @@ $(function() { item = get_item(item_data,"add_to_order"); customer_display_view(item,"add"); } + console.log(item_data); show_item_detail(item_data,"add_to_order"); calculate_sub_total(); code = $('#item_code').text() @@ -839,17 +840,20 @@ $(function() { // click plus icon for add $(document).on('click', '.add_icon', function(event){ - var item_data = $(this); - code = $(this).data('item-code'); - if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { - item = get_item(item_data,"add_icon"); - customer_display_view(item,"add"); + if (window.location.pathname != '/settings/out_of_stock/new') { + var item_data = $(this); + code = $(this).data('item-code'); + if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { + item = get_item(item_data,"add_icon"); + customer_display_view(item,"add"); + } + + show_item_detail(item_data,"add_icon"); + calculate_sub_total(); + autoScrollToItem(code) } - show_item_detail(item_data,"add_icon"); - calculate_sub_total(); - autoScrollToItem(code) }); //End Add Icon Click // scroll to element @@ -1270,6 +1274,8 @@ $(function() { }else{ window.location.href = "/origami/dashboard"; } + }else if(window.location.href.incluses("out_of_stock")){ + window.location.href = '/settings/out_of_stock'; }else{ var table_type = $('#table_type').text(); var table_id = $('#table_id').text(); @@ -1536,7 +1542,6 @@ $(function() { var menu_list = $('.menu_items_list'); menu_list.empty(); for(var field in menu_items) { - console.log(menu_items[field].instances); if (menu_items[field].is_sub_item == false) { instances = menu_items[field].instances ; @@ -1577,6 +1582,7 @@ $(function() { data_target = 'sx_item_detailModal'; data_modal = '' add_icon = "add_icon" + menu_instances = []; $(instances).each(function(i){ if (instances[i].is_default === true) { @@ -1589,6 +1595,10 @@ $(function() { promotion_price = instances[i].promotion_price; code = instances[i].code; out_of_stock = instances[i].out_of_stock; + menu_insta = [code,name,item_attributes]; + } + if(instances[i].out_of_stock === false){ + menu_instances.push(menu_insta); } }); } @@ -1635,6 +1645,7 @@ $(function() { +''+ price +'' + "
'+ price + '' +"
{:status=> "Success", :url => settings_menu_category_simple_menu_item_path(category,catID) }.to_json - # respond_to do |format| + # respond_to do |format| # format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully destroyed.' } # format.json { head :no_content } # end @@ -155,7 +156,7 @@ class Settings::MenuItemInstancesController < ApplicationController end # To Only show in Menu item selected attrs - @item.item_attributes = MenuItemAttribute.where(id: @item.item_attributes).select("id, name").map { |e| [e.name, e.id] } + @item.item_attributes = MenuItemAttribute.where(id: @item.item_attributes).select("id, name, attribute_type").group_by(&:attribute_type) end # Never trust parameters from the scary internet, only allow the white list through. diff --git a/app/controllers/settings/out_of_stock_controller.rb b/app/controllers/settings/out_of_stock_controller.rb index 1681a600..2f76bb97 100644 --- a/app/controllers/settings/out_of_stock_controller.rb +++ b/app/controllers/settings/out_of_stock_controller.rb @@ -1,6 +1,6 @@ class Settings::OutOfStockController < ApplicationController def index - @menu_items = MenuItem.joins(:menu_item_instances).where(menu_item_instances: {is_out_of_stock: true}).select('menu_item_instances.id, menu_item_instances.item_instance_code, menu_items.name, menu_item_instances.is_out_of_stock') + @menu_items = MenuItem.joins(:menu_item_instances).where(menu_item_instances: {is_out_of_stock: true}).select('menu_item_instances.id, menu_item_instances.item_instance_code, menu_item_instances.item_instance_name, menu_items.name, menu_item_instances.is_out_of_stock, menu_item_instances.item_attributes') end def show @@ -26,7 +26,7 @@ class Settings::OutOfStockController < ApplicationController if !item_instance.first.is_out_of_stock? item_instance.update(is_out_of_stock: true) items_arr.each do |i| - OutOfStock.create_out_of_stock(date,i) + # OutOfStock.create_out_of_stock(date,i) ActionCable.server.broadcast "out_of_stock_channel", item_instance_code: i, status: true end elsif item_instance.first.is_out_of_stock? @@ -43,7 +43,7 @@ class Settings::OutOfStockController < ApplicationController unless item_instance.nil? item_instance.update(is_out_of_stock: false) ActionCable.server.broadcast "out_of_stock_channel", item_instance_code: item_instance.item_instance_code, status: false - OutOfStock.where(item_instance_code: item_instance.item_instance_code, created_at: Time.zone.now.beginning_of_day..Time.zone.now.end_of_day).destroy_all + # OutOfStock.where(item_instance_code: item_instance.item_instance_code, created_at: Time.zone.now.beginning_of_day..Time.zone.now.end_of_day).destroy_all flash[:message] = 'Out of stock was successfully destroyed.' render :json => {:status=> "Success", :url => settings_out_of_stock_index_url }.to_json end @@ -55,7 +55,7 @@ class Settings::OutOfStockController < ApplicationController item_instance.update(is_out_of_stock: false) item_instance.each do |i| ActionCable.server.broadcast "out_of_stock_channel", item_instance_code: i.item_instance_code, status: false - OutOfStock.where(item_instance_code: i.item_instance_code, created_at: Time.zone.now.beginning_of_day..Time.zone.now.end_of_day).destroy_all + # OutOfStock.where(item_instance_code: i.item_instance_code, created_at: Time.zone.now.beginning_of_day..Time.zone.now.end_of_day).destroy_all end flash[:message] = 'Out of stock was successfully destroyed.' render :json => {:status=> "Success", :url => settings_out_of_stock_index_url }.to_json diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index cd1c4507..68973cc7 100755 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -18,13 +18,13 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/new def new - @settings_menu_item = MenuItem.new - @item_sets = ItemSet.all + @settings_menu_item = MenuItem.new + @item_sets = ItemSet.all end # GET /settings/menu_items/1/edit - def edit - @item_sets = ItemSet.all + def edit + @item_sets = ItemSet.all end # POST /settings/menu_items @@ -37,14 +37,14 @@ class Settings::SimpleMenuItemsController < ApplicationController # end @settings_menu_item.created_by = current_login_employee.name - # Remove "" default first + # 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| + # # 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: [] }) @@ -53,15 +53,15 @@ class Settings::SimpleMenuItemsController < ApplicationController # attr_format.each do |af| # if menu_attr.attribute_type == af[:type] # af[:value].push(menu_attr.value) - # else + # else # new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] } - # attr_format.push(new_attr) + # attr_format.push(new_attr) # end - + # break if attr_format.count > param_count # end - # param_count -= 1 + # param_count -= 1 # end # @settings_menu_item.item_attributes = attr_format @@ -75,7 +75,7 @@ class Settings::SimpleMenuItemsController < ApplicationController @settings_menu_item.item_sets = sets end end - + respond_to do |format| if @settings_menu_item.save menu_item = MenuItem.find(@settings_menu_item.id) @@ -83,7 +83,7 @@ class Settings::SimpleMenuItemsController < ApplicationController 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 + else format.html { render :new } format.json { render json: @settings_menu_item.errors, status: :unprocessable_entity } end @@ -93,7 +93,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1 # PATCH/PUT /settings/menu_items/1.json def update - # Remove "" default first + # Remove "" default first params[:simple_menu_item][:item_attributes].delete_at(0) params[:simple_menu_item][:item_options].delete_at(0) @@ -104,7 +104,7 @@ class Settings::SimpleMenuItemsController < ApplicationController sets = ItemSet.find(params[:simple_menu_item][:item_sets]) if sets.count >= 0 - # destroy all item sets for edit + # destroy all item sets for edit @settings_menu_item.item_sets.destroy @settings_menu_item.item_sets = sets end @@ -125,8 +125,8 @@ class Settings::SimpleMenuItemsController < ApplicationController # DELETE /settings/menu_items/1 # DELETE /settings/menu_items/1.json - def destroy - path_to_file = @settings_menu_item.image_path.to_s + def destroy + path_to_file = @settings_menu_item.image_path.to_s File.delete(path_to_file) if File.exist?(path_to_file) abc = MenuItem.deleteRecursive(@settings_menu_item) render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_items_path }.to_json @@ -147,7 +147,7 @@ class Settings::SimpleMenuItemsController < ApplicationController end def set_settings_item_attribute - @item_attributes = MenuItemAttribute.all.order("id asc") #.map{|a| [a.name, a.value]} + @item_attributes = MenuItemAttribute.all.order("id asc") #.map{|a| [a.name, a.value]} end def set_settings_item_option diff --git a/app/models/out_of_stock.rb b/app/models/out_of_stock.rb deleted file mode 100644 index e3d65fc8..00000000 --- a/app/models/out_of_stock.rb +++ /dev/null @@ -1,8 +0,0 @@ -class OutOfStock < ApplicationRecord - def self.create_out_of_stock(date,item_instance_code) - OutOfStock.create( - date: date, - item_instance_code: item_instance_code - ) - end -end diff --git a/app/views/api/restaurant/out_of_stock/index.json.jbuilder b/app/views/api/restaurant/out_of_stock/index.json.jbuilder index 997f83e8..0956801f 100644 --- a/app/views/api/restaurant/out_of_stock/index.json.jbuilder +++ b/app/views/api/restaurant/out_of_stock/index.json.jbuilder @@ -1,4 +1,4 @@ -out_of_stock_json = json.array! @out_of_stock do |oos| - json.date oos.date +json.status true +json.data @out_of_stock do |oos| json.item_instance_code oos.item_instance_code end diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb index 389d53ac..b8bc515e 100644 --- a/app/views/foodcourt/addorders/detail.html.erb +++ b/app/views/foodcourt/addorders/detail.html.erb @@ -102,7 +102,7 @@
- + @@ -349,7 +349,7 @@ -
+

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

diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index 9d6d4257..6359a955 100755 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -13,7 +13,7 @@
<%= f.input :item_instance_code ,:input_html=>{:class=>""},:required=>true %> - + <% flash.each do |test, msg| %> <% str="[\"#{msg['item_instance_code']}\"]" str.gsub!('["', '') @@ -25,11 +25,14 @@ <%= f.input :item_instance_name %> <%= f.input :price %> - <%= f.input :item_attributes, collection: @item.item_attributes, include_blank: false, include_hidden: false%> + <% @item.item_attributes.each do |type, value| %> + <%= f.input :attributes, :label => type, :collection => value.map {|v| [v['name'], v['id']]}, :include_blank => false, :input_html => {:class => "form-control item_sets #{type}"} %> + <% end %> + <%= f.input :item_attributes, :as => :hidden, :input_html => { :value => '', :id => "attr_type" } %> <%= f.input :is_on_promotion %> - <%= f.input :promotion_price %> - + <%= f.input :promotion_price %> + <%= f.input :is_available %> <%= f.input :is_default %> @@ -69,6 +72,39 @@ 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>

-
+
+ + diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index ccd2a70c..f10cabbf 100755 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -5,11 +5,11 @@ diff --git a/app/views/settings/out_of_stock/_form.html.erb b/app/views/settings/out_of_stock/_form.html.erb index a33293e7..e3b77c98 100644 --- a/app/views/settings/out_of_stock/_form.html.erb +++ b/app/views/settings/out_of_stock/_form.html.erb @@ -1,5 +1,5 @@ <%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %> - +<%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %>
- +
+
+ +
+ + +
- -
- -
-
- +
@@ -140,9 +145,9 @@
+ - -->