diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/orgiami.scss index 70e1fe8b..327c5897 100644 --- a/app/assets/stylesheets/orgiami.scss +++ b/app/assets/stylesheets/orgiami.scss @@ -25,3 +25,7 @@ .long{ width:100% } + +.purple { + background-color:#7a62d3; +} diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb new file mode 100644 index 00000000..2df4b266 --- /dev/null +++ b/app/controllers/origami/card_payments_controller.rb @@ -0,0 +1,10 @@ +class Origami::CardPaymentsController < BaseOrigamiController + + + def index + end + + def create + end + +end diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb new file mode 100644 index 00000000..a348951e --- /dev/null +++ b/app/controllers/origami/credit_payments_controller.rb @@ -0,0 +1,10 @@ +class Origami::CreditPaymentsController < BaseOrigamiController + + + def index + end + + def create + end + +end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index a09b81fe..f64e27e3 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -2,13 +2,16 @@ class Origami::PaymentsController < BaseOrigamiController def index - end def create + #payment type + #sale status + #point - get [ food amount ] end def show end + end diff --git a/app/views/origami/card_payments/index.html.erb b/app/views/origami/card_payments/index.html.erb new file mode 100644 index 00000000..86ef10b0 --- /dev/null +++ b/app/views/origami/card_payments/index.html.erb @@ -0,0 +1 @@ +Hello Card Payment diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb new file mode 100644 index 00000000..e4f97119 --- /dev/null +++ b/app/views/origami/credit_payments/index.html.erb @@ -0,0 +1 @@ +hello Credit diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 78f59422..4897407d 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -312,14 +312,15 @@ $( document ).ready(function() { window.location.href = '/origami/request_bills/'+ table_or_order_id return false; }); + + $('#pay').click(function() { + window.location.href = '/origami/sale/'+ pay_sale_id + "/payment" + return false; + }); + }); -$( document ).ready(function() { - $('#pay').click(function() { - window.location.href = '/origami/sale/'+ pay_sale_id + "/payment" - return false; - }); -}); +