diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 50dc4741..d523e7e6 100644 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -61,7 +61,7 @@ $(function(){ +JSON.stringify(item_attributes)+"' data-toggle='modal' data-target='.sx_item_detailModal'>" +"
" - +"" + +"" +"
" +'
' @@ -170,7 +170,7 @@ $(function(){ +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>" +"
" - +"" + +"" +"
" +'
' diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7491e075..f9661398 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,7 +16,6 @@ //= require bootstrap/js/popper.min //= require bootstrap/js/bootstrap-material-design.min //= require jquery_ujs -//= require jquery-confirm //= require turbolinks //= require cable //= require settings/processing_items @@ -25,6 +24,7 @@ //= require bootstrap-select/js/bootstrap-select //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js +//= require sweetalert/sweetalert.min.js //= require autosize/autosize.js //= require jquery-countto/jquery.countTo.js //= require raphael/raphael.min @@ -34,9 +34,9 @@ //= require BSBMaterial/pages/index.js //= require BSBMaterial/demo.js + $(document).on('turbolinks:load', function() { - // $(document).ready(function(){ - //Datetimepicker plugin + $('.datetimepicker').bootstrapMaterialDatePicker({ format: 'DD-MM YYYY - HH:mm', clearButton: true, @@ -55,14 +55,25 @@ $(document).on('turbolinks:load', function() { clearButton: true, date: false }); -/* - $('.datepicker').attr('ReadOnly','true'); - $('.datepicker').css('cursor','pointer');*/ - + }); +function showConfirmMessage() { + swal({ + title: "Information", + text: "You will not be able to recover this imaginary file!", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "OK", + closeOnConfirm: true + }, function () { + swal("Deleted!", "Your imaginary file has been deleted.", "success"); + }); +} $(function(){ + $('body').bootstrapMaterialDesign(); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); @@ -124,10 +135,60 @@ $(function(){ '
\n', } }); + + $('.delete').click(function(){ + var method = $(this).attr('data-method'); + var url = $(this).attr('data-ref'); + var html = $( this ).siblings( "#delete_text" ).html(); + console.log(html); + swal({ + title: "Confirmation", + 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/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index fd495ffe..f29a211a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,6 +2,7 @@ @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; @import "animate-css/animate"; +@import "sweetalert/sweetalert.css"; @import "multi-select/css/multi-select"; @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker"; @import "bootstrap-select/css/bootstrap-select"; @@ -213,6 +214,10 @@ select.form-control { // cursor:pointer; } +.border-left{ + border-left:1px solid #fff; +} + .del_cashier_number{ opacity:0.6, } @@ -366,6 +371,8 @@ select.form-control { .bottom{ margin-bottom: 1px; + margin-left:-10px ; + margin-right:-10px; } /* Discount */ 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 6bb0adb9..027f96b8 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 %> @@ -48,3 +51,7 @@ +
  • - Processed <%= @queue_completed_item.length %> + Processed + <%= @queue_completed_item.length %>
    • <% # For Tab Disable for Station is inactive status="" @@ -48,11 +49,11 @@ > <%= qsi.station_name %> <% if @filter.nil? %> - + <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %> <%else%> - + <% @count.each do |c|%> <% if qsi.id == c.station_id %> <%= c.total %> diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index d7fed3de..d8f5a263 100644 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -1,103 +1,104 @@
    -
    -
    -
    -

    CREDIT PAYMENT

    -
    +
    +

    CREDIT PAYMENT

    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - - <% if @creditcount != 0 %> - -
    -
    - -
    -
    - -
    - -
    -
    - - <% end %> - -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -
    0.0
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + + <% if @creditcount != 0 %> + +
    +
    + +
    +
    + +
    +
    +
    + + <% end %> + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    0.0
    +
    +
    +
    +
    +
    +
    +
    -
    +
    -
    -
    +
    +
    -
    1
    -
    2
    -
    3
    +
    1
    +
    2
    +
    3
    -
    4
    -
    5
    -
    6
    +
    4
    +
    5
    +
    6
    -
    7
    -
    8
    -
    9
    +
    7
    +
    8
    +
    9
    -
    0
    -
    .
    -
    00
    +
    0
    +
    .
    +
    00
    -
    Nett
    -
    Del
    -
    Clr
    +
    Nett
    +
    Del
    +
    Clr
    -
    +
    -
    1000
    +
    1000
    3000
    -
    5000
    +
    5000
    10000
    -
    Pay
    +
    Pay
    @@ -168,13 +169,18 @@ data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ - alert("Payment success") - window.location.href = '/origami/sale/'+ sale_id + "/payment"; + swal({ + title: "Infomation!", + text: "Payment Success", + type: "success" + }, function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment"; + }); } } }); }else{ - alert("Paid Amount is over!"); + swal("Alert","Paid Amount is over!","error"); } }) diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index be2f7ef7..b82aa895 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -38,7 +38,7 @@
    - +
    @@ -403,47 +403,37 @@ if(customer_name != ""){ customer = '(' + customer_name + ')'; } - - $.confirm({ - title: 'Confirm!', - content: 'Are You Sure to assign this customer' + customer + '!', - buttons: { - - 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) - { - var id = $("#table_id").val() - var type = $("#type").val() - if (type=="Table") { - window.location.href = '/origami/table/'+id - }else{ - window.location.href = '/origami/room/'+id - } - + swal({ + title: "Confirmation !", + text: 'Are You Sure to assign this customer' + customer + '!', + showCancelButton: true, + confirmButtonColor: "green", + confirmButtonText: "Yes!", + cancelButtonClass: 'btn btn-danger', + 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) + { + var id = $("#table_id").val() + var type = $("#type").val() + if (type=="Table") { + window.location.href = '/origami/table/'+id }else{ - alert('Record not found!'); - location.reload(); + window.location.href = '/origami/room/'+id } - + }else{ + swal("Alert!", "Record not found!", "error"); + location.reload(); } - }); } - } - } - }); + }); + }); } $('#back').on('click',function(){ diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index a5af5625..ada238bb 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -174,7 +174,7 @@
    -
    +
    30%
    @@ -378,25 +378,18 @@ type: "POST", url: ajax_url, data: params, - success:function(result){ - $.confirm({ - title: 'Infomation!', - content: result.status, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - } - } - }); + success:function(result){ + swal({ + title: "Infomation!", + text: result.status, + }, function () { + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + }); } }); }); @@ -410,19 +403,8 @@ // Selected Items var sale_items = get_selected_sale_items(); if(sale_items.length == 0){ - $.confirm({ - title: 'Infomation!', - content: "You have no selected item!", - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - return; - } - } - } - }); + //swal("Infomation!", "You have no selected item!"); + swal ( "Oops" , "You have no selected item!" , "error" ); } for(var i=0;i < sale_items.length;i++){ @@ -430,19 +412,7 @@ discount_items.push(sale_items[i]); } else { - $.confirm({ - title: 'Infomation!', - content: "You have selected no discount item!!", - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - return; - } - } - } - }); + swal ("Oops" , "You have no selected item!" , "error" ); } } @@ -452,24 +422,18 @@ url: "/origami/" + sale_id + "/remove_discount_items", data: params, success: function(result){ - $.confirm({ - title: 'Infomation!', - content: result.status, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - } - } - }); + swal({ + title: "Infomation!", + text: result.status, + type: "success", + }, function () { + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + }); } }); }); @@ -481,24 +445,18 @@ type: "GET", url: "/origami/" + sale_id + "/remove_all_discount", success: function(result){ - $.confirm({ - title: 'Infomation!', - content: result.status, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - } - } - }); + swal({ + title: "Infomation!", + text: result.status, + type: "success", + }, function () { + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + }); } }); }); @@ -524,50 +482,28 @@ url: ajax_url, data: params, success:function(result){ - console.log(result) - if (result.status == "Success") { - type = 'green' - btn_color = 'btn-green' + if (result.status == "Success") { + type = 'success' + btn_color = 'green' }else{ - type = 'red' - btn_color = 'btn-red' - + type = 'error' + btn_color = 'red' } - - $.confirm({ - title: result.title, - content: result.status, - columnClass: 'small', - type: type, - buttons: { - confirm: { - text: 'Ok', - btnClass: btn_color, - action: function(){ - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - } - } - }); - + swal({ + title: "Infomation!", + text: result.status, + confirmButtonText: 'OK', + confirmButtonColor: btn_color, + }, function () { + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + }); } }); - // } - // else{ - // $.alert({ - // title: 'Alert!', - // content: 'Please Select Account', - // type: 'red', - // typeAnimated: true, - // btnClass: 'btn-danger', - // }); - - // } });//end member discount }); @@ -663,18 +599,12 @@ function calculate_overall_discount(type, amount){ // For Percentage Pay if(type == 1){ if(amount > 100 ){ - $.confirm({ - title: 'Infomation!', - content: "Percentage Value over 100!", - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - return; - } - } - } + swal({ + title:"Oops!", + text:'Percentage Value over 100!', + type: "error", + confirmButtonText: 'OK', + confirmButtonColor:"red" }); } else{ @@ -740,19 +670,13 @@ function calculate_item_discount(type, amount, sale_items, account_types){ // For Percentage Pay if(type == 1){ if(amount > 100 ){ - $.confirm({ - title: 'Infomation!', - content: "Percentage Value over 100!", - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - return; - } - } - } - }); + swal({ + title:"Oops!", + text:'Percentage Value over 100!', + type: "error", + confirmButtonText: 'OK', + confirmButtonColor:"red" + }); } else{ // Check sale items exists diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index a04fc943..d3774135 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -494,19 +494,7 @@ // data: 'order_id='+ order_id, success: function (result) { if (!result.status) { - $.confirm({ - title: 'Infomation!', - content: result.error_message, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function () { - window.location.href = '/origami'; - } - } - } - }); + swal("Infomation!", result.error_message); } else { location.reload(); @@ -591,20 +579,17 @@ }); $('#void').on('click', function () { - var sure = confirm("Are you sure want to Void"); - if (sure == true) { - var sale_id = $('#sale_id').val(); - var ajax_url = "/origami/sale/" + sale_id + '/void'; - $.ajax({ - type: 'POST', - url: ajax_url, - success: function () { - window.location.href = '/origami/'; - } - }) - } else { - - } + swal({ + title: "Alert", + text: "Are you sure want to Void?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "Yes, void it!", + closeOnConfirm: false + }, function () { + window.location.href = '/origami/'; + }); }); $('#add_order').on('click', function () { diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index eaf1f07e..e1ec43d4 100644 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -1,16 +1,14 @@ -
    - -
    -
    -
    -

    JCB

    -
    -
    +
    +

    JCB

    +
    +
    +
    +
    -
    +
    @@ -46,47 +44,47 @@
    -
    +
    -
    +
    -
    1
    -
    2
    -
    3
    +
    1
    +
    2
    +
    3
    -
    4
    -
    5
    -
    6
    +
    4
    +
    5
    +
    6
    -
    7
    -
    8
    -
    9
    +
    7
    +
    8
    +
    9
    -
    0
    -
    .
    -
    00
    +
    0
    +
    .
    +
    00
    -
    Nett
    -
    Del
    -
    Clr
    +
    Nett
    +
    Del
    +
    Clr
    -
    +
    -
    1000
    +
    1000
    3000
    -
    5000
    +
    5000
    10000
    -
    Pay
    +
    Pay
    @@ -174,30 +172,17 @@ $('#jcb_pay').on('click',function(){ data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ - $.confirm({ - title: 'Infomation!', - content: 'Payment Successfully', - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami/sale/'+ sale_id + "/payment"; - } - } - } + swal({ + title: "Infomation!", + text: "Payment Successfully", + },function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment"; }); } } }); }else{ - $.alert({ - title: 'Alert!', - content: "Paid Amount is over!", - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - }); + swal ( "Oops" , "Paid Amount is over!" , "error" ); } }) diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb index ab396252..bdbbf6d4 100644 --- a/app/views/origami/master/index.html.erb +++ b/app/views/origami/master/index.html.erb @@ -1,16 +1,14 @@ -
    - +
    +

    Master

    +
    +
    +
    -
    -
    -

    Master

    -
    -
    -
    +
    @@ -46,47 +44,47 @@
    -
    +
    -
    +
    -
    1
    -
    2
    -
    3
    +
    1
    +
    2
    +
    3
    -
    4
    -
    5
    -
    6
    +
    4
    +
    5
    +
    6
    -
    7
    -
    8
    -
    9
    +
    7
    +
    8
    +
    9
    -
    0
    -
    .
    -
    00
    +
    0
    +
    .
    +
    00
    -
    Nett
    -
    Del
    -
    Clr
    +
    Nett
    +
    Del
    +
    Clr
    -
    +
    -
    1000
    +
    1000
    3000
    -
    5000
    +
    5000
    10000
    -
    Pay
    +
    Pay
    @@ -171,30 +169,17 @@ data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ - $.confirm({ - title: 'Infomation!', - content: 'Payment Successfully', - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami/sale/'+ sale_id + "/payment"; - } - } - } - }); + swal({ + title: "Infomation!", + text: "Payment Successfully", + },function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment"; + }); } } }); }else{ - $.alert({ - title: 'Alert!', - content: "Paid Amount is over!", - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - }); + swal ( "Oops" , "Paid Amount is over!" , "error" ); } }) diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index 30d12d35..ce2947fd 100644 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -1,103 +1,104 @@ - -
    - -
    -
    -
    -

    MPU

    -
    -
    - - - -
    -
    -
    -
    - - -
    -
    -
    - <% if @mpucount != 0 %> -
    -
    - - -
    -
    -
    - <% end %> -
    -
    - - -
    -
    -
    -
    -
    - -
    0.0
    -
    -
    -
    -
    +
    +
    +
    +

    MPU

    - -
    - -
    -
    -
    -
    1
    -
    2
    -
    3
    -
    -
    -
    4
    -
    5
    -
    6
    -
    -
    -
    7
    -
    8
    -
    9
    -
    -
    -
    0
    -
    .
    -
    00
    -
    -
    -
    Nett
    -
    Del
    -
    Clr
    -
    -
    -
    -
    -
    1000
    -
    3000
    -
    -
    -
    5000
    -
    10000
    -
    -
    -
    Pay
    +
    +
    + + + +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @mpucount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    -
    +
    -
    - +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    + +
    + +
    - + diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb index b81c7344..ead7f2c7 100644 --- a/app/views/origami/other_charges/index.html.erb +++ b/app/views/origami/other_charges/index.html.erb @@ -85,7 +85,7 @@ -
    +
    @@ -94,7 +94,7 @@
    -
    +
    @@ -108,12 +108,12 @@
    -
    +
    -
    +
    3000
    -
    +
    1
    2
    @@ -161,7 +161,7 @@
    -
    +
    20000
    @@ -291,13 +291,17 @@ url: ajax_url, data: params, success:function(result){ - alert("Success!"); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } + swal({ + title: "Infomation!", + text: "Success", + }, function () { + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + }); } }); }); diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 8d908290..af8cde00 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -218,34 +218,34 @@
    -
    +
    -
    1
    -
    2
    -
    3
    +
    1
    +
    2
    +
    3
    -
    4
    -
    5
    -
    6
    +
    4
    +
    5
    +
    6
    -
    7
    -
    8
    -
    9
    +
    7
    +
    8
    +
    9
    -
    0
    -
    .
    -
    00
    +
    0
    +
    .
    +
    00
    -
    Nett
    -
    Del
    -
    Clr
    +
    Nett
    +
    Del
    +
    Clr
    -
    +
    1000
    3000
    @@ -360,7 +360,7 @@ $( "#loading_wrapper" ).show(); if($('#balance').text() > 0){ - alert(" Insufficient Amount!") + swal ( "Oops" , "Insufficient Amount!" , "error" ); $( "#loading_wrapper" ).hide(); }else{ var sale_id = $('#sale_id').text(); @@ -389,33 +389,19 @@ } $( "#loading_wrapper" ).hide(); if($('#balance').text() < 0){ - $.confirm({ - title: 'Infomation!', - content: 'Changed amount ' + $('#balance').text() * (-1), - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami'; - } - } - } + swal({ + title: "Infomation!", + text: 'Changed amount ' + $('#balance').text() * (-1), + }, function () { + window.location.href = '/origami'; }); }else{ - $('#pay').text("Pay") - $.confirm({ - title: 'Infomation!', - content: 'Thank you !', - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami'; - } - } - } + $('#pay').text("Pay"); + swal({ + title: "Infomation!", + text: 'Thank You !', + }, function () { + window.location.href = '/origami'; }); } } @@ -424,20 +410,20 @@ }); $('#void').on('click',function () { - var sure = confirm("Are you sure want to Void"); - if (sure == true) { + swal({ + title: "Infomation!", + text: 'Are you sure want to Void !', + }, function () { var sale_id = $('#sale_id').text(); var ajax_url = "/origami/sale/" + sale_id + '/void'; - $.ajax({ - type: 'POST', - url: ajax_url, - success: function () { - window.location.href = '/origami/'; - } - }) - } else { - - } + $.ajax({ + type: 'POST', + url: ajax_url, + success: function () { + window.location.href = '/origami/'; + } + }) + }); }); }); @@ -472,18 +458,11 @@ $( "#loading_wrapper" ).hide(); if (cash > 0) { - $.confirm({ - title: 'Infomation!', - content: 'Thank you !', - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami'; - } - } - } + swal({ + title: "Infomation!", + text: 'Thank You !', + }, function () { + window.location.href = '/origami'; }); } diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index bae9878c..ac881ef4 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -1,11 +1,10 @@
    -
    -
    +
    - +
    @@ -13,7 +12,7 @@ <% if @payparcount > 0 %>
    - +
    @@ -21,14 +20,14 @@ <% end %>
    - +
    - +
    0.0
    @@ -41,47 +40,47 @@

    You can rebate upto <%= @redeem_prices %>

    -->
    -
    +
    -
    1
    -
    2
    -
    3
    +
    1
    +
    2
    +
    3
    -
    4
    -
    5
    -
    6
    +
    4
    +
    5
    +
    6
    -
    7
    -
    8
    -
    9
    +
    7
    +
    8
    +
    9
    -
    0
    -
    .
    -
    00
    +
    0
    +
    .
    +
    00
    -
    Nett
    -
    Del
    -
    Clr
    +
    Nett
    +
    Del
    +
    Clr
    -
    +
    -
    1000
    +
    1000
    3000
    -
    5000
    +
    5000
    10000
    -
    Pay
    +
    Pay
    @@ -154,10 +153,9 @@ $("#redeem").click(function(){ membership_id = $("#valid_amount").attr('data-member-value'); redeem_amount = parseFloat($("#used_amount").text()); if(redeem_amount<=0 ){ - alert("Please type valid amount"); - + swal ( "Oops" , "Please type valid amount!" , "warning" ); }else if(valid_amount< redeem_amount){ - alert(" Insufficient Amount!") + swal ( "Oops" , "Insufficient Amount!" , "warning" ); }else{ if(redeem_amount <= "<%= @redeem_prices %>"){ $.ajax({ @@ -166,14 +164,20 @@ $("#redeem").click(function(){ data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, success: function(result){ if(result.status == true){ - window.location.href = '/origami/sale/'+ sale_id + "/payment" + swal({ + title: "Infomation!", + text: result.status, + }, function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment" + }); + }else{ - alert(result.message); + swal ( "Information" , result.message); } } }) }else { - alert("Redeem Amount is over!"); + swal ( "Oops" , "Redeem Amount is over!" , "warning" ); } } }); diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb index d0486a6b..22224536 100644 --- a/app/views/origami/sale_edit/edit.html.erb +++ b/app/views/origami/sale_edit/edit.html.erb @@ -142,21 +142,12 @@ url: ajax_url, data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price, success: function (result) { - $.confirm({ - title: 'Alert!', - content: 'Qty and Price was successfully Updated', - buttons: { - - confirm: { - text: 'Ok', - btnClass: 'btn-green btn-lg', - action: function () { - location.reload(); - } - } - } + swal({ + title: "Infomation!", + text: "Qty and Price was successfully Updated", + }, function () { + location.reload(); }); - } }); }); diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 54f207b8..53cf8dcf 100644 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -1,15 +1,15 @@
    -
    -
    -

    VISA

    -
    +

    VISA

    +
    +
    +
    -
    +
    @@ -45,47 +45,46 @@
    -
    - +
    -
    +
    -
    1
    -
    2
    -
    3
    +
    1
    +
    2
    +
    3
    -
    4
    -
    5
    -
    6
    +
    4
    +
    5
    +
    6
    -
    7
    -
    8
    -
    9
    +
    7
    +
    8
    +
    9
    -
    0
    -
    .
    -
    00
    +
    0
    +
    .
    +
    00
    -
    Nett
    -
    Del
    -
    Clr
    +
    Nett
    +
    Del
    +
    Clr
    -
    +
    -
    1000
    +
    1000
    3000
    -
    5000
    +
    5000
    10000
    -
    Pay
    +
    Pay
    @@ -170,30 +169,17 @@ data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ - $.confirm({ - title: 'Infomation!', - content: 'Payment Successfully', - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami/sale/'+ sale_id + "/payment"; - } - } - } + swal({ + title: "Infomation!", + text: "Payment Successfully", + }, function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment"; }); } } }); }else{ - $.alert({ - title: 'Alert!', - content: "Paid Amount is over!", - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - }); + swal ( "Oops" , "Paid Amount is over!" , "error" ); } }) diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index e151b318..87f9c8d2 100644 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -14,7 +14,7 @@
    <%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    -
    +
    @@ -27,9 +27,9 @@ - - - + + + @@ -46,9 +46,9 @@ - - - + + + 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 @@ - + - + @@ -35,12 +35,12 @@ - + - - + + <% 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..b613048c 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. @@ -54,7 +45,15 @@
    <% end %> diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index 2cd310a7..f6626fa1 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 @@ - + - + @@ -43,13 +43,12 @@ - + - + - - + <% end %>
    Page width Page height Print copiesPrecisionDelimiterHeading_space Action
    <%= 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' %>Active Login? Auto printPrinter name Show tax Show cashierShow guest info Action
    <%= 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' %>
    <%= settings_menu_item_attribute.value %> <%= 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' %> + + + +
    Is active Auto Print Print copyCut per item Alternate nameCreated by Created At Updated At Action<%= 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' %>