diff --git a/README.md b/README.md index aa292813..5f9c08f6 100755 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ Person and Extra Time category_code = SPL... //for menu categories special 1) must create Person in settings/accounts 2) must create Adult and Child in settings/item_attributes - 3) must be P00001 for Adult and P00002 for Child in settings/menu_categories/[cat_id]/simple_menu_items - 3) must be PI0001 for Adult and PI0002 for Child in settings/simple_menu_items/[item_id]/menu_item_instances + 3) must be PSA_[a-z/0-9] for Adult and PSC_[a-z/0-9] for Child in settings/menu_categories/[cat_id]/simple_menu_items + 3) must be PSAI_[a-z/0-9] for Adult and PSCI_[a-z/0-9] for Child in settings/simple_menu_items/[item_id]/menu_item_instances For Extra Time item_instance_code @@ -98,6 +98,9 @@ SQL Update after rake clear:data runned i) TableBooking, Order, OrderItem, sale, SaleOrder, SaleItem, SaleTax, SalePayment, SaleAudit, AssignedOrderItem => { current:0, next:0 } ** Note :: do not update Customer +Change type in mysql + *run if you got font error for Myanmar, Chinese, etc... + => ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci * ToDo list diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7fafd6bd..e66d7700 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -36,7 +36,7 @@ class ApplicationController < ActionController::Base # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] end - else + else # check for license file # if check_license # current_license(ENV["SX_PROVISION_URL"]) diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb index fac74926..353509c3 100755 --- a/app/controllers/install_controller.rb +++ b/app/controllers/install_controller.rb @@ -30,7 +30,7 @@ class InstallController < BaseController # end @license = License.new(ENV["SX_PROVISION_URL"]) - response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password) + response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password) if response[:status] redirect_to root_url, notice: response["message"] else diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb index 9b7a7a66..bbd4a087 100644 --- a/app/controllers/sym_control_controller.rb +++ b/app/controllers/sym_control_controller.rb @@ -4,7 +4,7 @@ class SymControlController < BaseController def run sym_path = "/home/yan/symmetric/" - check_sym_proc_str = `#{"service SymmetricDS status"}` + check_sym_proc_str = `#{"sudo service SymmetricDS status"}` # Check Sym Installed # if sym_install_status[1] == "false" # response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"} @@ -12,15 +12,15 @@ class SymControlController < BaseController if check_sym_proc_str.include? "Active: active (running)" || "Active: active (exited)" #"Server is already running" # Create Sym Table - check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables") + check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables") if check_sym_table sym_sql = Rails.root + "db/sym_master.sql" if File.exist? (sym_sql) # Import Sym Sql to db and start sym - run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s) - stop_sym = system("service SymmetricDS stop") - run_sym = system("service SymmetricDS start") + run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s) + stop_sym = system("sudo service SymmetricDS stop") + run_sym = system("sudo service SymmetricDS start") if run_sym flash[:notice] = 'Success!' end diff --git a/app/models/license.rb b/app/models/license.rb index 869abe59..8c22f478 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -379,7 +379,7 @@ class License # check_sym_proc_str = check_sym_proc_str.split("\n") # sym_install_status = check_sym_proc_str[0].split(": ") - check_sym_proc_str = `#{"service SymmetricDS status"}` + check_sym_proc_str = `#{"sudo service SymmetricDS status"}` # Check Sym Installed # if sym_install_status[1] == "false" @@ -390,21 +390,23 @@ class License sym_run_status = check_sym_running(check_sym_proc_str, sym_path) if sym_run_status # Create Sym Table - check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables") + check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables") if check_sym_table sym_sql = Rails.root + "db/sym_master.sql" if File.exist? (sym_sql) # Import Sym Sql to db and start sym - run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s) - stop_sym = system("service SymmetricDS stop") - run_sym = system("service SymmetricDS start") + run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s) + stop_sym = system("sudo service SymmetricDS stop") + run_sym = system("sudo service SymmetricDS start") if run_sym response = { "status": true, "message": "Activation is success and Configuration done..."} end else response = { "status": false, "message": "Activation is success but Symmetric Sql not found. \n Please contact code2lab call center!"} end + else + response = { "status": false, "message": "Activation is success but Cannot create Sym Tables. \n Please contact code2lab call center!"} end else response = { "status": false, "message": "Activation is success but Symmetric not running. \n Please contact code2lab call center!"} diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder index a7759514..ae3fea84 100755 --- a/app/views/api/orders/view_orders.json.jbuilder +++ b/app/views/api/orders/view_orders.json.jbuilder @@ -37,11 +37,11 @@ if (@booking) json.order_items order_items do |item| # For YGN BBQ - if item.item_code == "P00001" + if item.item_code.include? ("PSA_") adult_count += item.qty adult_spent += (item.price * item.qty) end - if item.item_code == "P00002" + if item.item_code.include? ("PSC_") child_count += item.qty child_spent += (item.price * item.qty) end diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index 5ffcbff5..8d0df9b8 100755 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -63,7 +63,7 @@

1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>
2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>
- 2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>
+ 3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>

list <%= t("views.right_panel.header.link_lists") %>

diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb index 8196a906..1c5e549d 100755 --- a/app/views/settings/lookups/_form.html.erb +++ b/app/views/settings/lookups/_form.html.erb @@ -19,10 +19,21 @@

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
view_headline <%= t("views.right_panel.header.page_detail") %>
+

+ 1) <%= t("views.right_panel.detail.lookup") + " " + t("views.right_panel.detail.type_txt") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.lookup_txt") %>
+ 2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
+ 3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.value_txt") %>
+

+
list <%= t("views.right_panel.header.button_lists") %>
+

+ 1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.lookup_txt") %>
+

+
list <%= t("views.right_panel.header.link_lists") %>
+

+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+ 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.lookup_txt") %>
+

diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index 85588d6a..174ff9d7 100755 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -11,29 +11,29 @@
-
- <%= link_to t("views.btn.new"),new_settings_lookup_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> -
+
+ <%= link_to t("views.btn.new"),new_settings_lookup_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
- - - - - - - - - +
Lookup typeNameValueAction
+ + + + + + + + - - <% @settings_lookups.each do |settings_lookup| %> - - - - - - + <% @settings_lookups.each do |settings_lookup| %> + + + + + +
<%= t("views.right_panel.detail.lookup") +" "+ t("views.right_panel.detail.type_txt") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.value") %><%= t("views.right_panel.detail.actions") %>
<%= settings_lookup.lookup_type %><%= settings_lookup.name %><%= settings_lookup.value %> - <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> +
<%= settings_lookup.lookup_type %><%= settings_lookup.name %><%= settings_lookup.value %> + <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %>