diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a8174bbd..1ed96cea 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -72,34 +72,7 @@ function showConfirmMessage() { }); } - - - $(function(){ - $('.delete').click(function(){ - var currentForm = $(this).closest("form"); - console.log(currentForm); - swal({ - title: "Are you sure?", - text: "You will not be able to recover this imaginary file!", - type: "warning", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: "Yes, delete it!", - cancelButtonText: "No, cancel plx!", - closeOnConfirm: false, - closeOnCancel: false - }, function (isConfirm) { - console.log(isConfirm); - if (isConfirm) { - console.log("hi") - currentForm.submit(); - } else { - swal("Cancelled", "Your imaginary file is safe :)", "error"); - } - }); - }); - $('body').bootstrapMaterialDesign(); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); @@ -162,10 +135,60 @@ $(function(){ '\n', } }); + + $('.delete').click(function(){ + var method = $(this).attr('data-method'); + var url = $(this).attr('data-ref'); + var html = $(this).siblings.html(); + console.log(html); + swal({ + title: "Confirmation", + text: $(this).children().children('#delete_text').html(), + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + html: true + }, function (isConfirm) { + if (isConfirm) { + $.ajax({ + type: method, + url: url , + success: function(data) { + } + }); + } else { + swal("Cancelled", "Your imaginary file is safe :)", "error"); + } + }); + }); + + $('.dddddddd').click(function(){ + var currentForm = $(this).closest("form"); + bootbox.confirm({ + title: 'Confirmation', + message: $('#delete_text').html(), + buttons: { + 'cancel': { + label: 'No', + className: 'btn green col-md-4 pull-left' + }, + 'confirm': { + label: 'Yes', + className: 'btn red col-md-4 pull-right' + } + }, + callback: function(result) { + if (result) { + currentForm.submit(); + } + } + }); + }); + }); - $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ - $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); +$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ + $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); $('.dropdown-toggle').dropdown(); }); diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 8473ecf6..c9479d2d 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -131,7 +131,6 @@ $(function() { var code = ""; setTimeout(function(){ var hi=getQRCode(); - alert(hi); },100); }); @@ -231,39 +230,31 @@ $(document).on('click',".customer_tr",function(){ }) function update_sale(customer_id,sale_id) { - $.confirm({ - title: 'Confirm!', - content: 'Are You Sure to assign this customer!', - buttons: { + swal({ + title: "Confirmation", + text: "Are You Sure to assign this customer!", + type: "success", + showCancelButton: true, + confirmButtonColor: "green", + confirmButtonText: "Yes, delete it!", + closeOnConfirm: false + }, function () { + $.ajax({ + type: "POST", + url: "update_sale/" , + data: {customer_id:customer_id,sale_id:sale_id}, + dataType: "json", + success: function(data) { + if(data.status == true) + { + window.location.href = '/origami' + }else{ + swal("Alert!", "Record not found!", "error"); + location.reload(); + } - cancel: function () { - - }, - confirm: { - text: 'Confirm', - btnClass: 'btn-green', - keys: ['enter', 'shift'], - action: function(){ - $.ajax({ - type: "POST", - url: "update_sale/" , - data: {customer_id:customer_id,sale_id:sale_id}, - dataType: "json", - success: function(data) { - if(data.status == true) - { - window.location.href = '/origami' - }else{ - alert('Record not found!'); - location.reload(); - } - - } - }); - } - } - - } + } + }); }); } diff --git a/app/views/crm/dining_queues/assign.html.erb b/app/views/crm/dining_queues/assign.html.erb index cc36e1a9..9b2ca4a8 100644 --- a/app/views/crm/dining_queues/assign.html.erb +++ b/app/views/crm/dining_queues/assign.html.erb @@ -57,56 +57,32 @@ $(document).on('click',".assign_table",function(){ if (status == "available") { assign_table(queue_id,table_id,url); } else { - $.confirm({ - title: 'Alert!', - content: 'You cannot assign this table', - buttons: { - - confirm: { - text: 'Ok', - btnClass: 'btn-green', - - } - } - }); + swal ( "Alert!" , "You cannot assign this table!" , "warning" ); } }) function assign_table(id,table_id,url) { - $.confirm({ - title: 'Confirm!', - content: 'Are You Sure to assign this customer!', - buttons: { - - cancel: function () { - - }, - confirm: { - text: 'Confirm', - btnClass: 'btn-green', - keys: ['enter', 'shift'], - action: function(){ - $.ajax({ - type: "POST", - url: url , - data: {id:id,table_id:table_id}, - dataType: "json", - success: function(data) { - if(data.status == true) - { - window.location.href = '<%=crm_dining_queues_path%>' - }else{ - alert('Record not found!'); - location.reload(); - } - - } - }); - } - } - + swal({ + title: "Confirm!", + text: "Are You Sure to assign this customer!", + }, function () { + $.ajax({ + type: "POST", + url: url , + data: {id:id,table_id:table_id}, + dataType: "json", + success: function(data) { + if(data.status == true) + { + window.location.href = '<%=crm_dining_queues_path%>' + }else{ + swal ( "Alert!" , "Record not found!" , "warning" ); + location.reload(); } + + } }); + }); } diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 12714fc0..da7dac6b 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -91,35 +91,24 @@ $('#cancel').click(function() { function cancel_queue(id,url) { - $.confirm({ - title: 'Confirm!', - content: 'Are You Sure to cancel this Queue!', - buttons: { - cancel: function () { - }, - confirm: { - text: 'Confirm', - btnClass: 'btn-green', - keys: ['enter', 'shift'], - action: function(){ - $.ajax({ - type: "POST", - url: url , - data: {id:id}, - dataType: "json", - success: function(data) { - if(data.status == true) - { - location.reload(); - } + swal({ + title: "Confirm!", + text: "Are You Sure to cancel this Queue!", + }, function () { + $.ajax({ + type: "POST", + url: url , + data: {id:id}, + dataType: "json", + success: function(data) { + if(data.status == true) + { + location.reload(); + } - } - }); - } - } - - } - }); + } + }); + }); } diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 80c2f065..d60e6892 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,4 @@ - +Search Bar --> + + + +
+ + <% if current_login_employee %> + <%= current_login_employee.name %> + <% end %> @@ -51,3 +50,7 @@ + + + Action @@ -46,9 +46,9 @@ <%= print_setting.page_width %> <%= print_setting.page_height %> <%= print_setting.print_copies %> - <%= print_setting.precision %> - <%= print_setting.delimiter %> - <%= print_setting.heading_space %> + + + <%= link_to t("views.btn.show"), print_setting,:class => 'btn btn-primary btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_print_setting_path(print_setting),:class => 'btn btn-info btn-sm waves-effect' %> diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index fa170229..521a84a5 100644 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -20,10 +20,10 @@ Active Login? Auto print - Printer name + Show tax Show cashier - Show guest info + Action @@ -35,12 +35,12 @@ <%= settings_cashier_terminal.is_active %> <%= settings_cashier_terminal.is_currently_login %> <%= settings_cashier_terminal.auto_print_receipt %> - <%= settings_cashier_terminal.printer_name %> + <%= settings_cashier_terminal.show_tax %> <%= settings_cashier_terminal.show_cashier %> - <%= settings_cashier_terminal.show_guest_info %> - <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-lg 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-lg waves-effect' %> + + <%= 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/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb index d3eeb9b2..e635fd4e 100644 --- a/app/views/settings/menu_item_attributes/index.html.erb +++ b/app/views/settings/menu_item_attributes/index.html.erb @@ -1,12 +1,3 @@ -
  1. Home
    2. @@ -55,6 +46,14 @@ <%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(settings_menu_item_attribute),:class => 'btn btn-primary btn-sm waves-effect' %> <%= link_to t("views.btn.delete"), settings_menu_item_attribute_path(settings_menu_item_attribute), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + + <% end %> diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index 82210efc..ac1f0246 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -25,9 +25,9 @@ Is active Auto Print Print copy - Cut per item + Alternate name - Created by + Created At Updated At Action @@ -43,13 +43,12 @@ <%= settings_order_queue_station.auto_print %> <%= settings_order_queue_station.print_copy %> - <%= settings_order_queue_station.cut_per_item %> + <%= settings_order_queue_station.use_alternate_name %> - <%= settings_order_queue_station.created_by %> + <%= 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-lg waves-effect' %> + <%= 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 %>