-
- Back to Order
-
+ @if($marking)
+
+ Back to Order
+
+ @endif
+ @if($company_module_marking)
+
+ Back to Payment and Billing
+
+ @endif
Retry Payment
diff --git a/resources/views/pages/wallet/index.blade.php b/resources/views/pages/wallet/index.blade.php
new file mode 100644
index 00000000..7a9b49ef
--- /dev/null
+++ b/resources/views/pages/wallet/index.blade.php
@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+ @include('pages.wallet.transactions')
+@endsection
diff --git a/resources/views/pages/wallet/transactions.blade.php b/resources/views/pages/wallet/transactions.blade.php
new file mode 100644
index 00000000..67a479d5
--- /dev/null
+++ b/resources/views/pages/wallet/transactions.blade.php
@@ -0,0 +1,6 @@
+
Back to Payment and Billing
+
\ No newline at end of file
diff --git a/resources/views/pages/wallet/wallets.blade.php b/resources/views/pages/wallet/wallets.blade.php
new file mode 100644
index 00000000..6abb1812
--- /dev/null
+++ b/resources/views/pages/wallet/wallets.blade.php
@@ -0,0 +1,124 @@
+
+@extends('layouts.base_portal')
+@section('inner_content')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@endsection
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 0946a13b..27c0343e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -62,6 +62,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
require __DIR__ . '/report.php';
+ require __DIR__ . '/wallet.php';
+
require __DIR__ . '/contact.php';
});
diff --git a/routes/transaction.php b/routes/transaction.php
index 3ae8e5d2..013b99af 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -14,13 +14,19 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
Route::post('/upload-verification-document/{transaction_id}', 'UploadPaymentVerificationDocumentController@upload')->name('verification.create');
Route::put('/approve/{transaction_id}/{status}', 'ApprovePaymentTransactionController@approve')->where('status', 'approve|reject')->name('approval');
});
-
+
Route::group(['prefix' => 'invoice', 'as' => 'invoice.'], function () {
route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('create');
+ route::post('/shipping-invoice/company/{company_module_id}/regenerate', 'RegenerateShippingInvoiceTransactionController@regenerate')->name('company.regenerate');
route::put('/shipping-invoice/{id}/update', 'UpdateShippingInvoiceTransactionController@update')->name('update');
route::put('/shipping-invoice/{id}/approve', 'ApproveShippingInvoiceTransactionController@approve')->name('approve');
});
+
+ Route::group(['prefix' => 'invoices', 'as' => 'invoices.'], function () {
+ route::put('/combine', 'CreateCombinedInvoicesController@combine')->name('combine');
+ });
+
route::post('/shipping-invoice/calculator', 'ShippingEstimationCalculatorController@calculate')->name('shipping.estimation.calculator');
// Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
@@ -35,4 +41,13 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
// Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
-});
\ No newline at end of file
+ Route::group(['prefix' => 'groups', 'as' => 'group.'], function () {
+ Route::post('/{transaction_ids}/create', 'CreateGroupsController@create')->name('create');
+ Route::get('/list', 'ListGroupsController@list')->name('list');
+ Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
+ Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
+ // Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
+ // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
+ });
+
+});
diff --git a/routes/wallet.php b/routes/wallet.php
new file mode 100644
index 00000000..b93a1514
--- /dev/null
+++ b/routes/wallet.php
@@ -0,0 +1,18 @@
+ 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'], function () {
+ Route::get('/', 'ListWalletController@list')->name('list');
+
+ Route::get('/company-module/{company_module_id}', 'FetchWalletByCompanyModuleController@fetch')->name('company_module.show');
+
+ Route::post('/create', 'CreateWalletController@create')->name('create');
+
+ Route::post('/topup', 'TopUpWalletController@topUp')->name('topup'); // user
+ Route::post('/credit', 'CreditWalletController@credit')->name('credit'); // admin +
+
+ Route::put('/{transaction_id}/update-status/{status}', 'UpdateStatusWalletController@updateStatus')->where('status', 'approve|reject')->name('approval');
+
+ Route::get('/reports', 'WalletReportController@walletsReport')->name('reports');
+});
diff --git a/routes/web.php b/routes/web.php
index 6bd136e1..fa13ed05 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -495,18 +495,21 @@ Route::get('/customer/summary/{year}/monthly', function ($year) {
});
-Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{inactive_end?}/{with_cbm?}', function ($active_start, $active_end, $inactive_start=null, $inactive_end=null, $with_cbm = false) {
- $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
- return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
- return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
- });
- })->pluck('id');
+Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{inactive_end?}/{with_cbm?}', function ($active_start, $active_end, $inactive_start = null, $inactive_end = null, $with_cbm = false) {
+ /* $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
+ return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
+ return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
+ });
+ })->pluck('id');
+
+ $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
+ return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
+ return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
+ });
+ })->whereNotIn('id', $activeCompanies)->get();*/
+
+ $companies = getActiveCompanies($inactive_start, $inactive_end, $active_start, $active_end);
- $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
- return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
- return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
- });
- })->whereNotIn('id', $activeCompanies)->get();
echo '
List of customers active between '. Carbon::parse($active_start)->format('d/m/Y'). ' - '. Carbon::parse($active_end)->format('d/m/Y').' & inactive between '. Carbon::parse($inactive_start)->format('d/m/Y'). ' - '. Carbon::parse($inactive_end)->format('d/m/Y').'
';
echo '
@@ -1034,6 +1037,40 @@ Route::get('/packing-lists/delete-duplicated', function(Request $request){
}
});
+Route::get('/wallet/{marking}/details', function ($marking) {
+ $connection = CompanyConnection::where('invitee_reference', $marking)->first();
+ $id = $connection->invitee->id;
+ return view('pages.wallet.index', ['id' => $id, 'marking' => $marking]);
+})->name('wallet.details');
+
+Route::get('/wallet/audit', function (Request $request) {
+ $wallets = \App\Models\Wallet::all();
+
+ $i = 0;
+ foreach ($wallets as $wallet){
+ $topups = 0;
+ $credit = 0;
+ $payments = 0;
+ $debit = 0;
+
+ foreach ($wallet->transactions as $transaction){
+ if(!in_array((int) $transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) continue;
+ if((int) $transaction->type === TransactionType::TOP_UP) {
+ $topups += (float) $transaction->amount;
+ }
+ if((int) $transaction->type === TransactionType::CREDIT_NOTE) $credit += (float) $transaction->amount;
+ if((int) $transaction->type === TransactionType::PAYMENT) $payments += (float) $transaction->amount;
+ if((int) $transaction->type === TransactionType::DEBIT_NOTE) $debit += (float) $transaction->amount;
+ }
+ if((round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) AND $wallet->amount > -0.01) continue;
+
+ $i++;
+
+ echo $i.". Marking: ". $wallet->owner->connections->first()->invitee_reference ."(".$wallet->id.")
Current Balance: ". $wallet->amount ."
Audit Balance: ". (($topups + $credit) - ($payments + $debit)) ."
Difference: ". round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) ."
";
+ }
+});
+
+
Route::get('/final-duplicated-invoice-debug', function(){
$duplicatedTransactions = Transaction::select(DB::raw('owner_type, owner_id, receiver, type, GROUP_CONCAT(id) as transaction_ids, COUNT(*) as count'))
->whereNotIn('status', [ApprovalStatus::REJECTED,ApprovalStatus::SUSPENDED,ApprovalStatus::EXPIRED])
@@ -1057,31 +1094,31 @@ Route::get('/final-duplicated-invoice-debug', function(){
Invoices |
';
-foreach ($duplicatedTransactions as $transaction) {
- $transactionIds = explode(',', $transaction->transaction_ids);
+ foreach ($duplicatedTransactions as $transaction) {
+ $transactionIds = explode(',', $transaction->transaction_ids);
- $duplicatedInvoice = Transaction::whereIn('id', $transactionIds)->get();
-
- $order_reference = $duplicatedInvoice->first()->owner->owner->reference ?? null;
+ $duplicatedInvoice = Transaction::whereIn('id', $transactionIds)->get();
+
+ $order_reference = $duplicatedInvoice->first()->owner->owner->reference ?? null;
- if ($transaction->type == TransactionType::PAYMENT) {
- $order_reference = $duplicatedInvoice->first()->owner->owner->owner->reference ?? null;
- }
-
- echo '';
- // echo '| ' . $transaction->owner_type . ' | ';
- // echo '' . $transaction->owner_id . ' | ';
- echo '' . $transaction->receiver . ' | ';
- echo '' . ''. $order_reference .'' . ' | ';
- echo '' . $transactionType[$transaction->type] . ' | ';
- echo '' . count($transactionIds) . ' | ';
- echo '';
- foreach ($duplicatedInvoice as $invoice) {
- echo ' ID: ' . $invoice->id . '. Status: ' . $approvalStatusArray[$invoice->status] . '. Amount: ' . $invoice->amount . ' ';
+ if ($transaction->type == TransactionType::PAYMENT) {
+ $order_reference = $duplicatedInvoice->first()->owner->owner->owner->reference ?? null;
}
- echo' | ';
- echo '
';
-}
-echo '
';
+
+ echo '
';
+ // echo '| ' . $transaction->owner_type . ' | ';
+ // echo '' . $transaction->owner_id . ' | ';
+ echo '' . $transaction->receiver . ' | ';
+ echo '' . ''. $order_reference .'' . ' | ';
+ echo '' . $transactionType[$transaction->type] . ' | ';
+ echo '' . count($transactionIds) . ' | ';
+ echo '';
+ foreach ($duplicatedInvoice as $invoice) {
+ echo ' ID: ' . $invoice->id . '. Status: ' . $approvalStatusArray[$invoice->status] . '. Amount: ' . $invoice->amount . ' ';
+ }
+ echo' | ';
+ echo '
';
+ }
+ echo '';
});
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 547152f6..e3a47be4 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -3,15 +3,16 @@
namespace Tests;
use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Foundation\Application;
trait CreatesApplication
{
/**
* Creates the application.
*
- * @return \Illuminate\Foundation\Application
+ * @return Application
*/
- public function createApplication()
+ public function createApplication(): Application
{
$app = require __DIR__.'/../bootstrap/app.php';
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2932d4a6..1d3747f2 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,9 +2,52 @@
namespace Tests;
+use Faker\Factory as Faker;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Support\Facades\Artisan;
+use JWTAuth;
abstract class TestCase extends BaseTestCase
{
- use CreatesApplication;
+
+ use CreatesApplication, RefreshDatabase, DatabaseMigrations;
+
+ protected $faker;
+
+
+ /* public function actingAs($user, $driver = "api"): TestCase
+ {
+ $token = JWTAuth::fromUser($user);
+ $this->withHeader('Authorization', "Bearer {$token}");
+ parent::actingAs($user);
+
+ return $this;
+ }*/
+
+
+ /**
+ * Sets up the tests
+ */
+ public function setUp(): void
+ {
+ parent::setUp();
+
+ $this->faker = Faker::create();
+
+ Artisan::call('migrate');
+ }
+
+
+ /**
+ * Rolls back migrations
+ */
+ public function tearDown(): void
+ {
+ Artisan::call('migrate:rollback');
+
+ parent::tearDown();
+ }
+
}
diff --git a/tests/Unit/AuthenticationTest.php b/tests/Unit/AuthenticationTest.php
new file mode 100644
index 00000000..023a9314
--- /dev/null
+++ b/tests/Unit/AuthenticationTest.php
@@ -0,0 +1,231 @@
+create();
+ $this->actingAs($user)
+ ->assertAuthenticatedAs($user)
+ ->get(route('login'))
+ ->assertSee('Sign In');
+ }
+
+
+ /**
+ * Empty email and password can not be null
+ * @return void
+ */
+ public function testBothEmailAndPasswordAreRequiredToLogin()
+ {
+ $response = $this->post(route($this->loginRoute), [
+ 'email' => '',
+ 'password' => ''
+ ]);
+
+ $response->assertStatus(500)
+ ->assertSee('Authentication failed');
+ //todo we need to implement Laravel Requests for proper error handling
+ }
+
+ /**
+ * Test a user with Valid credentials can login
+ * @return void
+ */
+ public function testUserWithValidCredentialsCanLogin()
+ {
+ $user = User::factory()->create([
+ 'password' => bcrypt($password = 'password')
+ ]);
+ $response = $this->post(route($this->loginRoute), [
+ 'email' => $user->email,
+ 'password' => $password
+ ]);
+
+ $response->assertStatus(200)
+ ->assertSee('You have successfully logged in to your account')
+ ->assertSee('access_token');
+ }
+
+ /**
+ * Invalid Users get an error
+ * * @return void
+ */
+ public function testUserWithInvalidCredentialCanNotLogin()
+ {
+ $user = User::factory()->create([
+ 'password' => bcrypt($password = 'password')
+ ]);
+
+ $response = $this->post((route($this->loginRoute)), [
+ 'email' => $user->email,
+ 'password' => 'wrongpassword'
+ ]);
+
+ $response->assertStatus(401)
+ ->assertSee('Authentication failed')
+ ->assertSee('These credentials do not match our records.');
+ }
+
+ /**
+ * test User can Logout
+ * @return void
+ */
+ public function testUserCanLogout()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('GET', route('api.account.authentication.logout'));
+
+
+ $response->assertStatus(200)
+ ->assertSee('Logout Successful')
+ ->assertSee('You have successfully logged out of your account')
+ ->assertDontSee('access_token');
+
+ }
+
+ /**
+ * test Refresh token
+ * @return void
+ */
+ public function testUserCanRefreshToken()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('GET', route('api.account.authentication.refresh'));
+
+ $response->assertStatus(200)
+ ->assertSee('Refresh Authentication Successful')
+ ->assertSee('You have successfully your account authentication')
+ ->assertJsonStructure([
+ 'title',
+ 'message',
+ 'payload',
+ ]);
+
+
+ }
+
+ /**
+ * test forgot password
+ * @return void
+ */
+ public function testForgotPassword()
+ {
+ $route = 'api.account.authentication.password.forget';
+
+ $user = User::factory()->create();
+
+
+ $response = $this->post(route($route), [
+ 'email' => $user->email
+ ]);
+ $response->assertStatus(200)
+ ->assertSee('Reset Password Successful')
+ ->assertSee('Reset Password Successful')
+ ->assertSee('You have successfully sent you an email to reset your password');
+
+ }
+
+ /**
+ * test reset password
+ * @return void
+ */
+ public function testUserGetResetPasswordLink()
+ {
+ $route = 'api.account.authentication.password.reset';
+
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('POST', route($route), [
+ 'password' => 'newPassword',
+ 'confirmPassword' => 'newPassword'
+ ]);
+
+ $response->assertStatus(500)
+ ->assertSee('Password Change failed');
+ }
+
+
+ /*
+ * todo
+ * $response->assertStatus(200)
+ ->assertSee('Reset Password Successful')
+ ->assertSee('Reset Password Successful')
+ ->assertSee('You have successfully sent you an email to reset your password');*/
+
+ /*}*/
+
+ /**
+ * test user can verify email
+ * @return void
+ */
+ /*public function testCanVerifyEmail()
+ {
+ $route = 'api.account.email.verify';
+ $user = User::factory()->create();
+
+ $token = Password::createToken($user);
+
+ dd($token);
+
+ $response = $this->actingAs($user)
+ ->post(route($route), [
+ 'token' => $token
+ ])->assertStatus(200);
+
+ }*/
+
+ /**
+ * test Resend verification email
+ * @return void
+ */
+ public function testResendVerification()
+ {
+ $route = 'api.account.email.verification.resend';
+ $user = User::factory()->create();
+ $response = $this->post(route($route), [
+ 'user_id' => $user->id
+ ])
+ ->assertStatus(200)
+ ->assertSee('Resend Verification Email Successful')
+ ->assertSee('Successfully resent a new verification email');
+
+ }
+
+
+}
diff --git a/tests/Unit/BrowserSessionsTest.php b/tests/Unit/BrowserSessionsTest.php
new file mode 100644
index 00000000..dfb20f2c
--- /dev/null
+++ b/tests/Unit/BrowserSessionsTest.php
@@ -0,0 +1,26 @@
+create();
+ $this->actingAs($user);
+
+ $response = $this->get('/user/other-browser-sessions', [
+ 'password' => 'password',
+ ]);
+
+ $response->assertSessionHasNoErrors();
+ }
+
+}
diff --git a/tests/Unit/EmailVerificationTest.php b/tests/Unit/EmailVerificationTest.php
new file mode 100644
index 00000000..f409fdb0
--- /dev/null
+++ b/tests/Unit/EmailVerificationTest.php
@@ -0,0 +1,101 @@
+create();
+
+ $response = $this->post('api/v1/account/authentication/login/check_email', [
+ 'email' => $user->email
+ ]);
+
+
+ $response->assertStatus(200)
+ ->assertSee("User found Successful")
+ ->assertSee("Account Already Exists");
+
+ }
+
+ public function test_check_unknown_email()
+ {
+
+ $response = $this->post('api/v1/account/authentication/login/check_email', [
+ 'email' => 'random_email@test.com'
+ ]);
+
+ $response->assertStatus(404)
+ ->assertSee("User found failed")
+ ->assertSee("Unable to find any record based on the criteria provided");
+
+ }
+
+
+ //todo test post success email verification
+
+ public function test_email_verification()
+ {
+
+ $user = User::factory()->create();
+
+ //todo create a new email verification token, not post request method found
+
+ $response = $this->actingAs($user)->post('api/v1/account/email/verify', [
+ 'token' => 'simple_string'
+ ]);
+ //todo need to register notification services on IOC
+
+ $response->assertStatus(404);
+ }
+
+ public function test_resend_email()
+ {
+
+ $user = User::factory()->create();
+
+ //create a new email verification token, not post request method found
+
+ $response = $this->actingAs($user)->post('api/v1/account/email/verification/resend', [
+
+ 'user_id' => $user->id
+ ]);
+
+ $response->assertStatus(200)
+ ->assertSee("Resend Verification Email Successful")
+ ->assertSee("Successfully resent a new verification email");
+ }
+
+ public function test_change_email()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+ //create a new email verification token, not post request method found
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('POST', 'api/v1/company/team/create', [
+ 'email' => "newemail@test.abc"
+ ]);
+
+//todo add user payload to the response and assert json
+ $response->assertStatus(200)
+ ->assertSee("Updated Email Successful")
+ ->assertSee("Successfully updated email");
+
+ }
+}
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
deleted file mode 100644
index b22f346b..00000000
--- a/tests/Unit/ExampleTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-assertTrue(true);
-
- }
-}
diff --git a/tests/Unit/PasswordRestTest.php b/tests/Unit/PasswordRestTest.php
new file mode 100644
index 00000000..8949739f
--- /dev/null
+++ b/tests/Unit/PasswordRestTest.php
@@ -0,0 +1,46 @@
+create();
+
+ $response = $this->actingAs($user)->post('api/v1/account/authentication/password/forget', [
+ 'email' => $user->email
+ ]);
+
+ $response->assertStatus(200)
+ ->assertSee("Reset Password Successful")
+ ->assertSee("You have successfully sent you an email to reset your password");
+
+ //assert a reset data was saved in the database
+ $this->assertDatabaseHas('password_resets', [
+ 'user_id' => $user->id,
+ ]);
+
+ //todo register all classes in the IOC
+
+ //assert a verification Link was generated
+
+
+ // Queue::assertDispatched(ProcessImage::class, function ($job) {
+ // return $job->image === 'image.jpg';
+ // });
+
+
+ //get the token and pass it on the verification link
+
+ }
+
+}
diff --git a/tests/Unit/RegistrationTest.php b/tests/Unit/RegistrationTest.php
new file mode 100644
index 00000000..1073c3e5
--- /dev/null
+++ b/tests/Unit/RegistrationTest.php
@@ -0,0 +1,62 @@
+post('api/v1/account/invite/registration', [
+ 'company_id' => 1,
+ 'name' => 'Test User',
+ 'email' => 'test@example.com',
+ 'phone' => '899990989',
+ 'wechat_id' => '5666',
+ 'company_name' => 'test company co',
+ 'password' => 'password',
+ 'password_confirmation' => 'password',
+ 'contact_email' => "contact@email.com",
+ ]);
+
+
+ $response->assertStatus(404);
+
+ }
+
+ public function test_new_users_can_register()
+ {
+ $response = $this->post('/api/v1/account/registration', [
+ 'type' => 1,
+ 'name' => 'Test User',
+ 'email' => 'test@example.com',
+ 'phone' => '899990989',
+ 'wechat_id' => '5666',
+ 'company_name' => 'test company co',
+ 'password' => 'password',
+ 'password_confirmation' => 'password',
+ 'contact_email' => "contact@email.com",
+ ]);
+
+ $this->assertDatabaseHas('users', [
+ 'id' => 1,
+ 'email' => 'test@example.com',
+ 'name' => 'Test User',
+ ]);
+
+ //todo an error experienced on line $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
+
+ //todo 1. assert a user was logged in 2. assert a user was redirected 3. assert user has a token
+ }
+ */
+}
diff --git a/tests/Unit/UsersTest.php b/tests/Unit/UsersTest.php
new file mode 100644
index 00000000..ff0ad36e
--- /dev/null
+++ b/tests/Unit/UsersTest.php
@@ -0,0 +1,180 @@
+create();
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('POST', route('api.account.user.show', [
+ 'user_id' => $user->id
+ ]));
+
+ $response->assertStatus(200)
+ ->assertSee('Fetch Users Successful')
+ ->assertSee('You have successfully retrieved the user');
+
+ }
+
+ /**
+ * Get User by email
+ *
+ * @return void
+ */
+ public function test_get_fetch_user_by_email()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('GET', route('api.account.user.company', $user->email), [
+ 'email' => $user->email
+ ]);
+
+ //todo fix the invitee issue
+
+ /* $response->assertStatus(200)
+ ->assertSee('Fetch Users')
+ ->assertSee('You have successfully retrieved the user by email'); */
+
+ $response->assertStatus(500);
+ }
+
+ /**
+ * Get a List of all users test
+ * @return void
+ */
+ public function test_list_users()
+ {
+ $user = User::factory()->create([
+ 'type' => RoleTypes::ADMIN,
+ 'status' => ApprovalStatus::APPROVED
+ ]);
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('GET', 'api/v1/account/user/list?&filters=null}');
+
+ $response->assertStatus(404);
+
+ //todo add a default return list without filter or null filters
+
+/*
+ $response->assertStatus(200)
+ ->assertSee('Retrieved Companies Successful')
+ ->assertSee('You have successfully retrieved a list of users');*/
+ }
+
+
+ /**
+ * Test Can Create an Admin User
+ *
+ * @return void
+ */
+ public function test_create_an_admin_user()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('POST', route('api.account.user.admin.create'),
+ [
+ 'name' => 'Test Admin',
+ 'email' => 'admin@example.com',
+ 'password' => 'password',
+ 'password_confirmation' => 'password',
+ ]);
+
+
+ $response->assertStatus(200)
+ ->assertSee('Created Account')
+ ->assertSee('You have successfully created a new Account');
+ }
+
+
+ /**
+ * Test Can create a user
+ *
+ * @return void
+ */
+ public function test_can_update_user()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('PUT', route('api.account.user.update', $user->id), [
+ 'name' => 'Test Admin',
+ /*'email' => 'admin@example.com',
+ 'password' => 'password',
+ 'password_confirmation' => 'password',*/
+ ]);
+ $response->assertStatus(200)
+ ->assertSee('Updated User Profile')
+ ->assertSee('You have successfully updated the User Profile');
+
+ }
+
+
+ /**
+ * Test Can delete a user
+ *
+ * @return void
+ */
+ public function test_can_delete_user_profile()
+ {
+ $user = User::factory()->create();
+
+ $token = JWTAuth::fromUser($user);
+
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $token,
+ ])->json('DELETE', route('api.account.user.delete', $user->id), [
+ 'id' => $user->id
+ ]);
+
+ $response->assertStatus(200)
+ ->assertSee('Delete User Successful')
+ ->assertSee('You have successfully deleted the User');
+
+ }
+
+
+}
diff --git a/tests/_data/.gitkeep b/tests/_data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/_output/.gitignore b/tests/_output/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/tests/_output/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
new file mode 100644
index 00000000..42dc8471
--- /dev/null
+++ b/tests/_support/AcceptanceTester.php
@@ -0,0 +1,28 @@
+wantTo('Test the Authentication Flow');
+ $I->amOnPage('/');
+ }
+
+ /**
+ * test if the home page is loaded
+ * @param AcceptanceTester $I
+ * @return void
+ */
+ public function tryToTestIfWelcomePageIsLoaded(AcceptanceTester $I)
+ {
+
+ $I->wantTo('Check if the home page works.');
+ $I->amOnPage('/');
+ $I->see('SIGN IN');
+ $I->see('To keep using the service please sign in with your personal info');
+ $I->see('New Customer? Create Account');
+ }
+
+ /**
+ * test if admin can log in
+ * @param AcceptanceTester $I
+ * @return void
+ */
+ public function tryToTestIfAdminCanLogin(AcceptanceTester $I)
+ {
+
+
+ // Fill out the login form
+ $I->fillField('email', 'omair@cief-malaysia.com');
+ $I->fillField('password', '123456abcabc');
+ $I->click(['css' => '.btn.btn-block.btn-lg.b-rad-none.no-border']);
+
+ $I->wait(5); // 2 seconds delay
+
+ $I->expectTo('be redirected to the dashboard');
+ $I->seeCurrentUrlEquals('/dashboard');
+ $I->see('Dashboard');
+ $I->see('NEW CUSTOMERS');
+ $I->see('Unclaimed Packing Lists');
+ $I->see('Identification Verification');
+ $I->see('ACTIVATED ORDERS');
+ }
+}
diff --git a/tests/acceptance/DashboardCest.php b/tests/acceptance/DashboardCest.php
new file mode 100644
index 00000000..f127ac58
--- /dev/null
+++ b/tests/acceptance/DashboardCest.php
@@ -0,0 +1,49 @@
+wantTo('Test All Dashboard Data is Loaded');
+ $I->amOnPage('/dashboard');
+ }
+
+ /**
+ * test if the sidebar was loaded
+ * @param AcceptanceTester $I
+ * @return void
+ */
+ public function tryToTestIfAllAdminSidebarAreLoaded(AcceptanceTester $I)
+ {
+ $I->amOnPage('/dashboard');
+ $I->see('DASHBOARD');
+ $I->see('CUSTOMERS');
+ $I->see('DELIVERY LIST');
+ $I->see('CONTAINERS');
+ $I->see('PAYMENT AND BILLING');
+
+ }
+
+
+ /**
+ * test if the dashboard content is Loaded
+ * @param AcceptanceTester $I
+ * @return void
+ */
+ public function tryToTestAllDashboardComponentLoaded(AcceptanceTester $I)
+ {
+ $I->amOnPage('/dashboard');
+ $I->see('Dashboard');
+ $I->see('NEW CUSTOMERS');
+ $I->see('Unclaimed Packing Lists');
+ $I->see('Identification Verification');
+ $I->see('ACTIVATED ORDERS');
+ $I->see('PENDING SHIPMENT');
+
+ //delay a few second
+ $I->wait(5); // 2 seconds delay
+
+ $I->see('Unclaimed Packing Lists');
+ }
+}
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
new file mode 100644
index 00000000..303c8ac7
--- /dev/null
+++ b/tests/functional.suite.yml
@@ -0,0 +1,13 @@
+# Codeception Test Suite Configuration
+#
+# Suite for functional tests
+# Emulate web requests and make application process them
+# Include one of framework modules (Symfony2, Yii2, Laravel5, Phalcon4) to use it
+# Remove this suite if you don't use frameworks
+
+actor: FunctionalTester
+modules:
+ enabled:
+ # add a framework module here
+ - \Helper\Functional
+ step_decorators: ~
\ No newline at end of file
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
new file mode 100644
index 00000000..00565f69
--- /dev/null
+++ b/tests/unit.suite.yml
@@ -0,0 +1,10 @@
+# Codeception Test Suite Configuration
+#
+# Suite for unit or integration tests.
+
+actor: UnitTester
+modules:
+ enabled:
+ - Asserts
+ - \Helper\Unit
+ step_decorators: ~
\ No newline at end of file
-
+ 