Merged in izzati-feat-format-notis-lelong-baru-30jun (pull request #40)

Izzati feat format notis lelong baru 30jun
This commit is contained in:
izzati zulkifli
2024-07-08 02:40:42 +00:00
28 changed files with 1865 additions and 96 deletions
@@ -244,6 +244,7 @@ class CreateLelongsTable extends Migration
$table->string('mora_upah');
$table->integer('fasa')->default(0);
$table->integer('opencash')->default(0);
$table->integer('xlaku')->default(0);
$table->timestamps();
// $table->foreign('caw_id')
@@ -1,35 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddPara2ToCawanganTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('cawangan', function (Blueprint $table) {
$table->longText('para2')->nullable();
$table->longText('para3')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('cawangan', function (Blueprint $table) {
$table->dropColumn('para2') ;
$table->dropColumn('para3') ;
});
}
}
@@ -0,0 +1,44 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateLelongbidderTempTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('lelongbidder_temp', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedBigInteger('user_id')->unsigned();
$table->unsignedBigInteger('lelongbid_id')->unsigned();
$table->string('kodcaw')->nullable();
$table->string('nama_bidder');
$table->decimal('hargabida');
$table->string('notelbimbit');
$table->decimal('nilaimarhun');
$table->decimal('cajlelong');
$table->integer('status_bidder')->nullable(); //1 = win
$table->integer('payment_id')->nullable();
$table->integer('status_payment')->nullable(); // 1=paid, 2=memerlukan pengesahan operasi (CDM)
$table->datetime('masa_bidaan');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('lelongbidder_temp');
}
}
+18
View File
@@ -201,6 +201,13 @@ class RolesSeeder extends Seeder
'name' => 'skoptugasan',
'description' => 'Skop Tugasan Cawangan Kegunaan E-KPI'
]);
//ajklelong
Permission::create([
'name' => 'semakanlelong',
'description' => 'Semakan Lelongan'
]);
// create roles and assign existing permissions
$role1 = Role::create(['name' => 'admin']);
$role1->givePermissionTo('pengguna');
@@ -296,6 +303,9 @@ class RolesSeeder extends Seeder
$role14->givePermissionTo('pengurusangambar');
$role14->givePermissionTo('pendaftaranbatch');
$role15 = Role::create(['name' => 'ajk']);
$role15->givePermissionTo('semakanlelong');
// $role3 = Role::create(['name' => 'Super-Admin']);
// gets all permissions via Gate::before rule; see AuthServiceProvider
@@ -416,5 +426,13 @@ class RolesSeeder extends Seeder
'user_type' => 1
]);
$user->assignRole($role14);
$user = \App\Models\User::factory()->create([
'name' => 'Ahli Jawatan Kuasa',
'username' => 'ajk',
'email' => 'ajk@example.com',
'user_type' => 3
]);
$user->assignRole($role15);
}
}