diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js index e9c764fe..a57de941 100755 --- a/app/assets/javascripts/CRM.js +++ b/app/assets/javascripts/CRM.js @@ -16,9 +16,22 @@ //= require bootstrap/js/bootstrap-material-design.min //= require jquery_ujs //= require turbolinks +//= require momentjs/moment +//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js //= require sweetalert/sweetalert.min.js //= require BSBMaterial/admin.js //= require BSBMaterial/demo.js //= require custom.js + +$(document).on('turbolinks:load', function() { + + $('.datepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM-YYYY', + clearButton: true, + weekStart: 1, + time: false + }); + +}); \ No newline at end of file diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b4eae256..1bf91306 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -59,7 +59,7 @@ $(document).on('turbolinks:load', function() { }); }); -$(function(){ +$(document).on('turbolinks:load', function() { // Image Upload $("#simple_menu_item_image_path").fileinput({ diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 1509a71b..46543c6b 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -1,5 +1,5 @@ -$(function(){ +$(document).on('turbolinks:load', function() { $('body').bootstrapMaterialDesign(); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index be16da51..fae66e28 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -3,7 +3,7 @@ -
+
    <% @menu.each do |menu| %> @@ -19,17 +19,17 @@
-
+
-
+

- ORDER DETAILS | Table <%=@table.name%> + ORDER DETAILS | Table<%=@table.name%> diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 3f48ac92..66fadd48 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -127,7 +127,7 @@
-
+
Receipt No: <% if @status_sale == 'sale' %> @@ -142,7 +142,7 @@
-
+
<% if @status_sale == 'sale' %> diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 7df2038d..60aa775f 100755 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -220,17 +220,22 @@ $(document).ready(function(){ var dining_id = $(this).attr("data-id"); var change_from = "<%= @dining.id %>"; if (dining_id == change_from) { - $.alert({ + /*$.alert({ title: 'Alert!', content: 'Please Select Another Table', type: 'red', typeAnimated: true, btnClass: 'btn-danger', - }); - }else{ - $('#moved').text(" ' " + dining_name + " ' ") - $('#change_table_value').val(dining_id); - } + });*/ + swal({ + title: "Alert!!", + text: 'Please Select Another Table !', + type: 'warning', + }); + }else{ + $('#moved').text(" ' " + dining_name + " ' ") + $('#change_table_value').val(dining_id); + } }) @@ -241,13 +246,11 @@ $(document).ready(function(){ var dining_id = $(this).attr("data-id"); var change_from = "<%= @dining.id %>"; if (dining_id == change_from) { - $.alert({ - title: 'Alert!', - content: 'Please Select Another Table', - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - }); + swal({ + title: "Alert!!", + text: 'Please Select Another Table !', + type: 'warning', + }); }else{ $('#moved').text(dining_name) $('#change_table_value').val(dining_id); @@ -258,18 +261,29 @@ $(document).ready(function(){ change_to = $('#change_table_value').val(); change_from = "<%= @dining.id %>"; if (change_to == ""){ - alert("Please Select Table") + swal({ + title: "Alert!!", + text: 'Please Select Table !', + type: 'warning', + }); }else{ $.ajax({type: "POST", url: "<%= origami_moving_path %>", data: "change_from="+ change_from + "&change_to=" + change_to, success:function(result){ - alert("Moving Success") - if (result.get_type == 'Table'){ - window.location.href = '/origami/table/' + change_to; - }else{ - window.location.href = '/origami/room/' + change_to; - } + + swal({ + title: "Information!", + text: 'Moving Success', + type: 'success', + }, function (){ + if (result.get_type == 'Table'){ + window.location.href = '/origami/table/' + change_to; + }else{ + window.location.href = '/origami/room/' + change_to; + } + }); + } }); } diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index 7d395ab6..28930adf 100755 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -127,18 +127,18 @@
ORDERS DETAILS
-
+
-

Receipt No: -

+ Receipt No: +
-

Date: <%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

+ Date: <%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
-

Customer :

+ Customer :
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 5128e6f5..d0b3804b 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -130,27 +130,27 @@
-
+
-

Receipt No: + Receipt No: <% if @status_sale == 'sale' %> <%= @obj_sale.receipt_no rescue '' %> <% end %> -

+
-

Date: <%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

+ Date: <%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
-
+
<% if @status_sale == 'sale' %> -

Customer : <%= @obj_sale_sale.customer.name rescue '-' %>

+ Customer : <%= @obj_sale_sale.customer.name rescue '-' %> <%else%> -

Customer : <%= @customer.name rescue "-" %>

+ Customer : <%= @customer.name rescue "-" %> <%end%>
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 904d5896..dd8a0b4f 100755 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -112,20 +112,19 @@
INVOICE DETAILS
-
+
-

Receipt No: + Receipt No: <%= @sale.receipt_no rescue '' %> -

+
-

Date: <%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

+ Date: <%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
-
+
- -

Customer : <%= @sale.customer.name rescue "-" %>

+ Customer : <%= @sale.customer.name rescue "-" %>
diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index 8a9e01e3..2544ae35 100755 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -11,7 +11,19 @@
-
+
+
+
    +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
    • +
+
+
+
<%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index e451a70a..f41862ba 100755 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -11,11 +11,12 @@
    -
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • - +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
@@ -44,7 +45,7 @@ <%= settings_menu_category.order_by rescue ''%> <%= settings_menu_category.parent.name rescue ''%> <%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <% end %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index f8addee7..65bb50e4 100755 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -12,13 +12,14 @@
-
    -
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • - -
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • - -
+
    +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
    • +
@@ -31,8 +32,8 @@ Menu Name Alt name - Is Available - Order by + Available + Created At Actions @@ -44,10 +45,10 @@ <%= @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 t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %> - + <%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %> + diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb index b9f08a18..5e42ec4e 100755 --- a/app/views/settings/menu_item_attributes/index.html.erb +++ b/app/views/settings/menu_item_attributes/index.html.erb @@ -12,11 +12,12 @@
    -
  • <%= 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 %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index 90f0c43d..29c09223 100755 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -1,12 +1,12 @@
-
+
<%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %> <%= f.error_notification %>
-
+
<%= f.input :item_instance_code %> <%= f.input :item_instance_name %> <%= f.input :price %> @@ -28,13 +28,13 @@
-
+
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
<% end %>
-
+
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod diff --git a/app/views/settings/menu_item_instances/index.html.erb b/app/views/settings/menu_item_instances/index.html.erb index 3e43ff25..84f24627 100755 --- a/app/views/settings/menu_item_instances/index.html.erb +++ b/app/views/settings/menu_item_instances/index.html.erb @@ -83,13 +83,13 @@ <%=l settings_menu_item.created_at, :format => :short %> <% if settings_menu_item.type == "SimpleMenuItem" %> - <%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> - <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> - <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class=>"btn btn-primary waves-effect btn-sm" %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class=>"btn btn-info waves-effect btn-sm" %> + <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class=>"btn btn-danger waves-effect btn-sm" %> <% else %> - <%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> - <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> - <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ),,:class=>"btn btn-primary waves-effect btn-sm" %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),,:class=>"btn btn-info waves-effect btn-sm" %> + <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },,:class=>"btn btn-danger waves-effect btn-sm" %> <% end %> <% end %> diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 0be31de7..9e8b9f6d 100755 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -28,30 +28,37 @@

Menu Item Instance

- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + <% if params[:simple_menu_item_id] %> <% end %> - - +
Item Instance codeNamePriceOn PromotionPromotion PriceAvailableIs DefaultCreated At
Item Instance code <%= @settings_menu_item_instances.item_instance_code %>
Name <%= @settings_menu_item_instances.item_instance_name rescue "-" %>
Price <%= @settings_menu_item_instances.price %>
On Promotion <%= @settings_menu_item_instances.is_on_promotion %>
Promotion Price <%= @settings_menu_item_instances.promotion_price %>
Available <%= @settings_menu_item_instances.is_available %>
Is Default <%= @settings_menu_item_instances.is_default %>
Created At <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index cd4b503b..722a0ec8 100755 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -13,11 +13,12 @@
    -
  • <%= 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 %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 6b4a3271..0d2cd99e 100755 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -12,11 +12,12 @@

    +
  • <%= link_to 'Menu ', settings_menus_path %>
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • - +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index 3260c385..14f61299 100755 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -12,11 +12,14 @@
    +
      +
    • <%= link_to 'Menu ', settings_menus_path %>
    • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • <%= link_to 'Item Set', settings_item_sets_path %>
      • - +
    • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
      • +
    • <%= link_to 'Items Options', settings_menu_item_options_path %>
      • +
@@ -33,7 +36,7 @@ Valid To Created By Created At - Actions + Actions @@ -43,9 +46,8 @@ <%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %> <%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %> <%= @settings_menu.created_by %> - <%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %> - + <%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d") %> + <%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %> diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index 3e0bb3d5..f941bc13 100755 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -23,11 +23,12 @@
    -
  • <%= 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 %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index 592eda2d..134a52bc 100755 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -13,11 +13,12 @@
    -
  • <%= 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 %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
@@ -25,15 +26,16 @@

Menu Item

- +
+
- + - + @@ -44,12 +46,12 @@ - + - + - +
Item code NameAlt name Type Account TypeMenu category Min qty Created At Action
<%= @settings_menu_item.item_code %> <%= @settings_menu_item.name rescue "-" %><%= @settings_menu_item.alt_name %> <%= @settings_menu_item.type %> <%= @settings_menu_item.account.title %><%= @settings_menu_item.menu_category_id %> <%= @settings_menu_item.min_qty %><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %>
+
@@ -82,8 +85,8 @@ Instance name Attributes price - Promotion - promotion price + Actions @@ -97,13 +100,13 @@ <%= settings_menu_item.item_instance_code %> <%= settings_menu_item.item_instance_name %> <%= settings_menu_item.item_attributes %> - <%= settings_menu_item.price %> + <%= settings_menu_item.price %> <%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <% end %> @@ -114,10 +117,7 @@
- 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/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index 10a7abfe..984f8d95 100755 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -24,11 +24,12 @@
    -
  • <%= 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 %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 7983b7b3..a30d3b6c 100755 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -14,11 +14,12 @@
    -
  • <%= 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 %>
    • +
  • <%= link_to 'Menu ', settings_menus_path %>
    • +
  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
    • + +
  • <%= link_to 'Item Set', settings_item_sets_path %>
    • +
  • <%= link_to 'Items Attributes', settings_menu_item_attributes_path %>
    • +
  • <%= link_to 'Items Options', settings_menu_item_options_path %>
@@ -26,17 +27,18 @@

Menu Item

+
- + - + - + @@ -48,15 +50,15 @@ - + - - + + -
Item code NameAlt name Type AccoutMenu category Min qty Created At
<%= @settings_menu_item.item_code %> <%= @settings_menu_item.name rescue "-" %><%= @settings_menu_item.alt_name %> <%= @settings_menu_item.type %> <%= @settings_menu_item.account.title %><%= @settings_menu_item.menu_category_id %><%= @settings_menu_item.min_qty %> <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
+
@@ -110,8 +113,8 @@ - <%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb index 315a3f00..5a490d13 100755 --- a/app/views/settings/tax_profiles/_form.html.erb +++ b/app/views/settings/tax_profiles/_form.html.erb @@ -5,14 +5,14 @@ <%= simple_form_for([:settings, @settings_tax_profile ]) do |f| %> <%= f.error_notification %> -
+
<%= f.input :name %> <%= f.input :rate %> <%= f.input :inclusive %> <%= f.input :order_by %>
-
+
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
<% end %> diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb index 2f94e0e2..de3ab94e 100755 --- a/app/views/settings/tax_profiles/index.html.erb +++ b/app/views/settings/tax_profiles/index.html.erb @@ -35,7 +35,7 @@ <%= settings_tax_profile.order_by %> <%= settings_tax_profile.created_by %> <%= link_to t("views.btn.show"), settings_tax_profile_path(settings_tax_profile), :class => "btn btn-info btn-sm waves-effect" %> - <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/tax_profiles/new.html.erb b/app/views/settings/tax_profiles/new.html.erb index 4ce9ffb0..a5f3663e 100755 --- a/app/views/settings/tax_profiles/new.html.erb +++ b/app/views/settings/tax_profiles/new.html.erb @@ -1,4 +1,4 @@ -<%= link_to 'Back', settings_tax_profiles_path %> --> +
  1. Home
    2. diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb index 5e92bcea..d0808a49 100755 --- a/app/views/settings/tax_profiles/show.html.erb +++ b/app/views/settings/tax_profiles/show.html.erb @@ -1,10 +1,10 @@
      -
    1. Home
      2. -
    2. Tax Profiles
      3. +
    3. Home
      4. +
    4. Tax Profiles
    5. Details
      6. - <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profile_path %> + <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %>
    diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb index 19327139..451b4eb3 100755 --- a/app/views/transactions/credit_notes/index.html.erb +++ b/app/views/transactions/credit_notes/index.html.erb @@ -11,19 +11,19 @@
-
-
+
+
- - +
+ - + + + + +
+ <%= form_tag transactions_credit_notes_path, :method => :get do %> -
+
-
+
-
+
-
+
-
+
<% end %>
+
+
+
+ + @@ -82,6 +92,7 @@
+ diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 30152ae4..e3f0f91d 100755 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -10,7 +10,7 @@
-
+
<%= form_tag transactions_orders_path, :method => :get do %>
@@ -36,13 +36,14 @@
- - + +
<% end %> -
-
Sale Id Receipt no
+
+
+
@@ -76,6 +77,7 @@ <%= paginate @orders %> <%end%> + diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb index 95f39983..4820a4e1 100755 --- a/app/views/transactions/orders/show.html.erb +++ b/app/views/transactions/orders/show.html.erb @@ -12,7 +12,7 @@
-
+
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index c4767553..f918e7b6 100755 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -8,11 +8,11 @@
-
-
+
+
-
- +
+ + + + + +
<%= form_tag transactions_sales_path, :method => :get do %> @@ -32,12 +32,24 @@
- +
<% end %>
+ +
+
+
+ + + @@ -72,6 +84,7 @@ <%= paginate @sales %> <% end %> +
Sale Id Receipt no