raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly

Browse Source
This commit is contained in:
Steve Pettitt
2015-11-28 20:55:55 +00:00
committed by Rob Harrington
parent 25454d3e97
commit e423e890e0
11 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/variant_overrides/services/variant_overrides.js.coffee
View File

@@ -20,7 +20,7 @@ angular.module("admin.variantOverrides").factory "VariantOverrides", (variantOve
count_on_hand: null
on_demand: null
default_stock: null
enable_reset: false
resettable: false
updateIds: (updatedVos) ->
for vo in updatedVos

2
app/models/variant_override.rb
View File

@@ -56,7 +56,7 @@ class VariantOverride < ActiveRecord::Base
end
def reset_stock!
if enable_reset
if resettable
if default_stock?
self.attributes = { count_on_hand: default_stock }
self.save

2
app/models/variant_override_set.rb
View File

@@ -7,7 +7,7 @@ class VariantOverrideSet < ModelSet
attrs['price'].blank? &&
attrs['count_on_hand'].blank? &&
attrs['default_stock'].blank? &&
attrs['enable_reset'].blank? &&
attrs['resettable'].blank? &&
attrs['sku'].nil? &&
attrs['on_demand'].nil?
end

2
app/serializers/api/admin/variant_override_serializer.rb
View File

@@ -1,3 +1,3 @@
class Api::Admin::VariantOverrideSerializer < ActiveModel::Serializer
attributes :id, :hub_id, :variant_id, :sku, :price, :count_on_hand, :on_demand, :default_stock, :enable_reset
attributes :id, :hub_id, :variant_id, :sku, :price, :count_on_hand, :on_demand, :default_stock, :resettable
end

2
app/views/admin/variant_overrides/_products_variants.html.haml
View File

@@ -15,6 +15,6 @@
%input{name: 'variant-overrides-{{ variant.id }}-count-on-hand', type: 'text', ng: {model: 'variantOverrides[hub.id][variant.id].count_on_hand'}, placeholder: '{{ variant.on_hand }}', 'ofn-track-variant-override' => 'count_on_hand'}
%td
%input{name: 'variant-overrides-{{ variant.id }}-enable-reset', type: 'checkbox', ng: {model: 'variantOverrides[hub.id][variant.id].enable_reset'}, placeholder: '{{ variant.enable_reset }}', 'ofn-track-variant-override' => 'enable_reset'}
%input{name: 'variant-overrides-{{ variant.id }}-resettable', type: 'checkbox', ng: {model: 'variantOverrides[hub.id][variant.id].resettable'}, placeholder: '{{ variant.resettable }}', 'ofn-track-variant-override' => 'resettable'}
%td
%input{name: 'variant-overrides-{{ variant.id }}-default-stock', type: 'text', ng: {model: 'variantOverrides[hub.id][variant.id].default_stock'}, placeholder: '{{ variant.default_stock ? variant.default_stock : "Default stock"}}', 'ofn-track-variant-override' => 'default_stock'}