diff --git a/app/Entities/Partners/Partner.php b/app/Entities/Partners/Partner.php index 3e83e8a..32d82fb 100644 --- a/app/Entities/Partners/Partner.php +++ b/app/Entities/Partners/Partner.php @@ -9,12 +9,7 @@ class Partner extends Model { use OwnedByAgency; - protected $fillable = ['name', 'type_id', 'email', 'phone', 'pic', 'address', 'notes', 'is_active', 'owner_id']; - - public function getTypeAttribute() - { - return $this->type_id == 1 ? trans('partner.types.customer') : trans('partner.types.vendor'); - } + protected $fillable = ['name', 'email', 'phone', 'pic', 'address', 'notes', 'is_active', 'owner_id']; public function owner() { diff --git a/app/Entities/Projects/ProjectsRepository.php b/app/Entities/Projects/ProjectsRepository.php index 43ca468..3150e60 100755 --- a/app/Entities/Projects/ProjectsRepository.php +++ b/app/Entities/Projects/ProjectsRepository.php @@ -62,7 +62,6 @@ class ProjectsRepository extends BaseRepository { $newCustomer = new Partner; $newCustomer->name = $customerName; - $newCustomer->type_id = 1; $newCustomer->email = $customerEmail; $newCustomer->owner_id = auth()->user()->agency->id; $newCustomer->save(); diff --git a/app/Http/Controllers/Partners/PartnersController.php b/app/Http/Controllers/Partners/PartnersController.php index 80d9ebd..79c3320 100644 --- a/app/Http/Controllers/Partners/PartnersController.php +++ b/app/Http/Controllers/Partners/PartnersController.php @@ -42,12 +42,7 @@ class PartnersController extends Controller */ public function create() { - $partnerTypes = [ - 1 => trans('partner.types.customer'), - 2 => trans('partner.types.vendor'), - ]; - - return view('partners.create', compact('partnerTypes')); + return view('partners.create'); } /** @@ -60,7 +55,6 @@ class PartnersController extends Controller { $newPartnerData = $this->validate($request, [ 'name' => 'required|max:60', - 'type_id' => 'required|numeric', 'email' => 'nullable|email|unique:partners,email', 'phone' => 'nullable|max:255', 'pic' => 'nullable|max:255', @@ -96,12 +90,7 @@ class PartnersController extends Controller */ public function edit(Partner $partner) { - $partnerTypes = [ - 1 => trans('partner.types.customer'), - 2 => trans('partner.types.vendor'), - ]; - - return view('partners.edit', compact('partnerTypes', 'partner')); + return view('partners.edit', compact('partner')); } /** @@ -115,7 +104,6 @@ class PartnersController extends Controller { $partnerData = $this->validate($request, [ 'name' => 'required|max:60', - 'type_id' => 'required|numeric', 'email' => 'nullable|email|unique:partners,email,'.$partner->id, 'phone' => 'nullable|max:255', 'pic' => 'nullable|max:255', diff --git a/database/factories/PartnerFactory.php b/database/factories/PartnerFactory.php index 5d94866..0e165f1 100644 --- a/database/factories/PartnerFactory.php +++ b/database/factories/PartnerFactory.php @@ -8,31 +8,8 @@ $factory->define(Partner::class, function (Faker $faker) { return [ 'name' => $faker->company, - 'type_id' => 1, // 1:Customer, 2:Vendor 'owner_id' => function () { return factory(Agency::class)->create()->id; }, ]; -}); - -$factory->defineAs(Partner::class, 'customer', function (Faker $faker) { - - return [ - 'name' => $faker->company, - 'type_id' => 1, // 1:Customer, 2:Vendor - 'owner_id' => function () { - return factory(Agency::class)->create()->id; - }, - ]; -}); - -$factory->defineAs(Partner::class, 'vendor', function (Faker $faker) { - - return [ - 'name' => $faker->company, - 'type_id' => 2, // 1:Customer, 2:Vendor - 'owner_id' => function () { - return factory(Agency::class)->create()->id; - }, - ]; -}); +}); \ No newline at end of file diff --git a/database/migrations/2017_10_26_134455_create_partners_table.php b/database/migrations/2017_10_26_134455_create_partners_table.php index aa42299..9c55395 100644 --- a/database/migrations/2017_10_26_134455_create_partners_table.php +++ b/database/migrations/2017_10_26_134455_create_partners_table.php @@ -16,7 +16,6 @@ class CreatePartnersTable extends Migration Schema::create('partners', function (Blueprint $table) { $table->increments('id'); $table->string('name', 60); - $table->unsignedTinyInteger('type_id'); $table->string('email')->nullable()->unique(); $table->string('phone')->nullable(); $table->string('pic')->nullable(); diff --git a/resources/views/partners/create.blade.php b/resources/views/partners/create.blade.php index 33f16c6..cc94a6e 100644 --- a/resources/views/partners/create.blade.php +++ b/resources/views/partners/create.blade.php @@ -19,7 +19,6 @@