gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Berater Register, Mitgliedschat live

Browse source 
https://dev.adametz.media:3000/cliquers/mivita.care/issues/3
This commit is contained in:
Kevin Adametz 2020-03-09 14:45:09 +01:00
parent 21abafb8db
commit 1ada368ed4
43 changed files with 286 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/views/admin/sales/users.blade.php
View file

@ -22,7 +22,7 @@
<th>{{__('Status')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('Käufe')}}</th>
<th>{{__('Shop')}}</th>
<th>{{__('User-Shop')}}</th>
</tr>
</thead>
</table>
@ -44,7 +44,7 @@
{ data: 'txaction', name: 'txaction' },
{ data: 'total_shipping', name: 'shopping_orders.total_shipping' },
{ data: 'orders', name: 'shopping_user.orders' },
{ data: 'user_shop_id', name: 'user_shop_id' },
{ data: 'auth_user_shop', name: 'auth_user_shop' },
],
"bLengthChange": false,
"iDisplayLength": 100,

54
resources/views/admin/user/index.blade.php
View file

@ -23,6 +23,7 @@
<th>{{__('Account')}} (bis)</th>
<th>{{__('Shop')}} (bis)</th>
<th>{{__('Shop')}} ab</th>
<th>{{__('Test Modus')}}</th>
<th>{{__('delete')}}</th>
</tr>
</thead>
@ -60,10 +61,12 @@
</select>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
<button type="submit" class="btn btn-primary" name="save-admin" value="save-admin">{{__('save')}}</button>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="confirmed" checked>
<span class="custom-control-label">{{__('verified')}}</span>
</label>
</div>
</div>
</form>
</div>
@ -218,6 +221,42 @@
</div>
</div>
<!-- Modal test modus -->
<div class="modal fade" id="modals-test_mode">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_user_store') }}" method="post">
@csrf
<input type="hidden" class="form-control" name="id">
<div class="modal-header">
<h5 class="modal-title">{{__('User')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-row">
<div class="form-group col">
<label for="email" class="form-label">{{__('E-Mail')}}</label>
<input type="text" class="form-control" name="email" placeholder="{{__('E-Mail')}}" readonly>
</div>
</div>
<div class="form-group">
<p>Aktiviert den Testmodus beim den Zahlungsdiensten. Käufe werden als TEST markiert und die Mails gehen an devtest@mivita.care</p>
<p><a target="_blank" href="https://docs.payone.com/display/public/PLATFORM/Testdata">Zu den Testdaten für den Kauf von Payone</a>.</p>
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="test_mode" checked>
<span class="custom-control-label">{{__('Test Mode')}}</span>
</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
<button type="submit" class="btn btn-primary" name="save-test_mode" value="save-test_mode">{{__('save')}}</button>
</div>
</form>
</div>
</div>
<script>
$( document ).ready(function() {
$('#modals-admin').on('show.bs.modal', function (event) {
@ -258,6 +297,12 @@
$(this).find(".modal-body input[name='payment_shop']").val(button.data('payment_shop'));
});
$('#modals-test_mode').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='email']").val(button.data('email'));
$(this).find(".modal-body input[name='test_mode']").prop( "checked", button.data('test_mode'));
});
$('.datatables-users').dataTable({
@ -276,6 +321,7 @@
{ data: 'account', name: 'account' },
{ data: 'shop', name: 'shop' },
{ data: 'since', name: 'since' },
{ data: 'test_mode', name: 'test_mode' },
{ data: 'action_delete', orderable: false, searchable: false},
],
"bLengthChange": false,

7
resources/views/emails/checkout.blade.php
View file

@ -141,6 +141,13 @@
</table>
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
@if($mode === 'test')
<tr>
<td class="headline">
<b>##### TEST MODE ##### TEST MODE ##### TEST MODE #####</b>
</td>
</tr>
@endif
<tr>
<td class="headline">
<b>{{ $salutation }} </b>

7
resources/views/emails/checkout_status.blade.php
View file

@ -141,6 +141,13 @@
</table>
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
@if($mode === 'test')
<tr>
<td class="headline">
<b>##### TEST MODE ##### TEST MODE ##### TEST MODE #####</b>
</td>
</tr>
@endif
<tr>
<td class="headline">
<b>{{ $salutation }} </b>

2
resources/views/emails/info.blade.php
View file

@ -143,7 +143,7 @@
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
<tr>
<td class="headline">
<b>{{ $salutation }} </b>
<b>{{ $title }} </b>
</td>
</tr>
<tr>

4
resources/views/home.blade.php
View file

@ -170,8 +170,8 @@
</h5>
<div class="card-body">
@if($user->active == 1)
@if($user->payment_shop)
@if($user->isActiveAccount())
@if($user->isActiveShop())
@if($user->shop)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('open since')}}</strong> {{__('at')}} {{ $user->shop->getActiveDateFormat() }}</p>

6
resources/views/layouts/application.blade.php
View file

@ -39,7 +39,7 @@
<link rel="stylesheet" href="{{ asset('/vendor/libs/summernote/dist/summernote-bs4.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css?v=1') }}">
<!-- Layout helpers -->
@ -122,8 +122,8 @@
<script src="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.kickstart.min.js') }}"></script>
<script src="{{ asset('/vendor/libs/dropzone/dropzone.js')}}"></script>
<script src="{{ asset('/js/forms_file-upload.js') }}"></script>
<script src="{{ asset('/vendor/libs/dropzone/dropzone.js?v=1')}}"></script>
<script src="{{ asset('/js/forms_file-upload.js?v=1') }}"></script>

10
resources/views/user/form.blade.php
View file

@ -77,6 +77,11 @@
<label class="form-label" for="phone">{{ __('Phone') }}</label>
{{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 18)) }}
</div>
@if ($errors->has('phone'))
<span class="help-block">
<strong>{{ $errors->first('phone') }}</strong>
</span>
@endif
</div>
@ -92,6 +97,11 @@
<label class="form-label" for="mobil">{{ __('Mobile Phone') }}</label>
{{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 19)) }}
</div>
@if ($errors->has('mobil'))
<span class="help-block">
<strong>{{ $errors->first('mobil') }}</strong>
</span>
@endif
</div>
<hr>

31
resources/views/user/membership/index.blade.php
View file

@ -48,12 +48,26 @@
@endif
@endif
@include('user.membership._payment_order')
</div>
</div>
@else
{{-- no Shop - Upgrade --}}
@if($user->isActiveAccount() && !$user->isActiveShop())
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('MIVITA BUSINESS Paket')}} {{__('Upgrade')}}</h5>
<div class="card-body">
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
<h6 class="alert badge-{{$userHistoryUpgradeOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryUpgradeOrder->getStatusType())}}</h6>
@endif
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
@include('user.membership._upgrade')
</div>
</div>
@endif
{{-- upgrade downgrade next booking --}}
@if($user->payment_account)
<div class="card w-100 mb-4">
@ -66,17 +80,7 @@
</div>
@endif
{{-- no Shop - Upgrade --}}
@if($user->isActiveAccount() && !$user->isActiveShop())
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('MIVITA BUSINESS Paket')}} {{__('Upgrade')}}</h5>
<div class="card-body">
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
@include('user.membership._upgrade')
</div>
</div>
@endif
{{-- remove ABO Options --}}
@ -127,9 +131,6 @@
{{--
TODO
//cron sepa

12
resources/views/user/user_form.blade.php
View file

@ -98,7 +98,7 @@
{!! HTMLHelper::getContriesCodes($user->account->pre_phone_id) !!}
</select>
</div>
<div class="form-group col-md-8">
<div class="form-group col-md-8 {{ $errors->has('phone') ? 'has-error' : '' }}">
<label class="form-label" for="phone">{{ __('Phone') }}</label>
{{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 11)) }}
</div>
@ -110,14 +110,18 @@
{!! HTMLHelper::getContriesCodes($user->account->pre_mobil_id) !!}
</select>
</div>
<div class="form-group col-md-8">
<div class="form-group col-md-8 {{ $errors->has('mobil') ? 'has-error' : '' }}">
<label class="form-label" for="mobil">{{ __('Mobile Phone') }}</label>
{{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }}
</div>
<div class="form-group col-md-12">
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@if($errors->has('phone') || $errors->has('mobil'))
<div class="alert badge-danger block p-2">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@else
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@endif
</div>
</div>
@if(!isset($step))
<hr>

10
resources/views/user/wizard/_payment.blade.php
View file

@ -1,15 +1,5 @@
@if($user->shopping_orders->count())
@php
$last_shopping_order = $user->shopping_orders->last();
$last_shopping_payments = $last_shopping_order->shopping_payments->last();
@endphp
<div class="alert alert-secondary">
Es wurde eine Zahlung ausgeführt. Referenz: {{$last_shopping_payments->reference }}.
<br>Bitte warte die Zahlungs-Bestätiung per E-Mail.
</div>
@endif
{!! Form::open(['url' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">

3
resources/views/user/wizard/create.blade.php
View file

@ -100,6 +100,9 @@
</div>
<div id="smartwizard-3-step-4" class="card animated fadeIn">
<div class="card-body">
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
@endif
@include('user.wizard._payment')
</div>
</div>

1
resources/views/user/wizard/register.blade.php
View file

@ -249,7 +249,6 @@
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
// The setting up of the dropzone
init:function() {
this.on("removedfile", function(file) {
var _ele = $('.alert-danger');
_ele.fadeOut();

3
resources/views/user/wizard/register_payment.blade.php
View file

@ -35,6 +35,9 @@
<div class="mb-3">
<div id="smartwizard-3-step-1" class="card animated fadeIn">
<div class="card-body">
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
@endif
@include('user.wizard._payment')
</div>
</div>

4
resources/views/web/templates/checkout.blade.php
View file

@ -435,7 +435,9 @@
</div>
<div class="col-lg-5 col-sm-5">
@if($shopping_mode === 'test')
<strong>#### TEST MODE #### TEST MODE ####</strong>
@endif
<!-- PAYMENT METHOD -->
<fieldset class="box-border-shadow p-20">
<h4>Zahlungsart</h4>