diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 26e6c151..6d8092cc 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -24,7 +24,9 @@ $(document).ready(function() { }); $('#order-detail-slimscroll').slimScroll({ - height: height-$('#order-detail-slimscroll').attr('data-height'), + // height: '250px', + height: $('#order-detail-slimscroll').attr('data-height'), + // height: height-$('#order-detail-slimscroll').attr('data-height'), size: '5px', color: 'rgba(0,0,0,0.5)', alwaysVisible: false, diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss new file mode 100644 index 00000000..e1d36dce --- /dev/null +++ b/app/assets/stylesheets/custom.scss @@ -0,0 +1,14 @@ +.home.card { + height: 100%; +} + +#order-detail-slimscroll { + display: block; +} + +.pending-order.card-footer, .home.card-footer, .credit_sale.card-footer .inventory.card-footer{ + width: 100%; + vertical-align: bottom; + position: absolute; + bottom: 0; +} diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 64cc2937..b971b6dd 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -11,6 +11,7 @@ @import "BSBMaterial/themes/all-themes"; @import "reset"; @import "fileinput.min"; +@import "custom"; /* Reset */ diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb index 0a6f7cbb..5fe7fc4a 100644 --- a/app/controllers/transactions/bookings_controller.rb +++ b/app/controllers/transactions/bookings_controller.rb @@ -23,6 +23,7 @@ class Transactions::BookingsController < ApplicationController @receipt_no = filter @from = from @to = to + @food_court = Lookup.find_by_lookup_type_and_value("food_court", "1") respond_to do |format| format.html # index.html.erb format.json { render json: @bookings } diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index 5d41439c..4a3ab0ef 100755 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -21,8 +21,9 @@ class Transactions::OrdersController < ApplicationController end @receipt_no = filter - @from = from - @to = to + @from = from + @to = to + @food_court = Lookup.find_by_lookup_type_and_value("food_court", "1") respond_to do |format| format.html diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index 98b420ff..7e69ac4b 100755 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -35,6 +35,7 @@ class Transactions::SalesController < ApplicationController @receipt_no = receipt_no @from = from @to = to + @food_court = Lookup.find_by_lookup_type_and_value("food_court", "1") if @shift.present? @shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb new file mode 100644 index 00000000..91ee1ac3 --- /dev/null +++ b/app/helpers/breadcrumb_helper.rb @@ -0,0 +1,21 @@ +module BreadcrumbHelper + + def ensure_breadcrumb + @breadcrumb ||= [ { :title => t("views.right_panel.button.home"), :url => dashboard_path } ] + end + + def back + @back ||= [] + end + + def breadcrumb_add(title, url, back_url, act_name = nil) + ensure_breadcrumb << { :title => title, :url => url } + ensure_breadcrumb << { :title => act_name, :url => '' } if act_name.present? + + back << {url: back_url} if back_url.present? + end + + def render_breadcrumb + render :partial => 'shared/breadcrumb', :locals => { :nav => ensure_breadcrumb, :back => back } + end +end \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index 29e93341..4f007b88 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -109,6 +109,9 @@ class Customer < ApplicationRecord }, :timeout => 10 ) + + rescue Errno::ECONNREFUSED + response = {status: false, message: "Can't open membership server " } rescue HTTParty::Error response = {status: false, message: "Can't open membership server " } diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb index d30af42d..5d7cce22 100755 --- a/app/models/printer/printer_worker.rb +++ b/app/models/printer/printer_worker.rb @@ -42,17 +42,17 @@ class Printer::PrinterWorker end def print(file_path, printer_destination = nil ) - if printer_destination.nil? - printer_destination = self.printer_destination - end + # if printer_destination.nil? + # printer_destination = self.printer_destination + # end - copy = self.print_copies - #Print only when printer information is not null - if !self.printer_destination.nil? - (1..copy).each do - page = Cups::PrintJob.new(file_path, printer_destination) - page.print - end - end + # copy = self.print_copies + # #Print only when printer information is not null + # if !self.printer_destination.nil? + # (1..copy).each do + # page = Cups::PrintJob.new(file_path, printer_destination) + # page.print + # end + # end end end diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 646cd06a..d881b73f 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -1,14 +1,4 @@ -
-
- -
+<% breadcrumb_add 'CRM', "", dashboard_path %>
@@ -65,7 +55,7 @@ <%= @customer.date_of_birth rescue '-'%> <% if @customer.membership_type.to_f > 0%> <%lookup= Lookup.find_by_value(@customer.membership_type) %> - <%= lookup.name %> + <%= lookup.try(:name) %> <%else%> - diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb index 7c50a06d..fe7c913c 100755 --- a/app/views/crm/dining_queues/_form.html.erb +++ b/app/views/crm/dining_queues/_form.html.erb @@ -1,3 +1,5 @@ +<% breadcrumb_add t('queue'), crm_dining_queues_path, crm_dining_queues_path, t("views.btn.#{action_name}") %> +
diff --git a/app/views/crm/dining_queues/assign.html.erb b/app/views/crm/dining_queues/assign.html.erb index a6e6c20a..7c78ecc8 100755 --- a/app/views/crm/dining_queues/assign.html.erb +++ b/app/views/crm/dining_queues/assign.html.erb @@ -1,15 +1,6 @@
-
-
    -
  • Home
    • -
  • Queue
    • -
  • Assign Queue <%=@queue.queue_no%>
    • - - <%= link_to 'Back', dashboard_path %> - -
-
-
+<% breadcrumb_add 'Queue', crm_dining_queues_path, dashboard_path, "Assign Queue #{@queue.queue_no}" %> +
diff --git a/app/views/crm/dining_queues/edit.html.erb b/app/views/crm/dining_queues/edit.html.erb index bf0c3b10..0632425a 100755 --- a/app/views/crm/dining_queues/edit.html.erb +++ b/app/views/crm/dining_queues/edit.html.erb @@ -1,11 +1,3 @@ -
-
- -
<%= render 'form', dining_queue: @dining_queue %>
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index a935cf38..85450b84 100755 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -1,13 +1,4 @@ -
-
- -
+<% breadcrumb_add t('queue'), "", dashboard_path %>
diff --git a/app/views/crm/dining_queues/new.html.erb b/app/views/crm/dining_queues/new.html.erb index 19a12c5b..e6aa5698 100755 --- a/app/views/crm/dining_queues/new.html.erb +++ b/app/views/crm/dining_queues/new.html.erb @@ -1,15 +1,3 @@
-
- -
- - <%= render 'form', dining_queue: @dining_queue %> - + <%= render 'form', dining_queue: @dining_queue %>
\ No newline at end of file diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb index 06396dba..3b765c89 100755 --- a/app/views/inventory/inventory/index.html.erb +++ b/app/views/inventory/inventory/index.html.erb @@ -1,12 +1,4 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t :inventory %>
    3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
-
+<% breadcrumb_add t('inventory'), "", dashboard_path %>
diff --git a/app/views/inventory/inventory/show.html.erb b/app/views/inventory/inventory/show.html.erb index a08110e8..a570277c 100644 --- a/app/views/inventory/inventory/show.html.erb +++ b/app/views/inventory/inventory/show.html.erb @@ -1,13 +1,4 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t :inventory %>
    3. - - <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %> - -
-
- +<% breadcrumb_add t('inventory'), '', inventory_path %>
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index 66497616..ada37e7b 100644 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -79,7 +79,7 @@
-
+
@@ -96,7 +96,7 @@
-
+
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb index b66d74c4..2ab89ba4 100644 --- a/app/views/inventory/stock_checks/index.html.erb +++ b/app/views/inventory/stock_checks/index.html.erb @@ -37,7 +37,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb index 25a17752..7d45f0ba 100755 --- a/app/views/layouts/CRM.html.erb +++ b/app/views/layouts/CRM.html.erb @@ -65,6 +65,7 @@ <% end %> <% end %> <% end %> + <%= render_breadcrumb %> <%= yield %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d31559fa..4a0a3e7c 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -63,6 +63,7 @@ data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >

<% end %> + <%= render_breadcrumb %> <%= yield %> diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb index fe49647e..28dc00f6 100755 --- a/app/views/layouts/inventory.html.erb +++ b/app/views/layouts/inventory.html.erb @@ -51,7 +51,9 @@
<% end %> - <% end %> + <% end %> + <%= render_breadcrumb %> + <%= yield %> diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index cf82739e..2a683c25 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -4,7 +4,7 @@ <% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%> <% modify_order = request.path_info.include?('modify_order')%> -
+
@@ -14,7 +14,7 @@ -
+
-
+
diff --git a/app/views/origami/credit_sales/show.html.erb b/app/views/origami/credit_sales/show.html.erb index c286fb65..963dc864 100755 --- a/app/views/origami/credit_sales/show.html.erb +++ b/app/views/origami/credit_sales/show.html.erb @@ -1,5 +1,5 @@ -
+
@@ -198,7 +198,7 @@
-
+
SALE DETAILS
@@ -218,7 +218,7 @@
-
+
@@ -248,7 +248,7 @@
-
+
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index dedfc728..f6f5373d 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -196,7 +196,7 @@
-
+
<% existing_class = "" %><% existing_order = false %> <% if @status_sale == 'sale' unless @order_items.nil? || @order_items.empty?%> @@ -276,7 +276,7 @@
-
"> +
">
Sub Total:
@@ -346,7 +346,7 @@
-
+
@@ -377,7 +377,7 @@ <% else %> No Tax - <% end %>
+ <% end %> <%if !@webview && @changable_tax %> <% if @current_user.role == 'cashier' %> diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 346db018..44a05fcb 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -1,11 +1,11 @@ -
+
-
+
@@ -49,7 +49,7 @@
Sub Total:
-
+
@@ -77,7 +77,7 @@
- + @@ -153,7 +153,7 @@
-
+
Amount Due <% if !@sale_payment.nil? %>( Credit )<% end %>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb index 73ee0040..118b2998 100644 --- a/app/views/origami/pending_order/show.html.erb +++ b/app/views/origami/pending_order/show.html.erb @@ -90,7 +90,7 @@
-
+
INVOICE DETAILS | Table <%= @dining.name rescue "" %>
@@ -131,7 +131,7 @@
-
+
Sub Total <%=number_format(sub_total, precision: precision.to_i)%>
@@ -172,7 +172,7 @@
-
+
<% if @status == 'sale' %> diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index 81e5802e..546184c8 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -1,3 +1,4 @@ +<% breadcrumb_add t("views.right_panel.header.print_settings"), print_settings_path, print_settings_path, t("views.btn.#{action_name}") %>
diff --git a/app/views/print_settings/edit.html.erb b/app/views/print_settings/edit.html.erb index c115917d..b5ba644a 100755 --- a/app/views/print_settings/edit.html.erb +++ b/app/views/print_settings/edit.html.erb @@ -1,14 +1,3 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.print_settings") %>
    3. -
  3. <%= t("views.btn.edit") %>
    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/index.html.erb b/app/views/print_settings/index.html.erb index 70ce02ef..694832ae 100755 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -1,14 +1,7 @@

<%= notice %>

-
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.print_settings") %>
    3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.header.print_settings"), "", dashboard_path %> +
diff --git a/app/views/print_settings/new.html.erb b/app/views/print_settings/new.html.erb index 01c75785..bd8bfacb 100755 --- a/app/views/print_settings/new.html.erb +++ b/app/views/print_settings/new.html.erb @@ -1,14 +1,3 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.print_settings") %>
    3. -
  3. <%= t("views.btn.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 0278cfd2..9bb8cda3 100755 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -1,13 +1,4 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.print_settings") %>
    3. -
  3. <%= t :details %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %> - -
-
+<% breadcrumb_add t("views.right_panel.header.print_settings"), print_settings_path, print_settings_path, t('details') %>
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb index 693951e0..9c357659 100755 --- a/app/views/reports/commission/index.html.erb +++ b/app/views/reports/commission/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.commission_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.commission_report"), "", dashboard_path %> +
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index 0ecfb3ab..6ffe0116 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.credit_payment_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.credit_payment_report"), "", dashboard_path %> + <%= render :partial=>'shift_sale_report_filter', :locals=>{ :period_type => true, :filter_for_credit => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %> diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 13b315de..72f5c9c5 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -1,13 +1,5 @@ +<% breadcrumb_add t("views.right_panel.detail.daily_sale_report"), "", dashboard_path %> -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.daily_sale_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/hourly_saleitem/index.html.erb b/app/views/reports/hourly_saleitem/index.html.erb index 992eba0e..e38263af 100644 --- a/app/views/reports/hourly_saleitem/index.html.erb +++ b/app/views/reports/hourly_saleitem/index.html.erb @@ -1,13 +1,6 @@
-
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.hourly_saleitem_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+ <% breadcrumb_add t("views.right_panel.detail.hourly_saleitem_report"), "", dashboard_path %> +
<%= render :partial=>'hourly_saleitem_report_filter', diff --git a/app/views/reports/induty/index.html.erb b/app/views/reports/induty/index.html.erb index fe1c72cf..aa9c1baf 100644 --- a/app/views/reports/induty/index.html.erb +++ b/app/views/reports/induty/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.induty_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.induty_report"), "", dashboard_path %> +
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb index 7a1c1431..14bc2ebf 100755 --- a/app/views/reports/order_reservation/index.html.erb +++ b/app/views/reports/order_reservation/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.order_reservation_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.order_reservation_report"), "", dashboard_path %> +
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb index ed0ffec3..85e61a0a 100755 --- a/app/views/reports/payment_method/index.html.erb +++ b/app/views/reports/payment_method/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. Payment Method Report
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add 'Payment Method Report', "", dashboard_path %> +
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 264ee13a..c9f79e01 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.receipt_no_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.receipt_no_report"), "", dashboard_path %> +
diff --git a/app/views/reports/receipt_no_detail/index.html.erb b/app/views/reports/receipt_no_detail/index.html.erb index c766108b..fe4ea16a 100755 --- a/app/views/reports/receipt_no_detail/index.html.erb +++ b/app/views/reports/receipt_no_detail/index.html.erb @@ -1,13 +1,6 @@
-
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.receipt_no_report") %> Details
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+ <% breadcrumb_add t("views.right_panel.detail.receipt_no_report"), "", dashboard_path %> +
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 62bfc497..5be6e649 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.sale_item_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.sale_item_report"), "", dashboard_path %> +
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 5fb10c71..e947ca1c 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.shift_sale_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.shift_sale_report"), "", dashboard_path %> +
diff --git a/app/views/reports/staff_meal/index.html.erb b/app/views/reports/staff_meal/index.html.erb index bfb5ec43..10676b2b 100644 --- a/app/views/reports/staff_meal/index.html.erb +++ b/app/views/reports/staff_meal/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.staff_meal_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.staff_meal_report"), "", dashboard_path %> +
<%= render :partial=>'staff_meal_report_filter', diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb index 10a24de2..a955b972 100755 --- a/app/views/reports/stock_check/index.html.erb +++ b/app/views/reports/stock_check/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. Home
    2. -
  2. Stock Check Report
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add 'Stock Check Report', "", dashboard_path %> +
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 3b619848..951ea18e 100755 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.void_sale_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.detail.void_sale_report"), "", dashboard_path %> +
diff --git a/app/views/reports/waste_and_spoilage/index.html.erb b/app/views/reports/waste_and_spoilage/index.html.erb index afd292f9..b65a804a 100755 --- a/app/views/reports/waste_and_spoilage/index.html.erb +++ b/app/views/reports/waste_and_spoilage/index.html.erb @@ -1,13 +1,6 @@
-
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.waste_spoilage_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+ <% breadcrumb_add t("views.right_panel.detail.waste_spoilage_report"), "", dashboard_path %> +
<%= render :partial=>'shift_sale_report_filter', diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index 8d0df9b8..74d7f4a8 100755 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -1,13 +1,4 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.account") %>
    3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
-
- +<% breadcrumb_add t("views.right_panel.detail.account"), '', dashboard_path %>
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb index 7a47bd3a..1a0700b7 100755 --- a/app/views/settings/cashier_terminals/_form.html.erb +++ b/app/views/settings/cashier_terminals/_form.html.erb @@ -1,3 +1,4 @@ +<% breadcrumb_add t("views.right_panel.header.cashier_terminal"), settings_cashier_terminals_path, settings_cashier_terminals_path, t("views.btn.#{action_name}") %>
diff --git a/app/views/settings/cashier_terminals/edit.html.erb b/app/views/settings/cashier_terminals/edit.html.erb index 89c7491c..e3b77a71 100755 --- a/app/views/settings/cashier_terminals/edit.html.erb +++ b/app/views/settings/cashier_terminals/edit.html.erb @@ -1,11 +1 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.cashier_terminal") %>
    3. -
  3. <%= t("views.btn.edit") %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> - -
-
<%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %> \ No newline at end of file diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index 32f4dc35..b0a4af62 100755 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.cashier_terminal") %>
    3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
-
+<% breadcrumb_add t("views.right_panel.header.cashier_terminal"), "", dashboard_path %> +
diff --git a/app/views/settings/cashier_terminals/new.html.erb b/app/views/settings/cashier_terminals/new.html.erb index cde2e8f6..73e1de30 100755 --- a/app/views/settings/cashier_terminals/new.html.erb +++ b/app/views/settings/cashier_terminals/new.html.erb @@ -1,11 +1 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.cashier_terminal") %>
    3. -
  3. <%= t("views.btn.new") %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> - -
-
<%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %> diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb index aa0c6596..ddc5eefe 100755 --- a/app/views/settings/cashier_terminals/show.html.erb +++ b/app/views/settings/cashier_terminals/show.html.erb @@ -1,13 +1,4 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.header.cashier_terminal") %>
    3. -
  3. <%= t :details %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> - -
-
+<% breadcrumb_add t("views.right_panel.header.cashier_terminal"), settings_cashier_terminals_path, settings_cashier_terminals_path, t('details') %>
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb index 85981077..57c4b31d 100755 --- a/app/views/settings/commissioners/_form.html.erb +++ b/app/views/settings/commissioners/_form.html.erb @@ -1,3 +1,5 @@ +<% breadcrumb_add t('commissioners'), settings_commissioners_path, settings_commissioners_path, t("views.btn.#{action_name}") %> +
diff --git a/app/views/settings/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb index 2909aa6f..e621c082 100755 --- a/app/views/settings/commissioners/edit.html.erb +++ b/app/views/settings/commissioners/edit.html.erb @@ -1,13 +1 @@ - -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("en.commissioners") %>
    3. -
  3. <%= t("views.btn.edit") %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> - -
-
- <%= render 'form', commissioner: @commissioner %> diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index 2c3487e0..b3b14401 100755 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -1,12 +1,5 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("en.commissioners") %>
    3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
-
+<% breadcrumb_add t('commissioners'), '', dashboard_path %> +
diff --git a/app/views/settings/commissioners/new.html.erb b/app/views/settings/commissioners/new.html.erb index 23480fb9..95eaf080 100755 --- a/app/views/settings/commissioners/new.html.erb +++ b/app/views/settings/commissioners/new.html.erb @@ -1,13 +1,2 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("en.commissioners") %>
    3. -
  3. <%= t("views.btn.new") %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> - -
-
- <%= render 'form', commissioner: @commissioner %> diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index b9df0967..7ce6287f 100755 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -1,13 +1,4 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("en.commissioners") %>
    3. -
  3. <%= t :details %>
    4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> - -
-
+<% breadcrumb_add t('commissioners'), settings_commissioners_path, settings_commissioners_path, t("details") %>
    diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb index 46c92b3d..ebf529d7 100755 --- a/app/views/settings/commissions/_form.html.erb +++ b/app/views/settings/commissions/_form.html.erb @@ -1,3 +1,4 @@ +<% breadcrumb_add t('commissions'), settings_commissions_path, settings_commissions_path, t("views.btn.#{action_name}") %>
    diff --git a/app/views/settings/commissions/edit.html.erb b/app/views/settings/commissions/edit.html.erb index bf021e34..30180b41 100755 --- a/app/views/settings/commissions/edit.html.erb +++ b/app/views/settings/commissions/edit.html.erb @@ -1,11 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.commissions") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> - -
    -
    - <%= render 'form', commission: @commission %> \ No newline at end of file +<%= render 'form', commission: @commission %> \ No newline at end of file diff --git a/app/views/settings/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb index 81117502..4c910059 100755 --- a/app/views/settings/commissions/index.html.erb +++ b/app/views/settings/commissions/index.html.erb @@ -1,12 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.commissions") %>
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    +<% breadcrumb_add t('commissions'), '', dashboard_path %>
    diff --git a/app/views/settings/commissions/new.html.erb b/app/views/settings/commissions/new.html.erb index deae67ec..30180b41 100755 --- a/app/views/settings/commissions/new.html.erb +++ b/app/views/settings/commissions/new.html.erb @@ -1,11 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.commissions") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> - -
    -
    - <%= render 'form', commission: @commission %> \ No newline at end of file +<%= render 'form', commission: @commission %> \ No newline at end of file diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb index 627b61f5..ea28ed21 100755 --- a/app/views/settings/commissions/show.html.erb +++ b/app/views/settings/commissions/show.html.erb @@ -1,13 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.commissions") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> - -
    -
    +<% breadcrumb_add t('commissions'), settings_commissions_path, settings_commissions_path, t('details') %>
    diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb index 4bbf9d0f..f4c2f0f3 100755 --- a/app/views/settings/employees/_form.html.erb +++ b/app/views/settings/employees/_form.html.erb @@ -1,3 +1,4 @@ +<% breadcrumb_add t("views.right_panel.detail.employee"), settings_employees_path, settings_employees_path, t("views.btn.#{action_name}") %>
    diff --git a/app/views/settings/employees/edit.html.erb b/app/views/settings/employees/edit.html.erb index ef8e6bfd..bbc92c22 100755 --- a/app/views/settings/employees/edit.html.erb +++ b/app/views/settings/employees/edit.html.erb @@ -1,12 +1 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.employees") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> - -
    -
    - <%= render 'form', employee: @employee %> +<%= render 'form', employee: @employee %> diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index f47cc8e5..8210de0b 100755 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -1,13 +1,5 @@ +<% breadcrumb_add t("views.right_panel.detail.employee"), "", dashboard_path %> -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.employee") %>
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    diff --git a/app/views/settings/employees/new.html.erb b/app/views/settings/employees/new.html.erb index 1a12fc6b..0b5f248c 100755 --- a/app/views/settings/employees/new.html.erb +++ b/app/views/settings/employees/new.html.erb @@ -1,12 +1 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.employees") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> - -
    -
    - <%= render 'form', employee: @employee %> \ No newline at end of file +<%= render 'form', employee: @employee %> \ No newline at end of file diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index 807dc54a..12b6a0eb 100755 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -1,22 +1,4 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.employee") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> - -
    -
    +<% breadcrumb_add t("views.right_panel.detail.employee"), settings_employees_path, settings_employees_path, t('details') %>
    diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index 48bd9982..5eae8e45 100755 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -1,14 +1,4 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.item_set") %>
      3. - - <%= link_to t("views.btn.back"), dashboard_path %> - -
    -
    - +<% breadcrumb_add t("views.right_panel.detail.item_set"), '', dashboard_path %>
    diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb index 1c5e549d..92ec53a8 100755 --- a/app/views/settings/lookups/_form.html.erb +++ b/app/views/settings/lookups/_form.html.erb @@ -1,4 +1,4 @@ - +<% breadcrumb_add 'LookUp', settings_lookups_path, settings_lookups_path, t("views.btn.#{action_name}") %>
    diff --git a/app/views/settings/lookups/edit.html.erb b/app/views/settings/lookups/edit.html.erb index 87c62e60..769b2be5 100755 --- a/app/views/settings/lookups/edit.html.erb +++ b/app/views/settings/lookups/edit.html.erb @@ -1,12 +1 @@ - -
    -
      -
    1. Home
      2. -
    2. Lookup
      3. -
    3. Edit
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_lookups_path %> - -
    -
    <%= render 'form', settings_lookup: @settings_lookup %> diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index 174ff9d7..0dd1d839 100755 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -1,13 +1,4 @@ - -
    -
      -
    1. Home
      2. -
    2. LookUp
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    +<% breadcrumb_add 'LookUp', '', dashboard_path %>
    diff --git a/app/views/settings/lookups/new.html.erb b/app/views/settings/lookups/new.html.erb index 598f9349..68b2f068 100755 --- a/app/views/settings/lookups/new.html.erb +++ b/app/views/settings/lookups/new.html.erb @@ -1,12 +1 @@ - -
    -
      -
    1. Home
      2. -
    2. Lookup
      3. -
    3. New
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_lookups_path %> - -
    -
    <%= render 'form', settings_lookup: @settings_lookup %> \ No newline at end of file diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb index 85ebaf74..2c4ab69c 100755 --- a/app/views/settings/menu_categories/_form.html.erb +++ b/app/views/settings/menu_categories/_form.html.erb @@ -1,3 +1,5 @@ +<% breadcrumb_add t("views.right_panel.header.menu_categories"), settings_menu_categories_path, settings_menu_categories_path, t("views.btn.#{action_name}") %> +
    diff --git a/app/views/settings/menu_categories/edit.html.erb b/app/views/settings/menu_categories/edit.html.erb index 59e3badb..a7929a77 100755 --- a/app/views/settings/menu_categories/edit.html.erb +++ b/app/views/settings/menu_categories/edit.html.erb @@ -1,12 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.menu_categories") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to 'Back', settings_menu_categories_path %> - -
    -
    -
    <%= render 'form', settings_menu_category: @settings_menu_category %> diff --git a/app/views/settings/menu_categories/new.html.erb b/app/views/settings/menu_categories/new.html.erb index 21841a18..a7929a77 100755 --- a/app/views/settings/menu_categories/new.html.erb +++ b/app/views/settings/menu_categories/new.html.erb @@ -1,13 +1 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.menu_categories") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to 'Back', settings_menu_categories_path %> - -
    -
    -
    <%= render 'form', settings_menu_category: @settings_menu_category %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index eabb31d5..f7d31f05 100755 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,13 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.menu_category") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to 'Back', settings_menu_categories_path %> - -
    -
    +<% breadcrumb_add t("views.right_panel.header.menu_category"), settings_menu_categories_path, settings_menu_categories_path, t('details') %>
    diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb index 924cdfb3..c2595568 100755 --- a/app/views/settings/menu_item_attributes/index.html.erb +++ b/app/views/settings/menu_item_attributes/index.html.erb @@ -1,12 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_attributes") %>
      3. - - <%= link_to 'Back', dashboard_path %> - -
    -
    +<% breadcrumb_add t("views.right_panel.header.menu_item_attributes"), '', dashboard_path %>
    diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index cc478055..9d6d4257 100755 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -1,3 +1,6 @@ +<% breadcrumb_add t("views.right_panel.header.menu_item_instances"), settings_menu_category_simple_menu_item_path(@category, @item), settings_menu_category_simple_menu_item_path(@category, @item), + t("views.btn.#{action_name}") %> +
    diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index 5b312432..ccd2a70c 100755 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -1,15 +1,3 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_instances") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> - -
    -
    -
    <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %> diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index 9a939db6..aef699f8 100755 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -1,12 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_instances") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> - -
    -
    -
    <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %> diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index f1592f89..0faeaf82 100755 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -1,26 +1,6 @@ - - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> - -
    -
    - +<% breadcrumb_add t("views.right_panel.header.menu_item"),settings_menu_category_simple_menu_item_path(@category,@item), + settings_menu_category_simple_menu_item_path(@category,@item), + t('details') %>
    diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb index c50809bf..102cb3b8 100755 --- a/app/views/settings/menu_item_options/_form.html.erb +++ b/app/views/settings/menu_item_options/_form.html.erb @@ -1,3 +1,4 @@ +<% breadcrumb_add t("views.right_panel.header.menu_item_options"), settings_menu_item_options_path, settings_menu_item_options_path, t("views.btn.#{action_name}") %>
    diff --git a/app/views/settings/menu_item_options/edit.html.erb b/app/views/settings/menu_item_options/edit.html.erb index ec7692ec..fdce74fc 100755 --- a/app/views/settings/menu_item_options/edit.html.erb +++ b/app/views/settings/menu_item_options/edit.html.erb @@ -1,11 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_options") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to 'Back', settings_menu_item_options_path %> - -
    -
    <%= render 'form', settings_menu_item_option: @settings_menu_item_option %> diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index 5345bcdd..b71a09ed 100755 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -1,12 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_options") %>
      3. - - <%= link_to 'Back', dashboard_path %> - -
    -
    +<% breadcrumb_add t("views.right_panel.header.menu_item_options"), '', dashboard_path %>
    diff --git a/app/views/settings/menu_item_options/new.html.erb b/app/views/settings/menu_item_options/new.html.erb index ce0aed01..fdce74fc 100755 --- a/app/views/settings/menu_item_options/new.html.erb +++ b/app/views/settings/menu_item_options/new.html.erb @@ -1,11 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_options") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to 'Back', settings_menu_item_options_path %> - -
    -
    <%= render 'form', settings_menu_item_option: @settings_menu_item_option %> diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index 9eb2face..681e6394 100755 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -1,15 +1,4 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.menu_item_options") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to 'Back', settings_menu_item_options_path %> - -
    -
    - +<% breadcrumb_add t("views.right_panel.header.menu_item_options"), settings_menu_item_options_path, settings_menu_item_options_path, t('details') %>
    diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb index 770a18b3..023f5f63 100755 --- a/app/views/settings/menus/_form.html.erb +++ b/app/views/settings/menus/_form.html.erb @@ -1,3 +1,5 @@ +<% breadcrumb_add t('menus'), settings_menus_path, settings_menus_path, t("views.btn.#{action_name}") %> +
    diff --git a/app/views/settings/menus/edit.html.erb b/app/views/settings/menus/edit.html.erb index 786c729c..e3656110 100755 --- a/app/views/settings/menus/edit.html.erb +++ b/app/views/settings/menus/edit.html.erb @@ -1,23 +1 @@ - - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.menus") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to 'Back', settings_menus_path %> - -
    -
    -
    <%= render 'form', settings_menu: @settings_menu %> diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 78a41acb..81734317 100755 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -1,12 +1,5 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.menus") %>
      3. - - <%= link_to 'Back', dashboard_path %> - -
    -
    +<% breadcrumb_add t('menus'), "", dashboard_path %> +


    diff --git a/app/views/settings/menus/new.html.erb b/app/views/settings/menus/new.html.erb index 2466f24a..2889a68b 100755 --- a/app/views/settings/menus/new.html.erb +++ b/app/views/settings/menus/new.html.erb @@ -1,24 +1 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.menus") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to 'Back', settings_menus_path %> - -
    -
    -
    <%= render 'form', settings_menu: @settings_menu %> \ No newline at end of file diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index 5a81a215..b3785e72 100755 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -1,13 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.menus") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to 'Back', settings_menus_path %> - -
    -
    +<% breadcrumb_add t('menus'), settings_menus_path, settings_menus_path, t('details') %>
    diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 3b8d120f..07cc9728 100755 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -4,6 +4,8 @@ div.form-inputs span{ } +<% breadcrumb_add 'Order Queue Stations', settings_order_queue_stations_path, settings_order_queue_stations_path, t("views.btn.#{action_name}") %> +
    diff --git a/app/views/settings/order_queue_stations/edit.html.erb b/app/views/settings/order_queue_stations/edit.html.erb index ea68ef11..b5b00680 100755 --- a/app/views/settings/order_queue_stations/edit.html.erb +++ b/app/views/settings/order_queue_stations/edit.html.erb @@ -1,12 +1 @@ -
    -
      -
    1. Home
      2. -
    2. Order Queue Stations
      3. -
    3. Edit
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %> - -
    -
    -
    <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> \ No newline at end of file diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index 417654be..b46661da 100755 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -1,15 +1,4 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.header.order_queue_stations") %>
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    - - +<% breadcrumb_add t("views.right_panel.header.order_queue_stations"), "", dashboard_path %>
    diff --git a/app/views/settings/order_queue_stations/new.html.erb b/app/views/settings/order_queue_stations/new.html.erb index c8b73639..81f623bb 100755 --- a/app/views/settings/order_queue_stations/new.html.erb +++ b/app/views/settings/order_queue_stations/new.html.erb @@ -1,12 +1 @@ -
    -
      -
    1. Home
      2. -
    2. Order Queue Stations
      3. -
    3. New
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %> - -
    -
    -
    <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> diff --git a/app/views/settings/out_of_stock/index.html.erb b/app/views/settings/out_of_stock/index.html.erb index 563aa6a2..2efd77db 100644 --- a/app/views/settings/out_of_stock/index.html.erb +++ b/app/views/settings/out_of_stock/index.html.erb @@ -1,12 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t :out_of_stock %>
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    +<% breadcrumb_add t('out_of_stock'), "", dashboard_path %>
    diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index 2679d1b2..1b2af479 100755 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -1,3 +1,4 @@ +<% breadcrumb_add t("payment_methods"), settings_payment_method_settings_path, settings_payment_method_settings_path, t("views.btn.#{action_name}") %>
    diff --git a/app/views/settings/payment_method_settings/edit.html.erb b/app/views/settings/payment_method_settings/edit.html.erb index 4d7e646c..5d2c1492 100755 --- a/app/views/settings/payment_method_settings/edit.html.erb +++ b/app/views/settings/payment_method_settings/edit.html.erb @@ -1,12 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.payment_methods") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to t('.ack', :default => t("views.back")), settings_payment_method_settings_path %> - -
    -
    - <%= render 'form', settings_payment_method_setting: @settings_payment_method_setting %> \ No newline at end of file diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb index b489ab5d..59e0d27d 100755 --- a/app/views/settings/payment_method_settings/index.html.erb +++ b/app/views/settings/payment_method_settings/index.html.erb @@ -1,13 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.payment_methods") %>
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    - +<% breadcrumb_add t('payment_methods'), "", dashboard_path %>
    diff --git a/app/views/settings/payment_method_settings/new.html.erb b/app/views/settings/payment_method_settings/new.html.erb index a4255b4e..5d2c1492 100755 --- a/app/views/settings/payment_method_settings/new.html.erb +++ b/app/views/settings/payment_method_settings/new.html.erb @@ -1,13 +1 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.payment_methods") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to t('.ack', :default => t("views.back")), settings_payment_method_settings_path %> - -
    -
    - <%= render 'form', settings_payment_method_setting: @settings_payment_method_setting %> \ No newline at end of file diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb index 0b0cdec9..a7cd0661 100755 --- a/app/views/settings/payment_method_settings/show.html.erb +++ b/app/views/settings/payment_method_settings/show.html.erb @@ -1,14 +1,4 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("en.payment_methods") %>
      3. -
    3. <%= t :details %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_payment_method_settings_path %> - -
    -
    - +<% breadcrumb_add t('payment_methods'), settings_payment_method_settings_path, settings_payment_method_settings_path, t('details') %>
    diff --git a/app/views/settings/processing_items/new.html.erb b/app/views/settings/processing_items/new.html.erb index 29ce5527..b42840bb 100755 --- a/app/views/settings/processing_items/new.html.erb +++ b/app/views/settings/processing_items/new.html.erb @@ -1,12 +1,3 @@ -
    -
      -
    1. Home
      2. -
    2. Order Queue Stations
      3. -
    3. <%= @settings_order_queue_station.station_name %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %> - -
    -
    +<% breadcrumb_add 'Order Queue Stations', settings_order_queue_stations_path, settings_order_queue_stations_path, @settings_order_queue_station.station_name %>
    <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> \ No newline at end of file diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb index bea0f004..4285cc4f 100755 --- a/app/views/settings/products/_form.html.erb +++ b/app/views/settings/products/_form.html.erb @@ -1,4 +1,5 @@ - +<% breadcrumb_add t("views.right_panel.detail.product"), settings_products_path, settings_products_path, t("views.btn.#{action_name}") %> +
    diff --git a/app/views/settings/products/edit.html.erb b/app/views/settings/products/edit.html.erb index a0b02edf..ede231f4 100755 --- a/app/views/settings/products/edit.html.erb +++ b/app/views/settings/products/edit.html.erb @@ -1,12 +1 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.product") %>
      3. -
    3. <%= t("views.btn.edit") %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %> - -
    -
    -
    <%= render 'form', settings_product: @settings_product %> diff --git a/app/views/settings/products/index.html.erb b/app/views/settings/products/index.html.erb index c5740b8d..1786f319 100755 --- a/app/views/settings/products/index.html.erb +++ b/app/views/settings/products/index.html.erb @@ -1,14 +1,4 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.product") %>
      3. - - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> - -
    -
    - +<% breadcrumb_add t("views.right_panel.detail.product"), "", dashboard_path %>
    diff --git a/app/views/settings/products/new.html.erb b/app/views/settings/products/new.html.erb index 5ba87f02..28743e94 100755 --- a/app/views/settings/products/new.html.erb +++ b/app/views/settings/products/new.html.erb @@ -1,24 +1,3 @@ - -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.product") %>
      3. -
    3. <%= t("views.btn.new") %>
      4. - - <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %> - -
    -
    -
    <%= render 'form', settings_product: @settings_product %>