gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main system

Browse source
This commit is contained in:
Kevin Adametz 2021-01-15 18:16:31 +01:00
parent 0baac018a2
commit a96d7d5c77
115 changed files with 4589 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/views/admin/customer/_edit.blade.php
View file

@ -247,7 +247,7 @@
<div class="alert alert-warning mt-3" id="show_has_buyed" style="display: @if($shopping_user->has_buyed) block @else none @endif;">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="subscribed" id="subscribed" @if($shopping_user->subscribed) checked="checked" @endif >
<span class="custom-control-label">Für Newsletter abonniert. Es ist Dir bzw. MIVITA erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat.
<span class="custom-control-label">Für Newsletter abonniert. Es ist Dir bzw. gruene-seele.bio erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat.
Sollte der Kunde explizit mitgeteilt haben, dass er keinen Newsletter möchte, dann bitte unbedingt das Häkchen entfernen.</span>
</label>
</div>

2
resources/views/admin/lead/m_register_data.blade.php
View file

@ -31,7 +31,7 @@
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong>: {{ $user->getActiveDateFormat() }}</p>
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">MIVITA_Beratervertrag.pdf</a>
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">Beratervertrag.pdf</a>
@endforeach
@endif
@else

118
resources/views/admin/sales/_detail.blade.php
View file

@ -48,8 +48,9 @@
{{$shopping_order->getFormattedTotalShipping()}} &euro;
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Points gesamt</div>
{{-- <div class="text-muted small">Points gesamt</div>
{{ $shopping_order->points }}
--}}
</div>
</div>
</div>
@ -296,7 +297,6 @@
}
</style>
@if($shopping_order->shopping_user->is_from !== 'homeparty')
<div class="table-responsive">
<table class="table table-product m-0" style="">
@ -330,7 +330,7 @@
<small>
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
{{-- <span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }} --}}
</small>
</div>
@endif
@ -402,105 +402,6 @@
</tfoot>
</table>
</div>
@else
@if($shopping_order->homeparty)
<style>
.table-small {
font-size: 0.9em;
width: auto;
}
.table-small td {
padding: 0.225rem 1rem 0.225rem 0;
}
.btn-md-extra {
padding: 0.3rem 0.6rem;
font-size: 0.8rem;
line-height: 1.5;
border-radius: 0.25rem;
}
.md-btn-extra {
width: calc(1.7rem + 2px) !important;
line-height: 1.5rem;
}
.form-control.input-extra {
padding: 0.28rem 0.6rem;
font-size: 0.8rem;
font-weight: 500;
min-height: calc(1.8rem + 2px);
height: calc(1.8rem + 2px);
width: 44px;
}
.input-group-min-w {
min-width: 102px;
}
.img-extra {
min-width:55px;
max-height: 120px;
}
.table td.border-top {
border: none;
border-top: 1px solid #ccccdb;
}
.table td {
border: none;
}
.table th {
border: none;
border-bottom: 1px solid #c3c3d2;
}
@media (max-width: 767px) {
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
padding-left: 0.6rem !important;
}
.img-extra {
min-width:35px;
max-height: 160px;
}
}
.table .foot-small td {
padding: 0.225rem 0.625rem;
}
.table .text-body {
font-size: 0.9em;
}
.table .options a.auto-delete-product {
font-size: 0.7em;
font-weight: bold;
text-transform: uppercase;
}
.table .min-width-80 {
min-width: 160px;
}
</style>
@php($homeparty = $shopping_order->homeparty)
@if($homeparty->homeparty_host)
<p><strong>Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong></p>
@include('admin.sales._detail_homparty', ['homeparty'=>$shopping_order->homeparty, 'homeparty_guest' => $homeparty->homeparty_host])
@endif
@if($homeparty->homeparty_guests)
@php($g_count = 1)
@foreach($homeparty->homeparty_guests as $homeparty_guest)
<hr>
<p><strong>Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong></p>
@include('admin.sales._detail_homparty', ['homeparty'=>$shopping_order->homeparty, 'homeparty_guest' => $homeparty_guest])
@endforeach
@endif
<hr>
@include('admin.sales._detail_homparty_total', ['homeparty' => $homeparty])
@endif
@endif
</div>
<hr class="m-0">
@ -531,7 +432,7 @@
<hr class="m-0">
@endif
<!-- / Payment -->
<div class="card-body">
<h6 class="small font-weight-semibold">
Zahlung
@ -557,7 +458,7 @@
<td>{{$shopping_payment->getPaymentType()}}</td>
<td>{{$shopping_payment->getPaymentAmount()}}</td>
<td>
@if($isAdmin && $shopping_payment->clearingtype === 'fnc' && $shopping_payment->onlinebanktransfertype === 'MIV')
@if($isAdmin && ($shopping_payment->clearingtype === 'fnc' || $shopping_payment->clearingtype === 'vor'))
<button type="button" class="btn btn-sm btn-{{ \App\Services\Payment::getFormattedTxactionColor($shopping_payment->txaction)}}" data-toggle="modal" data-target="#modals-txaction"
data-id="{{ $shopping_order->id }}"
data-payment_id="{{ $shopping_payment->id }}"
@ -620,7 +521,6 @@
</div>
@if($isAdmin)
<!-- Modal template -->
<div class="modal fade" id="modals-shipped">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
@ -648,8 +548,6 @@
</div>
</div>
<!-- Modal template -->
<div class="modal fade" id="modals-txaction">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
@ -660,13 +558,13 @@
<input type="hidden" name="back" value="{{url()->current()}}">
<div class="modal-header">
<h5 class="modal-title">{{__('Bestellung')}} {{__('Rechnung')}} </h5>
<h5 class="modal-title">{{__('Bestellung')}} {{__('Zahlung')}} </h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-group col-sm-12">
<label class="form-label" for="txaction">{{ __('Rechnung') }}</label>
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'invoice_paid', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
<label class="form-label" for="txaction">{{ __('Zahlung') }}</label>
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'open', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
</div>
</div>

50
resources/views/admin/settings/index.blade.php Executable file
View file

@ -0,0 +1,50 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Einstellungen') }}
</h4>
{!! Form::open(['url' => route('admin_setting_store'), 'class' => 'form-horizontal']) !!}
<div class="card mb-2">
<div class="card-body">
<h4>Vorkasse Infos</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('Kontoinhaber') }}*</label>
{{ Form::text('settings[prepayment-account-owner][val]', \App\Models\Setting::getContentBySlug('prepayment-account-owner'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-account-owner][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('IBAN') }}*</label>
{{ Form::text('settings[prepayment-iban][val]', \App\Models\Setting::getContentBySlug('prepayment-iban'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-iban][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('BIC') }}*</label>
{{ Form::text('settings[prepayment-bic][val]', \App\Models\Setting::getContentBySlug('prepayment-bic'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-bic][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('Bank') }}*</label>
{{ Form::text('settings[prepayment-bank][val]', \App\Models\Setting::getContentBySlug('prepayment-bank'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-bank][type]', 'text') }}
</div>
{{--
<div class="form-group col-sm-12">
{{ Form::textarea('settings[prepayment-info][val]', \App\Models\Setting::getContentBySlug('prepayment-info'), array('placeholder'=>__('Inhalt zur Vorkasse'), 'class'=>'form-control summernote-small', 'rows'=>10)) }}
{{ Form::hidden('settings[prepayment-info][type]', 'full_text') }}
</div>
--}}
</div>
<button type="submit" name="action" value="save_prepayment" class="btn btn-primary btn-sm mb-2"><i class="ion ion-ios-save"></i> speichern</button>
</div>
</div>
{!! Form::close() !!}
@endsection

21
resources/views/admin/shipping/edit.blade.php
View file

@ -69,8 +69,7 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Kunden Preis')}}</th>
<th>{{__('Kompensation Preis')}}</th>
<th>{{__('Anzahl KP')}}</th>
<th>{{__('Tax')}}</th>
<th>{{__('Preis von - bis')}}</th>
<th>{{__('Gewicht von - bis')}}</th>
@ -97,8 +96,6 @@
</button>
</td>
<td>{{ $price->getFormattedPrice() }}</td>
<td>{{ $price->getFormattedPriceComp() }}</td>
<td>{{ $price->num_comp }}</td>
<td>{{ $price->getFormattedTaxRate() }}</td>
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
@ -112,8 +109,6 @@
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
data-id="new"
data-price=""
data-price_comp=""
data-num_comp=""
data-tax_rate=""
data-factor="1"
data-total_from=""
@ -146,23 +141,13 @@
<label for="price" class="form-label">{{__('Kunden Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price" placeholder="{{__('Preis in Euro')}}" required>
</div>
<div class="form-group col-6">
<label for="price_comp" class="form-label">{{__('Kompensation Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price_comp" placeholder="{{__('Preis in Euro')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="tax_rate" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax_rate" placeholder="{{__('Tax in %')}}">
</div>
<div class="form-group col-6">
<label for="num_comp" class="form-label">{{__('Anzahl Kompensationsprodukte')}}*</label>
<input type="text" class="form-control" name="num_comp" placeholder="{{__('Anzahl Kompensationsprodukte')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="total_from" class="form-label">{{__('von Preis')}}</label>
@ -270,8 +255,6 @@
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='price']").val(button.data('price'));
$(this).find(".modal-body input[name='price_comp']").val(button.data('price_comp'));
$(this).find(".modal-body input[name='num_comp']").val(button.data('num_comp'));
$(this).find(".modal-body input[name='tax_rate']").val(button.data('tax_rate'));
$(this).find(".modal-body input[name='factor']").val(button.data('factor'));
$(this).find(".modal-body input[name='total_from']").val(button.data('total_from'));