+
-
-
-
@include('user.components.user_shop_image')
-
@else
diff --git a/resources/views/user/components/user_shop_on_site.blade.php b/resources/views/user/components/user_shop_on_site.blade.php
index 4047d6b..eba9f5f 100755
--- a/resources/views/user/components/user_shop_on_site.blade.php
+++ b/resources/views/user/components/user_shop_on_site.blade.php
@@ -23,18 +23,18 @@
-
-
diff --git a/resources/views/user/components/user_shop_image.blade.php b/resources/views/user/components/user_shop_image.blade.php
index 75c11d0..81c2d09 100755
--- a/resources/views/user/components/user_shop_image.blade.php
+++ b/resources/views/user/components/user_shop_image.blade.php
@@ -21,7 +21,7 @@
- @include('user.components.user_shop_on_site')
-
+
+
+ @include('user.components.user_shop_on_site')
+
@if(count($user->shop->on_sites) <= 5)
-
+
-
@@ -391,7 +391,15 @@
- zurück zum Warenkorb
+ @if(isset($order_reference))
+
+ zurück zum Shop
+
+ @else
+
+ zurück zum Warenkorb
+
+ @endif
@foreach($user->shop->on_sites as $image)
@endforeach
+
diff --git a/resources/views/user/components/user_shop_register.blade.php b/resources/views/user/components/user_shop_register.blade.php
index 8d5c577..a5c2e1e 100644
--- a/resources/views/user/components/user_shop_register.blade.php
+++ b/resources/views/user/components/user_shop_register.blade.php
@@ -40,9 +40,14 @@
@endif
+
+
@@ -374,7 +374,7 @@
-
+
{{__('shop_name_description')}}
-+
+ {{ Form::text('preview_user_shop_name', '', array('placeholder'=>__('Vorschau Shop-Internet Adresse'), 'class'=>'form-control', 'id'=>'preview_user_shop_name', 'readonly')) }}
+
+ Hier siehtst du eine Vorschau, wie Deine Shop-Internet Adresse lauten wird.
++
-
+
@@ -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;
}
}
diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php
index e3e50d2..1d4c0a1 100644
--- a/resources/views/user/edit.blade.php
+++ b/resources/views/user/edit.blade.php
@@ -22,8 +22,7 @@
{!! Form::open(['url' => route('user_edit'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
- @include('user.form')
-
+ @include('user.user_form')
{{ __('back') }}
diff --git a/resources/views/web/templates/checkout.blade.php b/resources/views/web/templates/checkout.blade.php
index 60f328e..ab9420c 100644
--- a/resources/views/web/templates/checkout.blade.php
+++ b/resources/views/web/templates/checkout.blade.php
@@ -224,7 +224,7 @@
-
+
diff --git a/routes/api.php b/routes/api.php
index c641ca5..ebbc2e5 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,6 +13,17 @@ use Illuminate\Http\Request;
|
*/
-Route::middleware('auth:api')->get('/user', function (Request $request) {
- return $request->user();
+//Route::post('login', 'API\UserController@login');
+//Route::post('register', 'API\UserController@register');
+
+
+
+
+
+Route::get('/payment/status', 'Api\PayoneController@paymentStatus')->name('api.payment_status');
+Route::post('/payment/status', 'Api\PayoneController@paymentStatus')->name('api.payment_status');
+ Route::group(['middleware' => 'auth:api'], function(){
+
});
+
+
diff --git a/routes/web.php b/routes/web.php
index 90ad6d7..f759e8c 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -51,6 +51,7 @@ Route::get('/shop/product/image/{slug}', function($slug = null)
})->name('shop_product_image');
+
//main site mivita
Route::domain(config('app.pre_url_main').config('app.domain'))->group(function () {
@@ -74,7 +75,7 @@ Route::domain(config('app.pre_url_main').config('app.domain'))->group(function (
});
-/* ROUTING FOR CRM mein.mivita / CMS*/
+/* ROUTING FOR CRM my.mivita / CMS*/
Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function () {
Auth::routes();
@@ -246,9 +247,6 @@ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function ()
Route::domain(config('app.checkout_url').config('app.domain'))->group(function () {
- Route::get('/payment/status', 'Web\CheckoutController@paymentStatus')->name('checkout.payment_status');
- Route::post('/payment/status', 'Web\CheckoutController@paymentStatus')->name('checkout.payment_status');
-
Route::group(['middleware' => ['checkout']], function() {
Route::get('/checkout/card/{identifier?}', 'Web\CheckoutController@checkout')->name('checkout.checkout_card');
@@ -281,80 +279,9 @@ Route::domain('{subdomain}.'.config('app.domain'))->group(function () {
Route::get('/card/remove/{rowId}', 'Web\CardController@removeCard')->name('user.card_remove');
Route::get('/card/delete', 'Web\CardController@deleteCard')->name('user.card_delete');
Route::get('/back/to/shop/{reference?}', 'Web\CardController@backToShop')->name('user.back_to_shop');
+ Route::get('/domain/check', 'Web\SiteController@domainCheck')->name('user.domain_check');
Route::get('/{site}/{subsite?}/{product_slug?}', 'Web\SiteController@site')->name('user.site');
});
-});
-
-
-
-
-
-
-
-
-/*
-
-//Route::get('/', 'HomeController@index')->name('/');
-
-/*Route::post('/register/data', 'HomeController@register')->name('register_data');
-Route::post('/user/check/mail', 'HomeController@checkMail')->name('user_check_mail');
-
-Route::get('/register/verify/{confirmationCode}', 'HomeController@verify')->name('register_verify');
-
-Route::get('/status/register', 'HomeController@statusRegister')->name('status_register');
-Route::get('/status/verify', 'HomeController@statusVerify')->name('status_verify');
-Route::get('/status/error', 'HomeController@statusError')->name('status_error');
-
-
-Route::get('/user/update_email_confirm/{token}', 'UpdateEmailController@activateMail')->name('user_update_email_confirm');
-*/
-
-
-
-
-
-/*Route::get('storage/{what}/{path}/{id}/{file_name}', function($what = null, $path = null, $id = null, $file_name = null)
-{
- $path = storage_path().'/app/'.$path.'/'.$id.'/images/'.$what.'/'.$file_name;
- if (file_exists($path)) {
- return Response::file($path);
- }
-});
-
-Route::get('storage/{user_id}/{file_name}', function($user_id = null, $file_name = null)
-{
- $path = storage_path().'/'.'app'.'/user/' . $user_id . '/verification/' . $file_name;
- if (file_exists($path)) {
- return Response::file($path);
- }
-});
-*/
-
-/*
-use App\Mail\MailResetPassword;
-
-Route::get('/send_test_email', function(){
-
- try {
- // Mail::to('kevin.adametz@me.com')->send(new MailResetPassword('asdasd', Auth::user()));
-
- Mail::raw('Sending emails with Mailgun and Laravel is easy!', function($message) {
- $message->to('kevin.adametz@me.com', 'Kevin Adametz');
- $message->subject('testing Networktrips');
- });
-
-
-
- } catch (\Exception $e) {
- dd($e->getMessage());
- }
-
- $fail = Mail::failures();
-
- if(!empty($fail)) throw new \Exception('Could not send message to '.$fail[0]);
-
- });
-
-*/
\ No newline at end of file
+});
\ No newline at end of file