From 4ce8fe48bc5544ad00001353b1d7d95ac44a21a2 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 10 Nov 2017 14:15:05 +0630 Subject: [PATCH 1/9] license for master --- app/controllers/application_controller.rb | 6 +++--- app/models/license.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ce00dda9..896d0b5b 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -38,13 +38,13 @@ class ApplicationController < ActionController::Base end end - def current_license(url, key) - @license = License.new(url, key) + def current_license(url, subdomain) + @license = License.new(url, subdomain) ##creating md5 hash md5_hostname = Digest::MD5.new md5key = md5_hostname.update(request.host) - if (@license.detail_with_local_cache(key, md5key.to_s) == true) + if (@license.detail_with_local_cache(subdomain, md5key.to_s) == true) #if (@license.detail == true) return @license diff --git a/app/models/license.rb b/app/models/license.rb index b2682213..2a8fca4e 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -50,7 +50,7 @@ class License if cache_license.nil? ##change the d/e key # @options = { query: {device: "SXlite", lookup: lookup, skey: @secret, token: SECRETS_CONFIG['provision_key']} } - @params = { query: { device: "SXlite", token: SECRETS_CONFIG['provision_key']} } + @params = { query: { lookup_type: "cloud", lookup: lookup, encrypted_key: SECRETS_CONFIG['provision_key']} } response = self.class.get("/request_license", @params) @license = response.parsed_response From 8db96beca0f547fa1ba90f0691551941967ce952 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 10 Nov 2017 14:32:21 +0630 Subject: [PATCH 2/9] update oqs view an d promotion form update --- app/assets/javascripts/OQS.js | 24 ++-- .../channels/order_queue_station.js | 24 ++-- app/assets/stylesheets/OQS.scss | 5 - app/models/dining_facility.rb | 1 - app/views/oqs/home/index.html.erb | 28 ++--- app/views/origami/home/index.html.erb | 3 + app/views/settings/promotions/_form.html.erb | 107 ++++++++---------- 7 files changed, 91 insertions(+), 101 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 609fdfc2..ce844239 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -70,26 +70,26 @@ $(document).on('turbolinks:load', function() { row ='
' +'
' - +'
' - +''+data[field]["table_type"]+'- ' - +''+ data[field]["zone"] +'' - +''+ data[field]["order_id"] +'' - +'
' + // +'
' + +''+data[field]["table_type"]+'- '+ data[field]["zone"] +' ' + // +''+ data[field]["zone"] +'' + +''+ data[field]["order_id"] +'' + // +'
' - +'
' - +''+ data[field]["item_name"] +'- ' + // +'
' + +''+ data[field]["item_name"] +'- ' +''+ data[field]["qty"] +' ' - +'
' + // +'' +'

'+ options +'

' - +'

' - +'Order at' + +'' + +'Order at' +''+ show_date +' - ' +''+ data[field]["item_order_by"] +' ' - +' ' - +'

' + +' ' + +'' +' ' +' ' diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js index 4fb7d214..6c8166d4 100755 --- a/app/assets/javascripts/channels/order_queue_station.js +++ b/app/assets/javascripts/channels/order_queue_station.js @@ -37,26 +37,26 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann row ='
' +'' +'
' - +'

' - +''+items[field]["table_type"]+'- ' - +''+ items[field]["zone"] +'' - +''+ items[field]["order_id"] +'- ' - +'

' + // +'

' + +''+items[field]["table_type"]+'- ' + +''+ items[field]["zone"] +'' + +''+ items[field]["order_id"] +'- ' + // +'

' - +'

' - +''+ items[field]["item_name"] +'- ' + // +'

' + +''+ items[field]["item_name"] +'- ' +''+ items[field]["qty"] +'- ' - +'

' + // +'' +'

'+ options +'

' - +'

' - +'Order at' + +'' + +'Order at' +''+ show_date +' - ' +''+ items[field]["item_order_by"] +' ' - +' ' - +'

' + +' ' + +'' +' ' +' ' diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index f6211dec..bd62ff95 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -22,10 +22,5 @@ background-color: blue; } -.order-item { - width: 49%; - font-size: 18px; - margin: 0px 0px 5px 0px; -} diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index ba01afb6..24a3e47b 100755 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -33,7 +33,6 @@ class DiningFacility < ApplicationRecord def get_current_booking booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) - if booking.count > 0 then return booking[0] else diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 3e03f84d..896dfae7 100755 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -73,7 +73,7 @@ -
+
@@ -83,31 +83,31 @@ %>
-
- <%= qid.type %> - - <%= qid.zone %> - <%= qid.order_id %> -
-
- + + <%= qid.type %> - + <%= qid.zone %> + <%= qid.order_id %> + + + <%= qid.item_name %> [x <%= qid.qty %> ] -
+

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

- Order at + Order at <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - <%= qid.item_order_by %> - +

@@ -140,9 +140,9 @@ - - + diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 4dd97cda..845c3a95 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -43,6 +43,7 @@ <% if table.get_booking.nil? %>
+ <%= table.get_booking %> Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
@@ -50,6 +51,7 @@ <% else %>
+ <%= table.get_booking %> Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
@@ -58,6 +60,7 @@ <% else %>
+ <%= table.get_booking %> Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index f8e54317..ab8172f7 100755 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -85,7 +85,7 @@
- <%= f.hidden_field :promo_day, :class => "form-control" %> + <%= f.hidden_field :promo_day, :class => "form-control", :id => "promotion_promo_day" %>
      @@ -97,15 +97,9 @@
- - <%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:input_html=>{:class => 'col-md-5 form-control select'} ,:label => "Promotion Type", :include_blank => 'Choose Promotion Type', :selected => '' %> + + <%= f.input :promo_type,input_html: { :class => 'form-control col-md-5 form-control select' }, + collection: %w{Quantity Net_off Net_price Percentage},:label => "Promotion Type" %> @@ -147,7 +141,7 @@ <% end %>
<%= f.input :original_product,collection: sample %>
-
<%= f.input :min_qty %>
+
<%= f.input :min_qty ,label: "Qualified Qty" %>

@@ -155,10 +149,10 @@
Item Code
Item Instance
-
Min Qty
+
Qualified Qty
Net off
Net Price
-
Percentage
+
Percentage
@@ -183,10 +177,10 @@ <%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
-
<%= pro.input :min_qty , label: false%>
+
<%= pro.input :min_qty , label: false%>
<%= pro.input :net_off , label: false %>
<%= pro.input :net_price , label: false %>
-
<%= pro.input :percentage , label: false %>
+
<%= pro.input :percentage , label: false %>
<%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%>
<% end %> @@ -250,58 +244,56 @@ $(document).ready(function(){ - // $('#promotion_promo_start_date').datetimepicker({ - // timepicker:false, - // format:'Y-m-d' - // }); - // $('#promotion_promo_end_date').datetimepicker({ - // timepicker:false, - // format:'Y-m-d' - // }); - // $('#promotion_promo_start_hour').datetimepicker({ - // datepicker:false, - // format:'H:m' - // }); - // $('#promotion_promo_end_hour').datetimepicker({ - // datepicker:false, - // format:'H:m' - // }); - // $('#promotion_promo_start_hour').on('change', function(event) { - // $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00"); - // }); + $('#promotion_promo_start_hour').on('change', function(event) { + $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00"); + }); - // $('#promotion_promo_end_hour').on('change', function(event) { - // $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00"); - // }); + $('#promotion_promo_end_hour').on('change', function(event) { + $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00"); + }); - // $('.datepicker').bootstrapMaterialDatePicker({ - // format: 'dddd DD MM YYYY', - // clearButton: true, - // weekStart: 1, - // time: false - // }); + $('.datepicker').bootstrapMaterialDatePicker({ + format: 'dddd DD MM YYYY', + clearButton: true, + weekStart: 1, + time: false + }); - // $('.timepicker').bootstrapMaterialDatePicker({ - // format: 'HH:mm', - // clearButton: true, - // date: false - // }); + $('.timepicker').bootstrapMaterialDatePicker({ + format: 'HH:mm', + clearButton: true, + date: false + }); - // var dayy = $("#promotion_promo_day").val().replace("[","").replace("]",""); - // jQuery.each( dayy.split(","), function( i, d ) { - // $("input.selectDay[value='"+d+"']").prop( "checked", true ); - // }); + var dayy = $("#promotion_promo_day").val().replace("[","").replace("]",""); + jQuery.each( dayy.split(","), function( i, d ) { + $("input.selectDay[value='"+d+"']").prop( "checked", true ); + }); - var form = document.getElementById("new_promotion"); + /*var form = document.getElementById("new_promotion"); var inputs = $("input"); var arr = []; var count = 0; - var day = "["; + var day = "[";*/ + $(".selectDay").click(function() { // debugger; - day = "["; + var item_row = $('.selectDay'); + console.log(item_row); + check = $(item_row).prop("checked"); + var attribute_arr = []; + $(item_row).each(function(i){ + if ($(item_row[i]).prop("checked")) { + value = $(item_row[i]).val(); + str = value; + attribute_arr.push(str); + } + }); + + + /*day = "["; for (var j = 8; j <=15; j += 1){ if (inputs[j].type === "checkbox" && inputs[j].checked) { @@ -316,9 +308,10 @@ $(".selectDay").click(function() { { day = day + "]"; } - } + }*/ + document.getElementById("promotion_promo_day").value = ''; - document.getElementById("promotion_promo_day").value = day; + document.getElementById("promotion_promo_day").value = "["+attribute_arr+"]"; }); // $("#promotion_original_product").select2(); From 97fd7619ced40cacba5e2136d12d6915cfc3ec9c Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 10 Nov 2017 18:08:48 +0630 Subject: [PATCH 3/9] license test --- app/controllers/application_controller.rb | 6 +++--- app/models/AESEncDec.rb | 4 ++++ app/models/license.rb | 6 +++--- app/views/origami/home/index.html.erb | 6 ++---- config/secrets.yml | 4 ++-- lib/tasks/clear_data.rake | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d378a694..14838c20 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,8 +23,8 @@ class ApplicationController < ActionController::Base end def lookup_domain - if request.subdomain.present? && request.subdomain != "www" - @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase) + # if request.subdomain.present? && request.subdomain != "www" + @license = current_license(ENV["SX_PROVISION_URL"], "chromis") # request.subdomain.downcase if (!@license.nil?) # logger.info "Location - " + @license.name ActiveRecord::Base.establish_connection(website_connection(@license)) @@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] end - end + # end end def current_license(url, subdomain) diff --git a/app/models/AESEncDec.rb b/app/models/AESEncDec.rb index e175a3a9..0a8be5de 100644 --- a/app/models/AESEncDec.rb +++ b/app/models/AESEncDec.rb @@ -5,6 +5,10 @@ require 'uri' class AESEncDec { cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc") + def initialize + + end + def self.export_key ENV['aes_key'] = cipher.key = cipher.random_key # stores the key in key, and also sets the generated key on the cipher ENV['aes_iv'] = cipher.iv = cipher.random_iv # stores the iv in iv, and also sets the generated iv on the cipher diff --git a/app/models/license.rb b/app/models/license.rb index 537e1221..53cc81ba 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -1,7 +1,7 @@ class License include HTTParty - base_uri "secure.smartsales.asia/api" + base_uri "provision.zsai.ws/api" attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain, :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections, @@ -20,8 +20,8 @@ class License end # generate key for license file encrypt - AESCrypt.export_key() - + AESEncDec.export_key() +byebug @secret = ENV["aes_key"] @params = { query: { device: "SX", token: SECRETS_CONFIG['provision_key'] } } end diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 845c3a95..9b9d3a2e 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -42,16 +42,14 @@ <% if table.status == 'occupied' %> <% if table.get_booking.nil? %>
-
- <%= table.get_booking %> +
Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
<% else %>
-
- <%= table.get_booking %> +
Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
diff --git a/config/secrets.yml b/config/secrets.yml index 794deddf..6dabc7c7 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -12,7 +12,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 - sx_provision_url: secure.smartsales.asia/api + sx_provision_url: 192.168.1.94:3002/api #provision.zsai.ws aes_key: <%= ENV['aes_key'] %> aes_iv: <%= ENV['aes_iv'] %> @@ -23,7 +23,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: secure.smartsales.asia/api + sx_provision_url: 192.168.1.94:3002/api #provision.zsai.ws aes_key: <%= ENV['aes_key'] %> aes_iv: <%= ENV['aes_iv'] %> diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index a761636e..3071132b 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -14,7 +14,7 @@ namespace :clear do ShiftSale.delete_all PaymentJournal.delete_all DiningFacility.update_all(status:'available') - CashierTerminal.update_all(is_currently_login: 1) + CashierTerminal.update_all(is_currently_login: 0) puts "Clear Data Done." end end From e4308cdc53ec6882fa970a88ec28db0a2d4bf8e3 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 10 Nov 2017 18:10:19 +0630 Subject: [PATCH 4/9] license test remove --- app/controllers/application_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 14838c20..f6d3c957 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,8 +23,8 @@ class ApplicationController < ActionController::Base end def lookup_domain - # if request.subdomain.present? && request.subdomain != "www" - @license = current_license(ENV["SX_PROVISION_URL"], "chromis") # request.subdomain.downcase + if request.subdomain.present? && request.subdomain != "www" + @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase) # request.subdomain.downcase if (!@license.nil?) # logger.info "Location - " + @license.name ActiveRecord::Base.establish_connection(website_connection(@license)) @@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] end - # end + end end def current_license(url, subdomain) From f1a28d64e179a166faa7a51ce58b766b73fe6733 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 14 Nov 2017 09:43:13 +0630 Subject: [PATCH 5/9] update OQS and cashier --- app/assets/javascripts/OQS.js | 34 +++---- app/assets/javascripts/application.js | 2 +- .../channels/order_queue_station.js | 33 ++++--- app/assets/stylesheets/OQS.scss | 45 ++++++++++ .../origami/addorders_controller.rb | 2 +- app/controllers/origami/home_controller.rb | 17 ++++ .../origami/payments_controller.rb | 8 ++ app/controllers/origami/rooms_controller.rb | 5 +- .../transactions/credit_notes_controller.rb | 3 +- .../transactions/orders_controller.rb | 7 +- .../transactions/sales_controller.rb | 6 +- app/views/layouts/_left_sidebar.html.erb | 2 +- app/views/oqs/edit/index.html.erb | 89 ++++++++++++++++--- app/views/oqs/home/index.html.erb | 63 ++++++------- .../origami/credit_payments/index.html.erb | 19 ++-- app/views/origami/home/show.html.erb | 40 ++++++--- app/views/origami/jcb/index.html.erb | 11 +-- app/views/origami/master/index.html.erb | 11 +-- app/views/origami/mpu/index.html.erb | 10 ++- app/views/origami/orders/show.html.erb | 6 +- .../origami/others_payments/index.html.erb | 9 +- app/views/origami/payments/show.html.erb | 16 +++- .../origami/paypar_payments/index.html.erb | 3 + .../origami/redeem_payments/index.html.erb | 11 +-- app/views/origami/rooms/show.html.erb | 49 ++++++---- app/views/origami/visa/index.html.erb | 11 +-- .../transactions/credit_notes/index.html.erb | 2 +- app/views/transactions/orders/index.html.erb | 2 +- app/views/transactions/orders/show.html.erb | 12 +-- app/views/transactions/sales/index.html.erb | 10 ++- app/views/transactions/sales/show.html.erb | 11 ++- 31 files changed, 378 insertions(+), 171 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index ce844239..831f2f5f 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -66,28 +66,28 @@ $(document).on('turbolinks:load', function() { } var date = new Date(data[field]["created_at"]); - var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); + var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); row ='
' +'
' - // +'
' - +''+data[field]["table_type"]+'- '+ data[field]["zone"] +' ' - // +''+ data[field]["zone"] +'' - +''+ data[field]["order_id"] +'' - // +'
' + +'
' + +''+data[field]["table_type"]+'-'+ data[field]["zone"] +'' + +'' + +''+data[field]["order_id"]+'' + +'
' - // +'
' - +''+ data[field]["item_name"] +'- ' - +''+ data[field]["qty"] +' ' - // +'
' + +'

' + +''+ data[field]["item_name"] +'- ' + +' [x'+ data[field]["qty"] +'] ' + +'

' +'

'+ options +'

' +'' - +'Order at' - +''+ show_date +' - ' + +'Order at - ' + +''+ show_date +'
' - +''+ data[field]["item_order_by"] +' ' + +'Order By - '+ data[field]["item_order_by"] +' ' +' ' +'' @@ -114,6 +114,7 @@ $(document).on('turbolinks:load', function() { $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); + var orderZoneType=$(this).children().children().children('.order-zone-type').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); var assigned_item_id = $(this).children().find(".assigned-order-item").text(); var orderQty = $(this).children().children().children('.order-qty').text(); @@ -121,8 +122,8 @@ $(document).on('turbolinks:load', function() { var orderAt = $(this).children().children().children().children('.order-at').text(); var orderCustomer = $(this).children().children('.order-customer').text(); var order_status = $(this).children().children('.order-status').text(); - - $('#order-title').text("ORDER DETAILS - " + orderZone); + $('.cus_name').removeClass('hidden'); + $('#order-title').text("ORDER DETAILS - " + orderZoneType); $('#order-by').text(orderBy); $('#order-at').text(orderAt); $('#order-customer').text(orderCustomer); @@ -134,7 +135,8 @@ $(document).on('turbolinks:load', function() { type: 'GET', url: '/oqs/' + orderZone, data: { 'status' : order_status }, - success: function(res){ + success: function(res){ + for (i = 0; i < res.length; i++) { var data = JSON.stringify(res[i]); var parse_data = JSON.parse(data); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 66714f33..109d154e 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -52,7 +52,7 @@ $(document).ready(function() { $('.datepicker').bootstrapMaterialDatePicker({ format: 'DD-MM-YYYY', - clearButton: true, + clearButton: false, weekStart: 1, time: false }); diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js index 6c8166d4..11f21727 100755 --- a/app/assets/javascripts/channels/order_queue_station.js +++ b/app/assets/javascripts/channels/order_queue_station.js @@ -37,26 +37,27 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann row ='
' +'' +'
' - // +'

' - +''+items[field]["table_type"]+'- ' - +''+ items[field]["zone"] +'' - +''+ items[field]["order_id"] +'- ' - // +'

' + - // +'

' - +''+ items[field]["item_name"] +'- ' - +''+ items[field]["qty"] +'- ' - // +'

' + +'
' + +''+items[field]["table_type"]+'-'+ items[field]["zone"] +'' + +'' + +''+items[field]["order_id"]+'' + +'
' + +'

' + +''+ items[field]["item_name"] +'- ' + +' [x'+ items[field]["qty"] +'] ' + +'

' +'

'+ options +'

' +'' - +'Order at' - +''+ show_date +' - ' + +'Order at - ' + +''+ show_date +'
' - +''+ items[field]["item_order_by"] +' ' - +' ' - +'' + +'Order By - '+ items[field]["item_order_by"] +' ' + +' ' + +'' +' ' +' ' @@ -73,8 +74,12 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann var $divs = $("div.queue_station"); var SortListDivs = $divs.sort(function (a, b) { + first = $(a).attr('data-date'); next = $(b).attr('data-date'); + console.log(first); + console.log("hi") + console.log(next); return parseInt(next.substring(4, 16)) - parseInt(first.substring(4, 16)); }); $("#oqs_container").html(SortListDivs); diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index bd62ff95..8258a2df 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -21,6 +21,51 @@ color: #fff !important; background-color: blue; } +.cashier_number{ + width: 33%; + height:58px; + line-height:58px; + text-align:center; + background:#54A5AF; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} +.del_cashier_number{ + opacity:0.6, +} +.pay{ + width: 86%; + height:174px; + line-height:174px; + text-align:center; + font-size:20px; + color:white; +} +.long{ + width:43%; +} +.orange{ + background-color:#FF7F50; +} +.red { + background-color:#F44336; +} +.green{ + background-color: #009900; +} +.left{ + margin-left:1px; +} + +.bottom{ + margin-bottom:1px; +} +.border-left{ + border-left:1px solid #fff; +} diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index ff917887..7bde1e98 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -67,7 +67,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @order.guest = params[:guest_info] @order.table_id = params[:table_id] # this is dining facilities's id @order.new_booking = true - @order.employee_name = current_login_employee.name + @order.waiters = current_login_employee.name #Create Table Booking or Room Booking if !params["booking_id"].nil? # check booking id is already completed. diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 27b9cc52..febf7e45 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -24,6 +24,7 @@ class Origami::HomeController < BaseOrigamiController @dining.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' + @order_items = Array.new booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) @@ -31,26 +32,42 @@ class Origami::HomeController < BaseOrigamiController @obj_order = order @customer = order.customer @date = order.created_at + @booking= booking order.order_items.each do |item| @order_items.push(item) end + accounts = @customer.tax_profiles + @account_arr =[] + accounts.each do |acc| + account = TaxProfile.find(acc) + @account_arr.push(account) + end end end @status_order = 'order' else sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" && sale.sale_status != 'void' + @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' end + @booking= booking @date = sale.created_at @status_sale = 'sale' @obj_sale = sale @customer = sale.customer + accounts = @customer.tax_profiles + @account_arr =[] + accounts.each do |acc| + account = TaxProfile.find(acc) + @account_arr.push(account) + end end end end + end private diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index d6671700..0ef1c1a5 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -116,6 +116,13 @@ class Origami::PaymentsController < BaseOrigamiController #get customer amount @customer = Customer.find(@sale_data.customer_id) + accounts = @customer.tax_profiles + @account_arr =[] + accounts.each do |acc| + account = TaxProfile.find(acc) + @account_arr.push(account) + end + rebate = MembershipSetting.find_by_rebate(1) # get member information if @customer.membership_id != nil && rebate @@ -136,6 +143,7 @@ class Origami::PaymentsController < BaseOrigamiController @sale_data.bookings.each do |sbk| df = DiningFacility.find(sbk.dining_facility_id) @table_no = df.type + ' ' + df.name + @checkin_time = sbk.checkin_at break end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index f235aee3..6c0b98c8 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -24,10 +24,12 @@ class Origami::RoomsController < BaseOrigamiController @order_items = Array.new booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) + @customer = order.customer if (order.status == "new") @obj_order = order - @customer = order.customer + @date = order.created_at + @booking = booking order.order_items.each do |item| @order_items.push(item) end @@ -42,6 +44,7 @@ class Origami::RoomsController < BaseOrigamiController if @status_order == 'order' @status_order = 'sale' end + @booking = booking @date = sale.created_at @status_sale = 'sale' @obj_sale = sale diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb index 339998f5..e28b5331 100755 --- a/app/controllers/transactions/credit_notes_controller.rb +++ b/app/controllers/transactions/credit_notes_controller.rb @@ -15,12 +15,11 @@ class Transactions::CreditNotesController < ApplicationController if filter.nil? && from.nil? && to.nil? && customer.nil? @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING) - puts "cccccccccccc" else sale = Sale.search_credit_sales(customer,filter,from,to) if sale.count > 0 @sales = sale - @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20) else @sales = 0 end diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index bd079d83..496d43cd 100755 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -9,19 +9,18 @@ class Transactions::OrdersController < ApplicationController if filter.nil? && from.nil? && to.nil? && count.nil? orders = Order.order("order_id desc") - puts "ssssss" + else orders = Order.search(filter,from,to,count) - puts "aaaaa" end if !orders.nil? - @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50) + @orders = Kaminari.paginate_array(orders).page(params[:page]).per(20) else @orders = [] end - puts @orders.to_json + respond_to do |format| format.html # index.html.erb format.json { render json: @orders } diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index 9aca7d87..8486d9ca 100755 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -11,13 +11,13 @@ class Transactions::SalesController < ApplicationController to = params[:to] if receipt_no.nil? && from.nil? && to.nil? - @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) - @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc") + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20) else sale = Sale.search(receipt_no,from,to) if sale.count > 0 @sales = sale - @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20) else @sales = 0 end diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index cf9f77c0..fb326c24 100755 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -89,7 +89,7 @@ <% end %> <% if can? :menage, Sale %>
  • - <%= (t :credit) + " " + (t :reports) %> + <%= (t :credit) %>
    • <% end %> diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb index cf255912..99541e8a 100755 --- a/app/views/oqs/edit/index.html.erb +++ b/app/views/oqs/edit/index.html.erb @@ -1,5 +1,5 @@ -
    +
    -
    +
    Update Quantity
    @@ -32,36 +32,74 @@
    -->
    -
    - +
    +
    -
    +
    - +
    -
    - +
    +
    -
    +
    - +

    +
    +
    +
    +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    Del
    +
    Clr
    +
    + +
    + +
    +
    +
    +
    + +
    diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 896dfae7..f3a94be5 100755 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,14 +1,14 @@ -
    + +
  • Home
    • <%= link_to 'Back', dashboard_path %> -
    +
    -->
    @@ -83,32 +83,33 @@ %>
    - - <%= qid.type %> - - <%= qid.zone %> - <%= qid.order_id %> - - +
    + <%= qid.type %>-<%= qid.zone %> + + <%= qid.order_id %> +
    +

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

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

    -

    - Order at - + + Order at - + <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - - - - <%= qid.item_order_by %> +
    + Order By - + <%= qid.item_order_by %>     -

    + + @@ -133,27 +134,27 @@
    -
    ORDER DETAILS - Table
    +
    ORDER DETAILS
    -
    Order ByOrder At - Customer + Order ByOrder At + Customer
    +
    - - - - - - - - + + + + + + + + + + - - + +
    Order ByOrder At - Customer -
    Order ByOrder At
    Table/Room
    diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index c7827808..963ec9f6 100755 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -1,14 +1,15 @@
    -
    + +
  • <%= t("views.btn.payment") %>
  • <%= t("views.right_panel.details.credit") %>
    • <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id +'/payment'%> -
    +
    --> +
    Credit Payment
    @@ -64,7 +65,7 @@
    - +
    @@ -107,12 +108,12 @@
    -
    - +
    + +
    + +
    \ No newline at end of file diff --git a/app/views/origami/surveys/index.html.erb b/app/views/origami/surveys/index.html.erb index f61caefb..915bf20a 100755 --- a/app/views/origami/surveys/index.html.erb +++ b/app/views/origami/surveys/index.html.erb @@ -9,7 +9,7 @@
    -
    +
    @@ -70,5 +70,22 @@ +
    + +
    + \ No newline at end of file diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb index db1f68c0..bee0f843 100755 --- a/app/views/origami/surveys/new.html.erb +++ b/app/views/origami/surveys/new.html.erb @@ -1,4 +1,4 @@ -
    + <%= render 'form', survey: @survey %> diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 144f18da..4fce17ae 100755 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -99,7 +99,7 @@
    - +
    From f927d998077c969c1ade8635b72559636d19fc56 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 14 Nov 2017 15:48:22 +0630 Subject: [PATCH 9/9] update transaction --- app/assets/javascripts/application.js | 25 +----------- app/assets/stylesheets/application.scss | 1 - .../transactions/bookings_controller.rb | 17 ++++++++- app/views/reports/shiftsale/index.html.erb | 1 + .../transactions/bookings/index.html.erb | 38 ++++++++++++++++++- .../transactions/credit_notes/index.html.erb | 4 +- app/views/transactions/orders/index.html.erb | 2 +- 7 files changed, 58 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8136a5cc..629b2542 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -23,15 +23,6 @@ //= require bootstrap-notify/bootstrap-notify.js //= require node-waves/waves.js //= require sweetalert/sweetalert.min.js -//=require jquery-datatable/jquery.dataTables.js -//=require jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js -//=require jquery-datatable/extensions/export/dataTables.buttons.min.js -//=require jquery-datatable/extensions/export/buttons.flash.min.js -//=require jquery-datatable/extensions/export/jszip.min.js -//=require jquery-datatable/extensions/export/pdfmake.min.js -//=require jquery-datatable/extensions/export/vfs_fonts.js -//=require jquery-datatable/extensions/export/buttons.html5.min.js -//=require jquery-datatable/extensions/export/buttons.print.min.js //= require autosize/autosize.js //= require jquery-countto/jquery.countTo.js //= require raphael/raphael.min @@ -60,7 +51,7 @@ $(document).ready(function() { $('.datepicker').bootstrapMaterialDatePicker({ format: 'DD-MM-YYYY', - clearButton: false, + clearButton: true, weekStart: 1, time: false }); @@ -351,21 +342,7 @@ $(document).ready(function(){ } }); }); - $(function () { - $('.js-basic-example').DataTable({ - responsive: true, -bLengthChange: false - }); - //Exportable table - $('.js-exportable').DataTable({ - dom: 'Bfrtip', - responsive: true, - buttons: [ - 'copy', 'csv', 'excel', 'pdf', 'print' - ] - }); -}); }); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ff1757aa..b7bcb027 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -5,7 +5,6 @@ @import "animate-css/animate"; @import "sweetalert/sweetalert.css"; @import "multi-select/css/multi-select.css"; -@import "jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css"; @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker"; @import "morrisjs/morris"; @import "fileinput.min"; diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb index dfce77e2..b826cd52 100644 --- a/app/controllers/transactions/bookings_controller.rb +++ b/app/controllers/transactions/bookings_controller.rb @@ -4,7 +4,22 @@ class Transactions::BookingsController < ApplicationController def index - @bookings = Booking.all.order("booking_id desc") + filter = params[:filter] + from = params[:from] + to = params[:to] + + if filter.nil? && from.nil? && to.nil? + @bookings = Booking.all.order("sale_id desc") + @bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2) + else + sale = Sale.search(filter,from,to) + if sale.count > 0 + @bookings = sale + @bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2) + else + @bookings = 0 + end + end respond_to do |format| format.html # index.html.erb diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 54b63caa..d8d814b8 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -145,6 +145,7 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + console.log(date); $('#from').val(date.format("DD-MM-YYYY")) search_by_date(); }); diff --git a/app/views/transactions/bookings/index.html.erb b/app/views/transactions/bookings/index.html.erb index f0e6aea2..997d18b5 100755 --- a/app/views/transactions/bookings/index.html.erb +++ b/app/views/transactions/bookings/index.html.erb @@ -10,10 +10,40 @@
    - +
    +
    + + + + + +
    + <%= form_tag transactions_orders_path, :method => :get do %> +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    +
    +
    + <% end %> +
    +
    - +
    @@ -48,6 +78,10 @@ <% end %>
    <%= t("views.right_panel.detail.booking_id") %>
    +
    + <% if @bookings != 0 %> + <%= paginate @bookings %> + <% end %>
    diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb index 9f708d8e..ac706d90 100755 --- a/app/views/transactions/credit_notes/index.html.erb +++ b/app/views/transactions/credit_notes/index.html.erb @@ -100,7 +100,9 @@
    - + <% if @sales != 0 %> + <%= paginate @sales %> + <% end %>
    diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 6f146034..d78b9fbf 100755 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -73,7 +73,7 @@
    - <%if !@order.nil?%> + <%if !@orders.nil?%> <%= paginate @orders %> <%end%>