From 75dd4db10f2b17731f4e7740fe2f98431c72b629 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 19:33:29 +0630 Subject: [PATCH 1/3] update seed --- db/seeds.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/seeds.rb b/db/seeds.rb index 21268860..d5b35629 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -63,6 +63,7 @@ employee_roles = Lookup.create([{lookup_type:'employee_roles', name: 'Cashier', {lookup_type:'employee_roles', name: 'Waiter', value: 'waiter'}, {lookup_type:'employee_roles', name: 'Supervisour', value: 'supervisour'}, {lookup_type:'employee_roles', name: 'Manager', value: 'manager'}, + {lookup_type:'employee_roles', name: 'Accountant', value: 'account'}, {lookup_type:'employee_roles', name: 'Administrator', value: 'administrator'}]) #booking_status From 0726af072e577d4c8290167280356009218b081c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 19:49:02 +0630 Subject: [PATCH 2/3] update cancan --- .../reports/daily_sales_controller.rb | 2 +- .../reports/sale_items_controller.rb | 2 +- app/models/ability.rb | 27 ++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/controllers/reports/daily_sales_controller.rb b/app/controllers/reports/daily_sales_controller.rb index 6d99551d..1a878aaa 100644 --- a/app/controllers/reports/daily_sales_controller.rb +++ b/app/controllers/reports/daily_sales_controller.rb @@ -1,5 +1,5 @@ class Reports::DailySalesController < BaseReportController - # authorize_resource :class => false + authorize_resource :class => false def index from, to ,report_type = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) diff --git a/app/controllers/reports/sale_items_controller.rb b/app/controllers/reports/sale_items_controller.rb index 81f7af01..9001658c 100644 --- a/app/controllers/reports/sale_items_controller.rb +++ b/app/controllers/reports/sale_items_controller.rb @@ -1,5 +1,5 @@ class Reports::SaleItemsController < BaseReportController - # authorize_resource :class => false + authorize_resource :class => false def index from, to, report_type = get_date_range_from_params diff --git a/app/models/ability.rb b/app/models/ability.rb index f3e8da5c..10a289f1 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -20,9 +20,9 @@ class Ability can :manage, Zone can :manage, CashierTerminal can :manage, Employee - can :manage, MembershipSetting - can :manage, MembershipAction - can :manage, PaymentMethodSetting + # can :manage, MembershipSetting + # can :manage, MembershipAction + # can :manage, PaymentMethodSetting can :manage, TaxProfile can :manage, PrintSetting can :manage, Account @@ -30,9 +30,26 @@ class Ability can :manage, Order can :manage, Sale + can :manage, Customer + can :index, :dailysale can :index, :saleitem + can :add_customer, Customer + can :update_sale_by_customer, Customer + + can :index, :discount + can :create, :discount + + can :show, :payment + can :create, :payment + can :reprint, :payment + + can :move_dining, :movetable + can :moving, :movetable + + can :move_dining, :moveroom + elsif user.role == "cashier" can :read, Order @@ -55,6 +72,10 @@ class Ability can :moving, :movetable can :move_dining, :moveroom + + can :index, :dailysale + can :index, :saleitem + elsif user.role == "accountant" From 4c13be257b1aa09b0dd960915e30e2d523f9d3cc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 22:45:34 +0630 Subject: [PATCH 3/3] update authroize --- .../{dailysales.coffee => dailysale.coffee} | 0 .../{sale_items.coffee => saleitem.coffee} | 0 .../{dailysales.scss => dailysale.scss} | 2 +- .../{sale_items.scss => saleitem.scss} | 2 +- .../reports/bksale_items_controller.rb | 19 -- .../reports/daily_sales_controller.rb | 17 -- ..._controller.rb => dailysale_controller.rb} | 8 +- .../reports/receipt_no_controller.rb | 2 +- ...s_controller.rb => saleitem_controller.rb} | 6 +- app/helpers/reports/dailysale_helper.rb | 2 + app/helpers/reports/dailysales_helper.rb | 2 - app/helpers/reports/sale_items_helper.rb | 2 - app/helpers/reports/saleitem_helper.rb | 2 + app/models/ability.rb | 26 +-- app/views/layouts/_header.html.erb | 4 +- .../_shift_sale_report_filter.html.erb | 151 -------------- app/views/reports/daily_sales/index.html.erb | 190 ------------------ app/views/reports/daily_sales/index.xls.erb | 116 ----------- .../_shift_sale_report_filter.html.erb | 0 .../{daily_sale => dailysale}/index.html.erb | 4 +- .../{daily_sale => dailysale}/index.xls.erb | 0 .../_shift_sale_report_filter.html.erb | 156 -------------- app/views/reports/sale_items/index.html.erb | 141 ------------- app/views/reports/sale_items/index.xls.erb | 136 ------------- .../_shift_sale_report_filter.html.erb | 0 .../{sale_item => saleitem}/index.html.erb | 4 +- .../{sale_item => saleitem}/index.xls.erb | 0 config/routes.rb | 4 +- .../reports/dailysale_controller_spec.rb | 5 + .../reports/dailysales_controller_spec.rb | 5 - .../reports/sale_items_controller_spec.rb | 5 - .../reports/saleitem_controller_spec.rb | 5 + ...elper_spec.rb => dailysale_helper_spec.rb} | 6 +- ...helper_spec.rb => saleitem_helper_spec.rb} | 6 +- 34 files changed, 52 insertions(+), 976 deletions(-) rename app/assets/javascripts/reports/{dailysales.coffee => dailysale.coffee} (100%) rename app/assets/javascripts/reports/{sale_items.coffee => saleitem.coffee} (100%) rename app/assets/stylesheets/reports/{dailysales.scss => dailysale.scss} (60%) rename app/assets/stylesheets/reports/{sale_items.scss => saleitem.scss} (60%) delete mode 100644 app/controllers/reports/bksale_items_controller.rb delete mode 100644 app/controllers/reports/daily_sales_controller.rb rename app/controllers/reports/{daily_salesbk_controller.rb => dailysale_controller.rb} (70%) rename app/controllers/reports/{sale_items_controller.rb => saleitem_controller.rb} (73%) create mode 100644 app/helpers/reports/dailysale_helper.rb delete mode 100644 app/helpers/reports/dailysales_helper.rb delete mode 100644 app/helpers/reports/sale_items_helper.rb create mode 100644 app/helpers/reports/saleitem_helper.rb delete mode 100644 app/views/reports/daily_sales/_shift_sale_report_filter.html.erb delete mode 100644 app/views/reports/daily_sales/index.html.erb delete mode 100644 app/views/reports/daily_sales/index.xls.erb rename app/views/reports/{daily_sale => dailysale}/_shift_sale_report_filter.html.erb (100%) rename app/views/reports/{daily_sale => dailysale}/index.html.erb (97%) rename app/views/reports/{daily_sale => dailysale}/index.xls.erb (100%) delete mode 100644 app/views/reports/sale_items/_shift_sale_report_filter.html.erb delete mode 100644 app/views/reports/sale_items/index.html.erb delete mode 100644 app/views/reports/sale_items/index.xls.erb rename app/views/reports/{sale_item => saleitem}/_shift_sale_report_filter.html.erb (100%) rename app/views/reports/{sale_item => saleitem}/index.html.erb (95%) rename app/views/reports/{sale_item => saleitem}/index.xls.erb (100%) create mode 100644 spec/controllers/reports/dailysale_controller_spec.rb delete mode 100644 spec/controllers/reports/dailysales_controller_spec.rb delete mode 100644 spec/controllers/reports/sale_items_controller_spec.rb create mode 100644 spec/controllers/reports/saleitem_controller_spec.rb rename spec/helpers/reports/{sale_items_helper_spec.rb => dailysale_helper_spec.rb} (69%) rename spec/helpers/reports/{dailysales_helper_spec.rb => saleitem_helper_spec.rb} (69%) diff --git a/app/assets/javascripts/reports/dailysales.coffee b/app/assets/javascripts/reports/dailysale.coffee similarity index 100% rename from app/assets/javascripts/reports/dailysales.coffee rename to app/assets/javascripts/reports/dailysale.coffee diff --git a/app/assets/javascripts/reports/sale_items.coffee b/app/assets/javascripts/reports/saleitem.coffee similarity index 100% rename from app/assets/javascripts/reports/sale_items.coffee rename to app/assets/javascripts/reports/saleitem.coffee diff --git a/app/assets/stylesheets/reports/dailysales.scss b/app/assets/stylesheets/reports/dailysale.scss similarity index 60% rename from app/assets/stylesheets/reports/dailysales.scss rename to app/assets/stylesheets/reports/dailysale.scss index cfc48374..516e1b52 100644 --- a/app/assets/stylesheets/reports/dailysales.scss +++ b/app/assets/stylesheets/reports/dailysale.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the reports/dailysales controller here. +// Place all the styles related to the reports/dailysale controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/reports/sale_items.scss b/app/assets/stylesheets/reports/saleitem.scss similarity index 60% rename from app/assets/stylesheets/reports/sale_items.scss rename to app/assets/stylesheets/reports/saleitem.scss index b9692327..3e3460a4 100644 --- a/app/assets/stylesheets/reports/sale_items.scss +++ b/app/assets/stylesheets/reports/saleitem.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the reports/sale_items controller here. +// Place all the styles related to the reports/saleitem controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/reports/bksale_items_controller.rb b/app/controllers/reports/bksale_items_controller.rb deleted file mode 100644 index 1f349320..00000000 --- a/app/controllers/reports/bksale_items_controller.rb +++ /dev/null @@ -1,19 +0,0 @@ -class Reports::SaleItemsController < BaseReportController - authorize_resource :class => false - def index - - from, to, report_type = get_date_range_from_params - - @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) - - respond_to do |format| - format.html - format.xls - end - end - - def show - - end - -end \ No newline at end of file diff --git a/app/controllers/reports/daily_sales_controller.rb b/app/controllers/reports/daily_sales_controller.rb deleted file mode 100644 index 1a878aaa..00000000 --- a/app/controllers/reports/daily_sales_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -class Reports::DailySalesController < BaseReportController - authorize_resource :class => false - def index - from, to ,report_type = get_date_range_from_params - @sale_data = Sale.daily_sales_list(from,to) - @tax = SaleTax.get_tax(from,to) - respond_to do |format| - format.html - format.xls - end - end - - def show - - end - -end \ No newline at end of file diff --git a/app/controllers/reports/daily_salesbk_controller.rb b/app/controllers/reports/dailysale_controller.rb similarity index 70% rename from app/controllers/reports/daily_salesbk_controller.rb rename to app/controllers/reports/dailysale_controller.rb index 1a878aaa..27e812ab 100644 --- a/app/controllers/reports/daily_salesbk_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -1,5 +1,6 @@ -class Reports::DailySalesController < BaseReportController - authorize_resource :class => false +class Reports::DailysaleController < BaseReportController + authorize_resource :class => false + def index from, to ,report_type = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) @@ -13,5 +14,4 @@ class Reports::DailySalesController < BaseReportController def show end - -end \ No newline at end of file +end diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index d85c7d57..e4157c4e 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -1,5 +1,5 @@ class Reports::ReceiptNoController < BaseReportController - +authorize_resource :class => false def index from, to = get_date_range_from_params puts "from..." diff --git a/app/controllers/reports/sale_items_controller.rb b/app/controllers/reports/saleitem_controller.rb similarity index 73% rename from app/controllers/reports/sale_items_controller.rb rename to app/controllers/reports/saleitem_controller.rb index 9001658c..0f91681d 100644 --- a/app/controllers/reports/sale_items_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -1,5 +1,5 @@ -class Reports::SaleItemsController < BaseReportController - authorize_resource :class => false +class Reports::SaleitemController < BaseReportController + authorize_resource :class => false def index from, to, report_type = get_date_range_from_params @@ -16,4 +16,4 @@ class Reports::SaleItemsController < BaseReportController end -end \ No newline at end of file +end diff --git a/app/helpers/reports/dailysale_helper.rb b/app/helpers/reports/dailysale_helper.rb new file mode 100644 index 00000000..88ccfd83 --- /dev/null +++ b/app/helpers/reports/dailysale_helper.rb @@ -0,0 +1,2 @@ +module Reports::DailysaleHelper +end diff --git a/app/helpers/reports/dailysales_helper.rb b/app/helpers/reports/dailysales_helper.rb deleted file mode 100644 index 94e34c27..00000000 --- a/app/helpers/reports/dailysales_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module Reports::DailysalesHelper -end diff --git a/app/helpers/reports/sale_items_helper.rb b/app/helpers/reports/sale_items_helper.rb deleted file mode 100644 index 63e884d7..00000000 --- a/app/helpers/reports/sale_items_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module Reports::SaleItemsHelper -end diff --git a/app/helpers/reports/saleitem_helper.rb b/app/helpers/reports/saleitem_helper.rb new file mode 100644 index 00000000..47544cf9 --- /dev/null +++ b/app/helpers/reports/saleitem_helper.rb @@ -0,0 +1,2 @@ +module Reports::SaleitemHelper +end diff --git a/app/models/ability.rb b/app/models/ability.rb index 10a289f1..2876c902 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -32,9 +32,6 @@ class Ability can :manage, Customer - can :index, :dailysale - can :index, :saleitem - can :add_customer, Customer can :update_sale_by_customer, Customer @@ -50,6 +47,10 @@ class Ability can :move_dining, :moveroom + can :index, :dailysale + can :index, :saleitem + can :index, :receipt_no + elsif user.role == "cashier" can :read, Order @@ -72,20 +73,21 @@ class Ability can :moving, :movetable can :move_dining, :moveroom - - can :index, :dailysale - can :index, :saleitem - elsif user.role == "accountant" can :index, :dailysale - can :index, :saleitem - can :index, :receiptno - can :show, :dailysale - can :show, :saleitem - can :show, :receiptno + can :manage, :saleitem + can :index, :receiptno + + elsif user.role == "supervisour" + + can :index, :dailysale + can :manage, :saleitem + can :index, :receiptno end + end + end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 24211081..4bf44234 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -38,8 +38,8 @@
    • -
    • <%= link_to "Daily Sale Report", reports_daily_sales_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Sales Item Report", reports_sale_items_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Daily Sale Report", reports_dailysale_index_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Sales Item Report", reports_saleitem_index_path, :tabindex =>"-1" %>
    • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
    • diff --git a/app/views/reports/daily_sales/_shift_sale_report_filter.html.erb b/app/views/reports/daily_sales/_shift_sale_report_filter.html.erb deleted file mode 100644 index 3a5d788c..00000000 --- a/app/views/reports/daily_sales/_shift_sale_report_filter.html.erb +++ /dev/null @@ -1,151 +0,0 @@ -
    -
    - <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> - <% if period_type != false %> -
    -
    - - -
    - - -
    - - - -
    -
    - - -
    -
    - -
    -
    - <% end %> - - - -
    -
    - <% if defined? promotions %> - <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> - <% end %> - - <% if defined? menu_types %> - <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> - <% end %> - - <% if defined? payments %> - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> - <% end %> - - <% if defined? shift_name %> - - <% end %> - - <% if defined? cashiers %> - <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> - <% end %> - - <% if defined? singer %> - <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> - <% end %> - - <% if defined? bsm %> - <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> - <% end %> - - <% if defined? guest_role %> - <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> - <% end %> - - <% if defined? list_by_payment_type %> - <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> - <% end %> - - <% if defined? products %> - <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> - <% end %> - - <% if defined? items %> - <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> - <% end %> -
    -
    - - - - <% end %> -
    -
    - - - - \ No newline at end of file diff --git a/app/views/reports/daily_sales/index.html.erb b/app/views/reports/daily_sales/index.html.erb deleted file mode 100644 index 7c2a8c61..00000000 --- a/app/views/reports/daily_sales/index.html.erb +++ /dev/null @@ -1,190 +0,0 @@ -
    -
      -
    • Home
      • -
    • Daily Sale Report
      • -
    -
    - -
    - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_daily_sales_path} %> -
    -
    - -
    -
    -
    - Export to Excel -
    -
    -
    - -
    -
    -
    - - - <% if params[:from]%> - - - - <% end %> - - - - - - - - - - - - - - - - - - - <% unless @sale_data.empty? %> - - - <% void = 0 %> - <% mpu = 0 %> - <% master = 0 %> - <% visa = 0 %> - <% jcb = 0 %> - <% paypar = 0 %> - <% cash = 0 %> - <% credit = 0 %> - <% foc = 0 %> - <% discount = 0 %> - <% total = 0 %> - <% grand_total = 0 %> - <% count = 1 %> <% rounding_adj = 0 %> - <% @sale_data.each do |sale| %> - <% void += sale[:void_amount] %> - <% mpu += sale[:mpu_amount] %> - <% master += sale[:master_amount] %> - <% visa += sale[:visa_amount] %> - <% jcb += sale[:jcb_amount] %> - <% paypar += sale[:paypar_amount] %> - <% cash += sale[:cash_amount] %> - <% credit += sale[:credit_amount] %> - <% foc += sale[:foc_amount] %> - <% discount += sale[:total_discount] %> - <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> - <% grand_total += sale[:grand_total].to_f %> - <% rounding_adj += sale[:rounding_adj].to_f %> - - - - - - - - - - - - - - - - - - <% count = count + 1 %> - <% end %> - - - - - - - - - - - - - - - - - - <% total_tax = 0 %> - <% unless @tax.empty? %> - <% @tax.each do |tax| %> - <% total_tax += tax.tax_amount.to_f %> - - - - - - - <% end %> - <% net = total - total_tax %> - - - - - - <% end %> - - <% end %> -
    Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
    Sr.noDateVoid AmountMpu SalesMaster SalesVisa SalesJcb SalesPaypar SalesCash SalesCredit SalesFOC Sales(Discount)Grand Total +
    Rounding Adj.    		Rounding Adj.Grand Total
    <%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
    Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
    <%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
    Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
    -
    -
    -
    - - - \ No newline at end of file diff --git a/app/views/reports/daily_sales/index.xls.erb b/app/views/reports/daily_sales/index.xls.erb deleted file mode 100644 index 67e76e3c..00000000 --- a/app/views/reports/daily_sales/index.xls.erb +++ /dev/null @@ -1,116 +0,0 @@ -
    -
    - - - <% if params[:from]%> - - - - <% end %> - - - - - - - - - - - - - - - - - - - <% unless @sale_data.empty? %> - - - <% void = 0 %> - <% mpu = 0 %> - <% master = 0 %> - <% visa = 0 %> - <% jcb = 0 %> - <% paypar = 0 %> - <% cash = 0 %> - <% credit = 0 %> - <% foc = 0 %> - <% discount = 0 %> - <% total = 0 %> - <% grand_total = 0 %> - <% count = 1 %> <% rounding_adj = 0 %> - <% @sale_data.each do |sale| %> - <% void += sale[:void_amount] %> - <% mpu += sale[:mpu_amount] %> - <% master += sale[:master_amount] %> - <% visa += sale[:visa_amount] %> - <% jcb += sale[:jcb_amount] %> - <% paypar += sale[:paypar_amount] %> - <% cash += sale[:cash_amount] %> - <% credit += sale[:credit_amount] %> - <% foc += sale[:foc_amount] %> - <% discount += sale[:total_discount] %> - <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> - <% grand_total += sale[:grand_total].to_f %> - <% rounding_adj += sale[:rounding_adj].to_f %> - - - - - - - - - - - - - - - - - - <% count = count + 1 %> - <% end %> - - - - - - - - - - - - - - - - - - <% total_tax = 0 %> - <% unless @tax.empty? %> - <% @tax.each do |tax| %> - <% total_tax += tax.tax_amount.to_f %> - - - - - - - <% end %> - <% net = total - total_tax %> - - - - - - <% end %> - - <% end %> -
    Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
    Sr.noDateVoid AmountMpu SalesMaster SalesVisa SalesJcb SalesPaypar SalesCash SalesCredit SalesFOC Sales(Discount)Grand Total +
    Rounding Adj.    		Rounding Adj.Grand Total
    <%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
    Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
    <%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
    Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
    -
    -
    \ No newline at end of file diff --git a/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb similarity index 100% rename from app/views/reports/daily_sale/_shift_sale_report_filter.html.erb rename to app/views/reports/dailysale/_shift_sale_report_filter.html.erb diff --git a/app/views/reports/daily_sale/index.html.erb b/app/views/reports/dailysale/index.html.erb similarity index 97% rename from app/views/reports/daily_sale/index.html.erb rename to app/views/reports/dailysale/index.html.erb index 7c2a8c61..e151878e 100644 --- a/app/views/reports/daily_sale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -7,14 +7,14 @@
    <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_daily_sales_path} %> + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
    - Export to Excel + Export to Excel
    diff --git a/app/views/reports/daily_sale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb similarity index 100% rename from app/views/reports/daily_sale/index.xls.erb rename to app/views/reports/dailysale/index.xls.erb diff --git a/app/views/reports/sale_items/_shift_sale_report_filter.html.erb b/app/views/reports/sale_items/_shift_sale_report_filter.html.erb deleted file mode 100644 index 7f95b6b9..00000000 --- a/app/views/reports/sale_items/_shift_sale_report_filter.html.erb +++ /dev/null @@ -1,156 +0,0 @@ -
    -
    - <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> - <% if period_type != false %> -
    -
    - - -
    - - -
    - - - -
    -
    - - -
    -
    - -
    -
    - <% end %> - - - -
    -
    - <% if defined? promotions %> - <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> - <% end %> - - <% if defined? menu_types %> - <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> - <% end %> - - <% if defined? payments %> - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> - <% end %> - - <% if defined? shift_name %> - - <% end %> - - <% if defined? cashiers %> - <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> - <% end %> - - <% if defined? singer %> - <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> - <% end %> - - <% if defined? bsm %> - <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> - <% end %> - - <% if defined? guest_role %> - <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> - <% end %> - - <% if defined? list_by_payment_type %> - <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> - <% end %> - - <% if defined? products %> - <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> - <% end %> - - <% if defined? items %> - <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> - <% end %> -
    -
    - - - - <% end %> -
    -
    - - - - \ No newline at end of file diff --git a/app/views/reports/sale_items/index.html.erb b/app/views/reports/sale_items/index.html.erb deleted file mode 100644 index a3b460fc..00000000 --- a/app/views/reports/sale_items/index.html.erb +++ /dev/null @@ -1,141 +0,0 @@ -
    -
      -
    • Home
      • -
    • Daily Sale Report
      • -
    -
    - -
    - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_sale_items_path} %> -
    -
    - -
    -
    -
    - Export to Excel -
    -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    Date
    Menu CategoryCodeProductTotal ItemUnit PriceRevenue
    -
    -
    -
    - - \ No newline at end of file diff --git a/app/views/reports/sale_items/index.xls.erb b/app/views/reports/sale_items/index.xls.erb deleted file mode 100644 index 2807ec3f..00000000 --- a/app/views/reports/sale_items/index.xls.erb +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - -
    -<% unless @sale_data.blank? %> - - - - - <% if !params[:from].blank?%> - - - - <% end %> - <% if @shift_from %> - - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - - - - - - - <% acc_arr = Array.new %> - <% cate_arr = Array.new %> - - <% sub_total = 0.0 %> - <% count = 0%> - <% total_price = 0.0 %> - <% cate_count = 0 %> - <% acc_count = 0%> - <% grand_total = 0%> - <% total_discount = 0.0 %> - - <% @sale_data.order("total_item desc").each do |sale| %> - - <% if !acc_arr.include?(sale.account_id) %> - - - - - - - <% acc_arr.push(sale.account_id) %> - - <% end %> - - - <% if !cate_arr.include?(sale.menu_category_id) %> - - <% cate_arr.push(sale.menu_category_id) %> - <% else %> - - <% end %> - - <% if @item_table == 'sale' %> - <% if sale.item_remark == 'FOC' %> - - <% elsif sale.item_remark == 'FOC ITEM' %> - - <% elsif sale.item_remark == 'DISCOUNT' %> - - <% else %> - - <% end %> - <% if sale.item_remark == 'DISCOUNT' %> - - - - <% total_price += sale.total_price %> - <% else %> - - - - <% end %> - <% else %> - - - - - <% end %> - - - - <% @menu_cate_count.each do |key,value| %> - <% if sale.menu_category_id == key %> - <% count = count + 1 %> - <% sub_total += sale.grand_total %> - <% if count == value %> - - - - - - <% sub_total = 0.0%> - <% total_discount = total_discount + total_price %> - <% total_price = 0.0%> - <% count = 0%> - <% end %> - <% end %> - <% end %> - - <% grand_total += sale.grand_total%> - <% end %> - - - - - - -
    From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
     Menu CategoryCodeProductTotal ItemUnit PriceRevenue
    <%= sale.account_name %> Total Price By <%= sale.account_name %> - <% @totalByAccount.each do |account, total| %> - <% if sale.account_id == account %> - <%= total %> - <% end %> - <% end %> -
     <%= sale.menu_category_name %> <%= sale.code rescue '-' %><%= '[PROMO] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:QTY] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:TP] '.to_s + sale.product_name.to_s rescue '-' %><%= sale.product_name.to_s rescue '-' %> - - <%= sale.total_price.abs rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %><%= sale.product_name.to_s rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %>
     Sub Total<%= sub_total + total_price %>
     Grand Total<%= grand_total + total_discount %>
    -<% end %> -
    - - \ No newline at end of file diff --git a/app/views/reports/sale_item/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb similarity index 100% rename from app/views/reports/sale_item/_shift_sale_report_filter.html.erb rename to app/views/reports/saleitem/_shift_sale_report_filter.html.erb diff --git a/app/views/reports/sale_item/index.html.erb b/app/views/reports/saleitem/index.html.erb similarity index 95% rename from app/views/reports/sale_item/index.html.erb rename to app/views/reports/saleitem/index.html.erb index a3b460fc..dd9fd1a5 100644 --- a/app/views/reports/sale_item/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -7,14 +7,14 @@
    <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_sale_items_path} %> + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_saleitem_index_path} %>
    - Export to Excel + Export to Excel
    diff --git a/app/views/reports/sale_item/index.xls.erb b/app/views/reports/saleitem/index.xls.erb similarity index 100% rename from app/views/reports/sale_item/index.xls.erb rename to app/views/reports/saleitem/index.xls.erb diff --git a/config/routes.rb b/config/routes.rb index cfaec2d0..ac43228c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -217,8 +217,8 @@ Rails.application.routes.draw do #--------- Reports Controller Sections ------------# namespace :reports do resources :receipt_no, :only => [:index, :show] - resources :daily_sales, :only => [:index, :show] - resources :sale_items, :only => [:index, :show] + resources :dailysale, :only => [:index, :show] + resources :saleitem, :only => [:index, :show] # resources :sales, :only => [:index, :show] # resources :orders, :only => [:index, :show] # resources :customers, :only => [:index, :show] diff --git a/spec/controllers/reports/dailysale_controller_spec.rb b/spec/controllers/reports/dailysale_controller_spec.rb new file mode 100644 index 00000000..b80d898e --- /dev/null +++ b/spec/controllers/reports/dailysale_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Reports::DailysaleController, type: :controller do + +end diff --git a/spec/controllers/reports/dailysales_controller_spec.rb b/spec/controllers/reports/dailysales_controller_spec.rb deleted file mode 100644 index 83fcb321..00000000 --- a/spec/controllers/reports/dailysales_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe Reports::DailysalesController, type: :controller do - -end diff --git a/spec/controllers/reports/sale_items_controller_spec.rb b/spec/controllers/reports/sale_items_controller_spec.rb deleted file mode 100644 index 546fc874..00000000 --- a/spec/controllers/reports/sale_items_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe Reports::SaleItemsController, type: :controller do - -end diff --git a/spec/controllers/reports/saleitem_controller_spec.rb b/spec/controllers/reports/saleitem_controller_spec.rb new file mode 100644 index 00000000..3e431a45 --- /dev/null +++ b/spec/controllers/reports/saleitem_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Reports::SaleitemController, type: :controller do + +end diff --git a/spec/helpers/reports/sale_items_helper_spec.rb b/spec/helpers/reports/dailysale_helper_spec.rb similarity index 69% rename from spec/helpers/reports/sale_items_helper_spec.rb rename to spec/helpers/reports/dailysale_helper_spec.rb index ea2807c4..2b1e1ddc 100644 --- a/spec/helpers/reports/sale_items_helper_spec.rb +++ b/spec/helpers/reports/dailysale_helper_spec.rb @@ -1,15 +1,15 @@ require 'rails_helper' # Specs in this file have access to a helper object that includes -# the Reports::SaleItemsHelper. For example: +# the Reports::DailysaleHelper. For example: # -# describe Reports::SaleItemsHelper do +# describe Reports::DailysaleHelper do # describe "string concat" do # it "concats two strings with spaces" do # expect(helper.concat_strings("this","that")).to eq("this that") # end # end # end -RSpec.describe Reports::SaleItemsHelper, type: :helper do +RSpec.describe Reports::DailysaleHelper, type: :helper do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/helpers/reports/dailysales_helper_spec.rb b/spec/helpers/reports/saleitem_helper_spec.rb similarity index 69% rename from spec/helpers/reports/dailysales_helper_spec.rb rename to spec/helpers/reports/saleitem_helper_spec.rb index 96853812..2c579f0e 100644 --- a/spec/helpers/reports/dailysales_helper_spec.rb +++ b/spec/helpers/reports/saleitem_helper_spec.rb @@ -1,15 +1,15 @@ require 'rails_helper' # Specs in this file have access to a helper object that includes -# the Reports::DailysalesHelper. For example: +# the Reports::SaleitemHelper. For example: # -# describe Reports::DailysalesHelper do +# describe Reports::SaleitemHelper do # describe "string concat" do # it "concats two strings with spaces" do # expect(helper.concat_strings("this","that")).to eq("this that") # end # end # end -RSpec.describe Reports::DailysalesHelper, type: :helper do +RSpec.describe Reports::SaleitemHelper, type: :helper do pending "add some examples to (or delete) #{__FILE__}" end