diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index d18a4726..35dce150 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -25,8 +25,7 @@ $(document).ready(function() { var method = $(this).attr('data-method'); var url = $(this).attr('data-ref'); var html_text = $(this).siblings( "#delete_text" ).html(); - //var page = url.substring(url.lastIndexOf('/') + 1); - console.log(location.href); + //var page = url.substring(url.lastIndexOf('/') + 1); swal({ title: "Confirmation", text: html_text, @@ -40,7 +39,7 @@ $(document).ready(function() { type: method, url: url , success: function(data) { - // console.log(data.url); + console.log(data.url); location.href = data.url; } }); diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index ac2acc7f..e9b67de2 100755 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -134,10 +134,11 @@ class Settings::MenuItemInstancesController < ApplicationController item = MenuItem.find(catID.menu_item_id) category = MenuCategory.find(item.menu_category_id) end - 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 + render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_item_path(category,catID) }.to_json + # 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 end private diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index f97aa09e..0c046d7c 100755 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -105,13 +105,18 @@ class Settings::SetMenuItemsController < ApplicationController # DELETE /settings/menu_items/1 # DELETE /settings/menu_items/1.json def destroy + # item_id = @settings_menu_item.id + # category_id = @settings_menu_item.menu_category + 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) - respond_to do |format| - format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully destroyed.' } - format.json { head :no_content } - end + + render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_items_path }.to_json + # respond_to do |format| + # format.html { redirect_to settings_menu_category_set_menu_items_path(category_id,item_id), notice: 'Menu item was successfully destroyed.' } + # format.json { head :no_content } + # end end private diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 319934ca..b37f6706 100755 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -126,14 +126,15 @@ class Settings::SimpleMenuItemsController < ApplicationController # DELETE /settings/menu_items/1 # DELETE /settings/menu_items/1.json - def destroy + 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) - respond_to do |format| - format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' } - format.json { head :no_content } - end + render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_items_path }.to_json + # respond_to do |format| + # format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' } + # format.json { head :no_content } + # end end private diff --git a/app/views/origami/surveys/index.html.erb b/app/views/origami/surveys/index.html.erb index ec28b822..f61caefb 100755 --- a/app/views/origami/surveys/index.html.erb +++ b/app/views/origami/surveys/index.html.erb @@ -1,9 +1,9 @@
    -
  1. <%= t("views.right_panel.button.home") %>
    2. +
  2. <%= t("views.right_panel.button.home") %>
  3. <%= t("views.right_panel.detail.account") %>
    4. - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + <%= link_to t('.back', :default => t("views.btn.back")), origami_root_path %>
diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb index 4a287beb..8af5c071 100755 --- a/app/views/origami/surveys/new.html.erb +++ b/app/views/origami/surveys/new.html.erb @@ -1,10 +1,10 @@
    -
  1. <%= t("views.right_panel.button.home") %>
    2. +
  2. <%= t("views.right_panel.button.home") %>
  3. <%= t("views.right_panel.detail.survey") %>
    4. - <%= link_to t('.back', :default => t("views.btn.back")), root_path %> + <%= link_to t('.back', :default => t("views.btn.back")), origami_root_path %>
diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 41b9bd57..f1592f89 100755 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -55,36 +55,27 @@ <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - - - - - <% if params[:simple_menu_item_id] %> - - <% else %> - - <% end %> - - + + <% if params[:simple_menu_item_id] %> + + + + <% else %> + + + + <% end %> diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index d742b9ae..c712d5ff 100755 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -110,7 +110,6 @@ <% else %> <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <% end %> <% end %> diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index e3097acf..2a34a5df 100755 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -107,7 +107,8 @@ <%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - + <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <% end %> diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index b66d636e..8970da4d 100755 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -112,13 +112,11 @@ <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - + <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> <% else %> <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <% end %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 38814b69..0cb95979 100755 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -116,6 +116,10 @@ <%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> + + <% end %> diff --git a/config/routes.rb b/config/routes.rb index a60b8bc4..021e1594 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,7 +180,7 @@ scope "(:locale)", locale: /en|mm/ do post '/:sale_id/get_customer' => "customers#get_customer" get '/:id/surveys', to: "surveys#new" - post '/:id/create' => "surveys#create", :as => "create_surveys" + post '/:id/create_survey' => "surveys#create", :as => "create_surveys" get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }