Merge branch 'r-1902001-01' into foodcourt

2020-05-29 13:32:16 +06:30
parent d037802a43 8bae89eeac
commit 7c2dd165fc
23 changed files with 724 additions and 508 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -41,13 +41,13 @@ class Api::OrdersController <  Api::ApiController
      @booking = table.get_booking
    end

-    @tax_profile = nil
+    @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
    # arr_tax = []

    # if !arr_tax.empty?
    #   @tax_profile = TaxProfile.where(:id => arr_tax)
    # else
-      @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
+    #   @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
    # end

    #