diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 081aef7e..83618770 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -467,7 +467,7 @@ function showNewOrder(order_reservation,shop_code){ var time = timeFormat(date); var requested_date = date.getFullYear() + '-' + (date.getMonth() >= 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() >= 10? date.getDate() : '0' + date.getDate()) +' '+time; //audio play - var audio = new Audio('/beep.mp3'); // define your audio + var audio = new Audio('/'+shop_code+'-beep.mp3'); // define your audio // setTimeout(function(){ // audio.loop = true; audio.play(); diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb index b96b92ca..a343958f 100644 --- a/db/migrate/20180406080240_create_order_reservations.rb +++ b/db/migrate/20180406080240_create_order_reservations.rb @@ -4,7 +4,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1] t.string :order_reservation_id, :limit => 16, :primary_key => true t.string :order_reservation_type, :null => false t.string :customer_id, :null => false - t.datetime :requested_time, :null => false + t.string :requested_time, :null => false t.string :callback_url, :null => false t.string :transaction_ref, :null => false t.string :sale_id @@ -21,7 +21,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1] t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.string :status, :null => false, :default => "new" t.string :order_remark - t.string :reservation_remark + t.string :remark t.timestamps end end