Skip to content

Commit

Permalink
Merge branch 'v4.8.x' of https://github.com/blair2004/NexoPOS-4x into…
Browse files Browse the repository at this point in the history
… v4.8.x
  • Loading branch information
Blair2004 committed Mar 1, 2023
2 parents 9965907 + 78f8275 commit 9cade45
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions resources/ts/pages/auth/ns-login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<template>{{ __( 'Sign In' ) }}</template>
</ns-button>
</div>
<div>
<div v-if="showRegisterButton">
<ns-button :link="true" :href="'/sign-up'" type="success">{{ __( 'Register' ) }}</ns-button>
</div>
</div>
Expand All @@ -33,7 +33,7 @@ import { nsHooks, nsHttpClient, nsSnackBar } from '@/bootstrap';
import { __ } from '@/libraries/lang';
export default {
name: 'ns-login',
props: [ 'showRecoveryLink' ],
props: [ 'showRecoveryLink', 'showRegisterButton' ],
data() {
return {
fields: [],
Expand Down
7 changes: 5 additions & 2 deletions resources/views/common/auth/sign-in-form.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<ns-login :show-recovery-link="{{ ns()->option->get( 'ns_recovery_enabled' ) === 'yes' ? 'true' : 'false' }}">
<ns-login
:show-recovery-link="{{ ns()->option->get( 'ns_recovery_enabled' ) === 'yes' ? 'true' : 'false' }}"
:show-register-button="{{ ns()->option->get( 'ns_registration_enabled' ) === 'no' ? 'false' : 'true' }}"
>
<div class="w-full flex items-center justify-center">
<h3 class="font-hairline text-sm ns-normal-text">{{ __( 'Loading...' ) }}</h3>
</div>
</ns-login>
</ns-login>

0 comments on commit 9cade45

Please sign in to comment.