From 8ebdacec98298d7e0e3f273efdf8d00f2abe9603 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Sat, 23 Nov 2019 15:02:41 +0100 Subject: [PATCH] 23.11 Upload to live --- .env | 6 +- .idea/mivita.care.iml | 10 +- .idea/php.xml | 10 +- .idea/workspace.xml | 837 +-- .phpstorm.meta.php | 157 +- _ide_helper.php | 5544 ++++++++++------- _ide_helper_models.php | 111 +- app/Http/Controllers/Api/KasController.php | 12 +- app/Http/Controllers/Api/KasSLLController.php | 350 ++ app/Http/Controllers/AttributeController.php | 2 - app/Http/Controllers/CategoryController.php | 151 +- app/Http/Controllers/Pay/PayoneController.php | 3 +- app/Http/Controllers/ProductController.php | 21 +- app/Http/Controllers/SitesController.php | 148 + .../Controllers/Sys/AdminToolsController.php | 87 + app/Http/Controllers/UserShopController.php | 4 +- app/Http/Controllers/Web/CardController.php | 6 +- .../Controllers/Web/CheckoutController.php | 4 +- app/Http/Controllers/Web/SiteController.php | 17 +- app/Http/Kernel.php | 1 + app/Http/Middleware/Checkout.php | 4 +- app/Http/Middleware/Subdomain.php | 23 +- app/Http/Middleware/SysAdmin.php | 26 + app/Models/Attribute.php | 1 + app/Models/Category.php | 30 +- app/Models/IqImage.php | 75 + app/Models/IqSite.php | 75 + app/Models/PaymentTransaction.php | 37 + app/Models/Product.php | 15 +- app/Models/Shipping.php | 26 + app/Models/ShippingCountry.php | 20 + app/Models/ShippingPrice.php | 31 + app/Models/ShoppingInstance.php | 25 + app/Models/ShoppingOrder.php | 48 + app/Models/ShoppingOrderItem.php | 28 + app/Models/ShoppingPayment.php | 35 + app/Models/ShoppingUser.php | 66 + app/Models/UserAccount.php | 74 + app/Models/UserShop.php | 110 +- app/Models/UserShopOnSite.php | 30 + app/Models/UserUpdateEmail.php | 8 + app/Providers/RouteServiceProvider.php | 2 +- app/Services/HTMLHelper.php | 21 + app/Services/Util.php | 10 +- app/User.php | 22 + composer.lock | 1812 ++++-- config/app.php | 6 +- ...18_10_21_163950_create_iq_images_table.php | 42 + ...8_10_21_163959_create_categories_table.php | 10 +- ..._21_164007_create_product_images_table.php | 2 + ...019_10_10_163950_create_iq_sites_table.php | 49 + public/.htaccess | 2 + public/assets/css/custom-style.css | 32 + resources/views/admin/category/edit.blade.php | 45 + resources/views/admin/category/form.blade.php | 67 + .../views/admin/category/images.blade.php | 93 + .../views/admin/category/index.blade.php | 103 +- resources/views/admin/product/form.blade.php | 22 +- .../views/admin/product/images.blade.php | 20 +- resources/views/admin/site/edit.blade.php | 41 + resources/views/admin/site/form.blade.php | 46 + resources/views/admin/site/images.blade.php | 93 + resources/views/emails/auth.blade.php | 5 +- resources/views/emails/checkout.blade.php | 5 +- .../views/emails/checkout_status.blade.php | 5 +- resources/views/emails/contact.blade.php | 5 +- .../layouts/includes/layout-sidenav.blade.php | 44 +- resources/views/sys/admin/index.blade.php | 50 + .../user/components/user_shop_edit.blade.php | 15 +- .../views/web/layouts/application.blade.php | 2 +- .../views/web/templates/_categories.blade.php | 9 +- resources/views/web/templates/card.blade.php | 13 +- .../web/templates/produkte-item.blade.php | 73 +- .../web/templates/produkte-show.blade.php | 46 +- .../views/web/templates/produkte.blade.php | 20 +- .../web/user/layouts/application.blade.php | 2 +- .../user/layouts/includes/header.blade.php | 2 +- resources/views/web/user/start.blade.php | 17 +- routes/web.php | 136 +- vendor.zip | Bin 0 -> 17894556 bytes 80 files changed, 7320 insertions(+), 3937 deletions(-) create mode 100755 app/Http/Controllers/Api/KasSLLController.php create mode 100755 app/Http/Controllers/SitesController.php create mode 100755 app/Http/Controllers/Sys/AdminToolsController.php create mode 100755 app/Http/Middleware/SysAdmin.php create mode 100644 app/Models/IqImage.php create mode 100644 app/Models/IqSite.php create mode 100644 database/migrations/2018_10_21_163950_create_iq_images_table.php create mode 100644 database/migrations/2019_10_10_163950_create_iq_sites_table.php create mode 100755 resources/views/admin/category/edit.blade.php create mode 100755 resources/views/admin/category/form.blade.php create mode 100755 resources/views/admin/category/images.blade.php create mode 100755 resources/views/admin/site/edit.blade.php create mode 100755 resources/views/admin/site/form.blade.php create mode 100755 resources/views/admin/site/images.blade.php create mode 100644 resources/views/sys/admin/index.blade.php create mode 100644 vendor.zip diff --git a/.env b/.env index 9c7ed0a..039e4ea 100644 --- a/.env +++ b/.env @@ -3,8 +3,10 @@ APP_ENV=local APP_DEBUG=true APP_KEY=base64:HrWQ9AV3Zt2TU0iq1OeUUpTUaXwNUdh8xHmx7RXTif4= APP_URL=https://mivita.local/ -APP_DOMAIN=mivita.local -APP_PROTOCOL=http:// +APP_DOMAIN=mivita +APP_TLD_CARE=.local +APP_TLD_SHOP=.lshop +APP_PROTOCOL=https:// APP_URL_MAIN= APP_URL_CHECKOUT=checkout. #APP_URL_MAIN=dev. diff --git a/.idea/mivita.care.iml b/.idea/mivita.care.iml index 2f0edf4..f1fcdb1 100644 --- a/.idea/mivita.care.iml +++ b/.idea/mivita.care.iml @@ -34,6 +34,7 @@ + @@ -82,22 +83,29 @@ - + + + + + + + + diff --git a/.idea/php.xml b/.idea/php.xml index 2c12eee..1f86948 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -100,9 +100,17 @@ - + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2a195ba..2746dfc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,84 @@ + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - log - same_as_billing - select - back_to_shop - secu - checkUserShopName - shop_name_description - shop_contact_help - user_shop_name_check - ok - billing_cou - mail - MailVerifyContact - Dear customer - Dear Customer you will receive - For further - reset - jackon - trans - tra - checkout_subject - transmitted_data - data_protected - data - data_prote - data_pro - birthday - datepicker-birthday - datepicker - Mail:: - - - - - - $PROJECT_DIR$/app/Http/Controllers - $PROJECT_DIR$/database/migrations - $PROJECT_DIR$/resources/views/user - $PROJECT_DIR$/resources/views/web - $PROJECT_DIR$/resources/views - $PROJECT_DIR$/resources - $PROJECT_DIR$/app - $PROJECT_DIR$/app/Http - - @@ -144,63 +126,6 @@ - - - @@ -304,199 +229,28 @@ - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+   + {{ __('back') }} +
+ + @include('admin.category.form') + +
+   + {{ __('back') }} +
+ + {!! Form::close() !!} + + + @include('admin.category.images') + + +@endsection diff --git a/resources/views/admin/category/form.blade.php b/resources/views/admin/category/form.blade.php new file mode 100755 index 0000000..c80cb62 --- /dev/null +++ b/resources/views/admin/category/form.blade.php @@ -0,0 +1,67 @@ + +
+ +
+ {{ __('Kategorie') }} + +
+ +
+ +
+
+ + + {{ Form::text('name', $category->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }} +
+
+ +
+
+ + {{ Form::text('headline', $category->headline, array('placeholder'=>__('Produktwelt'), 'class'=>'form-control', 'id'=>'name', 'required')) }} +
+
+ +
+
+ + +
+
+ + {{ Form::text('pos', $category->pos, array('placeholder'=>__('pos'), 'class'=>'form-control', 'id'=>'pos')) }} +
+
+ +
+
+ + +
+
+ {{ __('Ãœbersetzungen') }} +
+
+ @foreach($trans as $lang) + @if($lang != 'de') +
+
+ + {{ Form::text('trans_name['.$lang.']', $category->getTrans('name', $lang), array('class'=>'form-control', 'id'=>'trans_name_'.$lang)) }} +
+
+ + {{ Form::text('trans_headline['.$lang.']', $category->getTrans('headline', $lang), array('class'=>'form-control', 'id'=>'trans_headline_'.$lang)) }} +
+
+ @endif + @endforeach +
+
+ diff --git a/resources/views/admin/category/images.blade.php b/resources/views/admin/category/images.blade.php new file mode 100755 index 0000000..c4428b4 --- /dev/null +++ b/resources/views/admin/category/images.blade.php @@ -0,0 +1,93 @@ + + + + +
+ +
+ {{ __('Headline Bild') }} + +
+ + +
+ + @if($category->id>0) + + +
+ +
+

Bild wird rechts hinter die Headline gesetzt und automatisch auf eine Höhe von 60 Pixel skaliert.

+
+
+ +
+ @if($category->headline_image_id) +
+ +
+ Bild löschen + @if($category->iq_image->active) + + @else + + @endif +
+ @endif +
+
+
+ + @if(!$category->headline_image_id) +
+
+
+ @csrf + +
+
+ +
+ +
+ +
+
+
+
+ @else +

Nur ein Bild möglich, vor neuem Upload Bild löschen

+ @endif +
+
+ @else +

Kategorie erst anlegen

+ + + @endif + + +
+
diff --git a/resources/views/admin/category/index.blade.php b/resources/views/admin/category/index.blade.php index c0edc30..d3dbd58 100755 --- a/resources/views/admin/category/index.blade.php +++ b/resources/views/admin/category/index.blade.php @@ -12,7 +12,7 @@   {{__('Pos')}} {{__('Hauptkategorie')}} - {{__('Unterkategorie')}} + {{__('Headline')}} {{__('Translate') }} {{__('Status')}} @@ -22,20 +22,15 @@ @foreach($values as $value) - + {{ $value->pos }} @if($value->parent) {{ $value->parent->name }} @else {{ $value->name }} @endif @if($value->parent) {{ $value->name }} @else - @endif - {{ $value->getTranNames() }} + {{ $value->headline }} + @if($value->active) @else@endif @@ -44,102 +39,22 @@
- + + {{__('Neue Kategorie erstellen')}} +
- - - - - diff --git a/resources/views/web/templates/_categories.blade.php b/resources/views/web/templates/_categories.blade.php index 0bed069..b37ef41 100644 --- a/resources/views/web/templates/_categories.blade.php +++ b/resources/views/web/templates/_categories.blade.php @@ -1,14 +1,10 @@ -
- +

Kategorien

- - -
diff --git a/resources/views/web/templates/card.blade.php b/resources/views/web/templates/card.blade.php index c18cb5d..781dab8 100644 --- a/resources/views/web/templates/card.blade.php +++ b/resources/views/web/templates/card.blade.php @@ -77,6 +77,7 @@ .cartContent .yard .total_price { padding-top: 10px; } + } @media only screen and (min-width: 992px) { .cartContent .yard .total_price { @@ -119,7 +120,7 @@ @if(Yard::instance('shopping')->content()->count()) - {!! Form::open(['url' => route(Util::getPostRoute().'card_update', Util::addRoute()), 'class' => 'cartContent clearfix', 'id'=>'']) !!} + {!! Form::open(['url' => url(Util::getPostRoute().'card/update'), 'class' => 'cartContent clearfix', 'id'=>'']) !!}
@@ -148,7 +149,7 @@ {{ $row->name }} Lieferzeit: 1-3 Werktage - +
{{ $row->subtotal() }} €
× {{ $row->price() }} €
@@ -157,8 +158,8 @@ @endforeach
- Warenkorb löschen - + Warenkorb löschen +
@@ -199,7 +200,7 @@
Versandland:
-
+ @@ -225,7 +226,7 @@ {{ Yard::instance('shopping')->totalWithShipping() }} € Gesamtsumme: - zur Kasse + zur Kasse

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

diff --git a/resources/views/web/templates/produkte-item.blade.php b/resources/views/web/templates/produkte-item.blade.php index 26230a9..6c7ea70 100644 --- a/resources/views/web/templates/produkte-item.blade.php +++ b/resources/views/web/templates/produkte-item.blade.php @@ -1,5 +1,11 @@ - +
@@ -7,20 +13,22 @@ @php ($set = 'first') - @foreach($product->images as $image) - @if($image->slug) - @if($set == 'hover') - {{ $product->getLang('name') }} - @php($set = 'done') - @endif + @foreach($product->imagesActive as $image) + @if($image->active) + @if($image->slug) + @if($set == 'hover') + + @php($set = 'done') + @endif - @if($set == 'first') - {{ $product->getLang('name') }} - @php($set = 'hover') + @if($set == 'first') + {{ $product->getLang('name') }} + @php($set = 'hover') + @endif @endif @endif @endforeach @@ -30,26 +38,30 @@ @if($user_shop)
-

{{ $product->getLang('name') }}

- +

{{ $product->getLang('name') }}

- + @if($product->price_old > 0) +
+ {{ $product->getFormattedPriceOld() }} € + {{ $product->getFormattedPrice() }} € +
+ @else +
+ {{ $product->getFormattedPrice() }} € +
+ @endif -
- {{ $product->getFormattedPrice() }} € -
+
- -
@else +
+

{{ $product->getLang('name') }}

+ + +
+
+
+ +
+
- {{ $product->getLang('name') }} + zum Produkt
@endif diff --git a/resources/views/web/templates/produkte-show.blade.php b/resources/views/web/templates/produkte-show.blade.php index 73046e8..66d4620 100644 --- a/resources/views/web/templates/produkte-show.blade.php +++ b/resources/views/web/templates/produkte-show.blade.php @@ -26,7 +26,7 @@ font-size: 16px; } -
@@ -37,30 +37,31 @@
-
- -
+
+ @include('web.templates._categories') +
+ +
- @if($product->images->count()) - -
+ @if($product->imagesActive->count()) + - - -
- @include('web.templates._categories') -
- +
diff --git a/resources/views/web/templates/produkte.blade.php b/resources/views/web/templates/produkte.blade.php index 501d9e4..25afe0a 100644 --- a/resources/views/web/templates/produkte.blade.php +++ b/resources/views/web/templates/produkte.blade.php @@ -3,7 +3,7 @@ @section('content') -
@@ -46,10 +46,12 @@
- -
-

Produktwelt

+
+ @include('web.templates._categories') +
+
+

{{$headline}} @if($headline_image) @endif

    @foreach($products as $product) @@ -59,18 +61,8 @@ @endforeach
-
- - - -
- @include('web.templates._categories') -
- -
-
diff --git a/resources/views/web/user/layouts/application.blade.php b/resources/views/web/user/layouts/application.blade.php index 30d6b31..cecedcb 100644 --- a/resources/views/web/user/layouts/application.blade.php +++ b/resources/views/web/user/layouts/application.blade.php @@ -19,7 +19,7 @@ - + diff --git a/resources/views/web/user/layouts/includes/header.blade.php b/resources/views/web/user/layouts/includes/header.blade.php index 3875b21..1b7d64d 100644 --- a/resources/views/web/user/layouts/includes/header.blade.php +++ b/resources/views/web/user/layouts/includes/header.blade.php @@ -127,7 +127,7 @@
inkl. MwSt. zzgl. Versandkosten
- zum Warenkorb + zum Warenkorb schließen diff --git a/resources/views/web/user/start.blade.php b/resources/views/web/user/start.blade.php index 11f47be..6268513 100644 --- a/resources/views/web/user/start.blade.php +++ b/resources/views/web/user/start.blade.php @@ -102,14 +102,15 @@
-

Produktwelt

-

MIVITA ist ein Unternehmen mit Standort in Deutschland, das innovative und umweltfreundliche - sowie hochwertige Produkte vertreibt. Seit seinem Markteintritt bekennt sich das MIVITA Unternehmen zu einem - Werteverständnis, bei dem die Zufriedenheit der Kunden, wie auch die Verantwortung für die Umwelt im Fokus - stehen.

+

{{$site->headline}}

+

{{$site->copy}}

+ + @if($site->hasImage()) + + @endif