From 0d6167eca9761aaaeea142dd07d1d10e2d0c779c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 24 Oct 2017 15:22:34 +0630 Subject: [PATCH] update setting admin pages --- app/assets/javascripts/application.js | 22 ++++ app/assets/stylesheets/reset.css | 4 + .../settings/commissioners/_form.html.erb | 4 +- .../settings/commissioners/edit.html.erb | 12 +- app/views/settings/commissions/_form.html.erb | 44 ++++--- app/views/settings/commissions/edit.html.erb | 19 +-- app/views/settings/commissions/new.html.erb | 19 +-- app/views/settings/commissions/show.html.erb | 27 ++-- .../settings/dining_charges/_form.html.erb | 6 +- .../settings/dining_charges/edit.html.erb | 18 --- app/views/settings/employees/_form.html.erb | 8 +- app/views/settings/employees/show.html.erb | 76 ++++++----- app/views/settings/item_sets/_form.html.erb | 8 +- app/views/settings/item_sets/index.html.erb | 4 +- app/views/settings/item_sets/show.html.erb | 74 +++++++---- app/views/settings/lookups/_form.html.erb | 8 +- app/views/settings/lookups/index.html.erb | 4 +- app/views/settings/lookups/show.html.erb | 11 ++ .../membership_actions/_form.html.erb | 8 +- .../settings/membership_actions/show.html.erb | 3 +- .../membership_settings/_form.html.erb | 8 +- .../order_queue_stations/_form.html.erb | 8 +- .../order_queue_stations/show.html.erb | 118 ++++++++++-------- .../payment_method_settings/_form.html.erb | 8 +- .../payment_method_settings/index.html.erb | 8 +- .../payment_method_settings/show.html.erb | 21 +++- .../settings/processing_items/_form.html.erb | 2 +- app/views/settings/products/_form.html.erb | 8 +- app/views/settings/promotions/_form.html.erb | 50 ++++---- app/views/settings/promotions/edit.html.erb | 7 +- app/views/settings/promotions/new.html.erb | 4 +- app/views/settings/promotions/show.html.erb | 45 ++++--- app/views/settings/rooms/_form.html.erb | 10 +- app/views/settings/tables/_form.html.erb | 8 +- app/views/settings/tables/edit.html.erb | 10 -- app/views/settings/tables/new.html.erb | 5 +- app/views/settings/tables/show.html.erb | 6 +- app/views/settings/zones/_form.html.erb | 10 +- app/views/settings/zones/index.html.erb | 4 +- app/views/settings/zones/show.html.erb | 6 +- 40 files changed, 422 insertions(+), 303 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 28a1d23d..b4eae256 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -37,6 +37,28 @@ //= require select2 //= require custom.js +$(document).on('turbolinks:load', function() { + + $('.datetimepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM YYYY - HH:mm', + clearButton: true, + weekStart: 1 + }); + + $('.datepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM-YYYY', + clearButton: true, + weekStart: 1, + time: false + }); + + $('.timepicker').bootstrapMaterialDatePicker({ + format: 'HH:mm', + clearButton: true, + date: false + }); + +}); $(function(){ // Image Upload diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index 5aa94bb9..e79eb0b2 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -194,5 +194,9 @@ section.content { padding: 5px 13px; } +.dtp .dtp-buttons .dtp-btn-clear ,.dtp-btn-now ,.dtp-btn-ok ,.dtp-btn-cancel { + background-color: #007d72 !important; +} + /* End Reset Theme */ /* *************************************************** */ \ No newline at end of file diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb index 28ce6fe9..4ff75432 100755 --- a/app/views/settings/commissioners/_form.html.erb +++ b/app/views/settings/commissioners/_form.html.erb @@ -37,7 +37,7 @@ - --> diff --git a/app/views/settings/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb index b5da1ebe..5a8701a5 100755 --- a/app/views/settings/commissioners/edit.html.erb +++ b/app/views/settings/commissioners/edit.html.erb @@ -1,14 +1,4 @@ - +
  1. Home
    2. diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb index 24e10366..8cc04475 100755 --- a/app/views/settings/commissions/_form.html.erb +++ b/app/views/settings/commissions/_form.html.erb @@ -1,18 +1,34 @@ -
    -<%= simple_form_for([:settings,@commission]) do |f| %> - <%= f.error_notification %> +
    +
    +
    -
    - <%= f.label :product_code, 'Product' %> - <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %>
    - <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %> - <%= f.input :amount %> - + <%= simple_form_for([:settings,@commission]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.label :product_code, 'Product' %> + <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %>
    + <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %> + <%= f.input :amount %> + + +

    +
    + <%= f.submit 'Submit', class: 'btn btn-primary wave-effects' %> +
    + <% end %> -

    -
    - <%= link_to t('.new', :default => t("views.btn.new")), settings_commissions_path, class: 'btn btn-success' %> - <%= f.button :submit, class: 'btn btn-info' %>
    -<% 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/edit.html.erb b/app/views/settings/commissions/edit.html.erb index ab93e2bc..13abfa88 100755 --- a/app/views/settings/commissions/edit.html.erb +++ b/app/views/settings/commissions/edit.html.erb @@ -1,10 +1,11 @@ -
    -
    - -
    - <%= render 'form', commission: @commission %> +
    +
      +
    1. Home
      2. +
    2. Commission
      3. +
    3. Edit
      4. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> + +
    + <%= render 'form', commission: @commission %> \ No newline at end of file diff --git a/app/views/settings/commissions/new.html.erb b/app/views/settings/commissions/new.html.erb index 35560940..d0928d4a 100755 --- a/app/views/settings/commissions/new.html.erb +++ b/app/views/settings/commissions/new.html.erb @@ -1,10 +1,11 @@ -
    -
    - -
    - <%= render 'form', commission: @commission %> +
    +
      +
    1. Home
      2. +
    2. Commission
      3. +
    3. New
      4. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> + +
    + <%= render 'form', commission: @commission %> \ No newline at end of file diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb index cc929544..f385890c 100755 --- a/app/views/settings/commissions/show.html.erb +++ b/app/views/settings/commissions/show.html.erb @@ -1,7 +1,7 @@
    1. Home
      2. -
    2. Commissioner
      3. +
    3. Commission
    4. Details
      5. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> @@ -9,25 +9,27 @@
    -
    +
    +
    +

    Commission

    - + - + - + - + @@ -47,5 +49,16 @@
    Product NameProduct Name <%= @commission.menu_item.name rescue '-' %>
    AmountAmount <%= @commission.amount %>
    Commission TypeCommission Type <%= @commission.commission_type %>
    ActiveActive <%= @commission.is_active %>
    -
    +
    +
    +
    + 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/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index a83f1a7d..acee9616 100755 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -1,9 +1,9 @@
    -
    +
    <%= 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 %> @@ -20,7 +20,7 @@
    <% end %>
    -
    +
    view_headline PAGE DETAIL
    diff --git a/app/views/settings/dining_charges/edit.html.erb b/app/views/settings/dining_charges/edit.html.erb index 12316e27..7ffedcb1 100755 --- a/app/views/settings/dining_charges/edit.html.erb +++ b/app/views/settings/dining_charges/edit.html.erb @@ -1,22 +1,4 @@ - - -
      diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb index 0a6986e9..4dcb446c 100755 --- a/app/views/settings/employees/_form.html.erb +++ b/app/views/settings/employees/_form.html.erb @@ -1,9 +1,9 @@
      -
      +
      <%= simple_form_for([:settings,@employee]) do |f| %> <%= f.error_notification %> -
      +
      <%= f.input :name %> <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %> <%= f.input :emp_id, :as => :integer, :label => "Employee Numberic ID (*Unique)" %> @@ -11,12 +11,12 @@
      -
      +
      <%= 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/employees/show.html.erb b/app/views/settings/employees/show.html.erb index 7d2ddd8d..35d3dac4 100755 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -19,43 +19,63 @@

      -
      -
      -

      Employee

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

      Employee

      +
      NameRoleCreated At
      + + + + + + + + + + + + + + + - - - - - - - - - + + +
      Name<%= @employee.name %>
      Role<%= @employee.role %>
      Created At<%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
      Updated AtActions
      <%= @employee.name %><%= @employee.role %><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
      - <%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %> - <%if @employee.role != "administrator"%> + <%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %> + <%if @employee.role != "administrator"%> - + - - <%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/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index 3de13df0..b1f976ba 100755 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -1,23 +1,23 @@
      -
      +
      <%= simple_form_for([:settings,@settings_item_set]) do |f| %> <%= f.error_notification %> -
      +
      <%= f.input :name %> <%= f.input :alt_name %> <%= f.input :min_selectable_qty,input_html: {value: f.object.min_selectable_qty || '0'} %> <%= f.input :max_selectable_qty,input_html: {value: f.object.max_selectable_qty || '0'} %>
      -
      +
      <%= 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/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index 9232f10d..8a9e01e3 100755 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -37,14 +37,14 @@ <%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary waves-effect' %> -
    -
    +
    +
    +
    +
    + -
    -
    + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - -
    Name:<%= @settings_item_set.name %>
    Alt Name:<%= @settings_item_set.alt_name %>
    Min selectable qty: <%= @settings_item_set.min_selectable_qty %>
    Max selectable qty:<%= @settings_item_set.max_selectable_qty %>
    <%= link_to t("views.btn.edit"), edit_settings_item_set_path(@settings_item_set),:class=>'btn btn-sm btn-primary waves-effect' %> + + -
    Name:<%= @settings_item_set.name %>
    Alt Name:<%= @settings_item_set.alt_name %>
    Min selectable qty: <%= @settings_item_set.min_selectable_qty %>
    Max selectable qty:<%= @settings_item_set.max_selectable_qty %>
    + + + + +
    +
    +
    +
    +
    + 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/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb index 556c6de0..18403960 100755 --- a/app/views/settings/lookups/_form.html.erb +++ b/app/views/settings/lookups/_form.html.erb @@ -1,22 +1,22 @@
    -
    +
    <%= simple_form_for([:settings,@settings_lookup]) do |f| %> <%= f.error_notification %> -
    +
    <%= f.input :lookup_type %> <%= f.input :name %> <%= f.input :value %>
    -
    +
    <%= 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/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index d758a686..85588d6a 100755 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -34,14 +34,14 @@ <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> - + +
    diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index ab0270e2..ce88a087 100755 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -1,10 +1,10 @@
    -
    +
    <%= simple_form_for([:settings,@settings_membership_action]) do |f| %> <%= f.error_notification %> -
    +
    <%= f.input :membership_type %> <%= f.input :is_active %> <%= f.input :gateway_communication_type %> @@ -14,12 +14,12 @@ <%= f.input :created_by %>
    -
    +
    <%= 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/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb index ca73df77..58193063 100755 --- a/app/views/settings/membership_actions/show.html.erb +++ b/app/views/settings/membership_actions/show.html.erb @@ -46,7 +46,8 @@ <%= @settings_membership_action.additional_parameter %> - + + <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
+
-
-
- - +
+
+ @@ -61,6 +61,15 @@
Payment method:
-
+
+
+
+
+ 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/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 8230e4e6..b97f43bb 100755 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -18,7 +18,7 @@
-

<%= category.name %>

+
<%= category.name %>
@@ -62,7 +62,7 @@
-
+
view_headline PAGE DETAIL
diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb index bd35ce0d..f6f427d8 100755 --- a/app/views/settings/zones/_form.html.erb +++ b/app/views/settings/zones/_form.html.erb @@ -1,20 +1,20 @@
-
+
<%= simple_form_for([:settings,@settings_zone]) do |f| %> <%= f.error_notification %> -
+
<%= f.input :name %> <%= f.input :is_active %>
-
- <%= f.submit "Create Zone",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
<% end %>
-
+
view_headline PAGE DETAIL
diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb index 13679733..554b9dc6 100755 --- a/app/views/settings/zones/index.html.erb +++ b/app/views/settings/zones/index.html.erb @@ -36,8 +36,8 @@ <%= settings_zone.created_by %> <% end %> - <%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb index c7aba050..9a431987 100755 --- a/app/views/settings/zones/show.html.erb +++ b/app/views/settings/zones/show.html.erb @@ -12,7 +12,7 @@
-
+

Zone

@@ -36,7 +36,7 @@ <%= @settings_zone.created_by %> <% end %> - <%= link_to t("views.btn.edit"),edit_settings_zone_path(@settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"),edit_settings_zone_path(@settings_zone),:class => 'btn btn-primary btn-sm waves-effect' %> @@ -109,7 +109,7 @@
-
+
Zone