diff --git a/app/Http/Modules/User/ContractModule.php b/app/Http/Modules/User/ContractModule.php index d0f1582..3e76541 100644 --- a/app/Http/Modules/User/ContractModule.php +++ b/app/Http/Modules/User/ContractModule.php @@ -149,8 +149,6 @@ class ContractModule extends BaseController } } - - // log ContractModule::makeLog($contract->id, 'user (' . Auth::guard('user-api')->user()->id . ') created'); diff --git a/app/Models/ContractObligation.php b/app/Models/ContractObligation.php index ff0764a..5985cfb 100644 --- a/app/Models/ContractObligation.php +++ b/app/Models/ContractObligation.php @@ -50,14 +50,14 @@ class ContractObligation extends Model public function getContractObligationDependencyListAttribute() { return $this->contract_obligation_dependency() - ->where('status', config('constants.contract_obligation.status.active')) + // ->where('status', config('constants.contract_obligation.status.active')) ->get()->makeHidden(['contract_obligation_list', 'depend_contract_obligation_list']); } public function getDependContractObligationDependencyListAttribute() { return $this->depend_contract_obligation_dependency() - ->where('status', config('constants.contract_obligation.status.active')) + // ->where('status', config('constants.contract_obligation.status.active')) ->get()->makeHidden(['contract_obligation_list', 'depend_contract_obligation_list']); } diff --git a/app/Models/ContractObligationDependency.php b/app/Models/ContractObligationDependency.php index ddded59..5d20126 100644 --- a/app/Models/ContractObligationDependency.php +++ b/app/Models/ContractObligationDependency.php @@ -2,10 +2,65 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Http\Helpers\Hasher; + use Illuminate\Database\Eloquent\Model; +use Carbon\Carbon; class ContractObligationDependency extends Model { - use HasFactory; + protected $table = 'contract_obligation_dependencies'; + + protected $appends = [ + 'hash_id', + 'contract_obligation_hash_id', + 'depend_contract_obligation_hash_id', + 'contract_obligation_list', + 'depend_contract_obligation_list' + ]; + + public function contract_obligation() + { + return $this->belongsTo('App\Models\ContractObligation', 'contract_obligation_id'); + } + + public function depend_contract_obligation() + { + return $this->belongsTo('App\Models\ContractObligation', 'depend_contract_obligation_id'); + } + + public function getHashIdAttribute() + { + return Hasher::encode('contract_obligation_dependencies', $this->id); + } + + public function getContractObligationHashIdAttribute() + { + return Hasher::encode('contract_obligations', $this->contract_obligation_id); + } + + public function getDependContractObligationHashIdAttribute() + { + return Hasher::encode('contract_obligations', $this->depend_contract_obligation_id); + } + + public function getContractObligationListAttribute() + { + return $this->contract_obligation()->get()->makeHidden(['contract_obligation_dependency_list']); + } + + public function getDependContractObligationListAttribute() + { + return $this->depend_contract_obligation()->get()->makeHidden(['contract_obligation_dependency_list']); + } + + public function getUpdatedAtAttribute($date) + { + return $date ? Carbon::parse($date)->timezone('Asia/Kuala_Lumpur')->format('Y-m-d') : ''; + } + + public function getCreatedAtAttribute($date) + { + return $date ? Carbon::parse($date)->timezone('Asia/Kuala_Lumpur')->format('Y-m-d') : ''; + } } diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceContractEntitiesTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceContractEntitiesTableSeeder.php new file mode 100644 index 0000000..6f5d6ef --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceContractEntitiesTableSeeder.php @@ -0,0 +1,54 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'contract_id' => 101, + 'entity_id' => 101, + 'entity_signature_id' => 101, + 'type' => 1, + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'user_id' => 4, + 'contract_id' => 101, + 'entity_id' => 102, + 'entity_signature_id' => 102, + 'type' => 1, + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'user_id' => 4, + 'contract_id' => 101, + 'entity_id' => 103, + 'entity_signature_id' => 103, + 'type' => 1, + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceContractObligationDependenciesTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceContractObligationDependenciesTableSeeder.php new file mode 100644 index 0000000..ec69f90 --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceContractObligationDependenciesTableSeeder.php @@ -0,0 +1,75 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'contract_obligation_id' => 102, // seller requst J&T deliver service + 'depend_contract_obligation_id' => 101, // user made payment to seller + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'user_id' => 4, + 'contract_obligation_id' => 103, // J&T provide service to seller + 'depend_contract_obligation_id' => 102, // seller requst J&T deliver service + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'user_id' => 4, + 'contract_obligation_id' => 104, // seller pack up the parcel and wait J&T pick up + 'depend_contract_obligation_id' => 103, // J&T provide service to seller + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 104, + 'user_id' => 4, + 'contract_obligation_id' => 105, // J&T picke up seller parcel + 'depend_contract_obligation_id' => 104, // seller pack up the parcel and wait J&T pick up + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 105, + 'user_id' => 4, + 'contract_obligation_id' => 106, // J&T deliver parcel to user + 'depend_contract_obligation_id' => 105, // J&T picke up seller parcel + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 106, + 'user_id' => 4, + 'contract_obligation_id' => 107, // user recieve parcel + 'depend_contract_obligation_id' => 106, // J&T deliver parcel to user + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceContractObligationsTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceContractObligationsTableSeeder.php new file mode 100644 index 0000000..72bc4e7 --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceContractObligationsTableSeeder.php @@ -0,0 +1,192 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 101, + 'contract_entity_id' => 101, + 'name' => 'user made payment to seller', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 102, + 'contract_entity_id' => 102, + 'name' => 'seller requst J&T deliver service', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 103, + 'contract_entity_id' => 103, + 'name' => 'J&T provide service to seller', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 104, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 104, + 'contract_entity_id' => 102, + 'name' => 'seller pack up the parcel and wait J&T pick up', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 105, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 105, + 'contract_entity_id' => 103, + 'name' => 'J&T picke up seller parcel', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 106, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 106, + 'contract_entity_id' => 103, + 'name' => 'J&T deliver parcel to user', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 107, + 'user_id' => 4, + 'contract_id' => 101, + 'contract_template_obligation_id' => 107, + 'contract_entity_id' => 101, + 'name' => 'user recieve parcel', + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_status' => config('constants.contract_obligation.complete_status.pending'), + 'accept_status' => config('constants.contract_obligation.accept_status.pending'), + 'type' => config('constants.contract_obligation.type.money'), + 'in_time_contract_obligation_template' => json_encode([]), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays(1), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateObligationDependenciesTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateObligationDependenciesTableSeeder.php new file mode 100644 index 0000000..4aa85b5 --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateObligationDependenciesTableSeeder.php @@ -0,0 +1,75 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'contract_template_obligation_id' => 102, // seller requst J&T deliver service + 'depend_contract_template_obligation_id' => 101, // user made payment to seller + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'user_id' => 4, + 'contract_template_obligation_id' => 103, // J&T provide service to seller + 'depend_contract_template_obligation_id' => 102, // seller requst J&T deliver service + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'user_id' => 4, + 'contract_template_obligation_id' => 104, // seller pack up the parcel and wait J&T pick up + 'depend_contract_template_obligation_id' => 103, // J&T provide service to seller + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 104, + 'user_id' => 4, + 'contract_template_obligation_id' => 105, // J&T picke up seller parcel + 'depend_contract_template_obligation_id' => 104, // seller pack up the parcel and wait J&T pick up + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 105, + 'user_id' => 4, + 'contract_template_obligation_id' => 106, // J&T deliver parcel to user + 'depend_contract_template_obligation_id' => 105, // J&T picke up seller parcel + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 106, + 'user_id' => 4, + 'contract_template_obligation_id' => 107, // user recieve parcel + 'depend_contract_template_obligation_id' => 106, // J&T deliver parcel to user + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateObligationsTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateObligationsTableSeeder.php new file mode 100644 index 0000000..e11cbea --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateObligationsTableSeeder.php @@ -0,0 +1,143 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'user made payment to seller', + 'sequence' => 1.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.money'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'seller requst J&T deliver service', + 'sequence' => 2.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.offer_service'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'J&T provide service to seller', + 'sequence' => 3.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.offer_service'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 104, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'seller pack up the parcel and wait J&T pick up', + 'sequence' => 4.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.received_service'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 105, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'J&T picke up seller parcel', + 'sequence' => 5.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.offer_service'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 106, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'J&T deliver parcel to user', + 'sequence' => 6.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.offer_service'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 107, + 'user_id' => 4, + 'contract_template_id' => 101, + 'name' => 'user recieve parcel', + 'sequence' => 7.0, + 'reference' => null, + 'content' => null, + 'must_complete' => 1, + 'must_accept' => 1, + 'complete_day_range' => 1, + 'type' => config('constants.contract_obligation.type.received_service'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateTableSeeder.php new file mode 100644 index 0000000..d84b144 --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceContractTemplateTableSeeder.php @@ -0,0 +1,30 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'name' => 'J&T Contract Deliver Service', + 'complete_day_range' => 7, + 'status' => config('constants.contact.status.active'), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceEntitiesTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceEntitiesTableSeeder.php new file mode 100644 index 0000000..505d5d7 --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceEntitiesTableSeeder.php @@ -0,0 +1,45 @@ +insert([ + [ + 'id' => 101, + 'user_id' => 4, + 'name' => 'Siti Nurhaliza', + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'user_id' => 4, + 'name' => 'H&M', + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'user_id' => 4, + 'name' => 'J&T Deliver Man', + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServiceEntitySignaturesTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServiceEntitySignaturesTableSeeder.php new file mode 100644 index 0000000..77ed411 --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServiceEntitySignaturesTableSeeder.php @@ -0,0 +1,45 @@ +insert([ + [ + 'id' => 101, + 'entity_id' => 101, + 'type' => config('constants.entity.signature.master_key'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 102, + 'entity_id' => 102, + 'type' => config('constants.entity.signature.master_key'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 103, + 'entity_id' => 103, + 'type' => config('constants.entity.signature.master_key'), + 'status' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/CourierDeliverService/CourierDeliverServicesContractTableSeeder.php b/database/seeders/CourierDeliverService/CourierDeliverServicesContractTableSeeder.php new file mode 100644 index 0000000..9a8d26e --- /dev/null +++ b/database/seeders/CourierDeliverService/CourierDeliverServicesContractTableSeeder.php @@ -0,0 +1,40 @@ +insert([ + [ + 'id' => 101, + 'user_id' => $contract_template->user_id, + 'contract_template_id' => $contract_template->id, + 'name' => $contract_template->name, + 'in_time_contract_template' => json_encode($contract_template), + 'status' => 1, + 'completed_at' => null, + 'failed_at' => null, + 'start_at' => Carbon::now(), + 'end_at' => Carbon::now()->addDays($contract_template->complete_day_range), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') + ] + ]); + } +} \ No newline at end of file diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index e5fae99..63c5d31 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -35,6 +35,18 @@ class DatabaseSeeder extends Seeder $this->call(SodaVendorMachine\SodaVendorContractObligationsTableSeeder::class); $this->call(SodaVendorMachine\SodaVendorContractObligationDependenciesTableSeeder::class); + // Courier Deliver Servive + $this->call(CourierDeliverService\CourierDeliverServiceContractTemplateTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceContractTemplateObligationsTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceContractTemplateObligationDependenciesTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceEntitiesTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceEntitySignaturesTableSeeder::class); + + $this->call(CourierDeliverService\CourierDeliverServicesContractTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceContractEntitiesTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceContractObligationsTableSeeder::class); + $this->call(CourierDeliverService\CourierDeliverServiceContractObligationDependenciesTableSeeder::class); + DB::commit(); } } diff --git a/database/seeders/SodaVendorMachine/SodaVendorContractObligationsTableSeeder.php b/database/seeders/SodaVendorMachine/SodaVendorContractObligationsTableSeeder.php index e98c83b..64dd3fe 100644 --- a/database/seeders/SodaVendorMachine/SodaVendorContractObligationsTableSeeder.php +++ b/database/seeders/SodaVendorMachine/SodaVendorContractObligationsTableSeeder.php @@ -14,6 +14,11 @@ class SodaVendorContractObligationsTableSeeder extends Seeder * * @return void */ + + // user insert coin and select soda at vendor machine + // vendor machine drop selected soda to user + // user pickup the soda + public function run() { DB::table('contract_obligations')->insert([ diff --git a/database/seeders/SodaVendorMachine/SodaVendorContractTemplateObligationsTableSeeder.php b/database/seeders/SodaVendorMachine/SodaVendorContractTemplateObligationsTableSeeder.php index 0d4c844..1d8d79a 100644 --- a/database/seeders/SodaVendorMachine/SodaVendorContractTemplateObligationsTableSeeder.php +++ b/database/seeders/SodaVendorMachine/SodaVendorContractTemplateObligationsTableSeeder.php @@ -13,6 +13,11 @@ class SodaVendorContractTemplateObligationsTableSeeder extends Seeder * * @return void */ + + // user insert coin and select soda at vendor machine + // vendor machine drop selected soda to user + // user pickup the soda + public function run() { DB::table('contract_template_obligations')->insert([ diff --git a/database/seeders/SodaVendorMachine/SodaVendorContractTemplatesTableSeeder.php b/database/seeders/SodaVendorMachine/SodaVendorContractTemplatesTableSeeder.php index d31c18e..fc813d9 100644 --- a/database/seeders/SodaVendorMachine/SodaVendorContractTemplatesTableSeeder.php +++ b/database/seeders/SodaVendorMachine/SodaVendorContractTemplatesTableSeeder.php @@ -21,7 +21,7 @@ class SodaVendorContractTemplatesTableSeeder extends Seeder 'user_id' => 2, 'name' => 'Coca Cola Contract Service', 'complete_day_range' => 1, - 'status' => 1, + 'status' => config('constants.contact.status.active'), 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s') ] diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index effcc27..c8e022d 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -57,6 +57,20 @@ class UsersTableSeeder extends Seeder 'login_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s') + ], + [ + 'id' => 4, + 'first_name' => 'J&T', + 'last_name' => 'project', + 'username' => 'J&T', + 'email' => 'one@j-t.com', + 'password' => bcrypt('pass123'), + 'img' => null, + 'status' => 1, + 'active_at' => date('Y-m-d H:i:s'), + 'login_at' => date('Y-m-d H:i:s'), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s') ] ]); }