From e4a4c7aba426d481e857a7ddba97ebd3e21b1c60 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 8 Dec 2017 16:07:10 +0630 Subject: [PATCH 1/3] update receipt no report --- .../reports/receipt_no_controller.rb | 1 - app/models/sale.rb | 6 +- app/views/origami/addorders/detail.html.erb | 59 ++++++++++--------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 9564bfe1..2bd5e813 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -21,7 +21,6 @@ authorize_resource :class => false @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @tax_profiles = TaxProfile.order('order_by asc') - @from = from @to = to diff --git a/app/models/sale.rb b/app/models/sale.rb index 4b60cc94..fbd22da2 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -764,23 +764,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty query = Sale.all if shift.present? - query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - elsif shift_sale_range.present? - query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - else - query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") end + return query end def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 315cb99f..9021ecb5 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -7,36 +7,41 @@
    - <% - @menu.each do |menu| - if menu.menu_category_id.nil? - %> - - -
  • - - <%= menu.name%> -
    • - <% - end - - # Sub-Category - if !menu.menu_category_id.nil? - %> - - <% - end - end - %> + <% @menu.each do |menu| %> + <% if menu.menu_category_id.nil?%> +
  • + + <%= menu.name%> +
    • + <% end%> + + <% if !menu.menu_category_id.nil? %> + + <% end%> + <%end %> +
  • Products
    • + +
From dd5936b9914d450cbee245cb54d349d477825e11 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 8 Dec 2017 16:26:41 +0630 Subject: [PATCH 2/3] license cloud finished --- app/models/license.rb | 12 ++++++------ app/models/my_aes_crypt.rb | 33 +++++++++++++-------------------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/app/models/license.rb b/app/models/license.rb index 961d4e5a..37ed5149 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -61,7 +61,7 @@ class License @license = response.parsed_response if (@license["status"] == true) - assign() + assign(aes_key, aes_iv) Rails.logger.info "License - " + response.parsed_response.to_s @@ -79,7 +79,7 @@ class License end else @license = Marshal.load(cache_license) - assign() + assign(aes_key, aes_iv) Rails.logger.info 'API License' return true end @@ -330,7 +330,7 @@ class License end # Assign db info for Cloud - def assign + def assign(aes_key, aes_iv) # self.name = @license["name"] # self.address_1 = @license["address_1"] # self.address_2 = @license["address_2"] @@ -354,10 +354,10 @@ class License # self.plan_active_connections = @license["plan_active_connections"].to_i # salt = @license["secret_key"] - key = Base64.decode64(ENV['AES_KEY']) - iv = Base64.decode64(ENV['AES_IV']) + key = Base64.decode64(aes_key) + iv = Base64.decode64(aes_iv) - if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] ) + if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] ) host = Base64.decode64(@license["dbhost"]) dbschema = Base64.decode64(@license["dbschema"]) dbusername = Base64.decode64(@license["dbusername"]) diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb index 9cbd77bd..569a401d 100644 --- a/app/models/my_aes_crypt.rb +++ b/app/models/my_aes_crypt.rb @@ -30,7 +30,7 @@ class MyAesCrypt def export_to_file(passphrase) file_path = "config/shops.json" aes_key, aes_iv = export_key(passphrase) - tmpHash = { + tmpHash = { "lookup" => passphrase, "value" => { @@ -40,27 +40,20 @@ class MyAesCrypt } shop_data = File.read(file_path) - if shop_data != "" - shop_json = JSON.parse(shop_data) - shop_json.each do |j| - byebug - if j == passphrase - j.each do |k| - return k["key"], k["iv"] - end - end + + shop_json = JSON.parse(shop_data) + shop_json["data"].each do |j| + if j["lookup"] == passphrase + return j["value"]["key"], j["value"]["iv"] end - - shop_json << tmpHash - - File.open(file_path, "w") { |io| - io.puts JSON.pretty_generate(shop_json) - } - else - File.open(file_path, "w") { |io| - io.write(tmpHash.to_json) - } end + + shop_json["data"] << tmpHash + + File.open(file_path, "w") { |io| + io.puts JSON.pretty_generate(shop_json) + } + return aes_key, aes_iv end From d80c7840cc4347593242be4d39d2d61da46c1d14 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 8 Dec 2017 17:37:30 +0630 Subject: [PATCH 3/3] remove card pay for member dis --- app/controllers/origami/discounts_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 8134a886..59de9f6d 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -163,7 +163,7 @@ class Origami::DiscountsController < BaseOrigamiController # Check for Card Payment is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments) - if is_card != "true" + # if is_card != "true" account_types = Account.where("discount=?",true) table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type @@ -239,7 +239,7 @@ class Origami::DiscountsController < BaseOrigamiController render :json => result.to_json - end #end Is Card Payment + # end #end Is Card Payment end #discount for selected order