promotion + merge with master

2017-08-23 10:12:41 +06:30
parent 28dab9d3e0
commit eedf6c39a1
4 changed files with 20 additions and 22 deletions
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -24,6 +24,7 @@ class Api::BillController < Api::ApiController
        @sale = Sale.new
        @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
      end
+      # Promotion.promo_activate(@sale)
    else
      @status = false
      @error_message = "No Current Open Shift"