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

fixed conflict file

Browse Source
This commit is contained in:
Aung Myo
2017-06-13 10:40:49 +06:30
parent c05a64bae7 3e691ca3f7
commit f8df5147a4
19 changed files with 196 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/origami.js
View File

@@ -68,11 +68,12 @@ $(document).ready(function(){
// Receipt Header
receipt_no = result[i].receipt_no;
cashier = result[i].cashier_name;
receipt_date = result[i].receipt_date;
receipt_date = new Date(result[i].receipt_date);
show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' + receipt_date.getHours()+ ':' + receipt_date.getMinutes()
$("#receipt_no").text(receipt_no);
$("#cashier").text(cashier == null ? "" : cashier);
$("#receipt_date").text(receipt_date);
$("#receipt_date").text(show_date);
//Receipt Charges
@@ -132,7 +133,8 @@ $(document).ready(function(){
});
// Pay Discount for Payment
$("#pay-discount").on('click', function(){
$("#pay-discount").on('click', function(e){
e.preventDefault();
var sale_id = $('#sale-id').text();
var sale_item_id = $('.selected-item').attr('id');
var sub_total = $('#order-sub-total').text();
@@ -140,10 +142,10 @@ $(document).ready(function(){
var discount_type = $('#discount-type').val();
var discount_value = $('#discount-amount').val();
var discount_amount = discount_value;
var ajax_url = "/origami/" + sale_id + "/discount";
if(sale_item_id == null){
alert('Please select item row to discount!');
return;
if(sale_item_id != null){
ajax_url = "/origami/" + sale_item_id + "/discount";
}
// For Percentage Discount
@@ -154,7 +156,7 @@ $(document).ready(function(){
var params = {'sale_id': sale_id, 'sale_item_id': sale_item_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount};
$.ajax({
type: "POST",
url: "/origami/" + sale_item_id + "/discount",
url: ajax_url,
data: params,
success:function(result){ }
});