diff --git a/Main Menu.xlsx b/Main Menu.xlsx deleted file mode 100644 index 94c70338..00000000 Binary files a/Main Menu.xlsx and /dev/null differ diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index 0264084c..bc92a959 100755 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -167,8 +167,9 @@ class Settings::MenusController < ApplicationController # end end - p.serialize("tmp/menus/" + menu.name + ".xlsx") - render :json => {status: true} + file_path = "public/menus/" + menu.name + ".xlsx" + p.serialize(file_path) + render :json => { status: true, path: file_path } end def import diff --git a/app/models/menu.rb b/app/models/menu.rb index 8bf616c9..28b23c76 100755 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -160,7 +160,7 @@ class Menu < ApplicationRecord account = Account.create({title: row["Account"], account_type: "0"}) end - menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by) + menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", is_sub_item: 0, is_available: 1, created_by: created_by) # else # status = status + "Item Code already exists for " + row["Item Name"] + "." end diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index d8e37899..8eeb5269 100755 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -115,7 +115,8 @@ url: "/settings/menus/" + menu_id + "/export", success: function(result){ if(result.status){ - swal("Success", "Export Success...", "success"); + location.href = result.path.substring(6); + // swal("Success", "Export Success...", "success"); } } }); diff --git a/public/menus/Main Menu.xlsx b/public/menus/Main Menu.xlsx new file mode 100644 index 00000000..a35944b0 Binary files /dev/null and b/public/menus/Main Menu.xlsx differ diff --git a/public/menus/Shwe Myittar.xlsx b/public/menus/Shwe Myittar.xlsx new file mode 100644 index 00000000..5cd9d6b9 Binary files /dev/null and b/public/menus/Shwe Myittar.xlsx differ