mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/izyim.git
synced 2026-08-19 04:24:00 +00:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # app/Http/Controllers/Companies/CompanyController.php # routes/api.php
This commit is contained in:
+15
-15
@@ -35,40 +35,40 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
|
||||
Route::get('/list/{pagination?}', 'CompanyController@index')->name('list');
|
||||
|
||||
// search companies
|
||||
Route::get('/search', 'CompanyController@search')->name('search');
|
||||
Route::get('/search', 'SearchCompanyController@search')->name('search');
|
||||
|
||||
// List single company
|
||||
Route::get('{id}/profile', 'CompanyController@show')->name('profile');
|
||||
Route::get('{id}/profile', 'ProfileCompanyController@show')->name('profile');
|
||||
|
||||
// Create new company
|
||||
Route::post('/', 'CreateCompanyController@create')->name('create');
|
||||
|
||||
// Update company
|
||||
Route::put('{id}', 'CompanyController@store')->name('update');
|
||||
Route::put('{id}', 'UpdateCompanyController@update')->name('update');
|
||||
|
||||
// Delete company
|
||||
Route::delete('{id}', 'CompanyController@destroy')->name('delete');
|
||||
Route::delete('{id}', 'DeleteCompanyController@destroy')->name('delete');
|
||||
|
||||
Route::get('{id}/order/{category}/list', 'CompanyOrderController@list')
|
||||
->where('category', 'processing|shipping|receiving|complete|cancel')->name('order.list');
|
||||
|
||||
// Companies Address Book Routes
|
||||
Route::group(['prefix' => 'address-book', 'as' => 'addressBook.'], function () {
|
||||
Route::group(['prefix' => 'address-book', 'as' => 'addressBook.', 'namespace' => 'AddressBook'], function () {
|
||||
|
||||
// List addresses in company's address book
|
||||
Route::get('{companyId}', 'AddressBookController@index')->name('list');
|
||||
Route::get('{companyId}', 'ListAddressBookController@list')->name('list');
|
||||
|
||||
// Create new address in company's address book
|
||||
Route::post('{companyId}', 'AddressBookController@store')->name('create');
|
||||
Route::post('{companyId}', 'CreateAddressBookController@store')->name('create');
|
||||
|
||||
// Update address in company's address book
|
||||
Route::put('{companyId}/{id}', 'AddressBookController@store')->name('update');
|
||||
Route::put('{companyId}/{id}', 'UpdateAddressBookController@update')->name('update');
|
||||
|
||||
// sets default delivery address
|
||||
Route::put('{companyId}/{id}/default', 'AddressBookController@default')->name('default');
|
||||
Route::put('{companyId}/{id}/default', 'DefaultAddressBookController@default')->name('default');
|
||||
|
||||
// Delete address from company's address book
|
||||
Route::delete('{companyId}/{id}', 'AddressBookController@destroy')->name('delete');
|
||||
Route::delete('{companyId}/{id}', 'DeleteAddressBookController@destroy')->name('delete');
|
||||
|
||||
});
|
||||
});
|
||||
@@ -77,16 +77,16 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
|
||||
Route::group(['prefix' => 'contact', 'as' => 'contact.', 'namespace' => 'Contacts'], function () {
|
||||
|
||||
// List contacts
|
||||
Route::get('list/{type}/{reference}', 'ContactController@index')->name('list');
|
||||
Route::get('list/{type}/{reference}', 'ListContactController@list')->name('list');
|
||||
|
||||
// Create new contact
|
||||
Route::post('{type}/{reference}', 'ContactController@store')->name('create');
|
||||
Route::post('{type}/{reference}', 'CreateContactController@create')->name('create');
|
||||
|
||||
// Update contact
|
||||
Route::put('{type}/{reference}/{id}', 'ContactController@store')->name('update');
|
||||
Route::put('{type}/{reference}/{id}', 'UpdateContactController@update')->name('update');
|
||||
|
||||
// Delete contact
|
||||
Route::delete('{id}', 'ContactController@destroy')->name('delete');
|
||||
Route::delete('{id}', 'DeleteContactController@destroy')->name('delete');
|
||||
|
||||
});
|
||||
|
||||
@@ -125,7 +125,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
|
||||
|
||||
Route::post('/{orderId}/update', 'updateOrderStepController@update')->name('step.update');
|
||||
|
||||
Route::post('/{orderId}/packing-list', 'UpdatePackingListController@update')->name('packages.update');
|
||||
Route::post('/{orderId}/packing-list', 'OrderController@updatePackingList')->name('packages.update');
|
||||
|
||||
Route::post('/{orderId}/shipping-arrangement', 'OrderController@orderShippingArrangement')->name('shipping.arrangement.create');
|
||||
Route::post('/{orderId}/shipping-arrangement/reschedule', 'OrderController@rescheduleShipping')->name('shipping.arrangement.reschedule');
|
||||
|
||||
Reference in New Issue
Block a user