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

Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

Browse Source
This commit is contained in:
yamin
2017-08-24 18:26:28 +06:30
parent 7004637027 1f7ba42e80
commit 4791656a7d
102 changed files with 1734 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/inventory/inventory_definitions/_form.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<%= simple_form_for(@inventory_definition) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/inventory/inventory_definitions/_inventory_definition.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! inventory_definition, :id, :created_at, :updated_at
json.url inventory_definition_url(inventory_definition, format: :json)

6
app/views/inventory/inventory_definitions/edit.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<h1>Editing Inventory Definition</h1>
<%= render 'form', inventory_definition: @inventory_definition %>
<%= link_to 'Show', @inventory_definition %> |
<%= link_to 'Back', inventory_definitions_path %>

25
app/views/inventory/inventory_definitions/index.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<p id="notice"><%= notice %></p>
<h1>Inventory Definitions</h1>
<table>
<thead>
<tr>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @inventory_definitions.each do |inventory_definition| %>
<tr>
<td><%= link_to 'Show', inventory_definition %></td>
<td><%= link_to 'Edit', edit_inventory_definition_path(inventory_definition) %></td>
<td><%= link_to 'Destroy', inventory_definition, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<%= link_to 'New Inventory Definition', new_inventory_definition_path %>

1
app/views/inventory/inventory_definitions/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @inventory_definitions, partial: 'inventory_definitions/inventory_definition', as: :inventory_definition

5
app/views/inventory/inventory_definitions/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New Inventory Definition</h1>
<%= render 'form', inventory_definition: @inventory_definition %>
<%= link_to 'Back', inventory_definitions_path %>

4
app/views/inventory/inventory_definitions/show.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<p id="notice"><%= notice %></p>
<%= link_to 'Edit', edit_inventory_definition_path(@inventory_definition) %> |
<%= link_to 'Back', inventory_definitions_path %>

1
app/views/inventory/inventory_definitions/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "inventory_definitions/inventory_definition", inventory_definition: @inventory_definition

10
app/views/inventory/stock_check_items/_form.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<%= simple_form_for(@stock_check_item) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/inventory/stock_check_items/_stock_check_item.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! stock_check_item, :id, :created_at, :updated_at
json.url stock_check_item_url(stock_check_item, format: :json)

6
app/views/inventory/stock_check_items/edit.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<h1>Editing Stock Check Item</h1>
<%= render 'form', stock_check_item: @stock_check_item %>
<%= link_to 'Show', @stock_check_item %> |
<%= link_to 'Back', stock_check_items_path %>

25
app/views/inventory/stock_check_items/index.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<p id="notice"><%= notice %></p>
<h1>Stock Check Items</h1>
<table>
<thead>
<tr>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @stock_check_items.each do |stock_check_item| %>
<tr>
<td><%= link_to 'Show', stock_check_item %></td>
<td><%= link_to 'Edit', edit_stock_check_item_path(stock_check_item) %></td>
<td><%= link_to 'Destroy', stock_check_item, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<%= link_to 'New Stock Check Item', new_stock_check_item_path %>

1
app/views/inventory/stock_check_items/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @stock_check_items, partial: 'stock_check_items/stock_check_item', as: :stock_check_item

5
app/views/inventory/stock_check_items/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New Stock Check Item</h1>
<%= render 'form', stock_check_item: @stock_check_item %>
<%= link_to 'Back', stock_check_items_path %>

4
app/views/inventory/stock_check_items/show.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<p id="notice"><%= notice %></p>
<%= link_to 'Edit', edit_stock_check_item_path(@stock_check_item) %> |
<%= link_to 'Back', stock_check_items_path %>

1
app/views/inventory/stock_check_items/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "stock_check_items/stock_check_item", stock_check_item: @stock_check_item

10
app/views/inventory/stock_checks/_form.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<%= simple_form_for(@stock_check) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/inventory/stock_checks/_stock_check.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! stock_check, :id, :created_at, :updated_at
json.url stock_check_url(stock_check, format: :json)

6
app/views/inventory/stock_checks/edit.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<h1>Editing Stock Check</h1>
<%= render 'form', stock_check: @stock_check %>
<%= link_to 'Show', @stock_check %> |
<%= link_to 'Back', stock_checks_path %>

25
app/views/inventory/stock_checks/index.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<p id="notice"><%= notice %></p>
<h1>Stock Checks</h1>
<table>
<thead>
<tr>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @stock_checks.each do |stock_check| %>
<tr>
<td><%= link_to 'Show', stock_check %></td>
<td><%= link_to 'Edit', edit_stock_check_path(stock_check) %></td>
<td><%= link_to 'Destroy', stock_check, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<%= link_to 'New Stock Check', new_stock_check_path %>

1
app/views/inventory/stock_checks/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @stock_checks, partial: 'stock_checks/stock_check', as: :stock_check

5
app/views/inventory/stock_checks/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New Stock Check</h1>
<%= render 'form', stock_check: @stock_check %>
<%= link_to 'Back', stock_checks_path %>

4
app/views/inventory/stock_checks/show.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<p id="notice"><%= notice %></p>
<%= link_to 'Edit', edit_stock_check_path(@stock_check) %> |
<%= link_to 'Back', stock_checks_path %>

1
app/views/inventory/stock_checks/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "stock_checks/stock_check", stock_check: @stock_check

10
app/views/inventory/stock_journals/_form.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<%= simple_form_for(@stock_journal) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
<% end %>

2
app/views/inventory/stock_journals/_stock_journal.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.extract! stock_journal, :id, :created_at, :updated_at
json.url stock_journal_url(stock_journal, format: :json)

6
app/views/inventory/stock_journals/edit.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<h1>Editing Stock Journal</h1>
<%= render 'form', stock_journal: @stock_journal %>
<%= link_to 'Show', @stock_journal %> |
<%= link_to 'Back', stock_journals_path %>

25
app/views/inventory/stock_journals/index.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<p id="notice"><%= notice %></p>
<h1>Stock Journals</h1>
<table>
<thead>
<tr>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @stock_journals.each do |stock_journal| %>
<tr>
<td><%= link_to 'Show', stock_journal %></td>
<td><%= link_to 'Edit', edit_stock_journal_path(stock_journal) %></td>
<td><%= link_to 'Destroy', stock_journal, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<%= link_to 'New Stock Journal', new_stock_journal_path %>

1
app/views/inventory/stock_journals/index.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.array! @stock_journals, partial: 'stock_journals/stock_journal', as: :stock_journal

5
app/views/inventory/stock_journals/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New Stock Journal</h1>
<%= render 'form', stock_journal: @stock_journal %>
<%= link_to 'Back', stock_journals_path %>

4
app/views/inventory/stock_journals/show.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<p id="notice"><%= notice %></p>
<%= link_to 'Edit', edit_stock_journal_path(@stock_journal) %> |
<%= link_to 'Back', stock_journals_path %>

1
app/views/inventory/stock_journals/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "stock_journals/stock_journal", stock_journal: @stock_journal

82
app/views/settings/promotions/_form.html.erb
View File

@@ -10,18 +10,18 @@
</div>
<div class="row">
<div class="col-md-6">
<span>Promo Start Date</span>
<span>* Promo Start Date</span>
<%= f.date_field :promo_start_date, :placeholder => "From Date" , :class => "form-control"%>
<br>
</div>
<div class="col-md-6">
<span>Promo End Date</span>
<span>* Promo End Date</span>
<%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control"%>
</div>
</div>
<div class="row">
<div class="col-md-6">
<!-- <%= f.input :promo_start_hour %> -->
<!-- <span>* Promo Start Hour</span> -->
<% if !@promotion.promo_start_hour.nil?%>
<%= f.input :promo_start_hour, as: :string, input_html: { :value => @promotion.promo_start_hour.utc.strftime('%H:%M') } %>
<% else %>
@@ -31,7 +31,7 @@
<%= text_field_tag :promo_start_hour , nil, :placeholder => "From Time", :id => "fromtime", :class => 'form-control' %> -->
</div>
<div class="col-md-6">
<!-- <%= f.input :promo_end_hour %> -->
<!-- <span>* Promo End Hour</span> -->
<% if !@promotion.promo_end_hour.nil?%>
<%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') } %>
<% else %>
@@ -49,60 +49,38 @@
</div>
</div>
<div class="row">
<div class="col-md-6"><%= f.input :original_product,collection: MenuItem.order("name desc"),input_html: { selected: 2 } %></div>
<div class="col-md-6"><%= f.input :original_product,collection: MenuItem.order("name desc").pluck(:name,:item_code),input_html: { selected: 2 } %></div>
<div class="col-md-6"><%= f.input :min_qty %></div>
</div>
<br>
<br>
<table class="table" style="border : 1px solid #555555 !important;margin:0px">
<tbody>
<tr>
<!-- <td>Promotion Code</td> -->
<td>Item Code</td>
<td>Min Qty</td>
<td>Net off</td>
<td>Net Price</td>
<td>Percentage</td>
<td colspan="2"></td>
</tr>
<!-- <% @promotion.promotion_products.each do |pp| %>
<tr>
<!-- <td><%= pp.promotion_id %></td>
<td><%= pp.item_code %></td>
<td><%= pp.min_qty %></td>
<td><%= pp.net_off %></td>
<td><%= pp.net_price %></td>
<td><%= pp.percentage %></td>
<td><%= link_to 'Edit', edit_settings_promotion_promotion_product_path(@promotion,pp) %></td>
<td><%= link_to 'Destroy', settings_promotion_promotion_product_path(@promotion,pp), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %> -->
</tbody>
</table>
<%= f.fields_for :promotion_products do |pro| %>
<table class="table" style="margin:0px">
<tbody>
<tr>
<!-- <td></td> -->
<td><%= pro.input :item_code, label: false%></td>
<td><%= pro.input :min_qty , label: false%></td>
<td><%= pro.input :net_off , label: false %></td>
<td><%= pro.input :net_price , label: false %></td>
<td><%= pro.input :percentage , label: false %></td>
<td><%= pro.link_to_remove "X" %></td>
<td></td>
</tr>
</tbody>
</table>
<% end %>
<%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %>
<div class="" style="border: 1px solid #cccccc;padding:1%">
<div class="row">
<div class="col-md-2" style="text-align:center">Item Code</div>
<div class="col-md-2" style="text-align:center">Min Qty</div>
<div class="col-md-2" style="text-align:center">Net off</div>
<div class="col-md-2" style="text-align:center">Net Price</div>
<div class="col-md-2" style="text-align:center">Percentage</div>
<div class="col-md-2" style="text-align:center"></div>
</div>
<div class="row"></div >
<%= f.fields_for :promotion_products do |pro| %>
<div class="row">
<div class="col-md-2"><%= pro.input :item_code, label: false,collection: MenuItem.order("name desc").pluck(:name,:item_code)%></div>
<div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
<div class="col-md-2"><%= pro.input :net_off , label: false %></div>
<div class="col-md-2"><%= pro.input :net_price , label: false %></div>
<div class="col-md-2"><%= pro.input :percentage , label: false %></div>
<div class="col-md-2" style="text-align:right"><%= pro.link_to_remove "X" %></div>
</div>
<% end %>
<div class="row">
<div class="col-md-12" style="text-align:right;"><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %></div>
</div>
</div>
</div>
</div>
<br>
<div class="form-actions">
<%= f.button :submit %>
</div>

4
app/views/settings/promotions/index.html.erb
View File

@@ -39,9 +39,7 @@
<td><%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
<td><%= pro.promo_day %></td>
<td>
<% if MenuItem.exists?(pro.original_product) %>
<%= MenuItem.find(pro.original_product).name %>
<% end %>
<%= MenuItem.find_by_item_code(pro.original_product).name rescue "-"%>
</td>
<% if Employee.exists?(pro.created_by) %>
<td><%= Employee.find(pro.created_by).name %></td>