Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-05-03 17:43:57 +06:30
parent 70c2d0a05d 16cb755f11
commit 9e54aa1a27
17 changed files with 181 additions and 143 deletions
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -86,7 +86,7 @@ class Origami::CustomersController < BaseOrigamiController
    @crm_customer    = Customer.new
    @count_customer = Customer.count_customer
    
-    @taxes = TaxProfile.all.order("order_by asc")
+    @taxes = TaxProfile.where(:group_type => 'cashier')
    # if flash["errors"]
    #   @crm_customer.valid?
    # end