merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #944 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-05-24 17:18:17 +05:30 committed by GitHub
parent 8323f3d783 b8561d4d5e
commit d7c2ef3e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/Webkul/Product/src/Database/Migrations/2019_05_23_113407_add_remaining_column_in_product_flat_table.php
View File

@ -14,13 +14,27 @@ class AddRemainingColumnInProductFlatTable extends Migration
public function up()
{
Schema::table('product_flat', function (Blueprint $table) {
if (! Schema::hasColumn('product_flat', 'short_description')) {
$table->text('short_description')->nullable();
}
if (! Schema::hasColumn('product_flat', 'meta_title')) {
$table->text('meta_title')->nullable();
}
if (! Schema::hasColumn('product_flat', 'meta_keywords')) {
$table->text('meta_keywords')->nullable();
}
if (! Schema::hasColumn('product_flat', 'meta_description')) {
$table->text('meta_description')->nullable();
}
if (! Schema::hasColumn('product_flat', 'width')) {
$table->decimal('width', 12, 4)->nullable();
}
if (! Schema::hasColumn('product_flat', 'height')) {
$table->decimal('height', 12, 4)->nullable();
}
if (! Schema::hasColumn('product_flat', 'depth')) {
$table->decimal('depth', 12, 4)->nullable();
}
});
}
@ -32,13 +46,7 @@ class AddRemainingColumnInProductFlatTable extends Migration
public function down()
{
Schema::table('product_flat', function (Blueprint $table) {
$table->dropColumn('short_description');
$table->dropColumn('meta_title');
$table->dropColumn('meta_keywords');
$table->dropColumn('meta_description');
$table->dropColumn('width', 12, 4);
$table->dropColumn('height', 12, 4);
$table->dropColumn('depth', 12, 4);
});
}
}

5
packages/Webkul/User/src/Http/Controllers/SessionController.php
View File

@ -5,6 +5,7 @@ namespace Webkul\User\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Auth;
use File;
/**
* Admin user session controller
@ -42,6 +43,10 @@ class SessionController extends Controller
*/
public function create()
{
if (File::exists(public_path('installer'))) {
File::deleteDirectory(public_path('installer'));
}
if (auth()->guard('admin')->check()) {
return redirect()->route('admin.dashboard.index');
} else {

9
public/index.php
View File

@ -1,6 +1,15 @@
<?php
$location = str_replace('\\', '/', getcwd());
$currentLocation = explode("/", $location);
$desiredLocation = implode("/", $currentLocation);
$installFile = $desiredLocation . '/installer' . '/install.php';
if (file_exists($installFile)) {
$install = require __DIR__.'/installer/install.php';
} else {
$install = null;
}
if (! is_null($install)) {