add two select box
This commit is contained in:
@@ -21,6 +21,8 @@ class BatchesController < ApplicationController
|
|||||||
|
|
||||||
def new
|
def new
|
||||||
@batch = Batch.new
|
@batch = Batch.new
|
||||||
|
@clients=Client.all.order('id desc')
|
||||||
|
@product=ProductCategory.all.order('id desc')
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@@ -30,12 +32,10 @@ class BatchesController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
date = DateTime.now.beginning_of_day.utc.to_time.strftime("%Y-%m-%d")
|
date = DateTime.now.beginning_of_day.utc.to_time.strftime("%Y-%m-%d")
|
||||||
order_ref = params[:batch][:order_ref]
|
order_ref = params[:batch][:order_ref]
|
||||||
puts order_ref
|
|
||||||
adult_or_child=params[:adult_or_child]
|
adult_or_child=params[:adult_or_child]
|
||||||
client_id=params[:client_id]
|
client_id=params[:client_id]
|
||||||
product_category_id=params[:product_category_id]
|
product_category_id=params[:product_category_id]
|
||||||
@batch = Batch.create_batch(date,order_ref,2,"adult_or_child",6,3)
|
@batch = Batch.create_batch(date,order_ref,2,"adult_or_child",6,3)
|
||||||
puts @batch.order_ref
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @batch.save
|
if @batch.save
|
||||||
|
|||||||
@@ -17,6 +17,14 @@
|
|||||||
<%= f.input :order_ref ,:label =>false,:error => false,:placeholder =>'Please enter name',input_html: { class: "form-control" } %>
|
<%= f.input :order_ref ,:label =>false,:error => false,:placeholder =>'Please enter name',input_html: { class: "form-control" } %>
|
||||||
<%= f.error :order_ref ,style: 'color: red' %>
|
<%= f.error :order_ref ,style: 'color: red' %>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="client" class="string optional control-label">Select Client:</label>
|
||||||
|
<%= select_tag "client", options_from_collection_for_select(@clients, "id", "name"), :class => 'form-control'%>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="product" class="string optional control-label">Select Product:</label>
|
||||||
|
<%= select_tag "product", options_from_collection_for_select(@product, "id", "name"), :class => 'form-control'%>
|
||||||
|
</div>
|
||||||
<div class ="form-group" >
|
<div class ="form-group" >
|
||||||
<label></label>
|
<label></label>
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ ActiveRecord::Schema.define(version: 20180226100816) do
|
|||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
enable_extension "uuid-ossp"
|
|
||||||
|
|
||||||
create_table "batch_line_items", force: :cascade do |t|
|
create_table "batch_line_items", force: :cascade do |t|
|
||||||
t.integer "batch_id"
|
t.integer "batch_id"
|
||||||
|
|||||||
Reference in New Issue
Block a user