Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/sale_edit_controller.rb

@@ -43,7 +43,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem = saleitemObj.dup
     @newsaleitem.save
     @newsaleitem.qty = saleitemObj.qty * -1      
-    @newsaleitem.unit_price = saleitemObj.unit_price * -1
+    @newsaleitem.unit_price = saleitemObj.unit_price * 1
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.price = saleitemObj.price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (FOC)'

app/controllers/reports/receipt_no_controller.rb

@@ -20,7 +20,11 @@ authorize_resource :class => false
 	    payment_type = params[:payment_type]
         @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) 
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
+        @tax_profiles = TaxProfile.order('order_by asc')
 
+puts @sale_taxes.to_json
+puts "sssssss"
+puts @tax_profiles.to_json
         @from       = from
         @to         = to
 

app/controllers/reports/saleitem_controller.rb

@@ -16,8 +16,7 @@ class Reports::SaleitemController < BaseReportController
       end
     end
     @sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
-    puts @sale_data.to_json
-    puts "SSSSSSSSSSS"
+
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}