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

update

Browse Source
This commit is contained in:
Nweni
2017-06-21 09:33:39 +06:30
parent 6272e07959
commit b889603ce6
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,11 +47,29 @@
font-size:20px;
color:white;
}
.payment{
height:70px;line-height:70px;align:center;color:white;font-size:16px;margin-bottom:1px;
}
.cash-color{
background-color:#80CBC4;
}
.credit-color{
background-color:#FFCCBC;
}
.other-payment-color{
background-color:#E1BEE7;
}
.cashier_number:hover{
background:#A9F5F2;
}
.style2 {
border-top: 3px double #8c8b8b;
}
.long{
width:49%;
}

1
app/controllers/application_controller.rb
View File

@@ -19,7 +19,6 @@ class ApplicationController < ActionController::Base
def current_login_employee
@employee = Employee.find_by_token_session(session[:session_token])
@time = Time.now
end
private

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

@@ -90,31 +90,30 @@
<div class="col-md-8"><strong style="font-size:18px;">Amount Due</strong></div>
<div class="col-md-4"><strong><span id="amount_due" style="font-size:18px;"><%= @sale_data.grand_total %></span></strong></div>
</div>
<hr>
<div class="row">
<br>
<div class="row payment cash-color">
<div class="col-md-8">Cash</div>
<div class="col-md-4" id="cash" ><%= @cash %></div>
</div>
<hr>
<div class="row" id="credit_payment">
<div class="row payment credit-color" id="credit_payment" >
<div class="col-md-8">Credit</div>
<div class="col-md-4" id="credit">0.0</div>
</div>
<hr>
<% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
<div class="row" id="card_payment">
<div class="row payment other-payment-color" id="card_payment" >
<div class="col-md-8">Other Payments</div>
<div class="col-md-4" id="others"><%= @other %></div>
</div>
<% else %>
<div class="row" id="card_payment">
<div class="row payment other-payment-color" id="card_payment" >
<div class="col-md-12">Other Payments</div>
</div>
<% end %>
<!-- mpu -->
<% if @other != 0.0 %>
<div class="row">
<div class="row payment other-payment-color" >
<div class="col-md-5"></div>
<div class="col-md-3">MPU</div>
<div class="col-md-4" id="others"><%= @other %></div>
@@ -182,12 +181,12 @@
<div class="col-md-4" id="mastercount">0.0</div>
</div>
<% end %>
<hr>
<hr class="style2">
<div class="row">
<div class="col-md-8">Balance</div>
<div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
</div>
<hr>
<br>
<div class="row">
<div class="col-lg-6 col-md-1 col-sm-1">