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-12-05 16:35:53 +06:30
parent 9372857696 97bb6ae211
commit 5e8f94fa13
5 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,21 +379,21 @@
return false;
});
$('#pay').click(function() {
$('#pay').click(function(event) {
// $('#pay').text("Processing, Please wait!")
$( "#loading_wrapper" ).show();
$( "#loading_wrapper").show();
if($('#balance').text() > 0){
swal ( "Oops" , "Insufficient Amount!" , "error" );
$( "#loading_wrapper" ).hide();
$( "#loading_wrapper").hide();
}else{
$(this).off("click");
var sale_id = $('#sale_id').text();
var item_row = $('.is_card');
if (item_row.length < 1) {
calculate_member_discount(sale_id);
}
// payment
var cash = $('#cash').text();
var credit = $('#credit').text();

13
app/views/reports/saleitem/index.xls.erb
View File

@@ -1,17 +1,6 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-md-12">
<%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
<hr />
<div class="text-right">