Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fec8dc083c | ||
|
|
4c4a4a33a9 | ||
|
|
a2aabd51d6 | ||
|
|
c168634c3a | ||
|
|
65695d0594 | ||
|
|
9158005a5c | ||
|
|
336d74b628 | ||
|
|
5f9f07657f |
@@ -12,6 +12,7 @@
|
|||||||
class BranchExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
|
class BranchExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
|
||||||
{
|
{
|
||||||
protected $search;
|
protected $search;
|
||||||
|
protected $parent_id;
|
||||||
|
|
||||||
public function __construct($search = null, $parent_id = null)
|
public function __construct($search = null, $parent_id = null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Modules\Basicdata\Http\Controllers;
|
namespace Modules\Basicdata\Http\Controllers;
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -16,8 +17,12 @@
|
|||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
// Mengatur middleware auth
|
||||||
|
$this->middleware('auth');
|
||||||
|
|
||||||
|
// Mengatur user setelah middleware auth dijalankan
|
||||||
$this->middleware(function ($request, $next) {
|
$this->middleware(function ($request, $next) {
|
||||||
$this->user = auth()->user();
|
$this->user = Auth::user();
|
||||||
return $next($request);
|
return $next($request);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
use Modules\Basicdata\Exports\CurrencyExport;
|
use Modules\Basicdata\Exports\CurrencyExport;
|
||||||
use Modules\Basicdata\Http\Requests\CurrencyRequest;
|
use Modules\Basicdata\Http\Requests\CurrencyRequest;
|
||||||
use Modules\Basicdata\Models\Currency;
|
use Modules\Basicdata\Models\Currency;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
||||||
class CurrencyController extends Controller
|
class CurrencyController extends Controller
|
||||||
{
|
{
|
||||||
@@ -16,8 +17,12 @@
|
|||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
// Mengatur middleware auth
|
||||||
|
$this->middleware('auth');
|
||||||
|
|
||||||
|
// Mengatur user setelah middleware auth dijalankan
|
||||||
$this->middleware(function ($request, $next) {
|
$this->middleware(function ($request, $next) {
|
||||||
$this->user = auth()->user();
|
$this->user = Auth::user();
|
||||||
return $next($request);
|
return $next($request);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
use Modules\Basicdata\Exports\HolidayCalendarExport;
|
use Modules\Basicdata\Exports\HolidayCalendarExport;
|
||||||
use Modules\Basicdata\Http\Requests\HolidayCalendarRequest;
|
use Modules\Basicdata\Http\Requests\HolidayCalendarRequest;
|
||||||
use Modules\Basicdata\Models\HolidayCalendar;
|
use Modules\Basicdata\Models\HolidayCalendar;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
||||||
class HolidayCalendarController extends Controller
|
class HolidayCalendarController extends Controller
|
||||||
{
|
{
|
||||||
@@ -16,8 +17,12 @@
|
|||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
// Mengatur middleware auth
|
||||||
|
$this->middleware('auth');
|
||||||
|
|
||||||
|
// Mengatur user setelah middleware auth dijalankan
|
||||||
$this->middleware(function ($request, $next) {
|
$this->middleware(function ($request, $next) {
|
||||||
$this->user = auth()->user();
|
$this->user = Auth::user();
|
||||||
return $next($request);
|
return $next($request);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,9 @@
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
use Spatie\Activitylog\Facades\CauserResolver;
|
|
||||||
use Spatie\Activitylog\LogOptions;
|
use Spatie\Activitylog\LogOptions;
|
||||||
use Spatie\Activitylog\Traits\LogsActivity;
|
use Spatie\Activitylog\Traits\LogsActivity;
|
||||||
use Wildside\Userstamps\Userstamps;
|
use Mattiverse\Userstamps\Traits\Userstamps;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'code',
|
'code',
|
||||||
'name',
|
'name',
|
||||||
|
'is_dalam_kota',
|
||||||
'address',
|
'address',
|
||||||
'mnemonic',
|
'mnemonic',
|
||||||
'customer_company',
|
'customer_company',
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration {
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('branches', function (Blueprint $table) {
|
||||||
|
$table->boolean('is_dalam_kota')->default(true)->after('name');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('branches', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('is_dalam_kota');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -12,6 +12,7 @@ class BasicdataDatabaseSeeder extends Seeder
|
|||||||
public function run(): void
|
public function run(): void
|
||||||
{
|
{
|
||||||
$this->call([
|
$this->call([
|
||||||
|
PermissionSeeder::class,
|
||||||
BranchesSeeder::class,
|
BranchesSeeder::class,
|
||||||
CurrencySeeder::class,
|
CurrencySeeder::class,
|
||||||
HolidayCalendarSeeder::class
|
HolidayCalendarSeeder::class
|
||||||
|
|||||||
@@ -59,7 +59,8 @@
|
|||||||
['code' => 'PKR', 'name' => 'Pakistani Rupee', 'symbol' => '₨', 'decimal_places' => 2, 'status' => true, 'created_at' => $now, 'updated_at' => $now],
|
['code' => 'PKR', 'name' => 'Pakistani Rupee', 'symbol' => '₨', 'decimal_places' => 2, 'status' => true, 'created_at' => $now, 'updated_at' => $now],
|
||||||
];
|
];
|
||||||
|
|
||||||
DB::table('currencies')->truncate();
|
// DB::table('currencies')->truncate();
|
||||||
|
DB::table('currencies')->delete();
|
||||||
DB::table('currencies')->insert($currencies);
|
DB::table('currencies')->insert($currencies);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
32
database/seeders/PermissionSeeder.php
Normal file
32
database/seeders/PermissionSeeder.php
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Basicdata\Database\Seeders;
|
||||||
|
|
||||||
|
use Illuminate\Database\Seeder;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Modules\Usermanagement\Models\PermissionGroup;
|
||||||
|
|
||||||
|
class PermissionSeeder extends Seeder
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the database seeds.
|
||||||
|
*/
|
||||||
|
public function run()
|
||||||
|
{
|
||||||
|
$data = $this->data();
|
||||||
|
|
||||||
|
foreach ($data as $value) {
|
||||||
|
PermissionGroup::updateOrCreate([
|
||||||
|
'name' => $value['name'],
|
||||||
|
'slug' => Str::slug($value['name'])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function data()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
['name' => 'basic-data']
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
54
database/seeders/UpdateBranchesIsDalamKotaSeeder.php
Normal file
54
database/seeders/UpdateBranchesIsDalamKotaSeeder.php
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Basicdata\Database\Seeders;
|
||||||
|
|
||||||
|
use Illuminate\Database\Seeder;
|
||||||
|
use Modules\Basicdata\Models\Branch;
|
||||||
|
|
||||||
|
class UpdateBranchesIsDalamKotaSeeder extends Seeder
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the database seeds.
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$codes = [
|
||||||
|
'0005','0012','0250','0016','0018','0279','0092','0022','0251',
|
||||||
|
'0029','0270','0096','0109','0098','2005','0008','0028','0015',
|
||||||
|
'0006','0090','0009','0023','0020','0099','0003','0010','0002',
|
||||||
|
'0273','0011','0105',
|
||||||
|
];
|
||||||
|
|
||||||
|
Branch::query()->update(['is_dalam_kota' => false]);
|
||||||
|
|
||||||
|
foreach ($codes as $code) {
|
||||||
|
Branch::where('code', 'like', '%' . $code)
|
||||||
|
->update(['is_dalam_kota' => true]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$newBranches = [
|
||||||
|
[
|
||||||
|
'code' => 'ID0012005',
|
||||||
|
'name' => 'KORPORASI',
|
||||||
|
'is_dalam_kota' => true,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'ID0010172',
|
||||||
|
'name' => 'AMBON TUAL MALUKU',
|
||||||
|
'is_dalam_kota' => false,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($newBranches as $branch) {
|
||||||
|
Branch::firstOrCreate(
|
||||||
|
['code' => $branch['code']],
|
||||||
|
[
|
||||||
|
'name' => $branch['name'],
|
||||||
|
'is_dalam_kota' => $branch['is_dalam_kota'],
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Seeder update kolom is_dalam_kota + insert data baru selesai!\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user