From 71f88f8a5de32e2cd79bd14ba06cb947d302bd20 Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 13 Jun 2017 19:49:25 +0630 Subject: [PATCH] Update --- app/controllers/origami/jcb_controller.rb | 17 ++ app/controllers/origami/master_controller.rb | 17 ++ app/controllers/origami/visa_controller.rb | 17 ++ app/views/origami/jcb/create.json.jbuilder | 5 + app/views/origami/jcb/index.html.erb | 144 +++++++++++++++++ app/views/origami/master/create.json.jbuilder | 5 + app/views/origami/master/index.html.erb | 144 +++++++++++++++++ app/views/origami/mpu/index.html.erb | 146 ++++++++++++++++++ app/views/origami/visa/create.json.jbuilder | 5 + app/views/origami/visa/index.html.erb | 144 +++++++++++++++++ config/routes.rb | 15 +- 11 files changed, 654 insertions(+), 5 deletions(-) create mode 100644 app/controllers/origami/jcb_controller.rb create mode 100644 app/controllers/origami/master_controller.rb create mode 100644 app/controllers/origami/visa_controller.rb create mode 100644 app/views/origami/jcb/create.json.jbuilder create mode 100644 app/views/origami/jcb/index.html.erb create mode 100644 app/views/origami/master/create.json.jbuilder create mode 100644 app/views/origami/master/index.html.erb create mode 100644 app/views/origami/visa/create.json.jbuilder create mode 100644 app/views/origami/visa/index.html.erb diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb new file mode 100644 index 00000000..9be83462 --- /dev/null +++ b/app/controllers/origami/jcb_controller.rb @@ -0,0 +1,17 @@ +class Origami::JcbController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu") + end + end + +end diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb new file mode 100644 index 00000000..92ab7ebb --- /dev/null +++ b/app/controllers/origami/master_controller.rb @@ -0,0 +1,17 @@ +class Origami::MasterController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu") + end + end + +end diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb new file mode 100644 index 00000000..043bd43c --- /dev/null +++ b/app/controllers/origami/visa_controller.rb @@ -0,0 +1,17 @@ +class Origami::VisaController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu") + end + end + +end diff --git a/app/views/origami/jcb/create.json.jbuilder b/app/views/origami/jcb/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/jcb/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb new file mode 100644 index 00000000..a0760b38 --- /dev/null +++ b/app/views/origami/jcb/index.html.erb @@ -0,0 +1,144 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
Nett
+
Del
+
Clr
+
+
+
+
+
1000
+
3000
+
+
+
5000
+
10000
+
+
+
Pay
+
+
+
+ +
+
+
+ +
+ diff --git a/app/views/origami/master/create.json.jbuilder b/app/views/origami/master/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/master/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb new file mode 100644 index 00000000..a0760b38 --- /dev/null +++ b/app/views/origami/master/index.html.erb @@ -0,0 +1,144 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
Nett
+
Del
+
Clr
+
+
+
+
+
1000
+
3000
+
+
+
5000
+
10000
+
+
+
Pay
+
+
+
+ +
+
+
+ +
+ diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index 7b483a75..3d9d1024 100644 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -1,3 +1,149 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
Nett
+
Del
+
Clr
+
+
+
+
+
1000
+
3000
+
+
+
5000
+
10000
+
+
+
Pay
+
+
+
+ +
+
+
+ +
+ + +

MPU

diff --git a/app/views/origami/visa/create.json.jbuilder b/app/views/origami/visa/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/visa/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb new file mode 100644 index 00000000..a0760b38 --- /dev/null +++ b/app/views/origami/visa/index.html.erb @@ -0,0 +1,144 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
Nett
+
Del
+
Clr
+
+
+
+
+
1000
+
3000
+
+
+
5000
+
10000
+
+
+
Pay
+
+
+
+ +
+
+
+ +
+ diff --git a/config/routes.rb b/config/routes.rb index 6bfe588e..2199ad67 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -86,15 +86,20 @@ Rails.application.routes.draw do #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' + post 'payment/cash' => 'payments#create' + post 'payment/mpu' => "mpu#create" + post 'payment/jcb' => "jcb#create" + post 'payment/master' => "master#create" + post 'payment/visa' => "master#visa" post 'payment/paypar' => '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/MPU' => "mpu#index" - post 'payment/mpu' => "mpu#create" + get 'sale/:sale_id/payment/others_payment/VISA' => "visa#index" + get 'sale/:sale_id/payment/others_payment/Master' => "master#index" + get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index" get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index" #---------Add Customer --------------# @@ -170,7 +175,7 @@ Rails.application.routes.draw do resources :lookups #orders resources :orders - #sales + #sales resources :sales #cashier_terminals resources :cashier_terminals