diff --git a/resources/views/swagger/json.blade.php b/resources/views/swagger/json.blade.php
index 4fa056ef..cd4df686 100644
--- a/resources/views/swagger/json.blade.php
+++ b/resources/views/swagger/json.blade.php
@@ -107,6 +107,54 @@
}
}
},
+ "/packing_list/container/inbound-custom-cleared": {
+ "get": {
+ "tags": [
+ "Packing"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "operationId": "listPackingIn",
+ "summary": "List packing",
+ "description": "",
+ "parameters": [
+ {
+ "name": "filter",
+ "in": "query",
+ "description": "Filters",
+ "required": false,
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "successful operation",
+ "headers": {
+ "X-Expires-After": {
+ "type": "string",
+ "format": "date-time",
+ "description": "date in UTC when token expires"
+ },
+ "X-Rate-Limit": {
+ "type": "integer",
+ "format": "int32",
+ "description": "calls per hour allowed by the user"
+ }
+ },
+ "schema": {
+ "type": "string"
+ }
+ },
+ "422": {
+ "description": "Invalid input supplied"
+ }
+ }
+ }
+ },
"/packing_list/list": {
"get": {
"tags": [
@@ -2982,7 +3030,7 @@
}
}
},
- "/account/registration/registration": {
+ "/account/registration": {
"post": {
"tags": [
"Account",
diff --git a/routes/account.php b/routes/account.php
index 7a9e08df..ff6a9960 100644
--- a/routes/account.php
+++ b/routes/account.php
@@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Route;
Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account.'], function () {
Route::post('/registration', 'CreateCustomerController@create')->name('registration.register');
+ Route::post('/invite/registration', 'CreateInvitedCustomerController@create')->name('registration.invite.register');
Route::group(['prefix' => 'authentication', 'as' => 'authentication.'], function () {
Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () {
diff --git a/routes/packing_list.php b/routes/packing_list.php
index ea64c7e1..4eb27ddf 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -16,6 +16,8 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
Route::post('/create', 'CreateContainerController@create')->name('create');
Route::put('/update/{id}', 'UpdateContainerController@update')->name('update');
Route::delete('/delete/{id}', 'DeleteContainerController@delete')->name('delete');
+
+ Route::put('/assign-packing_list/{id}', 'AssignPackingListContainerController@assign')->name('assign.packing_list');
});
Route::group(['namespace' => 'Packages', 'as' => 'package.', 'prefix' => 'package'], function () {
@@ -24,6 +26,8 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
Route::post('/create', 'CreatePackageController@create')->name('create');
Route::put('/update/{id}', 'UpdatePackageController@update')->name('update');
Route::delete('/delete/{id}', 'DeletePackageController@delete')->name('delete');
+ Route::get('/inbound-custom-cleared', 'InboundCustomClearedController@list')->name('list.inbound.custom.cleared');
+ Route::put('/switch-packing-list/{id}', 'SwitchPackagePackingListController@switch')->name('switch.packing_list');
Route::group(['namespace' => 'PackageItems', 'prefix' => 'item', 'as' => 'item.'], function () {
Route::get('/{id}/show', 'FetchPackageItemController@fetch')->name('show');
diff --git a/routes/web.php b/routes/web.php
index f4d71a9c..68121d43 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,8 @@ use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
use App\Models\CompanyConnection;
+use Illuminate\Support\Facades\Crypt;
+use App\Models\Container;
use Illuminate\Support\Facades\Route;
/*
@@ -21,9 +23,9 @@ use Illuminate\Support\Facades\Route;
require __DIR__ . '/template.php';
-Route::get('/', function () {
- return view('welcome');
-});
+Route::get('', function () {
+ return view('pages.accounts.login');
+})->name('login');
Route::group(['prefix' => 'swagger'], function () {
Route::get('/', function () {
@@ -34,9 +36,9 @@ Route::group(['prefix' => 'swagger'], function () {
});
});
-Route::get('', function () {
- return view('pages.accounts.login');//temporary showing welcome page.
-})->name('login');
+Route::get('/business/claim/{hash}', function ($hash) {
+ return view('pages.accounts.claim_business', ['id' => Crypt::decryptString($hash)]);
+})->name('company.claim');
Route::get('/account/email/verification/{token}', function ($token) {
return view('pages.accounts.email_verified', ['token' => $token]);
@@ -70,6 +72,11 @@ Route::get('/containers', function () {
return view('pages.containers');
})->name('containers');
+Route::get('/container/show/{reference}', function ($reference) {
+ $container = Container::where('reference', $reference)->first();
+ return view('pages.templates.warehouseFlow', ['id' => $container->id]);
+})->name('container.show');
+
Route::get('/customer/{marking}', function ($marking) {
$connection = CompanyConnection::where('invitee_reference', $marking)->first();
$id = $connection->invitee->company->id;
@@ -97,6 +104,10 @@ Route::get('/containers/refresh', function(){
})->name('containers.refresh');
+Route::get('/shipping-queue', function () {
+ return view('pages.templates.shippingQueue');
+})->name('shipping-queue');
+
Route::get('/deliveries/refresh', function(){
FetchDeliveryListFromVTPortalJob::dispatch();
@@ -107,16 +118,6 @@ Route::get('/deliveries/refresh', function(){
Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
-Route::get('/report/customclearance', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
-
-Route::get('/report/customclearance/{orderid}', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
-
-//Route::get('/test', function(){
-// $addresses = \App\Models\Address::all();
-// foreach ($addresses as $address){
-// $address->street_one = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_one, $address->district, $address->postcode);
-// $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
-// $address->save();
-// }
-//})->name('test');
-
+Route::get('/payments-and-billing', function () {
+ return view('pages.templates.paymentsBilling');
+})->name('payments-and-billing');
}})
+