From 57ecddd2095b67a5d42007210cada8c7636014b6 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 10:03:46 +0630 Subject: [PATCH 01/34] merge with staging for localization and layout change and print custom font --- app/views/layouts/application.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b6f044b9..e4820fed 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -59,8 +59,10 @@ <% end %> <% end %> -

<%= t 'welcome' %>

+ + <%= yield %> + From 31a7b6750f11f98ce471eaae4e9ec97d70a0bde4 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 14:56:32 +0630 Subject: [PATCH 02/34] change header --- app/views/layouts/_header.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index be10da70..cc94a92b 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -5,7 +5,10 @@ - E-menu + + Logo + SX Restaurant + From 6f95d36dc964f5e8985cb17c8315d92bc0e300da Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 13:27:59 +0630 Subject: [PATCH 14/34] update oqs --- app/models/order_queue_station.rb | 87 ++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 26 deletions(-) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index edd2ace2..9039a465 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -21,43 +21,78 @@ class OrderQueueStation < ApplicationRecord booking = Booking.find_by_dining_facility_id(dining.id) #Assign OQS id to order Items - oqs_stations.each do |oqs| - is_auto_printed = false - oqs_order_items = [] - #Get List of items - - pq_items = JSON.parse(oqs.processing_items) + # oqs_stations.each do |oqs| + # is_auto_printed = false + # oqs_order_items = [] + # #Get List of items - + # pq_items = JSON.parse(oqs.processing_items) - #Loop through the processing items - pq_items.each do |pq_item| - #Processing through the looping items - order_items.each do |order_item| - if (pq_item == order_item.item_code) - # if oqs.id == oqpbz.order_queue_station_id - # #Same Order_items can appear in two location. - # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - # else + # #Loop through the processing items + # pq_items.each do |pq_item| + # #Processing through the looping items + # order_items.each do |order_item| + # if (pq_item == order_item.item_code) + # # if oqs.id == oqpbz.order_queue_station_id + # # #Same Order_items can appear in two location. + # # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + # # else - if (order_item.price != 0) - AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - oqs_order_items.push(order_item) - end - # end - end - end - end - # Auto Printing + # if (order_item.price != 0) + # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + # oqs_order_items.push(order_item) + # end + # # end + # end + # end + # end + # ToDo per item per printer + OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}").find_each do |oqpbz| - if oqs.id == oqpbz.order_queue_station_id + oqs = OrderQueueStation.find(oqpbz.order_queue_station_id) + is_auto_printed = false + oqs_order_items = [] + + if oqs.is_active + #Get List of items - + pq_items = JSON.parse(oqs.processing_items) + #Loop through the processing items + pq_items.each do |pq_item| + #Processing through the looping items + order_items.each do |order_item| + if (pq_item == order_item.item_code) + # if oqs.id == oqpbz.order_queue_station_id + # #Same Order_items can appear in two location. + # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + # else + + if (order_item.price != 0) + AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + oqs_order_items.push(order_item) + end + # end + end + end + end + if oqs.auto_print if oqs_order_items.length > 0 print_slip(oqs, order, oqs_order_items) is_auto_printed = true end end - end + end + # if oqs.id == oqpbz.order_queue_station_id + # # Auto Printing + # if oqs.auto_print + # if oqs_order_items.length > 0 + # print_slip(oqs, order, oqs_order_items) + # is_auto_printed = true + # end + # end + # end end - end + # end end private From dfa3a4c08fa53a69e33df4f43852b4b5574a1d57 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 13:30:29 +0630 Subject: [PATCH 15/34] seed fix --- app/models/seed_generator.rb | 48 +++++++++++++++++------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index a5bf5976..6e45fa71 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -2,6 +2,7 @@ class SeedGenerator < ApplicationRecord # Generate ID for Tables def self.generate_id(model, prefix) seed = SeedGenerator.find_by_model(model) + next_no = seed.next new_receipt_no = 0 if (seed.nil?) @@ -9,38 +10,33 @@ class SeedGenerator < ApplicationRecord seed.model = model new_receipt_no = seed.next seed.save - else - current_no = seed.next - seed.next = seed.next + seed.increase_by - seed.current = current_no - seed.save + # current_no = seed.next + # seed.next = seed.next + seed.increase_by + # seed.current = current_no + # seed.save + cur_val, next_val = self.update_seed(model, seed.next, seed.increase_by) + + if next_no == cur_val + puts "SSS" + puts next_val + cur_val2, next_val2 = self.update_seed(model, next_val, seed.increase_by) + puts next_val2 + padding_len = 15 - prefix.length + saleOrderId = prefix +"-"+ cur_val2.to_s.to_s.rjust((14-prefix.length)+1,'0') + puts saleOrderId + return saleOrderId + end + + padding_len = 15 - prefix.length + saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0') + return saleOrderId + end padding_len = 15 - prefix.length saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') return saleOrderId - - end - - # Generate Receipt No - def self.new_receipt_no - seed = SeedGenerator.find_by_model("sale") - new_receipt_no = 0 - if (seed.nil?) - seed = SeedGenerator.new() - seed.model = "sale" - new_receipt_no = seed.next - seed.save - - else - current_no = seed.next - seed.next = seed.next - seed.current = current_no - seed.save - end - - return seed.current end # Generate for 4 digit Code From 4adfa48d754972211ba68b95e01367f2d4d63e2a Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 13:31:02 +0630 Subject: [PATCH 16/34] seed fix --- app/models/seed_generator.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 6e45fa71..429a876a 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -67,4 +67,24 @@ class SeedGenerator < ApplicationRecord next_code = prefix + seed.current.to_s.to_s.rjust((count)+1,'0') return next_code end + + def self.update_seed(model, current, inc) + cur_val = 0 + next_val = 0 + nex = current + inc + + update_sql = "update seed_generators set current= #{current}, next= #{nex} where model='#{model}';"; + select_sql = "select * from seed_generators where model='#{model}';" + update_result = ActiveRecord::Base.connection.execute(update_sql); + + select_result = ActiveRecord::Base.connection.execute(select_sql); + + select_result.each do |row| + p row + cur_val = row [3] + next_val = row[4] + end + + return cur_val, next_val + end end From 67a6effc83bd7a86dc0e7d33b2298143875976aa Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 14:18:31 +0630 Subject: [PATCH 17/34] update chart for group hour --- app/controllers/home_controller.rb | 2 +- app/models/sale.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index ee54bd46..c4ca54b6 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -65,7 +65,7 @@ class HomeController < ApplicationController @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count() @top_products = Sale.top_products(today) - @hourly_sales = Sale.hourly_sales(today) + @hourly_sales = Sale.hourly_sales(today).sum(:grand_total) # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p') # .sum(:grand_total) @employee_sales = Sale.employee_sales(today).sum(:grand_total) diff --git a/app/models/sale.rb b/app/models/sale.rb index c3b9cb5a..87ff1fe7 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -854,7 +854,9 @@ end end def self.hourly_sales(today) - query= Sale.select("grand_total").where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today) + query= Sale.select("grand_total") + .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today) + .group("date_format(receipt_date, '%I %p')") end def self.employee_sales(today) From 2539352e2d518d65ba2bf6666f29d00f2d0dbb22 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 23 Oct 2017 14:43:48 +0630 Subject: [PATCH 18/34] update admin bsb for add order design --- app/assets/javascripts/addorder.js | 3 ++- app/controllers/origami/addorders_controller.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 47f3389c..740dbbfe 100644 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -328,7 +328,8 @@ $(function(){ // }); }); } - +console.log(instance_attributes); +console.log("hi") // selected_arr = [] // $(selected_item).each(function(i){ // $.ajax({ diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 8ac82280..103d5a54 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -1,4 +1,4 @@ -class Origami::AddordersController < BaseOrigamiController +class Origami::AddordersController < ApplicationController#BaseOrigamiController # before_action :set_dining, only: [:detail] def index From 52b29e251fd32952fdd10424c5de677c92e6c3a2 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 14:45:04 +0630 Subject: [PATCH 19/34] update seed --- app/models/seed_generator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 429a876a..3a35bfac 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,8 +1,7 @@ class SeedGenerator < ApplicationRecord # Generate ID for Tables def self.generate_id(model, prefix) - seed = SeedGenerator.find_by_model(model) - next_no = seed.next + seed = SeedGenerator.find_by_model(model) new_receipt_no = 0 if (seed.nil?) @@ -11,6 +10,7 @@ class SeedGenerator < ApplicationRecord new_receipt_no = seed.next seed.save else + next_no = seed.next # current_no = seed.next # seed.next = seed.next + seed.increase_by # seed.current = current_no From a08d0f8fc759a8d743eb681918f0b4bd46dc4e28 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 15:11:11 +0630 Subject: [PATCH 20/34] fix asset --- app/assets/javascripts/application.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b93c2ccf..e240d8b2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,7 +25,6 @@ //= require select2 //= require jquery.datetimepicker //= require Chart -//= require bootstrap/modal $(document).on('turbolinks:load', function() { From 4cda67b96744b7335e9aec230d0262e6422b1329 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 15:20:35 +0630 Subject: [PATCH 21/34] update asset --- app/assets/stylesheets/CRM.scss | 1 - app/assets/stylesheets/settings.scss | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 96ec1313..3f9f69db 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -3,7 +3,6 @@ @import "theme"; @import "jquery-ui"; @import "bootstrap-datepicker3"; -@import "bootstrap/modal"; /* Show it is fixed to the top */ // body { diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index fd1c6d1f..79781790 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -18,8 +18,8 @@ ul.navbar-nav li a{ } ul.dropdown-menu li a{ - text-decoration :none; - color :#525252; + text-decoration:none; + color:#525252; } .setting_breadcrumb{ From 5c8adbe618480b08a4793f6dd37a42fdecfc5104 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 15:49:55 +0630 Subject: [PATCH 22/34] remove no need crm js --- app/assets/javascripts/CRM.js | 1 - app/assets/stylesheets/settings.scss | 8 ++++---- app/views/layouts/application.html.erb | 6 +----- config/initializers/assets.rb | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js index 4b5baba8..ede5946b 100644 --- a/app/assets/javascripts/CRM.js +++ b/app/assets/javascripts/CRM.js @@ -18,5 +18,4 @@ //= require cable //= require jquery-ui //= require bootstrap-datepicker -//= require bootstrap/modal diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index 79781790..0205c7f3 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -3,10 +3,10 @@ @import "theme"; /* Show it is fixed to the top */ -// body { -// min-height: 75rem; -// padding-top: 4.5rem; -// } +/* body { + min-height: 75rem; + padding-top: 4.5rem; + }*/ .setting_nav{ background-color: #2f5663; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5a31b84f..41f4971a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,11 +21,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %> - - - - - + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 357ab350..48ff05d8 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -24,7 +24,7 @@ Rails.application.config.assets.precompile += %w( fileinput.min.css ) # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( CRM.css ) -Rails.application.config.assets.precompile += %w( CRM.js ) +#Rails.application.config.assets.precompile += %w( CRM.js ) # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( jquery-confirm.css ) From 4441944a37d6c87d135beee498ac52cb93ab3251 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 23 Oct 2017 16:07:52 +0630 Subject: [PATCH 23/34] comment oqs js --- config/initializers/assets.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 48ff05d8..dfbb5fbf 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -15,7 +15,7 @@ Rails.application.config.assets.precompile += %w( origami.css ) # Rails.application.config.assets.precompile += %w( origami.js ) # -- Order Queue Station ----- Rails.application.config.assets.precompile += %w( OQS.css ) -Rails.application.config.assets.precompile += %w( OQS.js ) +#Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( settings.css ) From 2ae1b5ba3d3979feda652dec8c324452d909958d Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 25 Oct 2017 14:31:25 +0630 Subject: [PATCH 24/34] fix seed --- app/models/seed_generator.rb | 95 ++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 3a35bfac..1451b11e 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,42 +1,35 @@ class SeedGenerator < ApplicationRecord # Generate ID for Tables def self.generate_id(model, prefix) - seed = SeedGenerator.find_by_model(model) - new_receipt_no = 0 + cur_val, next_val = self.update_seed(model) - if (seed.nil?) - seed = SeedGenerator.new() - seed.model = model - new_receipt_no = seed.next - seed.save - else - next_no = seed.next - # current_no = seed.next - # seed.next = seed.next + seed.increase_by - # seed.current = current_no - # seed.save - cur_val, next_val = self.update_seed(model, seed.next, seed.increase_by) - - if next_no == cur_val - puts "SSS" - puts next_val - cur_val2, next_val2 = self.update_seed(model, next_val, seed.increase_by) - puts next_val2 - padding_len = 15 - prefix.length - saleOrderId = prefix +"-"+ cur_val2.to_s.to_s.rjust((14-prefix.length)+1,'0') - puts saleOrderId - return saleOrderId - end - - padding_len = 15 - prefix.length - saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0') - return saleOrderId - - end + if (cur_val == 0) + cur_val, next_val = self.execute_query(model) + end padding_len = 15 - prefix.length - saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') - return saleOrderId + saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0') + return saleOrderId + end + + # Generate Receipt No + def self.new_receipt_no + seed = SeedGenerator.find_by_model("sale") + new_receipt_no = 0 + if (seed.nil?) + seed = SeedGenerator.new() + seed.model = "sale" + new_receipt_no = seed.next + seed.save + + else + current_no = seed.next + seed.next = seed.next + seed.current = current_no + seed.save + end + + return seed.current end # Generate for 4 digit Code @@ -68,23 +61,41 @@ class SeedGenerator < ApplicationRecord return next_code end - def self.update_seed(model, current, inc) - cur_val = 0 - next_val = 0 - nex = current + inc + def self.execute_query(model) + current = 0 + nex = 0 + + sql = "INSERT INTO seed_generators (model, created_at, updated_at) + VALUES('#{ model }', NOW(), NOW()) + ON DUPLICATE KEY UPDATE current = current + 1, next = next + 1;" - update_sql = "update seed_generators set current= #{current}, next= #{nex} where model='#{model}';"; + select_sql = "select * from seed_generators where model='#{model}';" + ActiveRecord::Base.connection.execute(sql); + select_result = ActiveRecord::Base.connection.execute(select_sql); + + select_result.each do |row| + current = row [3] + nex = row[4] + end + + return current, nex + end + + def self.update_seed(model) + current = 0 + nex = 0 + + update_sql = "UPDATE seed_generators set current = current + 1, next = next + 1 WHERE model='#{model}';" select_sql = "select * from seed_generators where model='#{model}';" update_result = ActiveRecord::Base.connection.execute(update_sql); select_result = ActiveRecord::Base.connection.execute(select_sql); select_result.each do |row| - p row - cur_val = row [3] - next_val = row[4] + current = row [3] + nex = row[4] end - return cur_val, next_val + return current, nex end end From f01fab0951f6205ab56662de35bb122874ef9b57 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 31 Oct 2017 18:23:03 +0630 Subject: [PATCH 25/34] fix seed --- app/models/seed_generator.rb | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 1451b11e..0748edf1 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -14,22 +14,14 @@ class SeedGenerator < ApplicationRecord # Generate Receipt No def self.new_receipt_no - seed = SeedGenerator.find_by_model("sale") - new_receipt_no = 0 - if (seed.nil?) - seed = SeedGenerator.new() - seed.model = "sale" - new_receipt_no = seed.next - seed.save + # Only return seed no + cur_val, next_val = self.update_seed("sale") - else - current_no = seed.next - seed.next = seed.next - seed.current = current_no - seed.save - end + if (cur_val == 0) + cur_val, next_val = self.execute_query("sale") + end - return seed.current + return cur_val end # Generate for 4 digit Code From 1fa2d090ab6adedd25c7cb990b093f61050d73ff Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 31 Oct 2017 18:46:18 +0630 Subject: [PATCH 26/34] upgrading --- config/initializers/assets.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index a275f9bb..13b3db4d 100755 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -19,7 +19,7 @@ Rails.application.config.assets.precompile += %w( origami.css ) Rails.application.config.assets.precompile += %w( origami.js ) # -- Order Queue Station ----- Rails.application.config.assets.precompile += %w( OQS.css ) -#Rails.application.config.assets.precompile += %w( OQS.js ) +Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( settings.css ) @@ -28,11 +28,11 @@ Rails.application.config.assets.precompile += %w( fileinput.min.css ) # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( CRM.css ) -#Rails.application.config.assets.precompile += %w( CRM.js ) +Rails.application.config.assets.precompile += %w( CRM.js ) # --- Customer/ Customer - Crm ---- -Rails.application.config.assets.precompile += %w( jquery-confirm.css ) -Rails.application.config.assets.precompile += %w( jquery-confirm.js ) +# Rails.application.config.assets.precompile += %w( jquery-confirm.css ) +# Rails.application.config.assets.precompile += %w( jquery-confirm.js ) # --- Image Uploader ---- Rails.application.config.assets.precompile += %w( fileinput.min.js ) From 6fe447c7f309521009b2be4f2c0a1dc24372acf2 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 31 Oct 2017 18:55:16 +0630 Subject: [PATCH 27/34] upgrade --- app/assets/javascripts/CRM.js | 8 -------- app/assets/javascripts/addorder.js | 9 +-------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js index e9322f71..646bc195 100755 --- a/app/assets/javascripts/CRM.js +++ b/app/assets/javascripts/CRM.js @@ -16,11 +16,6 @@ //= require bootstrap/js/bootstrap-material-design.min //= require jquery_ujs //= require turbolinks -<<<<<<< HEAD -//= require cable -//= require jquery-ui -//= require bootstrap-datepicker -======= //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require jquery-slimscroll/jquery.slimscroll.js @@ -32,13 +27,10 @@ //= require custom.js $(document).on('turbolinks:load', function() { ->>>>>>> 01c4eeca81e1eac7bf7fe5854142a9663e104249 - $('.datepicker').bootstrapMaterialDatePicker({ format: 'DD-MM-YYYY', clearButton: true, weekStart: 1, time: false }); - }); \ No newline at end of file diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 276b7f26..cbcd662c 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -78,13 +78,7 @@ $(function(){ //click menu sidebar menu category $(".menu_category").on("click", function(){ var menu_id = $(this).find(".menu-id").text(); -<<<<<<< HEAD -// var url = $(this).attr('data-ref'); var url = "get_menu_category/"+menu_id; -======= - var url = "get_menu_category/"+menu_id; - console.log(url) ->>>>>>> 01c4eeca81e1eac7bf7fe5854142a9663e104249 show_menu_item_list(url); }); //End menu category Click @@ -408,8 +402,7 @@ $(function(){ // }); }); } -console.log(instance_attributes); -console.log("hi") + // selected_arr = [] // $(selected_item).each(function(i){ // $.ajax({ From a569e9b5a27d9dffc25cbe016430fa19fd5ff934 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 1 Nov 2017 10:11:41 +0630 Subject: [PATCH 28/34] add is_currently_login true in clear data --- lib/tasks/clear_data.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index affe76ff..a761636e 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -14,6 +14,7 @@ namespace :clear do ShiftSale.delete_all PaymentJournal.delete_all DiningFacility.update_all(status:'available') + CashierTerminal.update_all(is_currently_login: 1) puts "Clear Data Done." end end From bb668e10703a2bc7b82ff46b4432d115e47d98ab Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 1 Nov 2017 15:48:32 +0630 Subject: [PATCH 29/34] fix ui --- app/assets/stylesheets/origami.scss | 28 ++++++++++++ app/views/origami/addorders/detail.html.erb | 6 ++- app/views/origami/addorders/index.html.erb | 5 ++- app/views/origami/home/show.html.erb | 49 +++++++++++---------- app/views/origami/shifts/new.html.erb | 2 +- 5 files changed, 64 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index d52d07f2..4126bf81 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -13,6 +13,24 @@ /* Reset */ +.col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-auto, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-auto, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md-auto, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-auto, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-auto { + padding-left: 5px; + padding-right: 5px; +} + +.col-lg-1, .col-md-1, .col-sm-1,col-xl-1{ + padding-left: 1px ; + padding-right: 1px ; +} + +.ls-closed section.content { + margin-left: 5px; +} + +section.content { + margin: 70px 5px 0 225px; +} + .table { margin-bottom: 0px; } @@ -29,8 +47,18 @@ select.form-control { font-size: 18px !important; } +@media (min-width:769px) and (max-width:1024px) { + .btn-block { + font-size: 11px !important; + } +} + /* End Reset */ +#back { + padding: 0px 0px 7px 0px; +} + .order-info { min-height:300px; max-height:500px; diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index aac52c6d..900f7442 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -26,7 +26,11 @@
-
+ +
ORDER DETAILS | Table<%=@table.name%> diff --git a/app/views/origami/addorders/index.html.erb b/app/views/origami/addorders/index.html.erb index 50e52d3e..c45339c2 100755 --- a/app/views/origami/addorders/index.html.erb +++ b/app/views/origami/addorders/index.html.erb @@ -52,7 +52,10 @@
- +