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

update for shift and deving member dis

Browse Source
This commit is contained in:
Yan
2017-07-07 14:56:05 +06:30
parent 4d3de51e72
commit 1b0bcbffea
9 changed files with 78 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/void_controller.rb
View File

@@ -9,6 +9,11 @@ class Origami::VoidController < BaseOrigamiController
sale.sale_status = 'void'
sale.save
# update count for shift sale
shift = ShiftSale.current_open_shift(sale.cashier_id)
shift.total_void = shift.total_void + 1
shift.save
bookings = sale.bookings
bookings.each do |booking|
orders = booking.orders

1
app/models/sale_payment.rb
View File

@@ -288,6 +288,7 @@ class SalePayment < ApplicationRecord
end
# update for cashier shift
def update_shift
shift = ShiftSale.current_open_shift(self.sale.cashier_id)
if !shift.nil?

3
app/models/shift_sale.rb
View File

@@ -52,8 +52,9 @@ class ShiftSale < ApplicationRecord
self.cash_sales = self.cash_sales.to_f + cash.to_f
self.credit_sales = self.credit_sales.to_i + credit.to_f
self.other_sales = self.other_sales.to_i + other_sales.to_f
self.nett_sales = self.grand_total.to_i - self.commercial_taxes
self.nett_sales = saleobj.total_amount.to_f #self.grand_total.to_i - self.commercial_taxes
self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f
self.total_receipt = self.total_receipt + 1
self.save
end

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

@@ -190,6 +190,8 @@
<button id="remove-item-discount" class="btn btn-warning btn-block action-btn">RemoveItem Discount</button>
<button id="remove-all" class="btn btn-warning btn-block action-btn">Remove All</button>
<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button>
<hr />
<button id="member-discount" class="btn green btn-block action-btn">Member Discount</button>
</div>
</div>
</div>
@@ -418,6 +420,33 @@ $(document).ready(function(){
}
});
});
// Pay Discount for membership
$("#member-discount").on('click', function(e){
e.preventDefault();
var sale_id = $('#sale-id').text();
var sub_total = $('#order-sub-total').text();
var ajax_url = "/origami/" + sale_id + "/member_discount";
// Selected Account
var account_types = JSON.stringify(get_selected_account_types());
var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
$.ajax({
type: "POST",
url: ajax_url,
data: params,
success:function(result){
alert("Successfully Discount!");
if(result.table_type == "Table"){
window.location.href = "/origami/table/" + result.table_id
}
else {
window.location.href = "/origami/room/" + result.table_id
}
}
});
});
});
/* Remove Selection */

3
app/views/origami/home/index.html.erb
View File

@@ -105,8 +105,7 @@
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<button id="refreshbutton" type="button" class="btn btn-block" style="border-radius:5px;color:#fff;background-color:red;"> Refresh off </button>
<!-- TEMP Disable for BITP -->
<!-- <button id="cash_in" type="button" class="btn btn-block btn-primary" style="border-radius:5px;color:#fff;"> Cash In </button> -->
<button id="cash_in" type="button" class="btn btn-block btn-primary" style="border-radius:5px;color:#fff;"> Cash In </button>
<button id="cash_out" type="button" class="btn btn-block btn-primary" style="border-radius:5px;color:#fff;"> Cash Out </button>
<button id="close_cashier" type="button" class="btn btn-block btn-primary" style="border-radius:5px;color:#fff;"> Close Cashier </button>
</div>