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

fixed conflix payment page

Browse Source
This commit is contained in:
Aung Myo
2018-03-11 16:37:33 +06:30
parent cfcd067b59 4ea2337fae
commit 04b053d2b7
24 changed files with 948 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/origami/home/show.html.erb
View File

@@ -332,10 +332,10 @@
<td class="charges-name"><strong>Tax:
(<% @i = 0
@account_arr.each do |ct| %>
<%=ct.name%>
<% if @account_arr.count != @i+1%>
+ <% @i =+1 %>
<%end%>
<%=ct.name%>
<% if @account_arr.count != @i+1%>
+ <% @i =+1 %>
<%end%>
<%end %>)
</strong></td>
<td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0 %></strong></td>
@@ -424,6 +424,7 @@
<i class="material-icons">reply</i>
<%= t("views.btn.back") %>
</button>
<a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a>
<button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
<button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
<% if @dining.status != "available" %>

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

@@ -501,6 +501,7 @@ var customer_name = "<%= @customer.name %>";
$("#back").on('click', function() {
localStorage.removeItem('cash');
customer_display_view(null,"reload");
if (cashier_type=="cashier") {
window.location.href = '/origami/table/'+ dining_id;
}else{
@@ -608,6 +609,7 @@ var customer_name = "<%= @customer.name %>";
$("#changed_amount").text('Changed amount ' + parseFloat($('#balance').text() * (-1)));
<% end %>
}
customer_display_view(null,"reload");
//PDF lightbox data
// if($('#balance').text() < 0){
// swal({
@@ -684,6 +686,7 @@ var customer_name = "<%= @customer.name %>";
url: ajax_url,
data: "remark="+ remark + "&sale_id=" + sale_id,
success: function () {
customer_display_view(null,"reload");
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
@@ -841,6 +844,7 @@ var customer_name = "<%= @customer.name %>";
}
});
function update_balance(){
var cash = $('#cash').text();
var credit = $('#credit').text();
@@ -884,7 +888,8 @@ var customer_name = "<%= @customer.name %>";
type: "POST",
url: "<%= origami_payment_foc_path %>",
data: params,
success:function(result){
success:function(result){
customer_display_view(null,"reload");
if (cash >= 0) {
swal({
title: "Information!",
@@ -907,6 +912,16 @@ var customer_name = "<%= @customer.name %>";
}
});
function customer_display_view(data,status) {
$.ajax({
type: "POST",
url: '../../../customer_view',
data: {"data":data,"status":status},
dataType: "json",
success:function(result){
}
});
}
function calculate_member_discount(sale_id) {
var sub_total = $('#sub-total').text();
var member_id = $('#membership_id').text();

60
app/views/origami/second_display/_second_display.html.erb Normal file
View File

@@ -0,0 +1,60 @@
<div class="row clearfix">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="card">
<div class="card-block">
<div class="card-text" >
<div id="order-detail-slimscroll" data-height="150">
<table class="table table-striped second_display_items" id="order-items-table">
<thead>
<tr>
<th>#</th>
<th class="item-name">Items</th>
<th class="item-">QTY</th>
<th class="item-">Price</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
<div class="card-footer">
<table class="table" border="0">
<tr>
<td class="charges-name"><strong>Sub Total:</strong></td>
<td></td>
<td></td>
<td class="item-attr"><strong id="s_sub_total">0.00</strong></td>
</tr>
<tr>
<td class="charges-name"><strong>Discount Amount:</strong></td>
<td></td>
<td></td>
<td class="item-attr"><strong id="s_total_discount">0.00</strong></td>
</tr>
<tr>
<td class="charges-name"><strong>Tax Amount:</strong></td>
<td></td>
<td></td>
<td class="item-attr"><strong id="s_tatal_tax">0.00</strong></td>
</tr>
<tr>
<td class="charges-name"><strong>Grand:</strong></td>
<td></td>
<td></td>
<td class="item-attr"><strong id="s_grand_total">0.00</strong></td>
</tr>
</table>
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<%= image_tag("slider/s2.jpg", :alt => "rss feed") %>
</div>
</div>

18
app/views/origami/second_display/_slider.html.erb Normal file
View File

@@ -0,0 +1,18 @@
<%= stylesheet_link_tag 'wow_style', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'wowslider', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div id="wowslider-container" style="max-width: 100%;height: 530px ;">
<div class="ws_images full_screen">
<ul>
<li><%= image_tag("slider/s1.jpg", :alt => "rss feed") %></li>
<li><%= image_tag("slider/s2.jpg", :alt => "rss feed") %></li>
<li><%= image_tag("slider/s4.jpg", :alt => "rss feed") %></li>
</ul>
</div>
<div class="ws_bullets"></div>
</div>
</div>
</div>

11
app/views/origami/second_display/index.html.erb Normal file
View File

@@ -0,0 +1,11 @@
<div class="container-fluid">
<div class="slider" id="second_display_slider">
<%= render 'slider' %>
</div>
<div class="item hidden" id="second_display_items">
<%= render 'second_display' %>
</div>
</div>