From 66e6b69f12472de4ce8ef69b3ff561a79c211540 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 17 Nov 2017 18:26:01 +0630 Subject: [PATCH 1/5] add booking for assign customer in CRM --- app/controllers/crm/dining_queues_controller.rb | 13 ++++++++++++- db/migrate/20170627085117_dining_queues.rb | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb index 480ad08e..d583bc6f 100755 --- a/app/controllers/crm/dining_queues_controller.rb +++ b/app/controllers/crm/dining_queues_controller.rb @@ -1,7 +1,7 @@ class Crm::DiningQueuesController < BaseCrmController load_and_authorize_resource before_action :set_dining_queue, only: [:show, :edit, :update, :destroy] - + # GET /crm/dining_queues # GET /crm/dining_queues.json def index @@ -86,6 +86,17 @@ class Crm::DiningQueuesController < BaseCrmController queue = DiningQueue.find(params[:id]) table_id = params[:table_id] + dining_facility = DiningFacility.find(params[:table_id]) + if dining_facility.type == "Table" + type = "TableBooking" + else + type = "RoomBooking" + end + + booking = Booking.create({:dining_facility_id => params[:table_id],:type => type, + :checkin_at => Time.now.utc,:customer_id => queue.customer_id,:booking_status => "assign" }) + booking.save! + status = queue.update_attributes(dining_facility_id: table_id,status:"Assign") # status = DiningFacility.find(table_id).update_attributes(status: "occupied") diff --git a/db/migrate/20170627085117_dining_queues.rb b/db/migrate/20170627085117_dining_queues.rb index a4977f8c..269d4316 100755 --- a/db/migrate/20170627085117_dining_queues.rb +++ b/db/migrate/20170627085117_dining_queues.rb @@ -2,6 +2,7 @@ class DiningQueues < ActiveRecord::Migration[5.1] def change create_table :dining_queues do |t| t.string :name + t.string :customer_id, :default => "CUS-000000000001" t.string :contact_no t.string :queue_no t.string :status From e95562ad20325c0d6c2337f11fbd159abc55e944 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 18:27:48 +0630 Subject: [PATCH 2/5] edit addorder loading to oqs_loading --- app/assets/javascripts/addorder.js | 28 ++++++++++----------- app/assets/stylesheets/addorder.scss | 11 ++++---- app/views/origami/addorders/detail.html.erb | 7 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 34c93405..054627c7 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1,9 +1,8 @@ -$(function(){ +$(function() { //click menu sidebar menu category $(".product").on("click", function(){ var url = $(this).attr('data-ref'); show_product_list(url); - console.log(url) }); //show menu item list when click menu category function show_product_list(url_item){ @@ -635,8 +634,9 @@ $(function(){ // Pay Discount for Payment $("#create_order").on('click', function(e){ + $(this).attr('disabled', 'disabled'); e.preventDefault(); - $("#loading_wrapper").show(); + $("#oqs_loading_wrapper").show(); var table_id = $('#table_id').text(); var booking_id = $('#booking_id').text(); if (!booking_id.length > 0) { @@ -651,32 +651,32 @@ $(function(){ var ajax_url = '../addorders/create'; - var params = {'order_source': "cashier", 'order_type': "dine_in", 'customer_id': "", 'guest_info': "", 'table_id': table_id, 'order_items': order_items }; - $.ajax({ type: "POST", url: ajax_url, data: params, dataType: "json", - success:function(result){ - $("#loading_wrapper").hide(); + success:function(result){ + $("#oqs_loading_wrapper").hide(); swal({ title: "Information !", text: 'Order has been successfully created', confirmButtonColor: "green", confirmButtonText: "Yes!", closeOnConfirm: false, - }, function () { - if(table_type == "Table"){ - window.location.href = "/origami/table/" + table_id - } - else { - window.location.href = "/origami/room/" + table_id - } + }, function (isConfirm) { + if (isConfirm) { + if(table_type == "Table"){ + window.location.href = "/origami/table/" + table_id + } + else { + window.location.href = "/origami/room/" + table_id + } + } }); } }); diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 970532f7..8c535855 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -128,8 +128,7 @@ section.content{ /*Loading gif for payment*/ -#loading_wrapper{ - +#oqs_loading_wrapper{ position: fixed; background-color: #C8C8C8 ; height: 100%; @@ -137,9 +136,9 @@ section.content{ left: 0; opacity: 0.6; top: 0; - z-index: 9999999; + z-index: 100; } -#loading{ +#oqs_loading{ position: relative; height: 100%; width: 100%; @@ -147,9 +146,9 @@ section.content{ background-position: center center; background-repeat: no-repeat; opacity: 1; + z-index: 101; filter: alpha(opacity=100); /* ie */ - -moz-opacity: 1; /* mozilla */ - + -moz-opacity: 1; /* mozilla */ } #count ,#set_count{ diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 095036fa..2a6411a4 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -1,8 +1,9 @@ <%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> - + +
    From 2555efa1867d704be347776b5cbbf6d795540fee Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 18:43:42 +0630 Subject: [PATCH 3/5] add order double click fix --- app/assets/javascripts/addorder.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 054627c7..4057bf5f 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -660,25 +660,25 @@ $(function() { url: ajax_url, data: params, dataType: "json", - success:function(result){ - $("#oqs_loading_wrapper").hide(); - swal({ - title: "Information !", - text: 'Order has been successfully created', - confirmButtonColor: "green", - confirmButtonText: "Yes!", - closeOnConfirm: false, - }, function (isConfirm) { - if (isConfirm) { + success:function(result){ + // $("#oqs_loading_wrapper").hide(); + // swal({ + // title: "Information !", + // text: 'Order has been successfully created', + // confirmButtonColor: "green", + // confirmButtonText: "Yes!", + // closeOnConfirm: false, + // }, function (isConfirm) { + // if (isConfirm) { if(table_type == "Table"){ window.location.href = "/origami/table/" + table_id } else { window.location.href = "/origami/room/" + table_id } - } - }); - } + // } + // }); + } }); }); From 3aac2629c9155eef3c9fc417cda367b9d116253c Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 19:55:26 +0630 Subject: [PATCH 4/5] queue card ui --- app/assets/stylesheets/CRM.scss | 4 ++++ app/views/crm/dining_queues/index.html.erb | 23 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 18bdca31..12fc70b5 100755 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -11,6 +11,10 @@ @import "BSBMaterial/themes/all-themes"; @import "reset"; +.sx-margin-0 { + margin: 0 !important; +} + .selected-item { color: #fff !important; background-color: #7a62d3 !important; diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 17c7e7c8..8eb9904e 100755 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -28,15 +28,26 @@ @bg_color = "normal" end %> -
    +
    - Queue No : <%= queue.queue_no %> - Seater : <%= queue.seater %>
    - Name : <%= queue.name %>
    - Contact No : <%= queue.contact_no %>
    - Remark : <%= queue.remark %> +
    +
    +

    + Queue No : <%= queue.queue_no %> +

    +
    +
    +

    + Seater : <%= queue.seater %> +

    +
    +
    + +

    Name : <%= queue.name %>

    +

    Contact No : <%= queue.contact_no %>

    +

    Remark : <%= queue.remark %>

    <% end %> From a4238075548afb9253904692bc43d9dc133bb764 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 20 Nov 2017 12:23:49 +0630 Subject: [PATCH 5/5] crm index ui and remove zone and dining from seed --- app/views/crm/customers/index.html.erb | 22 +++++--------- db/seeds.rb | 42 ++------------------------ 2 files changed, 9 insertions(+), 55 deletions(-) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 2c1f9e75..2f4ff77d 100755 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -11,7 +11,7 @@
    -
    +
    @@ -19,21 +19,14 @@
    --> - + @@ -91,7 +83,7 @@ -
    +
    <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
    diff --git a/db/seeds.rb b/db/seeds.rb index 545cce58..efe056e3 100755 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -181,44 +181,6 @@ queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf cashier_terminal = CashierTerminal.create({name:"Terminal 1", printer_name: "Cashier"}) zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"62", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"53", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"54", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"24", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"25", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"26", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"34", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"35", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"45", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"46", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"47", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"48", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - -zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({name:"51", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"52", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"11", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"12", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"21", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"22", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"23", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"31", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"32", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"33", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"41", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"42", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"43", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"44", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) -zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({name:"71", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"72", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"73", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"74", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"75", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"76", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"}) @@ -248,7 +210,7 @@ zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_acti # QueueStationZone zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone}) -zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone2}) -zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone3}) +zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone}) +zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone}) puts " Finished System Default Set Up Data vWSsseoZCzxd6xcNf_uS RxzaYyAGzm7VqAZ4hKnv "
    - <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %> - - <% end %> + -
    - <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %> -
    +
    + <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %> +
    @@ -45,9 +38,8 @@
    <% end %> -
    -