diff --git a/README.md b/README.md index 3412e2ed..5be96143 100755 --- a/README.md +++ b/README.md @@ -49,6 +49,10 @@ Order Item & Order Summary Slim 5) app/models/printer/order_queue_printer.rb 6) app/models/printer/receipt_printer.rb +For Bank Integration setting + 1) rake db:migrate for card_sale_trans, card_settle_trans + 2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 } + * ToDo list 1. Cloud Sync diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index be4cc94c..9c872325 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -29,7 +29,13 @@ class Origami::JcbController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + #for bank integration @receipt_no = sale_data.receipt_no + bank_integration = Lookup.collection_of('bank_integration') + @bank_integration = 0 + if !bank_integration[0].nil? + @bank_integration = bank_integration[0][1] + end end def create diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 068095ca..0ad47913 100755 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -28,7 +28,13 @@ class Origami::MasterController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + #for bank integration @receipt_no = sale_data.receipt_no + bank_integration = Lookup.collection_of('bank_integration') + @bank_integration = 0 + if !bank_integration[0].nil? + @bank_integration = bank_integration[0][1] + end end def create diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index d1cb3c81..51bcabb1 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -28,7 +28,13 @@ class Origami::MpuController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + #for bank integration @receipt_no = sale_data.receipt_no + bank_integration = Lookup.collection_of('bank_integration') + @bank_integration = 0 + if !bank_integration[0].nil? + @bank_integration = bank_integration[0][1] + end end def create diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index a664e327..af4d31f0 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -27,7 +27,13 @@ class Origami::VisaController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + #for bank integration @receipt_no = sale_data.receipt_no + bank_integration = Lookup.collection_of('bank_integration') + @bank_integration = 0 + if !bank_integration[0].nil? + @bank_integration = bank_integration[0][1] + end end def create diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index 1d855ad2..ada30a8b 100755 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -20,6 +20,7 @@
+ <% if @bank_integration == '1' %>
@@ -29,7 +30,7 @@

- + <% end %>
@@ -120,25 +121,28 @@