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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging

Browse Source
This commit is contained in:
Aung Myo
2017-08-14 15:04:28 +06:30
parent a691eb8d64 a614ec6ae7
commit 67b6da92ab
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/customers_controller.rb
View File

@@ -90,6 +90,8 @@ class Origami::CustomersController < BaseOrigamiController
if status == true if status == true
render json: JSON.generate({:status => true}) render json: JSON.generate({:status => true})
# Re-calc All Amount in Sale
sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount)
else else
render json: JSON.generate({:status => false, :error_message => "Record not found"}) render json: JSON.generate({:status => false, :error_message => "Record not found"})
end end

8
app/models/sale.rb
View File

@@ -274,10 +274,9 @@ class Sale < ApplicationRecord
#tax_profile - list by order_by #tax_profile - list by order_by
tax_profiles = TaxProfile.all.order("order_by asc") tax_profiles = TaxProfile.all.order("order_by asc")
customer = Customer.find(sale.customer_id) customer = Customer.find(sale.customer_id)
# #Creat new tax records # #Creat new tax records
tax_profiles.each do |tax| tax_profiles.each do |tax|
customer.tax_profiles.each do |cus_tax| customer.tax_profiles.each do |cus_tax|
if cus_tax.to_i == tax.id if cus_tax.to_i == tax.id
sale_tax = SaleTax.new(:sale => sale) sale_tax = SaleTax.new(:sale => sale)
sale_tax.tax_name = tax.name sale_tax.tax_name = tax.name
@@ -319,11 +318,10 @@ class Sale < ApplicationRecord
tax_profiles = TaxProfile.all.order("order_by asc") tax_profiles = TaxProfile.all.order("order_by asc")
customer = Customer.find(self.customer_id) customer = Customer.find(self.customer_id)
# #Create new tax records # #Create new tax records
tax_profiles.each do |tax| tax_profiles.each do |tax|
customer.tax_profiles.each do |cus_tax| customer.tax_profiles.each do |cus_tax|
if cus_tax.to_i == tax.id if cus_tax.to_i == tax.id
sale_tax = SaleTax.new(:sale => self) sale_tax = SaleTax.new(:sale => self)
sale_tax.tax_name = tax.name sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate sale_tax.tax_rate = tax.rate

6
app/views/crm/customers/index.html.erb
View File

@@ -124,18 +124,20 @@ $(document).on('click',".customer_tr",function(){
var url = "customers/" + customer_id + "/edit"; var url = "customers/" + customer_id + "/edit";
} }
$("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});;
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: url, url: url,
data: {}, data: {},
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
// Selected for Taxes // Selected for Taxes
var taxes = JSON.stringify(data.tax_profiles); var taxes = JSON.stringify(data.tax_profiles);
var parse_taxes = JSON.parse(taxes); var parse_taxes = JSON.parse(taxes);
console.log(parse_taxes); console.log(parse_taxes);
$.each(parse_taxes, function(i, value){ $.each(parse_taxes, function(i, value){
$("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected"); $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
}); });
$('#customer_id').val(data.id); $('#customer_id').val(data.id);