main pull conflicts resolve

Signed-off-by: romanetar <roman_ag@hotmail.com>

Author: romanetar

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrdersApiController.php

@@ -285,7 +285,10 @@ function () {
                     'id',
                     'number',
                     'status',
-                    'owner_name'
+                    'owner_name',
+                    'owner_email',
+                    'owner_company',
+                    'created',
                 ];
             },
             function ($filter) use ($summit) {
@@ -344,6 +347,10 @@ function () {
                     'id',
                     'number',
                     'status',
+                    'owner_name',
+                    'owner_email',
+                    'owner_company',
+                    'created',
                 ];
             },
             function ($filter) use ($summit) {
@@ -403,6 +410,10 @@ function () {
                     'id',
                     'number',
                     'status',
+                    'owner_name',
+                    'owner_email',
+                    'owner_company',
+                    'created',
                 ];
             },
             function ($filter) use ($owner, $summit_id) {

app/Repositories/Summit/DoctrineSummitOrderRepository.php

@@ -78,13 +78,17 @@ protected function getOrderMappings()
             'number' => 'e.number',
             'id'     => 'e.id',
             'status' => 'e.status',
-        /*    'owner_name' =>  <<<SQL
-    CASE WHEN o IS NOT NULL THEN LOWER(CONCAT(o.first_name, ' ', o.last_name))
-    ELSE LOWER(CONCAT(e.owner_first_name, ' ', e.owner_surname)) END 
-SQL*/
-                'owner_name' =>  <<<SQL
+            'created' => 'e.created',
+            'owner_name' =>  <<<SQL
 COALESCE(LOWER(CONCAT(o.first_name, ' ', o.last_name)), LOWER(CONCAT(e.owner_first_name, ' ', e.owner_surname))) 
-SQL
+SQL,
+            'owner_email' =>  <<<SQL
+COALESCE(LOWER(o.email), LOWER(e.owner_email))
+SQL,
+            'owner_company' => <<<SQL
+COALESCE(LOWER(e.owner_company_name), LOWER(oc.name))
+SQL,
+
         ];
     }
 

database/seeders/ApiEndpointsSeeder.php

@@ -1225,7 +1225,7 @@ private function seedSummitEndpoints()
             ],
             [
                 'name' => 'add-summit-logo-secondary',
-                'route' => '/api/v1/summits/{id}/secondary',
+                'route' => '/api/v1/summits/{id}/logo/secondary',
                 'http_method' => 'POST',
                 'scopes' => [
                     sprintf(SummitScopes::WriteSummitData, $current_realm),

routes/api_v1.php

@@ -264,8 +264,8 @@
         Route::group(['prefix' => 'logo'], function () {
             Route::post('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@addSummitLogo']);
             Route::delete('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@deleteSummitLogo']);
-            Route::post('secondary', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@addSummitLogo']);
-            Route::delete('secondary', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@deleteSummitLogo']);
+            Route::post('secondary', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@addSummitSecondaryLogo']);
+            Route::delete('secondary', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@deleteSummitSecondaryLogo']);
         });
 
         Route::delete('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitApiController@deleteSummit']);