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 e355c13c..a8174bbd 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -24,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 @@ -33,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, @@ -54,14 +55,52 @@ $(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(){ + $('.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())); 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/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 6bb0adb9..80c2f065 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -37,6 +37,9 @@ -->
  • <%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %> +
    • diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index afa90efd..07374231 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -34,7 +34,8 @@ " data-toggle="tab" href="#search" role="tab">Searching .. <%= @queue_completed_item.length %> -->
  • - 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..92a6bbb8 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
    diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index a04fc943..421b1c9c 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -494,7 +494,7 @@ // data: 'order_id='+ order_id, success: function (result) { if (!result.status) { - $.confirm({ + /*$.confirm({ title: 'Infomation!', content: result.error_message, buttons: { @@ -506,7 +506,10 @@ } } } - }); + });*/ + + swal("Good job!", "You clicked the button!", "success"); + } else { location.reload(); diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index eaf1f07e..237111dd 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
    @@ -175,18 +173,18 @@ $('#jcb_pay').on('click',function(){ 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"; - } - } - } - }); + title: 'Infomation!', + content: 'Payment Successfully', + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + window.location.href = '/origami/sale/'+ sale_id + "/payment"; + } + } + } + }); } } }); diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb index ab396252..60b2734c 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
    diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index 30d12d35..b9f3986b 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..34eca9f2 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
    diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 8d908290..7c233b66 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
    diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index bae9878c..0e6ea64b 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
    diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 54f207b8..822879e0 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