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

Payone, Shop, wizard

Browse source
This commit is contained in:
Kevin Adametz 2019-03-04 17:05:44 +01:00
parent 446bc4561b
commit 044a6bf253
28 changed files with 996 additions and 814 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,6 @@
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Shop nicht gebucht')}}</strong></p>
@endif
</div>
@endif

28
resources/views/user/components/user_shop_edit.blade.php
View file

@ -66,16 +66,18 @@
<div class="text-muted">{{ __('Status') }}</div>
<div class="text-right">
@if($user->shop->getSubdomainStatus())
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i> DNS</span>
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i> DNS</span><br>
@else
<span class="badge badge-pill badge-danger"><i class="far fa-times"> {{ __('not available') }} </i> DNS</span>
@endif
@if($user->shop->getSubdomainAvailable())
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i> HTTP</span>
@else
<span class="badge badge-pill badge-danger"><i class="far fa-times"> {{ __('not available') }} </i> HTTP</span>
@endif
@if($user->shop->getSubdomainAvailable())
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i> HTTP</span>
@else
<span class="badge badge-pill badge-danger"><i class="far fa-times"> {{ __('not available') }} </i> HTTP</span>
@endif
</div>
</li>
@ -105,22 +107,18 @@
</div>
<div class="row">
<div class="col-12">
<div class="col-md-4">
<div class="card mb-4">
@include('user.components.user_shop_image')
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card mb-4">
@include('user.components.user_shop_on_site')
</div>
<div class="col-md-8">
<div class="card mb-4">
@include('user.components.user_shop_on_site')
</div>
</div>
</div>
<!-- / image files -->

2
resources/views/user/components/user_shop_image.blade.php
View file

@ -21,7 +21,7 @@
<div class="text-center">
<img class="img-fluid" style="margin: 0 auto;" alt="" src="{{ url($user->shop->getImage()) }}">
<br><br>
<a href="{{ route('user_shop_delete_image') }}" class="btn btn-primary" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
<a href="{{ route('user_shop_delete_image') }}" class="btn btn-danger" onclick="return confirm('Bild wirklich löschen?');"><i class="fa fa-trash"></i></a>
</div>
</div>
@else

8
resources/views/user/components/user_shop_on_site.blade.php
View file

@ -23,18 +23,18 @@
<div class="row">
@if(count($user->shop->on_sites) <= 5)
<div class="col-md-8 col-sm-6">
<div class="col-md-6 col-sm-6">
<div class="row">
@foreach($user->shop->on_sites as $image)
<div class="col-6 col-md-4 text-center" style="border: 1px solid #eee;">
<img class="img-fluid" alt="" src="{{ route('user_shop_image', [$image->slug]) }}">
<br>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-danger mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');"><i class="fa fa-trash"></i></a>
</div>
@endforeach
</div>
</div>
<div class="col-md-4 col-sm-6">
<div class="col-md-6 col-sm-6">
<div class="card">
<div class="card-body">
<form method="POST" action="{{ route('user_shop_on_site_upload_image') }}" accept-charset="UTF-8" class="avatar" enctype="multipart/form-data">
@ -72,7 +72,7 @@
<div class="col-6 col-md-4 text-center" style="border: 1px solid #eee;">
<img class="img-fluid" alt="" src="{{ route('user_shop_image', [$image->slug]) }}">
<br>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-danger mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');"><i class="fa fa-trash"></i></a>
</div>
@endforeach
</div>

16
resources/views/user/components/user_shop_register.blade.php
View file

@ -40,9 +40,14 @@
</span>
@endif
<p class="mt-2">{{__('shop_name_description')}}</p>
</div>
<hr>
<div class="from-group mt-2 mb-2 ">
{{ Form::text('preview_user_shop_name', '', array('placeholder'=>__('Vorschau Shop-Internet Adresse'), 'class'=>'form-control', 'id'=>'preview_user_shop_name', 'readonly')) }}
</div>
<p class="mt-2">Hier siehtst du eine Vorschau, wie Deine Shop-Internet Adresse lauten wird.</p>
<hr>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input {{ $errors->has('user_shop_active') ? 'is-invalid' : '' }}" name="user_shop_active" id="user_shop_active" tabindex = "1">
@ -59,7 +64,7 @@
</div>
<hr>
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary" name="shop_submit" value="action">{{__('save and continue') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary" name="shop_submit" value="action">{{__('akzeptieren und weiter') }}</button>&nbsp;
</div>
@ -111,10 +116,13 @@
dataFilter: function(response) {
response = $.parseJSON(response);
console.log(response);
if (response.success === true) return true;
if (response.success === true){
$('#preview_user_shop_name').val(response.preview_user_shop_name);
return true;
}
else {
message = response.errors.user_shop_name;
$('#preview_user_shop_name').val('');
return false;
}
}

3
resources/views/user/edit.blade.php
View file

@ -22,8 +22,7 @@
{!! Form::open(['url' => route('user_edit'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
<input type="hidden" name="user_id" id="user_id" value="@if($user->id>0){{$user->id}}@else new @endif">
@include('user.form')
@include('user.user_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('home')}}" class="btn btn-default">{{ __('back') }}</a>

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

@ -224,7 +224,7 @@
<select id="billing_state" name="billing_state" class="form-control select2 required" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
<input type="hidden" name="billing_country_id" value="{{Yard::instance('shopping')->getShippingCountryId()}}">
<input type="hidden" name="billing_country_id" value="{{Yard::instance('shopping')->getShippingCountryCountryId()}}">
</div>
</div>
@ -374,7 +374,7 @@
<select id="shipping_state" name="shipping_state" class="form-control select2 required" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
<input type="hidden" name="shipping_country_id" value="{{Yard::instance('shopping')->getShippingCountryId()}}">
<input type="hidden" name="shipping_country_id" value="{{Yard::instance('shopping')->getShippingCountryCountryId()}}">
</div>
</div>
@ -391,7 +391,15 @@
</fieldset>
<!-- /SHIPPING -->
<a href="{{ Util::getUserShopBackUrl('/card/show') }}" class="btn btn-default btn-sm btn- size-15 mt-4"><i class="fa fa-chevron-left"></i> zurück zum Warenkorb</a>
@if(isset($order_reference))
<a href="{{ Util::getUserShopBackUrl($order_reference) }}" class="btn btn-default btn-sm btn- size-15 mt-4">
<i class="fa fa-chevron-left"></i> zurück zum Shop
</a>
@else
<a href="{{ Util::getUserCardBackUrl('/card/show') }}" class="btn btn-default btn-sm btn- size-15 mt-4">
<i class="fa fa-chevron-left"></i> zurück zum Warenkorb
</a>
@endif
</div>
<div class="col-lg-5 col-sm-5">