git_admin/nemo_encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/nemo_encoder

Browse Source
This commit is contained in:
May Zin Oo
2018-03-05 12:10:51 +06:30
parent 567c494e28 57d210f6ed
commit d2fdc68d34
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/batches_controller.rb
View File

@@ -35,7 +35,7 @@ class BatchesController < ApplicationController
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",client_id,product_category_id)
respond_to do |format| respond_to do |format|
if @batch.save if @batch.save

2
app/models/batch_line_item.rb
View File

@@ -80,8 +80,6 @@ class BatchLineItem < ApplicationRecord
security_code = encoder.security_code security_code = encoder.security_code
digest = Digest::MD5.hexdigest(security_code) digest = Digest::MD5.hexdigest(security_code)
puts 'digest............'
puts digest
encryptd_data=BatchLineItem.encrypted(str,encrypt_key) encryptd_data=BatchLineItem.encrypted(str,encrypt_key)
encoder.secret_token=encryptd_data encoder.secret_token=encryptd_data

4
app/views/batches/_form.html.erb
View File

@@ -19,11 +19,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="client" class="string optional control-label">Select Client:</label> <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'%> <%= select_tag "client_id", options_from_collection_for_select(@clients, "id", "name"), :class => 'form-control'%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="product" class="string optional control-label">Select Product:</label> <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'%> <%= select_tag "product_category_id", options_from_collection_for_select(@product, "id", "name"), :class => 'form-control'%>
</div> </div>
<div class ="form-group" > <div class ="form-group" >
<label></label> <label></label>