diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d2e6eadb..481ba20e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -180,6 +180,11 @@ section.content { .nav-tabs .nav-link { padding: 0.7286em .8575em; } + +.checkbox label input[type=checkbox], label.checkbox-inline input[type=checkbox] { + opacity:0 !important; + margin-right:15px; +} /* End Reset Theme */ /* *************************************************** */ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 11c77361..9a16a42c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,10 +15,8 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index 6bc26d99..abaea5b6 100644 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -39,9 +39,17 @@ <%= account.bonus %> <%= account.rebate %> - <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to t("views.btn.delete"), settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %> + + + + <% end %> diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index 521a84a5..949e9302 100644 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -40,7 +40,17 @@ <%= settings_cashier_terminal.show_cashier %> <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + + + + + <% end %> diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb index 03be91b7..28ce6fe9 100644 --- a/app/views/settings/commissioners/_form.html.erb +++ b/app/views/settings/commissioners/_form.html.erb @@ -17,9 +17,8 @@ <%= f.text_field :joined_date, {class: 'form-control datepicker', id: 'joined_date', readonly: true} %>
<%= f.label :resigned_date %>
<%= f.text_field :resigned_date, {class: 'form-control datepicker', id: 'resigned_date', readonly: true} %>
- + <%= f.input :is_active %> -
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index eae016c7..dd7feaf5 100644 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -39,7 +39,16 @@ <%= commissioner.is_active %> <%= link_to t("views.btn.show"), settings_commissioner_path(commissioner),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'},:class => 'btn btn-danger btn-sm waves-effect' %> + + + + + <% end %> diff --git a/app/views/settings/dining_charges/index.html.erb b/app/views/settings/dining_charges/index.html.erb index 73f91387..40bf3bfd 100644 --- a/app/views/settings/dining_charges/index.html.erb +++ b/app/views/settings/dining_charges/index.html.erb @@ -14,7 +14,16 @@ <%= link_to t("views.btn.show"), dining_charge %> <%= link_to t("views.btn.edit"), edit_dining_charge_path(dining_charge) %> - <%= link_to t("views.btn.delete"), dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %> + + + + + <% end %> diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index 73781bfd..57a5cf32 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -36,9 +36,15 @@ <%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %> <%if employee.role != "administrator"%> + - <%= link_to t("views.btn.delete"), settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> - <%end%> + + <%end%> <% end %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index e28564f3..9232f10d 100644 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -34,9 +34,19 @@ <%= item.alt_name %> <%= item.min_selectable_qty %> <%= item.max_selectable_qty %> - <%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> - <%= link_to t("views.btn.edit"), edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary' %> - <%= link_to t("views.btn.delete"), settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> + <%= 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' %> + + + + + + <% end %> diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index f812e38f..d758a686 100644 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -32,7 +32,18 @@ <%= settings_lookup.name %> <%= settings_lookup.value %> - <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> <%= link_to t("views.btn.delete"), settings_lookup_path(settings_lookup), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> + + + + + <% end %> diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 3bac3cb4..79bacf00 100644 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -19,7 +19,7 @@ div.form-inputs span{ <%= 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.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox'%> <%= f.input :cut_per_item %> <%= f.input :use_alternate_name %> <%= f.input :processing_items, as: :hidden %> diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index f6626fa1..a0714e05 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -29,7 +29,7 @@ Alternate name Created At - Updated At + Action @@ -47,7 +47,7 @@ <%= settings_order_queue_station.use_alternate_name %> <%= 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 t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index 4f08f676..3ad65718 100644 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -15,7 +15,7 @@
- <%= f.button :submit %> + <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
<% end %> diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb index 9a0d2889..d66183d0 100644 --- a/app/views/settings/payment_method_settings/index.html.erb +++ b/app/views/settings/payment_method_settings/index.html.erb @@ -21,7 +21,7 @@ Payment method Is active - Gateway communication type + Gateway Comm type Gateway url Auth token Merchant account @@ -39,7 +39,16 @@ <%= settings_payment_method_setting.auth_token %> <%= settings_payment_method_setting.merchant_account_id %> <%= link_to t("views.btn.edit"), edit_settings_payment_method_setting_path(settings_payment_method_setting),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + + + + <% end %> diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb index 3bee23d5..bc4209bf 100644 --- a/app/views/settings/products/_form.html.erb +++ b/app/views/settings/products/_form.html.erb @@ -10,7 +10,7 @@ <%= f.input :unit_price %> <%= f.input :description %> <%= f.input :information %> - + <%= f.input:taxable %> diff --git a/app/views/settings/products/index.html.erb b/app/views/settings/products/index.html.erb index 6f49854b..2284e04f 100644 --- a/app/views/settings/products/index.html.erb +++ b/app/views/settings/products/index.html.erb @@ -8,7 +8,7 @@ -
+
@@ -43,7 +43,16 @@ <%= settings_product.taxable %> <%= link_to t("views.btn.show"), settings_product_path(settings_product),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_product_path(settings_product),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + + + + <% end %> diff --git a/app/views/settings/promotion_products/index.html.erb b/app/views/settings/promotion_products/index.html.erb index 955c2b16..b218e8d8 100644 --- a/app/views/settings/promotion_products/index.html.erb +++ b/app/views/settings/promotion_products/index.html.erb @@ -38,9 +38,17 @@ <%= pro.net_off rescue "-" %> <%= pro.net_price rescue "-" %> <%= pro.percentage %> - <%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p"),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to t("views.btn.edit"), edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to t("views.btn.delete"), settings_promotion_promotion_product_path(pro), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + <%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p"),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %> + + + + <% end %> diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index 1760f894..ac57343f 100644 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -1,5 +1,10 @@ -<%= simple_nested_form_for([:settings,@promotion]) do |f| %> + + + +
+
+ <%= simple_nested_form_for([:settings,@promotion]) do |f| %> <%= f.error_notification %>
@@ -147,6 +152,19 @@ <%= f.button :submit %>
<% 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 +
+
+
+
+