From d5141c30bbe28276fe42662a489eb69b4a549343 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 25 Oct 2017 18:13:44 +0630 Subject: [PATCH] update promtion and dining charges --- app/assets/javascripts/application.js | 8 +- app/assets/stylesheets/reset.css | 6 ++ .../settings/dining_charges/_form.html.erb | 55 +++++++++-- .../settings/dining_charges/new.html.erb | 17 ---- .../settings/menu_categories/show.html.erb | 2 +- app/views/settings/promotions/_form.html.erb | 83 ++++++++-------- app/views/settings/rooms/_form.html.erb | 42 +++++--- .../settings/set_menu_items/_form.html.erb | 80 +++++++-------- .../settings/set_menu_items/index.html.erb | 4 +- .../settings/simple_menu_items/_form.html.erb | 98 +++++++++---------- app/views/settings/tables/_form.html.erb | 42 +++++--- app/views/transactions/sales/index.html.erb | 2 +- 12 files changed, 245 insertions(+), 194 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1bf91306..e8874135 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -104,10 +104,10 @@ $(document).on('turbolinks:load', function() { }); -$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ - $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); - $('.dropdown-toggle').dropdown(); -}); +// $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ +// $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); +// $('.dropdown-toggle').dropdown(); +// }); function export_to(path) { diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index b4dba99e..eae4b190 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -214,6 +214,12 @@ section.content { margin-top: 7px; } +.bmd-form-group .bmd-label-static{ + font-size: 0.85rem; +} +.form-group { + margin-bottom: 15px; +} /* FORM */ .input-group-addon { padding: 0rem 0rem; diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index acee9616..407832aa 100755 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -4,15 +4,52 @@ <%= 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',:class=>"col-md-9" } %> + <%= f.input :unit_price, :input_html => { :id => 'unit_price',:class=>"col-md-9"} %> + <%= f.input :taxable, :input_html => {:class=>"col-md-9"} %> + <%= f.input :charge_type, :collection => [:hr, :day], :input_html => {:class=>"col-md-8"} %> + + +
+ + access_time + + <% if !@dining_charge.minimum_free_time.nil?%> + + <% else %> + + <% end %> +
+ +
+ +
+ + access_time + + <% if !@dining_charge.charge_block.nil?%> + + <% else %> + + <% end %> +
+
+ <%= f.input :time_rounding, :collection => [:down, :up], :input_html => { :class=>"col-md-8"} %> + +
+ +
+ + access_time + + <% if !@dining_charge.time_rounding_block.nil?%> + + <% else %> + + <% end %> +
+
+ <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price',:class=>"col-md-8"} %>
diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb index ab7009c7..05bb525c 100755 --- a/app/views/settings/dining_charges/new.html.erb +++ b/app/views/settings/dining_charges/new.html.erb @@ -1,21 +1,4 @@ - -
  1. Home
    2. diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 65bb50e4..ce911ade 100755 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -105,7 +105,7 @@ <% 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 t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - + <% end %> diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index e68cb665..c0c05145 100755 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -6,7 +6,7 @@
    -
    +
    @@ -18,58 +18,58 @@
    -
    +
    date_range <% if !@promotion.promo_start_date.nil?%> - + <% else %> - + <% end %>
    -
    +
    date_range <% if !@promotion.promo_end_date.nil?%> - + <% else %> - + <% end %>
    -
    +
    access_time <% if !@promotion.promo_start_hour.nil?%> - + <% else %> - + <% end %>
    -
    +
    access_time <% if !@promotion.promo_end_hour.nil?%> - + <% else %> - + <% end %>
    -
    <%= f.input :min_qty %>
    +
    <%= f.input :min_qty %>

    -
    +
    Item Code
    Min Qty
    @@ -237,18 +238,18 @@ $(document).ready(function(){ // $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00"); // }); - $('.datepicker').bootstrapMaterialDatePicker({ - format: 'dddd DD MM YYYY', - clearButton: true, - weekStart: 1, - time: false - }); + // $('.datepicker').bootstrapMaterialDatePicker({ + // format: 'dddd DD MM YYYY', + // clearButton: true, + // weekStart: 1, + // time: false + // }); - $('.timepicker').bootstrapMaterialDatePicker({ - format: 'HH:mm', - clearButton: true, - date: false - }); + // $('.timepicker').bootstrapMaterialDatePicker({ + // format: 'HH:mm', + // clearButton: true, + // date: false + // }); // var dayy = $("#promotion_promo_day").val().replace("[","").replace("]",""); // jQuery.each( dayy.split(","), function( i, d ) { @@ -283,8 +284,8 @@ $(".selectDay").click(function() { document.getElementById("promotion_promo_day").value = day; }); - $("#promotion_original_product").select2(); - $(".item_code_place").select2(); + // $("#promotion_original_product").select2(); + // $(".item_code_place").select2(); $(".item_code_place").on('change', function(event) { var ajax_url = "<%= settings_find_item_instance_path %>"; @@ -300,19 +301,19 @@ $(".selectDay").click(function() { itemlist += "" } $("#promotion_original_product").append(itemlist); - $("#promotion_original_product").select2(); + //$("#promotion_original_product").select2(); } }); }); - $(".promotion_promotion_products_item_code select").select2(); - $(".item_code_place1").select2(); + //$(".promotion_promotion_products_item_code select").select2(); + //$(".item_code_place1").select2(); callforpromoproduct(); $(".addProduct").on('click', function(event) { setTimeout(function(){ - $(".promotion_promotion_products_item_code select").select2(); + // $(".promotion_promotion_products_item_code select").select2(); callforpromoproduct(); }, 0); }); @@ -332,7 +333,7 @@ $(".selectDay").click(function() { $("select#"+select_id).empty(); $("select#"+select_id).append(""); $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").find("option[value='"+result[1]+"']").attr("selected","true") - $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").select2(); + // $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").select2(); } } }); @@ -340,7 +341,7 @@ $(".selectDay").click(function() { // promotion_promotion_products_attributes_0_item_code function callforpromoproduct(){ - $(".item_code_place1").select2(); + //$(".item_code_place1").select2(); $(".item_code_place1").on('change', function(event) { id = $(this).parent().next().find("select").attr("id"); var ajax_url = "<%= settings_find_item_instance_path %>"; @@ -356,7 +357,7 @@ $(".selectDay").click(function() { itemlist += "" } $("select#"+id).append(itemlist); - $("select#"+id).select2(); + //$("select#"+id).select2(); } }); }); diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb index 209ae5c8..d4683fe4 100755 --- a/app/views/settings/rooms/_form.html.erb +++ b/app/views/settings/rooms/_form.html.erb @@ -13,24 +13,44 @@ <%= f.input :is_active %> <% if @settings_room.dining_charges.length == 0 %> <% if @settings_room.id != nil %> -
    -
    - <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn btn-primary' %> +
    +
    + <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn bg-deep-purple' %>
    <% end %> <% else %> <% @settings_room.dining_charges.each do |dc| %> -
    -
    Dining Charge
    -
    item code : <%= dc.item_code %>
    -
    Unit price : <%= dc.unit_price %>
    -
    Charge type : <%= dc.charge_type %>
    -
    - <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn btn-primary' %> + +
    +
    + + + + + + + + + + + + + + + + + + + +
    +
    Dining Charge
    Item code :<%= dc.item_code %>
    Unit price : <%= dc.unit_price %>
    Charge type : <%= dc.charge_type %>
    + <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn bg-deep-purple' %> + +
    -
    +
    <% end %> <% end %>
    diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index bdb0d6ea..7efe0a80 100755 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,62 +1,62 @@
    -
    +
    <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> +
    +
    +
    + <%= f.input :item_code,:input_html => {:class => "col-md-9"} %> + <%= f.input :name,:input_html => {:class => "col-md-9"} %> + <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %> + <%= f.input :type,:input_html => {:class => "col-md-9"} %> + <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> -
    -
    -
    - <%= 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_available,:input_html => {:class => "col-md-9"} %> - <%= f.input :is_sub_item, :class => "form-control" %> + <%= f.input :is_sub_item,:input_html => {:class => "col-md-9"} %> - <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %> + <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:input_html => {:class => "col-md-9"} %> +
    +
    - <%= 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 %> -

    Menu Item Image

    - <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true,:class => "form-control item_attributes col-md-9" } %> + + <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true,:class => "form-control item_options col-md-9" } %> + +
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

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

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% 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.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.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/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index f941bc13..a8008306 100755 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -105,11 +105,11 @@ <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= 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 btn-sm waves-effect'%> + <% else %> <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= 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 btn-sm waves-effect' %> + <% end %> <% end %> diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 723e65f5..69093db3 100755 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,68 +1,58 @@
    - <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> - <%= f.error_notification %> + <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> + <%= f.error_notification %> +
    +
    +
    + <%= f.input :item_code,:input_html => {:class => "col-md-9"} %> + <%= f.input :name,:input_html => {:class => "col-md-9"} %> + <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %> + <%= f.input :type,:input_html => {:class => "col-md-9"} %> + <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> + + <%= f.input :is_available,:input_html => {:class => "col-md-9"} %> -
    -
    -
    - <%= 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,:input_html => {:class => "col-md-9"} %> - <%= f.input :is_sub_item, :class => "form-control" %> + <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:input_html => {:class => "col-md-9"} %> +
    +
    - <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %> +
    + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true,:class => "col-md-9 item_attributes" } %> - <%= 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 => "col-md-9" } %> - <%= 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,:input_html => { :class => "col-md-4 img-thumbnail" } %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png",:input_html => { :class => "col-md-4 img-thumbnail" } %> + <% end %> +
    + <%= f.file_field :image_path,:input_html => { :class => "col-md-4 img-thumbnail" } %> + + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true,:class => "form-control item_sets col-md-9" } %> + +
    + <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
    +
    +
    + <% end %>
    - -
    -
    -
    -
    - <% if f.object.image_path? %> -

    <%= f.object.name %>

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

    Menu Item Image

    - <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> -
    - <%= 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' %> -
    -
    -<% 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 + 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/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb index 682df12d..45db4ed9 100755 --- a/app/views/settings/tables/_form.html.erb +++ b/app/views/settings/tables/_form.html.erb @@ -11,29 +11,43 @@ <%= f.input :is_active %> <% if @settings_table.dining_charges.length == 0 %> <% if @settings_table.id != nil %> -
    -
    - <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %> +
    + <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn bg-deep-purple' %>
    -
    <% end %> <% else %> <% @settings_table.dining_charges.each do |dc| %> -
    -
    Dining Charge
    -
    item code : <%= dc.item_code %>
    -
    Unit price : <%= dc.unit_price %>
    -
    Charge type : <%= dc.charge_type %>
    -
    - <%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn btn-primary' %> - -
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    +
    Dining Charge
    Item code :<%= dc.item_code %>
    Unit price : <%= dc.unit_price %>
    Charge type : <%= dc.charge_type %>
    <%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %> +
    +
    <% end %> <% end %>
    -
    +
    <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
    <% end %> diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index f918e7b6..6a534715 100755 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -34,7 +34,7 @@
    -
    +
    <% end %>