From 98bc14c83d7052dc55055f79917b2c0ede5b5a7b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 16 Oct 2017 18:27:57 +0630 Subject: [PATCH] update adminbsb for settins --- app/assets/javascripts/application.js | 2 +- app/assets/stylesheets/application.scss | 30 + app/views/origami/customers/index.html.erb | 570 +++++++++--------- app/views/print_settings/_form.html.erb | 54 +- app/views/print_settings/edit.html.erb | 21 +- app/views/print_settings/index.html.erb | 115 ++-- app/views/print_settings/new.html.erb | 20 +- app/views/print_settings/show.html.erb | 124 ++-- .../_commission_report_filter.html.erb | 8 +- app/views/reports/commission/index.html.erb | 16 +- .../_shift_sale_report_filter.html.erb | 12 +- app/views/reports/dailysale/index.html.erb | 18 +- .../_shift_sale_report_filter.html.erb | 17 +- app/views/reports/receipt_no/index.html.erb | 15 +- .../_shift_sale_report_filter.html.erb | 194 ------ .../reports/saleitem (copy)/index.html.erb | 141 ----- .../reports/saleitem (copy)/index.xls.erb | 104 ---- .../_shift_sale_report_filter.html.erb | 11 +- app/views/reports/saleitem/index.html.erb | 16 +- .../_shift_sale_report_filter.html.erb | 14 +- app/views/reports/shiftsale/index.html.erb | 15 +- app/views/reports/stock_check/index.html.erb | 17 +- .../_shift_sale_report_filter.html.erb | 14 +- app/views/reports/void_sale/index.html.erb | 16 +- app/views/settings/accounts/index.html.erb | 51 +- .../settings/cashier_terminals/edit.html.erb | 2 +- .../settings/cashier_terminals/index.html.erb | 64 +- .../settings/cashier_terminals/new.html.erb | 2 +- .../settings/commissioners/edit.html.erb | 2 +- .../settings/commissioners/index.html.erb | 63 +- app/views/settings/commissioners/new.html.erb | 2 +- .../settings/commissioners/show.html.erb | 19 +- .../settings/dining_charges/_form.html.erb | 2 +- .../settings/dining_charges/edit.html.erb | 19 +- .../settings/dining_charges/new.html.erb | 17 +- app/views/settings/employees/edit.html.erb | 2 +- app/views/settings/employees/index.html.erb | 77 ++- app/views/settings/employees/new.html.erb | 2 +- app/views/settings/employees/show.html.erb | 2 +- app/views/settings/item_sets/edit.html.erb | 2 +- app/views/settings/item_sets/index.html.erb | 49 +- app/views/settings/item_sets/new.html.erb | 2 +- app/views/settings/lookups/edit.html.erb | 2 +- app/views/settings/lookups/index.html.erb | 13 +- app/views/settings/lookups/new.html.erb | 2 +- .../membership_actions/_form.html.erb | 43 +- .../settings/membership_actions/edit.html.erb | 15 +- .../membership_actions/index.html.erb | 86 +-- .../settings/membership_actions/new.html.erb | 14 +- .../settings/membership_actions/show.html.erb | 19 +- .../membership_settings/_form.html.erb | 47 +- .../membership_settings/edit.html.erb | 20 +- .../membership_settings/index.html.erb | 67 +- .../settings/membership_settings/new.html.erb | 20 +- .../settings/menu_categories/new.html.erb | 20 +- app/views/settings/menus/show.html.erb | 2 +- .../order_queue_stations/edit.html.erb | 2 +- .../order_queue_stations/index.html.erb | 2 +- .../order_queue_stations/new.html.erb | 2 +- .../order_queue_stations/show.html.erb | 2 +- .../payment_method_settings/_form.html.erb | 43 +- .../payment_method_settings/edit.html.erb | 21 +- .../payment_method_settings/index.html.erb | 93 +-- .../payment_method_settings/new.html.erb | 20 +- .../settings/processing_items/new.html.erb | 2 +- app/views/settings/products/edit.html.erb | 2 +- app/views/settings/products/index.html.erb | 8 +- app/views/settings/products/new.html.erb | 2 +- app/views/settings/products/show.html.erb | 2 +- .../settings/promotion_products/show.html.erb | 2 +- app/views/settings/rooms/edit.html.erb | 2 +- app/views/settings/rooms/new.html.erb | 2 +- app/views/settings/rooms/show.html.erb | 4 +- .../settings/set_menu_items/index.html.erb | 2 +- app/views/settings/tables/edit.html.erb | 2 +- app/views/settings/tables/show.html.erb | 4 +- app/views/settings/zones/new.html.erb | 2 +- app/views/transactions/sales/show.html.erb | 35 +- 78 files changed, 1171 insertions(+), 1398 deletions(-) delete mode 100644 app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb delete mode 100644 app/views/reports/saleitem (copy)/index.html.erb delete mode 100644 app/views/reports/saleitem (copy)/index.xls.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 84958b8d..e355c13c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -75,7 +75,7 @@ $(function(){ }); $('#order-detail-slimscroll').slimScroll({ - height: height-160, + height: height-180, size: '5px', color: 'rgba(0,0,0,0.5)', alwaysVisible: false, diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 62af91af..fd495ffe 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -380,6 +380,36 @@ tr.discount-item-row:hover { .required abbr{ color: red !important; } + +#sxModal { + display: none; + overflow: auto; + width: 100%; + height: 100%; + background-color: #000; + background-color: rgba(0,0,0,0.4); + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1100; +} + +#sxModal-Content { + position: relative; + left: 42%; + top: 30%; + background-color: #d9534f; + color: #fff; + text-align: center; + width: 200px; + height: 200px; + padding-top: 5%; + border-radius: 100px; + z-index: 1101; +} + /*Loading gif for payment*/ #loading_wrapper{ diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 84b78f4a..be2f7ef7 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -1,27 +1,27 @@
-
-
    -
  • Home
    • -
  • CRM
    • - - - <%= link_to 'Back', dashboard_path %> - -
-
+
+
    +
  • Home
    • +
  • CRM
    • + + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
- +
+
+
- + - - + + <% end %> + + @@ -68,28 +66,28 @@ <% if @crm_customers.count > 0 %> <% @i = 0 %> - <% @crm_customers.each do |crm_customer| %> - - - - - - - - - + <% @crm_customers.each do |crm_customer| %> - + + + + + + + + + + + <% end %> <%else%> - + <% end %>
+
- - - - - -
- -
- - - + + + + + +
+
- <% end %> + + + -
Select
- - <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> - <%= @i += 1 %> - <%else%> - - - <% end %> - <%= crm_customer.name %><%= crm_customer.company rescue '-' %><%= crm_customer.contact_no %><%= crm_customer.email %>
+ + <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <%= @i += 1 %> + <%else%> + - <% end %> + <%= crm_customer.name %><%= crm_customer.company rescue '-' %><%= crm_customer.contact_no %><%= crm_customer.email %>

There are no record for your search

There are no record for your search
@@ -99,22 +97,22 @@
-
+
- -
-
- <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> + +
+
+ <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> - - - - - <%= f.error_notification %> - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> -
-
- + + + + + <%= f.error_notification %> + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> +
+
+ <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%> @@ -122,139 +120,139 @@ <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%> -
- -
"> - <%= f.input :name, :class => "form-control col-md-6 name", :required => true %> - - <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
+
-
-
- - <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%> +
"> + <%= f.input :name, :class => "form-control col-md-6 name", :required => true %> + + <% flash.each do |name, msg| %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
+ +
+
+ + <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%> <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%> -
- -
- <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %> -
-
- <%= f.input :company, :class => "form-control col-md-6 company"%> - - <% flash.each do |name, msg| %> - <% str="[\"#{msg['company']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
-
"> - <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%> - - <% flash.each do |name, msg| %> - <% str="[\"#{msg['contact_no']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
- -
"> - <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['contact_no']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
- -
- <%= f.input :address, :class => "form-control col-md-6 address" %> -
- -
- - -
-
- - <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> -
- -
- - -
- -
- <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> -
- -
"> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
-
- -
- -
+ +
+ <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %> +
+
+ <%= f.input :company, :class => "form-control col-md-6 company"%> + + <% flash.each do |name, msg| %> + <% str="[\"#{msg['company']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
+
"> + <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%> + + <% flash.each do |name, msg| %> + <% str="[\"#{msg['contact_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
+ +
"> + <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['contact_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
+ +
+ <%= f.input :address, :class => "form-control col-md-6 address" %> +
+ +
+ + +
+
+ + <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> +
+ +
+ + +
+ +
+ <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> +
+ +
"> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
+
+ +
+ +
+
+
+ +
+ + +
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect', :id => 'submit_customer' %> + +
+
+ <%end%>
-
- - -
- -
- <%= f.button :submit, "Submit",:class => 'btn bg-blue waves-effect', :id => 'submit_customer' %> - -
- <%end%> + +
+

Card Tap

+
- -
- -
-

Card Tap

-
-
- diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index 31489bc6..baf945bc 100644 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -1,23 +1,37 @@ -<%= simple_form_for(@print_setting) do |f| %> - <%= f.error_notification %> -
- <%= f.input :name %> - <%= f.input :unique_code %> - <%= f.input :template %> - <%= f.input :printer_name %> - <%= f.input :font %> - <%= f.input :api_settings %> - <%= f.input :page_width %> - <%= f.input :page_height %> - <%= f.input :print_copies %> - <%= f.input :precision %> - <%= f.input :delimiter %> - <%= f.input :heading_space %> -
+
+
+ <%= simple_form_for(@print_setting) do |f| %> + <%= f.error_notification %> -
- <%= f.button :submit %> - <%= link_to 'Back', print_settings_path, :class => "btn btn-default" %> +
+ <%= f.input :name %> + <%= f.input :unique_code %> + <%= f.input :template %> + <%= f.input :font %> + <%= f.input :printer_name %> + <%= f.input :api_settings %> + <%= f.input :page_width %> + <%= f.input :page_height %> + <%= f.input :print_copies %> + <%= f.input :precision %> + <%= f.input :delimiter %> + <%= f.input :heading_space %> +
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %>
-<% end %> +
+
+
+ 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 +
+
+
+
\ No newline at end of file diff --git a/app/views/print_settings/edit.html.erb b/app/views/print_settings/edit.html.erb index 362dce39..6d4f0ded 100644 --- a/app/views/print_settings/edit.html.erb +++ b/app/views/print_settings/edit.html.erb @@ -1,13 +1,14 @@ -
-
- -
- <%= render 'form', print_setting: @print_setting %> -
+
+
    +
  1. Home
    2. +
  2. Print Setting
    3. +
  3. Edit
    4. + + <%= link_to t('.new', :default => t("views.btn.new")), print_settings_path %> + +
+<%= render 'form', print_setting: @print_setting %> + diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index 6379e45c..1f00826b 100644 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -1,54 +1,73 @@

<%= notice %>

+
-
    -
  • Home
    • -
  • Print Settings
    • - - <%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-sm' %> - -
+
    +
  1. Home
    2. +
  2. Print Settings
    3. + + <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + +
- -
-
- - - - - - - - - - - - - - - - - - - - - <% @print_settings.each do |print_setting| %> +
+
+
+ <%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
+
+
NameUnique codeTemplatePrinter nameFontApi settingsPage widthPage heightPrint copiesPrecisionDelimiterHeading_spaceAction
+ - - - - - - - - - - - - - - + + + + + + + + + + + + + - <% end %> - -
<%= print_setting.name %><%= print_setting.unique_code %><%= print_setting.template %><%= print_setting.printer_name %><%= print_setting.font %><%= print_setting.api_settings %><%= print_setting.page_width %><%= print_setting.page_height %><%= print_setting.print_copies %><%= print_setting.precision %><%= print_setting.delimiter %><%= print_setting.heading_space %><%= link_to t("views.btn.show"), print_setting %> | <%= link_to t("views.btn.edit"), edit_print_setting_path(print_setting) %>NameUnique codePrinter nameFontPage widthPage heightPrint copiesPrecisionDelimiterHeading_spaceAction
+ + + + <% @print_settings.each do |print_setting| %> + + <%= print_setting.name %> + <%= print_setting.unique_code %> + + <%= print_setting.printer_name %> + <%= print_setting.font rescue '-' %> + + <%= print_setting.page_width %> + <%= print_setting.page_height %> + <%= print_setting.print_copies %> + <%= print_setting.precision %> + <%= print_setting.delimiter %> + <%= print_setting.heading_space %> + + <%= link_to t("views.btn.show"), print_setting,:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_print_setting_path(print_setting),:class => 'btn btn-info btn-sm waves-effect' %> + + + <% end %> + + +
+
+
+
+
+ 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 +
+
+
+ diff --git a/app/views/print_settings/new.html.erb b/app/views/print_settings/new.html.erb index 2521a16b..fb2ab925 100644 --- a/app/views/print_settings/new.html.erb +++ b/app/views/print_settings/new.html.erb @@ -1,15 +1,15 @@ -
-
- -
- <%= render 'form', print_setting: @print_setting %> -
+
+
    +
  1. Home
    2. +
  2. Print Setting
    3. +
  3. New
    4. + + <%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %> + +
+<%= render 'form', print_setting: @print_setting %> diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index 124a3d94..9f91b01e 100644 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -1,66 +1,74 @@ -
-
    -
  • Home
    • -
  • Print Setting
    • - - -
  • - <%= link_to t("views.btn.edit"), edit_print_setting_path(@print_setting) %> | -<%= link_to 'Back', print_settings_path %> -
    • - -     -
+
    +
  1. Home
    2. +
  2. Print Setting
    3. +
  3. Details
    4. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> + +
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name<%= @print_setting.name %>
Unique code<%= @print_setting.unique_code %>
Template<%= @print_setting.template %>
Printer name<%= @print_setting.printer_name %>
Font<%= @print_setting.font %>
Api settings<%= @print_setting.api_settings %>
Page width<%= @print_setting.page_width %>
Page height<%= @print_setting.page_height %>
Print copies<%= @print_setting.print_copies %>
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name<%= @print_setting.name %>
Unique code<%= @print_setting.unique_code %>
Template<%= @print_setting.template %>
Printer name<%= @print_setting.printer_name %>
Font<%= @print_setting.font rescue '-' %>
Api settings<%= @print_setting.api_settings %>
Page width<%= @print_setting.page_width %>
Page height<%= @print_setting.page_height %>
Print copies<%= @print_setting.print_copies %>
+
+
+ +
+
+
+
+ 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 +
+
-
- diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb index 49eb1ea5..b5791993 100644 --- a/app/views/reports/commission/_commission_report_filter.html.erb +++ b/app/views/reports/commission/_commission_report_filter.html.erb @@ -3,7 +3,7 @@ <% if period_type != false %>
-
+
<% if @daterange %> @@ -11,7 +11,7 @@ <% end %>
-
+
-
+
-
+
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb index f20895d8..31e333f7 100644 --- a/app/views/reports/commission/index.html.erb +++ b/app/views/reports/commission/index.html.erb @@ -1,12 +1,14 @@ +
+
    +
  1. Home
    2. +
  2. Commission Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
    -
  • Home
    • -
  • Commission Report
    • -
-
- <%= render :partial => 'commission_report_filter', :locals => {:period_type => true, :shift_name => true, :report_path => reports_commission_index_path} %> diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb index 0208090f..1e26d28f 100644 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -2,7 +2,7 @@ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <% if period_type != false %>
-
+
-
+
- +
-
+
- +
-
+
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 25313435..c9adbe47 100644 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -1,13 +1,15 @@ + +
+
    +
  1. Home
    2. +
  2. Daily Sale Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
-
    -
  • Home
    • -
  • Daily Sale Report
    • -
-
-
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb index 30b58810..c11f98c7 100644 --- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -1,7 +1,7 @@ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <% if period_type != false %>
-
+
<% if defined? payments %> -
+
<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>
<% end %> -
+
- +
-
+
- +
-
+
-
+
+
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index e847316e..51b66b2d 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,11 +1,14 @@ +
+
    +
  1. Home
    2. +
  2. Recript No Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
    -
  • Home
    • -
  • Receipt List Report
    • -
-
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb deleted file mode 100644 index c57c8be9..00000000 --- a/app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb +++ /dev/null @@ -1,194 +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/saleitem (copy)/index.html.erb b/app/views/reports/saleitem (copy)/index.html.erb deleted file mode 100644 index b6482271..00000000 --- a/app/views/reports/saleitem (copy)/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_saleitem_index_path} %> -
-
- -
-
-
- Export to Excel -
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - -
Date
Menu CategoryCodeProductTotal ItemUnit PriceRevenue
-
-
-
- - \ No newline at end of file diff --git a/app/views/reports/saleitem (copy)/index.xls.erb b/app/views/reports/saleitem (copy)/index.xls.erb deleted file mode 100644 index 3773619b..00000000 --- a/app/views/reports/saleitem (copy)/index.xls.erb +++ /dev/null @@ -1,104 +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 !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 %> - - - - - - <% 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.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 '-' %>
 Grand Total<%= grand_total + total_discount %>
-<% end %> -
- - \ No newline at end of file diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb index 4cb14556..5436a82e 100644 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -2,7 +2,7 @@ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <% if period_type != false %>
-
+
--> -
+
-
+
-
+
-
+
+
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 06f2af00..ced2cc17 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -1,12 +1,14 @@ +
+
    +
  1. Home
    2. +
  2. Sale Item Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
- -
    -
  • Home
    • -
  • Sale Item Report
    • -
-
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb index 5e5ae1bb..e83183ba 100644 --- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb @@ -2,7 +2,7 @@ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <% if period_type != false %>
-
+
-
+
- +
-
+
- +
-
+
-
+

diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 8e23170a..8a3f4339 100644 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -1,11 +1,14 @@ +
+
    +
  1. Home
    2. +
  2. Shift Sale Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
    -
  • Home
    • -
  • Shift Sale Report
    • -
-
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb index 4d5c4335..4de80a59 100644 --- a/app/views/reports/stock_check/index.html.erb +++ b/app/views/reports/stock_check/index.html.erb @@ -1,12 +1,15 @@ +
+
    +
  1. Home
    2. +
  2. Stock Check Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
    -
  • Home
    • -
  • Stock Check Report
    • -
-
- + <%= render :partial => 'stock_check_report_filter', :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %> diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb index 3c03a537..f9801429 100644 --- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb @@ -2,7 +2,7 @@ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <% if period_type != false %>
-
+
-
+
- +
-
+
- +
-
+
-
+
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 5f2557cc..61982279 100644 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -1,12 +1,14 @@ +
+
    +
  1. Home
    2. +
  2. Void Sale Report
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
-
-
    -
  • Home
    • -
  • Void Sale Report
    • -
-
- <%= render :partial=>'shift_sale_report_filter', :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %> diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index fb48d00f..6bc26d99 100644 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -4,17 +4,16 @@
  • Home
  • Account
    • - <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %> - - -
    -
    - <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + +
    -
    +
    + <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
    @@ -32,33 +31,33 @@ <% @settings_accounts.each do |account| %> - - - - - - - - + + + + + + + - + + <% end %>
    <%= account.title %><%= %><%= account.account_type == 1 ? "Expense" : "Income"%><%= account.discount %><%= account.point %><%= account.bonus %><%= account.rebate %> - <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to t("views.btn.delete"), settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> +
    <%= account.title %><%= %><%= account.account_type == 1 ? "Expense" : "Income"%><%= account.discount %><%= account.point %><%= account.bonus %><%= account.rebate %> + <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> -
    -
    +
    - 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 - cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non - proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + 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 + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    diff --git a/app/views/settings/cashier_terminals/edit.html.erb b/app/views/settings/cashier_terminals/edit.html.erb index f2ebf3ce..5189a560 100644 --- a/app/views/settings/cashier_terminals/edit.html.erb +++ b/app/views/settings/cashier_terminals/edit.html.erb @@ -4,7 +4,7 @@
  • Terminals
  • Edit
    • - <%= link_to t('.new', :default => t("views.btn.new")), settings_cashier_terminals_path %> + <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %>
    diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index 224157ba..fa170229 100644 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -3,35 +3,33 @@
  • Home
  • Cashier Terminal
    • - <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %> + <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
    -
    -
    - <%= link_to t("views.btn.new"),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> -
    -
    +
    + <%= link_to t("views.btn.new"),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
    - - - - - - - - - - - - - - +
    NameActiveLogin?Auto printPrinter nameShow taxShow cashierShow guest infoAction
    + + + + + + + + + + + + + - - <% @settings_cashier_terminals.each do |settings_cashier_terminal| %> + + <% @settings_cashier_terminals.each do |settings_cashier_terminal| %> @@ -43,19 +41,19 @@ - - <% end %> - -
    NameActiveLogin?Auto printPrinter nameShow taxShow cashierShow guest infoAction
    <%= settings_cashier_terminal.name %> <%= settings_cashier_terminal.is_active %><%= settings_cashier_terminal.show_guest_info %> <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-lg waves-effect' %> <%= link_to t("views.btn.delete"), settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
    -
    -
    -
    + + <% end %> + + +
    +
    +
    - 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 + 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
    diff --git a/app/views/settings/cashier_terminals/new.html.erb b/app/views/settings/cashier_terminals/new.html.erb index 984dd185..cdd9635e 100644 --- a/app/views/settings/cashier_terminals/new.html.erb +++ b/app/views/settings/cashier_terminals/new.html.erb @@ -4,7 +4,7 @@
  • Cashier Terminals
  • New
    • - <%= link_to t('.new', :default => t("views.btn.new")), settings_cashier_terminals_path %> + <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %>
    diff --git a/app/views/settings/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb index 1fa688f3..b5da1ebe 100644 --- a/app/views/settings/commissioners/edit.html.erb +++ b/app/views/settings/commissioners/edit.html.erb @@ -15,7 +15,7 @@
  • Commissioner
  • Edit
    • - <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %> + <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %>
    diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index ac3891a1..eae016c7 100644 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -3,34 +3,31 @@
  • Home
  • Commissioner
    • - <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %> + <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
    -
    -
    - <%= link_to t("views.btn.new"),new_settings_commissioner_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> -
    - -
    +
    + <%= link_to t("views.btn.new"),new_settings_commissioner_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
    - - - - - - - - - - - - +
    NameEmployee NameCommission typeJoined DateResigned DateActive
    + + + + + + + + + + + - - <% @commissioners.each do |commissioner| %> + + <% @commissioners.each do |commissioner| %> - - - + - <% end %> - -
    NameEmployee NameCommission typeJoined DateResigned DateActive
    <%= commissioner.name %> @@ -40,22 +37,22 @@ <%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %> <%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %> <%= commissioner.is_active %><%= link_to t("views.btn.show"), settings_commissioner_path(commissioner),:class => 'btn btn-info btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-lg waves-effect' %><%= link_to t("views.btn.delete"), settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'},:class => 'btn btn-danger btn-lg waves-effect' %><%= link_to t("views.btn.show"), settings_commissioner_path(commissioner),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'},:class => 'btn btn-danger btn-sm waves-effect' %>
    -
    + <% end %> + + +
    -
    +
    - 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 + 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
    diff --git a/app/views/settings/commissioners/new.html.erb b/app/views/settings/commissioners/new.html.erb index ee973758..bc50bdac 100644 --- a/app/views/settings/commissioners/new.html.erb +++ b/app/views/settings/commissioners/new.html.erb @@ -4,7 +4,7 @@
  • Commissioner
  • New
    • - <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %> + <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %>
    diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index bad10952..05db222d 100644 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -1,11 +1,12 @@
    - +
      +
    1. Home
      2. +
    2. Commissioner
      3. +
    3. Details
      4. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> + +
    @@ -56,9 +57,7 @@ - <%= link_to t('.new', :default => t("views.btn.new")), settings_commissioners_path, class: 'btn btn-success' %> - <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %> - <%= link_to t("views.btn.delete"), settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %> +
    diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index 0138a774..db793f8c 100644 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -14,7 +14,7 @@
    - <%= f.button :submit %> + <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
    <% end %> diff --git a/app/views/settings/dining_charges/edit.html.erb b/app/views/settings/dining_charges/edit.html.erb index 1b0eb406..12316e27 100644 --- a/app/views/settings/dining_charges/edit.html.erb +++ b/app/views/settings/dining_charges/edit.html.erb @@ -2,7 +2,7 @@ <%= render 'form', dining_charge: @dining_charge %>--> -
    + + +
    +
      +
    1. Home
      2. + <% if @table %> +
    2. Table / Room
      3. + <% elsif @room %> +
    3. Table / Room
      4. + <% end %> +
    4. New
      5. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %> + +
    + +<%= render 'form', dining_charge: @dining_charge %> \ No newline at end of file diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb index bece2a2e..ab7009c7 100644 --- a/app/views/settings/dining_charges/new.html.erb +++ b/app/views/settings/dining_charges/new.html.erb @@ -1,7 +1,7 @@ -
    + +
    +
      +
    1. Home
      2. + <% if @table %> +
    2. Table / Room
      3. + <% elsif @room %> +
    3. Table / Room
      4. + <% end %> +
    4. New
      5. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %> + +
    +<%= render 'form', dining_charge: @dining_charge %>