raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

BasicOrderCycleSerializer renders order open and close times

Browse Source
This commit is contained in:
Rob Harrington
2016-12-02 11:55:44 +11:00
parent f6af5098b0
commit 5191877fbe
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -22,8 +22,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
$scope.refreshData = ->
unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
$scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].first_order).format('YYYY-MM-DD')
$scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].last_order).startOf('day').format('YYYY-MM-DD')
$scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
$scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")

12
app/serializers/api/admin/basic_order_cycle_serializer.rb
View File

@@ -1,7 +1,7 @@
class Api::Admin::BasicOrderCycleSerializer < ActiveModel::Serializer
include OrderCyclesHelper
attributes :id, :name, :status, :first_order, :last_order
attributes :id, :name, :status, :orders_open_at, :orders_close_at
has_many :suppliers, serializer: Api::Admin::IdNameSerializer
has_many :distributors, serializer: Api::Admin::IdNameSerializer
@@ -10,15 +10,11 @@ class Api::Admin::BasicOrderCycleSerializer < ActiveModel::Serializer
order_cycle_status_class object
end
def first_order
def orders_open_at
object.orders_open_at.andand.strftime("%F")
end
def last_order
if object.orders_close_at.present?
(object.orders_close_at + 1.day).strftime("%F")
else
nil
end
def orders_close_at
object.orders_close_at.andand.strftime("%F")
end
end