From ba18e722d7fb8bbdd97664ab26f4bcb60ef06221 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 23 Oct 2017 17:59:35 +0630 Subject: [PATCH] add user manual for zone --- app/views/print_settings/show.html.erb | 9 ++- app/views/settings/accounts/index.html.erb | 1 - .../settings/cashier_terminals/index.html.erb | 6 +- .../settings/cashier_terminals/show.html.erb | 10 +-- .../settings/commissioners/index.html.erb | 11 +-- .../settings/commissioners/show.html.erb | 13 +++ app/views/settings/commissions/index.html.erb | 79 +++++++++++-------- app/views/settings/commissions/show.html.erb | 34 +++++--- .../settings/dining_charges/_form.html.erb | 59 ++++++++++---- app/views/settings/employees/show.html.erb | 5 +- .../settings/membership_actions/show.html.erb | 2 +- .../settings/menu_categories/show.html.erb | 11 ++- .../menu_item_attributes/show.html.erb | 9 ++- .../menu_item_instances/index.html.erb | 13 ++- .../menu_item_instances/show.html.erb | 20 ++++- .../settings/menu_item_options/show.html.erb | 9 ++- .../settings/menu_item_sets/index.html.erb | 6 +- .../settings/menu_item_sets/show.html.erb | 13 +++ app/views/settings/menus/show.html.erb | 11 ++- .../order_queue_stations/show.html.erb | 9 ++- .../payment_method_settings/show.html.erb | 11 ++- app/views/settings/products/show.html.erb | 8 +- .../settings/simple_menu_items/index.html.erb | 12 ++- .../settings/simple_menu_items/show.html.erb | 13 ++- app/views/settings/tables/_form.html.erb | 19 ++++- app/views/settings/tables/index.html.erb | 19 +++-- app/views/settings/tables/show.html.erb | 31 ++++++-- .../settings/tax_profiles/index.html.erb | 4 +- app/views/settings/tax_profiles/show.html.erb | 73 +++++++++++------ app/views/settings/zones/_form.html.erb | 21 +++-- app/views/settings/zones/edit.html.erb | 1 - app/views/settings/zones/index.html.erb | 20 +++-- app/views/settings/zones/show.html.erb | 49 ++++++++++-- 33 files changed, 446 insertions(+), 165 deletions(-) diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index 4613b930..4304a64f 100755 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -53,7 +53,14 @@ <%= link_to t("views.btn.edit"), edit_print_setting_path(@print_setting),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), @print_setting, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-danger btn-sm waves-effect' %> + + + diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index d2a1c9a4..dc751a17 100755 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -1,4 +1,3 @@ -
  1. Home
    2. diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index c0916074..139d0978 100755 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -31,7 +31,7 @@ <% @settings_cashier_terminals.each do |settings_cashier_terminal| %> - <%= link_to settings_cashier_terminal.name,settings_cashier_terminal_path(settings_cashier_terminal) %> + <%= settings_cashier_terminal.name%> <%= settings_cashier_terminal.is_active %> <%= settings_cashier_terminal.is_currently_login %> <%= settings_cashier_terminal.auto_print_receipt %> @@ -39,7 +39,9 @@ <%= settings_cashier_terminal.show_tax %> <%= settings_cashier_terminal.show_cashier %> - <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %> + + <%= link_to t("views.btn.show"), settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb index 52f796bd..a9232d35 100755 --- a/app/views/settings/cashier_terminals/show.html.erb +++ b/app/views/settings/cashier_terminals/show.html.erb @@ -1,7 +1,7 @@
    1. Home
      2. -
    2. Cashier Terminals
      3. +
    3. Cashier Terminals
    4. Details
      5. <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminal_path %> @@ -78,16 +78,16 @@ - - <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(@settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_cashier_terminal_path(@item, @settings_cashier_terminal ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index dd7feaf5..3304a2ab 100755 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -22,7 +22,7 @@ Joined Date Resigned Date Active - + Actions @@ -39,15 +39,6 @@ <%= commissioner.is_active %> <%= 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' %> - - - - <% end %> diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index 05db222d..8c9348b2 100755 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -55,6 +55,19 @@ Created By <%= Employee.find(@commissioner.created_by).name %> + + + <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(@commissioner),:class => 'btn btn-primary btn-sm waves-effect' %> + + + + + diff --git a/app/views/settings/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb index 5b8ce0a4..47b9af57 100755 --- a/app/views/settings/commissions/index.html.erb +++ b/app/views/settings/commissions/index.html.erb @@ -1,38 +1,53 @@
      -
        -
      • Home
        • -
      • Commissions
        • - - <%= link_to t("views.btn.new"), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %> - -
      +
        +
      1. Home
        2. +
      2. Commissions
        3. + + <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + +
      -
      -
      - - - - - - - - - - - - - <% @commissions.each do |commission| %> +
      +
      +
      + <%= link_to t("views.btn.new"),new_settings_commission_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
      +
      +
      Product NameCommission TypeAmountActive
      + - - - - - - - + + + + + - <% end %> - -
      <%= commission.menu_item.name rescue '-' %><%= commission.commission_type rescue '-' %><%= commission.amount rescue '-' %><%= commission.is_active rescue '-' %><%= link_to t("views.btn.show"), settings_commissions_path(commission) %><%= link_to t("views.btn.edit"), edit_settings_commission_path(commission) %><%= link_to t("views.btn.delete"), settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %>Product NameCommission TypeAmountActiveActions
      + + + + <% @commissions.each do |commission| %> + + <%= commission.menu_item.name rescue '-' %> + <%= commission.commission_type rescue '-' %> + <%= commission.amount rescue '-' %> + <%= commission.is_active rescue '-' %> + <%= link_to t("views.btn.show"), settings_commission_path(commission), :class => "btn btn-info btn-sm waves-effect" %> + <%= link_to t("views.btn.edit"), edit_settings_commission_path(commission), :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/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb index 001f2a8c..cc929544 100755 --- a/app/views/settings/commissions/show.html.erb +++ b/app/views/settings/commissions/show.html.erb @@ -1,14 +1,14 @@ -

<%= notice %>

-
- +
    +
  1. Home
    2. +
  2. Commissioner
    3. +
  3. Details
    4. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> + +
+

Commission

@@ -30,11 +30,21 @@ Active <%= @commission.is_active %> + + + <%= link_to t("views.btn.edit"), edit_settings_commission_path(@commission), class: 'btn btn-info btn-sm waves-effect' %> + + + + + - <%= link_to t('.new', :default => t("views.btn.new")), settings_commissions_path, class: 'btn btn-success' %> - <%= link_to t("views.btn.edit"), edit_settings_commission_path(@commission), class: 'btn btn-info' %> - <%= link_to t("views.btn.delete"), settings_commissions_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index db793f8c..a83f1a7d 100755 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -1,22 +1,49 @@ -<%= simple_form_for([:settings,@zone,@settings_dining_facility,@dining_charge]) do |f| %> - <%= f.error_notification %> +
+
+ <%= simple_form_for([:settings,@zone,@settings_dining_facility,@dining_charge]) do |f| %> + <%= f.error_notification %> -
- <%= f.input :item_code, :input_html => { :id => 'item_code' } %> - <%= f.input :unit_price, :input_html => { :id => 'unit_price'} %> - <%= f.input :taxable %> - <%= f.input :charge_type, :collection => [:hr, :day] %> - <%= f.input :minimum_free_time %> - <%= f.input :charge_block, :input_html => { :id => 'charge_block'} %> - <%= f.input :time_rounding, :collection => [:down, :up] %> - <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %> - <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %> -
+
+ <%= f.input :item_code, :input_html => { :id => 'item_code' } %> + <%= f.input :unit_price, :input_html => { :id => 'unit_price'} %> + <%= f.input :taxable %> + <%= f.input :charge_type, :collection => [:hr, :day] %> + <%= f.input :minimum_free_time %> + <%= f.input :charge_block, :input_html => { :id => 'charge_block'} %> + <%= f.input :time_rounding, :collection => [:down, :up] %> + <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %> + <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %> +
-
- <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %>
-<% end %> +
+
+
+
view_headline PAGE DETAIL
+

+ 1) Item code - generated item code for extra charges
+ 2) Unit price - to write price for extra charges
+ 3) Taxable - checkbox for taxble or not
+ 4) Charge Type - to write type for extra charges
+ 5) Minimum free time - time for free
+ 6) Charge block - time for block
+ 7) Time rounding block - rounding time for block
+ 8) Time rounding block price - to write price for time rounding block
+

+
list BUTTON LISTS
+

+ 1) SUBMIT - to create extra charges
+

+
list LINK LISTS
+

1) Home / Back - go to dashboard

+
+
+
+