From 9b1bc61adc3b9dae171214660bd93421cda3069a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 17 Nov 2017 09:47:09 +0630 Subject: [PATCH 01/12] update cus show --- app/views/crm/customers/show.html.erb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 6027eec6..101ed798 100755 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -98,7 +98,7 @@
-

<%= t :order_details %>

+
<%= t :order_details %>
@@ -128,7 +128,7 @@
-

<%= t :sale_details %>

+
<%= t :sale_details %>
@@ -165,9 +165,8 @@
-

- - <%= t("views.btn.back") %> + + reply<%= t("views.btn.back") %>
From 393d0badc3180c0a64364f4375a56321bbb32d7a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 17 Nov 2017 11:47:42 +0630 Subject: [PATCH 02/12] update customer transaction list --- .../origami/customers_controller.rb | 5 +- app/views/crm/customers/show.html.erb | 70 ++++++++++++------- app/views/origami/home/show.html.erb | 36 ++++++---- 3 files changed, 70 insertions(+), 41 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 6e275355..58f70faa 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -121,8 +121,9 @@ class Origami::CustomersController < BaseOrigamiController if status == true render json: JSON.generate({:status => true}) - # Re-calc All Amount in Sale - sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount) + if(id == "SAL") + sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount) + end else render json: JSON.generate({:status => false, :error_message => "Record not found"}) end diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 101ed798..20808a54 100755 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -68,27 +68,39 @@ - + - + + <% if @response["status"] == true %> - <% @response["data"].each do |transaction| %> - - - - - - - - - - - <% end %> + <% @response["data"].each do |transaction| %> + + + <% if transaction["status"] == 'Rebate' || transaction["status"] == 'Discount'%> + + <% else %> + + <% end %> + + + + + <% end %> + <% if @response["data"].first["status"] != 'Discount'%> + + + + + <%end%> + <%else%> + <% end %>
<%= t("views.right_panel.detail.date") %> <%= t("views.right_panel.detail.discount_amount") %><%= t("views.right_panel.detail.amount") %> <%= t("views.right_panel.detail.from_account") %> <%= t("views.right_panel.detail.status") %><%= t("views.right_panel.detail.from_account") %><%= t("views.right_panel.detail.receipt_no") %>
<%= transaction["date"]%><%= transaction["deposit"] %><%= transaction["account_status"] %><%= transaction["status"] %><%= transaction["receipt_no"] %>
<%= transaction["date"]%><%= transaction["deposit"] %>(<%= transaction["withdraw"] %>)<%= transaction["status"] %><%= transaction["account_status"] %><%= transaction["receipt_no"] %>
Balance + <%= @response["data"].first["balance"] %> +

There is no transaction coz of <%=@response["data"]%> ...
@@ -133,13 +145,15 @@ - - - - - - - + + + + + + + + + @@ -147,12 +161,14 @@ <% @sales.each do |sale| %> - - - - - - + + + + + + + + <% end %> diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index ece1d39a..38d93892 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -27,7 +27,7 @@
<%= sale.receipt_no %> - <%= sale.sale_status %> + <%= sale.sale_status %>
<% end %> @@ -43,7 +43,7 @@
<%= table.name %> - billed + billed
@@ -55,7 +55,7 @@ <% end %>
<%= table.name %> - new + new
<% end %> @@ -63,7 +63,7 @@
<%= table.name %> - new + new
<% end %> @@ -81,9 +81,9 @@
<%= room.name %> <% if room.get_booking.nil? %> - billed + billed <% else %> - new + new <% end %>
@@ -91,7 +91,7 @@
<%= room.name %> - +
<% end %> @@ -134,6 +134,8 @@
INVOICE DETAILS | Table <%= @dining.name rescue "" %> Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
+ <% else %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> <% end %>
@@ -154,7 +156,16 @@
<% elsif !@date.nil? %> -
+
+ Order No: + <% if @status_order == 'order' %> + <%= @obj_order.order_id rescue '' %> + + <% end %> + +
+
+
Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %>
@@ -162,15 +173,16 @@
- <% if !@sale_array.empty? %> + <% if @status_sale == 'sale' %> Customer : <%= @sale_array[0].customer.name rescue '' %> - <% else %> + <% elsif @status_order == 'order' + %> Customer : <%= @customer.name rescue "" %> <% end %> - <% end %> +
@@ -350,7 +362,7 @@ <% if @dining.status != "available" %> <% if @status_order == 'order' %> - + From 02bf6f03f17e3e64857cf465b79daa92da944435 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 17 Nov 2017 11:58:46 +0630 Subject: [PATCH 03/12] update customer show --- app/views/crm/customers/show.html.erb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 20808a54..338aea1d 100755 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -92,15 +92,18 @@ <% end %> <% if @response["data"].first["status"] != 'Discount'%> - + - <%end%> <%else%> - + + + <% end %>
<%= t("views.right_panel.detail.sale_id") %><%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.tax_amount") %><%= t :cashier %><%= t("views.right_panel.detail.sales_status") %><%= t("views.right_panel.detail.receipt_date") %><%= t("views.right_panel.detail.sale_id") %><%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.total_discount") %><%= t("views.right_panel.detail.tax_amount") %><%= t("views.right_panel.detail.sub_total") %><%= t("views.right_panel.detail.grand_total") %><%= t :cashier %><%= t("views.right_panel.detail.sales_status") %><%= t("views.right_panel.detail.receipt_date") %>
<%= link_to sale.sale_id, transactions_sale_path(sale) %><%= sale.receipt_no %><%= sale.grand_total rescue '-' %><%= sale.total_tax %><%= sale.cashier_name rescue '-' %> <%= sale.sale_status %> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%m %p") %> <%= sale.receipt_no %><%= sale.total_discount %><%= sale.total_tax %><%= sale.total_amount %><%= sale.grand_total rescue '-' %><%= sale.cashier_name rescue '-' %> <%= sale.sale_status %> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
Balance + <%= @response["data"].first["balance"] %>

There is no transaction coz of <%=@response["data"]%> ...

There is no transaction coz of <%=@response["data"]%> ...

+
From 73da4841c6bf83aba89554ea3137e0bd51783f64 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 17 Nov 2017 13:50:27 +0630 Subject: [PATCH 04/12] update salepayment for puts --- app/models/sale_payment.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index e712ed9d..1ab1c613 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -407,9 +407,6 @@ class SalePayment < ApplicationRecord rescue SocketError response = { "status": false, "message": "Can't connect server"} end - puts response.to_json - puts payparcost - puts overall_dis redeem_amount = payparcost + overall_dis total_percentage = 0 From e7cd8deb8e9f2ff5f8dd8a3557660f352da74132 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 15:51:20 +0630 Subject: [PATCH 05/12] fix tester bugs --- app/controllers/origami/discounts_controller.rb | 9 +++++---- app/models/sale_item.rb | 2 +- app/pdf/close_cashier_pdf.rb | 2 +- app/pdf/crm_order_pdf.rb | 2 +- app/pdf/stock_result_pdf.rb | 2 +- app/views/origami/discounts/index.html.erb | 7 +++++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index c1319bfe..f3bd218f 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -114,7 +114,8 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) table_id = sale.bookings[0].dining_facility_id - table_type = DiningFacility.find(table_id).type + dining = DiningFacility.find(table_id) + table_type = dining.type discount_items = [] #destroy all discount sale item @@ -133,14 +134,14 @@ class Origami::DiscountsController < BaseOrigamiController sale.sale_items.destroy(discount_items) action_by = current_user.id - remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " + remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{dining.name} " sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" ) # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, 0) - result = {:status=> "Success", :table_id => table_id, :table_type => table_type } + result = {:status=> "Success", :table_id => table_id, :dining => dining.name, :table_type => table_type } else - result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table_type } + result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => dining.name, :table_type => table_type } end render :json => result.to_json diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index c4aae1fa..d4aaf5ee 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -39,7 +39,7 @@ class SaleItem < ApplicationRecord # Check for actual sale items sale_items.each do |si| - if si.account_id == a.id + if si.account_id == a.id account_price[:price] = account_price[:price] + si.price end end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 71969440..1f456a07 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -22,7 +22,7 @@ class CloseCashierPdf < Prawn::Document super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index dca0ab9b..a33b5fce 100755 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -20,7 +20,7 @@ class CrmOrderPdf < Prawn::Document super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb index 4787e9b1..510ab317 100755 --- a/app/pdf/stock_result_pdf.rb +++ b/app/pdf/stock_result_pdf.rb @@ -22,7 +22,7 @@ class StockResultPdf < Prawn::Document super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 23b83054..2549849a 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -424,9 +424,11 @@ // Selected Items var sale_items = get_selected_sale_items(); + console.log(sale_items.length); if(sale_items.length == 0){ //swal("Information!", "You have no selected item!"); - swal ( "Oops" , "You have no selected item!" , "error" ); + swal ( "Oops" , "You have no selected item!" , "error" ); + return; } for(var i=0;i < sale_items.length;i++){ @@ -434,7 +436,8 @@ discount_items.push(sale_items[i]); } else { - swal ("Oops" , "You have no selected item!" , "error" ); + swal ("Oops" , "You have no selected item!" , "error" ); + return; } } From 11f040b14298b7bd39581c07e9d653aa650d3c43 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 16:31:03 +0630 Subject: [PATCH 06/12] fix oqs css and oqs edit turbolink control --- app/assets/javascripts/OQS.js | 5 +- app/assets/stylesheets/OQS.scss | 31 ++ app/views/crm/dining_queues/index.html.erb | 6 +- app/views/oqs/edit/index.html.erb | 8 +- app/views/oqs/home/index.html.erb | 575 ++++++--------------- 5 files changed, 210 insertions(+), 415 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 831f2f5f..d2bb42bc 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -25,6 +25,9 @@ //= require custom.js $(document).on('turbolinks:load', function() { + $('#back').on('click', function () { + window.location.href = '/oqs/'; + }); $(".nav-completed").on("click", function(){ $("#completed").removeClass('hide') @@ -96,7 +99,7 @@ $(document).on('turbolinks:load', function() { +'
' +'
' - +'' + +'' +' ' +'
' diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 8258a2df..12fbd548 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -9,6 +9,37 @@ @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; @import "reset"; + +/* Reset */ +.col-lg-1, .col-md-1, .col-sm-1,col-xl-1{ + padding-left: 1px ; + padding-right: 1px ; +} + +.table { + margin-bottom: 0px; +} + +select.form-control { + height: inherit !important; +} + +.form-horizontal .form-group { + margin-right: 0px !important; +} + +.card-columns { + font-size: 18px !important; +} + +@media (min-width:769px) and (max-width:1024px) { + .btn-block { + font-size: 11px !important; + } +} + +/* End Reset */ + .order-completed { background-color: #CCFFDD; } diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index fab41cdc..17c7e7c8 100755 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -55,9 +55,9 @@
view_headline QUEUE DETAILs

- 1) Latest Queue No - <%= @complete_queue.last.queue_no%>
- 2) Next Queue No - <% @next = @complete_queue.last.queue_no.to_i + 1%> - <%= @next%>
+ 1) Latest Queue No - <%= @complete_queue.last.queue_no rescue 0 %>
+ 2) Next Queue No - <% @next = (@complete_queue.last.queue_no.to_i rescue 0) + 1%> + <%= @next rescue 0 %>
3) Today Completed Queue - <%= @complete_queue.count %>

list <%= t("views.right_panel.header.button_lists") %>
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb index 99541e8a..4d018249 100755 --- a/app/views/oqs/edit/index.html.erb +++ b/app/views/oqs/edit/index.html.erb @@ -89,10 +89,10 @@
- +
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index f3a94be5..39e84227 100755 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,418 +1,179 @@ - - - - -
-
-
- <%= form_tag oqs_root_path, :method => :get do %> -
-
- - -
-
- -
- + +
+
+
+ <%= form_tag oqs_root_path, :method => :get do %> +
+
+ +
- <% end %> -
- - - - - - -
- - -
-
- <% - @queue_completed_item.each do |qid| - %> -
-
-
- <%= qid.type %>-<%= qid.zone %> - - <%= qid.order_id %> -
-

- - <%= qid.item_name %> - [x - - <%= qid.qty %> - ] -

- -

<%= qid.options == "[]"? "" : qid.options %>

- - - Order at - - - <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> -
- Order By - - <%= qid.item_order_by %> - - - - - - - -
-
- <% - end - %> -
-
- - - - -
-
- +
+ +
+
+ <% end %>
+ + + + + + +
+ + +
+
+ <% + @queue_completed_item.each do |qid| + %> +
+
+
+ <%= qid.type %>-<%= qid.zone %> + + <%= qid.order_id %> +
+

+ + <%= qid.item_name %> + [x + + <%= qid.qty %> + ] +

+ +

<%= qid.options == "[]"? "" : qid.options %>

+ + + Order at - + + <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> +
+ Order By - + <%= qid.item_order_by %> + + + + + + +
-
- - - - - - - - - - -
ItemsQTY
-
- -
-
+
+ <% + end + %>
+
- -
- - - - + + +
+
+
+ + +
+
+
+
ORDER DETAILS
+
+
+
+ + + + + + + + + + + + + + + + + + + +
Order ByOrder At
+
+
+ + + + + + + + + + +
ItemsQTY
+
+
+
+
+ + +
+ + + + + + +
- - From c56fb1b0f4103958652919da7bbd279e3fbf0cfc Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 16:39:37 +0630 Subject: [PATCH 07/12] oqs back turbolink control --- app/assets/javascripts/OQS.js | 4 ---- app/views/oqs/edit/index.html.erb | 3 ++- app/views/oqs/home/index.html.erb | 8 ++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index d2bb42bc..2f670146 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -25,10 +25,6 @@ //= require custom.js $(document).on('turbolinks:load', function() { - $('#back').on('click', function () { - window.location.href = '/oqs/'; - }); - $(".nav-completed").on("click", function(){ $("#completed").removeClass('hide') $(".oqs_append").addClass('hide') diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb index 4d018249..0cae40ce 100755 --- a/app/views/oqs/edit/index.html.erb +++ b/app/views/oqs/edit/index.html.erb @@ -115,8 +115,9 @@ $(document).ready(function(){ } }); }); + $('#back').on('click', function () { - window.location.href = '/oqs/'; + window.location.href = '/oqs'; }) // number key pad diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 39e84227..96074792 100755 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -177,3 +177,11 @@
+ + From 66e6b69f12472de4ce8ef69b3ff561a79c211540 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 17 Nov 2017 18:26:01 +0630 Subject: [PATCH 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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 %> -
    -