rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

clean machines controller

Browse Source
This commit is contained in:
Sylvain 2017-02-22 11:01:52 +01:00
parent ce087ae778
commit 4bb9728502
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/controllers/machines.coffee.erb
View File

@ -303,6 +303,7 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
## will store the user's plan if he choosed to buy one
$scope.selectedPlan = null
## the moment when the plan selection changed for the last time, used to trigger changes in the cart
$scope.planSelectionTime = null
## array of fullCalendar events. Slots where the user want to book
@ -323,15 +324,15 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
$scope.coupon =
applied: null
## the moment when the slot selection changed for the last time, used to trigger changes in the cart
$scope.selectionTime = null
## the last clicked event in the calender
$scope.selectedEvent = null
## the application global settings
$scope.settings = settingsPromise
## is the user allowed to change the date of his booking
$scope.enableBookingMove = true
## list of plans, classified by group
$scope.plansClassifiedByGroup = []
for group in groupsPromise
@ -362,18 +363,6 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
## Gloabl config: message to the end user concerning the machine bookings
$scope.machineExplicationsAlert = settingsPromise.machine_explications_alert
## Global config: is the user authorized to change his bookings slots?
$scope.enableBookingMove = (settingsPromise.booking_move_enable == "true")
## Global config: delay in hours before a booking while changing the booking slot is forbidden
$scope.moveBookingDelay = parseInt(settingsPromise.booking_move_delay)
## Global config: is the user authorized to cancel his bookings?
$scope.enableBookingCancel = (settingsPromise.booking_cancel_enable == "true")
## Global config: delay in hours before a booking while the cancellation is forbidden
$scope.cancelBookingDelay = parseInt(settingsPromise.booking_cancel_delay)
##
@ -465,7 +454,6 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
# reservations. (admins only)
##
$scope.updateMember = ->
$scope.paidMachineSlots = null
$scope.plansAreShown = false
$scope.selectedPlan = null
Member.get {id: $scope.ctrl.member.id}, (member) ->
@ -524,10 +512,6 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
machineSlot.borderColor = UNAVAILABLE_SLOT_BORDER_COLOR
updateMachineSlot(machineSlot, reservation, $scope.ctrl.member)
machineSlot.backgroundColor = 'white'
$scope.paidMachineSlots = $scope.events.reserved
$scope.events.reserved = []
$scope.coupon.applied = null
if $scope.selectedPlan
$scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)

22
app/assets/javascripts/directives/cart.coffee.erb
View File

@ -461,8 +461,7 @@ Application.Directives.directive 'cart', [ '$rootScope', '$uibModal', 'dialogs',
$scope.attempting = false
]
.result['finally'](null).then (reservation)->
$scope.events.paid = $scope.events.reserved
$scope.afterPayment(reservation) if typeof $scope.afterPayment == 'function'
afterPayment(reservation)
@ -525,12 +524,25 @@ Application.Directives.directive 'cart', [ '$rootScope', '$uibModal', 'dialogs',
$uibModalInstance.dismiss('cancel')
]
.result['finally'](null).then (reservation)->
$scope.events.paid = $scope.events.reserved
$scope.afterPayment(reservation) if typeof $scope.afterPayment == 'function'
afterPayment(reservation)
## !!! MUST BE CALLED AT THE END of the directive
##
# Actions to run after the payment was successfull
##
afterPayment = (reservation) ->
# we set the cart content as 'paid' to display a summary of the transaction
$scope.events.paid = $scope.events.reserved
# we call the external callback if present
$scope.afterPayment(reservation) if typeof $scope.afterPayment == 'function'
# we reset the coupon and the cart content
$scope.events.reserved = []
$scope.coupon.applied = null
## !!! MUST BE CALLED AT THE END of the directive
initialize()
}
]