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

Replace references to 'standing line item' with 'subscription line item'

Browse Source
This commit is contained in:
Rob Harrington
2018-02-05 12:28:11 +11:00
parent ae4420d9ba
commit 7017c8540c
35 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/subscriptions/controllers/products_controller.js.coffee
View File

@@ -1,7 +1,7 @@
angular.module("admin.subscriptions").controller "ProductsController", ($scope, StatusMessage) ->
$scope.registerNextCallback 'products', ->
$scope.subscription_form.$submitted = true
if $scope.subscription.standing_line_items.length > 0
if $scope.subscription.subscription_line_items.length > 0
$scope.subscription_form.$setPristine()
StatusMessage.clear()
$scope.setView('review')

4
app/assets/javascripts/admin/subscriptions/controllers/products_panel_controller.js.coffee
View File

@@ -4,8 +4,8 @@ angular.module("admin.subscriptions").controller "ProductsPanelController", ($sc
$scope.saving = false
$scope.saved = ->
pristine = Subscriptions.pristineByID[$scope.subscription.id].standing_line_items
return false unless angular.equals($scope.subscription.standing_line_items, pristine)
pristine = Subscriptions.pristineByID[$scope.subscription.id].subscription_line_items
return false unless angular.equals($scope.subscription.subscription_line_items, pristine)
true
$scope.save = ->

10
app/assets/javascripts/admin/subscriptions/controllers/subscription_line_items_controller.js.coffee
View File

@@ -1,7 +1,7 @@
angular.module("admin.subscriptions").controller "StandingLineItemsController", ($scope, InfoDialog) ->
angular.module("admin.subscriptions").controller "SubscriptionLineItemsController", ($scope, InfoDialog) ->
$scope.newItem = { variant_id: 0, quantity: 1 }
$scope.addStandingLineItem = ->
$scope.addSubscriptionLineItem = ->
match = $scope.match()
if match
if match._destroy
@@ -13,18 +13,18 @@ angular.module("admin.subscriptions").controller "StandingLineItemsController",
$scope.subscription_form.$setDirty()
$scope.subscription.buildItem($scope.newItem)
$scope.removeStandingLineItem = (item) ->
$scope.removeSubscriptionLineItem = (item) ->
$scope.subscription_form.$setDirty()
$scope.subscription.removeItem(item)
$scope.match = ->
matching = $scope.subscription.standing_line_items.filter (sli) ->
matching = $scope.subscription.subscription_line_items.filter (sli) ->
sli.variant_id == $scope.newItem.variant_id
return matching[0] if matching.length > 0
null
$scope.estimatedSubtotal = ->
$scope.subscription.standing_line_items.reduce (subtotal, item) ->
$scope.subscription.subscription_line_items.reduce (subtotal, item) ->
return subtotal if item._destroy
subtotal += item.price_estimate * item.quantity
, 0

2
app/assets/javascripts/admin/subscriptions/controllers/subscriptions_controller.js.coffee
View File

@@ -12,7 +12,7 @@ angular.module("admin.subscriptions").controller "SubscriptionsController", ($sc
$scope.subscriptions = Subscriptions.index("q[shop_id_eq]": $scope.shop_id, "q[canceled_at_null]": true)
$scope.itemCount = (subscription) ->
subscription.standing_line_items.reduce (sum, sli) ->
subscription.subscription_line_items.reduce (sum, sli) ->
return sum + sli.quantity
, 0

4
app/assets/javascripts/admin/subscriptions/services/subscription_prototype.js.coffee
View File

@@ -3,8 +3,8 @@ angular.module("admin.subscriptions").factory 'SubscriptionPrototype', ($http, $
return false unless item.variant_id > 0
return false unless item.quantity > 0
data = angular.extend({}, item, { shop_id: @shop_id, schedule_id: @schedule_id })
$http.post("/admin/standing_line_items/build", data).then (response) =>
@standing_line_items.push response.data
$http.post("/admin/subscription_line_items/build", data).then (response) =>
@subscription_line_items.push response.data
, (response) =>
InfoDialog.open 'error', response.data.errors[0]

4
app/assets/javascripts/admin/subscriptions/services/subscriptions.js.coffee
View File

@@ -23,5 +23,5 @@ angular.module("admin.subscriptions").factory 'Subscriptions', ($q, Subscription
afterRemoveItem: (id, deletedItemID) ->
return unless @pristineByID[id]?
for item, i in @pristineByID[id].standing_line_items when item.id == deletedItemID
@pristineByID[id].standing_line_items.splice(i, 1)
for item, i in @pristineByID[id].subscription_line_items when item.id == deletedItemID
@pristineByID[id].subscription_line_items.splice(i, 1)