From e9ff6481d4424628b13f883d5e6a569a5f15ca33 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 12 Oct 2017 18:17:05 +0630 Subject: [PATCH] update adminbsb for setting pages --- .../order_queue_stations/_form.html.erb | 56 ++++++--- .../order_queue_stations/edit.html.erb | 24 ++-- .../order_queue_stations/index.html.erb | 118 +++++++++++------- .../order_queue_stations/new.html.erb | 20 +-- .../order_queue_stations/show.html.erb | 42 ++++--- .../settings/processing_items/_form.html.erb | 116 ++++++++++------- .../settings/processing_items/index.html.erb | 6 +- .../settings/processing_items/new.html.erb | 20 +-- app/views/settings/products/_form.html.erb | 74 ++++++----- app/views/settings/products/edit.html.erb | 20 +-- app/views/settings/products/index.html.erb | 47 ++++--- app/views/settings/products/new.html.erb | 15 ++- app/views/settings/products/show.html.erb | 66 ++++++---- 13 files changed, 381 insertions(+), 243 deletions(-) diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 08c00c90..3bac3cb4 100644 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -3,26 +3,44 @@ div.form-inputs span{ padding: 1%; } -<%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %> - <%= f.error_notification %> -
- <%= f.input :station_name %> - <%= f.input :is_active %> - <%= f.input :printer_name %> - - <%= f.input :print_copy %> - <%= f.hidden_field :processing_items %> - <%= f.label "Select Zones", :class => 'control-label' %> - <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'ta'%> - <%= f.input :cut_per_item %> - <%= f.input :use_alternate_name %> - <%= f.input :processing_items, as: :hidden %> - <%= f.input :auto_print %> +
+
+ <%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :station_name %> + <%= f.input :is_active %> + + <%= f.input :printer_name %> + + <%= f.input :print_copy %> + <%= f.hidden_field :processing_items %> + <%= f.label "Select Zones", :class => 'control-label' %> + <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'ta'%> + <%= f.input :cut_per_item %> + <%= f.input :use_alternate_name %> + <%= f.input :processing_items, as: :hidden %> + <%= f.input :auto_print %> +
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %>
- -
- <%= f.button :submit %> +
+
+
+ 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 +
+
-<% end %> +
+ + diff --git a/app/views/settings/order_queue_stations/edit.html.erb b/app/views/settings/order_queue_stations/edit.html.erb index 7301418c..50da88e0 100644 --- a/app/views/settings/order_queue_stations/edit.html.erb +++ b/app/views/settings/order_queue_stations/edit.html.erb @@ -1,12 +1,12 @@ - - -
- - <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> -
\ No newline at end of file + +
+<%= 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 71e36853..7a1c33dc 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -1,53 +1,77 @@ - -
-
- - - - - - - - - - - - - - - - - - <% @settings_order_queue_stations.each do |settings_order_queue_station| %> - - - - - - - - - - - - - - - - <% end %> - -
Station namePrinter nameIs activeAuto PrintPrint copyCut per itemAlternate nameCreated by Created AtUpdated AtAction
<%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %><%= settings_order_queue_station.printer_name %><%= settings_order_queue_station.is_active %><%= settings_order_queue_station.auto_print %><%= settings_order_queue_station.print_copy %><%= settings_order_queue_station.cut_per_item %><%= settings_order_queue_station.use_alternate_name %><%= settings_order_queue_station.created_by %><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %><%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station) %><%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station) %>
- <%= paginate @settings_order_queue_stations %> + +
+
+
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
+
+ + + + + + + + + + + + + + + + + + + <% @settings_order_queue_stations.each do |settings_order_queue_station| %> + + + + + + + + + + + + + + + + <% end %> + +
Station namePrinter nameIs activeAuto PrintPrint copyCut per itemAlternate nameCreated by Created AtUpdated AtAction
<%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %><%= settings_order_queue_station.printer_name %><%= settings_order_queue_station.is_active %><%= settings_order_queue_station.auto_print %><%= settings_order_queue_station.print_copy %><%= settings_order_queue_station.cut_per_item %><%= settings_order_queue_station.use_alternate_name %><%= settings_order_queue_station.created_by %><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %><%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => ' btn-success btn-sm waves-effect' %><%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %>
+ <%= paginate @settings_order_queue_stations %> +
+
+
+
+
+ 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 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/order_queue_stations/new.html.erb b/app/views/settings/order_queue_stations/new.html.erb index 5183495c..33f23f8c 100644 --- a/app/views/settings/order_queue_stations/new.html.erb +++ b/app/views/settings/order_queue_stations/new.html.erb @@ -1,10 +1,12 @@ -
- - <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> + +
+<%= render 'form', settings_order_queue_station: @settings_order_queue_station %> diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index 55d331f6..0e12b90f 100644 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -1,15 +1,20 @@ + -
+
+ +
+
+
-

Order Queue Station

@@ -23,7 +28,6 @@ - @@ -39,15 +43,21 @@ - +
Cut per item Use alternate name Created byAction
<%= @settings_order_queue_station.cut_per_item %> <%= @settings_order_queue_station.use_alternate_name %> <%= @settings_order_queue_station.created_by %> - <%= link_to 'Edit', edit_settings_order_queue_station_path(@settings_order_queue_station) %> | <%= link_to 'Destroy', settings_order_queue_station_path(@settings_order_queue_station), method: :delete, data: { confirm: 'Are you sure?' } %> | - - <%= link_to 'Back', settings_order_queue_stations_path %> -
- +
+
+
+
+ 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/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 6613f4b6..38c4284d 100644 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -1,50 +1,74 @@ -<%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %> - <%= f.error_notification %> - <%= f.input :processing_items, as: :hidden %> - Select Menu Items

-
- <%= f.button :submit, class:'pull-right', label: "Add Menu Items to Queue Station" %> -
-

-
- <% @menu_categories.each do |category|%> - -
-
-
-

<%= category.name %> -

- - - -

- -
+
+
+ <%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %> + <%= f.error_notification %> + <%= f.input :processing_items, as: :hidden %> + +
+
+ Select Menu Items +
+
+
+ <% @menu_categories.each do |category|%> + +
+
+
+

<%= category.name %> +

+ + + +

+ +
+
+ <% end %> +
+
+
+ + +
+ <%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect' %> +
+
<% end %>
-
-
- <%= f.button :submit, label: "Add Menu Items to Queue Station" %> +
+
+
+ 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 +
+
-
-<% end %> +
+ + + diff --git a/app/views/settings/processing_items/index.html.erb b/app/views/settings/processing_items/index.html.erb index 526d894c..a0687711 100644 --- a/app/views/settings/processing_items/index.html.erb +++ b/app/views/settings/processing_items/index.html.erb @@ -22,7 +22,7 @@ Cut per item Use alternate name Created by - + @@ -36,8 +36,8 @@ <%= settings_order_queue_station.cut_per_item %> <%= settings_order_queue_station.use_alternate_name %> <%= settings_order_queue_station.created_by %> - <%= link_to 'Assign Processing Items', settings_order_queue_station_path(settings_order_queue_station) %> - <%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station) %> + <%= link_to 'Assign Processing Items', settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-success btn-lg waves-effect' %> + <%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/processing_items/new.html.erb b/app/views/settings/processing_items/new.html.erb index a808131a..5a112512 100644 --- a/app/views/settings/processing_items/new.html.erb +++ b/app/views/settings/processing_items/new.html.erb @@ -1,10 +1,12 @@ -
- - <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> + +
+ <%= 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 ae651cb1..3bee23d5 100644 --- a/app/views/settings/products/_form.html.erb +++ b/app/views/settings/products/_form.html.erb @@ -1,35 +1,49 @@ -<%= simple_form_for([:settings,@settings_product]) do |f| %> - <%= f.error_notification %> -
-
- <%= f.input :item_code, :input_html => { :id => 'item_code' } %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :unit_price %> - <%= f.input :description %> - <%= f.input :information %> - -
-
- -
-
+
+
+ <%= simple_form_for([:settings,@settings_product]) do |f| %> + <%= f.error_notification %>
- - <%= f.file_field :image_path, :class => "img-thumbnail" %> + <%= f.input :item_code, :input_html => { :id => 'item_code' } %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :unit_price %> + <%= f.input :description %> + <%= f.input :information %> +
-
-
- <%= f.button :submit %> + +
+
+ + <%= f.file_field :image_path, :class => "img-thumbnail" %> +
+
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary 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 +
+
-<% end %> +
+ + \ No newline at end of file diff --git a/app/views/settings/products/edit.html.erb b/app/views/settings/products/edit.html.erb index 634381df..beeba74c 100644 --- a/app/views/settings/products/edit.html.erb +++ b/app/views/settings/products/edit.html.erb @@ -1,10 +1,12 @@ -
- - <%= render 'form', settings_product: @settings_product %> + +
+<%= 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 3f49a401..21685337 100644 --- a/app/views/settings/products/index.html.erb +++ b/app/views/settings/products/index.html.erb @@ -1,15 +1,21 @@ - +
-
+ +
+
+
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_product_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
+
@@ -21,7 +27,7 @@ - + @@ -35,11 +41,24 @@ - - - + <% end %>
Description Information TaxableActions
<%= settings_product.description %> <%= settings_product.information %> <%= settings_product.taxable %><%= link_to 'Show', settings_product_path(settings_product) %><%= link_to 'Edit', edit_settings_product_path(settings_product) %><%= link_to 'Destroy', settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_product_path(settings_product),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to 'Edit', edit_settings_product_path(settings_product),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to 'Destroy', settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
+
+
+
+
+ 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/products/new.html.erb b/app/views/settings/products/new.html.erb index e971f70d..58c96ba9 100644 --- a/app/views/settings/products/new.html.erb +++ b/app/views/settings/products/new.html.erb @@ -1,4 +1,4 @@ -
+ + - +
+<%= render 'form', settings_product: @settings_product %>