mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-01 02:03:22 +00:00
Patching a regression bug with login on checkout
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
Darkswarm.controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
|
||||
$scope.open = AuthenticationService.open
|
||||
$scope.toggle = AuthenticationService.toggle
|
||||
|
||||
$scope.spree_user = SpreeUser.spree_user
|
||||
$scope.active = AuthenticationService.active
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location)->
|
||||
new class AuthenticationService
|
||||
selectedPath: "/login"
|
||||
|
||||
constructor: ->
|
||||
if $location.path() in ["/login", "/signup", "/forgot"]
|
||||
@open()
|
||||
open: =>
|
||||
|
||||
open: (path = false)=>
|
||||
@modalInstance = $modal.open
|
||||
templateUrl: 'authentication.html'
|
||||
|
||||
@modalInstance.result.then @close, @close
|
||||
@selectedPath = path || @selectedPath
|
||||
Navigation.navigate @selectedPath
|
||||
|
||||
|
||||
select: (path)=>
|
||||
@selectedPath = path
|
||||
Navigation.navigate @selectedPath
|
||||
|
||||
@@ -5,11 +5,12 @@ Darkswarm.factory 'Navigation', ($location) ->
|
||||
active: (path)->
|
||||
$location.path() == path
|
||||
|
||||
navigate: (path)->
|
||||
navigate: (path)=>
|
||||
@path = path
|
||||
$location.path(@path)
|
||||
|
||||
toggle: (path = false)->
|
||||
toggle: (path = false)=>
|
||||
console.log "toggling"
|
||||
@path = path || @path
|
||||
if $location.path() == @path
|
||||
$location.path("/")
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%fieldset
|
||||
%accordion-group{heading: "User", "is-open" => "accordion.user"}
|
||||
.row
|
||||
.large-4.columns.text-center{"ng-controller" => "AuthenticationActionsCtrl"}
|
||||
%button{"ng-click" => "toggle('/login')"} Login
|
||||
.large-4.columns.text-center{"ng-controller" => "AuthenticationActionsCtrl"}
|
||||
%button{"ng-click" => "toggle('/signup')"} Signup
|
||||
.large-4.columns.text-center{"ng-controller" => "AuthenticationCtrl"}
|
||||
%button{"ng-click" => "open('/login')"} Login
|
||||
.large-4.columns.text-center{"ng-controller" => "AuthenticationCtrl"}
|
||||
%button{"ng-click" => "open('/signup')"} Signup
|
||||
.large-4.columns.text-center
|
||||
%button{"ng-click" => "show('details')"} Checkout as guest
|
||||
|
||||
Reference in New Issue
Block a user