diff --git a/README.md b/README.md index 923a6cc5..bdc4c76b 100755 --- a/README.md +++ b/README.md @@ -244,6 +244,13 @@ Menu Image (Import guideline) For Edit Order Open & Close 1) settings/lookups => {type:edit_order, name:EditOrderOrigami, value: {1 or 0}} +For Dashboard Settings for supervisor and cashier + 1) settings/lookups => {type:dashboard_settings, name:supervisor, value: {1 or 0}} + 2) settings/lookups => {type:dashboard_settings, name:cashier, value: {1 or 0}} + +For Customer Settings On/Off + 1) settings/lookups => {type:customer_settings, name:create, value: {1 or 0}} + * ToDo list 1. Migration diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 96be3a43..82aad283 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -504,7 +504,7 @@ function showNewOrderAlert(order_reservation,shop_code){ if((order_reservation!=undefined) && (order_reservation!=null) && (order_reservation!="")){ var date = new Date(order_reservation.requested_time); var time = timeFormat(date); - var requested_date = date.getFullYear() + '-' + (date.getMonth() >= 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() >= 10? date.getDate() : '0' + date.getDate()) +' '+time; + var requested_date = date.getFullYear() + '-' + (date.getMonth() >= 10? (date.getMonth()+1) : '0' + (date.getMonth()+1)) +'-'+ (date.getDate() >= 10? date.getDate() : '0' + date.getDate()) +' '+time; $('.first-1').click(); swal({ diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 00ede7ab..f0c6f815 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -569,7 +569,7 @@ function getCreditSales(filter, customer, cashier_type){ $(".credit_items").show(); for (var i = 0; i < credit_sales.length ; i++) { var sale_date = new Date(credit_sales[i].sale_date); - var receipt_date = sale_date.getFullYear() +'-'+ (sale_date.getMonth() > 10 ? sale_date.getMonth() : '0' + sale_date.getMonth()) +'-'+ (sale_date.getDate() > 10 ? sale_date.getDate() : '0' + sale_date.getDate()); + var receipt_date = sale_date.getFullYear() +'-'+ (sale_date.getMonth() > 10 ? (sale_date.getMonth()+1) : '0' + (sale_date.getMonth()+1)) +'-'+ (sale_date.getDate() > 10 ? sale_date.getDate() : '0' + sale_date.getDate()); $('.tbd_credit_lists').append(html_credit_items.formatUnicorn({ 'key':i, 'sale_id':credit_sales[i].sale_id, diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 18e87308..70f5a617 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -43,6 +43,19 @@ class Crm::CustomersController < BaseCrmController @filter = filter + #for create customer on/off + @create_flag = true + lookup_customer = Lookup.collection_of('customer_settings') + if !lookup_customer.empty? + lookup_customer.each do |create_setting| + if create_setting[0].downcase == "create" + if create_setting[1] == '0' && current_login_employee.role == 'cashier' + @create_flag = false + end + end + end + end + # if flash["errors"] # @crm_customer.valid? # end @@ -197,7 +210,7 @@ class Crm::CustomersController < BaseCrmController if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' + response["message"]} else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response["message"] } + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } end end else diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 11ed3da0..0c89bace 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -67,7 +67,8 @@ class HomeController < ApplicationController redirect_to dashboard_path elsif @employee.role == "supervisor" session[:session_token] = @employee.token_session - redirect_to origami_root_path + route_by_role(@employee) + # redirect_to origami_root_path elsif @employee.role == "waiter" session[:session_token] = @employee.token_session route_by_role(@employee) @@ -202,9 +203,9 @@ class HomeController < ApplicationController redirect_to origami_dashboard_path elsif employee.role == "crm" redirect_to crm_root_path - elsif @employee.role == "supervisor" - redirect_to origami_root_path - elsif @employee.role == "account" + elsif employee.role == "supervisor" + redirect_to origami_dashboard_path + elsif employee.role == "account" redirect_to reports_dailysale_index_path end end diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index e0e5c9ef..8e002532 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -74,8 +74,7 @@ class Origami::CustomersController < BaseOrigamiController end filter = params[:filter] - puts "filter" - puts filter + if filter.nil? puts params[:page] @crm_customers = Customer.order("customer_id") #.page(params[:page]) @@ -94,6 +93,19 @@ class Origami::CustomersController < BaseOrigamiController # end @membership_types = Lookup.collection_of("member_group_type") + #for create customer on/off + @create_flag = true + lookup_customer = Lookup.collection_of('customer_settings') + if !lookup_customer.empty? + lookup_customer.each do |create_setting| + if create_setting[0].downcase == "create" + if create_setting[1] == '0' && current_login_employee.role == 'cashier' + @create_flag = false + end + end + end + end + respond_to do |format| # format.html { render :template => "crm/customers/index" } format.html { render action: "index"} diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index 97ba21e4..b9910803 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -69,6 +69,17 @@ class Origami::DashboardController < BaseOrigamiController end end end + + #dashboard settings on/off for supervisor and cashier + dashboard_settings = Lookup.collection_of('dashboard_settings') + @setting_flag = true + if !dashboard_settings.empty? + dashboard_settings.each do |setting| + if setting[0].to_s.downcase == current_user.role.downcase && setting[1] == '0' + @setting_flag = false + end + end + end end def get_all_menu diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 33d5a1d5..69b20576 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -116,7 +116,7 @@ class Origami::HomeController < BaseOrigamiController @split_bill = lookup_spit_bill[0][1] end - #for edit order open & close + #for edit order on/off @edit_order_origami = true lookup_edit_order = Lookup.collection_of('edit_order') if !lookup_edit_order.empty? diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb index 7b558ea1..323bb6da 100755 --- a/app/controllers/settings/employees_controller.rb +++ b/app/controllers/settings/employees_controller.rb @@ -6,7 +6,11 @@ class Settings::EmployeesController < ApplicationController # GET /employees # GET /employees.json def index - @employees = Employee.all + if current_user.role == "supervisor" + @employees = Employee.where("role in ('cashier', 'waiter')") + else + @employees = Employee.all + end end # GET /employees/1 diff --git a/app/models/ability.rb b/app/models/ability.rb index 982d669a..fa13a781 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -223,7 +223,8 @@ class Ability can :show, :product_sale elsif user.role == "supervisor" - + can :manage, Employee + can :edit, :sale_edit can :item_void, :sale_edit can :item_foc, :sale_edit diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 96f1f985..ceb28f1c 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -11,7 +11,7 @@
-
+
@@ -104,20 +104,22 @@
-
-
-
- <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %> + <% if @create_flag %> +
+
+
+ <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %> +
+ +
- - -
+ <% end %>