From 1953c97cd0af41a0a823ffab539d3af0519086e5 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Thu, 21 Feb 2019 21:38:36 +0100 Subject: [PATCH] final checkout and card --- .env | 10 +- .idea/workspace.xml | 924 +++++++++++------- .phpstorm.meta.php | 2 +- _ide_helper.php | 71 +- _ide_helper_models.php | 142 ++- app/Http/Controllers/Web/CardController.php | 63 +- .../Controllers/Web/CheckoutController.php | 73 +- .../Controllers/Web/ContactController.php | 2 +- app/Http/Controllers/Web/SiteController.php | 2 +- app/Http/Kernel.php | 1 + app/Http/Middleware/Checkout.php | 32 +- app/Http/Middleware/Subdomain.php | 3 +- app/Mail/MailContact.php | 2 +- app/Models/ShoppingInstance.php | 26 + app/Services/Util.php | 28 + app/Services/Yard.php | 95 +- config/app.php | 16 +- ...195012_create_shopping_instances_table.php | 46 + public/assets/css/custom-style.css | 532 ++++++++++ resources/lang/de/validation.php | 14 +- .../views/web/layouts/application.blade.php | 4 +- .../web/layouts/includes/header.blade.php | 60 -- resources/views/web/layouts/layout.blade.php | 11 - resources/views/web/templates/card.blade.php | 21 +- .../views/web/templates/checkout.blade.php | 651 ++++++------ .../views/web/templates/kontakt.blade.php | 2 +- .../web/templates/produkte-item.blade.php | 35 +- .../web/templates/produkte-show.blade.php | 45 +- .../web/user/layouts/application.blade.php | 18 +- .../user/layouts/includes/footer.blade.php | 61 +- .../user/layouts/includes/header.blade.php | 182 ++-- .../views/web/user/layouts/layout.blade.php | 13 - routes/web.php | 28 +- 33 files changed, 2131 insertions(+), 1084 deletions(-) create mode 100644 app/Models/ShoppingInstance.php create mode 100644 database/migrations/2019_02_21_195012_create_shopping_instances_table.php diff --git a/.env b/.env index 7d2288f..32f3c16 100644 --- a/.env +++ b/.env @@ -1,11 +1,12 @@ -APP_NAME="mivita.care" +APP_NAME=mivita.care APP_ENV=local APP_DEBUG=true APP_KEY=base64:HrWQ9AV3Zt2TU0iq1OeUUpTUaXwNUdh8xHmx7RXTif4= -APP_URL=http://mivita.local/ +APP_URL=https://mivita.local/ APP_DOMAIN=mivita.local -APP_PROTOCOL=http:// +APP_PROTOCOL=https:// APP_URL_MAIN= +APP_URL_CHECKOUT=checkout. #APP_URL_MAIN=dev. APP_URL_CRM=mein. @@ -22,6 +23,9 @@ DB_PASSWORD=KT32vQ7 #DB_USERNAME=d02c1ed2 #DB_PASSWORD=H7mdYuVTV6pNHDVu +PAYONE_URL = checkout.mivita.care +PAYONE_TS = checkout.mivita.care/transaction/status +PAYONE_KEY = Zjop5cvP2UeB7Qhy BROADCAST_DRIVER=log CACHE_DRIVER=file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1dd95e3..554193b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,39 +2,36 @@ - - - - - - - + + - + + + + + - - - - + + + + - - - + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - tax - instance - priceTax - instance( - confi - cartIt - form form> date birthdatepicker @@ -183,7 +293,17 @@ dele getRoles admin + card + count + put + get + setShippingCountry + Util + use Util + + $PROJECT_DIR$/app + @@ -217,60 +337,63 @@ + + + @@ -405,10 +528,10 @@ - @@ -416,7 +539,6 @@ - @@ -429,12 +551,6 @@ - - - - - - @@ -452,7 +568,16 @@ - + + + + + + + + + + @@ -464,13 +589,12 @@ - + - - + @@ -482,12 +606,6 @@ - - - - - - @@ -504,6 +622,22 @@ + + + + + + + + + + + + + + + + @@ -511,8 +645,19 @@ + - + + + + + + + + + + + @@ -523,6 +668,7 @@ - {!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountry()) !!} + {!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!} -
{{ Yard::instance('shopping')->shipping() }} € Versandkosten:
-
-
{{ Yard::instance('shopping')->subtotalWithShipping() }} € Summe ohne MwSt: @@ -222,27 +218,22 @@
{{ Yard::instance('shopping')->taxWithShipping() }} € - zzgl. {{ Yard::getTaxRate() }} % MwSt.: + zzgl. {{ Yard::getTaxRate() }} % MwSt:
-
- {{ Yard::instance('shopping')->totalWithShipping() }} € Gesamtsumme: - - - zur Kasse + zur Kasse +
+

Sie werden auf unseren checkout Server weitergeletet, die Verbindung ist mit SSL verschlüsselt.

@endif - - -

diff --git a/resources/views/web/templates/checkout.blade.php b/resources/views/web/templates/checkout.blade.php index 9d1b82e..8f82a48 100644 --- a/resources/views/web/templates/checkout.blade.php +++ b/resources/views/web/templates/checkout.blade.php @@ -12,6 +12,9 @@
@@ -47,98 +58,107 @@ - + + +
+ +
+ @endif
diff --git a/resources/views/web/user/layouts/layout.blade.php b/resources/views/web/user/layouts/layout.blade.php index d3184d9..ff5ad2a 100644 --- a/resources/views/web/user/layouts/layout.blade.php +++ b/resources/views/web/user/layouts/layout.blade.php @@ -1,23 +1,10 @@ @extends('web.user.layouts.application') @section('layout-content') - @include('web.user.layouts.includes.header') -
- - - @yield('content') - - - - @include('web.user.layouts.includes.footer') - -
- - @endsection diff --git a/routes/web.php b/routes/web.php index 0aa044f..89ac557 100755 --- a/routes/web.php +++ b/routes/web.php @@ -51,7 +51,7 @@ Route::get('/shop/product/image/{slug}', function($slug = null) })->name('shop_product_image'); -//main site +//main site mivita Route::domain(config('app.pre_url_main').config('app.domain'))->group(function () { Route::get('/datenschutz', 'HomeController@legalDataProtected')->name('datenschutz'); @@ -60,20 +60,21 @@ Route::domain(config('app.pre_url_main').config('app.domain'))->group(function ( Route::post('/kontakt', 'Web\ContactController@store')->name('contact_store'); Route::get('/', 'Web\SiteController@index')->name('/'); - Route::get('/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('base.card_add_get'); + + /* Route::get('/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('base.card_add_get'); Route::post('/card/add/{id}', 'Web\CardController@addToCardPost')->name('base.card_add_post'); Route::get('/card/show', 'Web\CardController@showCard')->name('base.card_show'); Route::get('/card/checkout', 'Web\CardController@checkoutCard')->name('base.card_checkout'); Route::post('/card/checkout_final', 'Web\CardController@checkoutFinalCard')->name('base.card_checkout_final'); Route::post('/card/update', 'Web\CardController@updateCard')->name('base.card_update'); Route::get('/card/remove/{rowId}', 'Web\CardController@removeCard')->name('base.card_remove'); - Route::get('/card/delete', 'Web\CardController@deleteCard')->name('base.card_delete'); + Route::get('/card/delete', 'Web\CardController@deleteCard')->name('base.card_delete');*/ Route::get('/{site}/{subsite?}/{product_slug?}', 'Web\SiteController@site')->name('base.site'); }); -/* ROUTING FOR CRM / CMS*/ +/* ROUTING FOR CRM mein.mivita / CMS*/ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function () { Auth::routes(); @@ -228,8 +229,22 @@ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function () }); +/* ROUTING the checkout.mivita ... */ + +Route::domain(config('app.checkout_url').config('app.domain'))->group(function () { + + Route::group(['middleware' => ['checkout']], function() { + + Route::get('/checkout/card/{identifier}', 'Web\CheckoutController@checkout')->name('checkout.checkout_card'); + Route::post('/checkout/card/final', 'Web\CheckoutController@checkoutFinal')->name('checkout.checkout_card_final'); + + Route::get('/transaction/status/', 'Web\CheckoutController@transactionStatus')->name('checkout.transaction_status'); + Route::post('/transaction/status/', 'Web\CheckoutController@transactionStatus')->name('checkout.transaction_status'); + }); +}); + +/* ROUTING the SUBDOMAINS user.mivita ... */ -/* ROUTING the SUBDOMAINS*/ Route::domain('{subdomain}.'.config('app.domain'))->group(function () { Route::group(['middleware' => ['subdomain']], function() { @@ -242,8 +257,7 @@ Route::domain('{subdomain}.'.config('app.domain'))->group(function () { Route::get('/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('user.card_add_get'); Route::post('/card/add/{id}', 'Web\CardController@addToCardPost')->name('user.card_add_post'); Route::get('/card/show', 'Web\CardController@showCard')->name('user.card_show'); - Route::get('/card/checkout', 'Web\CardController@checkoutCard')->name('user.card_checkout'); - Route::post('/card/checkout_final', 'Web\CardController@checkoutFinalCard')->name('user.card_checkout_final'); + Route::get('/card/checkout/server', 'Web\CardController@checkoutServer')->name('user.card_checkout_server'); Route::post('/card/update', 'Web\CardController@updateCard')->name('user.card_update'); Route::get('/card/remove/{rowId}', 'Web\CardController@removeCard')->name('user.card_remove'); Route::get('/card/delete', 'Web\CardController@deleteCard')->name('user.card_delete');