From 8c47371fa7a1af392a470a4f971f51f8518d4ef8 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Tue, 6 Jun 2017 12:04:56 +0630 Subject: [PATCH 01/18] seed generator --- Gemfile.lock | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5dce67dc..e2c1dd73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,6 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) - pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -253,7 +252,6 @@ DEPENDENCIES kaminari! listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) From 9f9c83ab7fc504f5e13709e317580fd1e33b2106 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 13:01:03 +0630 Subject: [PATCH 02/18] pay par payment --- app/assets/javascripts/orgiami.js | 2 +- app/controllers/origami/others_payments_controller.rb | 1 + app/controllers/origami/paypar_payments_controller.rb | 1 - app/controllers/settings/membership_actions_controller.rb | 2 +- app/views/origami/others_payments/index.html.erb | 7 ++++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/orgiami.js index 92bdcbf3..20ac5b26 100644 --- a/app/assets/javascripts/orgiami.js +++ b/app/assets/javascripts/orgiami.js @@ -145,7 +145,7 @@ $(document).ready(function(){ // Payment for Bill $('#pay').click(function() { var sale_id=$(".selected-item").find(".orders-id").text(); - if(order_id!=""){ + if(sale_id!=""){ window.location.href = '/origami/sale/'+ sale_id + "/payment" } else { diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index a5177b06..c050c3f3 100644 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -5,6 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController @membership_rebate_balance = 0 @sale_id = params[:sale_id] @payment_method_setting = PaymentMethodSetting.all + # @sale_id = params[:sale_id] # sale_data = Sale.find_by_sale_id(@sale_id) diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index af5ce55f..67850117 100644 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -8,7 +8,6 @@ class Origami::PayparPaymentsController < BaseOrigamiController saleObj = Sale.find(sale_id) sale_payment = SalePayment.new status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) - if status == true @out = true, "Success!" else diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 6db1a45b..86292258 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -24,7 +24,7 @@ class Settings::MembershipActionsController < ApplicationController membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance + @out = true, @membership_rebate_balance,@membership_id else @out = false, 0 end diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 77c06904..4a43dd1e 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -86,7 +86,7 @@
-
PAY
+
PAY
@@ -143,6 +143,7 @@ $("#REDIMREBATE").click(function(){ url: "../../../../settings/membership_actions", data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id}, success: function(result){ + $("#redeem").attr("data-member-value",result[2]); $("#valid_amount").val(result[1]); } }) @@ -152,8 +153,8 @@ $("#REDIMREBATE").click(function(){ $("#redeem").click(function(){ valid_amount = $("#valid_amount").val(); - sale_id = $("#REDIMREBATE").attr("data-sale-id"); - membership_id = $(this).attr("data-member-value"); + sale = "<%=@sale_id %>"; + membership_id = $(this).attr('data-member-value'); redeem_amount = parseInt($("#used_amount").text()); if(redeem_amount<=0){ alert(" Insufficient Amount!") From aa8068ad10e5a693a2e558efd739ada74ebec391 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 13:02:03 +0630 Subject: [PATCH 03/18] Update --- .../origami/paypar_payments_controller.rb | 4 ++-- .../settings/membership_actions_controller.rb | 6 ++++-- .../origami/others_payments/index.html.erb | 21 +++++++++---------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index af5ce55f..b145ff63 100644 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -8,7 +8,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController saleObj = Sale.find(sale_id) sale_payment = SalePayment.new status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) - + if status == true @out = true, "Success!" else @@ -19,4 +19,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController end end -end \ No newline at end of file +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 6db1a45b..0d1f8b78 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -14,13 +14,15 @@ class Settings::MembershipActionsController < ApplicationController if !membership_actions_data.nil? url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s puts url.to_json - sale_data = Sale.find_by_sale_id(@sale_id) + sale_data = Sale.find_by_sale_id(@sale_id) if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) + puts customer_data.to_json @membership_id = customer_data.membership_id @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts membership_setting membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] @@ -41,7 +43,7 @@ class Settings::MembershipActionsController < ApplicationController end render :json => @out.to_json end - + end # GET /settings/membership_actions/1 diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 77c06904..f76d5146 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,15 +1,15 @@
- +
<% @payment_method_setting.each do |payment_method|%>
<%= payment_method.payment_method %>
- <% end %> + <% end %>
- +
+
0.0
-
+
@@ -86,16 +86,16 @@
-
PAY
+
PAY
- +
- +
\ No newline at end of file + From 7ab9874b808d5906d8ae369c4571f69bbaa1abc2 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 13:20:26 +0630 Subject: [PATCH 04/18] remove migration files --- app/views/origami/home/index.html.erb | 84 +++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index fa521d6c..9e406ede 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -21,23 +21,23 @@
- <% - @booking_orders.each do |bko| + <% + @booking_orders.each do |bko| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if bko.order_status == 'new' + if bko.order_status == 'new' unique_id=bko.booking_id - else + else unique_id=bko.sale_id sale_status="sold" - end + end %>
- -

<%= bko.table_name %>

+ +

<%= bko.table_name %>

Receipt No : @@ -48,12 +48,12 @@ Order Status : <%= bko.order_status %> - + -

-
-
- <% +

+
+
+ <% end %> @@ -62,23 +62,23 @@
- <% - @booking_rooms.each do |rmo| + <% + @booking_rooms.each do |rmo| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if rmo.order_status == 'new' - unique_id=rmo.booking_id - else + if rmo.order_status == 'new' + unique_id=rmo.booking_id + else unique_id=rmo.sale_id sale_status="sold" - end + end %>
- -

<%= rmo.room_name %>

+ +

<%= rmo.room_name %>

Receipt No : @@ -89,12 +89,12 @@ Order Status : <%= rmo.order_status %> - + -

-
-
- <% +

+
+
+ <% end %> @@ -103,23 +103,23 @@
- <% - @orders.each do |odr| + <% + @orders.each do |odr| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if odr.order_status == 'new' + if odr.order_status == 'new' unique_id=odr.booking_id - else + else unique_id=odr.sale_id sale_status="sold" - end + end %>
- -

<%= odr.table_name %>

+ +

<%= odr.table_name %>

Receipt No : @@ -130,16 +130,16 @@ Order Status : <%= odr.order_status %> - + -

-
-
- <% +

+
+
+ <% end %> - + @@ -157,10 +157,10 @@

Receipt No:

Cashier:

-
+

Date:

-
+
@@ -205,7 +205,7 @@
- + @@ -215,7 +215,7 @@ - + From d49dc3f8c894ab8f7b68b6f1d45f2efaa1f090b1 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 13:55:14 +0630 Subject: [PATCH 05/18] change route --- app/models/membership_action.rb | 2 ++ app/models/sale_payment.rb | 2 +- app/views/origami/others_payments/index.html.erb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/models/membership_action.rb diff --git a/app/models/membership_action.rb b/app/models/membership_action.rb new file mode 100644 index 00000000..93a4b3d8 --- /dev/null +++ b/app/models/membership_action.rb @@ -0,0 +1,2 @@ +class MembershipAction < ApplicationRecord +end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 834dba1f..57188d5c 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -79,7 +79,7 @@ class SalePayment < ApplicationRecord end def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id) - membership_actions_data = Settings::MembershipAction.find_by_membership_type("redeem_url"); + membership_actions_data = MembershipAction.find_by_membership_type("redeem"); if !membership_actions_data.nil? url = paypar_url.to_s + membership_actions_data.gateway_url.to_s campaign_type_id = 1 diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 4a43dd1e..404306e7 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -141,7 +141,7 @@ $("#REDIMREBATE").click(function(){ $.ajax({ type: "GET", url: "../../../../settings/membership_actions", - data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id}, + data: {type:"get_account_balance",gateway_url:gateway_url,sale_id:sale_id}, success: function(result){ $("#redeem").attr("data-member-value",result[2]); $("#valid_amount").val(result[1]); From 596c16d27480ee526297627ae7dd57ff9837fe31 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 14:09:19 +0630 Subject: [PATCH 06/18] edit redeem --- app/views/origami/others_payments/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 5cf1bfd4..bd77effd 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -133,7 +133,7 @@ $(document).on('click', '.cashier_number', function(event){ // return false; // } }); -$("#REDIMREBATE").click(function(){ +$("#REDEEMREBATE").click(function(){ $('.rebate-form').removeAttr("hidden"); gateway_url = $(this).attr("data-url"); sale_id = $(this).attr("data-sale-id"); From 33cc576f1e9f8695a56bba391236c93709cd749c Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 15:48:53 +0630 Subject: [PATCH 07/18] edit membership setting , otherpayment page --- .../origami/redeem_payments.coffee | 3 + .../stylesheets/origami/redeem_payments.scss | 3 + .../origami/redeem_payments_controller.rb | 41 +++++ .../settings/membership_actions_controller.rb | 53 +----- app/helpers/origami/redeem_payments_helper.rb | 2 + app/models/settings/membership_action.rb | 2 - .../origami/others_payments/index.html.erb | 166 +----------------- .../origami/redeem_payments/index.html.erb | 157 +++++++++++++++++ .../membership_actions/_form.html.erb | 2 +- .../settings/membership_actions/edit.html.erb | 2 +- .../membership_actions/index.html.erb | 4 +- config/routes.rb | 1 + ...170611084537_create_membership_actions.rb} | 7 +- .../redeem_payments_controller_spec.rb | 5 + .../origami/redeem_payments_helper_spec.rb | 15 ++ 15 files changed, 248 insertions(+), 215 deletions(-) create mode 100644 app/assets/javascripts/origami/redeem_payments.coffee create mode 100644 app/assets/stylesheets/origami/redeem_payments.scss create mode 100644 app/controllers/origami/redeem_payments_controller.rb create mode 100644 app/helpers/origami/redeem_payments_helper.rb delete mode 100644 app/models/settings/membership_action.rb create mode 100644 app/views/origami/redeem_payments/index.html.erb rename db/migrate/{20170608104900_create_settings_membership_actions.rb => 20170611084537_create_membership_actions.rb} (64%) create mode 100644 spec/controllers/origami/redeem_payments_controller_spec.rb create mode 100644 spec/helpers/origami/redeem_payments_helper_spec.rb diff --git a/app/assets/javascripts/origami/redeem_payments.coffee b/app/assets/javascripts/origami/redeem_payments.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/redeem_payments.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/origami/redeem_payments.scss b/app/assets/stylesheets/origami/redeem_payments.scss new file mode 100644 index 00000000..8fdd1e53 --- /dev/null +++ b/app/assets/stylesheets/origami/redeem_payments.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/redeem_payments controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb new file mode 100644 index 00000000..732f969e --- /dev/null +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -0,0 +1,41 @@ +class Origami::RedeemPaymentsController < BaseOrigamiController + def index + sale_id = params[:sale_id] + payment_method = params[:payment_method] + @membership_rebate_balance=0 + sale_data = Sale.find_by_sale_id(sale_id) + if sale_data + if sale_data.customer_id + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + if customer_data + @membership_id = customer_data.membership_id + @campaign_type_id =1 + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts 'Hello Hello' + puts membership_setting.to_json + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + puts member_actions.to_json + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + puts url + + membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) + if membership_data["status"]==true + @membership_rebate_balance=membership_data["balance"] + @out = true, @membership_rebate_balance,@membership_id + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + @out = false, 0 + end +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 50aad862..ad7311f2 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -4,46 +4,7 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions # GET /settings/membership_actions.json def index - type = params[:type] - @sale_id = params[:sale_id] - if type.nil? - @settings_membership_actions = Settings::MembershipAction.all - else - membership_actions_data=Settings::MembershipAction.find_by_membership_type(type) - - if !membership_actions_data.nil? - url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s - puts url.to_json - sale_data = Sale.find_by_sale_id(@sale_id) - if sale_data.customer_id - customer_data= Customer.find_by_customer_id(sale_data.customer_id) - puts customer_data.to_json - @membership_id = customer_data.membership_id - @campaign_type_id =1 - if !@membership_id.nil? - membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - puts membership_setting - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) - if membership_data["status"]==true - @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance,@membership_id - else - @out = false, 0 - end - else - @out = false, 0 - end - else - @out =false, 0 - end - # campaign_type_id=1 - # get_account_data = MembershipAction.get_account_data(url) - else - @out = false, 0 - end - render :json => @out.to_json - end - + @settings_membership_actions = MembershipAction.all end # GET /settings/membership_actions/1 @@ -53,7 +14,7 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions/new def new - @settings_membership_action = Settings::MembershipAction.new + @settings_membership_action = MembershipAction.new end # GET /settings/membership_actions/1/edit @@ -63,11 +24,11 @@ class Settings::MembershipActionsController < ApplicationController # POST /settings/membership_actions # POST /settings/membership_actions.json def create - @settings_membership_action = Settings::MembershipAction.new(settings_membership_action_params) + @settings_membership_action = MembershipAction.new(settings_membership_action_params) respond_to do |format| if @settings_membership_action.save - format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully created.' } + format.html { redirect_to settings_membership_actions_path, notice: 'Membership action was successfully created.' } format.json { render :show, status: :created, location: @settings_membership_action } else format.html { render :new } @@ -81,7 +42,7 @@ class Settings::MembershipActionsController < ApplicationController def update respond_to do |format| if @settings_membership_action.update(settings_membership_action_params) - format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully updated.' } + format.html { redirect_to settings_membership_action_path, notice: 'Membership action was successfully updated.' } format.json { render :show, status: :ok, location: @settings_membership_action } else format.html { render :edit } @@ -103,11 +64,11 @@ class Settings::MembershipActionsController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_settings_membership_action - @settings_membership_action = Settings::MembershipAction.find(params[:id]) + @settings_membership_action = MembershipAction.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. def settings_membership_action_params - params.require(:settings_membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) + params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) end end diff --git a/app/helpers/origami/redeem_payments_helper.rb b/app/helpers/origami/redeem_payments_helper.rb new file mode 100644 index 00000000..7e9151cb --- /dev/null +++ b/app/helpers/origami/redeem_payments_helper.rb @@ -0,0 +1,2 @@ +module Origami::RedeemPaymentsHelper +end diff --git a/app/models/settings/membership_action.rb b/app/models/settings/membership_action.rb deleted file mode 100644 index 814e4b97..00000000 --- a/app/models/settings/membership_action.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Settings::MembershipAction < ApplicationRecord -end diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 5cf1bfd4..6ea1ae5e 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -4,174 +4,20 @@
<% @payment_method_setting.each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
- -
- -
-
-
-
-
-
1
-
2
-
3
-
-
-
-
1000
-
-
-
-
-
-
4
-
5
-
6
-
-
-
-
5000
-
-
-
-
-
-
7
-
8
-
9
-
-
-
-
10000
-
-
-
-
-
-
0
-
.
-
00
-
-
-
-
50000
-
-
-
-
-
-
-
DEL
-
CLR
-
-
-
-
PAY
-
-
-
-
- -
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb new file mode 100644 index 00000000..5e336ac4 --- /dev/null +++ b/app/views/origami/redeem_payments/index.html.erb @@ -0,0 +1,157 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
1
+
2
+
3
+
+
+
+
1000
+
+
+
+
+
+
4
+
5
+
6
+
+
+
+
5000
+
+
+
+
+
+
7
+
8
+
9
+
+
+
+
10000
+
+
+
+
+
+
0
+
.
+
00
+
+
+
+
50000
+
+
+
+
+
+
+
DEL
+
CLR
+
+
+
+
PAY
+
+
+
+
+ +
+
+
+ +
+ diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index 9f4a2cd5..3084d4ac 100644 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for(@settings_membership_action) do |f| %> +<%= simple_form_for([:settings,@settings_membership_action]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb index 3373d008..cd5cb98a 100644 --- a/app/views/settings/membership_actions/edit.html.erb +++ b/app/views/settings/membership_actions/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', settings_membership_action: @settings_membership_action %> -<%= link_to 'Show', @settings_membership_action %> | +<%= link_to 'Show', settings_membership_action_path(@settings_membership_action) %> | <%= link_to 'Back', settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 80b4420e..635fd34c 100644 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -28,9 +28,9 @@ <%= settings_membership_action.merchant_account_id %> <%= settings_membership_action.created_by %> <%= settings_membership_action.additional_parameter %> - <%= link_to 'Show', settings_membership_action %> + <%= link_to 'Show', settings_membership_action_path(settings_membership_action) %> <%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %> - <%= link_to 'Destroy', settings_membership_action, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 6d7be02e..91acd6a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -85,6 +85,7 @@ Rails.application.routes.draw do post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" + get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" end diff --git a/db/migrate/20170608104900_create_settings_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb similarity index 64% rename from db/migrate/20170608104900_create_settings_membership_actions.rb rename to db/migrate/20170611084537_create_membership_actions.rb index 2b9dd85d..55f9bcb2 100644 --- a/db/migrate/20170608104900_create_settings_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -1,7 +1,7 @@ -class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1] +class CreateMembershipActions < ActiveRecord::Migration[5.1] def change - create_table :settings_membership_actions do |t| - t.string :membership_type + create_table :membership_actions do |t| + t.string :membership_type t.boolean :is_active t.string :gateway_communication_type t.string :gateway_url @@ -11,6 +11,7 @@ class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1] t.string :additional_parameter t.timestamps + t.timestamps end end end diff --git a/spec/controllers/origami/redeem_payments_controller_spec.rb b/spec/controllers/origami/redeem_payments_controller_spec.rb new file mode 100644 index 00000000..22e705d7 --- /dev/null +++ b/spec/controllers/origami/redeem_payments_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::RedeemPaymentsController, type: :controller do + +end diff --git a/spec/helpers/origami/redeem_payments_helper_spec.rb b/spec/helpers/origami/redeem_payments_helper_spec.rb new file mode 100644 index 00000000..580d73ff --- /dev/null +++ b/spec/helpers/origami/redeem_payments_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::RedeemPaymentsHelper. For example: +# +# describe Origami::RedeemPaymentsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::RedeemPaymentsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From b7bd68a461f3a16efdec5566e464650fc27c2b00 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 15:51:22 +0630 Subject: [PATCH 08/18] payment keypad --- app/assets/javascripts/origami.js | 45 +++--- app/assets/stylesheets/origami.scss | 43 +++-- app/views/origami/home/index.html.erb | 8 +- .../origami/others_payments/index.html.erb | 4 +- app/views/origami/payments/show.html.erb | 147 +++++++++--------- lib/tasks/clear_data.rake | 16 ++ 6 files changed, 148 insertions(+), 115 deletions(-) create mode 100644 lib/tasks/clear_data.rake diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 8ce3d0c4..21ec1c92 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -18,17 +18,17 @@ $(document).ready(function(){ $(".orders").on('click', function(){ - var zone_name=$(this).find(".orders-table").text(); + var zone_name=$(this).find(".orders-table").text(); var receipt_no=$(this).find(".orders-receipt-no").text(); var unique_id=$(this).find(".orders-id").text(); - var order_status=$(this).find(".orders-order-status").text().trim(); + var order_status=$(this).find(".orders-order-status").text().trim(); // Enable/Disable Button control_button(order_status); //for customer button if(unique_id.charAt(0) == 'S'){ - $("#customer").removeAttr('disabled'); + $("#customer").removeAttr('disabled'); }else{ $("#customer").attr('disabled','disabled'); } @@ -49,7 +49,7 @@ $(document).ready(function(){ type: "GET", url: "origami/" + unique_id, data: { 'id' : unique_id }, - success:function(result){ + success:function(result){ for (i = 0; i < result.length; i++) { var data = JSON.stringify(result[i]); var parse_data = JSON.parse(data); @@ -78,7 +78,7 @@ $(document).ready(function(){ $("#order-grand-total").text(grand_total_amount); // Ordered Items - var order_items_rows = "" + + var order_items_rows = "" + "" + parse_data.item_name + "" + "" + parse_data.qty + "" + "" + parse_data.qty*parse_data.price + "" + @@ -94,9 +94,9 @@ $(document).ready(function(){ $(this).addClass('selected-item'); }); - // Bill Request + // Bill Request $('#request_bills').click(function() { - var order_id=$(".selected-item").find(".orders-id").text(); + var order_id=$(".selected-item").find(".orders-id").text(); if(order_id!=""){ window.location.href = '/origami/request_bills/'+ order_id } @@ -106,16 +106,16 @@ $(document).ready(function(){ return false; }); - // Discount for Payment + // Discount for Payment $('#discount').click(function() { - var order_id=$(".selected-item").find(".orders-id").text(); + var order_id=$(".selected-item").find(".orders-id").text(); if(order_id!=""){ window.location.href = '/origami/discount/'+ order_id } else { alert("Please select an order!"); - } - + } + return false; }); @@ -125,11 +125,11 @@ $(document).ready(function(){ var sub_total = $('#order-sub-total').text(); var grand_total = $('#order-grand-total').text(); var discount_type = $('#discount-type').val(); - var discount_value = $('#discount-amount').val(); + var discount_value = $('#discount-amount').val(); var discount_amount = discount_value; // For Percentage Discount - if(discount_type == 1){ + if(discount_type == 1){ discount_amount=(sub_total*discount_value)/100; } @@ -150,8 +150,8 @@ $(document).ready(function(){ } else { alert("Please select an order!"); - } - + } + return false; }); @@ -168,7 +168,7 @@ $(document).ready(function(){ original_value = $('#discount-amount').val(); var input_type = $(this).attr("data-type"); - + switch (input_type) { case 'num': var input_value = $(this).attr("data-value"); @@ -179,7 +179,7 @@ $(document).ready(function(){ else{ $('#discount-amount').val(original_value + '' + input_value); update_balance(); - } + } break; case 'add': @@ -210,16 +210,16 @@ $(document).ready(function(){ }); /* Button Control by Status */ -function control_button(order_status){ +function control_button(order_status){ if(order_status=="billed"){ $("#request_bills").prop('disabled', true); $("#discount").prop('disabled', false); - $("#pay").prop('disabled', false); + $("#pay-bill").prop('disabled', false); } else if(order_status=="new") { $("#request_bills").prop('disabled', false); $("#discount").prop('disabled', true); - $("#pay").prop('disabled', true); + $("#pay-bill").prop('disabled', true); } } @@ -236,9 +236,6 @@ function update_balance(){ } var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; - $('#order-discount').text(discount_amount); + $('#order-discount').text(discount_amount); $('#order-grand-total').text(total); } - - - diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 0be16266..c37f2678 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -7,17 +7,36 @@ // min-height: 75rem; // padding-top: 4.5rem; // } +.others-payment{ + line-height:100px; + text-align:center; + color:white; + width:300px; + height:100px; + font-size:18px; +} .cashier_number{ - height:76px; - line-height:80px; + width: 30%; + height:71px; + line-height:71px; + text-align:center; background:#54A5AF; - float:left; - margin:2px; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} + +.pay{ + width: 98%; + height:210px; + line-height:210px; + text-align:center; font-size:20px; color:white; - cursor:pointer; } .cashier_number:hover{ @@ -25,7 +44,7 @@ } .long{ - width:100% + width:49% } .sold { @@ -42,17 +61,17 @@ } .charges-name { - width: 80%; + width: 80%; text-align: left; } .item-name { - width: 60%; + width: 60%; text-align: left; } .item-attr { - width: 20%; + width: 20%; text-align: right; } @@ -70,7 +89,13 @@ background-color: #009900 } +.left{ + margin-left:1px; +} +.bottom{ + margin-bottom: 1px; +} /*----- Reset -----*/ select.form-control { diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 9e406ede..e25aebd5 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -215,13 +215,13 @@ - - + + - + - +
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index bd77effd..7ac1a145 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,10 +1,10 @@
-
+
<% @payment_method_setting.each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index f16ef927..4e7744f3 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -1,25 +1,35 @@
-
+
- Receipt No : <%=@sale_data.receipt_no rescue ' '%> - Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> - Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %> - Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %> + + + + + + + + + + + + + +
Receipt No : <%=@sale_data.receipt_no rescue ' '%>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %>Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %>
Customer : Default CustomerPoints : 1234
- - +
+ - - + - +
ItemsQTY - Price + ItemsQTY + Price
@@ -71,95 +81,80 @@
-
-
AMOUNT DUE
-
<%= @sale_data.grand_total %>
+
+
Amount Due
+
<%= @sale_data.grand_total %>
-
CASH
+
Cash
<%= @cash %>
-
CREDIT
+
Credit
0.0
-
OTHERS PAYMENT
+
Others Payment
0.0
-
BALANCE
+
Balance
<%= @sale_data.grand_total %>
-
-
-
-
-
-
1
-
2
-
3
-
-
-
-
1000
+ +
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
+
Del
+
Clr
-
-
-
-
4
-
5
-
6
-
+
+
+
1000
+
3000
-
-
5000
+
+
5000
+
10000
+
+
+
Pay
-
-
-
-
7
-
8
-
9
-
-
-
-
10000
-
-
-
-
-
-
0
-
.
-
00
-
-
-
-
50000
-
-
-
-
-
-
-
DEL
-
CLR
-
-
-
-
PAY
-
-
-
+ +
+
+ + +
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake new file mode 100644 index 00000000..c9e0fe22 --- /dev/null +++ b/lib/tasks/clear_data.rake @@ -0,0 +1,16 @@ +namespace :clear do + desc "Clear Data" + task :data => :environment do + BookingOrder.delete_all + Booking.delete_all + OrderItem.delete_all + AssignedOrderItem.delete_all + Order.delete_all + SaleOrder.delete_all + SaleItem.delete_all + Sale.delete_all + SaleAudit.delete_all + SalePayment.delete_all + puts "Clear Data Done." + end +end From a8098183245190977a7db5aa4e1b23e0eef48cb1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 16:10:50 +0630 Subject: [PATCH 09/18] other payment --- app/controllers/origami/mpu_controller.rb | 8 +++++++ app/views/origami/mpu/index.html.erb | 1 + .../origami/others_payments/index.html.erb | 21 +++++++------------ config/routes.rb | 7 ++++--- 4 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 app/controllers/origami/mpu_controller.rb create mode 100644 app/views/origami/mpu/index.html.erb diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb new file mode 100644 index 00000000..8918d705 --- /dev/null +++ b/app/controllers/origami/mpu_controller.rb @@ -0,0 +1,8 @@ +class Origami::MpuController < BaseOrigamiController + + def index + end + + def create + end +end diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb new file mode 100644 index 00000000..6b339e0f --- /dev/null +++ b/app/views/origami/mpu/index.html.erb @@ -0,0 +1 @@ +Hello MPU diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 2e0feb11..b5ef15ae 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,25 +1,20 @@
-
+
<% @payment_method_setting.each do |payment_method|%> -
- -
<%= payment_method.payment_method %>
- -
+
<%= payment_method.payment_method %>
<% end %>
-
-
diff --git a/config/routes.rb b/config/routes.rb index 91acd6a3..26c00d10 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ require 'sidekiq/web' Rails.application.routes.draw do - + namespace :settings do resources :membership_actions end @@ -85,8 +85,9 @@ Rails.application.routes.draw do post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" - get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" - + # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" + get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index" + get 'sale/:sale_id/payment/others_payment/REDIMREBATE' => "redeem_payments#index" end #--------- Waiter/Ordering Station ------------# From 29cdcfb28d23f157ebe030355565ab4dd07ec227 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 16:11:44 +0630 Subject: [PATCH 10/18] For Pull --- .../origami/redeem_payments_controller.rb | 31 ++++++++++------- .../origami/redeem_payments/index.html.erb | 34 +++++++++++-------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 732f969e..fba759bb 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -1,9 +1,9 @@ class Origami::RedeemPaymentsController < BaseOrigamiController def index - sale_id = params[:sale_id] + @sale_id = params[:sale_id] payment_method = params[:payment_method] @membership_rebate_balance=0 - sale_data = Sale.find_by_sale_id(sale_id) + sale_data = Sale.find_by_sale_id(@sale_id) if sale_data if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) @@ -12,18 +12,23 @@ class Origami::RedeemPaymentsController < BaseOrigamiController @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - puts 'Hello Hello' - puts membership_setting.to_json - member_actions =MembershipAction.find_by_membership_type("get_account_balance") - puts member_actions.to_json - url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s - puts url - - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) - if membership_data["status"]==true - @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance,@membership_id + if membership_setting.gateway_url + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + if member_actions.gateway_url + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) + if membership_data["status"]==true + @membership_rebate_balance=membership_data["balance"] + @out = true, @membership_rebate_balance,@membership_id + end + else + @out =false,0 + end + else + @out = false,0 end + + else @out = false, 0 end diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 5e336ac4..72c09d4d 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -6,7 +6,7 @@
- +
@@ -77,12 +77,12 @@
-
DEL
-
CLR
+
DEL
+
CLR
-
PAY
+
PAY
@@ -95,9 +95,9 @@
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index b5ef15ae..4b2397a2 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -14,7 +14,6 @@ $('.others-payment').on('click',function(){ var input_type = $(this).attr("data-type"); var sale_id = $(this).attr("data-sale-id"); - alert(input_type) window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type; }) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 4e7744f3..d36902fb 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -93,12 +93,12 @@
Credit
-
0.0
+
0.0
Others Payment
-
0.0
+
<%= @other %>
@@ -159,6 +159,9 @@
diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb index 5b5d1774..74695871 100644 --- a/db/migrate/20170611084537_create_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -11,7 +11,6 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1] t.jsonb :additional_parameter t.timestamps - t.timestamps end end end diff --git a/dump.rdb b/dump.rdb index 353820066c0a3587829039db72f6c8e60a1eedaa..ebdb6db6aa4a16a1abe03b56aaa0c4d4053ff704 100644 GIT binary patch delta 213 zcmV;`04o2*ngP6>0gx~kp&C6|`UrJ%Wn?XFWo^RnV-EoS0Q(P-M};B{adl;NWjbVK zW?^+~bOFObVnMbCwgCVD3IG5AAO;^nsFN`t9s>+?Ws~tgWF=%`G%+ Date: Sun, 11 Jun 2017 17:49:06 +0630 Subject: [PATCH 15/18] payment --- app/assets/javascripts/origami.js | 2 +- app/models/sale_payment.rb | 17 +++++++---------- app/views/origami/mpu/index.html.erb | 3 ++- app/views/origami/payments/create.json.jbuilder | 1 + app/views/origami/payments/show.html.erb | 3 ++- 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 app/views/origami/payments/create.json.jbuilder diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 21ec1c92..e37728c1 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -20,7 +20,7 @@ $(document).ready(function(){ $(".orders").on('click', function(){ var zone_name=$(this).find(".orders-table").text(); var receipt_no=$(this).find(".orders-receipt-no").text(); - var unique_id=$(this).find(".orders-id").text(); + var unique_id = $(this).find(".orders-id").text(); var order_status=$(this).find(".orders-order-status").text().trim(); // Enable/Disable Button diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index ff4c49b6..4b6edce8 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -106,7 +106,6 @@ class SalePayment < ApplicationRecord self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.payment_status = "paid" payment_method = self.save! - sale_update_payment_status(self.received_amount) return payment_status @@ -205,30 +204,28 @@ class SalePayment < ApplicationRecord end def sale_update_payment_status(paid_amount) - puts "sale update" #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f - self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f - all_received_amount = 0.0 - sObj = self.sale + sObj = Sale.find(self.sale_id) sObj.sale_payments.each do |spay| - puts spay - puts spay.payment_amount all_received_amount += spay.payment_amount.to_f end - puts all_received_amount - puts self.sale.grand_total + if (self.sale.grand_total <= all_received_amount) - puts " sale update ......" self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! + rebat() end end + def rebat + + end + private def generate_custom_id self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index d82e6cd1..f082dc1a 100644 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -11,12 +11,13 @@ Amount : $('#mpu_pay').on('click',function(){ var amount = $('#amount').val(); var sale_id = "<%= @sale_id %>"; - alert(amount); + $.ajax({type: "POST", url: "<%= origami_create_mpu_payment_path %>", data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ + alert("Payment success") window.location.href = '/origami/sale/'+ sale_id + "/payment"; } } diff --git a/app/views/origami/payments/create.json.jbuilder b/app/views/origami/payments/create.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/payments/create.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index d36902fb..198b9518 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -229,7 +229,8 @@ $( document ).ready(function() { url: "<%= origami_payment_process_path %>", data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ - alert("THANK YOU") + alert("Thank you") + window.location.href = '/origami'; } }); } From 137267514b4e4c56ac47573e9e37fdfdb76bac53 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Mon, 12 Jun 2017 07:21:09 +0630 Subject: [PATCH 16/18] bundle gemlock --- Gemfile.lock | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fbf61a33..8780a375 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -257,8 +257,6 @@ DEPENDENCIES jquery-rails kaminari! listen (~> 3.0.5) - pg - mysql2 (>= 0.3.18, < 0.5) prawn prawn-table puma (~> 3.0) From 7eaea8f08d3299c058cc6df70323415a0736fd5d Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Mon, 12 Jun 2017 07:40:40 +0630 Subject: [PATCH 17/18] fixed jsonb to json to support both mysql and postgres --- db/migrate/20170611084537_create_membership_actions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb index 74695871..c980ceac 100644 --- a/db/migrate/20170611084537_create_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -8,7 +8,7 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1] t.string :auth_token t.string :merchant_account_id t.string :created_by - t.jsonb :additional_parameter + t.json :additional_parameter t.timestamps end From 3f3d37756dade885abf6d0b462dc0627f6e8b28f Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 09:20:38 +0630 Subject: [PATCH 18/18] update --- app/models/sale_payment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 8dea66a3..6609a28e 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -222,7 +222,7 @@ class SalePayment < ApplicationRecord end def rebat - + end private