git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-23 12:14:32 +06:30
parent f4898017d1 b64229aded
commit edd28332da
11 changed files with 371 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/home_controller.rb
View File

@@ -82,6 +82,7 @@ class HomeController < ApplicationController
@sale_data = Array.new @sale_data = Array.new
@total_payment_methods = Sale.total_payment_methods(today) @total_payment_methods = Sale.total_payment_methods(today)
@total_payment_methods.each do |payment| @total_payment_methods.each do |payment|
if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
pay = Sale.payment_sale('card', today) pay = Sale.payment_sale('card', today)
@@ -92,7 +93,6 @@ class HomeController < ApplicationController
end end
end end
@summ_sale = Sale.summary_sale_receipt(today) @summ_sale = Sale.summary_sale_receipt(today)
p @summ_sale
@total_customer = Sale.total_customer(today) @total_customer = Sale.total_customer(today)
@total_dinein = Sale.total_dinein(today) @total_dinein = Sale.total_dinein(today)
@total_takeaway = Sale.total_takeaway(today) @total_takeaway = Sale.total_takeaway(today)

4
app/models/sale.rb
View File

@@ -988,7 +988,7 @@ end
end end
def self.total_payment_methods(today) def self.total_payment_methods(today)
query = Sale.select("sp.payment_method") query = Sale.select("distinct sp.payment_method")
.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today) .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id") .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
end end
@@ -996,7 +996,7 @@ end
def self.payment_sale(payment_method, today) def self.payment_sale(payment_method, today)
query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id") query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
if payment_method == 'card' if payment_method == 'card'
query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb"',today) query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb")',today)
else else
query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today) query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
end end

16
app/views/crm/customers/_new_form.html.erb
View File

@@ -5,16 +5,16 @@
<div class="form-group"> <div class="form-group">
<label> <%= t("views.right_panel.detail.salutation") %> :</label><br> <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
<label class="font-13"><%= t("views.right_panel.detail.mr") %> <label class="font-15"><%= t("views.right_panel.detail.mr") %>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
</label>&nbsp; </label>&nbsp;
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.miss") %> <label class="font-15"><%= t("views.right_panel.detail.miss") %>
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
</label>&nbsp; </label>&nbsp;
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.mrs") %> <label class="font-15"><%= t("views.right_panel.detail.mrs") %>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
</label>&nbsp; </label>&nbsp;
<label class="font-13 m-l--15"> <label class="font-15">
<%= t("views.right_panel.detail.mdm") %> <%= t("views.right_panel.detail.mdm") %>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
</label> </label>
@@ -50,7 +50,7 @@
<% str="[\"#{msg['company']}\"]" <% str="[\"#{msg['company']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
<% end -%> <% end -%>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
@@ -60,7 +60,7 @@
<% str="[\"#{msg['contact_no']}\"]" <% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
<% end %> <% end %>
</div> </div>
@@ -71,7 +71,7 @@
<% str="[\"#{msg['email']}\"]" <% str="[\"#{msg['email']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
<% end %> <% end %>
</div> </div>
@@ -111,7 +111,7 @@
<% str="[\"#{msg['card_no']}\"]" <% str="[\"#{msg['card_no']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
<% end %> <% end %>
</div> </div>

4
app/views/crm/customers/index.html.erb
View File

@@ -88,15 +88,11 @@
</div> </div>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<div class="row">
<div class="col-md-12">
<div class="card"> <div class="card">
<div class="body" id="custom-slimscroll"> <div class="body" id="custom-slimscroll">
<%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %> <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
</div> </div>
</div> </div>
</div>
</div>
<!-- <div class="col-lg-1 col-md-1 col-sm-1 "> <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
<br> <br>

24
app/views/home/dashboard.html.erb
View File

@@ -147,7 +147,11 @@
<% if payment.payment_method == 'mpu' || payment.payment_method == 'visa' || payment.payment_method == 'master' || payment.payment_method == 'jcb' %> <% if payment.payment_method == 'mpu' || payment.payment_method == 'visa' || payment.payment_method == 'master' || payment.payment_method == 'jcb' %>
<tr> <tr>
<td>Card Sale : </td> <td>Card Sale : </td>
<td align="right"><%= @sale_data[0]['card'] %></td> <td align="right">
<% @sale_data.each do |data| %>
<%= data["card"] %>
<% end %>
</td>
</tr> </tr>
<% else %> <% else %>
<tr> <tr>
@@ -220,16 +224,16 @@
<table class="table"> <table class="table">
<% if !@total_order.nil? %> <% if !@total_order.nil? %>
<tr> <tr>
<td>Total Order : </td> <td width="40px">Total Order : </td>
<td align="right"><%= @total_order.total_order %></td> <td align="right" width="60px" style="padding: 5px"><%= @total_order.total_order %></td>
</tr> </tr>
<% end %> <% end %>
<% if !(@total_accounts.nil?) %> <% if !(@total_accounts.nil?) %>
<% @total_accounts.each do |account| %> <% @total_accounts.each do |account| %>
<tr> <tr>
<td><%= account.title %> (Account) : </td> <td width="40px"><%= account.title %> (Account) : </td>
<td align="right"> <td align="right" width="60px" style="padding: 5px">
<% @account_data.each do |data| %> <% @account_data.each do |data| %>
<% acc = account.title %> <% acc = account.title %>
<%= data[""+acc+""] %> <% if !data[''+acc+''].nil? %> ( <%= data[''+acc+'_amount'] %> ) <% end %> <%= data[""+acc+""] %> <% if !data[''+acc+''].nil? %> ( <%= data[''+acc+'_amount'] %> ) <% end %>
@@ -240,15 +244,15 @@
<% end %> <% end %>
<% if !@top_items.nil? %> <% if !@top_items.nil? %>
<tr> <tr>
<td>Top Item : </td> <td width="40px">Top Item : </td>
<td align="right"><%= @top_items.item_name %> <td align="right" width="60px" style="padding: 5px"><%= @top_items.item_name %>
<br>( <%= @top_items.item_total_price %> )</td> <br>(<%= @top_items.item_total_price %>)</td>
</tr> </tr>
<% end %> <% end %>
<% if !@total_foc_items.nil? %> <% if !@total_foc_items.nil? %>
<tr> <tr>
<td>Total FOC Item : </td> <td width="40px">Total FOC Item : </td>
<td align="right"><%= @total_foc_items %></td> <td align="right" width="60px" style="padding: 5px"><%= @total_foc_items %></td>
</tr> </tr>
<% end %> <% end %>
</table> </table>

7
app/views/layouts/_header.html.erb
View File

@@ -30,9 +30,10 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<%if current_login_employee.role !="waiter" %> <%if current_login_employee.role !="waiter" %>
<a class="delete waves-effect waves-block" style="padding:0.5rem 1rem; margin-bottom: 0rem;" data-ref="<%=logout_path%>" data-method="delete"> <p class="delete waves-effect waves-block p-l-30 m-t-15" data-ref="<%=logout_path%>" data-method="delete">
<i class="material-icons m-t-10">exit_to_app</i> Logout <i class="material-icons">exit_to_app</i>
</a> <span class="font-20 m-b-10">Logout</span>
</p>
<span class="hidden" id="delete_text"> <span class="hidden" id="delete_text">
<h6>Are you sure you want to Logout ?</h6> <h6>Are you sure you want to Logout ?</h6>
<!-- <h6>This action can't be undo. </h6> --> <!-- <h6>This action can't be undo. </h6> -->

68
app/views/origami/customers/index.html.erb
View File

@@ -13,7 +13,7 @@
<div class="row"> <div class="row">
<div class="col-lg-8 col-md-8 col-sm-8"> <div class="col-lg-8 col-md-8 col-sm-8">
<div class="card">
<div class="main-box-body clearfix" id="order-detail-slimscroll" style=""> <div class="main-box-body clearfix" id="order-detail-slimscroll" style="">
<div class="table-responsive"> <div class="table-responsive">
<table id="origami-crm-table" class="table table-striped"> <table id="origami-crm-table" class="table table-striped">
@@ -53,12 +53,12 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Select</th> <th></th>
<th>Sr.no</th> <th><%= t("views.right_panel.detail.sr_no") %></th>
<th>Name</th> <th><%= t("views.right_panel.detail.name") %></th>
<th>Company</th> <th><%= t("views.right_panel.detail.card_no") %></th>
<th>Contact no</th> <th><%= t("views.right_panel.detail.contact_no") %></th>
<th>Email</th> <th><%= t("views.right_panel.detail.email") %></th>
<!-- <th>Paypar No</th> --> <!-- <th>Paypar No</th> -->
</tr> </tr>
</thead> </thead>
@@ -96,12 +96,13 @@
<%= paginate @crm_customers %> <%= paginate @crm_customers %>
</div> </div>
</div> </div>
</div>
</div> </div>
<!-- <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> --> <!-- <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> -->
<div class="col-lg-3 col-md-3 col-sm-3" > <div class="col-lg-3 col-md-3 col-sm-3" >
<div id="custom-slimscroll"> <div class="card">
<div class="body" id="custom-slimscroll">
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
<span class="patch_method"></span> <span class="patch_method"></span>
@@ -111,15 +112,15 @@
<%= f.error_notification %> <%= f.error_notification %>
<%= f.hidden_field :id, :class => "form-control col-md-6 " %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
<div class="form-group"> <div class="form-group">
<label>Salutation :</label><br> <label><%= t("views.right_panel.detail.salutation") %> :</label><br>
<label class="font-13">Mr</label> <label class="font-15"><%= t("views.right_panel.detail.mr") %>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%> <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%></label>
<label class="m-l--20">Miss</label> <label class="font-15 m-l-20"><%= t("views.right_panel.detail.miss") %>
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%></label>
<label class="m-l--20">Mrs</label> <label class="font-15 m-l-20"><%= t("views.right_panel.detail.mrs") %>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%> <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%></label>
<label class="m-l--20">Mdm</label> <label class="font-15 m-l-20"><%= t("views.right_panel.detail.mdm") %>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%></label>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -134,11 +135,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Gender :</label><br> <label><%= t("views.right_panel.detail.gender") %> :</label><br>
<label>Male</label> <label><%= t("views.right_panel.detail.male") %>
<%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%> <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%></label>
<label>Female</label> <label><%= t("views.right_panel.detail.female") %>
<%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%> <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%></label>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -180,16 +181,16 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Sr.No</label> <label><%= t("views.right_panel.detail.sr_no") %></label>
<input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true"> <input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true">
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Date Of Birth</label> <label><%= t("views.right_panel.detail.date_of_birth") %></label>
<%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Select Customer Type</label> <label><%= t("views.right_panel.detail.select_customer_type") %></label>
<select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" > <select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
<% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %> <% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
<option value="<%= ct.value %>"> <option value="<%= ct.value %>">
@@ -212,7 +213,7 @@
<% end -%> <% end -%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Paypar Account No:</label> <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly /> <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
<div class="input-group-addon"><span class="fa fa-credit-card"></span></div> <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
@@ -220,9 +221,9 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Select Member Group</label> <label><%= t("views.right_panel.detail.select_membership_group") %></label>
<select class="form-control col-md-12" name="member_group_id"> <select class="form-control col-md-12" name="member_group_id">
<option value="">Select Membership Group</option> <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %> <% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
<option value="<%= member.value %>"> <option value="<%= member.value %>">
<%= member.name %></option> <%= member.name %></option>
@@ -231,12 +232,13 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect', :id => 'submit_customer' %> <%= f.submit t("views.btn.submit"),:class => 'btn btn-primary btn-lg waves-effect', :id => 'submit_customer' %>
<!-- <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> --> <!-- <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
</div> </div>
</div>
<%end%> <%end%>
</div> </div>
</div>
</div>
<!-- Column Three --> <!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button> <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
@@ -246,8 +248,8 @@
<div id="sxModal"> <div id="sxModal">
<div id="sxModal-Content"><h3>Card Tap</h3></div> <div id="sxModal-Content"><h3>Card Tap</h3></div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
/*$('.datepicker').datepicker({ /*$('.datepicker').datepicker({
setDate: '12-12-1999', setDate: '12-12-1999',

5
app/views/origami/in_duties/_assign_in_duty.html.erb
View File

@@ -1,4 +1,6 @@
<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %> <%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
<div class="card">
<div class="body">
<span class="patch_method"></span> <span class="patch_method"></span>
<%= f.error_notification %> <%= f.error_notification %>
<%= f.hidden_field :id, :class => "form-control col-md-6 " %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
@@ -18,7 +20,8 @@
<button type="button" class="btn btn-inverse pull-right" id='back'> <button type="button" class="btn bg-default btn-block" onclick="window.location.href = "origami_index_in_duty_path(@table.id)"><i class="material-icons">reply</i> Back </button>Back</button> <button type="button" class="btn btn-inverse pull-right" id='back'> <button type="button" class="btn bg-default btn-block" onclick="window.location.href = "origami_index_in_duty_path(@table.id)"><i class="material-icons">reply</i> Back </button>Back</button>
</div> </div>
</div>
</div>
<% end %> <% end %>

6
app/views/origami/in_duties/_edit_in_duty.html.erb
View File

@@ -1,6 +1,7 @@
<%= simple_form_for([:origami, @in_duty]) do |f| %> <%= simple_form_for([:origami, @in_duty]) do |f| %>
<div class="card">
<div class="body">
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs">
<%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %> <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
<br/><br/> <br/><br/>
@@ -11,4 +12,7 @@
<div class="form-actions"> <div class="form-actions">
<%= f.button :submit %> <%= f.button :submit %>
</div> </div>
</div>
</div>
<% end %> <% end %>

5
app/views/origami/in_duties/_form.html.erb
View File

@@ -1,5 +1,7 @@
<br> <br>
<%= simple_form_for @in_duty, :url => origami_index_in_duty_path, :method => :post do |f| %> <%= simple_form_for @in_duty, :url => origami_index_in_duty_path, :method => :post do |f| %>
<div class="card">
<div class="body">
<span class="patch_method"></span> <span class="patch_method"></span>
<%= f.error_notification %> <%= f.error_notification %>
<%= f.hidden_field :id, :class => "form-control col-md-6 " %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
@@ -48,6 +50,9 @@
<div class="form-actions"> <div class="form-actions">
<%= f.submit "Create In Duty", :class => 'btn bg-blue' %> <%= f.submit "Create In Duty", :class => 'btn bg-blue' %>
</div> </div>
</div>
</div>
<% end %> <% end %>

5
app/views/origami/in_duties/assign_in_duty.html.erb
View File

@@ -4,8 +4,9 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<%= simple_form_for([:origami,@in_duty]) do |f| %> <%= simple_form_for([:origami,@in_duty]) do |f| %>
<div class="card">
<div class="body">
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs">
<label>Dining Name:</label> <label>Dining Name:</label>
<%= @table.name %> <%= @table.name %>
@@ -29,6 +30,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>