From 7fe1ff5b220ee72712d4d99e16ac28089254d8f3 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 8 Nov 2017 17:14:18 +0630 Subject: [PATCH] update payment page --- app/assets/javascripts/custom.js | 4 +- app/assets/stylesheets/origami.scss | 18 +- app/views/origami/jcb/index.html.erb | 188 +++++----- app/views/origami/master/index.html.erb | 106 +++--- app/views/origami/mpu/index.html.erb | 109 +++--- .../origami/others_payments/index.html.erb | 16 +- app/views/origami/payments/show.html.erb | 56 +-- .../origami/redeem_payments/index.html.erb | 337 +++++++++--------- app/views/origami/visa/index.html.erb | 164 +++++---- 9 files changed, 519 insertions(+), 479 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 818807c2..2460031d 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -2,6 +2,8 @@ $(document).ready(function() { $('body').bootstrapMaterialDesign(); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); +console.log(height); +console.log($('#order-detail-slimscroll').attr('data-height')) $('#custom-slimscroll').slimScroll({ height: height, @@ -13,7 +15,7 @@ $(document).ready(function() { }); $('#order-detail-slimscroll').slimScroll({ - height: height-180, + height: height-$('#order-detail-slimscroll').attr('data-height'), size: '5px', color: 'rgba(0,0,0,0.5)', alwaysVisible: false, diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index de838a1e..b5176c2e 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -56,7 +56,7 @@ select.form-control { /* End Reset */ #back { - padding: 0px 0px 7px 0px; + padding: 7px 0px 7px 0px; } .order-info { @@ -80,8 +80,8 @@ select.form-control { .cashier_number{ width: 33%; - height:70px; - line-height:70px; + height:58px; + line-height:58px; text-align:center; background:#54A5AF; // float:left; @@ -97,16 +97,16 @@ select.form-control { .pay{ width: 86%; - height:211px; - line-height:211px; + height:174px; + line-height:174px; text-align:center; font-size:20px; color:white; } .payment{ - height:70px; - line-height:70px; + height:50px; + line-height:50px; align:center; color:white; font-size:16px; @@ -158,7 +158,7 @@ select.form-control { } .long{ - width:49%; + width:43%; } .sold { @@ -244,7 +244,7 @@ select.form-control { } .bottom{ - margin-bottom: 1px; + margin-bottom:1px; } /* Discount */ diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index ae77fa15..b65686c4 100755 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -1,101 +1,107 @@ -
-
-

JCB

+
+
+
    +
  1. <%= t :home %>
    2. +
  2. <%= t("views.btn.payment") %>
    3. +
  3. <%= t("views.btn.jcb") %>
    4. + + <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%> + +
-
-
-
- - - -
-
-
-
- - +
+
+ + + +
+
+
+
+ + +
+
-
-
- <% if @jcbcount != 0 %> -
-
- - + <% if @jcbcount != 0 %> +
+
+ + +
+
-
-
- <% end %> -
-
- - + <% end %> +
+
+ + +
+
-
-
-
-
- -
0.0
+
+
+ +
0.0
+
+
-
-
-
-
-
- -
- -
-
-
-
1
-
2
-
3
-
-
-
4
-
5
-
6
-
-
-
7
-
8
-
9
-
-
-
0
-
.
-
00
-
-
-
Nett
-
Del
-
Clr
-
-
-
-
-
1000
-
3000
-
-
-
5000
-
10000
-
-
-
Pay
-
+
+
+
+
+
+
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/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 53589c89..f8677d13 100755 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -1,99 +1,105 @@
-
-
-

VISA

-
+
+
    +
  1. <%= t :home %>
    2. +
  2. <%= t("views.btn.payment") %>
    3. +
  3. <%= t("views.btn.visa") %>
    4. + + <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%> + +
-
-
- - - -
-
-
-
- - +
+
+ + + +
+
+
+
+ + +
+
+
+ <% if @visacount != 0 %> +
+
+ + +
+
+
+ <% end %> +
+
+ +
- <% if @visacount != 0 %> -
-
- - -
-
-
- <% end %>
- - + +
0.0
-
-
- -
0.0
-
-
-
-
-
-
-
1
-
2
-
3
+
+
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
Nett
+
Del
+
Clr
+
-
-
4
-
5
-
6
-
-
-
7
-
8
-
9
-
-
-
0
-
.
-
00
-
-
-
Nett
-
Del
-
Clr
-
-
-
-
-
1000
-
3000
-
-
-
5000
-
10000
-
-
-
Pay
+
+
+
1000
+
3000
+
+
+
5000
+
10000
+
+
+
Pay
+
-
-
+