alireza_hassani
/
willaengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
pull/1/head
Alireza Hassani 4 years ago
parent bc13b44e66 017d8805b1
commit 992641c2c9
7 changed files with 79 additions and 69318 deletions
Show Stats Download Patch File Download Diff File

28
.idea/php.xml
Unescape View File

@ -125,6 +125,34 @@
<path value="$PROJECT_DIR$/vendor/org_heigl/ghostscript" /> <path value="$PROJECT_DIR$/vendor/org_heigl/ghostscript" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" /> <path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/blog" /> <path value="$PROJECT_DIR$/vendor/wm/blog" />
<path value="$PROJECT_DIR$/vendor/mtdowling/jmespath.php" />
<path value="$PROJECT_DIR$/vendor/aws/aws-sdk-php" />
<path value="$PROJECT_DIR$/vendor/coraxster/flysystem-aws-s3-v3-minio" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/core" />
<path value="$PROJECT_DIR$/vendor/wm/blog" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/core" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/core" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
</include_path> </include_path>
</component> </component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" /> <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />

1
.idea/symfony2.xml
Unescape View File

@ -3,5 +3,6 @@
<component name="Symfony2PluginSettings"> <component name="Symfony2PluginSettings">
<option name="directoryToWeb" value="public" /> <option name="directoryToWeb" value="public" />
<option name="pluginEnabled" value="true" /> <option name="pluginEnabled" value="true" />
<option name="lastServiceGeneratorLanguage" value="yaml" />
</component> </component>
</project> </project>

9
.idea/willamall-admin.iml
Unescape View File

@ -6,7 +6,9 @@
<sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" /> <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" /> <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
<sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/vendor/aws/aws-sdk-php" />
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" /> <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/coraxster/flysystem-aws-s3-v3-minio" />
<excludeFolder url="file://$MODULE_DIR$/vendor/defuse/php-encryption" /> <excludeFolder url="file://$MODULE_DIR$/vendor/defuse/php-encryption" />
<excludeFolder url="file://$MODULE_DIR$/vendor/dnoegel/php-xdg-base-dir" /> <excludeFolder url="file://$MODULE_DIR$/vendor/dnoegel/php-xdg-base-dir" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/annotations" /> <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/annotations" />
@ -43,6 +45,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/maennchen/zipstream-php" /> <excludeFolder url="file://$MODULE_DIR$/vendor/maennchen/zipstream-php" />
<excludeFolder url="file://$MODULE_DIR$/vendor/mockery/mockery" /> <excludeFolder url="file://$MODULE_DIR$/vendor/mockery/mockery" />
<excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" /> <excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<excludeFolder url="file://$MODULE_DIR$/vendor/mtdowling/jmespath.php" />
<excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" /> <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
<excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/php-enum" /> <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/php-enum" />
<excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" /> <excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
@ -120,12 +123,6 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/tijsverkoyen/css-to-inline-styles" /> <excludeFolder url="file://$MODULE_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" /> <excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" />
<excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" /> <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/blog" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/common" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/core" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/crm" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/portfolio" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/reservation" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/store" /> <excludeFolder url="file://$MODULE_DIR$/vendor/wm/store" />
<excludeFolder url="file://$MODULE_DIR$/vendor/zendframework/zend-diactoros" /> <excludeFolder url="file://$MODULE_DIR$/vendor/zendframework/zend-diactoros" />
<excludeFolder url="file://$MODULE_DIR$/vendor/zircote/swagger-php" /> <excludeFolder url="file://$MODULE_DIR$/vendor/zircote/swagger-php" />

69309
127_0_0_1.sql
View File

File diff suppressed because one or more lines are too long

44
database/migrations/2020_05_13_073148_update_table_users.php
Unescape View File

@ -0,0 +1,44 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateTableUsers extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('users', function (Blueprint $table) {
$table->string('file_code')->nullable();
$table->enum('user_type', ['natural','juridical'])->default('natural');
$table->string('father_name')->nullable();
$table->string('website')->nullable();
$table->text('description')->nullable();
$table->unsignedInteger('user_status_id')->nullable();
$table->unsignedInteger('user_title_id')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('file_code');
$table->dropColumn('user_type');
$table->dropColumn('father_name');
$table->dropColumn('website');
$table->dropColumn('description');
$table->dropColumn('user_status_id');
$table->dropColumn('user_title_id');
});
}
}

2
resources/js/Global/services/url.service.js vendored
Unescape View File

@ -16,7 +16,7 @@ const urlGenerator = (urls) => {
newPath.push(iterator); newPath.push(iterator);
} }
} }
return '/api/' + newPath.join("/"); return '/api/v1/' + newPath.join("/");
} }
}; };

4
webpack.mix.js vendored
Unescape View File

@ -32,7 +32,7 @@ require('./modules/wm-common/webpack.mix');
require('./modules/wm-crm/webpack.mix'); require('./modules/wm-crm/webpack.mix');
require('./modules/wm-blog/webpack.mix'); require('./modules/wm-blog/webpack.mix');
require('./modules/wm-portfolio/webpack.mix'); require('./modules/wm-portfolio/webpack.mix');
//
require('./modules/wm-reservation/webpack.mix'); // require('./modules/wm-reservation/webpack.mix');
mix.version(); mix.version();

Write Preview
Loading…
Cancel
Save