git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-08 17:17:41 +06:30
parent d928deaa2f 7fe1ff5b22
commit f7fa92e6bc
9 changed files with 519 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/custom.js
View File

@@ -2,6 +2,8 @@ $(document).ready(function() {
$('body').bootstrapMaterialDesign(); $('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); 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({ $('#custom-slimscroll').slimScroll({
height: height, height: height,
@@ -13,7 +15,7 @@ $(document).ready(function() {
}); });
$('#order-detail-slimscroll').slimScroll({ $('#order-detail-slimscroll').slimScroll({
height: height-180, height: height-$('#order-detail-slimscroll').attr('data-height'),
size: '5px', size: '5px',
color: 'rgba(0,0,0,0.5)', color: 'rgba(0,0,0,0.5)',
alwaysVisible: false, alwaysVisible: false,

16
app/assets/stylesheets/origami.scss
View File

@@ -56,7 +56,7 @@ select.form-control {
/* End Reset */ /* End Reset */
#back { #back {
padding: 0px 0px 7px 0px; padding: 7px 0px 7px 0px;
} }
.order-info { .order-info {
@@ -80,8 +80,8 @@ select.form-control {
.cashier_number{ .cashier_number{
width: 33%; width: 33%;
height:70px; height:58px;
line-height:70px; line-height:58px;
text-align:center; text-align:center;
background:#54A5AF; background:#54A5AF;
// float:left; // float:left;
@@ -97,16 +97,16 @@ select.form-control {
.pay{ .pay{
width: 86%; width: 86%;
height:211px; height:174px;
line-height:211px; line-height:174px;
text-align:center; text-align:center;
font-size:20px; font-size:20px;
color:white; color:white;
} }
.payment{ .payment{
height:70px; height:50px;
line-height:70px; line-height:50px;
align:center; align:center;
color:white; color:white;
font-size:16px; font-size:16px;
@@ -158,7 +158,7 @@ select.form-control {
} }
.long{ .long{
width:49%; width:43%;
} }
.sold { .sold {

30
app/views/origami/jcb/index.html.erb
View File

@@ -1,14 +1,20 @@
<div class="row"> <div class="container-fluid">
<div class="col-md-6"> <div class="page-header">
<h2>JCB</h2> <ol class="breadcrumb">
</div> <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.jcb") %></li>
<span class="float-right">
<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
</span>
</ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<span class="hidden" id="membership_id"><%= @membership_id%></span> <span class="hidden" id="membership_id"><%= @membership_id%></span>
<span class="hidden" id="member_discount"><%= @member_discount%></span> <span class="hidden" id="member_discount"><%= @member_discount%></span>
<span class="hidden" id="sub-total"><%= @sub_total%></span> <span class="hidden" id="sub-total"><%= @sub_total%></span>
<div class="card" style="padding:0px 20px;"> <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
<div class="rebate-form"> <div class="rebate-form">
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -45,7 +51,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="m-t-10 p-l-20">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom">
@@ -75,27 +81,27 @@
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div> <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div> <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div> <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="pay purple left" id="jcb_pay">Pay</div> <div class="pay purple left" id="jcb_pay">Pay</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <!-- <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button> <button type="button" class="btn btn-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div> -->
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){} if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}

30
app/views/origami/master/index.html.erb
View File

@@ -1,14 +1,20 @@
<div class="row"> <div class="container-fluid">
<div class="col-md-6"> <div class="page-header">
<h2>Master</h2> <ol class="breadcrumb">
</div> <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.jcb") %></li>
<span class="float-right">
<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
</span>
</ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<span class="hidden" id="membership_id"><%= @membership_id%></span> <span class="hidden" id="membership_id"><%= @membership_id%></span>
<span class="hidden" id="member_discount"><%= @member_discount%></span> <span class="hidden" id="member_discount"><%= @member_discount%></span>
<span class="hidden" id="sub-total"><%= @sub_total%></span> <span class="hidden" id="sub-total"><%= @sub_total%></span>
<div class="card" style="padding:0px 20px;"> <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
<div class="rebate-form"> <div class="rebate-form">
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -45,7 +51,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:;"> <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:;">
<div class="m-t-10 p-l-20">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom">
@@ -75,27 +81,27 @@
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div> <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div> <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div> <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="pay purple left" id="master_pay">Pay</div> <div class="pay purple left" id="master_pay">Pay</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <!-- <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default m-l-3 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button> <button type="button" class="btn btn-default m-l-3 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div> -->
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){} if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}

29
app/views/origami/mpu/index.html.erb
View File

@@ -1,11 +1,16 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="page-header">
<div class="col-md-6"> <ol class="breadcrumb">
<h2>MPU</h2> <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
</div> <li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.mpu") %></li>
<span class="float-right">
<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
</span>
</ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-5">
<span class="hidden" id="membership_id"><%= @membership_id%></span> <span class="hidden" id="membership_id"><%= @membership_id%></span>
<span class="hidden" id="member_discount"><%= @member_discount%></span> <span class="hidden" id="member_discount"><%= @member_discount%></span>
<span class="hidden" id="sub-total"><%= @sub_total%></span> <span class="hidden" id="sub-total"><%= @sub_total%></span>
@@ -48,7 +53,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:;"> <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:;">
<div class=" m-t-10 p-l-20">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom">
@@ -78,25 +83,23 @@
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div> <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div> <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div> <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="pay purple left" id="mpu_pay">Pay</div> <div class="pay purple left" id="mpu_pay">Pay</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div>
</div> </div>
</div> </div>
<script> <script>

16
app/views/origami/others_payments/index.html.erb
View File

@@ -1,17 +1,25 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.other_payment") %></li>
<span class="float-right">
<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment'%>
</span>
</ol>
</div>
<div class="row"> <div class="row">
<div class="col-lg-11col-md-11 col-sm-11"> <div class="col-lg-11col-md-11 col-sm-11">
<div > <div >
<div > <div >
<% @payment_method_setting.where("is_active = true").each do |payment_method|%> <% @payment_method_setting.where("is_active = true").each do |payment_method|%>
<div class="purple others-payment bottom left" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div> <div class="purple others-payment bottom left m-l-30" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default btn-block" id='back'>Back</button>
</div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

54
app/views/origami/payments/show.html.erb
View File

@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="card-block m-l-5 m-r-5"> <div class="card-block m-l-5 m-r-5 m-t--10">
<div class="card-title"> <div class="card-title">
<div id="table-details" class="card-text" > <div id="table-details" class="card-text" >
<table class="table" id="append-table"> <table class="table" id="append-table">
@@ -40,9 +40,9 @@
</table> </table>
</div> </div>
</div> </div>
<div id="order-detail-slimscroll"> <div id="order-detail-slimscroll" data-height="300">
<!-- <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll"> --> <!-- <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll"> -->
<div id="table-details" class="card-text" > <div id="table-details" class="card-text m-t--10" >
<table class="table" id="append-table"> <table class="table" id="append-table">
<tbody> <tbody>
<% sub_total = 0 <% sub_total = 0
@@ -66,7 +66,7 @@
</div> </div>
</div> </div>
<div class="card-footer "> <div class="card-footer ">
<table class="table"> <table class="table m-t--10 ">
<tfooter> <tfooter>
<tr> <tr>
<td class="charges-name"><strong>Sub Total</strong></td> <td class="charges-name"><strong>Sub Total</strong></td>
@@ -115,7 +115,7 @@
<div class="col-md-8"><strong>Amount Due</strong></div> <div class="col-md-8"><strong>Amount Due</strong></div>
<div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div> <div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div>
</div> </div>
<br>
<div class="row payment cash-color p-l-5 p-r-5"> <div class="row payment cash-color p-l-5 p-r-5">
<div class="col-md-8">Cash</div> <div class="col-md-8">Cash</div>
<div class="col-md-4" id="cash" ><%= @cash %></div> <div class="col-md-4" id="cash" ><%= @cash %></div>
@@ -208,12 +208,12 @@
<div class="col-md-4" id="mastercount">0.0</div> <div class="col-md-4" id="mastercount">0.0</div>
</div> </div>
<% end %> <% end %>
<br> <!-- <br> -->
<div class="row m-l-5 m-r-5"> <div class="row m-l-5 m-r-5">
<div class="col-md-8"><strong>Balance</strong></div> <div class="col-md-8"><strong>Balance</strong></div>
<div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total %></span></strong></div> <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total %></span></strong></div>
</div> </div>
<br> <!-- <br> -->
</div> </div>
</div> </div>
@@ -221,42 +221,42 @@
<div class="row m-l-5 m-r-5"> <div class="row m-l-5 m-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom">
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="1" data-type="num">1</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="1" data-type="num">1</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="2" data-type="num">2</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="2" data-type="num">2</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="3" data-type="num">3</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="3" data-type="num">3</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="4" data-type="num">4</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="4" data-type="num">4</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="5" data-type="num">5</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="5" data-type="num">5</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="6" data-type="num">6</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="6" data-type="num">6</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="7" data-type="num">7</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="7" data-type="num">7</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="8" data-type="num">8</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="8" data-type="num">8</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="9" data-type="num">9</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="9" data-type="num">9</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="0" data-type="num">0</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="0" data-type="num">0</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="." data-type="num">.</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="." data-type="num">.</div>
<div class="col-md-4 cashier_number border-top border-right border-left" data-value="00" data-type="num">00</div> <div class="col-md-4 cashier_number border-top border- border-left" data-value="00" data-type="num">00</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="col-md-4 cashier_number border-top border-right border-left green" data-type="nett">Nett</div> <div class="col-md-4 cashier_number border-top border- border-left green" data-type="nett">Nett</div>
<div class="col-md-4 cashier_number border-top border-right border-left red" data-type="del">Del</div> <div class="col-md-4 cashier_number border-top border- border-left red" data-type="del">Del</div>
<div class="col-md-4 cashier_number border-top border-right border-left orange" data-type="clr">Clr</div> <div class="col-md-4 cashier_number border-top border- border-left orange" data-type="clr">Clr</div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom">
<div class="cashier_number border-top border-right border-left payment-long payment-left" data-value="1000" data-type="add">1000</div> <div class="cashier_number border-top border- border-left payment-long payment-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number border-top border-right border-left payment-long" data-value="3000" data-type="add">3000</div> <div class="cashier_number border-top border- border-left payment-long" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="cashier_number border-top border-right border-left payment-long payment-left" data-value="5000" data-type="add">5000</div> <div class="cashier_number border-top border- border-left payment-long payment-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number border-top border-right border-left payment-long" data-value="10000" data-type="add">10000</div> <div class="cashier_number border-top border- border-left payment-long" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="pay border-top border-right border-left purple payment-left" id="pay">Pay</div> <div class="pay border-top border- border-left purple payment-left" id="pay">Pay</div>
</div> </div>
</div> </div>
</div> </div>

31
app/views/origami/redeem_payments/index.html.erb
View File

@@ -1,6 +1,17 @@
<div class="container-fluid">
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
<li class="breadcrumb-item active"><%= t("views.right_panel.details.redeem") %></li>
<span class="float-right">
<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
</span>
</ol>
</div>
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-5">
<div class="card" style="padding:0px 20px;"> <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
<div class="rebate-form"> <div class="rebate-form">
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -41,7 +52,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="m-t-10 p-l-20">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-1 col-sm-1"> <div class="col-lg-6 col-md-1 col-sm-1">
<div class="row bottom"> <div class="row bottom">
@@ -71,30 +82,28 @@
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div> <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div> <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div> <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="pay purple left" id="redeem">Pay</div> <div class="pay purple left" id="redeem">Pay</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <!-- <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn bg-default btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button> <button type="button" class="btn bg-default btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div> -->
</div> </div>
</div>
<div class="row">
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

30
app/views/origami/visa/index.html.erb
View File

@@ -1,15 +1,20 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="page-header">
<div class="col-md-6"> <ol class="breadcrumb">
<h2>VISA</h2> <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
</div> <li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.visa") %></li>
<span class="float-right">
<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
</span>
</ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-5">
<span class="hidden" id="membership_id"><%= @membership_id%></span> <span class="hidden" id="membership_id"><%= @membership_id%></span>
<span class="hidden" id="member_discount"><%= @member_discount%></span> <span class="hidden" id="member_discount"><%= @member_discount%></span>
<span class="hidden" id="sub-total"><%= @sub_total%></span> <span class="hidden" id="sub-total"><%= @sub_total%></span>
<div class="card" style="padding:0px 20px;"> <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
<div class="rebate-form"> <div class="rebate-form">
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -46,6 +51,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6" style=""> <div class="col-lg-6 col-md-6 col-sm-6" style="">
<div class=" m-t-10 p-l-20">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom">
@@ -75,25 +81,25 @@
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div> <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div> <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div> <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom m-l-5">
<div class="pay purple left" id="visa_pay">Pay</div> <div class="pay purple left" id="visa_pay">Pay</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <!-- <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn bg-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button> <button type="button" class="btn bg-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div> </div> -->
</div> </div>
</div> </div>
<script> <script>