diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 551199f4..c217628d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -97,7 +97,7 @@ section.content { } .card .card-block { - padding: 0.5rem 1rem 1rem; + padding: 0.5rem; } .btn { @@ -135,6 +135,10 @@ section.content { font-size:0.87rem; } +.list-group-item{ + padding:0.75rem 1rem; +} + /* End Reset Theme */ /* *************************************************** */ diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb index b611b397..431902f4 100644 --- a/app/views/settings/menu_categories/_form.html.erb +++ b/app/views/settings/menu_categories/_form.html.erb @@ -1,17 +1,32 @@ -<%= simple_form_for([:settings, @settings_menu_category]) do |f| %> - <%= f.error_notification %> +
+
+ <%= simple_form_for([:settings, @settings_menu_category]) do |f| %> + <%= f.error_notification %> -
- <%= f.input :menu_id, as: :hidden %> - <%= f.input :code, label: "Category Code" %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :is_available %> - <%= f.input :order_by %> - <%= f.association :parent %> -
+
+ <%= f.input :menu_id, as: :hidden %> + <%= f.input :code, label: "Category Code" %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :is_available %> + <%= f.input :order_by %> + <%= f.association :parent %> +
-
- <%= f.button :submit %> +
+ <%= 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 +
+
+
+
+ diff --git a/app/views/settings/menu_categories/edit.html.erb b/app/views/settings/menu_categories/edit.html.erb index 0b31a2b2..b50e3626 100644 --- a/app/views/settings/menu_categories/edit.html.erb +++ b/app/views/settings/menu_categories/edit.html.erb @@ -1,10 +1,12 @@ -
-
- -
- <%= render 'form', settings_menu_category: @settings_menu_category %> +
+
    +
  1. Home
    2. +
  2. Menu Categories
    3. +
  3. 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/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 9345469c..718eba9b 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -1,16 +1,26 @@ -
-
    -
  • Home
    • -
  • Menu Categories
    • - - - -
+
    +
  1. Home
    2. +
  2. Menu Category
    3. + + <%= link_to 'Back', dashboard_path %> + +
- -
-
+
+
+
+
    +
  • <%= link_to 'Menu Categories', dashboard_path %>
    • +
  • <%= link_to 'Menu Item', dashboard_path %>
    • +
  • <%= link_to 'Item Set', dashboard_path %>
    • +
  • <%= link_to 'Simple Menu', dashboard_path %>
    • +
  • <%= link_to 'Set Menu', dashboard_path %>
    • +
+
+
+
+
@@ -20,26 +30,39 @@ - - + <% @settings_menu_categories.each do |settings_menu_category| %> - - - + + + - - - - - + + + + + - - <% end %> - -
Is Available Order by ParentActions
<%= link_to settings_menu_category.menu.name, settings_menu_path(settings_menu_category.menu) %><%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %>
<%= link_to settings_menu_category.menu.name, settings_menu_path(settings_menu_category.menu) %><%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %><%= settings_menu_category.alt_name rescue ''%><%= settings_menu_category.is_available rescue false%><%= settings_menu_category.order_by rescue ''%><%= settings_menu_category.parent.name rescue ''%><%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %> | <%= link_to 'Destroy', settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' } %><%= settings_menu_category.alt_name rescue ''%><%= settings_menu_category.is_available rescue false%><%= settings_menu_category.order_by rescue ''%><%= settings_menu_category.parent.name rescue ''%><%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to 'Destroy', settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
-
+ + <% end %> + + +
<%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> +
+
+
+
+ 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/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 737709cd..6e296639 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,93 +1,120 @@
- +
    +
  1. Home
    2. +
  2. Menu Category
    3. +
  3. Detail
    4. + + <%= link_to 'Back', settings_menu_categories_path %> + +
-
-
-

Menu Category

- - - - - - - - - - - - - - - - - - - - - - - -
MenuNameAlt nameIs AvailableOrder byCreated AtAction
<%= @settings_menu_category.menu.name %><%= @settings_menu_category.name rescue "-" %><%= @settings_menu_category.alt_name %><%= settings_menu_category.is_available rescue false%><%= @settings_menu_category.order_by %><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category) %>
+
+
+
+
    +
  • <%= link_to 'Menu Categories', dashboard_path %>
    • +
  • <%= link_to 'Menu Item', dashboard_path %>
    • +
  • <%= link_to 'Item Set', dashboard_path %>
    • +
  • <%= link_to 'Simple Menu', dashboard_path %>
    • +
  • <%= link_to 'Set Menu', dashboard_path %>
    • +
+
-
+
+
+
+

Menu Category

+ + + + + + + + + + + + -
-
-
-

Menu Items - - <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> - <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> +

+ + + + + + + + + + +
MenuNameAlt nameIs AvailableOrder byCreated AtAction
<%= @settings_menu_category.menu.name %><%= @settings_menu_category.name rescue "-" %><%= @settings_menu_category.alt_name %><%= settings_menu_category.is_available rescue false%><%= @settings_menu_category.order_by %><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d") %><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
+
+
- - - - - - - - - - - +
+
+

Menu Items + + <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> + <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> -

- - - <% settings_menu_items = @settings_menu_category.menu_items %> - - <% settings_menu_items.each do |settings_menu_item| %> - - - - - - - + +
Item codeNameAlt nameTypeParent ItemCreated byCreated at
<%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %>
+ + + + + + + + + - + + + + <% settings_menu_items = @settings_menu_category.menu_items %> + + <% settings_menu_items.each do |settings_menu_item| %> + + + + + + + - <% if settings_menu_item.type == "SimpleMenuItem" %> - - - - <% else %> - - - - <% end %> - - <% end %> - -
Item codeNameAlt nameTypeParent ItemCreated at<%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
<%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %> + <% if settings_menu_item.type == "SimpleMenuItem" %> + + <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + <% else %> + <%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm 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/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index d82b8486..19f1799f 100644 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -1,18 +1,16 @@ - -
-
- -
- <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %> +
+
    +
  1. Home
    2. +
  2. Menu Item
    3. +
  3. 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/promotion_products/show.html.erb b/app/views/settings/promotion_products/show.html.erb index 9f414b57..08654f90 100644 --- a/app/views/settings/promotion_products/show.html.erb +++ b/app/views/settings/promotion_products/show.html.erb @@ -1,4 +1,4 @@ - + + +
+
    +
  1. Home
    2. +
  2. Promotion Products
    3. +
  3. Edit
    4. + + <%= link_to 'Back', settings_products_path %> + +
-
+
+ + +
+
+

Promotion Product

@@ -20,9 +36,25 @@ - +
Net off<%= @promotion_product.net_off %>
Net Price<%= @promotion_product.net_price %>
Percentage<%= @promotion_product.percentage %>
<%= link_to 'Edit', edit_settings_promotion_product_path(@promotion_product) %><%= link_to 'Destroy', settings_promotion_product_path(@promotion_product), method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= link_to 'Edit', edit_settings_promotion_product_path(@promotion_product),,:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to 'Destroy', settings_promotion_product_path(@promotion_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/rooms/index.html.erb b/app/views/settings/rooms/index.html.erb index 1480682d..9e4e0e48 100644 --- a/app/views/settings/rooms/index.html.erb +++ b/app/views/settings/rooms/index.html.erb @@ -1,51 +1,65 @@ - -
-
    -
  • Home
    • -
  • Rooms
    • - - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_room_path,:class => 'btn btn-primary btn-sm' %> - -
+
    +
  1. Home
    2. +
  2. Rooms
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
+
+
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_room_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> +
+
+ + + + + + + + + + + + + + -
-
-
NameStatusTypeSeaterOrder byis ActiveCreated ByCreated AtActions
- - - - - - - - - - - - - - - - <% @settings_rooms.each do |room| %> - - - - - - - - <% if Employee.exists?(room.created_by) %> - - <% else %> - + + <% @settings_rooms.each do |room| %> + + + + + + + + <% if Employee.exists?(room.created_by) %> + + <% else %> + + <% end %> + + + <% end %> - - - - - <% end %> - -
NameStatusTypeSeaterOrder byis ActiveCreated ByCreated At
<%= link_to room.name, settings_menu_path(room) %><%= room.status %>Room<%= room.seater rescue "-" %><%= room.order_by rescue "-" %><%= room.is_active %><%= Employee.find(room.created_by).name %><%= room.created_by %>
<%= link_to room.name, settings_menu_path(room) %><%= room.status %>Room<%= room.seater rescue "-" %><%= room.order_by rescue "-" %><%= room.is_active %><%= Employee.find(room.created_by).name %><%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,room),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to 'Destroy', settings_zone_room_path(@zone,room), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
<%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,room) %><%= link_to 'Destroy', settings_zone_room_path(@zone,room), 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 +
+
+
+ diff --git a/app/views/settings/rooms/show.html.erb b/app/views/settings/rooms/show.html.erb index 893ea325..16e0fd17 100644 --- a/app/views/settings/rooms/show.html.erb +++ b/app/views/settings/rooms/show.html.erb @@ -1,34 +1,36 @@
- +
    +
  1. Home
    2. +
  2. Rooms
    3. +
  3. Details
    4. + + <%= link_to 'Back', settings_zones_path %> + +
- -
-
-
-

Room

- - - - - - - - - - - - - - - +
+
+
+
+
+

Room

+
NameStatusRoomSeaterOrder byis ActiveCreated ByCreated At
+ - + + + + + + + + + + + + + + @@ -40,10 +42,24 @@ <% end %> - - - - -
<%= link_to @room.name, settings_menu_path(@room) %>NameStatusRoomSeaterOrder byis ActiveCreated ByCreated At
<%= @room.name %> <%= @room.status %> Room <%= @room.seater rescue "-" %><%= @room.created_by %><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %><%= link_to 'Destroy', settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %> + <%= link_to 'Destroy', settings_zone_room_path(@zone,@room), 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 +
+
+ + diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index 33be7f3a..da6c7f0d 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,54 +1,70 @@ -<%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> - <%= f.error_notification %> - -
-
-
- <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :min_qty %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> -
-
- <%= f.input :is_available, :class => "form-control" %> - <%= f.input :is_sub_item, :class => "form-control" %> +
+
+ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> + <%= f.error_notification %> - <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %> - - <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true }, :class => "form-control item_attributes" %> - - <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true }, :class => "form-control item_options" %> -
-
-
- -
-
+
-
- <% if f.object.image_path? %> +
+ <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :min_qty %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> +
+
+ <%= f.input :is_available, :class => "form-control" %> + + <%= f.input :is_sub_item, :class => "form-control" %> + + <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %> + + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true }, :class => "form-control item_attributes" %> + + <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true }, :class => "form-control item_options" %> +
+
+
+ +
+
+
+
+ <% if f.object.image_path? %>

<%= f.object.name %>

<%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> - <% else %> + <% else %>

Menu Item Image

<%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> + <% end %> +
+ <%= f.file_field :image_path, :class => "img-thumbnail" %>
- <%= f.file_field :image_path, :class => "img-thumbnail" %> +
+ +
+
+ <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
+
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
- -
-
- <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> -
-
- -
- <%= f.button :submit %> -
+ <% 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 +
+
+
+
+ diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index bc9bc62b..762ed0d9 100644 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -1,4 +1,4 @@ -
+ +
+
    +
  1. Home
    2. +
  2. Menu Category
    3. +
  3. New
    4. + + <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %> + +
- +
+<%= render 'form', settings_set_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>