diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index b581eae8..0d339fd6 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -54,8 +54,7 @@ class Reports::SaleitemController < BaseReportController
@shift_data = sh
end
end
-
- respond_to do |format|
+ respond_to do |format|
format.html
format.xls
end
diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb
index 8f326e27..1b5dd998 100755
--- a/app/views/reports/saleitem/index.xls.erb
+++ b/app/views/reports/saleitem/index.xls.erb
@@ -108,12 +108,7 @@
<% end %>
| |
- <% if !cate_arr.include?(sale.menu_category_id) %>
<%= sale.menu_category_name %> |
- <% cate_arr.push(sale.menu_category_id) %>
- <% else %>
- |
- <% end %>
<%= sale.item_code rescue '-' %> |
<%= sale.product_name rescue '-' %> |
<% if sale.status_type != "Discount" %>
@@ -143,13 +138,6 @@
sub_qty += sale.total_item
end %>
<% if count == value %>
-
- | |
- Total <%= sale.account_name %> Qty |
- <%= sub_qty %> |
- <%= t("views.right_panel.detail.sub_total") %> |
- <%= number_with_precision(sub_total , precision:precision.to_i,delimiter:delimiter)%> |
-
<% sub_total = 0.0%>
<% sub_qty = 0 %>
<% count = 0%>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 85f38ec5..205c330a 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -21,11 +21,11 @@ class ActionController::Base
end
else
# check for license file
- # if check_license
- # current_license(ENV["SX_PROVISION_URL"])
- # else
- # redirect_to activate_path
- # end
+ if check_license
+ current_license(ENV["SX_PROVISION_URL"])
+ else
+ redirect_to activate_path
+ end
end
end
diff --git a/config/puma.rb b/config/puma.rb
index 6a545bed..fd89392f 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,10 +1,10 @@
-# application_path="#{File.expand_path("../..", __FILE__)}"
-# directory application_path
-# #environment ENV.fetch("RAILS_ENV") { "production" }
-# environment "production"
-# pidfile "#{application_path}/tmp/puma/pid"
-# state_path "#{application_path}/tmp/puma/state"
-# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-# port ENV.fetch("PORT") { 62158 }
-# workers 2
-# preload_app!
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+port ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!