From e34d267fc869bf14dde09588fb44fb5998bc777f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Jul 2017 19:43:56 +0630 Subject: [PATCH] update control member for osaka --- .../origami/discounts_controller.rb | 13 +++++---- .../origami/others_payments_controller.rb | 2 ++ .../origami/payments_controller.rb | 9 ++++-- .../membership_settings_controller.rb | 2 +- app/models/sale_payment.rb | 29 +++++++++++-------- app/views/origami/discounts/index.html.erb | 8 +++-- .../membership_settings/_form.html.erb | 4 +++ .../membership_settings/index.html.erb | 8 +++++ ...170414071634_create_membership_settings.rb | 5 +++- 9 files changed, 54 insertions(+), 26 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 6aa76921..4645ff1d 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -7,7 +7,7 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) end - + @member_discount = MembershipSetting.find_by_discount(1) @accounts = Account.all end @@ -167,20 +167,21 @@ class Origami::DiscountsController < BaseOrigamiController 'Accept' => 'application/json' }, :timeout => 10) rescue HTTParty::Error - response = {status: false, message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } rescue Net::OpenTimeout - response = { status: false , message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } rescue OpenURI::HTTPError - response = { status: false, message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } rescue SocketError - response = { status: false, message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } end table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type - puts response.to_json + puts response + puts "sssssssssss" # Re-calc All Amount in Sale if response["status"] == true discount_amount = response["discount_earned"] diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index c050c3f3..2a24e2ac 100644 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -6,6 +6,8 @@ class Origami::OthersPaymentsController < BaseOrigamiController @sale_id = params[:sale_id] @payment_method_setting = PaymentMethodSetting.all + @rebate = MembershipSetting.find_by_rebate(1) + # @sale_id = params[:sale_id] # sale_data = Sale.find_by_sale_id(@sale_id) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index f2919cce..df1fbfcb 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -18,7 +18,8 @@ class Origami::PaymentsController < BaseOrigamiController # customer= Customer.where('customer_id=' +.customer_id) customer= Customer.find(sale_data.customer_id) # get member information - if customer.membership_id != nil + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) end # get printer info @@ -55,7 +56,8 @@ class Origami::PaymentsController < BaseOrigamiController #shop detail shop_details = Shop.find(1) # get member information - if customer.membership_id != nil + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) end @@ -145,7 +147,8 @@ class Origami::PaymentsController < BaseOrigamiController #shop detail shop_details = Shop.find(1) # get member information - if customer.membership_id != nil + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) end diff --git a/app/controllers/settings/membership_settings_controller.rb b/app/controllers/settings/membership_settings_controller.rb index 36bb0092..d4da84cd 100644 --- a/app/controllers/settings/membership_settings_controller.rb +++ b/app/controllers/settings/membership_settings_controller.rb @@ -70,6 +70,6 @@ class Settings::MembershipSettingsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_membership_setting_params - params.require(:membership_setting).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by) + params.require(:membership_setting).permit(:membership_type, :is_active,:discount,:rebate,:bonus,:point, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by) end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 300935d9..8df6f1c0 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -261,20 +261,25 @@ class SalePayment < ApplicationRecord end self.sale.sale_status = "completed" - response = rebat(sObj) + if MembershipSetting.find(1).rebate + response = rebat(sObj) - if response["status"] == true - self.sale.rebate_status = 'true' - end - if response["status"] == false - self.sale.rebate_status = 'false' - end + if !response.nil? + if response["status"] == true + self.sale.rebate_status = 'true' + end + if response["status"] == false + self.sale.rebate_status = 'false' + end - if response[:status] == false - self.sale.rebate_status = 'false' - end - if response[:status] == "no_member" - self.sale.rebate_status = nil + if response[:status] == false + self.sale.rebate_status = 'false' + end + if response[:status] == "no_member" + self.sale.rebate_status = nil + end + end + puts "rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr" end self.sale.save! diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 35e290e3..88e2bce6 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -195,9 +195,11 @@ -
- + <% if @member_discount%> +
+ + <%end %> diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index 85b52488..98ae8f0a 100644 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -7,6 +7,10 @@ <%= f.input :gateway_communication_type %> <%= f.input :gateway_url %> <%= f.input :auth_token %> + <%= f.input :discount %> + <%= f.input :rebate %> + <%= f.input :bonus %> + <%= f.input :point %> <%= f.input :created_by %> diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index 9099e9e4..f03683e1 100644 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -18,6 +18,10 @@ Gateway url Auth token Merchant account + Discount + Rebate + Bonus + Point Created by @@ -32,6 +36,10 @@ <%= settings_membership_setting.gateway_url %> <%= settings_membership_setting.auth_token %> <%= settings_membership_setting.merchant_account rescue ''%> + <%= settings_membership_setting.discount %> + <%= settings_membership_setting.rebate %> + <%= settings_membership_setting.bonus %> + <%= settings_membership_setting.point %> <%= settings_membership_setting.created_by %> <%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %> <%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/db/migrate/20170414071634_create_membership_settings.rb b/db/migrate/20170414071634_create_membership_settings.rb index fca5cce4..51127d92 100644 --- a/db/migrate/20170414071634_create_membership_settings.rb +++ b/db/migrate/20170414071634_create_membership_settings.rb @@ -8,7 +8,10 @@ class CreateMembershipSettings < ActiveRecord::Migration[5.1] t.string :auth_token t.string :merchant_account_id t.string :created_by - + t.boolean :discount, :default => false + t.boolean :rebate, :default => false + t.boolean :bonus, :default => false + t.boolean :point, :default => false t.timestamps end end