From 57d210f6ed4fe9ce5822c20fc685e58ac66bc4eb Mon Sep 17 00:00:00 2001 From: nandar Date: Mon, 5 Mar 2018 11:43:32 +0630 Subject: [PATCH] batch create --- app/controllers/batches_controller.rb | 2 +- app/models/batch_line_item.rb | 2 -- app/views/batches/_form.html.erb | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/batches_controller.rb b/app/controllers/batches_controller.rb index 01a85f4..dcf3b7e 100644 --- a/app/controllers/batches_controller.rb +++ b/app/controllers/batches_controller.rb @@ -35,7 +35,7 @@ class BatchesController < ApplicationController adult_or_child=params[:adult_or_child] client_id=params[:client_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",client_id,product_category_id) respond_to do |format| if @batch.save diff --git a/app/models/batch_line_item.rb b/app/models/batch_line_item.rb index dac29e5..6ebbdec 100644 --- a/app/models/batch_line_item.rb +++ b/app/models/batch_line_item.rb @@ -80,8 +80,6 @@ class BatchLineItem < ApplicationRecord security_code = encoder.security_code digest = Digest::MD5.hexdigest(security_code) - puts 'digest............' - puts digest encryptd_data=BatchLineItem.encrypted(str,encrypt_key) encoder.secret_token=encryptd_data diff --git a/app/views/batches/_form.html.erb b/app/views/batches/_form.html.erb index 81f8d79..aa5062c 100644 --- a/app/views/batches/_form.html.erb +++ b/app/views/batches/_form.html.erb @@ -19,11 +19,11 @@
- <%= select_tag "client", options_from_collection_for_select(@clients, "id", "name"), :class => 'form-control'%> + <%= select_tag "client_id", options_from_collection_for_select(@clients, "id", "name"), :class => 'form-control'%>
- <%= select_tag "product", options_from_collection_for_select(@product, "id", "name"), :class => 'form-control'%> + <%= select_tag "product_category_id", options_from_collection_for_select(@product, "id", "name"), :class => 'form-control'%>