diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index df4a7f8c2..bda9f5495 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -3052,6 +3052,7 @@ section.review { border-bottom: 1px solid $border-color; border-top: 1px solid $border-color; height: 50px; + margin-top: 10px; .account-action { margin-top: 12px; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index bb15928cc..1d6fb3974 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -812,6 +812,15 @@ modal { } } +// responsive css for model +@media only screen and (max-width: 770px){ + .modal-container { + max-width: 80%; + left: 10%; + margin-left: 0px; + } +} + .label { background: #E7E7E7; @include border-radius(2px); diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php index 8ac656dd2..1cd456ecd 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php @@ -21,25 +21,25 @@ @if (isset($column['wrapper'])) @if (isset($column['closure']) && $column['closure'] == true) - {!! $column['wrapper']($record) !!} + {!! $column['wrapper']($record) !!} @else - {{ $column['wrapper']($record) }} + {{ $column['wrapper']($record) }} @endif @else @if($column['type'] == 'price') @if(isset($column['currencyCode'])) - {{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }} + {{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }} @else - {{ core()->formatBasePrice($record->{$columnIndex}) }} + {{ core()->formatBasePrice($record->{$columnIndex}) }} @endif @else - {{ $record->{$columnIndex} }} + {{ $record->{$columnIndex} }} @endif @endif @endforeach @if ($enableActions) - +
@foreach ($actions as $action) diff --git a/public/installer/AdminConfig.php b/public/installer/AdminConfig.php index fc9769197..00c0dae82 100755 --- a/public/installer/AdminConfig.php +++ b/public/installer/AdminConfig.php @@ -47,6 +47,7 @@ $data = array(); $data = explode(PHP_EOL,$str); $databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION']; + $key = $value = []; if ($data) { foreach ($data as $line) { $rowValues = explode('=', $line); diff --git a/public/installer/Migration.php b/public/installer/Migration.php index 410804344..d4b66728d 100755 --- a/public/installer/Migration.php +++ b/public/installer/Migration.php @@ -69,12 +69,12 @@
+
+
-
-
@@ -194,11 +194,11 @@ if (data['publish']) { $('#publish').append('
' + data['publish'] + '
'); } - if (data['storage']) { - $('#storage').append('
' + data['storage'] + '
'); + if (data['key']) { + $('#key').append('
' + data['key'] + '
'); } - if ((data['key_results'] == 0) && (data['seeder_results'] == 0) && (data['publish_results'] == 0) && (data['storage_results'] == 0)) { + if ((data['key_results'] == 0) && (data['seeder_results'] == 0) && (data['publish_results'] == 0)) { $('#continue').show(); $('#migrate-seed').hide(); $('#loader').hide(); @@ -207,6 +207,7 @@ } else { $('#migrate').show(); + $('#loader').hide(); $('#migrate-seed').show(); $('#migration-back').show(); if (data['migrate']) { @@ -231,11 +232,4 @@ }); }); - - - - - - - - + \ No newline at end of file diff --git a/public/installer/Seeder.php b/public/installer/Seeder.php index 6ad5137db..a476842a9 100755 --- a/public/installer/Seeder.php +++ b/public/installer/Seeder.php @@ -1,17 +1,15 @@ &1'; $seeder = 'cd ../.. && php artisan db:seed 2>&1'; -$storage = 'cd ../.. && php artisan storage:link 2>&1'; $publish = 'cd ../.. && php artisan vendor:publish 2>&1'; $key_output = exec($key, $data['key'], $data['key_results']); $seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']); -$storage_output = exec($storage, $data['storage'], $data['storage_results']); $publish = exec($publish, $data['publish'], $data['publish_results']); // return a response diff --git a/public/installer/index.php b/public/installer/index.php index fe60196a5..3d7dd418a 100755 --- a/public/installer/index.php +++ b/public/installer/index.php @@ -18,6 +18,7 @@ $data = explode(PHP_EOL,$str); $databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION']; + $key = $value = []; if ($data) { foreach ($data as $line) { $rowValues = explode('=', $line); @@ -82,6 +83,8 @@ echo $requirement->render(); echo $permission->render(); echo $welcome->render(); + + $storage_output = exec('cd ../.. && php artisan storage:link 2>&1'); } else { // getting url $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";