diff --git a/app/controllers/api/authenticate_controller.rb b/app/controllers/api/authenticate_controller.rb index dc14e478..410d4bd0 100755 --- a/app/controllers/api/authenticate_controller.rb +++ b/app/controllers/api/authenticate_controller.rb @@ -20,26 +20,35 @@ class Api::AuthenticateController < Api::ApiController def create_cashier emp_id = params[:emp_id] password = params[:password] - + @terminals = [] if emp_id && password @employee = Employee.login(emp_id, password) if @employee && @employee.role == "cashier" if @employee.is_active shift = ShiftSale.current_open_shift(@employee.id) if !shift.nil? - render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role}) + @status = true + # render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role}) else - terminals = CashierTerminal.available.is_active - render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role, :error_message => "No current shift open for this employee!", :terminals => ActiveSupport::JSON.encode(terminals)}) + @status = true + @terminals = CashierTerminal.available.is_active + @error_message = "No current shift open for this employee!" + # render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role, :error_message => "No current shift open for this employee!", :terminals => terminals.to_json}) end else - render json: JSON.generate({:status => false, :error_message => "This employee is not active!"}) + @status = false + @error_message = "This employee is not active!" + # render json: JSON.generate({:status => false, :error_message => "This employee is not active!"}) end else - render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."}) + @status = false + @error_message = "Bad Emp_ID or Password!" + # render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."}) end else - render json: JSON.generate({:status => false, :error_message => "Input Parameters missing."}) + @status = false + @error_message = "Input Parameters missing!" + # render json: JSON.generate({:status => false, :error_message => "Input Parameters missing."}) end end diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index aa152aac..52706482 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -124,9 +124,6 @@ class Api::BillController < Api::ApiController end def request_bill - puts "order items" - puts params[:order_items] - if params[:order_items] is_extra_time = false extra_time = '' @@ -178,15 +175,22 @@ class Api::BillController < Api::ApiController end end # Promotion.promo_activate(@sale) - render json: JSON.generate({:status => true, :sale_id => @sale_id, :sale_data => ActiveSupport::JSON.encode(@sale_data)}) + @status = true + # render json: JSON.generate({:status => true, :sale_id => @sale_id, :sale_data => @sale_data.to_json }) else - render json: JSON.generate({:status => false, :error_message => "No Current Open Shift!"}) + @status = false + @error_message = "No Current Open Shift!" + # render json: JSON.generate({:status => false, :error_message => "No Current Open Shift!"}) end else - render json: JSON.generate({:status => false, :error_message => "Create order failed, some error occurred!"}) + @status = false + @error_message = "Create order failed, some error occurred!" + # render json: JSON.generate({:status => false, :error_message => "Create order failed, some error occurred!"}) end else - render json: JSON.generate({:status => false, :error_message => "Parameters missing!"}) + @status = false + @error_message = "Parameters missing!" + # render json: JSON.generate({:status => false, :error_message => "Parameters missing!"}) end end diff --git a/app/controllers/api/shifts_controller.rb b/app/controllers/api/shifts_controller.rb index d1cdd0ad..d8de4e50 100644 --- a/app/controllers/api/shifts_controller.rb +++ b/app/controllers/api/shifts_controller.rb @@ -17,9 +17,13 @@ class Api::ShiftsController < Api::ApiController @shift_sale = ShiftSale.new if @shift_sale.create(opening_balance,cashier_terminal_param, current_login_employee) - render json: JSON.generate({:status => true, :message => "Cashier Terminal successfully signin.", :shift => ActiveSupport::JSON.encode(@shift_sale)}) + @status = true + @message = "Cashier Terminal successfully signin." + # render json: JSON.generate({:status => true, :message => "Cashier Terminal successfully signin.", :shift => ActiveSupport::JSON.encode(@shift_sale)}) else - render json: JSON.generate({:status => false, :error_message => "Some error occurred!"}) + @status = false + @error_message = "Some error occurred!" + # render json: JSON.generate({:status => false, :error_message => "Some error occurred!"}) end end end diff --git a/app/views/api/authenticate/create_cashier.json.jbuilder b/app/views/api/authenticate/create_cashier.json.jbuilder new file mode 100644 index 00000000..be85fb81 --- /dev/null +++ b/app/views/api/authenticate/create_cashier.json.jbuilder @@ -0,0 +1,15 @@ +if @status == true + json.status :true + json.session_token @employee.token_session + json.name @employee.token_session + json.role @employee.role + if @error_message + json.error_message @error_message + json.terminals do + json.array! @terminals, :id, :name, :is_active, :is_currently_login + end + end +else + json.status :false + json.error_message @error_message +end \ No newline at end of file diff --git a/app/views/api/bill/request_bill.json.jbuilder b/app/views/api/bill/request_bill.json.jbuilder new file mode 100644 index 00000000..33d55350 --- /dev/null +++ b/app/views/api/bill/request_bill.json.jbuilder @@ -0,0 +1,26 @@ +if @status == true + #show invoice number and stuff + json.status @status + json.sale_id @sale_id + sale = Sale.find(@sale_id) + + json.sale_items sale.sale_items do |sale_item| + json.sale_item_id sale_item.sale_item_id + json.sale_id sale_item.sale_id + json.product_code sale_item.product_code + json.item_instance_code sale_item.item_instance_code + json.product_name sale_item.product_name + json.product_alt_name sale_item.product_alt_name + json.account_id sale_item.account_id + json.status sale_item.status + json.remark sale_item.remark + json.qty sale_item.qty + json.unit_price sale_item.unit_price + json.taxable_price sale_item.taxable_price + json.price sale_item.price + json.is_taxable sale_item.is_taxable + end +else + json.status @status + json.error_message @error_message +end diff --git a/app/views/api/shifts/create.json.jbuilder b/app/views/api/shifts/create.json.jbuilder new file mode 100644 index 00000000..88c5d5ce --- /dev/null +++ b/app/views/api/shifts/create.json.jbuilder @@ -0,0 +1,34 @@ +if @status == true + json.status true + json.message @message + + # json.shift_sale @shift_sale do |shift| + # json.id shift.id + # json.cashier_terminal_id shift.cashier_terminal_id + # json.shift_started_at shift.shift_started_at.strftime("%Y-%m-%d %H:%m:%s") + # json.shift_closed_at shift.shift_closed_at.strftime("%Y-%m-%d %H:%m:%s") + # json.employee_id shift.employee_id + # json.opening_balance shift.opening_balance + # json.closing_balance shift.closing_balance + # json.total_revenue shift.total_revenue + # json.total_discounts shift.total_discounts + # json.total_taxes shift.total_taxes + # json.grand_total shift.grand_total + # json.nett_sales shift.nett_sales + # json.cash_sales shift.cash_sales + # json.credit_sales shift.credit_sales + # json.other_sales shift.other_sales + # json.commercial_taxes shift.commercial_taxes + # json.cash_in shift.cash_in + # json.cash_out shift.cash_out + # json.dining_count shift.dining_count + # json.takeaway_count shift.takeaway_count + # json.member_count shift.member_count + # json.total_rounding shift.total_rounding + # json.total_receipt shift.total_receipt + # json.total_void shift.total_void + # end +else + json.status false + json.error_message @error_message +end \ No newline at end of file