update menu_sync

This commit is contained in:
Yan
2017-08-18 19:46:43 +06:30
parent 48461da9ea
commit a1df5a0dbc
14 changed files with 135 additions and 46 deletions

View File

@@ -1,3 +1,26 @@
# Format for attributes json
attr_format = []
param_count = item.item_attributes.count
# Format for attributes json
item.item_attributes.each do|attr_id|
menu_attr = MenuItemAttribute.find(attr_id)
if attr_format.count == 0
attr_format.push({ type: menu_attr.attribute_type, value: [] })
end
attr_format.each do |af|
if menu_attr.attribute_type == af[:type]
af[:value].push(menu_attr.value)
else
new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] }
attr_format.push(new_attr)
end
break if attr_format.count > param_count
end
param_count -= 1
end
#Menu Item Information
json.id item.id
@@ -12,7 +35,8 @@ json.account_id item.account_id
json.min_qty item.min_qty
json.is_available item.is_available
json.is_sub_item item.is_sub_item
json.attributes item.item_attributes
json.item_sets item.item_sets
json.attributes attr_format
json.options item.item_options
# json.min_selectable_item item.min_selectable_item
# json.max_selectable_item item.max_selectable_item
@@ -26,17 +50,16 @@ json.options item.item_options
# json.promotion_price = item_instance.promotion_price
# json.item_attributes = item_instance.item_attributes
# elsif item.menu_item_instances.count > 1 then
json.instances item.menu_item_instances do |is|
json.code = is.item_instance_code
json.name = is.item_instance_name
json.price = is.price
json.is_available = is.is_available
json.is_default = is.is_default
json.is_on_promotion = is.is_on_promotion
json.promotion_price = is.promotion_price
json.item_attributes = is.item_attributes
# end
json.item_sets is.item_sets
end
#Child Menu items

View File

@@ -3,21 +3,32 @@
<%= f.error_notification %>
<div class="form-inputs">
<%= f.input :item_instance_code %>
<%= f.input :item_instance_name %>
<%= f.input :price %>
<div class="col-md-8 panel">
<div class="form-group">
<%= f.input :item_instance_code %>
<%= f.input :item_instance_name %>
<%= f.input :price %>
<%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %>
<%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %>
<%= f.input :is_on_promotion %>
<%= f.input :promotion_price %>
<%= f.input :is_available %>
<%= f.input :is_on_promotion %>
<%= f.input :promotion_price %>
</div>
</div>
<div class="form-actions">
<%= f.button :submit %>
<div class="col-md-4">
<div class="panel padding-10">
<div class="form-group">
<%= f.input :is_available %>
<%= f.input :is_default %>
<%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %>
</div>
</div>
<div class="form-actions">
<%= f.button :submit %>
</div>
</div>
<% end %>

View File

@@ -11,6 +11,6 @@
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances %>
<%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
</div>

View File

@@ -14,6 +14,6 @@
<li>New Menu Item Instance</li>
</ul>
</div>
<%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances %>
<%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
</div>

View File

@@ -24,8 +24,8 @@
<th>On Promotion</th>
<th>Promotion Price</th>
<th>Available</th>
<th>Created At</th>
<th>Is Default</th>
<th>Created At</th>
</tr>
</thead>
@@ -38,6 +38,7 @@
<td><%= @settings_menu_item_instances.is_on_promotion %></td>
<td><%= @settings_menu_item_instances.promotion_price %></td>
<td><%= @settings_menu_item_instances.is_available %></td>
<td><%= @settings_menu_item_instances.is_default %></td>
<td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<% if params[:simple_menu_item_id] %>
<td><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td>