Skip to content

Commit

Permalink
fix-tests-5.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
harshjagad20-dev authored and mohitpanjwani committed Dec 7, 2021
1 parent 5a7b515 commit fe66b8b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 162 deletions.
83 changes: 0 additions & 83 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Schema;
use Laravel\Sanctum\HasApiTokens;
use Silber\Bouncer\BouncerFacade;
Expand Down Expand Up @@ -266,87 +264,6 @@ public function getAvatarAttribute()
return 0;
}

public static function createCustomer($request)
{
$data = $request->only([
'name',
'email',
'phone',
'company_name',
'contact_name',
'website',
'enable_portal',
'invoice_prefix',
'estimate_prefix',
'payment_prefix'
]);

$data['creator_id'] = Auth::id();
$data['company_id'] = $request->header('company');
$data['role'] = 'customer';
$data['password'] = Hash::make($request->password);
$customer = User::create($data);

$customer['currency_id'] = $request->currency_id;
$customer->save();

if ($request->addresses) {
foreach ($request->addresses as $address) {
$customer->addresses()->create($address);
}
}

$customFields = $request->customFields;

if ($customFields) {
$customer->addCustomFields($customFields);
}

$customer = User::with('billingAddress', 'shippingAddress', 'fields')->find($customer->id);

return $customer;
}

public static function updateCustomer($request, $customer)
{
$data = $request->only([
'name',
'currency_id',
'email',
'phone',
'company_name',
'contact_name',
'website',
'enable_portal',
'invoice_prefix',
'estimate_prefix',
'payment_prefix'
]);

$data['role'] = 'customer';
if ($request->has('password')) {
$customer->password = Hash::make($request->password);
}
$customer->update($data);

$customer->addresses()->delete();
if ($request->addresses) {
foreach ($request->addresses as $address) {
$customer->addresses()->create($address);
}
}

$customFields = $request->customFields;

if ($customFields) {
$customer->updateCustomFields($customFields);
}

$customer = User::with('billingAddress', 'shippingAddress', 'fields')->find($customer->id);

return $customer;
}

public function setSettings($settings)
{
foreach ($settings as $key => $value) {
Expand Down
12 changes: 0 additions & 12 deletions tests/Feature/Admin/RecurringInvoiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,7 @@

$recurringInvoice = collect($recurringInvoice)
->only([
'starts_at',
'send_automatically',
'next_invoice_at',
'frequency',
'limit_by',
'limit_count',
'limit_date'
])
->toArray();

Expand Down Expand Up @@ -96,13 +90,7 @@

$new_recurringInvoice = collect($new_recurringInvoice)
->only([
'starts_at',
'send_automatically',
'next_invoice_at',
'frequency',
'limit_by',
'limit_count',
'limit_date'
])
->toArray();

Expand Down
67 changes: 0 additions & 67 deletions tests/Unit/Model/UserTest.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?php

use Crater\Models\Address;
use Crater\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;

beforeEach(function () {
Expand All @@ -16,73 +14,8 @@
$this->assertTrue($user->currency()->exists());
});

test('user has many addresses', function () {
$user = User::factory()->hasAddresses(2)->create();

$this->assertTrue($user->addresses()->exists());
});

test('user belongs to many companies', function () {
$user = User::factory()->hasCompanies(5)->create();

$this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $user->companies);
});

it('user has one billing address', function () {
$user = User::factory()->has(Address::factory()->state([
'type' => Address::BILLING_TYPE,
]))->create();

$this->assertTrue($user->billingAddress()->exists());
});

it('user has one shipping address', function () {
$user = User::factory()->has(Address::factory()->state([
'type' => Address::SHIPPING_TYPE,
]))->create();

$this->assertTrue($user->shippingAddress()->exists());
});

test('create customer', function () {
$customer = User::factory()->raw([
'role' => 'customer',
]);

$request = new Request();

$request->replace($customer);

$response = User::createCustomer($request);

$this->assertDatabaseHas('users', [
'name' => $customer['name'],
'email' => $customer['email'],
'role' => $customer['role'],
]);
});

test('update customer', function () {
$customer = User::factory()->create([
'role' => 'customer',
]);

$customer2 = User::factory()->raw([
'role' => 'customer',
]);

$request = new Request();

$request->replace($customer2);

$updateCustomer = User::updateCustomer($request, $customer);

$newCustomer = User::find($customer->id);

$this->assertDatabaseHas('users', [
'id' => $customer->id,
'name' => $customer2['name'],
'email' => $customer2['email'],
'role' => $customer2['role'],
]);
});

0 comments on commit fe66b8b

Please sign in to comment.