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

Merge branch 'master' into 2-0-stable-Feb12

Browse Source
This commit is contained in:
luisramos0
2019-02-12 16:03:33 +00:00
parent b6ca0ba24f 1f72eb9f68
commit c652cfe4d5
106 changed files with 6794 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/subscriptions/controllers/subscription_controller.js.coffee
View File

@@ -6,7 +6,11 @@ angular.module("admin.subscriptions").controller "SubscriptionController", ($sco
$scope.schedules = Schedules.all
$scope.paymentMethods = PaymentMethods.all
$scope.shippingMethods = ShippingMethods.all
$scope.distributor_id = $scope.subscription.shop_id # variant selector requires distributor_id
# Variant selector requires these
$scope.distributor_id = $scope.subscription.shop_id
$scope.eligible_for_subscriptions = true
$scope.view = if $scope.subscription.id? then 'review' else 'details'
$scope.nextCallbacks = {}
$scope.backCallbacks = {}

1
app/assets/javascripts/admin/utils/directives/variant_autocomplete.js.coffee
View File

@@ -22,6 +22,7 @@ angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
q: term
distributor_id: scope.distributor_id
order_cycle_id: scope.order_cycle_id
eligible_for_subscriptions: scope.eligible_for_subscriptions
results: (data, page) ->
window.variants = data # this is how spree auto complete JS code picks up variants
results: data