diff --git a/.env b/.env
index 271cfa2..022d44b 100644
--- a/.env
+++ b/.env
@@ -48,7 +48,7 @@ MAIL_HOST=s182.goserver.host
MAIL_PORT=587
MAIL_USERNAME=web28p3
MAIL_PASSWORD=WeE2bmI9GjB7pDgi
-#MAIL_ENCRYPTION=SSL
+MAIL_ENCRYPTION=""
MAIL_FROM_ADDRESS=partner@gruene-seele.bio
MAIL_FROM_NAME="Partner GRÜNE SEELE Naturkosmetik"
diff --git a/app/Http/Controllers/AdminUserController.php b/app/Http/Controllers/AdminUserController.php
index 9e8d563..71d1ddb 100755
--- a/app/Http/Controllers/AdminUserController.php
+++ b/app/Http/Controllers/AdminUserController.php
@@ -64,6 +64,12 @@ class AdminUserController extends Controller
$data = Request::all();
$user = User::findOrFail($data['id']);
+ if(isset($data['user-delete'])){
+ if(isset($data['realy_delete_user'])){
+ return redirect(route('admin_user_delete', [$user->id]));
+ }
+ }
+
if(isset($data['save-admin'])){
$user->admin = $data['admin'];
SysLog::action('save-admin', 'admin_user', 3)
diff --git a/app/Http/Controllers/DataTableController.php b/app/Http/Controllers/DataTableController.php
index d1e1f71..ced9cd8 100644
--- a/app/Http/Controllers/DataTableController.php
+++ b/app/Http/Controllers/DataTableController.php
@@ -80,10 +80,12 @@ class DataTableController extends Controller
return $link.' '.$user->getPaymentMethodsShort().'';
})
- ->addColumn('action_delete', function (User $user) {
- return '
- ';
+ ->addColumn('action_login', function (User $user) {
+ return '';
})
+ ->addColumn('action_delete', function (User $user) {
+ return '';
+ })
->addColumn('test_mode', function (User $user) {
$link = '';
return $user->test_mode ? $link.'' : $link.'';
@@ -94,7 +96,7 @@ class DataTableController extends Controller
->orderColumn('active', 'active $1')
->orderColumn('shop', 'shop $1')
->orderColumn('admin', 'active $1')
- ->rawColumns(['id', 'admin', 'confirmed', 'active', 'account', 'shop', 'my_payment_methods', 'test_mode', 'action_delete'])
+ ->rawColumns(['id', 'admin', 'confirmed', 'active', 'account', 'shop', 'my_payment_methods', 'test_mode', 'action_login', 'action_delete'])
->make(true);
}
}
diff --git a/app/Http/Controllers/WizardController.php b/app/Http/Controllers/WizardController.php
index aaa8e7b..0c7989a 100755
--- a/app/Http/Controllers/WizardController.php
+++ b/app/Http/Controllers/WizardController.php
@@ -460,6 +460,7 @@ class WizardController extends Controller
$image = $product->images->first()->slug;
}
Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, $product->tax, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]);
+ Yard::instance('shopping')->setGlobalTaxRate(0);
//set onboarding products
if(Request::get('products_on_board')){
diff --git a/app/Services/Yard.php b/app/Services/Yard.php
index 4d12e56..39f4cb2 100644
--- a/app/Services/Yard.php
+++ b/app/Services/Yard.php
@@ -13,7 +13,18 @@ use Illuminate\Session\SessionManager;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Collection;
+/*
+0% MWST - prüfen CardItem - ob hier die TaxRate gesetzt wird!
+
+public function setTaxRate($taxRate)
+{
+ $this->taxRate = floatval($taxRate);
+
+ return $this;
+}
+
+*/
class Yard extends Cart
{
private $shipping_price = 0;
diff --git a/public/css/application.css b/public/css/application.css
index eb1a207..aa7890e 100644
--- a/public/css/application.css
+++ b/public/css/application.css
@@ -77,4 +77,8 @@ a[aria-expanded='true'] > .fa-caret-expand:before {
.no-line-break {
white-space: nowrap;
+}
+
+.spinner {
+ display: none;
}
\ No newline at end of file
diff --git a/public/css/mycolors.css b/public/css/mycolors.css
index a49757f..29500fd 100644
--- a/public/css/mycolors.css
+++ b/public/css/mycolors.css
@@ -99,4 +99,4 @@ a:hover {
}
[data-toggle="collapse"]:not(.collapsed) .if-collapsed {
display: none;
-}
\ No newline at end of file
+}
diff --git a/public/js/custom.js b/public/js/custom.js
index 8645e92..5181ba7 100644
--- a/public/js/custom.js
+++ b/public/js/custom.js
@@ -86,6 +86,10 @@ jQuery(document).ready(function() {
});
}
+ $('.form-prevent-multiple-submits').on('submit', function(){
+ $('.button-prevent-multiple-submits').attr('disabled', true);
+ $(this).find('.spinner').show();
+ });
});
function _scrollTo(to, offset) {
@@ -125,6 +129,11 @@ $(function () {
loadModalInner(this, data);
});
+ $('.form-prevent-multiple-submits').on('submit', function(){
+ $('.button-prevent-multiple-submits').attr('disabled', true);
+ $(this).find('.spinner').show();
+ });
+
}
function loadModalInner(self, data){
var url = data.route,
diff --git a/resources/views/admin/country/form.blade.php b/resources/views/admin/country/form.blade.php
index 1088766..57e705c 100755
--- a/resources/views/admin/country/form.blade.php
+++ b/resources/views/admin/country/form.blade.php
@@ -50,7 +50,6 @@
-