Skip to content

Commit

Permalink
Merge branch 'master' into imap-work
Browse files Browse the repository at this point in the history
  • Loading branch information
devansh-webkul committed Jan 17, 2025
2 parents 92b2801 + 3b9e3f6 commit 198d8d6
Show file tree
Hide file tree
Showing 187 changed files with 9,126 additions and 410 deletions.
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
"Webkul\\Attribute\\": "packages/Webkul/Attribute/src",
"Webkul\\Contact\\": "packages/Webkul/Contact/src",
"Webkul\\Core\\": "packages/Webkul/Core/src",
"Webkul\\DataGrid\\": "packages/Webkul/DataGrid/src",
"Webkul\\DataTransfer\\": "packages/Webkul/DataTransfer/src",
"Webkul\\Email\\": "packages/Webkul/Email/src",
"Webkul\\EmailTemplate\\": "packages/Webkul/EmailTemplate/src",
"Webkul\\Marketing\\": "packages/Webkul/Marketing/src",
"Webkul\\Installer\\": "packages/Webkul/Installer/src",
"Webkul\\Lead\\": "packages/Webkul/Lead/src",
"Webkul\\Product\\": "packages/Webkul/Product/src",
Expand All @@ -70,8 +73,7 @@
"Webkul\\User\\": "packages/Webkul/User/src",
"Webkul\\Warehouse\\": "packages/Webkul/Warehouse/src",
"Webkul\\WebForm\\": "packages/Webkul/WebForm/src",
"Webkul\\Automation\\": "packages/Webkul/Automation/src",
"Webkul\\DataGrid\\": "packages/Webkul/DataGrid/src"
"Webkul\\Automation\\": "packages/Webkul/Automation/src"
}
},
"autoload-dev": {
Expand Down
2 changes: 2 additions & 0 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,10 @@
Webkul\Contact\Providers\ContactServiceProvider::class,
Webkul\Core\Providers\CoreServiceProvider::class,
Webkul\DataGrid\Providers\DataGridServiceProvider::class,
Webkul\DataTransfer\Providers\DataTransferServiceProvider::class,
Webkul\EmailTemplate\Providers\EmailTemplateServiceProvider::class,
Webkul\Email\Providers\EmailServiceProvider::class,
Webkul\Marketing\Providers\MarketingServiceProvider::class,
Webkul\Installer\Providers\InstallerServiceProvider::class,
Webkul\Lead\Providers\LeadServiceProvider::class,
Webkul\Product\Providers\ProductServiceProvider::class,
Expand Down
1 change: 1 addition & 0 deletions config/concord.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
\Webkul\User\Providers\ModuleServiceProvider::class,
\Webkul\Warehouse\Providers\ModuleServiceProvider::class,
\Webkul\WebForm\Providers\ModuleServiceProvider::class,
\Webkul\DataTransfer\Providers\ModuleServiceProvider::class,
],

'register_route_models' => true,
Expand Down
39 changes: 39 additions & 0 deletions database/migrations/2024_09_09_094040_create_job_batches_table.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('job_batches', function (Blueprint $table) {
$table->string('id')->primary();
$table->string('name');
$table->integer('total_jobs');
$table->integer('pending_jobs');
$table->integer('failed_jobs');
$table->text('failed_job_ids');
$table->mediumText('options')->nullable();
$table->integer('cancelled_at')->nullable();
$table->integer('created_at');
$table->integer('finished_at')->nullable();
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('job_batches');
}
};
36 changes: 36 additions & 0 deletions database/migrations/2024_09_09_094042_create_jobs_table.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('jobs', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('queue')->index();
$table->longText('payload');
$table->unsignedTinyInteger('attempts');
$table->unsignedInteger('reserved_at')->nullable();
$table->unsignedInteger('available_at');
$table->unsignedInteger('created_at');
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('jobs');
}
};
83 changes: 77 additions & 6 deletions packages/Webkul/Admin/src/Config/acl.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'name' => 'admin::app.layouts.dashboard',
'route' => 'admin.dashboard.index',
'sort' => 1,
], [
], [
'key' => 'leads',
'name' => 'admin::app.acl.leads',
'route' => 'admin.leads.index',
Expand Down Expand Up @@ -56,7 +56,7 @@
'name' => 'admin::app.acl.delete',
'route' => ['admin.quotes.delete', 'admin.quotes.mass_delete'],
'sort' => 4,
], [
], [
'key' => 'mail',
'name' => 'admin::app.acl.mail',
'route' => 'admin.mail.index',
Expand Down Expand Up @@ -131,7 +131,7 @@
'name' => 'admin::app.acl.contacts',
'route' => 'admin.contacts.users.index',
'sort' => 6,
], [
], [
'key' => 'contacts.persons',
'name' => 'admin::app.acl.persons',
'route' => 'admin.contacts.persons.index',
Expand Down Expand Up @@ -176,7 +176,7 @@
'name' => 'admin::app.acl.delete',
'route' => ['admin.contacts.organizations.delete', 'admin.contacts.organizations.mass_delete'],
'sort' => 3,
], [
], [
'key' => 'products',
'name' => 'admin::app.acl.products',
'route' => 'admin.products.index',
Expand Down Expand Up @@ -401,8 +401,47 @@
'name' => 'admin::app.acl.delete',
'route' => 'admin.settings.workflows.delete',
'sort' => 3,
],
[
], [
'key' => 'settings.automation.events',
'name' => 'admin::app.acl.event',
'route' => 'admin.settings.marketing.events.index',
'sort' => 2,
], [
'key' => 'settings.automation.events.create',
'name' => 'admin::app.acl.create',
'route' => ['admin.settings.marketing.events.create', 'admin.settings.marketing.events.store'],
'sort' => 1,
], [
'key' => 'settings.automation.events.edit',
'name' => 'admin::app.acl.edit',
'route' => ['admin.settings.marketing.events.edit', 'admin.settings.marketing.events.update'],
'sort' => 2,
], [
'key' => 'settings.automation.events.delete',
'name' => 'admin::app.acl.delete',
'route' => ['admin.settings.marketing.events.delete', 'admin.settings.marketing.events.mass_delete'],
'sort' => 3,
], [
'key' => 'settings.automation.campaigns',
'name' => 'admin::app.acl.campaigns',
'route' => 'admin.settings.marketing.campaigns.index',
'sort' => 2,
], [
'key' => 'settings.automation.campaigns.create',
'name' => 'admin::app.acl.create',
'route' => ['admin.settings.marketing.campaigns.create', 'admin.settings.marketing.campaigns.store'],
'sort' => 1,
], [
'key' => 'settings.automation.campaigns.edit',
'name' => 'admin::app.acl.edit',
'route' => ['admin.settings.marketing.campaigns.edit', 'admin.settings.marketing.campaigns.update'],
'sort' => 2,
], [
'key' => 'settings.automation.campaigns.delete',
'name' => 'admin::app.acl.delete',
'route' => ['admin.settings.marketing.campaigns.delete', 'admin.settings.marketing.campaigns.mass_delete'],
'sort' => 3,
], [
'key' => 'settings.automation.webhooks',
'name' => 'admin::app.acl.webhook',
'route' => 'admin.settings.webhooks.index',
Expand Down Expand Up @@ -447,7 +486,39 @@
'name' => 'admin::app.acl.delete',
'route' => ['admin.settings.tags.delete', 'admin.settings.tags.mass_delete', 'admin.leads.tags.detach'],
'sort' => 2,
],
[
'key' => 'settings.data_transfer',
'name' => 'admin::app.acl.data-transfer',
'route' => 'admin.settings.data_transfer.imports.index',
'sort' => 10,
], [
'key' => 'settings.data_transfer.imports',
'name' => 'admin::app.acl.imports',
'route' => 'admin.settings.data_transfer.imports.index',
'sort' => 1,
], [
'key' => 'settings.data_transfer.imports.create',
'name' => 'admin::app.acl.create',
'route' => 'admin.settings.data_transfer.imports.create',
'sort' => 1,
], [
'key' => 'settings.data_transfer.imports.edit',
'name' => 'admin::app.acl.edit',
'route' => 'admin.settings.data_transfer.imports.edit',
'sort' => 2,
], [
'key' => 'settings.data_transfer.imports.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.settings.data_transfer.imports.delete',
'sort' => 3,
], [
'key' => 'settings.data_transfer.imports.import',
'name' => 'admin::app.acl.import',
'route' => 'admin.settings.data_transfer.imports.imports',
'sort' => 4,
],
[
'key' => 'configuration',
'name' => 'admin::app.acl.configuration',
'route' => 'admin.configuration.index',
Expand Down
23 changes: 23 additions & 0 deletions packages/Webkul/Admin/src/Config/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,20 @@
'route' => 'admin.settings.email_templates.index',
'sort' => 2,
'icon-class' => 'icon-settings-mail',
], [
'key' => 'settings.automation.events',
'name' => 'admin::app.layouts.events',
'info' => 'admin::app.layouts.events-info',
'route' => 'admin.settings.marketing.events.index',
'sort' => 2,
'icon-class' => 'icon-calendar',
], [
'key' => 'settings.automation.campaigns',
'name' => 'admin::app.layouts.campaigns',
'info' => 'admin::app.layouts.campaigns-info',
'route' => 'admin.settings.marketing.campaigns.index',
'sort' => 2,
'icon-class' => 'icon-note',
], [
'key' => 'settings.automation.webhooks',
'name' => 'admin::app.layouts.webhooks',
Expand All @@ -247,6 +261,14 @@
'route' => 'admin.settings.workflows.index',
'sort' => 3,
'icon-class' => 'icon-settings-flow',
],
[
'key' => 'settings.automation.data_transfer',
'name' => 'admin::app.layouts.data_transfer',
'info' => 'admin::app.layouts.data_transfer_info',
'route' => 'admin.settings.data_transfer.imports.index',
'sort' => 4,
'icon-class' => 'icon-download',
], [
'key' => 'settings.other_settings',
'name' => 'admin::app.layouts.other-settings',
Expand All @@ -273,4 +295,5 @@
'sort' => 9,
'icon-class' => 'icon-configuration',
],

];
Loading

0 comments on commit 198d8d6

Please sign in to comment.