jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes on tag_Groups and variations, add migrations

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-01-25 22:25:18 +01:00
parent 545c242bba
commit bdefa235eb
39 changed files with 1125 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@@ -539,6 +539,12 @@ module.exports = function(grunt) {
src: ['jqtree.css'],
dest: 'public/assets/plugins/jqtree'
},
{
expand: true,
cwd: 'node_modules/sidr/dist/',
src: ['**'],
dest: 'public/assets/plugins/sidr'
},
{
expand: true,
cwd: 'build/js/include/',

5
app/Datatables/Shop/TagGroupsDataTable.php
View File

@@ -12,14 +12,15 @@ class TagGroupsDataTable extends DataTable
public function query(TagGroup $model)
{
$model = $model::withCount('tags');
$model = $model::with('article_family')->withCount('tags');
return $this->buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('name'),
Column::make('code')->title('Code'),
Column::make('name')->title('Nom'),
Column::make('tags_count')->title('#Tags')->searchable(false)->addClass('text-right')->width(60),
$this->makeColumnButtons(),
];

12
app/Models/Shop/Tag.php
View File

@@ -2,9 +2,6 @@
namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
// use Spatie\Translatable\HasTranslations;
use Rinvex\Tags\Models\Tag as parentTag;
use App\Models\Botanic\Specie;
@@ -12,9 +9,16 @@ use App\Models\Botanic\Variety;
class Tag extends parentTag
{
// use HasTranslations;
protected $guarded = ['id'];
protected $fillable = [
'slug',
'name',
'description',
'sort_order',
'group',
'tag_group_id',
];
public $translatable = ['name'];
/*

5
app/Repositories/Shop/Tags.php
View File

@@ -12,7 +12,7 @@ class Tags
public static function getOptions()
{
return Tag::get()->pluck('name', 'id')->toArray();
return Tag::pluck('name', 'id')->toArray();
}
public static function getWithCountOffers()
@@ -52,8 +52,7 @@ class Tags
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
$item = $id ? self::update($data) : self::create($data);
$item = ($data['id'] ?? false) ? self::update($data) : self::create($data);
return $item->id;
}

4
app/Repositories/Shop/Variations.php
View File

@@ -2,6 +2,8 @@
namespace App\Repositories\Shop;
use Illuminate\Support\Str;
use App\Models\Shop\Variation;
class Variations
@@ -33,7 +35,7 @@ class Variations
public static function getName($variation)
{
return $variation->package->value . ' ' . $variation->quantity . ' ' . ($variation->unity->value ?? null);
return $variation->package->value . ' ' . $variation->quantity . ' ' . ($variation->unity->value ?? null) . ' ' . Str::limit($variation->description, 15, ' (...)');
}
public static function buildName($data)

42
database/migrations/2020_04_20_212813_create_activity_log_table.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateActivityLogTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('activity_log', function(Blueprint $table)
{
$table->bigInteger('id', true)->unsigned();
$table->string('log_name')->nullable()->index();
$table->text('description', 65535);
$table->bigInteger('subject_id')->unsigned()->nullable();
$table->string('subject_type')->nullable();
$table->bigInteger('causer_id')->unsigned()->nullable();
$table->string('causer_type')->nullable();
$table->text('properties', 65535)->nullable();
$table->timestamps();
$table->index(['subject_id','subject_type'], 'subject');
$table->index(['causer_id','causer_type'], 'causer');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('activity_log');
}
}

41
database/migrations/2020_04_20_212813_create_categories_table.php Normal file
View File

@@ -0,0 +1,41 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateCategoriesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('categories', function(Blueprint $table)
{
$table->increments('id');
$table->string('slug')->unique();
$table->text('name', 65535);
$table->text('description', 65535)->nullable();
$table->integer('_lft')->unsigned()->default(0);
$table->integer('_rgt')->unsigned()->default(0);
$table->integer('parent_id')->unsigned()->nullable();
$table->timestamps();
$table->softDeletes();
$table->index(['_lft','_rgt','parent_id']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('categories');
}
}

37
database/migrations/2020_04_20_212813_create_categorizables_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateCategorizablesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('categorizables', function(Blueprint $table)
{
$table->integer('category_id')->unsigned();
$table->string('categorizable_type');
$table->bigInteger('categorizable_id')->unsigned();
$table->timestamps();
$table->unique(['category_id','categorizable_id','categorizable_type'], 'categorizables_ids_type_unique');
$table->index(['categorizable_type','categorizable_id']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('categorizables');
}
}

37
database/migrations/2020_04_20_212813_create_failed_jobs_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFailedJobsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('failed_jobs', function(Blueprint $table)
{
$table->bigInteger('id', true)->unsigned();
$table->text('connection', 65535);
$table->text('queue', 65535);
$table->text('payload');
$table->text('exception');
$table->timestamp('failed_at')->default(DB::raw('CURRENT_TIMESTAMP'));
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('failed_jobs');
}
}

37
database/migrations/2020_04_20_212813_create_mail_logs_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateMailLogsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('mail_logs', function(Blueprint $table)
{
$table->increments('id');
$table->string('sent_to')->nullable();
$table->text('data', 65535);
$table->text('route', 65535);
$table->text('event', 65535);
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('mail_logs');
}
}

34
database/migrations/2020_04_20_212813_create_password_resets_table.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePasswordResetsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('password_resets', function(Blueprint $table)
{
$table->string('email')->index();
$table->string('token');
$table->dateTime('created_at')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('password_resets');
}
}

34
database/migrations/2020_04_20_212813_create_permission_role_table.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePermissionRoleTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('permission_role', function(Blueprint $table)
{
$table->integer('permission_id')->unsigned();
$table->integer('role_id')->unsigned()->index('permission_role_role_id_foreign');
$table->primary(['permission_id','role_id']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('permission_role');
}
}

35
database/migrations/2020_04_20_212813_create_permission_user_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePermissionUserTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('permission_user', function(Blueprint $table)
{
$table->integer('permission_id')->unsigned();
$table->integer('user_id')->unsigned();
$table->string('user_type');
$table->primary(['permission_id','user_id','user_type']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('permission_user');
}
}

34
database/migrations/2020_04_20_212813_create_permissions_categories_table.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePermissionsCategoriesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('permissions_categories', function(Blueprint $table)
{
$table->increments('id');
$table->string('name')->unique();
$table->string('display_name');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('permissions_categories');
}
}

37
database/migrations/2020_04_20_212813_create_permissions_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePermissionsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('permissions', function(Blueprint $table)
{
$table->increments('id');
$table->integer('category_id')->unsigned()->nullable()->index('permissions_category_id_foreign');
$table->string('name')->unique();
$table->string('display_name')->nullable();
$table->string('description')->nullable();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('permissions');
}
}

35
database/migrations/2020_04_20_212813_create_role_user_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateRoleUserTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('role_user', function(Blueprint $table)
{
$table->bigInteger('user_id')->unsigned();
$table->integer('role_id')->unsigned()->index('role_user_role_id_foreign');
$table->string('user_type');
$table->primary(['user_id','role_id','user_type']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('role_user');
}
}

36
database/migrations/2020_04_20_212813_create_roles_table.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateRolesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('roles', function(Blueprint $table)
{
$table->increments('id');
$table->string('name')->unique();
$table->string('display_name')->nullable();
$table->string('description')->nullable();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('roles');
}
}

34
database/migrations/2020_04_20_212813_create_tagging_tag_groups_table.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTaggingTagGroupsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('tagging_tag_groups', function(Blueprint $table)
{
$table->increments('id');
$table->string('slug', 125)->index();
$table->string('name', 125);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('tagging_tag_groups');
}
}

36
database/migrations/2020_04_20_212813_create_tagging_tagged_table.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTaggingTaggedTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('tagging_tagged', function(Blueprint $table)
{
$table->increments('id');
$table->integer('taggable_id')->unsigned()->index();
$table->string('taggable_type', 125)->index();
$table->string('tag_name', 125);
$table->string('tag_slug', 125)->index();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('tagging_tagged');
}
}

37
database/migrations/2020_04_20_212813_create_tagging_tags_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTaggingTagsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('tagging_tags', function(Blueprint $table)
{
$table->increments('id');
$table->string('slug', 125)->index();
$table->string('name', 125);
$table->boolean('suggest')->default(0);
$table->integer('count')->unsigned()->default(0);
$table->integer('tag_group_id')->unsigned()->nullable()->index('tagging_tags_tag_group_id_foreign');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('tagging_tags');
}
}

39
database/migrations/2020_04_20_212813_create_team_invites_table.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTeamInvitesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('team_invites', function(Blueprint $table)
{
$table->increments('id');
$table->bigInteger('user_id')->unsigned();
$table->integer('team_id')->unsigned()->index('team_invites_team_id_foreign');
$table->enum('type', array('invite','request'));
$table->string('email');
$table->string('accept_token');
$table->string('deny_token');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('team_invites');
}
}

34
database/migrations/2020_04_20_212813_create_team_user_table.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTeamUserTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('team_user', function(Blueprint $table)
{
$table->bigInteger('user_id')->unsigned()->index('team_user_user_id_foreign');
$table->integer('team_id')->unsigned()->index('team_user_team_id_foreign');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('team_user');
}
}

35
database/migrations/2020_04_20_212813_create_teams_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTeamsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('teams', function(Blueprint $table)
{
$table->increments('id');
$table->integer('owner_id')->unsigned()->nullable();
$table->string('name');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('teams');
}
}

45
database/migrations/2020_04_20_212813_create_users_table.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateUsersTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('users', function(Blueprint $table)
{
$table->bigInteger('id', true)->unsigned();
$table->boolean('active')->default(0);
$table->string('first_name')->nullable();
$table->string('last_name')->nullable();
$table->string('email')->unique();
$table->dateTime('email_verified_at')->nullable();
$table->string('password');
$table->string('remember_token', 100)->nullable();
$table->timestamps();
$table->softDeletes();
$table->dateTime('last_login')->nullable();
$table->boolean('verified')->default(0);
$table->string('verification_token')->nullable();
$table->integer('current_team_id')->unsigned()->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('users');
}
}

35
database/migrations/2020_04_20_212817_add_foreign_keys_to_categorizables_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToCategorizablesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('categorizables', function(Blueprint $table)
{
$table->foreign('category_id')->references('id')->on('categories')->onUpdate('CASCADE')->onDelete('CASCADE');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('categorizables', function(Blueprint $table)
{
$table->dropForeign('categorizables_category_id_foreign');
});
}
}

37
database/migrations/2020_04_20_212817_add_foreign_keys_to_permission_role_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToPermissionRoleTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('permission_role', function(Blueprint $table)
{
$table->foreign('permission_id')->references('id')->on('permissions')->onUpdate('CASCADE')->onDelete('CASCADE');
$table->foreign('role_id')->references('id')->on('roles')->onUpdate('CASCADE')->onDelete('CASCADE');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('permission_role', function(Blueprint $table)
{
$table->dropForeign('permission_role_permission_id_foreign');
$table->dropForeign('permission_role_role_id_foreign');
});
}
}

35
database/migrations/2020_04_20_212817_add_foreign_keys_to_permission_user_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToPermissionUserTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('permission_user', function(Blueprint $table)
{
$table->foreign('permission_id')->references('id')->on('permissions')->onUpdate('CASCADE')->onDelete('CASCADE');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('permission_user', function(Blueprint $table)
{
$table->dropForeign('permission_user_permission_id_foreign');
});
}
}

35
database/migrations/2020_04_20_212817_add_foreign_keys_to_permissions_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToPermissionsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('permissions', function(Blueprint $table)
{
$table->foreign('category_id')->references('id')->on('permissions_categories')->onUpdate('RESTRICT')->onDelete('SET NULL');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('permissions', function(Blueprint $table)
{
$table->dropForeign('permissions_category_id_foreign');
});
}
}

37
database/migrations/2020_04_20_212817_add_foreign_keys_to_role_user_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToRoleUserTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('role_user', function(Blueprint $table)
{
$table->foreign('role_id')->references('id')->on('roles')->onUpdate('CASCADE')->onDelete('CASCADE');
$table->foreign('user_id')->references('id')->on('users')->onUpdate('CASCADE')->onDelete('CASCADE');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('role_user', function(Blueprint $table)
{
$table->dropForeign('role_user_role_id_foreign');
$table->dropForeign('role_user_user_id_foreign');
});
}
}

35
database/migrations/2020_04_20_212817_add_foreign_keys_to_tagging_tags_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToTaggingTagsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('tagging_tags', function(Blueprint $table)
{
$table->foreign('tag_group_id')->references('id')->on('tagging_tag_groups')->onUpdate('RESTRICT')->onDelete('RESTRICT');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('tagging_tags', function(Blueprint $table)
{
$table->dropForeign('tagging_tags_tag_group_id_foreign');
});
}
}

35
database/migrations/2020_04_20_212817_add_foreign_keys_to_team_invites_table.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToTeamInvitesTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('team_invites', function(Blueprint $table)
{
$table->foreign('team_id')->references('id')->on('teams')->onUpdate('RESTRICT')->onDelete('CASCADE');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('team_invites', function(Blueprint $table)
{
$table->dropForeign('team_invites_team_id_foreign');
});
}
}

37
database/migrations/2020_04_20_212817_add_foreign_keys_to_team_user_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddForeignKeysToTeamUserTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('team_user', function(Blueprint $table)
{
$table->foreign('team_id')->references('id')->on('teams')->onUpdate('RESTRICT')->onDelete('CASCADE');
$table->foreign('user_id')->references('id')->on('users')->onUpdate('CASCADE')->onDelete('CASCADE');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('team_user', function(Blueprint $table)
{
$table->dropForeign('team_user_team_id_foreign');
$table->dropForeign('team_user_user_id_foreign');
});
}
}

83
database/migrations/2021_06_05_192053_teamwork_setup_tables.php Normal file
View File

@@ -0,0 +1,83 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class TeamworkSetupTables extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table(\Config::get('teamwork.users_table'), function (Blueprint $table) {
$table->integer('current_team_id')->unsigned()->nullable();
});
Schema::create(\Config::get('teamwork.teams_table'), function (Blueprint $table) {
$table->increments('id')->unsigned();
$table->integer('owner_id')->unsigned()->nullable();
$table->string('name');
$table->timestamps();
});
Schema::create(\Config::get('teamwork.team_user_table'), function (Blueprint $table) {
$table->bigInteger('user_id')->unsigned();
$table->integer('team_id')->unsigned();
$table->timestamps();
$table->foreign('user_id')
->references(\Config::get('teamwork.user_foreign_key'))
->on(\Config::get('teamwork.users_table'))
->onUpdate('cascade')
->onDelete('cascade');
$table->foreign('team_id')
->references('id')
->on(\Config::get('teamwork.teams_table'))
->onDelete('cascade');
});
Schema::create(\Config::get('teamwork.team_invites_table'), function (Blueprint $table) {
$table->increments('id');
$table->bigInteger('user_id')->unsigned();
$table->integer('team_id')->unsigned();
$table->enum('type', ['invite', 'request']);
$table->string('email');
$table->string('accept_token');
$table->string('deny_token');
$table->timestamps();
$table->foreign('team_id')
->references('id')
->on(\Config::get('teamwork.teams_table'))
->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table(\Config::get('teamwork.users_table'), function (Blueprint $table) {
$table->dropColumn('current_team_id');
});
Schema::table(\Config::get('teamwork.team_user_table'), function (Blueprint $table) {
if (DB::getDriverName() !== 'sqlite') {
$table->dropForeign(\Config::get('teamwork.team_user_table').'_user_id_foreign');
}
if (DB::getDriverName() !== 'sqlite') {
$table->dropForeign(\Config::get('teamwork.team_user_table').'_team_id_foreign');
}
});
Schema::drop(\Config::get('teamwork.team_user_table'));
Schema::drop(\Config::get('teamwork.team_invites_table'));
Schema::drop(\Config::get('teamwork.teams_table'));
}
}

1
package.json
View File

@@ -143,6 +143,7 @@
"screenfull": "^5.1.0",
"select2": "^4.0.13",
"selectize": "^0.12.6",
"sidr": "^2.2.1",
"simple-peer": "^9.9.3",
"sizzle": "^2.3.6",
"slick-carousel": "^1.8.1",

13
resources/lang/fr/shop.php
View File

@@ -195,6 +195,19 @@ return [
'successdel' => 'La famille de tag a été correctement effacée',
'confirmdelete' => 'Confirmez-vous la suppression de la famille de tag ?',
],
'tag_groups' => [
'title' => 'Groupes de tags',
'name' => 'Groupe de tag',
'description' => 'Gérer les groupes de tags',
'add' => 'Ajouter un groupe de tag',
'edit' => 'Editer un groupe de tag',
'del' => 'Effacer un groupe de tag',
'list' => 'Liste des groupes de tags',
'successadd' => 'Le groupe de tag été correctement ajoutée',
'successmod' => 'Le groupe de tag a été correctement modifiée',
'successdel' => 'Le groupe de tag a été correctement effacée',
'confirmdelete' => 'Confirmez-vous la suppression du groupe de tag ?',
],
'tariffs' => [
'title' => 'Tarifs',
'name' => 'Tarif',

6
resources/views/Admin/Shop/TagGroups/create.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layout.index', [
'title' => __('tag_groups.title'),
'subtitle' => __('tag_groups.create.title'),
'breadcrumb' => [__('tag_groups.title'), __('tag_groups.create.title')]
'title' => __('shop.tag_groups.title'),
'subtitle' => __('shop.tag_groups.add'),
'breadcrumb' => [__('shop.tag_groups.title'), __('shop.tag_groups.add')]
])
@include('boilerplate::load.fileinput')

4
resources/views/Admin/Shop/TagGroups/edit.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layout.index', [
'title' => __('tag_groups.title'),
'subtitle' => __('tag_groups.edit.title'),
'breadcrumb' => [__('tag_groups.title'), __('tag_groups.edit.title')]
'subtitle' => __('tag_groups.edit'),
'breadcrumb' => [__('tag_groups.title'), __('tag_groups.edit')]
])
@section('content')

16
resources/views/Admin/Shop/TagGroups/form.blade.php
View File

@@ -1,15 +1,25 @@
<div class="row">
<div class="col-md-6">
{{ Form::label('name', 'Famille d\'articles') }}
@include('components.form.select', ['name' => 'article_family_id', 'value' => $article_family_id ?? null, 'list' => $article_families ?? [], 'required' => true, 'with_empty' => ''])
{{ Form::label('name', 'Code') }}
@include('components.form.input', ['name' => 'code', 'value' => $code ?? null])
</div>
</div>
<div class="row mt-3">
<div class="col-md-6">
{{ Form::label('name', 'Nom') }}
@include('components.form.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true])
@include('components.form.input', ['name' => 'name', 'value' => $name ?? null, 'required' => true])
</div>
</div>
@include('components.save')
@include('load.form.save')
@push('js')
<script>
$(function() {
initSaveForm();
});
</script>
@endpush

6
resources/views/Admin/Shop/TagGroups/list.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layout.index', [
'title' => __('shop.tag_families.title'),
'subtitle' => __('shop.tag_families.list'),
'breadcrumb' => [__('shop.tag_families.title')]
'title' => __('shop.tag_groups.title'),
'subtitle' => __('shop.tag_groups.list'),
'breadcrumb' => [__('shop.tag_groups.title')]
])
@section('content')