From 5fc485615cf98490f5a4555bdbf1038030d8c09f Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 14 Aug 2017 16:49:39 +0630 Subject: [PATCH] UpdateDiningCharges --- .../settings/dining_charges_controller.rb | 3 +++ app/views/settings/dining_charges/_form.html.erb | 5 +++-- app/views/settings/dining_charges/new.html.erb | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 2c8e3b7e..31763b02 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -16,6 +16,9 @@ class Settings::DiningChargesController < ApplicationController # GET /dining_charges/new def new @dining_charge = DiningCharge.new + @dining_charge.minimum_free_time="00:30" + @dining_charge.charge_block="02:00" + @dining_charge.time_rounding_block="00:15" end # GET /dining_charges/1/edit diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index 47801ef6..2349025a 100644 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -2,10 +2,10 @@ <%= f.error_notification %>
- <%= f.input :item_code %> + <%= f.input :item_code, :input_html => { :id => 'item_code' } %> <%= f.input :unit_price %> <%= f.input :taxable %> - <%= f.input :charge_type %> + <%= f.input :charge_type, :collection => [:hr, :day] %> <%= f.input :minimum_free_time %> <%= f.input :charge_block %> <%= f.input :time_rounding %> @@ -16,3 +16,4 @@ <%= f.button :submit %>
<% end %> + diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb index 1caba288..2aa13a4b 100644 --- a/app/views/settings/dining_charges/new.html.erb +++ b/app/views/settings/dining_charges/new.html.erb @@ -16,3 +16,17 @@ <%= render 'form', dining_charge: @dining_charge %> + \ No newline at end of file