From f8164e483c0b20da6e83e2fa734572c4201a8539 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 18 Apr 2018 14:50:16 +0630 Subject: [PATCH 01/15] update puma production and remove develop --- config/puma.rb | 59 ++++++++------------------------------- config/puma.rb.production | 11 -------- 2 files changed, 11 insertions(+), 59 deletions(-) delete mode 100755 config/puma.rb.production diff --git a/config/puma.rb b/config/puma.rb index c8e0145e..cd3f0829 100755 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,48 +1,11 @@ -# Puma can serve each request in a thread from an internal thread pool. -# The `threads` method setting takes two numbers a minimum and maximum. -# Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum, this matches the default thread size of Active Record. -# -threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i -threads threads_count, threads_count - -# Specifies the `port` that Puma will listen on to receive requests, default is 3000. -# -port ENV.fetch("PORT") { 3000 } - -# Specifies the `environment` that Puma will run in. -# -environment ENV.fetch("RAILS_ENV") { "development" } - -# Specifies the number of `workers` to boot in clustered mode. -# Workers are forked webserver processes. If using threads and workers together -# the concurrency of the application would be max `threads` * `workers`. -# Workers do not work on JRuby or Windows (both of which do not support -# processes). -# -# workers ENV.fetch("WEB_CONCURRENCY") { 2 } - -# Use the `preload_app!` method when specifying a `workers` number. -# This directive tells Puma to first boot the application and load code -# before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. -# -# preload_app! - -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted this block will be run, if you are using `preload_app!` -# option you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end - -# Allow puma to be restarted by `rails restart` command. - -plugin :tmp_restart +application_path="#{File.expand_path("../..", __FILE__)}" +directory application_path +#environment ENV.fetch("RAILS_ENV") { "production" } +environment "production" +pidfile "#{application_path}/tmp/puma/pid" +state_path "#{application_path}/tmp/puma/state" +stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" +port ENV.fetch("PORT") { 62158 } +workers 2 +preload_app! + diff --git a/config/puma.rb.production b/config/puma.rb.production deleted file mode 100755 index cd3f0829..00000000 --- a/config/puma.rb.production +++ /dev/null @@ -1,11 +0,0 @@ -application_path="#{File.expand_path("../..", __FILE__)}" -directory application_path -#environment ENV.fetch("RAILS_ENV") { "production" } -environment "production" -pidfile "#{application_path}/tmp/puma/pid" -state_path "#{application_path}/tmp/puma/state" -stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" -port ENV.fetch("PORT") { 62158 } -workers 2 -preload_app! - From 61e8d6e2b5907489e5ae1d7e755995c1ba128713 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 10:28:31 +0630 Subject: [PATCH 02/15] update shift_sale migration file --- config/secrets.yml | 2 +- db/migrate/20170626191519_create_shift_sales.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index 6e8b73d4..84a824ba 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -24,7 +24,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api + sx_provision_url: https://connect.pos-myanmar.com/bensai/api #192.168.1.147:3002/api server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb index f18a2c1c..bd19a8cf 100755 --- a/db/migrate/20170626191519_create_shift_sales.rb +++ b/db/migrate/20170626191519_create_shift_sales.rb @@ -21,7 +21,7 @@ class CreateShiftSales < ActiveRecord::Migration[5.1] t.integer :dining_count, :default => 0 t.integer :takeaway_count, :default => 0 t.integer :member_count, :default => 0 - t.decimal :total_rounding,, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :total_rounding, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.integer :total_receipt, :default => 0 t.decimal :total_void, :default => 0 t.timestamps From 99e000e0003d1a9254b7042cc35573c671c4bc99 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 10:31:02 +0630 Subject: [PATCH 03/15] update shift_sale migration file --- config/secrets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/secrets.yml b/config/secrets.yml index 84a824ba..b0d7c5c8 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -24,7 +24,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: https://connect.pos-myanmar.com/bensai/api #192.168.1.147:3002/api + sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L From 1913ada8e56e07ab8c9e557fa9dfe02a499625a7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 15:23:08 +0630 Subject: [PATCH 04/15] update --- app/views/origami/paymal/index.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb index 6818fbad..5594eb13 100644 --- a/app/views/origami/paymal/index.html.erb +++ b/app/views/origami/paymal/index.html.erb @@ -328,7 +328,6 @@ var payment_amount = parseFloat($("#used_amount").text()); setTimeout(function(){ code=getQRCode(); - alert(code) if(sale_id != 0 && code != ""){ $.ajax({ type: "POST", @@ -345,7 +344,6 @@ url: "<%=origami_payment_paymal_path%>", data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code}, success: function(result){ - alert(result) if(result.status == true){ swal({ title: "Information!", From f638837f81d380a707aaed71a39035e61852cd41 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 15:48:39 +0630 Subject: [PATCH 05/15] update dinga and paymal view for tabcap --- app/views/origami/dinga/index.html.erb | 11 +++++++++-- app/views/origami/paymal/index.html.erb | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb index 1a7bd798..4c4bff3d 100644 --- a/app/views/origami/dinga/index.html.erb +++ b/app/views/origami/dinga/index.html.erb @@ -107,6 +107,12 @@ +
+

Card Tap

+
+ +
+
@@ -118,7 +124,7 @@
- +
@@ -250,6 +256,7 @@ getCardNo(); $("#sxModal").hide(); customer_mamber_card_no = $("#paypar_account_no").val(); + if(sale_id != 0 && customer_mamber_card_no != 0){ $.ajax({ type: "POST", @@ -423,7 +430,7 @@ }); } - $("#sxModal .btn_cancel").on('click',function(){ + $(".btn_cancel").on('click',function(){ $("#sxModal").hide(); }); diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb index 5594eb13..1000455f 100644 --- a/app/views/origami/paymal/index.html.erb +++ b/app/views/origami/paymal/index.html.erb @@ -108,6 +108,13 @@
+ +
+

Card Tap

+
+ +
+
From 8d3946fede5b108c0401b341c68656547c7dec68 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 15:49:38 +0630 Subject: [PATCH 06/15] update dinga and paymal view for tabcap --- app/views/origami/dinga/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb index 4c4bff3d..70b572db 100644 --- a/app/views/origami/dinga/index.html.erb +++ b/app/views/origami/dinga/index.html.erb @@ -124,7 +124,7 @@
- +
From ba1b7a1d9c1b223aa5e8be5045b710ff50e7df76 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Apr 2018 18:11:32 +0630 Subject: [PATCH 07/15] update receipt rake --- lib/tasks/receipt.rake | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake index fce410fa..3f8c12c5 100644 --- a/lib/tasks/receipt.rake +++ b/lib/tasks/receipt.rake @@ -3,11 +3,11 @@ namespace :consolidate do task :receipt => :environment do # Receipt.delete_all sales = Sale.all_receipts -puts sales.to_json shop = Shop.find(1) sales.each do |sale| - puts sale.to_json - shift = ShiftSale.find(sale.shift_sale_id) + + if !sale.shift_sale_id.nil? + shift = ShiftSale.find(sale.shift_sale_id) receipt = Receipt.new receipt.client_code = shop.client_code receipt.client_name = shop.client_name @@ -48,6 +48,7 @@ puts sales.to_json receipt.cancle = (sale.payment_status=="void") ? false : true # void is cancel receipt.remarks = sale.remark receipt.save + end end end @@ -109,14 +110,14 @@ puts sales.to_json receipt.receipt_date = @requested_at #requet-at receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char receipt.item_sequence = @item_sequence - receipt.category_code = '' - receipt.category_name = '' + receipt.category_code = sale.product_code + receipt.category_name = sale.product_name receipt.sub_category_code = 0 receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = '' - receipt.item_name = '' + receipt.item_code = sale.product_code + receipt.item_name = sale.product_name receipt.qty = @total_qty receipt.transaction_type = "Tender" receipt.gross_sales = @total_gross_sales @@ -158,14 +159,14 @@ puts sales.to_json receipt.receipt_date = sale.requested_at #requet-at receipt.transaction_date = sale.requested_at #before disco/after tax /after/ser_char receipt.item_sequence = @item_sequence - receipt.category_code = name - receipt.category_name = code + receipt.category_code = sale.product_code + receipt.category_name = sale.product_name receipt.sub_category_code = 0 receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = menu_name - receipt.item_name = menu_code + receipt.item_code = menu_code + receipt.item_name = menu_name receipt.qty = sale.qty receipt.transaction_type = (sale.status==nil) ? "Sales" : sale.status receipt.gross_sales = sale.price @@ -208,14 +209,14 @@ puts sales.to_json receipt.receipt_date = @requested_at #requet-at receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char receipt.item_sequence = @item_sequence - receipt.category_code = '' - receipt.category_name = '' + receipt.category_code = sale.product_code + receipt.category_name = sale.product_name receipt.sub_category_code = 0 receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = '' - receipt.item_name = '' + receipt.item_code = menu_code + receipt.item_name = menu_name receipt.qty = @total_qty receipt.transaction_type = "Tender" receipt.gross_sales = @total_gross_sales From cc89a35ececf435f692df4a8610ff8990e10d50d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 22 Apr 2018 10:45:29 +0630 Subject: [PATCH 08/15] update rake receipt --- app/models/sale.rb | 2 +- lib/tasks/receipt.rake | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 0e090073..b8ab0a10 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -2603,7 +2603,7 @@ end end def self.all_receipts - query = Sale.select("sale_payments.created_at as receipt_close_time, + query = Sale.select("sales.*,sale_payments.created_at as receipt_close_time, case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark, case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges, SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount, diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake index 3f8c12c5..08692a0e 100644 --- a/lib/tasks/receipt.rake +++ b/lib/tasks/receipt.rake @@ -6,7 +6,7 @@ namespace :consolidate do shop = Shop.find(1) sales.each do |sale| - if !sale.shift_sale_id.nil? + if sale.shift_sale_id.present? shift = ShiftSale.find(sale.shift_sale_id) receipt = Receipt.new receipt.client_code = shop.client_code @@ -69,10 +69,10 @@ namespace :consolidate do @item_sequence = 1 sale_count = sales.to_a.count sales.each do |sale| - if sale.qty > 0 if sale.item_instance_code !=nil + byebug menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id) name = menu_category.name code = menu_category.code @@ -91,7 +91,9 @@ namespace :consolidate do @receipt_no = sale.receipt_no @requested_at = sale.requested_at - + if @receipt_no == '20171130-10464' + byebug + end if sale_id == sale.sale_id || count == 0 || @z ==0 @total_qty += sale.qty @total_gross_sales += sale.price @@ -116,7 +118,7 @@ namespace :consolidate do receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = sale.product_code + receipt.item_code = (sale.product_code.to_s=="NULL") ? "0" : sale.product_code receipt.item_name = sale.product_name receipt.qty = @total_qty receipt.transaction_type = "Tender" @@ -165,7 +167,7 @@ namespace :consolidate do receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = menu_code + receipt.item_code = (menu_code.to_s=="NULL") ? "0" : sale.product_code receipt.item_name = menu_name receipt.qty = sale.qty receipt.transaction_type = (sale.status==nil) ? "Sales" : sale.status @@ -215,7 +217,7 @@ namespace :consolidate do receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = menu_code + receipt.item_code = (menu_code.to_s=="NULL") ? "0" : sale.product_code receipt.item_name = menu_name receipt.qty = @total_qty receipt.transaction_type = "Tender" From 76531535d09894221745e21c653306ed63b62e8b Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 23 Apr 2018 14:45:31 +0630 Subject: [PATCH 09/15] remove comment for license --- config/initializers/action_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 8a149cb7..92add0d2 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else #check for license file - # if check_license - # current_license(ENV["SX_PROVISION_URL"]) - # else - # redirect_to activate_path - # end + if check_license + current_license(ENV["SX_PROVISION_URL"]) + else + redirect_to activate_path + end end end From 1303fea51b8609b902361c62fcdc1966f6c35507 Mon Sep 17 00:00:00 2001 From: Jueli Moon Aung Date: Thu, 3 May 2018 11:13:00 +0000 Subject: [PATCH 10/15] secrets.yml edited online with Bitbucket --- config/secrets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/secrets.yml b/config/secrets.yml index 2768d134..aef81223 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -24,7 +24,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: connect.pos-myanmar.com/api #192.168.1.147:3002/api + sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L From 02690e6b0d8f9b656802e1fa4790daa49cd78996 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 9 May 2018 11:31:48 +0630 Subject: [PATCH 11/15] change printer to print in pdf --- app/pdf/order_set_item_pdf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb index 1e7b9c7f..14a8ff62 100755 --- a/app/pdf/order_set_item_pdf.rb +++ b/app/pdf/order_set_item_pdf.rb @@ -4,8 +4,8 @@ class OrderSetItemPdf < Prawn::Document def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height - self.header_font_size = printer_settings.header_font_size.to_i - self.item_font_size = printer_settings.item_font_size.to_i + self.header_font_size = print_settings.header_font_size.to_i + self.item_font_size = print_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 From 0f1ce09416e630209fd29d634ffdd78b0b4a18d5 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 9 May 2018 15:40:13 +0630 Subject: [PATCH 12/15] change customer and sale tax for takeaway --- app/controllers/crm/customers_controller.rb | 2 +- .../origami/customers_controller.rb | 2 +- app/models/sale.rb | 56 +++++++++++++++++++ .../crm/customers/_card_read_form.html.erb | 0 .../crm/customers/_crm_customer.json.jbuilder | 0 app/views/crm/customers/_form.html.erb | 0 app/views/crm/customers/_new_form.html.erb | 0 app/views/crm/customers/edit.html.erb | 0 app/views/crm/customers/edit.json.jbuilder | 0 app/views/crm/customers/index.html.erb | 0 app/views/crm/customers/index.json.jbuilder | 0 app/views/crm/customers/new.html.erb | 0 app/views/crm/customers/show.html.erb | 0 app/views/crm/customers/show.json.jbuilder | 0 app/views/origami/customers/index.html.erb | 0 15 files changed, 58 insertions(+), 2 deletions(-) mode change 100755 => 100644 app/controllers/crm/customers_controller.rb mode change 100755 => 100644 app/controllers/origami/customers_controller.rb mode change 100755 => 100644 app/views/crm/customers/_card_read_form.html.erb mode change 100755 => 100644 app/views/crm/customers/_crm_customer.json.jbuilder mode change 100755 => 100644 app/views/crm/customers/_form.html.erb mode change 100755 => 100644 app/views/crm/customers/_new_form.html.erb mode change 100755 => 100644 app/views/crm/customers/edit.html.erb mode change 100755 => 100644 app/views/crm/customers/edit.json.jbuilder mode change 100755 => 100644 app/views/crm/customers/index.html.erb mode change 100755 => 100644 app/views/crm/customers/index.json.jbuilder mode change 100755 => 100644 app/views/crm/customers/new.html.erb mode change 100755 => 100644 app/views/crm/customers/show.html.erb mode change 100755 => 100644 app/views/crm/customers/show.json.jbuilder mode change 100755 => 100644 app/views/origami/customers/index.html.erb diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb old mode 100755 new mode 100644 index 3082687b..1d0ad8e4 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -39,7 +39,7 @@ class Crm::CustomersController < BaseCrmController @membership_types = Lookup.collection_of("member_group_type") - @taxes = TaxProfile.all.order("order_by asc") + @taxes = TaxProfile.where(:group_type => 'cashier') @filter = filter diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb old mode 100755 new mode 100644 index 537703a1..ec559870 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -86,7 +86,7 @@ class Origami::CustomersController < BaseOrigamiController @crm_customer = Customer.new @count_customer = Customer.count_customer - @taxes = TaxProfile.all.order("order_by asc") + @taxes = TaxProfile.where(:group_type => 'cashier') # if flash["errors"] # @crm_customer.valid? # end diff --git a/app/models/sale.rb b/app/models/sale.rb index 8390c981..3be637d0 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -430,6 +430,32 @@ class Sale < ApplicationRecord # customer.tax_profiles.each do |cus_tax| # if cus_tax.to_i == tax.id if tax.group_type.to_s == order_source.to_s + if customer.customer_type.downcase == 'takeaway' + if tax.name.downcase == 'commercial tax' + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate + + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + + sale_tax.inclusive = tax.inclusive + sale_tax.save + end + else sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -452,6 +478,8 @@ class Sale < ApplicationRecord sale_tax.inclusive = tax.inclusive sale_tax.save + end + end # end # end @@ -484,6 +512,33 @@ class Sale < ApplicationRecord # customer.tax_profiles.each do |cus_tax| # if cus_tax.to_i == tax.id if tax.group_type.to_s == order_source.to_s + if customer.customer_type.downcase == 'takeaway' + if tax.name.downcase == 'commercial tax' + sale_tax = SaleTax.new(:sale => self) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate + + # substract , to give after discount + total_tax = total_taxable - self.total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + + sale_tax.inclusive = tax.inclusive + sale_tax.save + end + else sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -507,6 +562,7 @@ class Sale < ApplicationRecord sale_tax.inclusive = tax.inclusive sale_tax.save + end end # end # end diff --git a/app/views/crm/customers/_card_read_form.html.erb b/app/views/crm/customers/_card_read_form.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/_crm_customer.json.jbuilder b/app/views/crm/customers/_crm_customer.json.jbuilder old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/_form.html.erb b/app/views/crm/customers/_form.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/edit.html.erb b/app/views/crm/customers/edit.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/edit.json.jbuilder b/app/views/crm/customers/edit.json.jbuilder old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/index.json.jbuilder b/app/views/crm/customers/index.json.jbuilder old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/new.html.erb b/app/views/crm/customers/new.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb old mode 100755 new mode 100644 diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder old mode 100755 new mode 100644 diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb old mode 100755 new mode 100644 From 62e9dd08da6586fe5405afabc6bd2979ed9c4923 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 May 2018 16:53:39 +0630 Subject: [PATCH 13/15] update addorder js for set_item --- app/assets/javascripts/addorder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 6203d513..8f00eb36 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -273,6 +273,8 @@ $(function() { $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]); value = item_sets[field]["instances"]; + type = window.location.href.indexOf("quick_service"); + modify_order = window.location.href.indexOf("modify_order"); $(value).each(function(i){ if (type != -1 && modify_order != -1) { @@ -294,7 +296,6 @@ $(function() { url: url, // data: {id:value[i]}, success:function(result){ - row = '
' +"
replyBack <% if @sale.sale_status != 'void' %> - +